"MDL-14129, fix error() in feedback module"

diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index ddb31265ee9265c8b28e12623a5a4e12f48c1207..24545478b72f701eb5ab45c850c399186ce90b3b 100644 (file)
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -23,20 +23,20 @@
     $courseid = optional_param('courseid', false, PARAM_INT);
     
     if(($searchcourse OR $courseitemfilter OR $coursefilter) AND !confirm_sesskey()) {
-        error('no sesskey defined');
+        print_error('invalidsesskey');
     }
     
     if ($id) {
         if (! $cm = get_coursemodule_from_id('feedback', $id)) {
-            error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
      
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            error("Course is misconfigured");
+            print_error('coursemisconf');
         }
      
         if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
-            error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     }
     $capabilities = feedback_load_capabilities($cm->id);
@@ -44,7 +44,7 @@
     require_login($course->id, true, $cm);
     
     if( !( (intval($feedback->publish_stats) == 1) || $capabilities->viewreports)) {
-        error(get_string('error'));
+        print_error('error');
     }
     
     /// Print the page header

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index b56d00346705b252135d9475de1b333f57cb24dd..00144ed3e731ef127f89ca24862504386e325aa2 100644 (file)
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -24,7 +24,7 @@
     $highlightrequired = false;
 
     if(($formdata = data_submitted()) AND !confirm_sesskey()) {
-        error('no sesskey defined');
+        print_error('invalidsesskey');
     }
 
     //if the use hit enter into a textfield so the form should not submit
@@ -48,7 +48,7 @@
             $gonextpage = false;
             $gopreviouspage = true;
         }else {
-            error('parameter (gopage) required');
+            print_error('missingparameter');
         }
     }else {
         $gonextpage = $gopreviouspage = false;
@@ -57,15 +57,15 @@
 
     if ($id) {
         if (! $cm = get_coursemodule_from_id('feedback', $id)) {
-            error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
      
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            error("Course is misconfigured");
+            print_error('coursemisconf');
         }
      
         if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
-            error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     }
 
@@ -84,7 +84,7 @@
     if($course->id == SITEID AND !$capabilities->edititems) {
         if($DB->get_records('feedback_sitecourse_map', array('feedbackid'=>$feedback->id))) {
             if(!$DB->get_record('feedback_sitecourse_map', array('feedbackid'=>$feedback->id, 'courseid'=>$courseid))){
-                error("this feedback is not available");
+                print_error('notavailable', 'feedback');
             }
         }
     }
@@ -109,12 +109,12 @@
             require_course_login($course2); //this overwrites the object $course :-(
             $course = $DB->get_record("course", array("id"=>$cm->course)); // the workaround
         }else {
-            error("courseid is not correct");
+            print_error('invalidcourseid');
         }
     }
     
     if(!$capabilities->complete) {
-        error(get_string('error'));
+        print_error('error');
     }
     
     /// Print the page header
@@ -168,7 +168,8 @@
     if($feedback_can_submit) {
         //preserving the items
         if($preservevalues == 1){
-            if(!$SESSION->feedback->is_started == true)error('error', $CFG->wwwroot.'/course/view.php?id='.$course->id);
+            if(!$SESSION->feedback->is_started == true)
+                print_error('error', '', $CFG->wwwroot.'/course/view.php?id='.$course->id);
             //checken, ob alle required items einen wert haben
             if(feedback_check_values($_POST, $startitempos, $lastitempos)) {
                     $userid = $USER->id; //arb
@@ -183,7 +184,7 @@
                     if(isset($lastpage)) {
                         $gopage = $lastpage;
                     }else {
-                        error('parameter failed');
+                        print_error('missingparameter');
                     }
                 }
             }else {
@@ -192,7 +193,7 @@
                 if(isset($lastpage)) {
                     $gopage = $lastpage;
                 }else {
-                    error('parameter failed');
+                    print_error('missingparameter');
                 }
             
             }

diff --git a/mod/feedback/index.php b/mod/feedback/index.php
index f89f53bb3635aeed98cbd70ede8184c84086c3a3..efd3a1489bc6c94907bb5e5403e1fcebef62cef6 100644 (file)
--- a/mod/feedback/index.php
+++ b/mod/feedback/index.php
@@ -14,7 +14,7 @@
     $id = required_param('id', PARAM_INT);
 
     if (!$course = $DB->get_record('course', array('id'=>$id))) {
-        error("Course ID is incorrect");
+        print_error('invalidcourseid');
     }
     $capabilities = feedback_load_course_capabilities($course->id);
 

diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 150e18315ad49e0d8bac1e3a9874b0c87d2586f3..006ba7049763c90fffe12c0f1dd4c484e05b43e9 100644 (file)
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -39,15 +39,15 @@
 
     if ($id) {
         if (! $cm = get_coursemodule_from_id('feedback', $id)) {
-            error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
      
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            error("Course is misconfigured");
+            print_error('coursemisconf');
         }
      
         if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
-            error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     }
     
@@ -65,11 +65,11 @@
     require_login($course->id, true, $cm);
     
     if(($formdata = data_submitted()) AND !confirm_sesskey()) {
-        error('no sesskey defined');
+        print_error('invalidsesskey');
     }
     
     if(!$capabilities->viewreports){
-        error(get_string('error'));
+        print_error('error');
     }
 
     ////////////////////////////////////////////////////////

diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index 3fc600a93b6ca0b8b16186a3cc51bdbae37967ea..bed5ba0418e40a22360cb57bb4b6d08fba67e063 100644 (file)
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -18,20 +18,20 @@
     $userid = optional_param('userid', false, PARAM_INT);
     
     if(($formdata = data_submitted()) AND !confirm_sesskey()) {
-        error('no sesskey defined');
+        print_error('invalidsesskey');
     }
 
     if ($id) {
         if (! $cm = get_coursemodule_from_id('feedback', $id)) {
-            error("Course Module ID was incorrect");
+            print_error('invalidcoursemodule');
         }
      
         if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            error("Course is misconfigured");
+            print_error('coursemisconf');
         }
      
         if (! $feedback = $DB->get_record("feedback", array("id"=>$cm->instance))) {
-            error("Course module is incorrect");
+            print_error('invalidcoursemodule');
         }
     }
     $capabilities = feedback_load_capabilities($cm->id);
@@ -39,7 +39,7 @@
     require_login($course->id, true, $cm);
     
     if(!$capabilities->viewreports){
-        error(get_string('error'));
+        print_error('error');
     }