Better errors that lead to the wiki for more help MDL-8068

diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 2d86273d8f1b50422c8dc9d06591b9533252fc8b..284ab76b0e96f1dae2b465ea8fb7edfdec8d40ff 100644 (file)
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -1,4 +1,4 @@
-<?php
+<?php // $Id$
 
 // Allows the admin to control user logins from remote moodles.
 
@@ -15,13 +15,14 @@ $action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
 require_login();
 $adminroot = admin_get_root();
 
-if (!extension_loaded('openssl')) {
-    error(get_string('requiresopenssl', 'mnet'));
-}
 
 admin_externalpage_setup('ssoaccesscontrol', $adminroot);
 admin_externalpage_print_header($adminroot);
 
+if (!extension_loaded('openssl')) {
+    print_error('requiresopenssl', 'mnet', '', NULL, true);
+}
+
 $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
 $sesskey = sesskey();
 $formerror = array();

diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index 53aa1f56818725755c2eba87f7e3f14933095ddc..91a6fea7c17860f9ce8ee19de153452d58482aaf 100644 (file)
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -14,16 +14,20 @@
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
-    if (!$site = get_site()) {
-        error(get_string('nosite','mnet'));
+
+    if (!extension_loaded('openssl')) {
+        admin_externalpage_print_header($adminroot);
+        print_error('requiresopenssl', 'mnet', '', NULL, true);
     }
 
-    if (!function_exists('curl_init') ) {
-        error(get_string('nocurl','mnet'));
+    if (!$site = get_site()) {
+        admin_externalpage_print_header($adminroot);
+        print_error('nosite', 'mnet', '', NULL, true);
     }
 
-    if (!extension_loaded('openssl')) {
-        error(get_string('requiresopenssl', 'mnet'));
+    if (!function_exists('curl_init') ) {
+        admin_externalpage_print_header($adminroot);
+        print_error('nocurl', 'mnet', '', NULL, true);
     }
 
     if (!isset($CFG->mnet_dispatcher_mode)) set_config('mnet_dispatcher_mode', 'off');

diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
index a88d5df057f2efe893e972b00a344dd5244b92e5..f2a9a9d8f30d36f620ba1375c3e419f3a3938c36 100644 (file)
--- a/admin/mnet/peers.php
+++ b/admin/mnet/peers.php
@@ -14,16 +14,19 @@ $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
 
 require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
-if (!$site = get_site()) {
-    error(get_string('nosite','mnet'));
+if (!extension_loaded('openssl')) {
+    admin_externalpage_print_header($adminroot);
+    print_error('requiresopenssl', 'mnet', '', NULL, true);
 }
 
-if (!function_exists('curl_init') ) {
-    error(get_string('nocurl','mnet'));
+if (!$site = get_site()) {
+    admin_externalpage_print_header($adminroot);
+    print_error('nosite', 'mnet', '', NULL, true);
 }
 
-if (!extension_loaded('openssl')) {
-    error(get_string('requiresopenssl', 'mnet'));
+if (!function_exists('curl_init') ) {
+    admin_externalpage_print_header($adminroot);
+    print_error('nocurl', 'mnet', '', NULL, true);
 }
 
 /// Initialize variables.
@@ -130,4 +133,4 @@ if (($form = data_submitted()) && confirm_sesskey()) {
     if (empty($hosts)) $hosts = array();
     include('./peers.html');
 }
-?>
\ No newline at end of file
+?>

diff --git a/admin/mnet/trustedhosts.php b/admin/mnet/trustedhosts.php
index 4e91d7dbaf6305a002663aefa53ada031e3a92b1..ffc871917d5c1836923accf98cd13a57adfae4ff 100644 (file)
--- a/admin/mnet/trustedhosts.php
+++ b/admin/mnet/trustedhosts.php
@@ -13,12 +13,14 @@
 
     require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
-    if (!$site = get_site()) {
-        error(get_string('nosite','mnet'));
-    }
-
     if (!extension_loaded('openssl')) {
-        error(get_string('requiresopenssl', 'mnet'));
+        admin_externalpage_print_header($adminroot);
+        print_error('requiresopenssl', 'mnet', '', NULL, true);
+    }
+    
+    if (!$site = get_site()) {
+        admin_externalpage_print_header($adminroot);
+        print_error('nosite', 'mnet', '', NULL, true);
     }
 
     $trusted_hosts = '';//array();