"MDL-14129, fix print_error"

diff --git a/grade/export/key.php b/grade/export/key.php
index 4fc2abcb84f40560e75a38b46d354f322bdd4f55..a01141ca9f968d3d3a3ea27423e64b86aba9fd15 100644 (file)
--- a/grade/export/key.php
+++ b/grade/export/key.php
@@ -34,22 +34,22 @@ $confirm  = optional_param('confirm', 0, PARAM_BOOL);
 
 if ($id) {
     if (!$key = get_record('user_private_key', 'id', $id)) {
-        print_error('Group ID was incorrect');
+        print_error('invalidgroupid');
     }
     if (empty($courseid)) {
         $courseid = $key->instance;
 
     } else if ($courseid != $key->instance) {
-        print_error('Course ID was incorrect');
+        print_error('invalidcourseid');
     }
 
     if (!$course = get_record('course', 'id', $courseid)) {
-        print_error('Course ID was incorrect');
+        print_error('invalidcourseid');
     }
 
 } else {
     if (!$course = get_record('course', 'id', $courseid)) {
-        print_error('Course ID was incorrect');
+        print_error('invalidcourseid');
     }
     $key = new object();
 }
@@ -62,7 +62,7 @@ require_capability('moodle/grade:export', $context);
 
 // extra security check
 if (!empty($key->userid) and $USER->id != $key->userid) {
-    print_error('You are not owner of this key');
+    print_error('notownerofkey');
 }
 
 $returnurl = $CFG->wwwroot.'/grade/export/keymanager.php?id='.$course->id;

diff --git a/grade/export/ods/dump.php b/grade/export/ods/dump.php
index 8f40b6269598af9d9754b2e46fce60e3763b9755..d2db33dd49e91a8babcab754c5146cbb85dd8630 100644 (file)
--- a/grade/export/ods/dump.php
+++ b/grade/export/ods/dump.php
@@ -34,7 +34,7 @@ if (!$course = get_record('course', 'id', $id)) {
 require_user_key_login('grade/export', $id); // we want different keys for each course
 
 if (empty($CFG->gradepublishing)) {
-    print_error('Grade publishing disabled');
+    print_error('gradepubdisable');
 }
 
 $context = get_context_instance(CONTEXT_COURSE, $id);

diff --git a/grade/export/txt/dump.php b/grade/export/txt/dump.php
index 9897cc152b671bdfc71f6816d259347abcd72fc9..6117d54445da469d536f9fd1d8c4beda150135ed 100644 (file)
--- a/grade/export/txt/dump.php
+++ b/grade/export/txt/dump.php
@@ -34,7 +34,7 @@ if (!$course = get_record('course', 'id', $id)) {
 require_user_key_login('grade/export', $id); // we want different keys for each course
 
 if (empty($CFG->gradepublishing)) {
-    print_error('Grade publishing disabled');
+    print_error('gradepubdisable');
 }
 
 $context = get_context_instance(CONTEXT_COURSE, $id);

diff --git a/grade/export/xls/dump.php b/grade/export/xls/dump.php
index 7139e2f6cc080351d9339a5a38f33aef7cc16775..223f4192cc56b794aa361f38a0c8e7d63326b49f 100644 (file)
--- a/grade/export/xls/dump.php
+++ b/grade/export/xls/dump.php
@@ -34,7 +34,7 @@ if (!$course = get_record('course', 'id', $id)) {
 require_user_key_login('grade/export', $id); // we want different keys for each course
 
 if (empty($CFG->gradepublishing)) {
-    print_error('Grade publishing disabled');
+    print_error('gradepubdisable');
 }
 
 $context = get_context_instance(CONTEXT_COURSE, $id);

diff --git a/grade/export/xml/dump.php b/grade/export/xml/dump.php
index 68a7aadd62a54f070c3f17b03bf97c012d18d194..8d3255e3f887f37b30c024432590e8406405d954 100644 (file)
--- a/grade/export/xml/dump.php
+++ b/grade/export/xml/dump.php
@@ -34,7 +34,7 @@ if (!$course = get_record('course', 'id', $id)) {
 require_user_key_login('grade/export', $id); // we want different keys for each course
 
 if (empty($CFG->gradepublishing)) {
-    print_error('Grade publishing disabled');
+    print_error('gradepubdisable');
 }
 
 $context = get_context_instance(CONTEXT_COURSE, $id);

diff --git a/grade/export/xml/grade_export_xml.php b/grade/export/xml/grade_export_xml.php
index 2379929e1c1af5e8f4e90be2e3c0180d778584d9..e2552bac462b2f9cb5df81913318a9a6e2d47f20 100755 (executable)
--- a/grade/export/xml/grade_export_xml.php
+++ b/grade/export/xml/grade_export_xml.php
@@ -50,7 +50,7 @@ class grade_export_xml extends grade_export {
         make_upload_directory('temp/gradeexport', false);
         $tempfilename = $CFG->dataroot .'/temp/gradeexport/'. md5(sesskey().microtime().$downloadfilename);
         if (!$handle = fopen($tempfilename, 'w+b')) {
-            print_error("Could not create a temporary file into which to dump the XML data.");
+            print_error('cannotcreatetempdir');
             return false;
         }