mnet: $CFG->mnet_dispatcher_mode - ensure we set it on install and upgrade, silence...

diff --git a/course/lib.php b/course/lib.php
index b796f34761aefebb45df26b2ea7e3f290338e76d..2af332fd024e6569b0f4d1bb3cad99abce34b449 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1836,7 +1836,7 @@ function print_my_moodle() {
     $courses  = get_my_courses($USER->id);
     $rhosts   = array();
     $rcourses = array();
-    if ($CFG->mnet_dispatcher_mode === 'strict') {
+    if (!empty($CFG->mnet_dispatcher_mode) && $CFG->mnet_dispatcher_mode==='strict') {
         $rcourses = get_my_remotecourses($USER->id);
         $rhosts   = get_my_remotehosts();
     }

diff --git a/login/index.php b/login/index.php
index 7399e8e71639b7e7cecf9bda8596b309f694d53c..936ded2c180b215e70917426c9abc20ad51ad27f 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -226,7 +226,8 @@ if ($authsequence[0] == 'cas' and !empty($CFG->cas_enabled)) {
             }
 
             // TODO: if the user failed to authenticate, check if the username corresponds to a remote mnet user
-            if ( $CFG->mnet_dispatcher_mode === 'strict'
+            if ( !empty($CFG->mnet_dispatcher_mode) 
+                 && $CFG->mnet_dispatcher_mode === 'strict'
                  && is_enabled_auth('mnet')) {
                 $errormsg .= get_string('loginlinkmnetuser', 'mnet', "mnet_email.php?u=$frm->username");
             }

diff --git a/mnet/environment.php b/mnet/environment.php
index 5b8e523e4e51468e6ce8af994e14fbe6286fc3cd..1fd7dda4c322ee102c7e3afe544df63b7968f9e8 100644 (file)
--- a/mnet/environment.php
+++ b/mnet/environment.php
@@ -24,6 +24,10 @@ class mnet_environment {
     function init() {
         global $CFG;
 
+        if (empty($CFG->mnet_dispatcher_mode)) {
+            set_config('mnet_dispatcher_mode', 'off');
+        }
+
         // Bootstrap the object data on first load.
         if (empty($CFG->mnet_localhost_id) ) {