mnet: better descriptions and warnings in admin pages

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 0d08c2a3a74ca1dfe57bbaf41c587c38a1cd2edc..b2acb10b86419175cdeef033046242ea1252525f 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -120,7 +120,29 @@ if ($form = data_submitted() and confirm_sesskey()) {
     exit;
 }
 
-
+// Explain
+print_box(get_string('ssoacldescr','mnet'));
+// Are the needed bits enabled?
+$warn = '';
+if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+    $warn = '<p>' . get_string('mnetdisabled','mnet') .'</p>';
+}
+if (empty($CFG->auth_plugins_enabled)) {
+    $warn .= '<p>' .  get_string('authmnetdisabled','mnet').'</p>';
+} else {
+    $auths = explode(',', $CFG->auth_plugins_enabled);
+    if (!in_array('mnet', $auths)) {
+        $warn .= '<p>' .  get_string('authmnetdisabled','mnet').'</p>';
+    }
+    unset($auths);
+}
+if (get_config('auth/mnet', 'auto_add_remote_users') != true) {
+    $warn .= '<p>' .  get_string('authmnetautoadddisabled','mnet').'</p>';
+}
+if (!empty($warn)) {
+    $warn = '<p>' .  get_string('ssoaclneeds','mnet').'</p>' . $warn;
+    print_box($warn);
+}
 // output the ACL table
 $columns = array("username", "mnet_host_id", "access", "delete");
 $headings = array();

diff --git a/admin/mnet/peers.html b/admin/mnet/peers.html
index 5578f8b4160f4a13eaa814afa358b2f27f678f73..67326625f7bff1c9643f4ac867500c4dc229fcb1 100644 (file)
--- a/admin/mnet/peers.html
+++ b/admin/mnet/peers.html
@@ -1,5 +1,9 @@
 <?php
 admin_externalpage_print_header($adminroot);
+
+if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+    print_box(get_string('mnetdisabled','mnet'));
+}
 ?>
 <center>
 <form  method="post" action="peers.php">

diff --git a/auth/mnet/config.html b/auth/mnet/config.html
index f8728cac1d818453aaeb09ababc9f413483060e4..8e6930d7656dcd65e08bc01b155b42910081063c 100644 (file)
--- a/auth/mnet/config.html
+++ b/auth/mnet/config.html
@@ -10,6 +10,10 @@ if (!isset ($config->auto_add_remote_users)) {
 
 $yesno = array(get_string('no'), get_string('yes'));
 
+if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+    print_box(get_string('mnetdisabled','mnet'));
+}
+
 ?>
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 

diff --git a/enrol/mnet/config.html b/enrol/mnet/config.html
index c07ac73820cc6032423c998b96dedac072b9f94c..90d53c6c77ed70fc6971b8fe36b242878539c013 100644 (file)
--- a/enrol/mnet/config.html
+++ b/enrol/mnet/config.html
@@ -1,3 +1,10 @@
+<?php
+
+if (empty($CFG->mnet_mode) || $CFG->mnet_mode !== 'strict') {
+    print_box(get_string('mnetdisabled','mnet'));
+}
+
+?>
 <table cellspacing="0" cellpadding="5" border="0" align="center">
 
 <tr valign="top">

diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php
index 1ddf54ec48675d2c3007870eaa999edbf1ef7a24..5d1f34d03e3be7dd5229ddeeacb2b73886078f0f 100644 (file)
--- a/lang/en_utf8/mnet.php
+++ b/lang/en_utf8/mnet.php
@@ -9,8 +9,15 @@ $string['settings']                     = 'Settings';
 $string['hostsettings']                 = 'Host Settings';
 $string['mnetpeers']                    = 'Moodle network peers';
 $string['mnetservices']                 = 'Moodle network services';
-$string['trustedhosts']                 = 'Trusted Hosts';
-$string['trustedhostsexplain']          = 'Please enter a list of IP addresses or networks, one on each line. Some examples:<br />'.
+$string['trustedhosts']                 = 'Trusted Hosts for XML-RPC';
+$string['trustedhostsexplain']          = '<p>The trusted hosts mechanism allows specific machines to
+                                           execute calls via XML-RPC to any part of the Moodle API. This
+                                           available for scripts to control Moodle behaviour and can be
+                                           a very dangerous option to enable. If in doubt, keep it off.</p>
+                                           <p>This is <strong>not</strong> needed for Moodle Networking.</p>
+                                           <p>To enable it, enter a list of IP addresses or networks, 
+                                           one on each line. 
+                                           Some examples:</p>'.
                                           'Your local host:<br />'.
                                           '127.0.0.1<br />'.
                                           'Your local host (with a network block):<br />'.
@@ -21,7 +28,7 @@ $string['trustedhostsexplain']          = 'Please enter a list of IP addresses o
                                           '192.168.0.0/24<br />'.
                                           'Any host whatsoever:<br />'.
                                           '192.168.0.0/0<br />'.
-                                          'Obviously the last example is not a recommended configuration.';
+                                          'Obviously the last example is <strong>not</strong> a recommended configuration.';
 $string['otherenrolledusers']           = 'Other enrolled users';
 $string['hideremote']                   = 'Hide remote users';
 $string['showremote']                   = 'Show remote users';
@@ -78,8 +85,9 @@ $string['testtrustedhostsexplain']      = 'Enter an IP address to see if it is a
 $string['forbidden-function']           = 'That function has not been enabled for RPC.';
 $string['forbidden-transport']          = 'The transport method you are trying to use is not permitted.';
 
-$string['registerallhosts']             = 'Register all hosts';
-$string['registerallhostsexplain']      = 'You can choose to register all hosts that try to connect to you. This means that a record will appear in your hosts list for any '.
+$string['registerallhosts']             = 'Register all hosts (<em>Hub mode</em>)';
+$string['registerallhostsexplain']      = 'You can choose to register all hosts that try to connect to you automatically. 
+                                           This means that a record will appear in your hosts list for any '.
                                           'Moodle site that connects to you and requests your public key.<br />'.
                                           'You have the option below to configure services for \'All Hosts\' and by enabling some services there, you are able to provide '.
                                           'services to any Moodle server indiscriminately.';
@@ -197,4 +205,9 @@ $string['authmnetdisabled'] = 'Moodle Networking authentication is disabled.';
 $string['unknownerror'] = 'Unknown error occurred during negotiation.';
 $string['nolocaluser'] = 'No local record exists for remote user.';
 $string['databaseerror'] = 'Could not write details to the database.';
+$string['ssoacldescr'] = 'Use this page to grant/deny access to specific users from remote Moodle Network hosts. This is functional when you are offering SSO services to remote users. To control your <em>local</em> users\' ability to roam to other Moodle Network hosts, use the roles system to grant them the <em>mnetcanroam</em> capability.';
+$string['ssoaclneeds'] = 'For this functionality to work, you must have Moodle Networking On, plus the Moodle Network authentication plugin enabled with auto-add users enabled .';
+$string['mnetdisabled'] = 'Moodle Network is <strong>disabled</strong>.';
+$string['authmnetdisabled'] = 'Moodle Networking <em>Authentication plugin</em>is <strong>disabled</strong>.';
+$string['authmnetautoadddisabled'] = '<em>Auto-add users</em> in Moodle Networking Authentication plugin is <strong>disabled</strong>.';
 ?>