Some updates:

[core.git] / framework / main / classes / filter / change / class_EmailChangeFilter.php

diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php
index 3347823de111394a57e785f1d0e12f71c6080399..e7c3be06a997b3c8aadb2e012812adaf25baadc4 100644 (file)
--- a/framework/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php
@@ -1,20 +1,24 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filter\Change\Email;
+namespace Org\Mxchange\CoreFramework\Filter\Change\Email;
 
 // Import framework stuff
-use CoreFramework\Filter\BaseFilter;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Filterable;
+use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A filter for detecting email changes
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/change/class_EmailChangeFilter.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/filter/change/class_EmailChangeFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -72,7 +76,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
                // Is only first email set?
                if ((!empty($email1)) && (empty($email2))) {
                        // Request is invalid!
-                       $requestInstance->requestIsValid(FALSE);
+                       $requestInstance->requestIsValid(false);
 
                        // Email 2 is empty
                        $responseInstance->addFatalMessage('email2_empty');
@@ -84,7 +88,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
                // Is only second email set?
                if ((empty($email1)) && (!empty($email2))) {
                        // Request is invalid!
-                       $requestInstance->requestIsValid(FALSE);
+                       $requestInstance->requestIsValid(false);
 
                        // Email 1 is empty
                        $responseInstance->addFatalMessage('email1_empty');
@@ -96,7 +100,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
                // Do both match?
                if ($email1 != $email2) {
                        // Request is invalid!
-                       $requestInstance->requestIsValid(FALSE);
+                       $requestInstance->requestIsValid(false);
 
                        // Emails are mismatching
                        $responseInstance->addFatalMessage('emails_mismatch');
@@ -108,7 +112,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
                // Are email and confirmation empty?
                if ((empty($email1)) && (empty($email2))) {
                        // No email change required!
-                       return TRUE;
+                       return true;
                } // END - if
 
                // Now, get a user instance for comparison
@@ -120,7 +124,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable {
                // Are they different?
                if ($userEmail == $email1) {
                        // Nothing has been changed is fine...
-                       return TRUE;
+                       return true;
                } // END - if
 
                // Update the "new_email" field