Rewrite continued:

[core.git] / framework / main / classes / filter / validator / class_EmailValidatorFilter.php

diff --git a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
index 1abdf68cb7b8bc9bfb5516687cf6724de421c74d..1bdd5631dc34f54a276a05d0271ad02e2261b989 100644 (file)
--- a/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -79,7 +79,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                        // Is the email still not set?
                        if ((is_null($email1)) || (is_null($email2))) {
                                // Not found in form so stop the filtering process
-                               $requestInstance->requestIsValid(FALSE);
+                               $requestInstance->requestIsValid(false);
 
                                // Add a message to the response
                                $responseInstance->addFatalMessage('email_unset');
@@ -88,7 +88,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                                throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                        } elseif ((empty($email1)) || (empty($email2))) {
                                // Email is empty
-                               $requestInstance->requestIsValid(FALSE);
+                               $requestInstance->requestIsValid(false);
 
                                // Is the email empty?
                                if (empty($email1)) {
@@ -106,7 +106,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                                throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                        } elseif ($this->ifEmailIsTaken($email1)) {
                                // Email is already taken
-                               $requestInstance->requestIsValid(FALSE);
+                               $requestInstance->requestIsValid(false);
 
                                // Add a message to the response
                                $responseInstance->addFatalMessage('email_taken');
@@ -115,7 +115,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                                throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                        } elseif ($email1 != $email2) {
                                // Emails didn't match
-                               $requestInstance->requestIsValid(FALSE);
+                               $requestInstance->requestIsValid(false);
 
                                // Add a message to the response
                                $responseInstance->addFatalMessage('emails_mismatch');
@@ -125,7 +125,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                        } // END - elseif
                } elseif (empty($email)) {
                        // Empty field!
-                       $requestInstance->requestIsValid(FALSE);
+                       $requestInstance->requestIsValid(false);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('email_empty');
@@ -143,7 +143,7 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
         */
        private function ifEmailIsTaken ($email) {
                // Default is already taken
-               $alreadyTaken = TRUE;
+               $alreadyTaken = true;
 
                // Initialize instance
                $userInstance = NULL;
@@ -165,9 +165,9 @@ class EmailValidatorFilter extends BaseFilter implements Filterable {
                }
 
                // Does the email exist?
-               if ($userInstance->ifEmailAddressExists() === FALSE) {
+               if ($userInstance->ifEmailAddressExists() === false) {
                        // This email has not being used yet
-                       $alreadyTaken = FALSE;
+                       $alreadyTaken = false;
                }
 
                // Return the result