Copyright updated

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

diff --git a/inc/classes/main/user/class_BaseUser.php b/inc/classes/main/user/class_BaseUser.php
index d995e3310ec530fc47efc3d731db75570bd8928c..e4f795d58873ee77807b5554a92048326d057cf6 100644 (file)
--- a/inc/classes/main/user/class_BaseUser.php
+++ b/inc/classes/main/user/class_BaseUser.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -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/>.
  */
-class BaseUser extends BaseFrameworkSystem {
+class BaseUser extends BaseFrameworkSystem implements Updateable {
        // Exception constances
        const EXCEPTION_USERNAME_NOT_FOUND   = 0x150;
        const EXCEPTION_USER_EMAIL_NOT_FOUND = 0x151;
@@ -51,10 +51,6 @@ class BaseUser extends BaseFrameworkSystem {
        protected function __construct ($className) {
                // Call parent constructor
                parent::__construct($className);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -116,9 +112,9 @@ class BaseUser extends BaseFrameworkSystem {
        }
 
        /**
-        * Determines wether the username exists or not
+        * Determines whether the username exists or not
         *
-        * @return      $exists         Wether the username exists
+        * @return      $exists         Whether the username exists
         */
        public function ifUsernameExists () {
                // By default the username does not exist
@@ -160,9 +156,9 @@ class BaseUser extends BaseFrameworkSystem {
        }
 
        /**
-        * Determines wether the email exists or not
+        * Determines whether the email exists or not
         *
-        * @return      $exists         Wether the email exists
+        * @return      $exists         Whether the email exists
         */
        public function ifEmailAddressExists () {
                // By default the email does not exist
@@ -217,7 +213,7 @@ class BaseUser extends BaseFrameworkSystem {
         * database.
         *
         * @param       $requestInstance        A requestable class instance
-        * @return      $matches                        Wether the supplied password hash matches
+        * @return      $matches                        Whether the supplied password hash matches
         */
        public function ifPasswordHashMatches (Requestable $requestInstance) {
                // By default nothing matches... ;)
@@ -245,13 +241,16 @@ class BaseUser extends BaseFrameworkSystem {
                        $this->setResultInstance($resultInstance);
                } // END - if
 
-               // Rewind it
+               // Rewind it and advance to first entry
                $this->getResultInstance()->rewind();
 
+               // This call set the result instance to a clean state
+               $this->getResultInstance()->next();
+
                // Search for it
                if ($this->getResultInstance()->find('pass_hash')) {
                        // So does the hashes match?
-                       //* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash').'/'.$entry['pass_hash'];
+                       //* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash') . '<br />' . $this->getResultInstance()->getFoundValue() . '<br />';
                        $matches = ($requestInstance->getRequestElement('pass_hash') === $this->getResultInstance()->getFoundValue());
                } // END - if
 
@@ -266,7 +265,7 @@ class BaseUser extends BaseFrameworkSystem {
         */
        public final function getPasswordHash () {
                // Default is missing password hash
-               $passHash = null;
+               $passHash = NULL;
 
                // Get a database entry
                $entry = $this->getDatabaseEntry();
@@ -306,16 +305,9 @@ class BaseUser extends BaseFrameworkSystem {
         * @param       $fieldName              Field to update
         * @param       $fieldValue             New value to store
         * @return      void
-        * @throws      DatabaseUpdateSupportException  If this class does not support database updates
         * @todo        Try to make this method more generic so we can move it in BaseFrameworkSystem
         */
        public function updateDatabaseField ($fieldName, $fieldValue) {
-               // Is updating database fields allowed by interface?
-               if (!$this instanceof Updateable) {
-                       // Update not supported!
-                       throw new DatabaseUpdateSupportException($this, self::EXCEPTION_DATABASE_UPDATED_NOT_ALLOWED);
-               } // END - if
-
                // Get a critieria instance
                $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');