From: skodak Date: Thu, 21 Aug 2008 20:43:25 +0000 (+0000) Subject: MDL-16163 disable mnet scripts properly if mnet not enabled X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=600be0625e51e7189f3987edc4c7f624b28cdcae;p=moodle.git MDL-16163 disable mnet scripts properly if mnet not enabled --- diff --git a/mnet/publickey.php b/mnet/publickey.php index 7ed80c7293..725c631483 100644 --- a/mnet/publickey.php +++ b/mnet/publickey.php @@ -10,6 +10,11 @@ require_once(dirname(dirname(__FILE__)) . '/config.php'); require_once $CFG->dirroot.'/mnet/lib.php'; + +if ($CFG->mnet_dispatcher_mode === 'off') { + print_error('mnetdisabled', 'mnet'); +} + header("Content-type: text/plain"); $keypair = mnet_get_keypair(); echo $keypair['certificate']; diff --git a/mnet/testclient.php b/mnet/testclient.php index c97cfd9b68..9c0bb57121 100644 --- a/mnet/testclient.php +++ b/mnet/testclient.php @@ -13,6 +13,10 @@ require_once(dirname(dirname(__FILE__)) . '/config.php'); require_once $CFG->dirroot.'/mnet/xmlrpc/client.php'; +if ($CFG->mnet_dispatcher_mode === 'off') { + print_error('mnetdisabled', 'mnet'); +} + // Site admins only, thanks. $context = get_context_instance(CONTEXT_SYSTEM); require_capability('moodle/site:config', $context); diff --git a/mnet/xmlrpc/server.php b/mnet/xmlrpc/server.php index 8aa821c180..c937003d61 100644 --- a/mnet/xmlrpc/server.php +++ b/mnet/xmlrpc/server.php @@ -18,6 +18,10 @@ ini_set('display_errors',0); require_once $CFG->dirroot.'/mnet/lib.php'; require_once $CFG->dirroot.'/mnet/remote_client.php'; +if ($CFG->mnet_dispatcher_mode === 'off') { + print_error('mnetdisabled', 'mnet'); +} + // Content type for output is not html: header('Content-type: text/xml; charset=utf-8');