WIP2

Author: mchurchward

db/access.php

@@ -33,9 +33,9 @@
         'contextlevel' => CONTEXT_COURSE,
         'archetypes' => [
             'editingteacher' => CAP_ALLOW,
-            'manager' => CAP_ALLOW
+            'manager' => CAP_ALLOW,
         ],
-        'clonepermissionsfrom' => 'moodle/course:manageactivities'
+        'clonepermissionsfrom' => 'moodle/course:manageactivities',
     ],
     // Ability to see that the questionnaire exists, and the basic information
     // about it.

db/log.php

@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$logs = array(
+$logs = [
     ['module' => 'questionnaire', 'action' => 'view all', 'mtable' => 'questionnaire', 'field' => 'name'],
     ['module' => 'questionnaire', 'action' => 'submit', 'mtable' => 'questionnaire_response', 'field' => 'id'],
     ['module' => 'questionnaire', 'action' => 'view', 'mtable' => 'questionnaire', 'field' => 'name'],
-);
+];

db/upgrade.php

@@ -418,7 +418,7 @@ function xmldb_questionnaire_upgrade($oldversion = 0) {
                 if (
                     ($choice->value == null || $choice->value == 'NULL') &&
                     !preg_match("/^([0-9]{1,3}=.*|!other=.*)$/", $choice->content)
-                    ) {
+                ) {
                     $content = questionnaire_choice_values($choice->content);
                     if (strpos($content->text, '=')) {
                         $newcontent = str_replace('=', '::', $content->text);

locallib.php

@@ -78,10 +78,12 @@
 ];
 
 global $autonumbering;
-$autonumbering = array (0 => get_string('autonumberno', 'questionnaire'),
-        1 => get_string('autonumberquestions', 'questionnaire'),
-        2 => get_string('autonumberpages', 'questionnaire'),
-        3 => get_string('autonumberpagesandquestions', 'questionnaire'));
+$autonumbering = [
+    0 => get_string('autonumberno', 'questionnaire'),
+    1 => get_string('autonumberquestions', 'questionnaire'),
+    2 => get_string('autonumberpages', 'questionnaire'),
+    3 => get_string('autonumberpagesandquestions', 'questionnaire'),
+];
 
 /**
  * Return the choice values for the content.
@@ -774,21 +776,26 @@ function questionnaire_check_page_breaks($questionnaire) {
     $delpb = 0;
     $sid = $questionnaire->survey->id;
     $positions = [];
-    if ($questions = $DB->get_records(
+    $questions = $DB->get_records(
         'questionnaire_question',
         ['surveyid' => $sid, 'deleted' => 'n'],
         'position'
-        )
-    ) {
+    );
+    if ($questions) {
         foreach ($questions as $key => $qu) {
             $newqu = new stdClass();
             $newqu->question_id = $key;
             $newqu->type_id = $qu->type_id;
             $newqu->qname = $qu->name;
             $newqu->qpos = $qu->position;
 
-            $dependencies = $DB->get_records('questionnaire_dependency', ['questionid' => $key, 'surveyid' => $sid],
-                    'id ASC', 'id, dependquestionid, dependchoiceid, dependlogic');
+            $dependencies = $DB->get_records(
+                'questionnaire_dependency',
+                ['questionid' => $key,
+                'surveyid' => $sid],
+                'id ASC',
+                'id, dependquestionid, dependchoiceid, dependlogic'
+            );
             $newqu->dependencies = $dependencies ?? [];
             $positions[] = (array)$newqu;
         }
@@ -865,7 +872,7 @@ function questionnaire_check_page_breaks($questionnaire) {
                 if (
                     ($prevtypeid != QUESPAGEBREAK && $diffdependencies != 0) ||
                     (!isset($qu['dependencies']) && isset($prevdependencies))
-                    ) {
+                ) {
                     $sql = 'SELECT MAX(position) as maxpos FROM {questionnaire_question} ' .
                         'WHERE surveyid = ' . $questionnaire->survey->id . ' AND deleted = \'n\'';
                     if ($record = $DB->get_record_sql($sql)) {
@@ -926,7 +933,7 @@ function questionnaire_prep_for_questionform($questionnaire, $qid, $qtype) {
             ['subdirs' => true],
             $question->content
         );
-        $question->content = array('text' => $content, 'format' => FORMAT_HTML, 'itemid' => $draftideditor);
+        $question->content = ['text' => $content, 'format' => FORMAT_HTML, 'itemid' => $draftideditor];
 
         if (isset($question->dependencies)) {
             foreach ($question->dependencies as $dependencies) {