mnet: $CFG->mnet_dispatcher_mode - ensure we set it on install and up…

…grade, silence warnings - MDL-8284
ralferlebach · Jan 24, 2007 · 36e6379 · 36e6379
1 parent 3efde7e
commit 36e6379
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -226,7 +226,8 @@
             }
 
             // 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
@@ -24,6 +24,10 @@ function 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) ) {