Fixes #510

Author: alexweissman

userfrosting/locale/en_US.php

@@ -52,7 +52,8 @@
     "ACCOUNT_REGISTRATION_BROKEN" => "We're sorry, there is a problem with our account registration process.  Please contact us directly for assistance.",
 	"ACCOUNT_REGISTRATION_LOGOUT" => "I'm sorry, you cannot register for an account while logged in. Please log out first.",
 	"ACCOUNT_INACTIVE" => "Your account is in-active. Check your emails / spam folder for account activation instructions.",
-	"ACCOUNT_DISABLED" => "This account has been disabled. Please contact us for more information.",
+	"ACCOUNT_INVALID" => "This account does not exist. It may have been deleted.  Please contact us for more information.",
+    "ACCOUNT_DISABLED" => "This account has been disabled. Please contact us for more information.",
 	"ACCOUNT_USER_CHAR_LIMIT" => "Your username must be between {{min}} and {{max}} characters in length.",
 	"ACCOUNT_USER_INVALID_CHARACTERS" => "Username can only include alpha-numeric characters",
     "ACCOUNT_USER_NO_LEAD_WS" => "Username cannot begin with whitespace",

userfrosting/models/UserFrosting.php

@@ -79,9 +79,24 @@ public function setupErrorHandling(){
                 return $this->logout(true);
             }
 
+            if ($e instanceof AccountDisabledException) {
+                $this->logout(false);
+                // Create a new session to store alerts
+                $this->startSession();
+                // Seems to be needed to create a new session as per http://stackoverflow.com/questions/19738422/destroying-old-session-making-new-but-php-still-refers-to-old-session
+                session_regenerate_id(true);
+                $this->setupServices($this->site->default_locale);
+                $this->alerts->addMessageTranslated('danger','ACCOUNT_DISABLED');
+                $this->redirect($this->urlFor('uri_home'));
+            }
+            
             if ($e instanceof AccountInvalidException) {
-                $controller = new AccountController($this);
-                return $this->logout(false);
+                $this->logout(false);
+                $this->startSession();
+                session_regenerate_id(true);
+                $this->setupServices($this->site->default_locale);                
+                $this->alerts->addMessageTranslated('danger','ACCOUNT_INVALID');
+                $this->redirect($this->urlFor('uri_home'));
             }
 
             if ($e instanceof AuthCompromisedException) {