Payment introduced, minor rewrites

[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 1cf97e945e90b187651640ed6e1b5282be7b8365..726e8501405c08e5732a24b7079db6ef9c58f789 100644 (file)
--- a/inc/classes/main/user/member/class_Member.php
+++ b/inc/classes/main/user/member/class_Member.php
@@ -22,29 +22,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class Member extends BaseUser implements ManageableMember, Registerable, Updateable {
-       // Exception constances
-       const EXCEPTION_USERNAME_NOT_FOUND   = 0x150;
-       const EXCEPTION_USER_EMAIL_NOT_FOUND = 0x151;
-       const EXCEPTION_USER_PASS_MISMATCH   = 0x152;
-
        /**
         * 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__);
        }
 
        /**
@@ -69,7 +54,7 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
         * @return      $userInstance   An instance of this user class
         * @throws      UsernameMissingException        If the username does not exist
         */
-       public final static function createUserByUsername ($userName) {
+       public final static function createMemberByUsername ($userName) {
                // Get a new instance
                $userInstance = new Member();
 
@@ -93,7 +78,7 @@ class Member extends BaseUser implements ManageableMember, Registerable, Updatea
         * @param       $email                  Email address of the user
         * @return      $userInstance   An instance of this user class
         */
-       public final static function createUserByEmail ($email) {
+       public final static function createMemberByEmail ($email) {
                // Get a new instance
                $userInstance = new Member();
 
@@ -109,15 +94,16 @@ 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 createUserByRequest (Requestable $requestInstance) {
+       public final static function createMemberByRequest (Requestable $requestInstance) {
                // Determine if by email or username
                if (!is_null($requestInstance->getRequestElement('username'))) {
                        // Username supplied
-                       $userInstance = self::createUserByUserName($requestInstance->getRequestElement('username'));
+                       $userInstance = self::createMemberByUserName($requestInstance->getRequestElement('username'));
                } elseif (!is_null($requestInstance->getRequestElement('email'))) {
                        // Email supplied
-                       $userInstance = self::createUserByEmail($requestInstance->getRequestElement('email'));
+                       $userInstance = self::createMemberByEmail($requestInstance->getRequestElement('email'));
                } else {
                        // Unsupported mode
                        $userInstance = new Member();
@@ -130,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
@@ -171,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);