"MDL-14129, fix print_error"

diff --git a/lang/en_utf8/message.php b/lang/en_utf8/message.php
index c84a32736729e6d0805ea93b79a60e0e99f8a588..b2e7ec1a9895ea7506132475d6ae68cfaeae1884 100644 (file)
--- a/lang/en_utf8/message.php
+++ b/lang/en_utf8/message.php
@@ -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';

diff --git a/message/discussion.php b/message/discussion.php
index f690da706e5993a3a44c61968244f50c2adfb858..03b0243933f8c9247a3f92a2c974fed035a8e03f 100644 (file)
--- a/message/discussion.php
+++ b/message/discussion.php
@@ -10,7 +10,7 @@
     }
 
     if (empty($CFG->messaging)) {
-        print_error("Messaging is disabled on this site");
+        print_error('disabled', 'message');
     }
 
 /// Script parameters

diff --git a/message/history.php b/message/history.php
index 93b1d35eb776f8f34947d12d0f1e7f35d32865a6..ceef16619d80582ea73d29f975b9ab64751f2dbb 100644 (file)
--- a/message/history.php
+++ b/message/history.php
@@ -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

diff --git a/message/index.php b/message/index.php
index 70c43c16e5b9cf31fc2312df31ad16ba716b4b25..2b6fa7c330d81b5c35c78bf291ff2cc1a66fe365 100644 (file)
--- a/message/index.php
+++ b/message/index.php
@@ -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

diff --git a/message/refresh.php b/message/refresh.php
index ba478c16d47078ac603f44e060ff451971612a9c..5b098ec20f01385a9ae0c21b2beff1a2480f406e 100644 (file)
--- a/message/refresh.php
+++ b/message/refresh.php
@@ -11,7 +11,7 @@
     }
 
     if (empty($CFG->messaging)) {
-        print_error("Messaging is disabled on this site");
+        print_error('disabled', 'message');
     }
 
 /// Script parameters

diff --git a/message/send.php b/message/send.php
index e8b6ee0ef2a31156fad5d226acea49568be3a212..df52e462ec5e4b0d9c9c88311e3ec1296f194916 100644 (file)
--- a/message/send.php
+++ b/message/send.php
@@ -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!!

diff --git a/message/user.php b/message/user.php
index f30200f9d8c0ef697f3ad5eca0a434b640f40807..a722392002d4683a328e4107c4affa5d2f35d34f 100644 (file)
--- a/message/user.php
+++ b/message/user.php
@@ -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