"MDL-14129, fix print_error"

moodle · Jun 12, 2008 · 1858ba0 · 1858ba0
1 parent eb7687e
commit 1858ba0
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 82 deletions.
diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php
@@ -20,7 +20,7 @@
     $jump[LESSON_EOL] = get_string("endoflesson", "lesson");
     if (!optional_param('firstpage', 0, PARAM_INT)) {
         if (!$apageid = $DB->get_field("lesson_pages", "id", array("lessonid" => $lesson->id, "prevpageid" => 0))) {
-            print_error("Add page: first page not found");
+            print_error('cannotfindfirstpage', 'lesson');
         }
         while (true) {
             if ($apageid) {

diff --git a/mod/lesson/action/addcluster.php b/mod/lesson/action/addcluster.php
@@ -16,11 +16,11 @@
 
     if ($pageid == 0) {
         if (!$page = $DB->get_record("lesson_pages", array("prevpageid" => 0, "lessonid" => $lesson->id))) {
-            print_error("Error: Add cluster: page record not found");
+            print_error('cannotfindpagerecord', 'lesson');
         }
     } else {
         if (!$page = $DB->get_record("lesson_pages", array("id" => $pageid))) {
-            print_error("Error: Add cluster: page record not found");
+            print_error('cannotfindpagerecord', 'lesson');
         }
     }
     $newpage = new stdClass;
@@ -36,12 +36,12 @@
     $newpage->title = get_string("clustertitle", "lesson");
     $newpage->contents = get_string("clustertitle", "lesson");
     if (!$newpageid = $DB->insert_record("lesson_pages", $newpage)) {
-        print_error("Insert page: new page not inserted");
+        print_error('cannotinsertpage', 'lesson');
     }
     // update the linked list...
     if ($pageid != 0) {
         if (!$DB->set_field("lesson_pages", "nextpageid", $newpageid, array("id" => $pageid))) {
-            print_error("Add cluster: unable to update link");
+            print_error('cannotupdatelink', 'lesson');
         }
     }
 
@@ -51,7 +51,7 @@
     if ($page->nextpageid) {
         // the new page is not the last page
         if (!$DB->set_field("lesson_pages", "prevpageid", $newpageid, array("id" => $page->nextpageid))) {
-            print_error("Insert page: unable to update previous link");
+            print_error('cannotupdatelink', 'lesson');
         }
     }
     // ..and the single "answer"
@@ -61,8 +61,8 @@
     $newanswer->timecreated = $timenow;
     $newanswer->jumpto = LESSON_CLUSTERJUMP;
     if(!$newanswerid = $DB->insert_record("lesson_answers", $newanswer)) {
-        print_error("Add cluster: answer record not inserted");
+        print_error('cannotinsertanswer', 'lesson');
     }
     lesson_set_message(get_string('addedcluster', 'lesson'), 'notifysuccess');
     redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");
-?>
+?>
diff --git a/mod/lesson/action/addendofbranch.php b/mod/lesson/action/addendofbranch.php
@@ -15,17 +15,17 @@
 
     // the new page is not the first page (end of branch always comes after an existing page)
     if (!$page = $DB->get_record("lesson_pages", array("id" => $pageid))) {
-        print_error("Add end of branch: page record not found");
+        print_error('cannotfindpagerecord', 'lesson');
     }
     // chain back up to find the (nearest branch table)
     $btpageid = $pageid;
     if (!$btpage = $DB->get_record("lesson_pages", array("id" => $btpageid))) {
-        print_error("Add end of branch: btpage record not found");
+        print_error('cannotfindpagerecord', 'lesson');
     }
     while (($btpage->qtype != LESSON_BRANCHTABLE) AND ($btpage->prevpageid > 0)) {
         $btpageid = $btpage->prevpageid;
         if (!$btpage = $DB->get_record("lesson_pages", array("id" => $btpageid))) {
-            print_error("Add end of branch: btpage record not found");
+            print_error('cannotfindpagerecord', 'lesson');
         }
     }
     if ($btpage->qtype == LESSON_BRANCHTABLE) {
@@ -38,16 +38,16 @@
         $newpage->title = get_string("endofbranch", "lesson");
         $newpage->contents = get_string("endofbranch", "lesson");
         if (!$newpageid = $DB->insert_record("lesson_pages", $newpage)) {
-            print_error("Insert page: new page not inserted");
+            print_error('cannotinsertpage', 'lesson');
         }
         // update the linked list...
         if (!$DB->set_field("lesson_pages", "nextpageid", $newpageid, array("id" => $pageid))) {
-            print_error("Add end of branch: unable to update link");
+            print_error('cannotupdatelink', 'lesson');
         }
         if ($page->nextpageid) {
             // the new page is not the last page
             if (!$DB->set_field("lesson_pages", "prevpageid", $newpageid, array("id" => $page->nextpageid))) {
-                print_error("Insert page: unable to update previous link");
+                print_error('cannotupdatelink', 'lesson');
             }
         }
         // ..and the single "answer"
@@ -57,7 +57,7 @@
         $newanswer->timecreated = $timenow;
         $newanswer->jumpto = $btpageid;
         if(!$newanswerid = $DB->insert_record("lesson_answers", $newanswer)) {
-            print_error("Add end of branch: answer record not inserted");
+            print_error('cannotinsertanswer', 'lesson');
         }
 
         lesson_set_message(get_string('addedanendofbranch', 'lesson'), 'notifysuccess');

diff --git a/mod/lesson/action/addendofcluster.php b/mod/lesson/action/addendofcluster.php
@@ -15,7 +15,7 @@
 
     // the new page is not the first page (end of cluster always comes after an existing page)
     if (!$page = $DB->get_record("lesson_pages", array("id" => $pageid))) {
-        print_error("Error: Could not find page");
+        print_error('cannotfindpages', 'lesson');
     }
 
     // could put code in here to check if the user really can insert an end of cluster
@@ -29,16 +29,16 @@
     $newpage->title = get_string("endofclustertitle", "lesson");
     $newpage->contents = get_string("endofclustertitle", "lesson");
     if (!$newpageid = $DB->insert_record("lesson_pages", $newpage)) {
-        print_error("Insert page: end of cluster page not inserted");
+        print_error('cannotinsertpage', 'lesson');
     }
     // update the linked list...
     if (!$DB->set_field("lesson_pages", "nextpageid", $newpageid, array("id" => $pageid))) {
-        print_error("Add end of cluster: unable to update link");
+        print_error('cannotupdatelink', 'lesson');
     }
     if ($page->nextpageid) {
         // the new page is not the last page
         if (!$DB->set_field("lesson_pages", "prevpageid", $newpageid, array("id" => $page->nextpageid))) {
-            print_error("Insert end of cluster: unable to update previous link");
+            print_error('cannotupdatelink', 'lesson');
         }
     }
     // ..and the single "answer"
@@ -48,7 +48,7 @@
     $newanswer->timecreated = $timenow;
     $newanswer->jumpto = LESSON_NEXTPAGE;
     if(!$newanswerid = $DB->insert_record("lesson_answers", $newanswer)) {
-        print_error("Add end of cluster: answer record not inserted");
+        print_error('cannotinsertanswer', 'lesson');
     }
     lesson_set_message(get_string('addedendofcluster', 'lesson'), 'notifysuccess');
-    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");
+    redirect("$CFG->wwwroot/mod/lesson/edit.php?id=$cm->id");
diff --git a/mod/lesson/action/confirmdelete.php b/mod/lesson/action/confirmdelete.php
@@ -10,7 +10,7 @@
 
     $pageid = required_param('pageid', PARAM_INT);
     if (!$thispage = $DB->get_record("lesson_pages", array ("id" => $pageid))) {
-        print_error("Confirm delete: the page record not found");
+        print_error('cannotfindpages', 'lesson');
     }
     print_heading(get_string("deletingpage", "lesson", format_string($thispage->title)));
     // print the jumps to this page
@@ -20,7 +20,7 @@
         echo "<p align=\"center\">\n";
         foreach ($answers as $answer) {
             if (!$title = $DB->get_field("lesson_pages", "title", array("id" => $answer->pageid))) {
-                print_error("Confirm delete: page title not found");
+                print_error('cannotfindpagetitle', 'lesson');
             }
             echo $title."<br />\n";
         }

diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php
@@ -12,7 +12,7 @@
     $redirect = optional_param('redirect', '', PARAM_ALPHA);
 
     if (!$page = $DB->get_record("lesson_pages", array("id" => $pageid))) {
-        print_error("Edit page: page record not found");
+        print_error('cannotfindpages', 'lesson');
     }
 
     $page->qtype = optional_param('qtype', $page->qtype, PARAM_INT);
@@ -34,12 +34,12 @@
     }
     $jump[LESSON_EOL] = get_string("endoflesson", "lesson");
     if (!$apageid = $DB->get_field("lesson_pages", "id", array("lessonid" => $lesson->id, "prevpageid" => 0))) {
-        print_error("Edit page: first page not found");
+        print_error('cannotfindfirstpage', 'lesson');
     }
     while (true) {
         if ($apageid) {
             if (!$apage = $DB->get_record("lesson_pages", array("id" => $apageid))) {
-                print_error("Edit page: apage record not found");
+                print_error('cannotfindpages', 'lesson');
             }
             // removed != LESSON_ENDOFBRANCH...
             if (trim($page->title)) { // ...nor nuffin pages

diff --git a/mod/lesson/action/insertpage.php b/mod/lesson/action/insertpage.php
@@ -21,7 +21,7 @@
     if ($form->pageid) {
         // the new page is not the first page
         if (!$page = $DB->get_record("lesson_pages", array("id" => $form->pageid))) {
-            print_error("Insert page: page record not found");
+            print_error('cannotfindpages', 'lesson');
         }
         $newpage->lessonid = clean_param($lesson->id, PARAM_INT);
         $newpage->prevpageid = clean_param($form->pageid, PARAM_INT);
@@ -48,16 +48,16 @@
         $newpage->title = $newpage->title;
         $newpageid = $DB->insert_record("lesson_pages", $newpage);
         if (!$newpageid) {
-            print_error("Insert page: new page not inserted");
+            print_error('cannotinsertpage', 'lesson');
         }
         // update the linked list (point the previous page to this new one)
         if (!$DB->set_field("lesson_pages", "nextpageid", $newpageid, array("id" => $newpage->prevpageid))) {
-            print_error("Insert page: unable to update next link");
+            print_error('cannotupdatelink', 'lesson');
         }
         if ($page->nextpageid) {
             // new page is not the last page
             if (!$DB->set_field("lesson_pages", "prevpageid", $newpageid, array("id" => $page->nextpageid))) {
-                print_error("Insert page: unable to update previous link");
+                print_error('cannotupdatelink', 'lesson');
             }
         }
     } else {
@@ -91,7 +91,7 @@
             $newpage->title = $newpage->title;
             $newpageid = $DB->insert_record("lesson_pages", $newpage);
             if (!$newpageid) {
-                print_error("Insert page: new first page not inserted");
+                print_error('cannotinsertpage', 'lesson');
             }
         } else {
             // there are existing pages put this at the start
@@ -120,11 +120,11 @@
             $newpage->title = $newpage->title;
             $newpageid = $DB->insert_record("lesson_pages", $newpage);
             if (!$newpageid) {
-                print_error("Insert page: first page not inserted");
+                print_error('cannotfindfirstpage', 'lesson');
             }
             // update the linked list
             if (!$DB->set_field("lesson_pages", "prevpageid", $newpageid, array("id" => $newpage->nextpageid))) {
-                print_error("Insert page: unable to update link");
+                print_error('cannotupdatelink', 'lesson');
             }
         }
     }
@@ -141,7 +141,7 @@
         }
         $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
         if (!$newanswerid) {
-            print_error("Insert Page: answer record not inserted");
+            print_error('cannotinsertanswer', 'lesson');
         }
     } else {
         if ($form->qtype == LESSON_MATCHING) {
@@ -167,7 +167,7 @@
                 }
                 $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
                 if (!$newanswerid) {
-                    print_error("Insert Page: answer record $i not inserted");
+                    print_error('cannotinsertanswer', 'lesson');
                 }
             } else {
                 if ($form->qtype == LESSON_MATCHING) {
@@ -177,7 +177,7 @@
                         $newanswer->timecreated = $timenow;
                         $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
                         if (!$newanswerid) {
-                            print_error("Insert Page: answer record $i not inserted");
+                            print_error('cannotinsertanswer', 'lesson');
                         }
                     }
                 } else {

diff --git a/mod/lesson/action/move.php b/mod/lesson/action/move.php
@@ -13,7 +13,7 @@
 
     $params = array ("lessonid" => $lesson->id, "prevpageid" => 0);
     if (!$page = $DB->get_record_select("lesson_pages", "lessonid = :lessonid AND prevpageid = :prevpageid", $params)) {
-        print_error("Move: first page not found");
+        print_error('cannotfindfirstpage', 'lesson');
     }
 
     echo "<center><table cellpadding=\"5\" border=\"1\">\n";
@@ -30,7 +30,7 @@
         }
         if ($page->nextpageid) {
             if (!$page = $DB->get_record("lesson_pages", array("id" => $page->nextpageid))) {
-                print_error("Teacher view: Next page not found!");
+                print_error('cannotfindnextpage', 'lesson');
             }
         } else {
             // last page reached

diff --git a/mod/lesson/action/updatepage.php b/mod/lesson/action/updatepage.php
@@ -48,7 +48,7 @@
     $page->title = $page->title;
 
     if (!$DB->update_record("lesson_pages", $page)) {
-        print_error("Update page: page not updated");
+        print_error('cannotupdatepage', 'lesson');
     }
     if ($page->qtype == LESSON_ENDOFBRANCH || $page->qtype == LESSON_ESSAY || $page->qtype == LESSON_CLUSTER || $page->qtype == LESSON_ENDOFCLUSTER) {
         // there's just a single answer with a jump
@@ -67,13 +67,13 @@
             foreach ($answers as $answer) {
                 if ($answer->id != clean_param($form->answerid[0], PARAM_INT)) {
                     if (!$DB->delete_records("lesson_answers", array("id" => $answer->id))) {
-                        print_error("Update page: unable to delete answer record");
+                        print_error('cannotdeleteanswer', 'lesson');
                     }
                 }
             }
         }        
         if (!$DB->update_record("lesson_answers", $oldanswer)) {
-            print_error("Update page: EOB not updated");
+            print_error('cannotupdateanswer', 'lesson');
         }
     } else {
         // it's an "ordinary" page
@@ -108,7 +108,7 @@
                         $oldanswer->score = clean_param($form->score[$i], PARAM_INT);
                     }
                     if (!$DB->update_record("lesson_answers", $oldanswer)) {
-                        print_error("Update page: answer $i not updated");
+                        print_error('cannotupdateanswer', 'lesson');
                     }
                 } else {
                     // it's a new answer
@@ -134,7 +134,7 @@
                     }
                     $newanswerid = $DB->insert_record("lesson_answers", $newanswer);
                     if (!$newanswerid) {
-                        print_error("Update page: answer record not inserted");
+                        print_error('cannotinsertanswer', 'lesson');
                     }
                 }
             } else {
@@ -143,7 +143,7 @@
                         if ($form->answerid[$i]) {
                             // need to delete blanked out answer
                             if (!$DB->delete_records("lesson_answers", array("id" => clean_param($form->answerid[$i], PARAM_INT)))) {
-                                print_error("Update page: unable to delete answer record");
+                                print_error('cannotdeleteanswer', 'lesson');
                             }
                         }
                     } else {
@@ -160,13 +160,13 @@
                         $oldanswer->timemodified = $timenow;
                         $oldanswer->answer = NULL;
                         if (!$DB->update_record("lesson_answers", $oldanswer)) {
-                            print_error("Update page: answer $i not updated");
+                            print_error('cannotupdateanswer', 'lesson');
                         }
                     }                        
                 } elseif (!empty($form->answerid[$i])) {
                     // need to delete blanked out answer
                     if (!$DB->delete_records("lesson_answers", array("id" => clean_param($form->answerid[$i], PARAM_INT)))) {
-                        print_error("Update page: unable to delete answer record");
+                        print_error('cannotdeleteanswer', 'lesson');
                     }
                 }
             }

diff --git a/mod/lesson/backuplib.php b/mod/lesson/backuplib.php
@@ -176,7 +176,7 @@ function backup_lesson_pages ($bf, $preferences, $lessonid) {
                 // move to the next (logical) page
                 if ($page->nextpageid) {
                     if (!$page = $DB->get_record("lesson_pages", array ("id" => $page->nextpageid))) {
-                        print_error("Lesson Backup: Next page not found!");
+                        print_error('cannotfindnextpage', 'lesson');
                     }
                 } else {
                     // last page reached