Changeset 12520

Timestamp:

Aug 3, 2009, 3:46:28 PM (14 years ago)

Author:

ebihara

Message:

#4219:splitted the sfOpenPNESecurityUser::getAuthModes() method in to 2 methods by the getAuthAdapters() method

File:

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

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

@@ -42 +42 @@
   }
 
-  public function getAuthModes()
-  {
-    $is_mobile = sfConfig::get('app_is_mobile', false);
+  public function getAuthAdapters()
+  {
+    $adapters = array();
     $plugins = sfContext::getInstance()->getConfiguration()->getEnabledAuthPlugin();
-
-    $result = array();
 
     foreach ($plugins as $pluginName)
@@ -53 +51 @@
       $endPoint = strlen($pluginName) - strlen('opAuth') - strlen('Plugin');
       $authMode = substr($pluginName, strlen('opAuth'), $endPoint);
-
       $adapterClass = self::getAuthAdapterClassName($authMode);
-      $adapter = new $adapterClass($authMode);
+      $adapters[$authMode] = new $adapterClass($authMode);
+    }
+
+    return $adapters;
+  }
+
+  public function getAuthModes()
+  {
+    $is_mobile = sfConfig::get('app_is_mobile', false);
+    $result = array();
+
+    $adapters = $this->getAuthAdapters();
+    foreach ($adapters as $authMode => $adapter)
+    {
       if (($is_mobile && !$adapter->getAuthConfig('enable_mobile'))
         || (!$is_mobile && !$adapter->getAuthConfig('enable_pc')))