Changeset 12234

Timestamp:

Jul 12, 2009, 12:39:10 AM (14 years ago)

Author:

ebihara

Message:

changed sfOpenPNESecurityUser::getCurrentAuthMode() for considering noncommittal auth-mode

• now doesn't call sfOpenPNESecurityUser::setCurrentAuthMode() when auth-mode is not a certain
• added an $allowGuess argument

File:

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

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

@@ -130 +130 @@
   }
 
-  public function getCurrentAuthMode()
+  public function getCurrentAuthMode($allowGuess = true)
   {
     $authMode = $this->getAttribute('auth_mode', null, 'sfOpenPNESecurityUser');
@@ -137 +137 @@
     if (!in_array($authMode, $authModes))
     {
-      $authMode = array_shift($authModes);
-      $this->setCurrentAuthMode($authMode);
+      if ($allowGuess)
+      {
+        $authMode = array_shift($authModes);
+      }
+      else
+      {
+        $authMode = null;
+      }
     }