"MDL-14129, fix print_error"

diff --git a/mod/scorm/aicc.php b/mod/scorm/aicc.php
index f34059fcefb64b372bab4b692ee7949abe56d05e..b1f6368cab237c570966588b9afa631e6d80ebc2 100755 (executable)
--- a/mod/scorm/aicc.php
+++ b/mod/scorm/aicc.php
@@ -14,7 +14,7 @@
         if (isset($SESSION->scorm_scoid)) {
             $scoid = $SESSION->scorm_scoid;
         } else {
-            print_error('Invalid script call');
+            print_error('cannotcallscript');
         }
         $mode = 'normal';
         if (isset($SESSION->scorm_mode)) {
@@ -32,10 +32,10 @@
 
         if ($sco = scorm_get_sco($scoid, SCO_ONLY)) {
             if (!$scorm = $DB->get_record('scorm', array('id'=>$sco->scorm))) {
-                print_error('Invalid script call');
+                print_error('cannotcallscript');
             }
         } else {
-            print_error('Invalid script call');
+            print_error('cannotcallscript');
         }
 
         if ($scorm = $DB->get_record('scorm', array('id'=>$sco->scorm))) {
@@ -129,7 +129,7 @@
                             echo 'Max_Time_Allowed = '.$userdata->maxtimeallowed."\n";
                             echo 'Time_Limit_Action = '.$userdata->timelimitaction."\n";
                         } else {
-                            print_error('Sco not found');
+                            print_error('cannotfindsco', 'scorm');
                         }
                     }
                 break;

diff --git a/mod/scorm/api.php b/mod/scorm/api.php
index e3e6fcf3e79a9b3e0af980e7e61fd8da40a6f28c..d517b8bf59852b8827c42c6c2c076255fc71e2de 100644 (file)
--- a/mod/scorm/api.php
+++ b/mod/scorm/api.php
@@ -11,26 +11,26 @@
 
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('scorm', $id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $scorm = $DB->get_record("scorm", array("id"=>$cm->instance))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     } else if (!empty($a)) {
         if (! $scorm = $DB->get_record("scorm", array("id"=>$a))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$scorm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
     } else {
-        print_error('A required parameter is missing');
+        print_error('missingparameter');
     }
 
     require_login($course->id, false, $cm);
@@ -62,7 +62,7 @@
             $userdata->$key = $value;
         }
     } else {
-        print_error('Sco not found');
+        print_error('cannotfindsco', 'scorm');
     }
     $scorm->version = strtolower(clean_param($scorm->version, PARAM_SAFEDIR));   // Just to be safe
     if (file_exists($CFG->dirroot.'/mod/scorm/datamodels/'.$scorm->version.'.js.php')) {

diff --git a/mod/scorm/datamodel.php b/mod/scorm/datamodel.php
index 64872d6fdca7206f6ec467a824fb5ce2fe48bc7b..112c5834725b0f5b06812d091e266e87b0c990b8 100755 (executable)
--- a/mod/scorm/datamodel.php
+++ b/mod/scorm/datamodel.php
@@ -11,26 +11,26 @@
 
     if (!empty($id)) {
         if (! $cm = $DB->get_record("course_modules", array("id"=>$id))) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $scorm = $DB->get_record("scorm", array("id"=>$cm->instance))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     } else if (!empty($a)) {
         if (! $scorm = $DB->get_record("scorm", array("id"=>$a))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$scorm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
     } else {
-        print_error('A required parameter is missing');
+        print_error('missingparameter');
     }
 
     require_login($course->id, false, $cm);

diff --git a/mod/scorm/index.php b/mod/scorm/index.php
index 96f801dbcb912ba079a1c1bf98d6c1217c2fc10c..41163d21979084c10c53bac8a3ac7184e553df86 100755 (executable)
--- a/mod/scorm/index.php
+++ b/mod/scorm/index.php
@@ -7,10 +7,10 @@
 
     if (!empty($id)) {
         if (!$course = $DB->get_record('course', array('id'=>$id))) {
-            print_error("Course ID is incorrect");
+            print_error('invalidcourseid');
         }
     } else {
-        print_error('A required parameter is missing');
+        print_error('missingparameter');
     }
 
     require_course_login($course);

diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index aaa82506246cbcfd83b79261cd2ed4e4e713871d..3a40273df9a1b1203aa0ebe2a07d3b80487f6fa1 100755 (executable)
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -10,26 +10,26 @@
 
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('scorm', $id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record('course', array('id'=>$cm->course))) {
-            print_error('Course is misconfigured');
+            print_error('coursemisconf');
         }
         if (! $scorm = $DB->get_record('scorm', array('id'=>$cm->instance))) {
-            print_error('Course module is incorrect');
+            print_error('invalidcoursemodule');
         }
     } else if (!empty($a)) {
         if (! $scorm = $DB->get_record('scorm', array('id'=>$a))) {
-            print_error('Course module is incorrect');
+            print_error('coursemisconf');
         }
         if (! $course = $DB->get_record('course', array('id'=>$scorm->course))) {
-            print_error('Course is misconfigured');
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('invalidcoursemodule');
         }
     } else {
-        print_error('A required parameter is missing');
+        print_error('missingparameter');
     }
 
     require_login($course->id, false, $cm);

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index f485b05411e065db31f3dc4a3f2bf269bbbf65ae..9f7df6ae8c7d35d680248e18334f5d8bd962fb5a 100755 (executable)
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -457,7 +457,7 @@ function scorm_course_format_display($user,$course) {
         // The module SCORM activity with the least id is the course  
         $scorm = current($scorms);
         if (! $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('invalidcoursemodule');
         }
         $colspan = '';
         $headertext = '<table width="100%"><tr><td class="title">'.get_string('name').': <b>'.format_string($scorm->name).'</b>';

diff --git a/mod/scorm/player.php b/mod/scorm/player.php
index f90926bf286e510d67d312d31d4916eea8683fc6..c0946a7bae5158f680682818545f47438b1de905 100755 (executable)
--- a/mod/scorm/player.php
+++ b/mod/scorm/player.php
@@ -16,26 +16,26 @@
 
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('scorm', $id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $scorm = $DB->get_record("scorm", array("id"=>$cm->instance))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     } else if (!empty($a)) {
         if (! $scorm = $DB->get_record("scorm", array("id"=>$a))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$scorm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
     } else {
-        print_error('A required parameter is missing');
+        print_error('missingparameter');
     }
 
     require_login($course->id, false, $cm);

diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index 77b3b5aa8064940ced58b8cbca4406d607347ebe..055e3289bf3d8979dda26af5882fb5aa18e8edde 100755 (executable)
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -13,30 +13,30 @@
 
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('scorm', $id)) {
-            print_error('Course Module ID was incorrect');
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record('course', array('id'=>$cm->course))) {
-            print_error('Course is misconfigured');
+            print_error('coursemisconf');
         }
         if (! $scorm = $DB->get_record('scorm', array('id'=>$cm->instance))) {
-            print_error('Course module is incorrect');
+            print_error('invalidcoursemodule');
         }
     } else {
         if (!empty($b)) {
             if (! $sco = $DB->get_record('scorm_scoes', array('id'=>$b))) {
-                print_error('Scorm activity is incorrect');
+                print_error('invalidactivity', 'scorm');
             }
             $a = $sco->scorm;
         }
         if (!empty($a)) {
             if (! $scorm = $DB->get_record('scorm', array('id'=>$a))) {
-                print_error('Course module is incorrect');
+                print_error('invalidcoursemodule');
             }
             if (! $course = $DB->get_record('course', array('id'=>$scorm->course))) {
-                print_error('Course is misconfigured');
+                print_error('coursemisconf');
             }
             if (! $cm = get_coursemodule_from_instance('scorm', $scorm->id, $course->id)) {
-                print_error('Course Module ID was incorrect');
+                print_error('invalidcoursemodule');
             }
         }
     }
@@ -44,7 +44,7 @@
     require_login($course->id, false, $cm);
 
     if (!has_capability('mod/scorm:viewreport', get_context_instance(CONTEXT_MODULE,$cm->id))) {
-        print_error('You are not allowed to use this script');
+        print_error('cannotcallscript');
     }
 
     add_to_log($course->id, 'scorm', 'report', 'report.php?id='.$cm->id, $scorm->id);
@@ -406,7 +406,7 @@
             }                
             print_simple_box_end();
         } else {
-            print_error('Missing script parameter');
+            print_error('missingparameter');
         }
     }
 

diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index 00221dfe3e6cc0a17232c9b170bffb8234bc4944..9fd8cef76d3cee46e05846b84a27e40b42cc40ba 100755 (executable)
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -9,26 +9,26 @@
 
     if (!empty($id)) {
         if (! $cm = get_coursemodule_from_id('scorm', $id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $scorm = $DB->get_record("scorm", array("id"=>$cm->instance))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     } else if (!empty($a)) {
         if (! $scorm = $DB->get_record("scorm", array("id"=>$a))) {
-            print_error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
         if (! $course = $DB->get_record("course", array("id"=>$scorm->course))) {
-            print_error("Course is misconfigured");
+            print_error('coursemisconf');
         }
         if (! $cm = get_coursemodule_from_instance("scorm", $scorm->id, $course->id)) {
-            print_error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
     } else {
-        print_error('A required parameter is missing');
+        print_error('missingparameter');
     }
 
     require_login($course->id, false, $cm);