"MDL-14129, fix print_error"

diff --git a/grade/edit/letter/edit.php b/grade/edit/letter/edit.php
index e93a8e125b9994d876d301809d1145bc20d343e5..5b03853cc2017c5f62fb1f27372bf70e402c7316 100644 (file)
--- a/grade/edit/letter/edit.php
+++ b/grade/edit/letter/edit.php
@@ -32,7 +32,7 @@ require_once 'edit_form.php';
 $contextid = optional_param('id', SYSCONTEXTID, PARAM_INT);
 
 if (!$context = get_context_instance_by_id($contextid)) {
-    print_error('Incorrect context id');
+    print_error('invalidcourseid');
 }
 
 if ($context->contextlevel == CONTEXT_SYSTEM or $context->contextlevel == CONTEXT_COURSECAT) {
@@ -49,7 +49,7 @@ if ($context->contextlevel == CONTEXT_SYSTEM or $context->contextlevel == CONTEX
     $returnurl = $CFG->wwwroot.'/grade/edit/letter/index.php?id='.$context->instanceid;
 
 } else {
-    print_error('Incorrect context level');
+    print_error('invalidcourselevel');
 }
 
 require_capability('moodle/grade:manageletters', $context);

diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php
index 310159d154ab42af65ca0df19864a18c0cb1eca0..20dc880513deb86566c1729445b253c01654bd1c 100644 (file)
--- a/grade/edit/letter/index.php
+++ b/grade/edit/letter/index.php
@@ -37,7 +37,7 @@ require_login($course);
 $context = get_context_instance(CONTEXT_COURSE, $course->id);
 
 if (!has_capability('moodle/grade:manage', $context) and !has_capability('moodle/grade:manageletters', $context)) {
-    print_error('Missing permission to view letter grades');
+    print_error('nopermissiontoviewletergrade');
 }
 
 $gpr = new grade_plugin_return(array('type'=>'edit', 'plugin'=>'letter', 'courseid'=>$courseid));

diff --git a/grade/edit/scale/edit.php b/grade/edit/scale/edit.php
index 26b700e468fa3b60dfdbca7c95305dcfc6ef8ca4..b2c34a88fa9c83001c6e7992313fcedaae2505d0 100644 (file)
--- a/grade/edit/scale/edit.php
+++ b/grade/edit/scale/edit.php
@@ -37,12 +37,12 @@ $systemcontext = get_context_instance(CONTEXT_SYSTEM);
 if ($id) {
     /// editing existing scale
     if (!$scale_rec = get_record('scale', 'id', $id)) {
-        print_error('Incorrect scale id');
+        print_error('invalidscaleid');
     }
     if ($scale_rec->courseid) {
         $scale_rec->standard = 0;
         if (!$course = get_record('course', 'id', $scale_rec->courseid)) {
-            print_error('Incorrect course id');
+            print_error('invalidcourseid');
         }
         require_login($course);
         $context = get_context_instance(CONTEXT_COURSE, $course->id);
@@ -51,7 +51,7 @@ if ($id) {
     } else {
         if ($courseid) {
             if (!$course = get_record('course', 'id', $courseid)) {
-                print_error('Incorrect course id');
+                print_error('invalidcourseid');
             }
         }
         $scale_rec->standard = 1;

diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php
index 0a950e26df6a0730bcde0a6d2c08fe6e62e100b2..7392baec6abed567a675ef875b74370e43c6e8ca 100644 (file)
--- a/grade/edit/scale/index.php
+++ b/grade/edit/scale/index.php
@@ -76,7 +76,7 @@ switch ($action) {
         if (empty($scale->courseid)) {
             require_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM));
         } else if ($scale->courseid != $courseid) {
-            print_error('Incorrect courseid!');
+            print_error('invalidcourseid');
         }
 
         if (!$scale->can_delete()) {

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index 72ad98f82cb368a8d784150fa22f9c425aadd66c..a56180f67fa5109463fa1a9767612414c0b555ef 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -121,6 +121,7 @@ $string['invalidargorconf'] = 'No valid arguments supplied or incorrect server c
 $string['invalidaccessparameter'] = 'Invalid access parameter.';
 $string['invalidcourse'] = 'Invalid course';
 $string['invalidcourseid'] = 'You are tring to use an invalid course ID: ($a)';
+$string['invalidcourselevel'] = 'Incorrect context level';
 $string['invalidcoursemodule'] = 'Invalid course module ID';
 $string['invalidcontext'] = 'Invalid context';
 $string['invaliddata'] = 'Data submitted is invalid.';
@@ -143,6 +144,7 @@ $string['invalidpaymentmethod'] = 'Invalid payment method: $a';
 $string['invalidrequest'] = 'Invalid request';
 $string['invalidrole'] = 'Invalid role';
 $string['invalidshortname'] = 'That\'s an invalid short course name';
+$string['invalidscaleid'] = 'Incorrect scale id';
 $string['invalidurl'] = 'Invalid url';
 $string['invaliduser'] = 'Invalid user';
 $string['invaliduserid'] = 'Invalid user id';
@@ -193,6 +195,7 @@ $string['nopermissions'] = 'Sorry, but you do not currently have permissions to
 $string['nopermissiontomkdir'] = 'Cannot create folder. The site administrator needs to fix the file permissions';
 $string['nopermissiontoimportact'] = 'You do not have the required permissions to import activities to this course';
 $string['nopermissiontoviewpage'] = 'You are not allowed to look at this page';
+$string['nopermissiontoviewletergrade'] = 'Missing permission to view letter grades';
 $string['nopermissiontomanagegroup'] = 'You do not have the required permissions to manage groups.';
 $string['nosite'] = 'No sites';
 $string['nositeid'] = 'No site ID';