GHI622 Replace deprecated error functions (#660)

Co-authored-by: Mike Churchward <mike.churchward@poetopensource.org>

Author: sharpchi

classes/question/question.php

@@ -1673,7 +1673,7 @@ protected function form_preprocess_data($formdata) {
      */
     protected function form_preprocess_choicedata($formdata) {
         if (empty($formdata->allchoices)) {
-            error(get_string('enterpossibleanswers', 'questionnaire'));
+            throw new \moodle_exception('enterpossibleanswers', 'mod_questionnaire');
         }
         return false;
     }

lang/en/questionnaire.php

@@ -123,6 +123,7 @@
 $string['contentoptions'] = 'Content options';
 $string['couldnotcreatenewsurvey'] = 'Could not create a new survey!';
 $string['couldnotdelresp'] = 'Could not delete response ';
+$string['couldnotdelrespby'] = 'Could not delete response {$a->rid} by {$a->user}';
 $string['createcontent'] = 'Define New Content';
 $string['createcontent_help'] = 'Select one of the radio button options. \'Create new\' is the default.';
 $string['createcontent_link'] = 'mod/questionnaire/mod#Content_Options';
@@ -182,6 +183,7 @@
 $string['emailsnotspecified'] = 'No email(s) were specified.';
 $string['emailssent'] = 'Downloads sent to specified email(s).';
 $string['enabled'] = 'Enabled';
+$string['enterpossibleanswers'] = 'Enter possible answers';
 $string['errnewname'] = 'Sorry, name already in use. Pick a new name.';
 $string['erroropening'] = 'Error opening questionnaire.';
 $string['errortable'] = 'Error system table corrupt.';

report.php

@@ -220,8 +220,6 @@
         require_capability('mod/questionnaire:deleteresponses', $context);
 
         if (empty($questionnaire->survey)) {
-            $id = $questionnaire->survey;
-            notify("questionnaire->survey = /$id/");
             throw new \moodle_exception('surveynotexists', 'mod_questionnaire');
         } else if ($questionnaire->survey->courseid != $course->id) {
             throw new \moodle_exception('surveyowner', 'mod_questionnaire');
@@ -366,11 +364,17 @@
             } else {
                 $ruser = $response->userid;
             }
-            error(
-                get_string('couldnotdelresp', 'questionnaire') .
-                    $rid . get_string('by', 'questionnaire') . $ruser . '?',
-                $CFG->wwwroot . '/mod/questionnaire/report.php?action=vresp&sid=' . $sid . '&&instance=' .
-                    $instance . 'byresponse=1'
+            $link = new \moodle_url('/mod/questionnaire/report.php', [
+                'action' => 'vresp',
+                'sid' => $sid,
+                'instance' => $instance,
+                'byresponse' => '1',
+            ]);
+            throw new \moodle_exception(
+                'couldnotdelrespby',
+                'mod_questionnaire',
+                $link,
+                ['rid' => $rid, 'user' => $ruser]
             );
         }
         break;
@@ -442,10 +446,12 @@
 
             redirect($redirection);
         } else {
-            error(
-                get_string('couldnotdelresp', 'questionnaire'),
-                $CFG->wwwroot . '/mod/questionnaire/report.php?action=vall&sid=' . $sid . '&instance=' . $instance
-            );
+            $link = new \moodle_url('/mod/questionnaire/report.php', [
+                'action' => 'vall',
+                'sid' => $sid,
+                'instance' => $instance,
+            ]);
+            throw new \moodle_exception('couldnotdelresp', 'mod_questionnaire', $link);
         }
         break;