MDL-8590 fixed magic quotes in config settings; merged from MOODLE_18_STABLE

diff --git a/admin/auth_config.php b/admin/auth_config.php
index 99459f094b64131a8f7b677707b6afae6b00f089..4dd597625356a845e156a124d4771404755f9d60 100644 (file)
--- a/admin/auth_config.php
+++ b/admin/auth_config.php
@@ -19,6 +19,8 @@ if ($frm = data_submitted()) {
         error(get_string('confirmsesskeybad', 'error'));
     }
 
+    $frm = stripslashes_recursive($frm);
+
     $authplugin->validate_form($frm, $err);
 
     if (count($err) == 0) {
@@ -36,7 +38,7 @@ if ($frm = data_submitted()) {
                     }
                 }
             }
-            redirect("auth.php?sesskey=$USER->sesskey");
+            redirect("auth.php");
             exit;
         }
     } else {

diff --git a/lib/authlib.php b/lib/authlib.php
index 77964696c9998aa203ea5023aba5b1ba71b5b015..57f05f91d269d0e2323ef440cc41139dcba95553 100644 (file)
--- a/lib/authlib.php
+++ b/lib/authlib.php
@@ -259,6 +259,8 @@ class auth_plugin_base {
     /**
      * A chance to validate form data, and last chance to
      * do stuff before it is inserted in config_plugin
+     * @param object object with submitted configuration settings (without system magic quotes)
+     * @param array $err array of error messages
      */
      function validate_form(&$form, &$err) {
         //override if needed
@@ -266,6 +268,8 @@ class auth_plugin_base {
 
     /**
      * Processes and stores configuration data for this authentication plugin.
+     *
+     * @param object object with submitted configuration settings (without system magic quotes)
      */
     function process_config($config) {
         //override if needed