Fix upload when several file upload questions are used.

- Adjust siganture of methods to their parent
- Limit the files to upload to one for each question
- Use questionaire id for file draft area instead of question id in
  the questionaire.

Author: srobotta

classes/file_storage.php

@@ -17,7 +17,7 @@
 namespace mod_questionnaire;
 
 /**
- * Defines the file stoeage class for questionnaire.
+ * Defines the file storage class for questionnaire.
  * @package mod_questionnaire
  * @copyright  2020 onwards Mike Churchward ([email protected])
  * @author Mike Churchward

classes/question/file.php

@@ -70,12 +70,12 @@ protected function responseclass() {
     /**
      * Survey display output.
      *
-     * @param response $response
+     * @param \stdClass $formdata
      * @param object $descendantsdata
      * @param bool $blankquestionnaire
-     * @return object|string
+     * @return string
      */
-    protected function question_survey_display($response, $descendantsdata, $blankquestionnaire = false) {
+    protected function question_survey_display($formdata, $descendantsdata, $blankquestionnaire = false) {
         global $CFG, $PAGE;
         require_once($CFG->libdir . '/filelib.php');
         $elname = 'q' . $this->id;
@@ -114,27 +114,29 @@ private function get_file_manager_option() {
         return [
             'mainfile' => '',
             'subdirs' => false,
-            'accepted_types' => array('image', '.pdf')
+            'accepted_types' => array('image', '.pdf'),
+            'maxfiles' => 1,
         ];
     }
 
     /**
      * Response display output.
      *
-     * @param response $response
-     * @return object|string
+     * @param \stdClass $data
+     * @return string
      */
-    protected function response_survey_display($response) {
+    protected function response_survey_display($data) {
         global $PAGE, $CFG;
         require_once($CFG->libdir . '/filelib.php');
         require_once($CFG->libdir . '/resourcelib.php');
-        if (isset($response->answers[$this->id])) {
-            $answer = reset($response->answers[$this->id]);
+        if (isset($data->answers[$this->id])) {
+            $answer = reset($data->answers[$this->id]);
         } else {
             return '';
         }
         $fs = get_file_storage();
         $file = $fs->get_file_by_id($answer->value);
+        $code = '';
 
         if ($file) {
             // There is a file.
@@ -150,8 +152,6 @@ protected function response_survey_display($response) {
             $mimetype = $file->get_mimetype();
             $title = '';
 
-            $extension = resourcelib_get_extension($file->get_filename());
-
             $mediamanager = core_media_manager::instance($PAGE);
             $embedoptions = array(
                 core_media_manager::OPTION_TRUSTED => true,
@@ -177,11 +177,7 @@ protected function response_survey_display($response) {
                 $code = resourcelib_embed_general($moodleurl, $title, get_string('view'), $mimetype);
             }
         }
-        $output = '';
-        $output .= '<div class="response text">';
-        $output .= $code;
-        $output .= '</div>';
-        return $output;
+        return '<div class="response text">' . $code . '</div>';
     }
 
     /**

classes/responsetype/file.php

@@ -43,9 +43,9 @@ public static function answers_from_webform($responsedata, $question) {
             $record->responseid = $responsedata->rid;
             $record->questionid = $question->id;
 
-            file_save_draft_area_files($val, $question->context->id, 'mod_questionnaire', 'file', $responsedata->rid);
+            file_save_draft_area_files($val, $question->context->id, 'mod_questionnaire', 'file', $question->id);
             $fs = get_file_storage();
-            $files = $fs->get_area_files($question->context->id, 'mod_questionnaire', 'file', $responsedata->rid,
+            $files = $fs->get_area_files($question->context->id, 'mod_questionnaire', 'file', $question->id,
                 "itemid, filepath, filename",
                 false);
             $file = reset($files);

classes/responsetype/response/response.php

@@ -99,9 +99,9 @@ public static function create_from_data($responsedata) {
     /**
      * Provide a response object from web form data to the question.
      *
-     * @param \stdClass $responsedata All of the responsedata as an object.
+     * @param \stdClass $responsedata All the responsedata as an object.
      * @param array $questions
-     * @return bool|response A response object.
+     * @return response A response object.
      */
     public static function response_from_webform($responsedata, $questions) {
         global $USER;

questionnaire.class.php

@@ -122,12 +122,12 @@ public function add_survey($sid = 0, $survey = null) {
 
     /**
      * Adding questions to the object.
-     * @param bool $sid
+     * @param int $sid
      */
-    public function add_questions($sid = false) {
+    public function add_questions($sid = 0) {
         global $DB;
 
-        if ($sid === false) {
+        if ($sid === 0) {
             $sid = $this->sid;
         }