grade MDL-19797 Upgraded deprecated function calls

diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php
index 6eac4a8979b9aa7bb4317029c9e99be7fa49b9d3..91b900a02e558270bfc40b30e5504ea006ad51a3 100644 (file)
--- a/grade/edit/tree/index.php
+++ b/grade/edit/tree/index.php
@@ -98,7 +98,7 @@ if (has_capability('moodle/grade:manage', $context)) {
 // Change category aggregation if requested
 if (!is_null($category) && !is_null($aggregationtype) && confirm_sesskey()) {
     if (!$grade_category = grade_category::fetch(array('id'=>$category, 'courseid'=>$courseid))) {
-        error('Incorrect category id!');
+        print_error('invalidcategoryid');
     }
     $data->aggregation = $aggregationtype;
     grade_category::set_properties($grade_category, $data);

diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php
index 474d22f9bb9a5f9a92ec9498d0fe7c7f01af5b05..9a46270c2188fb28797b763c04e71f7eed0b5e5b 100644 (file)
--- a/grade/report/overview/index.php
+++ b/grade/report/overview/index.php
@@ -38,7 +38,7 @@ if (empty($userid)) {
 
 } else {
     if (!$DB->get_record('user', array('id'=>$userid, 'deleted'=>0)) or isguestuser($userid)) {
-        error("Incorrect userid");
+        print_error('invaliduserid');
     }
 }
 
@@ -62,7 +62,7 @@ if (has_capability('moodle/grade:viewall', $systemcontext)) {
 
 if (!$access) {
     // no access to grades!
-    error("Can not view grades.", $CFG->wwwroot.'/course/view.php?id='.$courseid); //TODO: localize
+    print_error('nopermissiontoviewgrades', 'error',  $CFG->wwwroot.'/course/view.php?id='.$courseid);
 }
 
 /// return tracking object

diff --git a/grade/report/user/index.php b/grade/report/user/index.php
index ac3be56c4b32b5223237756835b7cbe84b9a5fcf..bc04b6e95418cfe5730aa8d11de04f98cd5567d6 100644 (file)
--- a/grade/report/user/index.php
+++ b/grade/report/user/index.php
@@ -57,7 +57,7 @@ if (has_capability('moodle/grade:viewall', $context)) {
 
 if (!$access) {
     // no access to grades!
-    error("Can not view grades.", $CFG->wwwroot.'/course/view.php?id='.$courseid); //TODO: localize
+    print_error('nopermissiontoviewgrades', 'error',  $CFG->wwwroot.'/course/view.php?id='.$courseid);
 }
 
 /// return tracking object

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index e19b07390673a55bfece4b1d4c19e0eaa0362e4e..e97465349993916653630e61b3cf368f30000113 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -355,6 +355,7 @@ $string['nopermissiontolock'] = 'No permission to lock!';
 $string['nopermissiontomkdir'] = 'Cannot create folder. The site administrator needs to fix the file permissions';
 $string['nopermissiontoshow'] = 'No permission to see this!';
 $string['nopermissiontounlock'] = 'No permission to unlock!';
+$string['nopermissiontoviewgrades'] = 'Can not view grades.';
 $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';