"MDL-14129, fix print_error call"

diff --git a/mod/data/comment.php b/mod/data/comment.php
index bc24ed021405b667cf05da00e5d6f4b572973d35..bed2afe83ff4bc5666e740d637b9a81ad1292bd6 100755 (executable)
--- a/mod/data/comment.php
+++ b/mod/data/comment.php
@@ -15,16 +15,16 @@
 
 
     if (! $record = get_record('data_records', 'id', $rid)) {
-        print_error('Record ID is incorrect');
+        print_error('invalidrecord', 'data');
     }
     if (! $data = get_record('data', 'id', $record->dataid)) {
-        print_error('Data ID is incorrect');
+        print_error('invalidid', 'data');
     }
     if (! $course = get_record('course', 'id', $data->course)) {
-        print_error('Course is misconfigured');
+        print_error('coursemisconf');
     }
     if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
 
     require_login($course->id, false, $cm);
@@ -33,13 +33,13 @@
 
     if ($commentid) {
         if (! $comment = get_record('data_comments', 'id', $commentid)) {
-            print_error('Comment ID is misconfigured');
+            print_error('commentmisconf');
         }
         if ($comment->recordid != $record->id) {
-            print_error('Comment ID is misconfigured');
+            print_error('commentmisconf');
         }
         if (!has_capability('mod/data:managecomments', $context) && $comment->userid != $USER->id) {
-            print_error('Comment is not yours to edit!');
+            print_error('cannoteditcomment');
         }
     } else {
         $comment = false;
@@ -81,7 +81,7 @@
             if (insert_record('data_comments',$newcomment)) {
                 redirect('view.php?rid='.$record->id.'&page='.$page);
             } else {
-                print_error('Error while saving comment.');
+                print_error('cannotsavecomment');
             }
 
         break;
@@ -100,7 +100,7 @@
             if (update_record('data_comments',$updatedcomment)) {
                 redirect('view.php?rid='.$record->id.'&page='.$page);
             } else {
-                print_error('Error while saving comment.');
+                print_error('cannotsavecomment');
             }
         break;
 

diff --git a/mod/data/edit.php b/mod/data/edit.php
index 40eb0e7a0c53ab870defaf65110e280985fa1688..b699caace0d76ce70e842d92d8d41eb7f1abfed5 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -35,24 +35,24 @@
 
     if ($id) {
         if (! $cm = get_coursemodule_from_id('data', $id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('invalidcoursemodule');
         }
         if (! $course = get_record('course', 'id', $cm->course)) {
-            print_error('Course is misconfigured');
+            print_error('coursemisconf');
         }
         if (! $data = get_record('data', 'id', $cm->instance)) {
-            print_error('Course module is incorrect');
+            print_error('invalidcoursemodule');
         }
 
     } else {
         if (! $data = get_record('data', 'id', $d)) {
-            print_error('Data ID is incorrect');
+            print_error('invalidid', 'data');
         }
         if (! $course = get_record('course', 'id', $data->course)) {
-            print_error('Course is misconfigured');
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('invalidcoursemodule');
         }
     }
 
@@ -180,7 +180,7 @@
         } else { /// Add some new records
 
             if (!data_user_can_add_entry($data, $currentgroup, $groupmode)) {
-                print_error('Can not add entries!');
+                print_error('cannotadd', 'data');
             }
 
         /// Check if maximum number of entry as specified by this database is reached

diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index 24a8c494897fba1fa3680940f5dab87d26236d37..4837e4e27f29847607a4659f2dea2d5b0d000017 100755 (executable)
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -133,7 +133,7 @@ class data_field_file extends data_field_base {
             $oldcontent->fieldid = $this->field->id;
             $oldcontent->recordid = $recordid;
             if ($oldcontent->id = insert_record('data_content', $oldcontent)) {
-                print_error('Could not make an empty record!');
+                print_error('cannotinsertempty', 'data');
             }
         }
 

diff --git a/mod/data/field/latlong/kml.php b/mod/data/field/latlong/kml.php
index e2609d238a44cbb0c62e5ad134a0d6b238166c78..45c449bdee391ea39d8d17dfca8753c3b4398553 100644 (file)
--- a/mod/data/field/latlong/kml.php
+++ b/mod/data/field/latlong/kml.php
@@ -14,41 +14,41 @@ $rid     = optional_param('rid', 0, PARAM_INT);    //record id
 
 if ($rid) {
     if (! $record = get_record('data_records', 'id', $rid)) {
-        print_error('Record ID is incorrect');
+        print_error('invalidrecord', 'data');
     }
     if (! $data = get_record('data', 'id', $record->dataid)) {
-        print_error('Data ID is incorrect');
+        print_error('invalidid', 'data');
     }
     if (! $course = get_record('course', 'id', $data->course)) {
-        print_error('Course is misconfigured');
+        print_error('coursemisconf');
     }
     if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
     if (! $field = get_record('data_fields', 'id', $fieldid)) {
-        print_error('Field ID is incorrect');
+        print_error('invalidfieldid', 'data');
     }
     if (! $field->type == 'latlong') { // Make sure we're looking at a latlong data type!
-        print_error('Field ID is incorrect');
+        print_error('invalidfieldtype', 'data');
     }
     if (! $content = get_record('data_content', 'fieldid', $fieldid, 'recordid', $rid)) {
-        print_error('Field content not found');
+        print_error('nofieldcontent', 'data');
     }
 } else {   // We must have $d
     if (! $data = get_record('data', 'id', $d)) {
-        print_error('Data ID is incorrect');
+        print_error('invalidid', 'data');
     }
     if (! $course = get_record('course', 'id', $data->course)) {
-        print_error('Course is misconfigured');
+        print_error('coursemisconf');
     }
     if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
     if (! $field = get_record('data_fields', 'id', $fieldid)) {
-        print_error('Field ID is incorrect');
+        print_error('invalidfieldid', 'data');
     }
     if (! $field->type == 'latlong') { // Make sure we're looking at a latlong data type!
-        print_error('Field ID is incorrect');
+        print_error('invalidfieldtype', 'data');
     }
     $record = NULL;
 }

diff --git a/mod/data/import.php b/mod/data/import.php
index 855998c9cb5f6181d037efe86cf947892c05417d..22bdccfda8891c8a63c8cf944216b8c3ef385066 100755 (executable)
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -36,24 +36,24 @@
 
     if ($id) {
         if (! $cm = get_coursemodule_from_id('data', $id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('invalidcoursemodule');
         }
         if (! $course = get_record('course', 'id', $cm->course)) {
-            print_error('Course is misconfigured');
+            print_error('coursemisconf');
         }
         if (! $data = get_record('data', 'id', $cm->instance)) {
-            print_error('Course module is incorrect');
+            print_error('invalidcoursemodule');
         }
 
     } else {
         if (! $data = get_record('data', 'id', $d)) {
-            print_error('Data ID is incorrect');
+            print_error('invalidid', 'data');
         }
         if (! $course = get_record('course', 'id', $data->course)) {
-            print_error('Course is misconfigured');
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('coursemisconf');
         }
     }
 

diff --git a/mod/data/pagelib.php b/mod/data/pagelib.php
index 5e444b068e3f83616879f11a8147f42b6f0aab50..b0b80ea16bab1c01a6a3563c34bfcf6e93b96f0a 100755 (executable)
--- a/mod/data/pagelib.php
+++ b/mod/data/pagelib.php
@@ -22,7 +22,7 @@ class page_data extends page_generic_activity {
 
     function init_quick($data) {
         if(empty($data->pageid)) {
-            print_error('Cannot quickly initialize page: empty course id');
+            print_error('invalidcourseid');
         }
         $this->activityname = 'data';
         parent::init_quick($data);

diff --git a/mod/data/preset.php b/mod/data/preset.php
index bb25ba7bb9df3eae57981b66f55588f677e9091e..ac57b89c08da33949c081736ad767585b60b73fc 100644 (file)
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -25,26 +25,26 @@ unset($fullname);
 
 if ($id) {
     if (! $cm = get_coursemodule_from_id('data', $id)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
     if (! $course = get_record('course', 'id', $cm->course)) {
-        print_error('Course is misconfigured');
+        print_error('coursemisconf');
     }
     if (! $data = get_record('data', 'id', $cm->instance)) {
-        print_error('Module Incorrect');
+        print_error('invalidid', 'data');
     }
 } else if ($d) {
     if (! $data = get_record('data', 'id', $d)) {
-        print_error('Database ID Incorrect');
+        print_error('invalidid', 'data');
     }
     if (! $course = get_record('course', 'id', $data->course)) {
-        print_error('Course is misconfigured');
+        print_error('coursemisconf');
     }
     if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
 } else {
-    print_error('Parameter missing');
+    print_error('missingparameter');
 }
 
 // fill in missing properties needed for updating of instance
@@ -53,7 +53,7 @@ $data->cmidnumber = $cm->idnumber;
 $data->instance   = $cm->instance;
 
 if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) {
-    print_error('Could not find context');
+    print_error('cannotfindcontext');
 }
 
 require_login($course->id, false, $cm);
@@ -61,7 +61,7 @@ require_login($course->id, false, $cm);
 require_capability('mod/data:managetemplates', $context);
 
 if ($userid && ($userid != $USER->id) && !has_capability('mod/data:viewalluserpresets', $context)) {
-    print_error('You are not allowed to access presets from other users');
+    print_error('cannotaccesspresentsother', 'data');
 }
 
 /* Need sesskey security check here for import instruction */
@@ -76,13 +76,13 @@ switch ($action) {
         /***************** Deleting *****************/
     case 'confirmdelete' :
         if (!confirm_sesskey()) { // GET request ok here
-            print_error("Sesskey Invalid");
+            print_error('invalidsesskey');
         }
 
         if ($userid > 0 and ($userid == $USER->id || has_capability('mod/data:manageuserpresets', $context))) {
            //ok can delete
         } else {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         $path = data_preset_path($course, $userid, $shortname);
@@ -105,19 +105,19 @@ switch ($action) {
 
     case 'delete' :
         if (!data_submitted() and !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         if ($userid > 0 and ($userid == $USER->id || has_capability('mod/data:manageuserpresets', $context))) {
            //ok can delete
         } else {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         $presetpath = data_preset_path($course, $userid, $shortname);
 
         if (!clean_preset($presetpath)) {
-            print_error("Error deleting a preset!");
+            print_error('cannotdeletepreset', 'data');
         }
         @rmdir($presetpath);
 
@@ -130,7 +130,7 @@ switch ($action) {
         /***************** Importing *****************/
     case 'importpreset' :
         if (!data_submitted() or !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         $pimporter = new PresetImporter($course, $cm, $data, $userid, $shortname);
@@ -143,18 +143,18 @@ switch ($action) {
         /* Imports a zip file. */
     case 'importzip' :
         if (!data_submitted() or !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         if (!make_upload_directory('temp/data/'.$USER->id)) {
-            print_error("Can't Create Directory");
+            print_error('nopermissiontomkdir');
         }
 
         $presetfile = $CFG->dataroot.'/temp/data/'.$USER->id;
         clean_preset($presetfile);
 
         if (!unzip_file($CFG->dataroot."/$course->id/$file", $presetfile, false)) {
-            print_error("Can't unzip file");
+            print_error('cannotunzipfile');
         }
 
         $pimporter = new PresetImporter($course, $cm, $data, -$USER->id, $shortname);
@@ -166,7 +166,7 @@ switch ($action) {
 
     case 'finishimport':
         if (!data_submitted() or !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         $pimporter = new PresetImporter($course, $cm, $data, $userid, $shortname);
@@ -185,7 +185,7 @@ switch ($action) {
         /* Exports as a zip file ready for download. */
     case 'export':
         if (!data_submitted() or !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         echo '<div style="text-align:center">';
@@ -197,7 +197,8 @@ switch ($action) {
         make_upload_directory("$course->id/moddata/data/$data->id");
 
         /* now just move the zip into this folder to allow a nice download */
-        if (!rename($file, $perminantfile)) print_error("Can't move zip");
+        if (!rename($file, $perminantfile)) 
+            print_error('cannotmovezip');
         echo "<a href='$CFG->wwwroot/file.php/$course->id/moddata/data/$data->id/preset.zip'>".get_string('download', 'data')."</a>";
         echo '</div>';
         break;
@@ -205,7 +206,7 @@ switch ($action) {
         /***************** Exporting *****************/
     case 'save1':
         if (!data_submitted() or !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         $strcontinue = get_string('continue');
@@ -227,7 +228,7 @@ switch ($action) {
 
     case 'save2':
         if (!data_submitted() or !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         $strcontinue = get_string('continue');
@@ -263,7 +264,7 @@ switch ($action) {
 
     case 'save3':
         if (!data_submitted() or !confirm_sesskey()) {
-            print_error("Invalid request");
+            print_error('invalidrequest');
         }
 
         $name = optional_param('name', $data->name, PARAM_FILE);
@@ -274,7 +275,7 @@ switch ($action) {
 
         $file = data_presets_export($course, $cm, $data);
         if (!unzip_file($file, $CFG->dataroot.$presetdirectory, false)) {
-            print_error("Can't unzip to the preset directory");
+            print_error('cannotunziptopreset', 'data');
         }
         notify(get_string('savesuccess', 'data'), 'notifysuccess');
         break;

diff --git a/mod/data/preset_new.php b/mod/data/preset_new.php
index 6e4a1ddf5fb05298b872080c8e9aa86e4b6e5423..ed7a0459ed9890716cfeda87fa76fc82df90cd78 100755 (executable)
--- a/mod/data/preset_new.php
+++ b/mod/data/preset_new.php
@@ -26,30 +26,30 @@ unset($fullname);
 
 if ($id) {
     if (! $cm = get_coursemodule_from_id('data', $id)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
     if (! $course = get_record('course', 'id', $cm->course)) {
-        print_error('Course is misconfigured');
+        print_error('coursemisconf');
     }
     if (! $data = get_record('data', 'id', $cm->instance)) {
-        print_error('Module Incorrect');
+        print_error('invalidid', 'data');
     }
 } else if ($d) {
     if (! $data = get_record('data', 'id', $d)) {
-        print_error('Database ID Incorrect');
+        print_error('invalidid', 'data');
     }
     if (! $course = get_record('course', 'id', $data->course)) {
-        print_error('Course is misconfigured');
+        print_error('coursemisconf');
     }
     if (! $cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-        print_error('Course Module ID was incorrect');
+        print_error('invalidcoursemodule');
     }
 } else {
-    print_error('Parameter missing');
+    print_error('missingparameter');
 }
 
 if (!$context = get_context_instance(CONTEXT_MODULE, $cm->id)) {
-    print_error('Could not find context');
+    print_error('cannotfindcontext');
 }
 
 require_login($course->id, false, $cm);
@@ -57,7 +57,7 @@ require_login($course->id, false, $cm);
 require_capability('mod/data:managetemplates', $context);
 
 if ($userid && ($userid != $USER->id) && !has_capability('mod/data:viewalluserpresets', $context)) {
-    print_error('You are not allowed to access presets from other users');
+    print_error('cannotaccesspresentsother', 'data');
 }
 
 /* Need sesskey security check here for import instruction */

diff --git a/mod/data/rate.php b/mod/data/rate.php
index 06950926c930571c875573496c95542516e16ece..d4b38ad6df42b47e1ec193dc1c72699099edbe7a 100755 (executable)
--- a/mod/data/rate.php
+++ b/mod/data/rate.php
@@ -5,32 +5,32 @@
     $dataid = required_param('dataid', PARAM_INT); // The forum the rated posts are from
 
     if (!$data = get_record('data', 'id', $dataid)) {
-        print_error("Incorrect data id");
+        print_error('invalidid', 'data');
     }
 
     if (!$course = get_record('course', 'id', $data->course)) {
-        print_error("Course ID was incorrect");
+        print_error('invalidcourseid');
     }
 
     if (!$cm = get_coursemodule_from_instance('data', $data->id)) {
-        print_error("Course Module ID was incorrect");
+        print_error('invalidcoursemodule');
     }
 
     require_login($course, false, $cm);
 
     if (isguestuser()) {
-        print_error("Guests are not allowed to rate entries.");
+        print_error('guestrate', 'data');
     }
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
     require_capability('mod/data:rate', $context);
 
     if (!$data->assessed) {
-        print_error("Rating of items not allowed!");
+        print_error('cannotrate', 'data');
     }
 
     if (!$frmdata = data_submitted() or !confirm_sesskey()) {
-        print_error("This page was not accessed correctly");
+        print_error('invalidaccess', 'data');
     }
 
     $count = 0;
@@ -41,11 +41,11 @@
         }
 
         if (!$record = get_record('data_records', 'id', $recordid)) {
-            print_error("Record ID is incorrect");
+            print_error('invalidid', 'data');
         }
 
         if ($data->id != $record->dataid) {
-            print_error("Incorrect record.");
+            print_error('invalidrecord', 'data');
         }
 
         if ($record->userid == $USER->id) {
@@ -64,7 +64,7 @@
             } else if ($rating != $oldrating->rating) {
                 $oldrating->rating = $rating;
                 if (! update_record('data_ratings', $oldrating)) {
-                    print_error("Could not update an old rating ($record->id = $rating)");
+                    print_error('cannotupdaterate', 'data', '', array($record->id, $rating));
                 }
                 data_update_grades($data, $record->userid);
 
@@ -76,14 +76,14 @@
             $newrating->recordid = $record->id;
             $newrating->rating   = $rating;
             if (! insert_record('data_ratings', $newrating)) {
-                print_error("Could not insert a new rating ($record->id = $rating)");
+                print_error('cannotinsertrate', 'data', '', array($record->id, $rating));
             }
             data_update_grades($data, $record->userid);
         }
     }
 
     if ($count == 0) {
-        print_error("Incorrect submitted ratings data");
+        print_error('invalidratedata', 'data');
     }
 
     if (!empty($_SERVER['HTTP_REFERER'])) {

diff --git a/mod/data/report.php b/mod/data/report.php
index 621d2f5cc984b48eb9dbac729d64a95587d4ee9c..75e7af88847baa2de1bf9dcf5bee837de8c1d63c 100755 (executable)
--- a/mod/data/report.php
+++ b/mod/data/report.php
@@ -9,30 +9,30 @@
     $sort = optional_param('sort', '', PARAM_ALPHA);
 
     if (!$record = get_record('data_records', 'id', $id)) {
-        print_error("Record ID is incorrect");
+        print_error('invalidrecord', 'data');
     }
 
     if (!$data = get_record('data', 'id', $record->dataid)) {
-        print_error("Data ID is incorrect");
+        print_error('invalidid', 'data');
     }
 
     if (!$course = get_record('course', 'id', $data->course)) {
-        print_error("Course is misconfigured");
+        print_error('coursemisconf');
     }
 
     if (!$cm = get_coursemodule_from_instance('data', $data->id, $course->id)) {
-        print_error("Course Module ID was incorrect");
+        print_error('invalidcoursemodule');
     }
 
     require_login($course->id, false, $cm);
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
     if (!$data->assessed) {
-        print_error("This activity does not use ratings");
+        print_error('norating', 'data');
     }
 
     if (!data_isowner($record->id) and !has_capability('mod/data:viewrating', $context) and !has_capability('mod/data:rate', $context)) {
-        print_error("You can not view ratings");
+        print_error('cannotviewrate', 'data');
     }
 
     switch ($sort) {
@@ -50,7 +50,7 @@
     print_header($strratings);
 
     if (!$ratings = data_get_ratings($record->id, $sqlsort)) {
-        print_error("No ratings for this record!");
+        print_error('noratingforrecord', 'data');
 
     } else {
         echo "<table border=\"0\" cellpadding=\"3\" cellspacing=\"3\" class=\"generalbox\" style=\"width:100%\">";

diff --git a/mod/data/tabs.php b/mod/data/tabs.php
index 7a11f4390ede8b6d89a7029d6981e2e8284a69d2..0ff7dafe2a4f1b20f115d09318d6c0ff3a159bad 100755 (executable)
--- a/mod/data/tabs.php
+++ b/mod/data/tabs.php
@@ -26,7 +26,7 @@
 
 
     if (empty($currenttab) or empty($data) or empty($course)) {
-        print_error('You cannot call this script in that way');
+        print_error('cannotcallscript');
     }
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);