Rename the 'promiscous' mode to 'dangerous' as promiscuous is used elsewhere.

diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index d761acb9d415a860e71efa538e056bade0514c0f..ee017d9bfa1799c66fe1db6fbf7319e022dc4141 100644 (file)
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -39,7 +39,7 @@
 /// If data submitted, process and store
     if (($form = data_submitted()) && confirm_sesskey()) {
         if (!empty($form->submit) && $form->submit == get_string('savechanges')) {
-            if (in_array($form->mode, array("off", "strict", "promiscuous"))) {
+            if (in_array($form->mode, array("off", "strict", "dangerous"))) {
                 if (set_config('mnet_dispatcher_mode', $form->mode)) {
                     redirect('index.php', get_string('changessaved'));
                 } else {

diff --git a/mnet/lib.php b/mnet/lib.php
index ef714e49d1d5fe27854b5dd05c5b27ab5fc65aad..c7a95bd61e625bbf8d0f6b3ce0c0d04b7475b6c5 100644 (file)
--- a/mnet/lib.php
+++ b/mnet/lib.php
@@ -411,7 +411,7 @@ function mnet_permit_rpc_call($includefile, $functionname, $class=false) {
 
     $permissionobj = record_exists_sql($sql);
 
-    if ($permissionobj === false) {
+    if ($permissionobj === false && 'dangerous' != $CFG->mnet_dispatcher_mode) {
         return RPC_FORBIDDENMETHOD;
     }
 

diff --git a/mnet/xmlrpc/server.php b/mnet/xmlrpc/server.php
index d41fb0202b716fe77332eb771707961171f0abda..e24338e1e064eefa371dc9cf199012ffec85acbc 100644 (file)
--- a/mnet/xmlrpc/server.php
+++ b/mnet/xmlrpc/server.php
@@ -468,7 +468,7 @@ function mnet_server_dispatch($payload) {
         }
 
     ////////////////////////////////////// STRICT MOD/*
-    } elseif ($callstack[0] == 'mod' || 'promiscuous' == $CFG->mnet_dispatcher_mode) {
+    } elseif ($callstack[0] == 'mod' || 'dangerous' == $CFG->mnet_dispatcher_mode) {
         list($base, $module, $filename, $functionname) = $callstack;
 
     ////////////////////////////////////// STRICT MOD/*
@@ -478,8 +478,8 @@ function mnet_server_dispatch($payload) {
             $response = mnet_server_prepare_response($response);
             echo $response;
 
-    ////////////////////////////////////// PROMISCUOUS
-        } elseif ('promiscuous' == $CFG->mnet_dispatcher_mode && $MNET_REMOTE_CLIENT->plaintext_is_ok()) {
+    ////////////////////////////////////// DANGEROUS
+        } elseif ('dangerous' == $CFG->mnet_dispatcher_mode && $MNET_REMOTE_CLIENT->plaintext_is_ok()) {
 
             $functionname = array_pop($callstack);
             $filename     = array_pop($callstack);