[Gemstracker-svn] SF.net SVN: gemstracker:[622] trunk/library/classes/Gems/User/User.php

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

Revision: 622
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=622&view=rev
Author:   mennodekker
Date:     2012-04-18 12:53:21 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
And some more cleanup

Modified Paths:
--------------
    trunk/library/classes/Gems/User/User.php

Modified: trunk/library/classes/Gems/User/User.php
===================================================================
--- trunk/library/classes/Gems/User/User.php	2012-04-18 12:44:04 UTC (rev 621)
+++ trunk/library/classes/Gems/User/User.php	2012-04-18 12:53:21 UTC (rev 622)
@@ -126,16 +126,7 @@
     protected $userLoader;
 
     /**
-     * Use Zend_Auth for authentication
      *
-     * Warning: Zend_Auth contains only a partial ID of the current user, the base organization is missing
-     *
-     * @var boolean
-     */
-    protected $useZendAuth = false;
-
-    /**
-     *
      * @var Gems_Util
      */
     protected $util;
@@ -330,9 +321,6 @@
      */
     public function authenticate($password)
     {
-        if ($this->useZendAuth) {
-            $zendAuth = Zend_Auth::getInstance();
-        }
         $auths = $this->loadAuthorizers($password);
 
         foreach ($auths as $result) {
@@ -341,11 +329,7 @@
             }
 
             if ($result instanceof Zend_Auth_Adapter_Interface) {
-                if ($this->useZendAuth) {
-                    $result = $zendAuth->authenticate($result);
-                } else {
-                    $result = $result->authenticate();
-                }
+                $result = $result->authenticate();
             }
 
             if ($result instanceof Zend_Auth_Result) {

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