L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"MDL-14129, fix print_error"

Browse Source
This commit is contained in:
dongsheng
2008-06-13 06:55:25 +00:00
parent 38eac4d5c3
commit f857fa9ff5
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en_utf8/message.php
+1
View File
@@ -17,6 +17,7 @@ $string['blocknoncontacts'] = 'Block all new messages from people who are not on
$string['contactlistempty'] = 'Your contact list is currently empty';
$string['contacts'] = 'Contacts';
$string['context'] = 'context';
$string['disabled'] = 'Messaging is disabled on this site';
$string['deletemessagesdays'] = 'Number of days before old messages are automatically deleted';
$string['discussion'] = 'Discussion';
$string['emailmessages'] = 'Email messages when I am offline';
message/discussion.php
+1 -1
View File
@@ -10,7 +10,7 @@
}
if (empty($CFG->messaging)) {
print_error("Messaging is disabled on this site");
print_error('disabled', 'message');
}
/// Script parameters
message/history.php
+3 -3
View File
@@ -11,19 +11,19 @@
}
if (empty($CFG->messaging)) {
print_error("Messaging is disabled on this site");
print_error('disabled', 'message');
}
/// Script parameters
$userid1 = required_param('user1', PARAM_INT);
if (! $user1 = $DB->get_record("user", array("id"=>$userid1))) { // Check it's correct
print_error("User ID 1 was incorrect");
print_error('invaliduserid');
}
if (has_capability('moodle/site:readallmessages', get_context_instance(CONTEXT_SYSTEM))) { // Able to see any discussion
$userid2 = optional_param('user2', $USER->id, PARAM_INT);
if (! $user2 = $DB->get_record("user", array("id"=>$userid2))) { // Check
print_error("User ID 2 was incorrect");
print_error('invaliduserid');
}
} else {
$userid2 = $USER->id; // Can only see messages involving yourself
message/index.php
+1 -1
View File
@@ -11,7 +11,7 @@
}
if (empty($CFG->messaging)) {
print_error("Messaging is disabled on this site");
print_error('disabled', 'message');
}
/// Optional variables that may be passed in
message/refresh.php
+1 -1
View File
@@ -11,7 +11,7 @@
}
if (empty($CFG->messaging)) {
print_error("Messaging is disabled on this site");
print_error('disabled', 'message');
}
/// Script parameters
message/send.php
+2 -2
View File
@@ -10,7 +10,7 @@ if (isguest()) {
}
if (empty($CFG->messaging)) {
print_error("Messaging is disabled on this site");
print_error('disabled', 'message');
}
if (has_capability('moodle/site:sendmessage', get_context_instance(CONTEXT_SYSTEM))) {
@@ -51,7 +51,7 @@ if (has_capability('moodle/site:sendmessage', get_context_instance(CONTEXT_SYSTE
/// Check the user we are talking to is valid
if (! $user = $DB->get_record('user', array('id'=>$userid))) {
print_error("User ID was incorrect");
print_error('invaliduserid');
}
/// Check that the user is not blocking us!!
message/user.php
+2 -2
View File
@@ -10,7 +10,7 @@
}
if (empty($CFG->messaging)) {
print_error("Messaging is disabled on this site");
print_error('disabled', 'message');
}
/// Script parameters
@@ -23,7 +23,7 @@
/// Check the user we are talking to is valid
if (! $user = $DB->get_record('user', array('id'=>$userid))) {
print_error("User ID was incorrect");
print_error('invaliduserid');
}
/// Possibly change some contacts if requested