From 4eb3d5a47e86e363e97bdea3d76c097b3fa020e1 Mon Sep 17 00:00:00 2001 From: Mike Churchward Date: Tue, 7 Mar 2023 15:49:51 -0500 Subject: [PATCH] Appeasing the CI. --- backup/moodle1/lib.php | 6 ++--- classes/question/question.php | 34 +++++++++++++------------- complete.php | 2 +- lib.php | 32 ++++++++++++------------ locallib.php | 30 +++++++++++------------ preview.php | 8 +++--- qsettings.php | 12 ++++----- questionnaire.class.php | 34 +++++++++++++------------- questions.php | 14 +++++------ report.php | 4 +-- show_nonrespondents.php | 46 +++++++++++++++++------------------ tabs.php | 8 +++--- tests/generator/lib.php | 36 +++++++++++++-------------- tests/generator_test.php | 14 +++++------ version.php | 6 ++--- 15 files changed, 143 insertions(+), 143 deletions(-) diff --git a/backup/moodle1/lib.php b/backup/moodle1/lib.php index bdec7e10..bd8d7d9b 100644 --- a/backup/moodle1/lib.php +++ b/backup/moodle1/lib.php @@ -68,9 +68,9 @@ public function get_paths() { public function process_questionnaire($data) { // Get the course module id and context id. $instanceid = $data['id']; - $cminfo = $this->get_cminfo($instanceid); - $moduleid = $cminfo['id']; - $contextid = $this->converter->get_contextid(CONTEXT_MODULE, $moduleid); + $cminfo = $this->get_cminfo($instanceid); + $moduleid = $cminfo['id']; + $contextid = $this->converter->get_contextid(CONTEXT_MODULE, $moduleid); // We now have all information needed to start writing into the file. $this->open_xml_writer("activities/questionnaire_{$moduleid}/questionnaire.xml"); diff --git a/classes/question/question.php b/classes/question/question.php index 38a90682..faa4ec80 100644 --- a/classes/question/question.php +++ b/classes/question/question.php @@ -62,19 +62,19 @@ abstract class question { // Class Properties. /** @var int $id The database id of this question. */ - public $id = 0; + public $id = 0; /** @var int $surveyid The database id of the survey this question belongs to. */ - public $surveyid = 0; + public $surveyid = 0; /** @var string $name The name of this question. */ - public $name = ''; + public $name = ''; /** @var string $type The name of the question type. */ - public $type = ''; + public $type = ''; /** @var array $choices Array holding any choices for this question. */ - public $choices = []; + public $choices = []; /** @var array $dependencies Array holding any dependencies for this question. */ public $dependencies = []; @@ -83,25 +83,25 @@ abstract class question { public $responsetable = ''; /** @var int $length The length field. */ - public $length = 0; + public $length = 0; /** @var int $precise The precision field. */ - public $precise = 0; + public $precise = 0; /** @var int $position Position in the questionnaire */ - public $position = 0; + public $position = 0; /** @var string $content The question's content. */ - public $content = ''; + public $content = ''; /** @var string $allchoices The list of all question's choices. */ - public $allchoices = ''; + public $allchoices = ''; /** @var boolean $required The required flag. */ - public $required = 'n'; + public $required = 'n'; /** @var boolean $deleted The deleted flag. */ - public $deleted = 'n'; + public $deleted = 'n'; /** @var mixed $extradata Any custom data for the question type. */ public $extradata = ''; @@ -1303,8 +1303,8 @@ public function form_update($formdata, $questionnaire) { // Update existing question. // Handle any attachments in the content. - $formdata->itemid = $formdata->content['itemid']; - $formdata->format = $formdata->content['format']; + $formdata->itemid = $formdata->content['itemid']; + $formdata->format = $formdata->content['format']; $formdata->content = $formdata->content['text']; $formdata->content = file_save_draft_area_files($formdata->itemid, $questionnaire->context->id, 'mod_questionnaire', 'question', $formdata->qid, ['subdirs' => true], $formdata->content); @@ -1339,10 +1339,10 @@ public function form_update($formdata, $questionnaire) { $this->add($questionrecord); // Handle any attachments in the content. - $formdata->itemid = $formdata->content['itemid']; - $formdata->format = $formdata->content['format']; + $formdata->itemid = $formdata->content['itemid']; + $formdata->format = $formdata->content['format']; $formdata->content = $formdata->content['text']; - $content = file_save_draft_area_files($formdata->itemid, $questionnaire->context->id, 'mod_questionnaire', + $content = file_save_draft_area_files($formdata->itemid, $questionnaire->context->id, 'mod_questionnaire', 'question', $this->qid, ['subdirs' => true], $formdata->content); $DB->set_field('questionnaire_question', 'content', $content, ['id' => $this->qid]); } diff --git a/complete.php b/complete.php index b6b24dec..9950770f 100644 --- a/complete.php +++ b/complete.php @@ -60,7 +60,7 @@ $questionnaire->add_page(new \mod_questionnaire\output\completepage()); $questionnaire->strquestionnaires = get_string("modulenameplural", "questionnaire"); -$questionnaire->strquestionnaire = get_string("modulename", "questionnaire"); +$questionnaire->strquestionnaire = get_string("modulename", "questionnaire"); // Mark as viewed. $completion = new completion_info($course); diff --git a/lib.php b/lib.php index fdbd465c..46ac3232 100644 --- a/lib.php +++ b/lib.php @@ -453,12 +453,12 @@ function questionnaire_grade_item_update($questionnaire, $grades = null) { if ($questionnaire->grade > 0) { $params['gradetype'] = GRADE_TYPE_VALUE; - $params['grademax'] = $questionnaire->grade; - $params['grademin'] = 0; + $params['grademax'] = $questionnaire->grade; + $params['grademin'] = 0; } else if ($questionnaire->grade < 0) { $params['gradetype'] = GRADE_TYPE_SCALE; - $params['scaleid'] = -$questionnaire->grade; + $params['scaleid'] = -$questionnaire->grade; } else if ($questionnaire->grade == 0) { // No Grade..be sure to delete the grade item if it exists. $grades = null; @@ -865,11 +865,11 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart if ($groupid) { $groupselect = 'AND gm.groupid = :groupid'; - $groupjoin = 'JOIN {groups_members} gm ON gm.userid=u.id'; + $groupjoin = 'JOIN {groups_members} gm ON gm.userid=u.id'; $params['groupid'] = $groupid; } else { $groupselect = ''; - $groupjoin = ''; + $groupjoin = ''; } $params['timestart'] = $timestart; @@ -891,8 +891,8 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart } $accessallgroups = has_capability('moodle/site:accessallgroups', $context); - $viewfullnames = has_capability('moodle/site:viewfullnames', $context); - $groupmode = groups_get_activity_groupmode($cm, $course); + $viewfullnames = has_capability('moodle/site:viewfullnames', $context); + $groupmode = groups_get_activity_groupmode($cm, $course); $usersgroups = null; $aname = format_string($cm->name, true); @@ -929,19 +929,19 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart $tmpactivity = new stdClass(); - $tmpactivity->type = 'questionnaire'; - $tmpactivity->cmid = $cm->id; + $tmpactivity->type = 'questionnaire'; + $tmpactivity->cmid = $cm->id; $tmpactivity->cminstance = $cm->instance; // Current user is admin - or teacher enrolled in original public course. if (isset($cmoriginal)) { $tmpactivity->cminstance = $cmoriginal->instance; } $tmpactivity->cannotview = false; - $tmpactivity->anonymous = false; - $tmpactivity->name = $aname; + $tmpactivity->anonymous = false; + $tmpactivity->name = $aname; $tmpactivity->sectionnum = $cm->sectionnum; - $tmpactivity->timestamp = $attempt->submitted; - $tmpactivity->groupid = $groupid; + $tmpactivity->timestamp = $attempt->submitted; + $tmpactivity->groupid = $groupid; if (isset($userattempts[$attempt->lastname])) { $tmpactivity->nbattempts = $userattempts[$attempt->lastname]; } @@ -963,7 +963,7 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart } } if ($questionnaire->respondenttype != 'anonymous') { - $tmpactivity->user->fullname = fullname($attempt, $viewfullnames); + $tmpactivity->user->fullname = fullname($attempt, $viewfullnames); } else { $tmpactivity->user = ''; unset ($tmpactivity->user); @@ -1065,9 +1065,9 @@ function questionnaire_print_overview($courses, &$htmlarray) { } // Get Necessary Strings. - $strquestionnaire = get_string('modulename', 'questionnaire'); + $strquestionnaire = get_string('modulename', 'questionnaire'); $strnotattempted = get_string('noattempts', 'questionnaire'); - $strattempted = get_string('attempted', 'questionnaire'); + $strattempted = get_string('attempted', 'questionnaire'); $strsavedbutnotsubmitted = get_string('savedbutnotsubmitted', 'questionnaire'); $now = time(); diff --git a/locallib.php b/locallib.php index 6eec045a..f58a5d49 100644 --- a/locallib.php +++ b/locallib.php @@ -186,23 +186,23 @@ function questionnaire_load_capabilities($cmid) { $context = questionnaire_get_context($cmid); $cb = new stdClass(); - $cb->view = has_capability('mod/questionnaire:view', $context); - $cb->submit = has_capability('mod/questionnaire:submit', $context); - $cb->viewsingleresponse = has_capability('mod/questionnaire:viewsingleresponse', $context); + $cb->view = has_capability('mod/questionnaire:view', $context); + $cb->submit = has_capability('mod/questionnaire:submit', $context); + $cb->viewsingleresponse = has_capability('mod/questionnaire:viewsingleresponse', $context); $cb->submissionnotification = has_capability('mod/questionnaire:submissionnotification', $context); - $cb->downloadresponses = has_capability('mod/questionnaire:downloadresponses', $context); - $cb->deleteresponses = has_capability('mod/questionnaire:deleteresponses', $context); - $cb->manage = has_capability('mod/questionnaire:manage', $context); - $cb->editquestions = has_capability('mod/questionnaire:editquestions', $context); - $cb->createtemplates = has_capability('mod/questionnaire:createtemplates', $context); - $cb->createpublic = has_capability('mod/questionnaire:createpublic', $context); - $cb->readownresponses = has_capability('mod/questionnaire:readownresponses', $context); - $cb->readallresponses = has_capability('mod/questionnaire:readallresponses', $context); + $cb->downloadresponses = has_capability('mod/questionnaire:downloadresponses', $context); + $cb->deleteresponses = has_capability('mod/questionnaire:deleteresponses', $context); + $cb->manage = has_capability('mod/questionnaire:manage', $context); + $cb->editquestions = has_capability('mod/questionnaire:editquestions', $context); + $cb->createtemplates = has_capability('mod/questionnaire:createtemplates', $context); + $cb->createpublic = has_capability('mod/questionnaire:createpublic', $context); + $cb->readownresponses = has_capability('mod/questionnaire:readownresponses', $context); + $cb->readallresponses = has_capability('mod/questionnaire:readallresponses', $context); $cb->readallresponseanytime = has_capability('mod/questionnaire:readallresponseanytime', $context); - $cb->printblank = has_capability('mod/questionnaire:printblank', $context); - $cb->preview = has_capability('mod/questionnaire:preview', $context); + $cb->printblank = has_capability('mod/questionnaire:printblank', $context); + $cb->preview = has_capability('mod/questionnaire:preview', $context); - $cb->viewhiddenactivities = has_capability('moodle/course:viewhiddenactivities', $context, null, false); + $cb->viewhiddenactivities = has_capability('moodle/course:viewhiddenactivities', $context, null, false); return $cb; } @@ -534,7 +534,7 @@ function questionnaire_set_events($questionnaire) { calendar_event::create($event); } else { // Separate start and end events. - $event->timeduration = 0; + $event->timeduration = 0; if ($questionnaire->opendate) { $event->name = $questionnaire->name.' ('.get_string('questionnaireopens', 'questionnaire').')'; $event->timesort = $questionnaire->opendate; diff --git a/preview.php b/preview.php index aec2adeb..49245e3e 100644 --- a/preview.php +++ b/preview.php @@ -26,10 +26,10 @@ require_once("../../config.php"); require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php'); -$id = optional_param('id', 0, PARAM_INT); -$sid = optional_param('sid', 0, PARAM_INT); -$popup = optional_param('popup', 0, PARAM_INT); -$qid = optional_param('qid', 0, PARAM_INT); +$id = optional_param('id', 0, PARAM_INT); +$sid = optional_param('sid', 0, PARAM_INT); +$popup = optional_param('popup', 0, PARAM_INT); +$qid = optional_param('qid', 0, PARAM_INT); $currentgroupid = optional_param('group', 0, PARAM_INT); // Groupid. if ($id) { diff --git a/qsettings.php b/qsettings.php index 22fae579..16179ab0 100644 --- a/qsettings.php +++ b/qsettings.php @@ -95,9 +95,9 @@ $sdata->infoitemid = $settings->info['itemid']; $sdata->infoformat = $settings->info['format']; - $sdata->info = $settings->info['text']; - $sdata->info = file_save_draft_area_files($sdata->infoitemid, $context->id, 'mod_questionnaire', 'info', - $sdata->id, array('subdirs' => true), $sdata->info); + $sdata->info = $settings->info['text']; + $sdata->info = file_save_draft_area_files($sdata->infoitemid, $context->id, 'mod_questionnaire', 'info', + $sdata->id, array('subdirs' => true), $sdata->info); $sdata->theme = ''; // Deprecated theme field. $sdata->thanks_page = $settings->thanks_page; @@ -105,9 +105,9 @@ $sdata->thankitemid = $settings->thank_body['itemid']; $sdata->thankformat = $settings->thank_body['format']; - $sdata->thank_body = $settings->thank_body['text']; - $sdata->thank_body = file_save_draft_area_files($sdata->thankitemid, $context->id, 'mod_questionnaire', 'thankbody', - $sdata->id, array('subdirs' => true), $sdata->thank_body); + $sdata->thank_body = $settings->thank_body['text']; + $sdata->thank_body = file_save_draft_area_files($sdata->thankitemid, $context->id, 'mod_questionnaire', 'thankbody', + $sdata->id, array('subdirs' => true), $sdata->thank_body); $sdata->email = $settings->email; $sdata->courseid = $settings->courseid; diff --git a/questionnaire.class.php b/questionnaire.class.php index 5ae2234b..901b07dd 100644 --- a/questionnaire.class.php +++ b/questionnaire.class.php @@ -2125,21 +2125,21 @@ private function send_submission_notifications($rid) { */ private function send_message($info, $eventtype) { $eventdata = new \core\message\message(); - $eventdata->courseid = $this->course->id; - $eventdata->modulename = 'questionnaire'; - $eventdata->userfrom = $info->userfrom; - $eventdata->userto = $info->userto; - $eventdata->subject = $info->postsubject; - $eventdata->fullmessage = $info->posttext; + $eventdata->courseid = $this->course->id; + $eventdata->modulename = 'questionnaire'; + $eventdata->userfrom = $info->userfrom; + $eventdata->userto = $info->userto; + $eventdata->subject = $info->postsubject; + $eventdata->fullmessage = $info->posttext; $eventdata->fullmessageformat = FORMAT_PLAIN; - $eventdata->fullmessagehtml = $info->posthtml; - $eventdata->smallmessage = $info->postsubject; + $eventdata->fullmessagehtml = $info->posthtml; + $eventdata->smallmessage = $info->postsubject; - $eventdata->name = $eventtype; - $eventdata->component = 'mod_questionnaire'; - $eventdata->notification = 1; - $eventdata->contexturl = $info->submissionurl; - $eventdata->contexturlname = $info->name; + $eventdata->name = $eventtype; + $eventdata->component = 'mod_questionnaire'; + $eventdata->notification = 1; + $eventdata->contexturl = $info->submissionurl; + $eventdata->contexturlname = $info->name; message_send($eventdata); } @@ -2362,10 +2362,10 @@ private function response_send_email($rid, $email) { '&rid='.$rid.'&instance='.$this->id; // Html and plaintext body. - $bodyhtml = ''.$url.''.$endhtml; - $bodyplaintext = $url.$endplaintext; - $bodyhtml .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endhtml; - $bodyplaintext .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endplaintext; + $bodyhtml = ''.$url.''.$endhtml; + $bodyplaintext = $url.$endplaintext; + $bodyhtml .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endhtml; + $bodyplaintext .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endplaintext; $bodyhtml .= $answers['html']; $bodyplaintext .= $answers['plaintext']; diff --git a/questions.php b/questions.php index c24a8765..6175512c 100644 --- a/questions.php +++ b/questions.php @@ -26,12 +26,12 @@ require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php'); require_once($CFG->dirroot.'/mod/questionnaire/classes/question/question.php'); // Needed for question type constants. -$id = required_param('id', PARAM_INT); // Course module ID. +$id = required_param('id', PARAM_INT); // Course module ID. $action = optional_param('action', 'main', PARAM_ALPHA); // Screen. -$qid = optional_param('qid', 0, PARAM_INT); // Question id. -$moveq = optional_param('moveq', 0, PARAM_INT); // Question id to move. -$delq = optional_param('delq', 0, PARAM_INT); // Question id to delete. -$qtype = optional_param('type_id', 0, PARAM_INT); // Question type. +$qid = optional_param('qid', 0, PARAM_INT); // Question id. +$moveq = optional_param('moveq', 0, PARAM_INT); // Question id to move. +$delq = optional_param('delq', 0, PARAM_INT); // Question id to delete. +$qtype = optional_param('type_id', 0, PARAM_INT); // Question type. $currentgroupid = optional_param('group', 0, PARAM_INT); // Group id. if (! $cm = get_coursemodule_from_id('questionnaire', $id)) { @@ -401,8 +401,8 @@ $qid = key($qformdata->removebutton); if ($dependants) { // Show the dependencies and inform about the dependencies to be removed. - // Split dependencies in direct and indirect ones to separate for the confirm-dialogue. Only direct ones will be deleted. - // List direct dependencies. + // Split dependencies in direct and indirect ones to separate for the confirm-dialogue. + // Only direct ones will be deleted. List direct dependencies. $msg .= $questionnaire->renderer->dependency_warnings($dependants->directs, 'directwarnings', $strnum); // List indirect dependencies. $msg .= $questionnaire->renderer->dependency_warnings($dependants->indirects, 'indirectwarnings', $strnum); diff --git a/report.php b/report.php index 9d1cd115..e66b3555 100755 --- a/report.php +++ b/report.php @@ -491,8 +491,8 @@ $name = preg_replace("/[^A-Z0-9]+/i", "_", trim($name)); $choicecodes = optional_param('choicecodes', '0', PARAM_INT); - $choicetext = optional_param('choicetext', '0', PARAM_INT); - $showincompletes = optional_param('complete', '0', PARAM_INT); + $choicetext = optional_param('choicetext', '0', PARAM_INT); + $showincompletes = optional_param('complete', '0', PARAM_INT); $rankaverages = optional_param('rankaverages', '0', PARAM_INT); $dataformat = optional_param('downloadformat', '', PARAM_ALPHA); $emailroles = optional_param('emailroles', 0, PARAM_INT); diff --git a/show_nonrespondents.php b/show_nonrespondents.php index 23ec5dc1..924fd98d 100644 --- a/show_nonrespondents.php +++ b/show_nonrespondents.php @@ -38,8 +38,8 @@ $selectedanonymous = optional_param('selectedanonymous', '', PARAM_ALPHA); $perpage = optional_param('perpage', QUESTIONNAIRE_DEFAULT_PAGE_COUNT, PARAM_INT); // How many per page. $showall = optional_param('showall', false, PARAM_INT); // Should we show all users? -$sid = optional_param('sid', 0, PARAM_INT); -$qid = optional_param('qid', 0, PARAM_INT); +$sid = optional_param('sid', 0, PARAM_INT); +$qid = optional_param('qid', 0, PARAM_INT); $currentgroupid = optional_param('group', 0, PARAM_INT); // Groupid. if (!isset($SESSION->questionnaire)) { @@ -149,16 +149,16 @@ foreach ($messageuser as $userid) { $senduser = $DB->get_record('user', array('id' => $userid)); $eventdata = new \core\message\message(); - $eventdata->courseid = $course->id; - $eventdata->name = 'message'; - $eventdata->component = 'mod_questionnaire'; - $eventdata->userfrom = $USER; - $eventdata->userto = $senduser; - $eventdata->subject = $subject; - $eventdata->fullmessage = html_to_text($htmlmessage); + $eventdata->courseid = $course->id; + $eventdata->name = 'message'; + $eventdata->component = 'mod_questionnaire'; + $eventdata->userfrom = $USER; + $eventdata->userto = $senduser; + $eventdata->subject = $subject; + $eventdata->fullmessage = html_to_text($htmlmessage); $eventdata->fullmessageformat = FORMAT_PLAIN; - $eventdata->fullmessagehtml = $htmlmessage; - $eventdata->smallmessage = ''; + $eventdata->fullmessagehtml = $htmlmessage; + $eventdata->smallmessage = ''; $good = $good && message_send($eventdata); } if (!empty($good)) { @@ -247,10 +247,10 @@ $table->set_attribute('id', 'showentrytable'); $table->set_attribute('class', 'flexible generaltable generalbox'); $table->set_control_variables(array( - TABLE_VAR_SORT => 'ssort', - TABLE_VAR_IFIRST => 'sifirst', - TABLE_VAR_ILAST => 'silast', - TABLE_VAR_PAGE => 'spage' + TABLE_VAR_SORT => 'ssort', + TABLE_VAR_IFIRST => 'sifirst', + TABLE_VAR_ILAST => 'silast', + TABLE_VAR_PAGE => 'spage' )); $table->no_sorting('status'); @@ -307,16 +307,16 @@ $strnever = get_string('never'); $datestring = new stdClass(); -$datestring->year = get_string('year'); +$datestring->year = get_string('year'); $datestring->years = get_string('years'); -$datestring->day = get_string('day'); -$datestring->days = get_string('days'); -$datestring->hour = get_string('hour'); +$datestring->day = get_string('day'); +$datestring->days = get_string('days'); +$datestring->hour = get_string('hour'); $datestring->hours = get_string('hours'); -$datestring->min = get_string('min'); -$datestring->mins = get_string('mins'); -$datestring->sec = get_string('sec'); -$datestring->secs = get_string('secs'); +$datestring->min = get_string('min'); +$datestring->mins = get_string('mins'); +$datestring->sec = get_string('sec'); +$datestring->secs = get_string('secs'); if (!$nonrespondents) { $questionnaire->page->add_to_page('formarea', diff --git a/tabs.php b/tabs.php index ecb40a9f..dc560745 100644 --- a/tabs.php +++ b/tabs.php @@ -27,7 +27,7 @@ global $DB, $SESSION; $tabs = array(); -$row = array(); +$row = array(); $inactive = array(); $activated = array(); if (!isset($SESSION->questionnaire)) { @@ -89,7 +89,7 @@ get_string('myresponses', 'questionnaire')); if ($questionnaire->capabilities->downloadresponses) { $argstr2 = $argstr.'&action=dwnpg'; - $link = $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2); + $link = $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2); $row2[] = new tabobject('mydownloadcsv', $link, get_string('downloadtextformat', 'questionnaire')); } } else if (in_array($currenttab, array('mybyresponse', 'mysummary'))) { @@ -166,7 +166,7 @@ if ($questionnaire->capabilities->downloadresponses) { $argstr2 = $argstr.'&action=dwnpg&group='.$currentgroupid; - $link = $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2); + $link = $CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2); $row3[] = new tabobject('downloadcsv', $link, get_string('downloadtextformat', 'questionnaire')); } } @@ -214,7 +214,7 @@ if ($questionnaire->capabilities->downloadresponses) { $argstr2 = $argstr.'&action=dwnpg'; - $link = htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2); + $link = htmlspecialchars('/mod/questionnaire/report.php?'.$argstr2); $row2[] = new tabobject('downloadcsv', $link, get_string('downloadtextformat', 'questionnaire')); } if (count($row2) <= 1) { diff --git a/tests/generator/lib.php b/tests/generator/lib.php index d62a9950..cfa3f973 100644 --- a/tests/generator/lib.php +++ b/tests/generator/lib.php @@ -83,20 +83,20 @@ public function create_instance($record = null, array $options = null) { $record = (object)(array)$record; $defaultquestionnairesettings = array( - 'qtype' => 0, - 'respondenttype' => 'fullname', - 'resp_eligible' => 'all', - 'resp_view' => 0, - 'opendate' => 0, - 'closedate' => 0, - 'resume' => 0, - 'navigate' => 0, - 'grade' => 0, - 'sid' => 0, - 'timemodified' => time(), - 'completionsubmit' => 0, - 'autonum' => 3, - 'create' => 'new-0', // Used in form only to indicate a new, empty instance. + 'qtype' => 0, + 'respondenttype' => 'fullname', + 'resp_eligible' => 'all', + 'resp_view' => 0, + 'opendate' => 0, + 'closedate' => 0, + 'resume' => 0, + 'navigate' => 0, + 'grade' => 0, + 'sid' => 0, + 'timemodified' => time(), + 'completionsubmit' => 0, + 'autonum' => 3, + 'create' => 'new-0', // Used in form only to indicate a new, empty instance. ); foreach ($defaultquestionnairesettings as $name => $value) { @@ -724,8 +724,8 @@ public function create_and_fully_populate($coursecount = 4, $studentcount = 20, $questionnaire, [ 'surveyid' => $questionnaire->sid, - 'name' => $qdg->type_name($questiontype), - 'type_id' => QUESSECTIONTEXT + 'name' => $qdg->type_name($questiontype), + 'type_id' => QUESSECTIONTEXT ] ); // Create questions. @@ -738,8 +738,8 @@ public function create_and_fully_populate($coursecount = 4, $studentcount = 20, $questionnaire, [ 'surveyid' => $questionnaire->sid, - 'name' => $qdg->type_name($questiontype).' '.$qname++, - 'type_id' => $questiontype + 'name' => $qdg->type_name($questiontype).' '.$qname++, + 'type_id' => $questiontype ], $opts ); diff --git a/tests/generator_test.php b/tests/generator_test.php index f3fd71af..40a11faa 100644 --- a/tests/generator_test.php +++ b/tests/generator_test.php @@ -74,13 +74,13 @@ public function test_create_content() { $questionnaire = new questionnaire($course, $cm, $questionnaire->id, null, false); $newcontent = array( - 'title' => 'New title', - 'email' => 'test@email.com', - 'subtitle' => 'New subtitle', - 'info' => 'New info', - 'thanks_page' => 'http://thankurl.com', - 'thank_head' => 'New thank header', - 'thank_body' => 'New thank body', + 'title' => 'New title', + 'email' => 'test@email.com', + 'subtitle' => 'New subtitle', + 'info' => 'New info', + 'thanks_page' => 'http://thankurl.com', + 'thank_head' => 'New thank header', + 'thank_body' => 'New thank body', ); $sid = $generator->create_content($questionnaire, $newcontent); $this->assertEquals($sid, $questionnaire->sid); diff --git a/version.php b/version.php index 2240b82a..e67e6002 100644 --- a/version.php +++ b/version.php @@ -25,10 +25,10 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2022092200; // The current module version (Date: YYYYMMDDXX). +$plugin->version = 2022092201; // The current module version (Date: YYYYMMDDXX). $plugin->requires = 2022030300; // Moodle version (4.0). $plugin->component = 'mod_questionnaire'; -$plugin->release = '4.0.0 (Build - 2022030300)'; -$plugin->maturity = MATURITY_BETA; +$plugin->release = '4.0.0 (Build - 2023030700)'; +$plugin->maturity = MATURITY_STABLE;