A lot rewrites and fixes for weak redirect methods

[shipsimu.git] / inc / classes / main / user / member / class_Member.php

diff --git a/inc/classes/main/user/member/class_Member.php b/inc/classes/main/user/member/class_Member.php
index a71c746d4455b0460fe7464e000ec023bd96d506..b67ad88b9274bbc1f2ebc48759a49ab2ac47663f 100644 (file)
--- a/inc/classes/main/user/member/class_Member.php
+++ b/inc/classes/main/user/member/class_Member.php
@@ -25,21 +25,11 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
        /**
         * Protected constructor
         *
-        * @param       $className      Name of the class
         * @return      void
         */
-       protected function __construct ($className = "") {
-               // Is the class name empty? Then this is not a specialized user class
-               if (empty($className)) $className = __CLASS__;
-
+       protected function __construct () {
                // Call parent constructor
-               parent::__construct($className);
-
-               // Set part description
-               $this->setObjectDescription("Generic user class");
-
-               // Create unique ID number
-               $this->generateUniqueId();
+               parent::__construct(__CLASS__);
        }
 
        /**
@@ -57,8 +47,8 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
 
        /**
         * Creates an instance of this user class by a provided username. This
-        * factory method will check if the username is already taken and if not
-        * so it will throw an exception.
+        * factory method will check if username is already taken and if not so it
+        * will throw an exception.
         *
         * @param       $userName               Username we need a class instance for
         * @return      $userInstance   An instance of this user class
@@ -71,11 +61,11 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
                // Set the username
                $userInstance->setUserName($userName);
 
-               // Check if the username exists
-               if (!$userInstance->ifUsernameExists()) {
+               // Check if username exists
+               if ($userInstance->ifUsernameExists() === false) {
                        // Throw an exception here
                        throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);
-               }
+               } // END - if
 
                // Return the instance
                return $userInstance;
@@ -83,7 +73,7 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
 
        /**
         * Creates an instance of this user class by a provided email address. This
-        * factory method will not check if the email address is there.
+        * factory method will not check if email address is there.
         *
         * @param       $email                  Email address of the user
         * @return      $userInstance   An instance of this user class
@@ -104,6 +94,7 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
         *
         * @param       $requestInstance        An instance of a Requestable class
         * @return      $userInstance           An instance of this user class
+        * @todo        Add more ways over creating user classes
         */
        public final static function createMemberByRequest (Requestable $requestInstance) {
                // Determine if by email or username
@@ -125,19 +116,6 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
                return $userInstance;
        }
 
-       /**
-        * Adds data for later complete update
-        *
-        * @param       $column         Column we want to update
-        * @param       $value          New value to store in database
-        * @return      void
-        * @deprecated
-        */
-       public function addUpdateData ($column, $value) {
-               $this->deprecatedMethod("Please use updateDatabaseField() instead!");
-               $this->updateDatabaseField($column, $value);
-       }
-
        /**
         * Updates the last activity timestamp and last performed action in the
         * database result. You should call flushPendingUpdates() to flush these updates
@@ -166,8 +144,8 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
                $updateInstance = ObjectFactory::createObjectByConfiguredName('update_criteria_class');
 
                // And add our both entries
-               $updateInstance->addCriteria('last_activity', date("Y-m-d H:i:s", time()));
-               $updateInstance->addCriteria('last_action', $lastAction);
+               $updateInstance->addCriteria("last_activity", date("Y-m-d H:i:s", time()));
+               $updateInstance->addCriteria("last_action", $lastAction);
 
                // Add the search criteria for searching for the right entry
                $updateInstance->setSearchInstance($searchInstance);