Changeset 1559 in ExiteCMS for trunk/administration/settings_security.php

Timestamp:

07/30/08 18:35:15 (4 years ago)

Author:

hverton

Message:

updated preliminary support for multiple authentication methods. Made it more modulair and flexible, so other methods can be added. Also the login panel is more user friendly now

File:

• trunk/administration/settings_security.php (modified) (3 diffs)

trunk/administration/settings_security.php

@@ -44 +44 @@
         $auth_local = $_POST['auth_method']{1} == "+" ? "1" : "0";
         switch ($auth_method) {
+            case "0":   // Local only
+                $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = 'local' WHERE cfg_name = 'auth_type'");
+                break;
             case "1":   // LDAP
                 if ($auth_local) {
@@ -60 +63 @@
             case "3":   // OpenID
                 if ($auth_local) {
-                    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = 'openid,local' WHERE cfg_name = 'auth_type'");
+                    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = 'local,openid' WHERE cfg_name = 'auth_type'");
                 } else {
                     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = 'openid' WHERE cfg_name = 'auth_type'");
@@ -106 +109 @@
 
 // determine the auth_method defined
-$auth_methods = explode(",",$settings2['auth_type'].",");
-switch($auth_methods[0]) {
-    case "ldap":
-        $auth_method = 1;
-        break;
-    case "ad":
-        $auth_method = 2;
-        break;
-    case "openid":
-        $auth_method = 3;
-    case "local":
-        break;
-    default:
-        $auth_method = 0;
+$auth_methods = explode(",",$settings2['auth_type']);
+$auth_method = 0;
+$auth_local = false;
+foreach($auth_methods as $auth_method) {
+    switch($auth_method) {
+        case "ldap":
+            $auth_method = 1;
+            break;
+        case "ad":
+            $auth_method = 2;
+            break;
+        case "openid":
+            $auth_method = 3;
+        case "local":
+            $auth_local = true;
+            break;
+        default:
+            $auth_method = 0;
+    }
 }
-$variables['auth_method'] = $auth_method;
 
 // check if a local fallback is defined
-if ($auth_method && $auth_methods[1] == "local") {
-    $variables['auth_method'] .= "+";
-}
+$variables['auth_method'] .= $auth_method . ($auth_local ? "+" : " ");
 
 // define the admin body panel