Changeset 9801

Timestamp:

Dec 31, 2008, 3:38:32 AM (14 years ago)

Author:

ebihara

Message:

#3241:changed sfOpenPNESecurityUser to store the current authentication mode

File:

• OpenPNE3/trunk/lib/user/sfOpenPNESecurityUser.class.php (modified) (2 diffs)

OpenPNE3/trunk/lib/user/sfOpenPNESecurityUser.class.php

@@ -24 +24 @@
     $request = sfContext::getInstance()->getRequest();
     $authMode = $request->getUrlParameter('authMode');
-
-    $authModes = $this->getAuthModes();
-
-    if (!$authMode || !in_array($authMode, $authModes))
-    {
-      $authMode = array_shift($authModes);
-    }
-
-    $containerClass = self::getAuthAdapterClassName($authMode);
-    $this->authAdapter = new $containerClass($authMode);
+    if ($authMode)
+    {
+      $this->setCurrentAuthMode($authMode);
+    }
+
+    $containerClass = self::getAuthAdapterClassName($this->getCurrentAuthMode());
+    $this->authAdapter = new $containerClass($this->getCurrentAuthMode());
     $this->authForm = $this->authAdapter->getAuthForm();
 
@@ -83 +80 @@
   }
 
+  public function setCurrentAuthMode($authMode)
+  {
+    $this->setAttribute('auth_mode', $authMode, 'sfOpenPNESecurityUser');
+  }
+
+  public function getCurrentAuthMode()
+  {
+    $authMode = $this->getAttribute('auth_mode', null, 'sfOpenPNESecurityUser');
+
+    $authModes = $this->getAuthModes();
+    if (!in_array($authMode, $authModes))
+    {
+      $authMode = array_shift($authModes);
+      $this->setCurrentAuthMode($authMode);
+    }
+
+    return $authMode;
+  }
+
   public function getMember()
   {