"MDL-14129, fix print_error call under course/, see tracker"

abgreeve · May 7, 2008 · ba6018a · ba6018a
1 parent 211c689
commit ba6018a
Show file tree

Hide file tree

Showing 17 changed files with 146 additions and 117 deletions.
diff --git a/course/category.php b/course/category.php
@@ -24,19 +24,19 @@
     }
 
     if (!$site = get_site()) {
-        print_error("Site isn't defined!");
+        print_error("siteisnotdefined", 'debug');
     }
 
     if (empty($id)) {
-        print_error("Category not known!");
+        print_error("unknowcategory");
     }
 
     if (!$context = get_context_instance(CONTEXT_COURSECAT, $id)) {
-        print_error("Category not known!");
+        print_error("unknowcategory");
     }
 
     if (!$category = get_record("course_categories", "id", $id)) {
-        print_error("Category not known!");
+        print_error("unknowcategory");
     }
 
     if (has_capability('moodle/course:create', $context)) {
@@ -170,7 +170,7 @@
             require_capability('moodle/category:update', get_context_instance(CONTEXT_COURSECAT, $moveto));
 
             if (! $destcategory = get_record("course_categories", "id", $data->moveto)) {
-                print_error("Error finding the category");
+                print_error("cannotfindcategory", '', '', $data->moveto);
             }
 
 

diff --git a/course/delete.php b/course/delete.php
@@ -9,19 +9,19 @@
     require_login();
 
     if (!can_delete_course($id)) {
-        print_error('You do not have the permission to delete this course.');
+        print_error('cannotdeletecourse');
     }
 
     if (!$site = get_site()) {
-        print_error("Site not found!");
+        print_error("siteisnotdefined", 'debug');
     }
 
     $strdeletecourse = get_string("deletecourse");
     $stradministration = get_string("administration");
     $strcategories = get_string("categories");
 
     if (! $course = get_record("course", "id", $id)) {
-        print_error("Course ID was incorrect (can't find it)");
+        print_error("invalidcourseid");
     }
 
     $category = get_record("course_categories", "id", $course->category);
@@ -49,7 +49,7 @@
     }
 
     if ($delete != md5($course->timemodified)) {
-        print_error("The check variable was wrong - try again");
+        print_error("invalidmd5");
     }
 
     if (!confirm_sesskey()) {

diff --git a/course/edit.php b/course/edit.php
@@ -16,11 +16,11 @@
 
         if($id == SITEID){
             // don't allow editing of  'site course' using this from
-            print_error('You cannot edit the site course using this form');
+            print_error('cannoteditsiteform');
         }
 
         if (!$course = get_record('course', 'id', $id)) {
-            print_error('Course ID was incorrect');
+            print_error('invalidcourseid');
         }
         require_login($course->id);
         $category = get_record('course_categories', 'id', $course->category);
@@ -30,12 +30,12 @@
         $course = null;
         require_login();
         if (!$category = get_record('course_categories', 'id', $categoryid)) {
-            print_error('Category ID was incorrect');
+            print_error('unknowcategory');
         }
         require_capability('moodle/course:create', get_context_instance(CONTEXT_COURSECAT, $category->id));
     } else {
         require_login();
-        print_error('Either course id or category must be specified');
+        print_error('needcoursecategroyid');
     }
 
 /// prepare course

diff --git a/course/editcategory.php b/course/editcategory.php
@@ -22,7 +22,7 @@
 $resort         = optional_param('resort', 0, PARAM_BOOL);
 
 if (!$site = get_site()) {
-    print_error("Site isn't defined!");
+    print_error("siteisnotdefined");
 }
 
 if ($categoryadd) { // Show Add category form: if $id is given, it is used as the parent category 
@@ -33,7 +33,7 @@
     $strtitle = get_string("editcategorysettings");
     $context = get_context_instance(CONTEXT_COURSECAT, $id); 
     if (!$category = get_record("course_categories", "id", $id)) {
-        print_error("Category not known!");
+        print_error("unknowcategory");
     }
 }
 
@@ -83,7 +83,7 @@
         }
 
         if (!update_record('course_categories', $newcategory)) {
-            print_error( "Could not update the category '$newcategory->name' ");
+            print_error( "cannotupdatecategory", '', '', $newcategory->name);
         } else {
             if ($newcategory->parent == 0) {
                 $redirect_link = 'index.php?categoryedit=on';
@@ -210,7 +210,7 @@
             require_capability('moodle/category:update', get_context_instance(CONTEXT_COURSECAT, $moveto));
 
             if (!$destcategory = get_record("course_categories", "id", $data->moveto)) {
-                print_error("Error finding the destination category");
+                pritn_error("unknowcategory");
             } 
             // TODO function to move the category
         }

diff --git a/course/editsection.php b/course/editsection.php
@@ -7,11 +7,11 @@
     $id = required_param('id',PARAM_INT);    // Week ID
 
     if (! $section = get_record("course_sections", "id", $id)) {
-        print_error("Course section is incorrect");
+        print_error("sectionnotexist");
     }
 
     if (! $course = get_record("course", "id", $section->course)) {
-        print_error("Could not find the course!");
+        print_error("invalidcourseid");
     }
 
     require_login($course->id);
@@ -25,7 +25,7 @@
         $timenow = time();
 
         if (! set_field("course_sections", "summary", $form->summary, "id", $section->id)) {
-            print_error("Could not update the summary!");
+            print_error("cannotupdatesummary");
         }
 
         add_to_log($course->id, "course", "editsection", "editsection.php?id=$section->id", "$section->section");

diff --git a/course/importstudents.php b/course/importstudents.php
@@ -20,7 +20,7 @@
     }
 
     if (! $course = get_record("course", "id", $id)) {
-        print_error("Course ID was incorrect (can't find it)");
+        print_error("invalidcourseid");
     }
 
     require_login($course->id);
@@ -65,15 +65,15 @@
                 $addcourse = clean_param($addcourse, PARAM_INT);
                 set_time_limit(180);
                 if (!add_to_metacourse($course->id,$addcourse)) {
-                    print_error("Could not add the selected course to this meta course!");
+                    print_error("cannotmetacourse");
                 }
             }
         } else if ($remove and !empty($frm->removeselect) and confirm_sesskey()) {
             foreach ($frm->removeselect as $removecourse) {
                 set_time_limit(180);
                 $removecourse = clean_param($removecourse, PARAM_INT);
                 if (! remove_from_metacourse($course->id,$removecourse)) {
-                    print_error("Could not remove the selected course from this meta course!");
+                    print_error("cannotremovefrommeta");
                 }
             }
         } else if ($showall and confirm_sesskey()) {

diff --git a/course/index.php b/course/index.php
@@ -19,7 +19,7 @@
     $context = $sysctx;
 
     if (!$site = get_site()) {
-        print_error('Site isn\'t defined!');
+        print_error('siteisnotdefined', 'debug');
     }
 
     if ($CFG->forcelogin) {
@@ -120,7 +120,7 @@
                 if ($childcats = get_records('course_categories', 'parent', $deletecat->id)) {
                     foreach ($childcats as $childcat) {
                         if (! set_field('course_categories', 'parent', $deletecat->parent, 'id', $childcat->id)) {
-                            print_error('Could not update a child category!', 'index.php');
+                            print_error('cannotupdatesubcate', '', 'index.php');
                         }
                     }
                 }
@@ -131,7 +131,7 @@
                     if ($childcourses = get_records('course', 'category', $deletecat->id)) {
                         foreach ($childcourses as $childcourse) {
                             if (! set_field('course', 'category', $deletecat->parent, 'id', $childcourse->id)) {
-                                print_error('Could not update a child course!', 'index.php');
+                                print_error('cannotupdatesubcourse', '', 'index.php');
                             }
                         }
                     }
@@ -163,7 +163,7 @@
         unset($tempcat);
         $tempcat->name = get_string('miscellaneous');
         if (!$tempcat->id = insert_record('course_categories', $tempcat)) {
-            print_error('Serious error: Could not create a default category!');
+            print_error('cannotsetupcategory');
         }
         $tempcat->context = get_context_instance(CONTEXT_COURSECAT, $tempcat->id);
         mark_context_dirty('/'.SYSCONTEXTID);

diff --git a/course/info.php b/course/info.php
@@ -9,16 +9,16 @@
     $name = optional_param('name', false, PARAM_RAW); // Course short name
 
     if (!$id and !$name) {
-        print_error("Must specify course id or short name");
+        print_error("unspecifycourseid");
     }
 
     if ($name) {
         if (! $course = get_record("course", "shortname", $name) ) {
-            print_error("That's an invalid short course name");
+            print_error("invalidshortname");
         }
     } else {
         if (! $course = get_record("course", "id", $id) ) {
-            print_error("That's an invalid course id");
+            print_error("invalidcourseid");
         }
     }
 

diff --git a/course/lib.php b/course/lib.php
@@ -1184,7 +1184,7 @@ function get_all_mods($courseid, &$mods, &$modnames, &$modnamesplural, &$modname
         }
         asort($modnames, SORT_LOCALE_STRING);
     } else {
-        print_error("No modules are installed!");
+        print_error("nomodules", 'debug');
     }
 
     if ($rawmods = get_course_mods($courseid)) {
@@ -1948,7 +1948,7 @@ function print_my_moodle() {
     global $USER, $CFG;
 
     if (empty($USER->id)) {
-        print_error("It shouldn't be possible to see My Moodle without being logged in.");
+        print_error('nopermissions', '', '', 'See My Moodle');
     }
 
     $courses  = get_my_courses($USER->id, 'visible DESC,sortorder ASC', array('summary'));
@@ -2539,7 +2539,7 @@ function course_in_meta ($course) {
  */
 function print_standard_coursemodule_settings($form, $features=null) {
     if (! $course = get_record('course', 'id', $form->course)) {
-        print_error("This course doesn't exist");
+        print_error("invalidcourseid");
     }
     print_groupmode_setting($form, $course);
     if (!empty($features->groupings)) {
@@ -2555,12 +2555,12 @@ function print_groupmode_setting($form, $course=NULL) {
 
     if (empty($course)) {
         if (! $course = get_record('course', 'id', $form->course)) {
-            print_error("This course doesn't exist");
+            print_error("invalidcourseid");
         }
     }
     if ($form->coursemodule) {
         if (! $cm = get_record('course_modules', 'id', $form->coursemodule)) {
-            print_error("This course module doesn't exist");
+            print_error("cmunknown");
         }
         $groupmode = groups_get_activity_groupmode($cm);
     } else {
@@ -2588,12 +2588,12 @@ function print_grouping_settings($form, $course=NULL) {
 
     if (empty($course)) {
         if (! $course = get_record('course', 'id', $form->course)) {
-            print_error("This course doesn't exist");
+            print_error("invalidcourseid");
         }
     }
     if ($form->coursemodule) {
         if (! $cm = get_record('course_modules', 'id', $form->coursemodule)) {
-            print_error("This course module doesn't exist");
+            print_error("cmunknown");
         }
     } else {
         $cm = null;
@@ -2627,7 +2627,7 @@ function print_grouping_settings($form, $course=NULL) {
 function print_visible_setting($form, $course=NULL) {
     if (empty($course)) {
         if (! $course = get_record('course', 'id', $form->course)) {
-            print_error("This course doesn't exist");
+            print_error("invalidcourseid");
         }
     }
     if ($form->coursemodule) {

diff --git a/course/loginas.php b/course/loginas.php
@@ -46,7 +46,7 @@
     }
 
     if (! $course = get_record('course', 'id', $id)) {
-        print_error("Course ID was incorrect");
+        print_error("invalidcourseid");
     }
 
 /// User must be logged in
@@ -65,7 +65,7 @@
         require_login($course);
         require_capability('moodle/user:loginas', $coursecontext);
         if (!has_capability('moodle/course:view', $coursecontext, $userid, false)) {
-            print_error('This user is not in this course!');
+            print_error('usernotincourse');
         }
         if (has_capability('moodle/site:doanything', $coursecontext, $userid, false)) {
             print_error('nologinas');