More renamed

[shipsimu.git] / application / ship-simu / main / user / extended / class_ShipSimuMember.php

diff --git a/application/ship-simu/main/user/extended/class_ShipSimuMember.php b/application/ship-simu/main/user/extended/class_ShipSimuMember.php
index 46fb2ed7bfa5d790ee37eab70b054e33eb926446..a37ef16ff5616ffc9f834d1a3ea6f04cb581e1d3 100644 (file)
--- a/application/ship-simu/main/user/extended/class_ShipSimuMember.php
+++ b/application/ship-simu/main/user/extended/class_ShipSimuMember.php
@@ -2,11 +2,11 @@
 /**
  * A special member class for Ship-Simu
  *
 /**
  * A special member class for Ship-Simu
  *

- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>

  * @version            0.0.0
  * @version            0.0.0

- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team

  * @license            GNU GPL 3.0 or any newer version
  * @license            GNU GPL 3.0 or any newer version

- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
  * 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 ShipSimuMember extends ShipSimuBaseUser implements ManageableMember {
+class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember, BookableAccount {

        /**
         * Protected constructor
         *
        /**
         * Protected constructor
         *


@@ -48,21 +48,21 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember {
 
        /**
         * Creates an instance of this user class by a provided username. This
 
        /**
         * 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
+        * 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
         * @throws      UsernameMissingException        If the username does not exist
         */
         * so it will throw an exception.
         *
         * @param       $userName               Username we need a class instance for
         * @return      $userInstance   An instance of this user class
         * @throws      UsernameMissingException        If the username does not exist
         */

-       public final static function createMemberByUsername ($userName) {
+       public static final function createMemberByUsername ($userName) {

                // Get a new instance
                $userInstance = new ShipSimuMember();
 
                // Set the username
                $userInstance->setUserName($userName);
 
                // Get a new instance
                $userInstance = new ShipSimuMember();
 
                // Set the username
                $userInstance->setUserName($userName);
 

-               // Check if the username exists
+               // Check if username exists

                if ($userInstance->ifUsernameExists() === false) {
                        // Throw an exception here
                        throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);
                if ($userInstance->ifUsernameExists() === false) {
                        // Throw an exception here
                        throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);


@@ -74,12 +74,12 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember {
 
        /**
         * Creates an instance of this user class by a provided email address. This
 
        /**
         * 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
         */
         *
         * @param       $email                  Email address of the user
         * @return      $userInstance   An instance of this user class
         */

-       public final static function createMemberByEmail ($email) {
+       public static final function createMemberByEmail ($email) {

                // Get a new instance
                $userInstance = new ShipSimuMember();
 
                // Get a new instance
                $userInstance = new ShipSimuMember();
 


@@ -97,7 +97,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember {
         * @return      $userInstance           An instance of this user class
         * @todo        Add more ways of creating user instances
         */
         * @return      $userInstance           An instance of this user class
         * @todo        Add more ways of creating user instances
         */

-       public final static function createMemberByRequest (Requestable $requestInstance) {
+       public static final function createMemberByRequest (Requestable $requestInstance) {

                // Determine if by email or username
                if (!is_null($requestInstance->getRequestElement('username'))) {
                        // Username supplied
                // Determine if by email or username
                if (!is_null($requestInstance->getRequestElement('username'))) {
                        // Username supplied


@@ -131,7 +131,7 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember {
 
                // If there is no action use the default on
                if (is_null($lastAction)) {
 
                // If there is no action use the default on
                if (is_null($lastAction)) {

-                       $lastAction = $this->getConfigInstance()->readConfig('login_default_action');
+                       $lastAction = $this->getConfigInstance()->getConfigEntry('login_default_action');

                } // END - if
 
                // Get a critieria instance
                } // END - if
 
                // Get a critieria instance


@@ -145,16 +145,54 @@ class ShipSimuMember extends ShipSimuBaseUser implements ManageableMember {
                $updateInstance = ObjectFactory::createObjectByConfiguredName('update_criteria_class');
 
                // And add our both entries
                $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);
 
 
                // Add the search criteria for searching for the right entry
                $updateInstance->setSearchInstance($searchInstance);
 

+               // Set wrapper class name
+               $updateInstance->setWrapperConfigEntry('user_db_wrapper_class');
+

                // Remember the update in database result
                $this->getResultInstance()->add2UpdateQueue($updateInstance);
        }
 
                // Remember the update in database result
                $this->getResultInstance()->add2UpdateQueue($updateInstance);
        }
 

+       /**
+        * Books the given 'amount' in the request instance on the users 'points
+        * account'
+        *
+        * @param       $requestInstance        An instance of a Requestable class
+        * @return      void
+        */
+       public function bookAmountDirectly (Requestable $requestInstance) {
+               // Init points instance
+               $pointsInstance = null;
+
+               try {
+                       // Get the points class from registry
+                       $pointsInstance = Registry::getRegistry()->getInstance('points');
+               } catch (NullPointerException $e) {
+                       // Instance not found in registry
+                       // @TODO We should log this later
+               }
+
+               // Is the points instance null?
+               if (is_null($pointsInstance)) {
+                       // Then get a new one
+                       $pointsInstance = ObjectFactory::createObjectByConfiguredName('user_points_class', array($this));
+
+                       // And store it in registry
+                       Registry::getRegistry()->addInstance('points', $pointsInstance);
+               } // END - if
+
+               // Get the amount
+               $amount = $requestInstance->getRequestElement('amount');
+
+               // Call the method for booking points
+               $pointsInstance->bookPointsDirectly($amount);
+       }
+

        /**
         * Flushs all pending updates to the database layer
         *
        /**
         * Flushs all pending updates to the database layer
         *