Drift between CVS and git

- large deletions
- lucene updates
- error() => print_error()
- NO_MOODLE_COOKIES define
- various other things

admin/auth.php

@@ -30,7 +30,7 @@
 }
 
 if (!empty($auth) and !exists_auth_plugin($auth)) {
-    error(get_string('pluginnotinstalled', 'auth', $auth), $url);
+    print_error('pluginnotinstalled', 'auth', $url, $auth);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@
         $key = array_search($auth, $authsenabled);
         // check auth plugin is valid
         if ($key === false) {
-            error(get_string('pluginnotenabled', 'auth', $auth), $url);
+            print_error('pluginnotenabled', 'auth', $url, $auth);
         }
         // move down the list
         if ($key < (count($authsenabled) - 1)) {
@@ -82,7 +82,7 @@
         $key = array_search($auth, $authsenabled);
         // check auth is valid
         if ($key === false) {
-            error(get_string('pluginnotenabled', 'auth', $auth), $url);
+            print_error('pluginnotenabled', 'auth', $url, $auth);
         }
         // move up the list
         if ($key >= 1) {

admin/cron.php

@@ -20,7 +20,7 @@
 
 
 /// Do not set moodle cookie because we do not need it here, it is better to emulate session
-    $nomoodlecookie = true;
+    define('NO_MOODLE_COOKIES', true);
 
 /// The current directory in PHP version 4.3.0 and above isn't necessarily the
 /// directory of the script when run from the command line. The require_once()
@@ -66,7 +66,6 @@
 
 
 /// emulate normal session
-    $SESSION = new object();
     $USER = get_admin();      /// Temporarily, to provide environment for this script
 
 /// ignore admins timezone, language and locale - use site deafult instead!

admin/enrol.php

@@ -18,7 +18,7 @@
 
     if ($frm = data_submitted()) {
         if (!confirm_sesskey()) {
-            error(get_string('confirmsesskeybad', 'error'));
+            print_error('confirmsesskeybad', 'error');
         }
         if (empty($frm->enable)) {
             $frm->enable = array();
@@ -103,4 +103,4 @@
 
     admin_externalpage_print_footer();
 
-?>
+?>

admin/mnet/index.php

@@ -48,7 +48,7 @@
             }
         } elseif (!empty($form->submit) && $form->submit == get_string('delete')) {
             $MNET->get_private_key();
-            $_SESSION['mnet_confirm_delete_key'] = md5(sha1($MNET->keypair['keypair_PEM'])).':'.time();
+            $SESSION->mnet_confirm_delete_key = md5(sha1($MNET->keypair['keypair_PEM'])).':'.time();
             notice_yesno(get_string("deletekeycheck", "mnet"),
                                     "index.php?sesskey=$USER->sesskey&confirm=".md5($MNET->public_key),
                                     "index.php",
@@ -61,13 +61,13 @@
             // We're deleting
 
 
-            if (!isset($_SESSION['mnet_confirm_delete_key'])) {
+            if (!isset($SESSION->mnet_confirm_delete_key)) {
                 // fail - you're being attacked?
             }
 
             $key = '';
             $time = '';
-            @list($key, $time) = explode(':',$_SESSION['mnet_confirm_delete_key']);
+            @list($key, $time) = explode(':',$SESSION->mnet_confirm_delete_key);
             $MNET->get_private_key();
 
             if($time < time() - 60) {

admin/module.php

@@ -10,7 +10,7 @@
         $module = optional_param('module', '', PARAM_SAFEDIR);
 
         if (!confirm_sesskey()) {
-            error(get_string('confirmsesskeybad', 'error'));
+            print_error('confirmsesskeybad', 'error');
         }
 
         if ($module != '') {

auth/cas/cas_ldap_sync_users.php

@@ -27,7 +27,7 @@
     exit;
 }
 
-$nomoodlecookie = true; // cookie not needed
+define('NO_MOODLE_COOKIES', true);
 
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 

auth/db/auth_db_sync_users.php

@@ -27,7 +27,7 @@
     exit;
 }
 
-$nomoodlecookie = true; // cookie not needed
+define('NO_MOODLE_COOKIES', true);
 
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 

auth/ldap/auth.php

@@ -1764,7 +1764,7 @@ function loginpage_hook() {
      *
      * NOTE that this code will execute under the OS user credentials, 
      * so we MUST avoid dealing with files -- such as session files.
-     * (The caller should set $nomoodlecookie before including config.php)
+     * (The caller should define('NO_MOODLE_COOKIES', true) before including config.php)
      *
      */
     function ntlmsso_magic($sesskey) {

auth/ldap/auth_ldap_sync_users.php

@@ -26,7 +26,7 @@
     exit;
 }
 
-$nomoodlecookie = true; // cookie not needed
+define('NO_MOODLE_COOKIES', true);
 
 require_once(dirname(dirname(dirname(__FILE__))).'/config.php'); // global moodle config file.
 

auth/ldap/ntlmsso_magic.php

@@ -4,7 +4,7 @@
 // as we will be executing under the OS security
 // context of the user we are trying to login, rather than
 // of the webserver.
-$nomoodlecookie=true;
+define('NO_MOODLE_COOKIES', true);
 
 require_once(dirname(dirname(dirname(__FILE__)))."/config.php");
 

auth/shibboleth/index.php

@@ -43,7 +43,7 @@
             update_user_login_times();
 
             // Don't show username on login page
-            set_moodle_cookie('nobody');
+            $SESSION->set_moodle_cookie('nobody');
 
             set_login_session_preferences();
 

auth/shibboleth/login.php

@@ -38,8 +38,8 @@
     $loginurl = (!empty($CFG->alternateloginurl)) ? $CFG->alternateloginurl : '';
 
 
-    if (get_moodle_cookie() == '') {   
-        set_moodle_cookie('nobody');   // To help search for cookies
+    if ($SESSION->get_moodle_cookie() == '') {   
+        $SESSION->set_moodle_cookie('nobody');   // To help search for cookies
     }
 
     if (!empty($CFG->registerauth) or is_enabled_auth('none') or !empty($CFG->auth_instructions)) {