User class / resending of confirm link updated:

[shipsimu.git] / inc / classes / main / filter / verifier / class_UserUnconfirmedVerifierFilter.php

diff --git a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index a87ea95630db94e1501a3e4e0a3113c853b1a60a..f5ab58d248da507a95c6570b04cf72bf3f549427 100644 (file)
--- a/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/classes/main/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -66,13 +66,25 @@ class UserUnconfirmedVerifierFilter extends BaseFrameworkSystem implements Filte
                // Get a user instance for comparison
                $userInstance = User::createUserByRequest($requestInstance);
 
+               // Is the email address valid?
+               if (!$userInstance->ifEmailAddressExists()) {
+                       // Request is invalid!
+                       $requestInstance->requestIsValid(false);
+
+                       // Redirect to configured URL
+                       $responseInstance->redirectToConfiguredUrl('user_unconfirmed_email_missing_url');
+
+                       // Stop processing here
+                       exit();
+               } // END - if
+
                // Is the user account confirmed?
                if ($userInstance->getField('user_status') != $this->getConfigInstance()->readConfig('user_status_unconfirmed')) {
                        // Request is invalid!
                        $requestInstance->requestIsValid(false);
 
                        // Redirect to configured URL
-                       $responseInstance->redirectToConfiguredUrl('login_user_unconfirmed_url');
+                       $responseInstance->redirectToConfiguredUrl('user_not_unconfirmed_url');
 
                        // Stop processing here
                        exit();