Some updates:

[core.git] / framework / main / classes / user / class_BaseUser.php

diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index f8b945f9e704e01ea02ddc17ad9bcec4a0f39eaa..393ebee06bb2e4d430c18237b84e43242c7d4729 100644 (file)
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -1,21 +1,25 @@
 <?php
 // Own namespace
-namespace CoreFramework\User;
+namespace Org\Mxchange\CoreFramework\User;
 
 // Import framework stuff
-use CoreFramework\Database\Updateable;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Result\Search\SearchableResult;
-use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Database\Updateable;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
 
 /**
  * A general user class
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/user/class_BaseUser.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/user/class_BaseUser.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -32,7 +36,7 @@ use CoreFramework\Wrapper\Database\User\UserDatabaseWrapper;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseUser extends BaseFrameworkSystem implements Updateable {
+abstract class BaseUser extends BaseFrameworkSystem implements Updateable {
        // Exception constances
        const EXCEPTION_USERNAME_NOT_FOUND   = 0x150;
        const EXCEPTION_USER_EMAIL_NOT_FOUND = 0x151;
@@ -130,7 +134,7 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
         */
        public function ifUsernameExists () {
                // By default the username does not exist
-               $exists = FALSE;
+               $exists = false;
 
                // Is a previous result there?
                if (!$this->getResultInstance() instanceof SearchableResult) {
@@ -160,7 +164,7 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
                // Search for it
                if ($this->getResultInstance()->next()) {
                        // Entry found
-                       $exists = TRUE;
+                       $exists = true;
                } // END - if
 
                // Return the status
@@ -174,7 +178,7 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
         */
        public function ifEmailAddressExists () {
                // By default the email does not exist
-               $exists = FALSE;
+               $exists = false;
 
                // Is a previous result there?
                if (!$this->getResultInstance() instanceof SearchableResult) {
@@ -204,7 +208,7 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
                // Search for it
                if ($this->getResultInstance()->next()) {
                        // Entry found
-                       $exists = TRUE;
+                       $exists = true;
 
                        // Is the username set?
                        if ($this->getUserName() == '') {
@@ -229,7 +233,7 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
         */
        public function ifPasswordHashMatches (Requestable $requestInstance) {
                // By default nothing matches... ;)
-               $matches = FALSE;
+               $matches = false;
 
                // Is a previous result there?
                if ((!$this->getResultInstance() instanceof SearchableResult) || ($this->getResultInstance()->count() == 0)) {