Skip to content

Commit 4eb3d5a

Browse files
mchurchwardmchurchward
committed
Appeasing the CI.
1 parent 857f482 commit 4eb3d5a

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
@@ -62,19 +62,19 @@ abstract class question {
6262

6363
// Class Properties.
6464
/** @var int $id The database id of this question. */
65-
public $id = 0;
65+
public $id = 0;
6666

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

7070
/** @var string $name The name of this question. */
71-
public $name = '';
71+
public $name = '';
7272

7373
/** @var string $type The name of the question type. */
74-
public $type = '';
74+
public $type = '';
7575

7676
/** @var array $choices Array holding any choices for this question. */
77-
public $choices = [];
77+
public $choices = [];
7878

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

8585
/** @var int $length The length field. */
86-
public $length = 0;
86+
public $length = 0;
8787

8888
/** @var int $precise The precision field. */
89-
public $precise = 0;
89+
public $precise = 0;
9090

9191
/** @var int $position Position in the questionnaire */
92-
public $position = 0;
92+
public $position = 0;
9393

9494
/** @var string $content The question's content. */
95-
public $content = '';
95+
public $content = '';
9696

9797
/** @var string $allchoices The list of all question's choices. */
98-
public $allchoices = '';
98+
public $allchoices = '';
9999

100100
/** @var boolean $required The required flag. */
101-
public $required = 'n';
101+
public $required = 'n';
102102

103103
/** @var boolean $deleted The deleted flag. */
104-
public $deleted = 'n';
104+
public $deleted = 'n';
105105

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

13041304
// Update existing question.
13051305
// Handle any attachments in the content.
1306-
$formdata->itemid = $formdata->content['itemid'];
1307-
$formdata->format = $formdata->content['format'];
1306+
$formdata->itemid = $formdata->content['itemid'];
1307+
$formdata->format = $formdata->content['format'];
13081308
$formdata->content = $formdata->content['text'];
13091309
$formdata->content = file_save_draft_area_files($formdata->itemid, $questionnaire->context->id, 'mod_questionnaire',
13101310
'question', $formdata->qid, ['subdirs' => true], $formdata->content);
@@ -1339,10 +1339,10 @@ public function form_update($formdata, $questionnaire) {
13391339
$this->add($questionrecord);
13401340

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

‎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
@@ -453,12 +453,12 @@ function questionnaire_grade_item_update($questionnaire, $grades = null) {
453453

454454
if ($questionnaire->grade > 0) {
455455
$params['gradetype'] = GRADE_TYPE_VALUE;
456-
$params['grademax'] = $questionnaire->grade;
457-
$params['grademin'] = 0;
456+
$params['grademax'] = $questionnaire->grade;
457+
$params['grademin'] = 0;
458458

459459
} else if ($questionnaire->grade < 0) {
460460
$params['gradetype'] = GRADE_TYPE_SCALE;
461-
$params['scaleid'] = -$questionnaire->grade;
461+
$params['scaleid'] = -$questionnaire->grade;
462462

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

866866
if ($groupid) {
867867
$groupselect = 'AND gm.groupid = :groupid';
868-
$groupjoin = 'JOIN {groups_members} gm ON gm.userid=u.id';
868+
$groupjoin = 'JOIN {groups_members} gm ON gm.userid=u.id';
869869
$params['groupid'] = $groupid;
870870
} else {
871871
$groupselect = '';
872-
$groupjoin = '';
872+
$groupjoin = '';
873873
}
874874

875875
$params['timestart'] = $timestart;
@@ -891,8 +891,8 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
891891
}
892892

893893
$accessallgroups = has_capability('moodle/site:accessallgroups', $context);
894-
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
895-
$groupmode = groups_get_activity_groupmode($cm, $course);
894+
$viewfullnames = has_capability('moodle/site:viewfullnames', $context);
895+
$groupmode = groups_get_activity_groupmode($cm, $course);
896896

897897
$usersgroups = null;
898898
$aname = format_string($cm->name, true);
@@ -929,19 +929,19 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
929929

930930
$tmpactivity = new stdClass();
931931

932-
$tmpactivity->type = 'questionnaire';
933-
$tmpactivity->cmid = $cm->id;
932+
$tmpactivity->type = 'questionnaire';
933+
$tmpactivity->cmid = $cm->id;
934934
$tmpactivity->cminstance = $cm->instance;
935935
// Current user is admin - or teacher enrolled in original public course.
936936
if (isset($cmoriginal)) {
937937
$tmpactivity->cminstance = $cmoriginal->instance;
938938
}
939939
$tmpactivity->cannotview = false;
940-
$tmpactivity->anonymous = false;
941-
$tmpactivity->name = $aname;
940+
$tmpactivity->anonymous = false;
941+
$tmpactivity->name = $aname;
942942
$tmpactivity->sectionnum = $cm->sectionnum;
943-
$tmpactivity->timestamp = $attempt->submitted;
944-
$tmpactivity->groupid = $groupid;
943+
$tmpactivity->timestamp = $attempt->submitted;
944+
$tmpactivity->groupid = $groupid;
945945
if (isset($userattempts[$attempt->lastname])) {
946946
$tmpactivity->nbattempts = $userattempts[$attempt->lastname];
947947
}
@@ -963,7 +963,7 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
963963
}
964964
}
965965
if ($questionnaire->respondenttype != 'anonymous') {
966-
$tmpactivity->user->fullname = fullname($attempt, $viewfullnames);
966+
$tmpactivity->user->fullname = fullname($attempt, $viewfullnames);
967967
} else {
968968
$tmpactivity->user = '';
969969
unset ($tmpactivity->user);
@@ -1065,9 +1065,9 @@ function questionnaire_print_overview($courses, &$htmlarray) {
10651065
}
10661066

10671067
// Get Necessary Strings.
1068-
$strquestionnaire = get_string('modulename', 'questionnaire');
1068+
$strquestionnaire = get_string('modulename', 'questionnaire');
10691069
$strnotattempted = get_string('noattempts', 'questionnaire');
1070-
$strattempted = get_string('attempted', 'questionnaire');
1070+
$strattempted = get_string('attempted', 'questionnaire');
10711071
$strsavedbutnotsubmitted = get_string('savedbutnotsubmitted', 'questionnaire');
10721072

10731073
$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
}
@@ -534,7 +534,7 @@ function questionnaire_set_events($questionnaire) {
534534
calendar_event::create($event);
535535
} else {
536536
// Separate start and end events.
537-
$event->timeduration = 0;
537+
$event->timeduration = 0;
538538
if ($questionnaire->opendate) {
539539
$event->name = $questionnaire->name.' ('.get_string('questionnaireopens', 'questionnaire').')';
540540
$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
@@ -2125,21 +2125,21 @@ private function send_submission_notifications($rid) {
21252125
*/
21262126
private function send_message($info, $eventtype) {
21272127
$eventdata = new \core\message\message();
2128-
$eventdata->courseid = $this->course->id;
2129-
$eventdata->modulename = 'questionnaire';
2130-
$eventdata->userfrom = $info->userfrom;
2131-
$eventdata->userto = $info->userto;
2132-
$eventdata->subject = $info->postsubject;
2133-
$eventdata->fullmessage = $info->posttext;
2128+
$eventdata->courseid = $this->course->id;
2129+
$eventdata->modulename = 'questionnaire';
2130+
$eventdata->userfrom = $info->userfrom;
2131+
$eventdata->userto = $info->userto;
2132+
$eventdata->subject = $info->postsubject;
2133+
$eventdata->fullmessage = $info->posttext;
21342134
$eventdata->fullmessageformat = FORMAT_PLAIN;
2135-
$eventdata->fullmessagehtml = $info->posthtml;
2136-
$eventdata->smallmessage = $info->postsubject;
2135+
$eventdata->fullmessagehtml = $info->posthtml;
2136+
$eventdata->smallmessage = $info->postsubject;
21372137

2138-
$eventdata->name = $eventtype;
2139-
$eventdata->component = 'mod_questionnaire';
2140-
$eventdata->notification = 1;
2141-
$eventdata->contexturl = $info->submissionurl;
2142-
$eventdata->contexturlname = $info->name;
2138+
$eventdata->name = $eventtype;
2139+
$eventdata->component = 'mod_questionnaire';
2140+
$eventdata->notification = 1;
2141+
$eventdata->contexturl = $info->submissionurl;
2142+
$eventdata->contexturlname = $info->name;
21432143

21442144
message_send($eventdata);
21452145
}
@@ -2362,10 +2362,10 @@ private function response_send_email($rid, $email) {
23622362
'&amp;rid='.$rid.'&amp;instance='.$this->id;
23632363

23642364
// Html and plaintext body.
2365-
$bodyhtml = '<a href="'.$url.'">'.$url.'</a>'.$endhtml;
2366-
$bodyplaintext = $url.$endplaintext;
2367-
$bodyhtml .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endhtml;
2368-
$bodyplaintext .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endplaintext;
2365+
$bodyhtml = '<a href="'.$url.'">'.$url.'</a>'.$endhtml;
2366+
$bodyplaintext = $url.$endplaintext;
2367+
$bodyhtml .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endhtml;
2368+
$bodyplaintext .= get_string('surveyresponse', 'questionnaire') .' "'.$name.'"'.$endplaintext;
23692369

23702370
$bodyhtml .= $answers['html'];
23712371
$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)