mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

"MDL-14129, fix print_error"

Browse Source
This commit is contained in:
dongsheng 2008-05-08 06:27:28 +00:00
parent 54d8f804fa
commit 3db241b342
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/mnet/index.php
View File

@ -43,7 +43,7 @@
if (set_config('mnet_dispatcher_mode', $form->mode)) {
redirect('index.php', get_string('changessaved'));
} else {
print_error('Invalid action parameter.', '', 'index.php');
print_error('invalidaction', '', 'index.php');
}
}
} elseif (!empty($form->submit) && $form->submit == get_string('delete')) {

2
auth/ldap/ntlmsso_attempt.php
View File

@ -7,7 +7,7 @@ httpsrequired();
/// Define variables used in page
if (!$site = get_site()) {
print_error("No site found!");
print_error("siteisnotdefined");
}
$authsequence = get_enabled_auth_plugins(true); // auths, in sequence

2
auth/ldap/ntlmsso_finish.php
View File

@ -7,7 +7,7 @@ httpsrequired();
/// Define variables used in page
if (!$site = get_site()) {
print_error("No site found!");
print_error("siteisnotdefined", 'debug');
}
$authsequence = get_enabled_auth_plugins(true); // auths, in sequence

6
auth/mnet/auth.php
View File

@ -62,7 +62,7 @@ class auth_plugin_mnet extends auth_plugin_base {
* @return bool Authentication success or failure.
*/
function user_login($username, $password) {
return false; // print_error("Remote MNET users cannot login locally.");
return false; // print_error("mnetlocal");
}
/**
@ -273,7 +273,7 @@ class auth_plugin_mnet extends auth_plugin_base {
}
$message .= "ERROR $code:<br/>$errormessage<br/>";
}
print_error("RPC auth/mnet/user_authorise:<br/>$message");
print_error("rpcerror", '', '', $message");
}
unset($mnetrequest);
@ -372,7 +372,7 @@ class auth_plugin_mnet extends auth_plugin_base {
if (!$bool) {
// TODO: Jonathan to clean up mess
// Actually, this should never happen (modulo race conditions) - ML
print_error("updating user failed in mnet/auth/confirm_mnet_session ");
print_error("cannotupdateuser");
}
// set up the session

2
auth/mnet/jump.php
View File

@ -17,7 +17,7 @@ require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
require_login();
if (!is_enabled_auth('mnet')) {
print_error('mnet is disabled');
print_error('mnetdisable');
}
// grab the GET params - wantsurl could be anything - take it

2
auth/mnet/land.php
View File

@ -20,7 +20,7 @@ if (!$site = get_site()) {
}
if (!is_enabled_auth('mnet')) {
print_error('mnet is disabled');
print_error('mnetdisable');
}
// grab the GET params
$token = required_param('token', PARAM_BASE64);

2
auth/shibboleth/login.php
View File

@ -21,7 +21,7 @@ httpsrequired();
/// Define variables used in page
if (!$site = get_site()) {
print_error("No site found!");
print_error("siteisnotdefined", 'debug');
}
if (empty($CFG->langmenu)) {

5
lang/en_utf8/error.php
View File

@ -58,6 +58,7 @@ $string['cannotupdatecm'] = 'Could not update the course module with the correct
$string['cannotupdatelevel'] = 'Could not update the indent level on that course module';
$string['cannotupdaterole'] = 'Cannot update role!';
$string['cannotupdatemod'] = 'Could not update the $a';
$string['cannotupdateuser'] = 'updating user failed';
$stirng['cannotupdaterss'] = 'Cannot update rss';
$string['cannotupdatesummary'] = 'Could not update the summary!';
$string['cannotupdatesubcate'] = 'Could not update a child category!';
@ -149,6 +150,8 @@ $string['missingfield'] = 'Field \"$a\" is missing.';
$string['missingrequiredfield'] = 'Some required field is missing';
$string['mimetexisnotexist'] = 'Your system is not configured to run mimeTeX. You need to download the appropriate executable for you PHP_OS platform from <a href=\"http://moodle.org/download/mimetex/\">http://moodle.org/download/mimetex/</a>, or obtain the C source from <a href=\"http://www.forkosh.com/mimetex.zip\"> http://www.forkosh.com/mimetex.zip</a>, compile it and put the executable into your moodle/filter/tex/ directory.';
$string['mimetexnotexecutable'] = 'Custom mimetex is not executable!';
$string['mnetdisable'] = 'mnet is disabled';
$string['mnetlocal'] = 'Remote MNET users cannot login locally.';
$string['moduledoesnotexist'] = 'This module does not exist';
$string['moduleinstancedoesnotexist'] = 'The instance of this module does not exist';
$string['moduledisable'] = 'This module ($a) has been disabled for this particular course';
@ -187,7 +190,7 @@ $string['processingstops'] = 'Processing stops here. Remaining records ignored.'
$string['remotedownloaderror'] = 'Download of component to your server failed, please verify proxy settings, PHP cURL extension is highly recommended.<br /><br />You must download the <a href=\"$a->url\">$a->url</a> file manually, copy it to \"$a->dest\" in your server and unzip it there.';
$string['remotedownloadnotallowed'] = 'Download of components to your server isn\'t allowed (allow_url_fopen is disabled).<br /><br />You must download the <a href=\"$a->url\">$a->url</a> file manually, copy it to \"$a->dest\" in your server and unzip it there.';
$string['restricteduser'] = 'Sorry, but your current account \"$a\" is restricted from doing that.';
$string['rpcerror'] = 'RPC enrol/mnet/available_courses:<br/> ($a)';
$string['rpcerror'] = 'RPC enrol/mnet/available_courses: ($a)';
$string['scheduledbackupsdisabled'] = 'Scheduled backups have been disabled by the server admin';
$string['sectionnotexist'] = 'This section does not exist';
$string['sendmessage'] = 'Send Message';