mnet: check for the _right_ varname before warning about mnet being off

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index b2acb10b86419175cdeef033046242ea1252525f..debb9f04ce5189029cf8a39c5223aef69538046d 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -124,7 +124,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
 print_box(get_string('ssoacldescr','mnet'));
 // Are the needed bits enabled?
 $warn = '';
-if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
     $warn = '<p>' . get_string('mnetdisabled','mnet') .'</p>';
 }
 if (empty($CFG->auth_plugins_enabled)) {

diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html
index 67326625f7bff1c9643f4ac867500c4dc229fcb1..56a311d34b93bb8bd02142a3dc5130827b60bf53 100644 (file)
--- a/admin/mnet/peers.html
+++ b/admin/mnet/peers.html
@@ -1,7 +1,7 @@
 <?php
 admin_externalpage_print_header($adminroot);
 
-if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
     print_box(get_string('mnetdisabled','mnet'));
 }
 ?>

diff --git a/auth/mnet/config.html b/auth/mnet/config.html
index 8e6930d7656dcd65e08bc01b155b42910081063c..9848d9489d38ea675fa0f230c3325afe34d68902 100644 (file)
--- a/auth/mnet/config.html
+++ b/auth/mnet/config.html
@@ -10,7 +10,7 @@ if (!isset ($config->auto_add_remote_users)) {
 
 $yesno = array(get_string('no'), get_string('yes'));
 
-if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
     print_box(get_string('mnetdisabled','mnet'));
 }
 

diff --git a/enrol/mnet/config.html b/enrol/mnet/config.html
index d939e5f8c65f9b0147438852bea84d757bd24dd5..d6306593b74a5e32ccf4af2fcbd526f71f01f090 100644 (file)
--- a/enrol/mnet/config.html
+++ b/enrol/mnet/config.html
@@ -1,6 +1,6 @@
 <?php
 
-if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+if (empty($CFG->mnet_dispatcher_mode) || $CFG->mnet_dispatcher_mode !== 'strict') {
     print_box(get_string('mnetdisabled','mnet'));
 }