Shibboleth authentication: Fixed bug MDL-18538 that overwrites altern…

…ateloginurl when Shibboleth authentication settings are saved
moodle · Mar 12, 2009 · 37934e4 · 37934e4
1 parent 7b1476e
commit 37934e4
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
@@ -271,12 +271,17 @@ function process_config($config) {
         set_config('auth_instructions', $config->auth_instructions, 'auth/shibboleth');
         set_config('changepasswordurl', $config->changepasswordurl, 'auth/shibboleth');
 
+        // Overwrite alternative login URL if integrated WAYF is used
         if (isset($config->alt_login) && $config->alt_login == 'on'){
             set_config('alt_login',    $config->alt_login,    'auth/shibboleth');
             set_config('alternateloginurl', $CFG->wwwroot.'/auth/shibboleth/login.php');
         } else {
-            set_config('alt_login',    'off',    'auth/shibboleth');
-            set_config('alternateloginurl', '');
+            // Check if integrated WAYF was enabled and is now turned off
+            // If it was and only then, reset the Moodle alternate URL 
+            if ($this->config->alt_login == 'on'){
+                set_config('alt_login',    'off',    'auth/shibboleth');
+                set_config('alternateloginurl', '');
+            }
             $config->alt_login = 'off';
         }