"MDL-14129, fix print_error"

diff --git a/files/index.php b/files/index.php
index 5a820a37474304f070cbc43c465eefba83ff2210..a9f3e29cdcc3d9907e4d6b1df129e5d7dade1534 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -176,7 +176,7 @@
 
     if ($wdir == "/backupdata") {
         if (! make_upload_directory("$course->id/backupdata")) {   // Backup folder
-            print_error("nopermissiontomkdir");
+            print_error('cannotcreatebackupdir');
         }
     }
 

diff --git a/group/assign.php b/group/assign.php
index fb8bf24a5a0b52bf4af45951b026834979cb8cba..a4ef8bd12688711e5f8441524228c7aec09f3742 100644 (file)
--- a/group/assign.php
+++ b/group/assign.php
@@ -9,7 +9,7 @@ require_once('lib.php');
 $groupingid = required_param('id', PARAM_INT);
 
 if (!$grouping = get_record('groupings', 'id', $groupingid)) {
-    print_error('Incorrect group id');
+    print_error('invalidgroupid');
 }
 
 if (! $course = get_record('course', 'id', $grouping->courseid)) {

diff --git a/group/autogroup.php b/group/autogroup.php
index 642cbc2e2744fedfbe7012a43dd44e68f23b3e04..53cb1a8ee8999142d73359ea2524df86d2b18c07 100644 (file)
--- a/group/autogroup.php
+++ b/group/autogroup.php
@@ -19,7 +19,7 @@ if (!defined('AUTOGROUP_MIN_RATIO')) {
 $courseid = required_param('courseid', PARAM_INT);
 
 if (!$course = get_record('course', 'id', $courseid)) {
-    print_error('invalidcourse');
+    print_error('invalidcourseid');
 }
 
 // Make sure that the user has permissions to manage groups.
@@ -82,7 +82,7 @@ if ($editform->is_cancelled()) {
         case 'idnumber':
             $orderby = 'idnumber'; break;
         default:
-            print_error('Unknown ordering');
+            print_error('unknoworder');
     }
     $users = groups_get_potential_members($data->courseid, $data->roleid, $orderby);
     $usercnt = count($users);
@@ -255,4 +255,4 @@ if($preview !== '') {
 }
 
 print_footer($course);
-?>
\ No newline at end of file
+?>

diff --git a/group/group.php b/group/group.php
index 31f13cdebb1b827e97a6a5796de3d8e1b4d96170..89e55e6e45fc49219fa39b28613116650d62dd0e 100644 (file)
--- a/group/group.php
+++ b/group/group.php
@@ -21,23 +21,23 @@ $confirm  = optional_param('confirm', 0, PARAM_BOOL);
 
 if ($id) {
     if (!$group = get_record('groups', 'id', $id)) {
-        print_error('Group ID was incorrect');
+        print_error('invalidgroupid');
     }
     $group->description = clean_text($group->description);
     if (empty($courseid)) {
         $courseid = $group->courseid;
 
     } else if ($courseid != $group->courseid) {
-        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');
     }
     $group = new object();
     $group->courseid = $course->id;
@@ -83,11 +83,11 @@ if ($editform->is_cancelled()) {
 
     if ($data->id) {
         if (!groups_update_group($data, $editform->_upload_manager)) {
-            print_error('Error updating group');
+            print_error('cannotupdategroup');
         }
     } else {
         if (!$id = groups_create_group($data, $editform->_upload_manager)) {
-            print_error('Error creating group');
+            print_error('cannotcreategroup');
         }
         $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id;
     }

diff --git a/group/grouping.php b/group/grouping.php
index a6bdb9c4f0f5f5eb8d796d6d8ad0adb65fe71f6b..aa0d3ce61e73b0a1adfbf629539a25c25d6d83a2 100644 (file)
--- a/group/grouping.php
+++ b/group/grouping.php
@@ -20,23 +20,23 @@ $confirm  = optional_param('confirm', 0, PARAM_BOOL);
 
 if ($id) {
     if (!$grouping = get_record('groupings', 'id', $id)) {
-        print_error('Group ID was incorrect');
+        print_error('invalidgroupid');
     }
     $grouping->description = clean_text($grouping->description);
     if (empty($courseid)) {
         $courseid = $grouping->courseid;
 
     } else if ($courseid != $grouping->courseid) {
-        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');
     }
     $grouping = new object();
     $grouping->courseid = $course->id;
@@ -84,12 +84,12 @@ if ($editform->is_cancelled()) {
 
     if ($data->id) {
         if (!groups_update_grouping($data)) {
-            print_error('Error updating grouping');
+            print_error('cannotupdategroup');
         }
 
     } else {
         if (!groups_create_grouping($data)) {
-            print_error('Error creating grouping');
+            print_error('cannotcreategroup');
         }
     }
 

diff --git a/group/index.php b/group/index.php
index c0ab841f31bf7054312cfac631e543cbb352a5a8..04ffdb18c36202b9e99535a5a6aacb484f49a873 100644 (file)
--- a/group/index.php
+++ b/group/index.php
@@ -96,7 +96,7 @@ switch ($action) {
 
     default: //ERROR.
         if (debugging()) {
-            print_error('Error, unknown button/action. Probably a user-interface bug!', '', $returnurl);
+            print_error('unknowaction', '', $returnurl);
         break;
     }
 }
@@ -269,7 +269,7 @@ function groups_param_action($prefix = 'act_') {
     }
     if ($action && !preg_match('/^\w+$/', $action)) {
         $action = false;
-        print_error('Action had wrong type.');
+        print_error('unknowaction');
     }
     ///if (debugging()) echo 'Debug: '.$action;
     return $action;

diff --git a/group/members.php b/group/members.php
index c3f476da371dfb14cdac366b16b905a96961ce9d..c0a733822bfaea45bca8b8643e9c6742612f57d3 100644 (file)
--- a/group/members.php
+++ b/group/members.php
@@ -22,7 +22,7 @@ if ($showall) {
 }
 
 if (!$group = get_record('groups', 'id', $groupid)) {
-    print_error('Incorrect group id');
+    print_error('invalidgroupid');
 }
 
 if (!$course = get_record('course', 'id', $group->courseid)) {

diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php
index c28c214b97b1ba3ae76be90a614c93393d247450..254fc7367880c694aec15f2d59ff059b3645762a 100644 (file)
--- a/lang/en_utf8/error.php
+++ b/lang/en_utf8/error.php
@@ -18,6 +18,7 @@ $string['cannotaddcmtosection'] = 'Could not add the new course module to that s
 $string['cannotsaveconfig'] = 'Problem saving config \"$a[0]\" as \"$a[1]\" for plugin \"$a[2]\"'; 
 $string['cannotsavefile'] = 'Cannot save the file\"$a[0]\/$a[1]\"!';
 $string['cannotcreatebackupdir'] = 'Could not create backupdata folder.  The site administrator needs to fix the file permissions';
+$string['cannotcreategroup'] = 'Error creating group';
 $string['cannotcreatelangdir'] = 'Cannot create lang dir.';
 $string['cannotcreatelangbase'] = 'Error: Could not create base lang directory.';
 $string['cannotcreatetempdir'] = 'Cannot create temp dir.';
@@ -61,6 +62,7 @@ $string['cannotunzipfile'] = 'Cannot unzip file.';
 $string['cannotupdatecategory'] = 'Could not update the category ($a)';
 $string['cannotupdatecm'] = 'Could not update the course module with the correct section';
 $string['cannotupdatelevel'] = 'Could not update the indent level on that course module';
+$string['cannotupdategroup'] = 'Error updating group';
 $string['cannotupdaterecord'] = 'Could not update record ID $a';
 $string['cannotupdaterole'] = 'Cannot update role!';
 $string['cannotupdatemod'] = 'Could not update the $a';
@@ -236,6 +238,7 @@ $string['unknowncourseidnumber'] = 'Unknown Course ID \"$a\"';
 $string['unknowngroup'] = 'Unknown group \"$a\"';
 $string['unknownrole'] = 'Unknown role \"$a\"';
 $string['unknownuseraction'] = 'Sorry, I do not understand this user action.';
+$string['unknoworder'] = 'Unknown ordering';
 $string['unsupportedevent'] = 'Unsupported event type';
 $string['upgraderequires19'] = 'ERROR: New Moodle version was installed on server, unfortunately upgrade from the previous version is not supported.<br />Please upgrade first to latest 1.9.x release. You can also return to previous version by reinstalling original files.';
 $string['urlnotdefinerss'] = 'URL not defined for rss feed';