[Gemstracker-svn] SF.net SVN: gemstracker:[199] branches/newUser2/classes/Gems/User

[<gem...@li...>]

Revision: 199
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=199&view=rev
Author:   matijsdejong
Date:     2011-11-10 15:47:29 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Password check no works through user as well.

Modified Paths:
--------------
    branches/newUser2/classes/Gems/User/User.php
    branches/newUser2/classes/Gems/User/UserLoader.php

Modified: branches/newUser2/classes/Gems/User/User.php
===================================================================
--- branches/newUser2/classes/Gems/User/User.php	2011-11-10 15:29:54 UTC (rev 198)
+++ branches/newUser2/classes/Gems/User/User.php	2011-11-10 15:47:29 UTC (rev 199)
@@ -165,6 +165,17 @@
     }
 
     /**
+     * Checks the password for this user and handle the login security.
+     *
+     * @param string $password
+     * @return boolean True if the password is correct.
+     */
+    public function checkPassword($password)
+    {
+        return $this->userLoader->checkPassword($this->getLoginName(), $this->getOrganizationId(), $password);
+    }
+
+    /**
      * Should be called after answering the request to allow the Target
      * to check if all required registry values have been set correctly.
      *
@@ -203,7 +214,7 @@
 
     /**
      * Returns the group number of the current user.
-     * 
+     *
      * @return int
      */
     public function getGroup()

Modified: branches/newUser2/classes/Gems/User/UserLoader.php
===================================================================
--- branches/newUser2/classes/Gems/User/UserLoader.php	2011-11-10 15:29:54 UTC (rev 198)
+++ branches/newUser2/classes/Gems/User/UserLoader.php	2011-11-10 15:47:29 UTC (rev 199)
@@ -539,7 +539,7 @@
         if ((self::$currentUser instanceof Gems_User_User) && self::$currentUser->isCurrentUser()) {
             self::$currentUser->unsetAsCurrentUser();
         }
-        self::$currentUser = $user;
+        self::$currentUser = null;
         return $this;
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.