diff --git a/admin/auth.php b/admin/auth.php
index 61afb67c19f..41faab54ddc 100644
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -30,7 +30,7 @@ if (empty($CFG->auth)) {
}
if (!empty($auth) and !exists_auth_plugin($auth)) {
- error(get_string('pluginnotinstalled', 'auth', $auth), $url);
+ print_error('pluginnotinstalled', 'auth', $url, $auth);
}
////////////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ switch ($action) {
$key = array_search($auth, $authsenabled);
// check auth plugin is valid
if ($key === false) {
- error(get_string('pluginnotenabled', 'auth', $auth), $url);
+ print_error('pluginnotenabled', 'auth', $url, $auth);
}
// move down the list
if ($key < (count($authsenabled) - 1)) {
@@ -82,7 +82,7 @@ switch ($action) {
$key = array_search($auth, $authsenabled);
// check auth is valid
if ($key === false) {
- error(get_string('pluginnotenabled', 'auth', $auth), $url);
+ print_error('pluginnotenabled', 'auth', $url, $auth);
}
// move up the list
if ($key >= 1) {
diff --git a/admin/block.php b/admin/block.php
index d21218f23c7..f5165324e6d 100644
--- a/admin/block.php
+++ b/admin/block.php
@@ -31,7 +31,7 @@
if ($config = data_submitted()) {
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
if(!$block->has_config()) {
error('This block does not support global configuration');
diff --git a/admin/enrol.php b/admin/enrol.php
index 8e0cfdfd6bf..14b75d6b10d 100644
--- a/admin/enrol.php
+++ b/admin/enrol.php
@@ -18,7 +18,7 @@
if ($frm = data_submitted()) {
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
if (empty($frm->enable)) {
$frm->enable = array();
@@ -103,4 +103,4 @@
admin_externalpage_print_footer();
-?>
\ No newline at end of file
+?>
diff --git a/admin/enrol_config.php b/admin/enrol_config.php
index 6adca6d13c8..0ed836f7337 100644
--- a/admin/enrol_config.php
+++ b/admin/enrol_config.php
@@ -19,7 +19,7 @@
if ($frm = data_submitted()) {
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
if ($enrolment->process_config($frm)) {
redirect("enrol.php?sesskey=$USER->sesskey", get_string("changessaved"), 1);
diff --git a/admin/lang.php b/admin/lang.php
index 830c3e0863d..c02aa34b8d9 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -435,7 +435,7 @@
if (isset($_POST['currentfile'])){ // Save a file
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
$newstrings = array();
@@ -707,7 +707,7 @@
if (isset($_POST['currentfile'])) { // Save a file
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
if (lang_help_save_file($saveto, $currentfile, $_POST['filedata'])) {
notify(get_string("changessaved")." ($saveto/$currentfile)", "notifysuccess");
diff --git a/admin/langimport.php b/admin/langimport.php
index 2546bf290b8..80043340e60 100755
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -63,9 +63,9 @@
$a = new object();
$a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
$a->dest= $CFG->dataroot.'/lang';
- error(get_string($cd->get_error(), 'error', $a), 'langimport.php');
+ print_error($cd->get_error(), 'error', 'langimport.php', $a);
} else {
- error(get_string($cd->get_error(), 'error'), 'langimport.php');
+ print_error($cd->get_error(), 'error', 'langimport.php');
}
break;
@@ -198,9 +198,9 @@
$a = new stdClass();
$a->url = 'http://download.moodle.org/lang16/'.$pack.'.zip';
$a->dest= $CFG->dataroot.'/lang';
- error(get_string($cd->get_error(), 'error', $a)); // not probable
+ print_error($cd->get_error(), 'error', "", $a)); // not probable
} else {
- error(get_string($cd->get_error(), 'error')); // not probable
+ print_error($cd->get_error(), 'error'); // not probable
}
break;
case COMPONENT_UPTODATE:
diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php
index 9b3a34cebed..c8ac7cc81a4 100644
--- a/admin/mnet/access_control.php
+++ b/admin/mnet/access_control.php
@@ -19,7 +19,7 @@ admin_externalpage_setup('ssoaccesscontrol');
admin_externalpage_print_header();
if (!extension_loaded('openssl')) {
- print_error('requiresopenssl', 'mnet', '', NULL, true);
+ print_error('requiresopenssl', 'mnet');
}
$sitecontext = get_context_instance(CONTEXT_SYSTEM);
@@ -39,13 +39,13 @@ if (!empty($action) and confirm_sesskey()) {
// boot if insufficient permission
if (!has_capability('moodle/user:delete', $sitecontext)) {
- error(get_string('nomodifyacl','mnet'));
+ print_error('nomodifyacl','mnet');
}
// fetch the record in question
$id = required_param('id', PARAM_INT);
if (!$idrec = get_record('mnet_sso_access_control', 'id', $id)) {
- error(get_string('recordnoexists','mnet'), "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+ print_error('recordnoexists','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
}
switch ($action) {
@@ -60,7 +60,7 @@ if (!empty($action) and confirm_sesskey()) {
// require the access parameter, and it must be 'allow' or 'deny'
$accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
if ($accessctrl != 'allow' and $accessctrl != 'deny') {
- error(get_string('invalidaccessparam', 'mnet') , "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+ print_error('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
}
if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
@@ -84,7 +84,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
// check permissions and verify form input
if (!has_capability('moodle/user:delete', $sitecontext)) {
- error(get_string('nomodifyacl','mnet'), "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+ print_error('nomodifyacl','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
}
if (empty($form->username)) {
$formerror['username'] = get_string('enterausername','mnet');
diff --git a/admin/mnet/enr_course_enrol.php b/admin/mnet/enr_course_enrol.php
index 4ae894ee6bc..3cbd93db4a4 100644
--- a/admin/mnet/enr_course_enrol.php
+++ b/admin/mnet/enr_course_enrol.php
@@ -7,7 +7,7 @@
include_once($CFG->dirroot.'/mnet/xmlrpc/client.php');
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
admin_externalpage_setup('mnetenrol');
diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php
index 8735ecc9db9..79aad8fa06f 100644
--- a/admin/mnet/enr_courses.php
+++ b/admin/mnet/enr_courses.php
@@ -6,7 +6,7 @@
require_once($CFG->libdir.'/adminlib.php');
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
index d3ba9fb7ef9..60579966cd5 100644
--- a/admin/mnet/peers.php
+++ b/admin/mnet/peers.php
@@ -15,17 +15,17 @@ require_capability('moodle/site:config', $context, $USER->id, true, "nopermissio
if (!extension_loaded('openssl')) {
admin_externalpage_print_header();
- print_error('requiresopenssl', 'mnet', '', NULL, true);
+ print_error('requiresopenssl', 'mnet');
}
if (!$site = get_site()) {
admin_externalpage_print_header();
- print_error('nosite', '', '', NULL, true);
+ print_error('nosite', '');
}
if (!function_exists('curl_init') ) {
admin_externalpage_print_header();
- print_error('nocurl', 'mnet', '', NULL, true);
+ print_error('nocurl', 'mnet');
}
/// Initialize variables.
@@ -59,7 +59,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
if(!function_exists('xmlrpc_encode_request')) {
trigger_error("You must have xml-rpc enabled in your PHP build to use this feature.");
- error(get_string('xmlrpc-missing', 'mnet'),'peers.php');
+ print_error('xmlrpc-missing', 'mnet','peers.php');
exit;
}
@@ -82,7 +82,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
$temp_wwwroot = clean_param($form->wwwroot, PARAM_URL);
if ($temp_wwwroot !== $form->wwwroot) {
trigger_error("We now parse the wwwroot with PARAM_URL. Your URL will need to have a valid TLD, etc.");
- error(get_string("invalidurl", 'mnet'),'peers.php');
+ print_error("invalidurl", 'mnet','peers.php');
exit;
}
unset($temp_wwwroot);
@@ -103,7 +103,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
if (isset($form->public_key)) {
$form->public_key = clean_param($form->public_key, PARAM_PEM);
if (empty($form->public_key)) {
- error(get_string("invalidpubkey", 'mnet'),'peers.php?step=update&hostid='.$mnet_peer->id);
+ print_error("invalidpubkey", 'mnet', 'peers.php?step=update&hostid='.$mnet_peer->id);
exit;
} else {
$oldkey = $mnet_peer->public_key;
@@ -115,7 +115,8 @@ if (($form = data_submitted()) && confirm_sesskey()) {
foreach ($mnet_peer->error as $err) {
$errmsg .= $err['code'] . ': ' . $err['text'].'
';
}
- error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&hostid='.$mnet_peer->id);
+ //error(get_string("invalidpubkey", 'mnet') . $errmsg ,'peers.php?step=update&hostid='.$mnet_peer->id);
+ print_error("invalidpubkey", 'mnet', 'peers.php?step=update&hostid='.$mnet_peer->id, $errmsg);
exit;
}
}
@@ -124,7 +125,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
// PREVENT DUPLICATE RECORDS ///////////////////////////////////////////
if ('input' == $form->step) {
if ( isset($mnet_peer->id) && $mnet_peer->id > 0 ) {
- error(get_string("hostexists", 'mnet', $mnet_peer->id),'peers.php?step=update&hostid='.$mnet_peer->id);
+ print_error("hostexists", 'mnet', 'peers.php?step=update&hostid='.$mnet_peer->id, $mnet_peer->id);
}
}
diff --git a/admin/module.php b/admin/module.php
index 3b2c8cc99e9..e503b8292e0 100644
--- a/admin/module.php
+++ b/admin/module.php
@@ -10,7 +10,7 @@
$module = optional_param('module', '', PARAM_SAFEDIR);
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
if ($module != '') {
diff --git a/admin/register.php b/admin/register.php
index ce558f4824b..46a3e21a3d5 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -12,7 +12,7 @@
}
if (!confirm_sesskey()) {
- error(get_string('confirmsesskeybad', 'error'));
+ print_error('confirmsesskeybad', 'error');
}
if (!$admin = get_admin()) {
diff --git a/admin/report/courseoverview/index.php b/admin/report/courseoverview/index.php
index b4651036c49..eab091a97ba 100644
--- a/admin/report/courseoverview/index.php
+++ b/admin/report/courseoverview/index.php
@@ -43,7 +43,7 @@
$timeoptions = stats_get_time_options($now,$lastweekend,$lastmonthend,$earliestday,$earliestweek,$earliestmonth);
if (empty($timeoptions)) {
- error(get_string('nostatstodisplay'), $CFG->wwwroot.'/course/view.php?id='.$course->id);
+ print_error('nostatstodisplay', "", $CFG->wwwroot.'/course/view.php?id='.$course->id);
}
echo '