"MDL-14129, fix print_error"

diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php
index 4ef835860483d327a7e4741cd69fcb1cb547972f..81b03c98a35ce41c64e81ed0cbc585faa4cf6516 100644 (file)
--- a/question/type/calculated/questiontype.php
+++ b/question/type/calculated/questiontype.php
@@ -247,7 +247,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
             if (  $todo=='create'){
                 if (!$datasetdef->id = insert_record(
                     'question_dataset_definitions', $datasetdef)) {
-                    print_error("Unable to create dataset $defid");
+                    print_error('cannotcreatedataset', 'question', '', $defid);
                 } 
            }  
            // Create relation to the dataset:
@@ -256,7 +256,8 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
            $questiondataset->datasetdefinition = $datasetdef->id;
             if (!insert_record('question_datasets',
                                $questiondataset)) {
-                print_error("Unable to create relation to dataset $dataset->name $todo");
+                print_error("cannotcreaterelation", 'question', '',
+                        array($dataset->name, $todo));
             }
             if ($todo=='create'){ // add the items
                 foreach ($dataset->datasetitem as $dataitem ){
@@ -265,7 +266,8 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
                     $datasetitem->itemnumber = $dataitem->itemnumber ;
                     $datasetitem->value = $dataitem->value ;
                     if (!insert_record('question_dataset_items', $datasetitem)) {
-                        print_error("Unable to insert dataset item $item->itemnumber with $item->value for $datasetdef->name");
+                        print_error('cannotinsertitem', 'question', '',
+                                array($item->itemnumber, $item->value, $datasetdef->name));
                     }
                 }     
             }                                
@@ -623,11 +625,11 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
                 // Reuse any previously used record
                 $addeditem->id = $fromform->itemid[$i];
                 if (!update_record('question_dataset_items', $addeditem)) {
-                    print_error("Error: Unable to update dataset item");
+                    print_error('cannotupdateitem', 'question');
                 }
             } else {
                 if (!insert_record('question_dataset_items', $addeditem)) {
-                    print_error("Error: Unable to insert dataset item");
+                    print_error('cannotinsert', 'question');
                 }
             }
 
@@ -674,7 +676,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
                         }
                         //pp  echo "<pre>"; print_r( $datasetitem );
                         if (!insert_record('question_dataset_items', $datasetitem)) {
-                            print_error("Error: Unable to insert new dataset item");
+                            print_error('cannotinsert', 'question');
                         }                        
                     }
                 }//for number added
@@ -698,7 +700,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
                     $datasetdef->itemcount= $newmaxnumber ;        
                     if (!update_record('question_dataset_definitions',
                                        $datasetdef)) {
-                         print_error("Error: Unable to update itemcount");
+                         print_error('cannotupdatecount', 'question');
                     }
                 }
             }
@@ -720,7 +722,7 @@ class question_calculated_qtype extends question_dataset_dependent_questiontype
             return sprintf("%.".$regs[4]."f",$nbr);
  
         } else {
-            print_error("The distribution $regs[1] caused problems");
+            print_error('disterror', 'question', '', $regs[1]);
         }
         return '';
     }

diff --git a/question/type/datasetdependent/abstractqtype.php b/question/type/datasetdependent/abstractqtype.php
index 323ff3633115037041cbc5c50c0908fd16579904..8c69db14e7b75c5455c1627b9c78ffc0ccbea3f1 100644 (file)
--- a/question/type/datasetdependent/abstractqtype.php
+++ b/question/type/datasetdependent/abstractqtype.php
@@ -36,8 +36,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                                  {$CFG->prefix}question_datasets b
                             WHERE b.question = $question->id
                             AND   a.id = b.datasetdefinition")) {
-            print_error("Couldn't get the specified dataset for a calculated " .
-                  "question! (question: {$question->id}");
+            print_error('cannotgetdsforquestion', 'question', '', $question->id);
         }
 
         // Choose a random dataset
@@ -131,7 +130,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                 require("$CFG->dirroot/question/type/datasetdependent/datasetitems.php");
                 break;
             default:
-                print_error('Incorrect or no wizard page specified!');
+                print_error('invalidwizardpage', 'question');
                 break;
         }
     }
@@ -160,7 +159,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                 $mform =& new question_dataset_dependent_items_form("$submiturl?wizardnow=datasetitems", $question, $regenerate);
                 break;
             default:
-                print_error('Incorrect or no wizard page specified!');
+                print_error('invalidwizardpage', 'question');
                 break;
         }
 
@@ -313,7 +312,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                 $this->save_dataset_items($question, $form);
                 break;
             default:
-                print_error('Incorrect or no wizard page specified!');
+                print_error('invalidwizardpage', 'question');
                 break;
         }
         return $question;
@@ -388,7 +387,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
 
             if (!$datasetdef->id = insert_record(
                     'question_dataset_definitions', $datasetdef)) {
-                print_error("Unable to create dataset $defid");
+                print_error("cannotcreatedataset", 'question', '', $defid);
             }
 
             if (0 != $datasetdef->category) {
@@ -419,7 +418,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
             $questiondataset->datasetdefinition = $datasetdef->id;
             if (!insert_record('question_datasets',
                                $questiondataset)) {
-                print_error("Unable to create relation to dataset $name");
+                print_error('cannotcreaterelation', 'question', '', $name);
             }
             unset($datasetdefinitions[$defid]);
         }
@@ -468,7 +467,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                    $datasetdef->itemcount =0;
                    if (!$datasetdef->id = insert_record(
                         'question_dataset_definitions', $datasetdef)) {
-                        print_error("Unable to create dataset $defid");
+                        print_error('cannotcreatedataset', 'question', '', $defid);
                    }
                    //copy the dataitems
                    $olditems = get_records_sql( // Use number as key!!
@@ -480,7 +479,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                         foreach($olditems as $item ){
                             $item->definition = $datasetdef->id;
                         if (!insert_record('question_dataset_items', $item)) {
-                            print_error("Unable to insert dataset item $item->itemnumber with $item->value for $datasetdef->name");
+                            print_error('cannotinsertitem', 'question', '', array($item->itemnumber, $item->value, $datasetdef->name));
                         }
                         $itemcount++;
                         }
@@ -496,7 +495,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                 $questiondataset->datasetdefinition = $datasetdef->id;
                 if (!insert_record('question_datasets',
                                    $questiondataset)) {
-                    print_error("Unable to create relation to dataset $name");
+                    print_error('cannotcreaterelation', 'question', '', $name);
                 }
                 unset($datasetdefinitions[$defid]);
                 continue;
@@ -504,7 +503,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
             // really new one code similar to save_dataset_definitions()
             if (!$datasetdef->id = insert_record(
                     'question_dataset_definitions', $datasetdef)) {
-                print_error("Unable to create dataset $defid");
+                print_error('cannotcreatedataset', 'question', '', $defid);
             }
 
             if (0 != $datasetdef->category) {
@@ -535,7 +534,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
             $questiondataset->datasetdefinition = $datasetdef->id;
             if (!insert_record('question_datasets',
                                $questiondataset)) {
-                print_error("Unable to create relation to dataset $name");
+                print_error('cannotcreaterelation', 'question', '', $name);
             }
             unset($datasetdefinitions[$defid]);
         }
@@ -608,7 +607,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
 
                 break;
             default:
-                print_error('Incorrect or no wizard page specified!');
+                print_error('invalidwizardpage', 'question');
                 break;
         }
         return $question;
@@ -633,16 +632,14 @@ class question_dataset_dependent_questiontype extends default_questiontype {
                         AND q.datasetdefinition = d.id
                         AND d.id = i.definition
                         AND i.itemnumber = $datasetitem")) {
-            print_error("Couldn't get the specified dataset for a dataset dependent " .
-                  "question! (question: {$question->id}, " .
-                  "datasetitem: {$datasetitem})");
+            print_error('cannotgetdsfordependent', 'question', '', array($question->id, $datasetitem));
         }
         array_walk($dataset, create_function('&$val', '$val = $val->value;'));
         return $dataset;
     }
 
     function create_virtual_qtype() {
-        print_error("No virtual question type for question type ".$this->name());
+        print_error("novirtualquestion", 'question', '', $this->name());
     }
 
     function get_virtual_qtype() {
@@ -757,7 +754,7 @@ class question_dataset_dependent_questiontype extends default_questiontype {
 
     function create_virtual_nameprefix($nameprefix, $datasetinput) {
         if (!ereg('([0-9]+)' . $this->name() . '$', $nameprefix, $regs)) {
-            print_error("Wrongly formatted nameprefix $nameprefix");
+            print_error('wrongprefix', 'question', '', $nameprefix);
         }
         $virtualqtype = $this->get_virtual_qtype();
         return $nameprefix . $regs[1] . $virtualqtype->name();

diff --git a/question/type/description/questiontype.php b/question/type/description/questiontype.php
index 85ec40dce8dc1d67d039288b1fc6d7f6e70f5cc2..6dfe2e275043c50d00e46b7d60d077806e2eefbc 100644 (file)
--- a/question/type/description/questiontype.php
+++ b/question/type/description/questiontype.php
@@ -51,7 +51,7 @@ class description_qtype extends default_questiontype {
         } else if (!empty($cmoptions->course)) {
             $cmorcourseid = '&courseid='.$cmoptions->course;
         } else {
-            print_error('Need to provide courseid or cmid to print_question.');
+            print_error('missingcourseorcmid', 'question');
         }
 
         // For editing teachers print a link to an editing popup window

diff --git a/question/type/numerical/questiontype.php b/question/type/numerical/questiontype.php
index 0c08fdc409221bd414f5298dc9eda5dcc4a5e025..5dee90e03cb8998b51000898ace95bedce2136d8 100644 (file)
--- a/question/type/numerical/questiontype.php
+++ b/question/type/numerical/questiontype.php
@@ -344,7 +344,7 @@ class question_numerical_qtype extends question_shortanswer_qtype {
                 $min = $answer->answer / $quotient;
                 break;
             default:
-                print_error("Unknown tolerance type $answer->tolerancetype");
+                print_error('unknowntolerance', 'question', '', $answer->tolerancetype);
         }
 
         $answer->min = $min;

diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 19ef60a89b72fa01fad86e21d8da6c765fc6e7a5..8753e90a97cc6de94aee9c60795cdafc4bd3f384 100644 (file)
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -282,7 +282,7 @@ class default_questiontype {
             $question->modifiedby = $USER->id;
             $question->timemodified = time();
             if (!update_record('question', $question)) {
-                print_error('Could not update question!');
+                print_error('cannotupdatequestion', 'question');
             }
         } else {         // Question is a new one
             if (isset($form->categorymoveto)){
@@ -302,7 +302,7 @@ class default_questiontype {
             $question->timecreated = time();
             $question->timemodified = time();
             if (!$question->id = insert_record('question', $question)) {
-                print_error('Could not insert new question!');
+                print_error('cannotinsertquestion', 'question');
             }
         }
 
@@ -332,7 +332,7 @@ class default_questiontype {
 
         // Give the question a unique version stamp determined by question_hash()
         if (!set_field('question', 'version', question_hash($question), 'id', $question->id)) {
-            print_error('Could not update question version field');
+            print_error('cannotupdatequestionver', 'question');
         }
 
         return $question;
@@ -824,7 +824,7 @@ class default_questiontype {
             $context = get_context_instance(CONTEXT_COURSE, $cmoptions->course);
             $cmorcourseid = '&courseid='.$cmoptions->course;
         } else {
-            print_error('Need to provide courseid or cmid to print_question.');
+            print_error('missingcourseorcmid', 'question');
         }
 
         // For editing teachers print a link to an editing popup window