Skip to content

Commit c3c6a35

Browse files
mchurchwardmchurchward
committed
Appeasing the CI.
1 parent 76708fc commit c3c6a35

File tree

15 files changed

+143
-143
lines changed

15 files changed

+143
-143
lines changed

‎backup/moodle1/lib.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public function get_paths() {
6868
public function process_questionnaire($data) {
6969
// Get the course module id and context id.
7070
$instanceid = $data['id'];
71-
$cminfo = $this->get_cminfo($instanceid);
72-
$moduleid = $cminfo['id'];
73-
$contextid = $this->converter->get_contextid(CONTEXT_MODULE, $moduleid);
71+
$cminfo = $this->get_cminfo($instanceid);
72+
$moduleid = $cminfo['id'];
73+
$contextid = $this->converter->get_contextid(CONTEXT_MODULE, $moduleid);
7474

7575
// We now have all information needed to start writing into the file.
7676
$this->open_xml_writer("activities/questionnaire_{$moduleid}/questionnaire.xml");

‎classes/question/question.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ abstract class question {
6161

6262
// Class Properties.
6363
/** @var int $id The database id of this question. */
64-
public $id = 0;
64+
public $id = 0;
6565

6666
/** @var int $surveyid The database id of the survey this question belongs to. */
67-
public $surveyid = 0;
67+
public $surveyid = 0;
6868

6969
/** @var string $name The name of this question. */
70-
public $name = '';
70+
public $name = '';
7171

7272
/** @var string $type The name of the question type. */
73-
public $type = '';
73+
public $type = '';
7474

7575
/** @var array $choices Array holding any choices for this question. */
76-
public $choices = [];
76+
public $choices = [];
7777

7878
/** @var array $dependencies Array holding any dependencies for this question. */
7979
public $dependencies = [];
@@ -82,25 +82,25 @@ abstract class question {
8282
public $responsetable = '';
8383

8484
/** @var int $length The length field. */
85-
public $length = 0;
85+
public $length = 0;
8686

8787
/** @var int $precise The precision field. */
88-
public $precise = 0;
88+
public $precise = 0;
8989

9090
/** @var int $position Position in the questionnaire */
91-
public $position = 0;
91+
public $position = 0;
9292

9393
/** @var string $content The question's content. */
94-
public $content = '';
94+
public $content = '';
9595

9696
/** @var string $allchoices The list of all question's choices. */
97-
public $allchoices = '';
97+
public $allchoices = '';
9898

9999
/** @var boolean $required The required flag. */
100-
public $required = 'n';
100+
public $required = 'n';
101101

102102
/** @var boolean $deleted The deleted flag. */
103-
public $deleted = 'n';
103+
public $deleted = 'n';
104104

105105
/** @var mixed $extradata Any custom data for the question type. */
106106
public $extradata = '';
@@ -1300,8 +1300,8 @@ public function form_update($formdata, $questionnaire) {
13001300

13011301
// Update existing question.
13021302
// Handle any attachments in the content.
1303-
$formdata->itemid = $formdata->content['itemid'];
1304-
$formdata->format = $formdata->content['format'];
1303+
$formdata->itemid = $formdata->content['itemid'];
1304+
$formdata->format = $formdata->content['format'];
13051305
$formdata->content = $formdata->content['text'];
13061306
$formdata->content = file_save_draft_area_files($formdata->itemid, $questionnaire->context->id, 'mod_questionnaire',
13071307
'question', $formdata->qid, ['subdirs' => true], $formdata->content);
@@ -1336,10 +1336,10 @@ public function form_update($formdata, $questionnaire) {
13361336
$this->add($questionrecord);
13371337

13381338
// Handle any attachments in the content.
1339-
$formdata->itemid = $formdata->content['itemid'];
1340-
$formdata->format = $formdata->content['format'];
1339+
$formdata->itemid = $formdata->content['itemid'];
1340+
$formdata->format = $formdata->content['format'];
13411341
$formdata->content = $formdata->content['text'];
1342-
$content = file_save_draft_area_files($formdata->itemid, $questionnaire->context->id, 'mod_questionnaire',
1342+
$content = file_save_draft_area_files($formdata->itemid, $questionnaire->context->id, 'mod_questionnaire',
13431343
'question', $this->qid, ['subdirs' => true], $formdata->content);
13441344
$DB->set_field('questionnaire_question', 'content', $content, ['id' => $this->qid]);
13451345
}

‎complete.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
$questionnaire->add_page(new \mod_questionnaire\output\completepage());
6161

6262
$questionnaire->strquestionnaires = get_string("modulenameplural", "questionnaire");
63-
$questionnaire->strquestionnaire = get_string("modulename", "questionnaire");
63+
$questionnaire->strquestionnaire = get_string("modulename", "questionnaire");
6464

6565
// Mark as viewed.
6666
$completion = new completion_info($course);

‎lib.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,12 @@ function questionnaire_grade_item_update($questionnaire, $grades = null) {
422422

423423
if ($questionnaire->grade > 0) {
424424
$params['gradetype'] = GRADE_TYPE_VALUE;
425-
$params['grademax'] = $questionnaire->grade;
426-
$params['grademin'] = 0;
425+
$params['grademax'] = $questionnaire->grade;
426+
$params['grademin'] = 0;
427427

428428
} else if ($questionnaire->grade < 0) {
429429
$params['gradetype'] = GRADE_TYPE_SCALE;
430-
$params['scaleid'] = -$questionnaire->grade;
430+
$params['scaleid'] = -$questionnaire->grade;
431431

432432
} else if ($questionnaire->grade == 0) { // No Grade..be sure to delete the grade item if it exists.
433433
$grades = null;
@@ -835,11 +835,11 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
835835

836836
if ($groupid) {
837837
$groupselect = 'AND gm.groupid = :groupid';
838-
$groupjoin = 'JOIN {groups_members} gm ON gm.userid=u.id';
838+
$groupjoin = 'JOIN {groups_members} gm ON gm.userid=u.id';
839839
$params['groupid'] = $groupid;
840840
} else {
841841
$groupselect = '';
842-
$groupjoin = '';
842+
$groupjoin = '';
843843
}
844844

845845
$params['timestart'] = $timestart;
@@ -861,8 +861,8 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
861861
}
862862

863863
$accessallgroups = has_capability('moodle/site:accessallgroups', $context);
864-
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
865-
$groupmode = groups_get_activity_groupmode($cm, $course);
864+
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
865+
$groupmode = groups_get_activity_groupmode($cm, $course);
866866

867867
$usersgroups = null;
868868
$aname = format_string($cm->name, true);
@@ -899,19 +899,19 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
899899

900900
$tmpactivity = new stdClass();
901901

902-
$tmpactivity->type = 'questionnaire';
903-
$tmpactivity->cmid = $cm->id;
902+
$tmpactivity->type = 'questionnaire';
903+
$tmpactivity->cmid = $cm->id;
904904
$tmpactivity->cminstance = $cm->instance;
905905
// Current user is admin - or teacher enrolled in original public course.
906906
if (isset($cmoriginal)) {
907907
$tmpactivity->cminstance = $cmoriginal->instance;
908908
}
909909
$tmpactivity->cannotview = false;
910-
$tmpactivity->anonymous = false;
911-
$tmpactivity->name = $aname;
910+
$tmpactivity->anonymous = false;
911+
$tmpactivity->name = $aname;
912912
$tmpactivity->sectionnum = $cm->sectionnum;
913-
$tmpactivity->timestamp = $attempt->submitted;
914-
$tmpactivity->groupid = $groupid;
913+
$tmpactivity->timestamp = $attempt->submitted;
914+
$tmpactivity->groupid = $groupid;
915915
if (isset($userattempts[$attempt->lastname])) {
916916
$tmpactivity->nbattempts = $userattempts[$attempt->lastname];
917917
}
@@ -933,7 +933,7 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
933933
}
934934
}
935935
if ($questionnaire->respondenttype != 'anonymous') {
936-
$tmpactivity->user->fullname = fullname($attempt, $viewfullnames);
936+
$tmpactivity->user->fullname = fullname($attempt, $viewfullnames);
937937
} else {
938938
$tmpactivity->user = '';
939939
unset ($tmpactivity->user);
@@ -1035,9 +1035,9 @@ function questionnaire_print_overview($courses, &$htmlarray) {
10351035
}
10361036

10371037
// Get Necessary Strings.
1038-
$strquestionnaire = get_string('modulename', 'questionnaire');
1038+
$strquestionnaire = get_string('modulename', 'questionnaire');
10391039
$strnotattempted = get_string('noattempts', 'questionnaire');
1040-
$strattempted = get_string('attempted', 'questionnaire');
1040+
$strattempted = get_string('attempted', 'questionnaire');
10411041
$strsavedbutnotsubmitted = get_string('savedbutnotsubmitted', 'questionnaire');
10421042

10431043
$now = time();

‎locallib.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,23 +186,23 @@ function questionnaire_load_capabilities($cmid) {
186186
$context = questionnaire_get_context($cmid);
187187

188188
$cb = new stdClass();
189-
$cb->view = has_capability('mod/questionnaire:view', $context);
190-
$cb->submit = has_capability('mod/questionnaire:submit', $context);
191-
$cb->viewsingleresponse = has_capability('mod/questionnaire:viewsingleresponse', $context);
189+
$cb->view = has_capability('mod/questionnaire:view', $context);
190+
$cb->submit = has_capability('mod/questionnaire:submit', $context);
191+
$cb->viewsingleresponse = has_capability('mod/questionnaire:viewsingleresponse', $context);
192192
$cb->submissionnotification = has_capability('mod/questionnaire:submissionnotification', $context);
193-
$cb->downloadresponses = has_capability('mod/questionnaire:downloadresponses', $context);
194-
$cb->deleteresponses = has_capability('mod/questionnaire:deleteresponses', $context);
195-
$cb->manage = has_capability('mod/questionnaire:manage', $context);
196-
$cb->editquestions = has_capability('mod/questionnaire:editquestions', $context);
197-
$cb->createtemplates = has_capability('mod/questionnaire:createtemplates', $context);
198-
$cb->createpublic = has_capability('mod/questionnaire:createpublic', $context);
199-
$cb->readownresponses = has_capability('mod/questionnaire:readownresponses', $context);
200-
$cb->readallresponses = has_capability('mod/questionnaire:readallresponses', $context);
193+
$cb->downloadresponses = has_capability('mod/questionnaire:downloadresponses', $context);
194+
$cb->deleteresponses = has_capability('mod/questionnaire:deleteresponses', $context);
195+
$cb->manage = has_capability('mod/questionnaire:manage', $context);
196+
$cb->editquestions = has_capability('mod/questionnaire:editquestions', $context);
197+
$cb->createtemplates = has_capability('mod/questionnaire:createtemplates', $context);
198+
$cb->createpublic = has_capability('mod/questionnaire:createpublic', $context);
199+
$cb->readownresponses = has_capability('mod/questionnaire:readownresponses', $context);
200+
$cb->readallresponses = has_capability('mod/questionnaire:readallresponses', $context);
201201
$cb->readallresponseanytime = has_capability('mod/questionnaire:readallresponseanytime', $context);
202-
$cb->printblank = has_capability('mod/questionnaire:printblank', $context);
203-
$cb->preview = has_capability('mod/questionnaire:preview', $context);
202+
$cb->printblank = has_capability('mod/questionnaire:printblank', $context);
203+
$cb->preview = has_capability('mod/questionnaire:preview', $context);
204204

205-
$cb->viewhiddenactivities = has_capability('moodle/course:viewhiddenactivities', $context, null, false);
205+
$cb->viewhiddenactivities = has_capability('moodle/course:viewhiddenactivities', $context, null, false);
206206

207207
return $cb;
208208
}
@@ -532,7 +532,7 @@ function questionnaire_set_events($questionnaire) {
532532
calendar_event::create($event);
533533
} else {
534534
// Separate start and end events.
535-
$event->timeduration = 0;
535+
$event->timeduration = 0;
536536
if ($questionnaire->opendate) {
537537
$event->name = $questionnaire->name.' ('.get_string('questionnaireopens', 'questionnaire').')';
538538
$event->timesort = $questionnaire->opendate;

‎preview.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
require_once("../../config.php");
2727
require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
2828

29-
$id = optional_param('id', 0, PARAM_INT);
30-
$sid = optional_param('sid', 0, PARAM_INT);
31-
$popup = optional_param('popup', 0, PARAM_INT);
32-
$qid = optional_param('qid', 0, PARAM_INT);
29+
$id = optional_param('id', 0, PARAM_INT);
30+
$sid = optional_param('sid', 0, PARAM_INT);
31+
$popup = optional_param('popup', 0, PARAM_INT);
32+
$qid = optional_param('qid', 0, PARAM_INT);
3333
$currentgroupid = optional_param('group', 0, PARAM_INT); // Groupid.
3434

3535
if ($id) {

‎qsettings.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,19 @@
9595

9696
$sdata->infoitemid = $settings->info['itemid'];
9797
$sdata->infoformat = $settings->info['format'];
98-
$sdata->info = $settings->info['text'];
99-
$sdata->info = file_save_draft_area_files($sdata->infoitemid, $context->id, 'mod_questionnaire', 'info',
100-
$sdata->id, array('subdirs' => true), $sdata->info);
98+
$sdata->info = $settings->info['text'];
99+
$sdata->info = file_save_draft_area_files($sdata->infoitemid, $context->id, 'mod_questionnaire', 'info',
100+
$sdata->id, array('subdirs' => true), $sdata->info);
101101

102102
$sdata->theme = ''; // Deprecated theme field.
103103
$sdata->thanks_page = $settings->thanks_page;
104104
$sdata->thank_head = $settings->thank_head;
105105

106106
$sdata->thankitemid = $settings->thank_body['itemid'];
107107
$sdata->thankformat = $settings->thank_body['format'];
108-
$sdata->thank_body = $settings->thank_body['text'];
109-
$sdata->thank_body = file_save_draft_area_files($sdata->thankitemid, $context->id, 'mod_questionnaire', 'thankbody',
110-
$sdata->id, array('subdirs' => true), $sdata->thank_body);
108+
$sdata->thank_body = $settings->thank_body['text'];
109+
$sdata->thank_body = file_save_draft_area_files($sdata->thankitemid, $context->id, 'mod_questionnaire', 'thankbody',
110+
$sdata->id, array('subdirs' => true), $sdata->thank_body);
111111
$sdata->email = $settings->email;
112112

113113
$sdata->courseid = $settings->courseid;

‎questionnaire.class.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2120,21 +2120,21 @@ private function send_submission_notifications($rid) {
21202120
*/
21212121
private function send_message($info, $eventtype) {
21222122
$eventdata = new \core\message\message();
2123-
$eventdata->courseid = $this->course->id;
2124-
$eventdata->modulename = 'questionnaire';
2125-
$eventdata->userfrom = $info->userfrom;
2126-
$eventdata->userto = $info->userto;
2127-
$eventdata->subject = $info->postsubject;
2128-
$eventdata->fullmessage = $info->posttext;
2123+
$eventdata->courseid = $this->course->id;
2124+
$eventdata->modulename = 'questionnaire';
2125+
$eventdata->userfrom = $info->userfrom;
2126+
$eventdata->userto = $info->userto;
2127+
$eventdata->subject = $info->postsubject;
2128+
$eventdata->fullmessage = $info->posttext;
21292129
$eventdata->fullmessageformat = FORMAT_PLAIN;
2130-
$eventdata->fullmessagehtml = $info->posthtml;
2131-
$eventdata->smallmessage = $info->postsubject;
2130+
$eventdata->fullmessagehtml = $info->posthtml;
2131+
$eventdata->smallmessage = $info->postsubject;
21322132

2133-
$eventdata->name = $eventtype;
2134-
$eventdata->component = 'mod_questionnaire';
2135-
$eventdata->notification = 1;
2136-
$eventdata->contexturl = $info->submissionurl;
2137-
$eventdata->contexturlname = $info->name;
2133+
$eventdata->name = $eventtype;
2134+
$eventdata->component = 'mod_questionnaire';
2135+
$eventdata->notification = 1;
2136+
$eventdata->contexturl = $info->submissionurl;
2137+
$eventdata->contexturlname = $info->name;
21382138

21392139
message_send($eventdata);
21402140
}
@@ -2357,10 +2357,10 @@ private function response_send_email($rid, $email) {
23572357
'&amp;rid='.$rid.'&amp;instance='.$this->id;
23582358

23592359
// Html and plaintext body.
2360-
$bodyhtml = '<a href="'.$url.'">'.$url.'</a>'.$endhtml;
2361-
$bodyplaintext = $url.$endplaintext;
2362-
$bodyhtml .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endhtml;
2363-
$bodyplaintext .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endplaintext;
2360+
$bodyhtml = '<a href="'.$url.'">'.$url.'</a>'.$endhtml;
2361+
$bodyplaintext = $url.$endplaintext;
2362+
$bodyhtml .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endhtml;
2363+
$bodyplaintext .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endplaintext;
23642364

23652365
$bodyhtml .= $answers['html'];
23662366
$bodyplaintext .= $answers['plaintext'];

‎questions.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
2727
require_once($CFG->dirroot.'/mod/questionnaire/classes/question/question.php'); // Needed for question type constants.
2828

29-
$id = required_param('id', PARAM_INT); // Course module ID.
29+
$id = required_param('id', PARAM_INT); // Course module ID.
3030
$action = optional_param('action', 'main', PARAM_ALPHA); // Screen.
31-
$qid = optional_param('qid', 0, PARAM_INT); // Question id.
32-
$moveq = optional_param('moveq', 0, PARAM_INT); // Question id to move.
33-
$delq = optional_param('delq', 0, PARAM_INT); // Question id to delete.
34-
$qtype = optional_param('type_id', 0, PARAM_INT); // Question type.
31+
$qid = optional_param('qid', 0, PARAM_INT); // Question id.
32+
$moveq = optional_param('moveq', 0, PARAM_INT); // Question id to move.
33+
$delq = optional_param('delq', 0, PARAM_INT); // Question id to delete.
34+
$qtype = optional_param('type_id', 0, PARAM_INT); // Question type.
3535
$currentgroupid = optional_param('group', 0, PARAM_INT); // Group id.
3636

3737
if (! $cm = get_coursemodule_from_id('questionnaire', $id)) {
@@ -401,8 +401,8 @@
401401
$qid = key($qformdata->removebutton);
402402
if ($dependants) {
403403
// Show the dependencies and inform about the dependencies to be removed.
404-
// Split dependencies in direct and indirect ones to separate for the confirm-dialogue. Only direct ones will be deleted.
405-
// List direct dependencies.
404+
// Split dependencies in direct and indirect ones to separate for the confirm-dialogue.
405+
// Only direct ones will be deleted. List direct dependencies.
406406
$msg .= $questionnaire->renderer->dependency_warnings($dependants->directs, 'directwarnings', $strnum);
407407
// List indirect dependencies.
408408
$msg .= $questionnaire->renderer->dependency_warnings($dependants->indirects, 'indirectwarnings', $strnum);

‎report.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,8 @@
491491
$name = preg_replace("/[^A-Z0-9]+/i", "_", trim($name));
492492

493493
$choicecodes = optional_param('choicecodes', '0', PARAM_INT);
494-
$choicetext = optional_param('choicetext', '0', PARAM_INT);
495-
$showincompletes = optional_param('complete', '0', PARAM_INT);
494+
$choicetext = optional_param('choicetext', '0', PARAM_INT);
495+
$showincompletes = optional_param('complete', '0', PARAM_INT);
496496
$rankaverages = optional_param('rankaverages', '0', PARAM_INT);
497497
$dataformat = optional_param('downloadformat', '', PARAM_ALPHA);
498498
$emailroles = optional_param('emailroles', 0, PARAM_INT);

0 commit comments

Comments
 (0)