From 8a274bcde4b46f0ea2526da57e46cf0122fa2fed Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Fri, 6 Jun 2008 05:50:45 +0000
Subject: [PATCH] "MDL-14129, fix print_error"

---
 mod/glossary/approve.php    |  8 ++++----
 mod/glossary/exportfile.php |  6 +++---
 mod/glossary/report.php     |  2 +-
 mod/glossary/showentry.php  |  4 ++--
 mod/glossary/view.php       | 14 +++++++-------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mod/glossary/approve.php b/mod/glossary/approve.php
index 5d03612522..3c28926abc 100644
--- a/mod/glossary/approve.php
+++ b/mod/glossary/approve.php
@@ -10,15 +10,15 @@
     $hook = optional_param('hook','ALL', PARAM_CLEAN);
 
     if (! $cm = get_coursemodule_from_id('glossary', $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 (! $glossary = get_record("glossary", "id", $cm->instance)) {
-        print_error("Course module is incorrect");
+        print_error('invalidid', 'glossary');
     }
 
     require_login($course->id, false, $cm);
@@ -31,7 +31,7 @@
     $newentry->timemodified = time(); // wee need this date here to speed up recent activity, TODO: use timestamp in approved field instead in 2.0
 
     if (! update_record("glossary_entries", $newentry)) {
-        print_error("Could not update your glossary");
+        print_error('cantupdateglossary', 'glossary');
     } else {
         add_to_log($course->id, "glossary", "approve entry", "showentry.php?id=$cm->id&amp;eid=$eid", "$eid",$cm->id);
     }
diff --git a/mod/glossary/exportfile.php b/mod/glossary/exportfile.php
index 6df185d19c..69bc8369d1 100644
--- a/mod/glossary/exportfile.php
+++ b/mod/glossary/exportfile.php
@@ -12,15 +12,15 @@
     $cat = optional_param('cat',0, PARAM_ALPHANUM);
 
     if (! $cm = get_coursemodule_from_id('glossary', $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 (! $glossary = get_record("glossary", "id", $cm->instance)) {
-        print_error("Course module is incorrect");
+        print_error('invalidid', 'glossary');
     }
 
     require_login($course->id, false, $cm);
diff --git a/mod/glossary/report.php b/mod/glossary/report.php
index 537255d101..89bfb16a32 100644
--- a/mod/glossary/report.php
+++ b/mod/glossary/report.php
@@ -51,7 +51,7 @@
     print_header("$strratings: $entry->concept");
 
     if (!$ratings = glossary_get_ratings($entry->id, $sqlsort)) {
-        print_error("No ratings for this entry: \"$entry->concept\"");
+        print_error("ratingno', 'glossary');
 
     } else {
         echo "<table border=\"0\" cellpadding=\"3\" cellspacing=\"3\" class=\"generalbox\" style=\"width:100%\">";
diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php
index 1650643fe5..294143e27e 100644
--- a/mod/glossary/showentry.php
+++ b/mod/glossary/showentry.php
@@ -16,7 +16,7 @@
         $glossary = get_record('glossary','id',$entry->glossaryid);
         $entry->glossaryname = format_string($glossary->name,true);
         if (!$cm = get_coursemodule_from_instance("glossary", $glossary->id)) {
-            print_error("Could not determine which course module this belonged to!");
+            print_error("invalidcoursemodule");
         }
         if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $cm->id))) {
             redirect($CFG->wwwroot.'/course/view.php?id='.$cm->course, get_string('activityiscurrentlyhidden'));
@@ -27,7 +27,7 @@
     } else if ($concept) {
         $entries = glossary_get_entries_search($concept, $courseid);
     } else {
-        print_error('No valid entry specified');
+        print_error('invalidentry');
     }
 
     if ($entries) {
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index efac7625e8..e9673df276 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -21,27 +21,27 @@
 
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('glossary', $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 (! $glossary = get_record("glossary", "id", $cm->instance)) {
-            print_error("Course module is incorrect");
+            print_error('invalidid', 'glossary');
         }
     } else if (!empty($g)) {
         if (! $glossary = get_record("glossary", "id", $g)) {
-            print_error("Course module is incorrect");
+            print_error('invalidid', 'glossary');
         }
         if (! $course = get_record("course", "id", $glossary->course)) {
-            print_error("Could not determine which course this belonged to!");
+            print_error('invalidcourseid');
         }
         if (!$cm = get_coursemodule_from_instance("glossary", $glossary->id, $course->id)) {
-            print_error("Could not determine which course module this belonged to!");
+            print_error('invalidcoursemodule');
         }
         $id = $cm->id;
     } else {
-        print_error("Must specify glossary ID or course module ID");
+        print_error('invalidid', 'glossary');
     }
 
     require_course_login($course->id, true, $cm);
-- 
2.39.5