Skip to content

Commit e16b2c5

Browse files
mchurchwardmchurchward
committed
WIP12
1 parent 452ad43 commit e16b2c5

File tree

9 files changed

+291
-204
lines changed

9 files changed

+291
-204
lines changed

‎backup/moodle2/restore_questionnaire_activity_task.class.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ public static function define_decode_contents() {
5050
$contents = [];
5151

5252
$contents[] = new restore_decode_content('questionnaire', ['intro'], 'questionnaire');
53-
$contents[] = new restore_decode_content('questionnaire_survey',
54-
['info', 'thank_head', 'thank_body', 'thanks_page', 'feedbacknotes'], 'questionnaire_survey');
53+
$contents[] = new restore_decode_content(
54+
'questionnaire_survey',
55+
['info', 'thank_head', 'thank_body', 'thanks_page', 'feedbacknotes'], 'questionnaire_survey'
56+
);
5557
$contents[] = new restore_decode_content('questionnaire_question', ['content'], 'questionnaire_question');
5658
$contents[] = new restore_decode_content('questionnaire_fb_sections', ['sectionheading'], 'questionnaire_fb_sections');
5759
$contents[] = new restore_decode_content('questionnaire_feedback', ['feedbacktext'], 'questionnaire_feedback');

‎backup/moodle2/restore_questionnaire_stepslib.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ protected function define_structure() {
113113
'questionnaire_response_text',
114114
'/activity/questionnaire/attempts/attempt/responses/response/response_texts/response_text'
115115
);
116-
117116
} else {
118117
// New system.
119118
$paths[] = new restore_path_element(

‎complete.php‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2424
*
2525
*/
26+
2627
require_once("../../config.php");
2728
require_once($CFG->libdir . '/completionlib.php');
28-
require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
29+
require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
2930

3031
if (!isset($SESSION->questionnaire)) {
3132
$SESSION->questionnaire = new stdClass();
@@ -38,14 +39,14 @@
3839
$sid = optional_param('sid', null, PARAM_INT); // Survey id.
3940
$resume = optional_param('resume', null, PARAM_INT); // Is this attempt a resume of a saved attempt?
4041
41-
list($cm, $course, $questionnaire) = questionnaire_get_standard_page_items($id, $a);
42+
[$cm, $course, $questionnaire] = questionnaire_get_standard_page_items($id, $a);
4243

4344
// Check login and get context.
4445
require_course_login($course, true, $cm);
4546
$context = context_module::instance($cm->id);
4647
require_capability('mod/questionnaire:view', $context);
4748

48-
$url = new moodle_url($CFG->wwwroot.'/mod/questionnaire/complete.php');
49+
$url = new moodle_url($CFG->wwwroot . '/mod/questionnaire/complete.php');
4950
if (isset($id)) {
5051
$url->param('id', $id);
5152
} else {
@@ -54,7 +55,7 @@
5455

5556
$PAGE->set_url($url);
5657
$PAGE->set_context($context);
57-
$questionnaire = new questionnaire( $course, $cm, 0, $questionnaire);
58+
$questionnaire = new questionnaire($course, $cm, 0, $questionnaire);
5859
// Add renderer and page objects to the questionnaire object for display use.
5960
$questionnaire->add_renderer($PAGE->get_renderer('mod_questionnaire'));
6061
$questionnaire->add_page(new \mod_questionnaire\output\completepage());
@@ -70,11 +71,11 @@
7071
$context = context_module::instance($questionnaire->cm->id);
7172
$anonymous = $questionnaire->respondenttype == 'anonymous';
7273

73-
$event = \mod_questionnaire\event\attempt_resumed::create(array(
74-
'objectid' => $questionnaire->id,
75-
'anonymous' => $anonymous,
76-
'context' => $context
77-
));
74+
$event = \mod_questionnaire\event\attempt_resumed::create([
75+
'objectid' => $questionnaire->id,
76+
'anonymous' => $anonymous,
77+
'context' => $context,
78+
]);
7879
$event->trigger();
7980
}
8081

‎feedback.php‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727

2828
require_once("../../config.php");
29-
require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
29+
require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
3030

3131
$id = required_param('id', PARAM_INT); // Course module ID.
3232
$currentgroupid = optional_param('group', 0, PARAM_INT); // Groupid.
@@ -48,7 +48,7 @@
4848
require_course_login($course, true, $cm);
4949
$context = context_module::instance($cm->id);
5050

51-
$PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/questionnaire/feedback.php', ['id' => $id]));
51+
$PAGE->set_url(new moodle_url($CFG->wwwroot . '/mod/questionnaire/feedback.php', ['id' => $id]));
5252
$PAGE->set_context($context);
5353
if (!isset($SESSION->questionnaire)) {
5454
$SESSION->questionnaire = new stdClass();
@@ -71,8 +71,15 @@
7171
$sdata->id = $cm->id;
7272

7373
$draftideditor = file_get_submitted_draft_itemid('feedbacknotes');
74-
$currentinfo = file_prepare_draft_area($draftideditor, $context->id, 'mod_questionnaire', 'feedbacknotes',
75-
$sdata->sid, ['subdirs' => true], $questionnaire->survey->feedbacknotes);
74+
$currentinfo = file_prepare_draft_area(
75+
$draftideditor,
76+
$context->id,
77+
'mod_questionnaire',
78+
'feedbacknotes',
79+
$sdata->sid,
80+
['subdirs' => true],
81+
$questionnaire->survey->feedbacknotes
82+
);
7683
$sdata->feedbacknotes = ['text' => $currentinfo, 'format' => FORMAT_HTML, 'itemid' => $draftideditor];
7784

7885
$feedbackform->set_data($sdata);
@@ -92,18 +99,25 @@
9299

93100
if ($settings = $feedbackform->get_data()) {
94101
if (isset($settings->feedbacksettingsbutton1) || isset($settings->feedbacksettingsbutton2) || isset($settings->buttongroup)) {
95-
if (isset ($settings->feedbackscores)) {
102+
if (isset($settings->feedbackscores)) {
96103
$sdata->feedbackscores = $settings->feedbackscores;
97104
} else {
98105
$sdata->feedbackscores = 0;
99106
}
100107

101-
if (isset ($settings->feedbacknotes)) {
108+
if (isset($settings->feedbacknotes)) {
102109
$sdata->fbnotesitemid = $settings->feedbacknotes['itemid'];
103110
$sdata->fbnotesformat = $settings->feedbacknotes['format'];
104111
$sdata->feedbacknotes = $settings->feedbacknotes['text'];
105-
$sdata->feedbacknotes = file_save_draft_area_files($sdata->fbnotesitemid, $context->id, 'mod_questionnaire',
106-
'feedbacknotes', $sdata->id, ['subdirs' => true], $sdata->feedbacknotes);
112+
$sdata->feedbacknotes = file_save_draft_area_files(
113+
$sdata->fbnotesitemid,
114+
$context->id,
115+
'mod_questionnaire',
116+
'feedbacknotes',
117+
$sdata->id,
118+
['subdirs' => true],
119+
$sdata->feedbacknotes
120+
);
107121
} else {
108122
$sdata->feedbacknotes = '';
109123
}

‎print.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
2424
*
2525
*/
26+
2627
require_once("../../config.php");
2728
require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
2829

‎questions.php‎

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
*/
2424

2525
require_once("../../config.php");
26-
require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
27-
require_once($CFG->dirroot.'/mod/questionnaire/classes/question/question.php'); // Needed for question type constants.
26+
require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
27+
require_once($CFG->dirroot . '/mod/questionnaire/classes/question/question.php'); // Needed for question type constants.
2828

2929
$id = required_param('id', PARAM_INT); // Course module ID.
3030
$action = optional_param('action', 'main', PARAM_ALPHA); // Screen.
@@ -38,18 +38,18 @@
3838
throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire');
3939
}
4040

41-
if (! $course = $DB->get_record("course", array("id" => $cm->course))) {
41+
if (! $course = $DB->get_record("course", ["id" => $cm->course])) {
4242
throw new \moodle_exception('coursemisconf', 'mod_questionnaire');
4343
}
4444

45-
if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) {
45+
if (! $questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) {
4646
throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire');
4747
}
4848

4949
require_course_login($course, true, $cm);
5050
$context = context_module::instance($cm->id);
5151

52-
$url = new moodle_url($CFG->wwwroot.'/mod/questionnaire/questions.php');
52+
$url = new moodle_url($CFG->wwwroot . '/mod/questionnaire/questions.php');
5353
$url->param('id', $id);
5454
if ($qid) {
5555
$url->param('qid', $qid);
@@ -93,15 +93,15 @@
9393

9494
// Just in case the page is refreshed (F5) after a question has been deleted.
9595
if (isset($questions[$qid])) {
96-
$select = 'surveyid = '.$sid.' AND deleted = \'n\' AND position > '.
96+
$select = 'surveyid = ' . $sid . ' AND deleted = \'n\' AND position > '.
9797
$questions[$qid]->position;
9898
} else {
99-
redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id);
99+
redirect($CFG->wwwroot . '/mod/questionnaire/questions.php?id=' . $questionnaire->cm->id);
100100
}
101101

102102
if ($records = $DB->get_records_select('questionnaire_question', $select, null, 'position ASC')) {
103103
foreach ($records as $record) {
104-
$DB->set_field('questionnaire_question', 'position', $record->position - 1, array('id' => $record->id));
104+
$DB->set_field('questionnaire_question', 'position', $record->position - 1, ['id' => $record->id]);
105105
}
106106
}
107107
// Delete section breaks without asking for confirmation.
@@ -121,11 +121,11 @@
121121
// Log question deleted event.
122122
$context = context_module::instance($questionnaire->cm->id);
123123
$questiontype = \mod_questionnaire\question\question::qtypename($questionnaire->questions[$qid]->type_id);
124-
$params = array(
125-
'context' => $context,
126-
'courseid' => $questionnaire->course->id,
127-
'other' => array('questiontype' => $questiontype)
128-
);
124+
$params = [
125+
'context' => $context,
126+
'courseid' => $questionnaire->course->id,
127+
'other' => ['questiontype' => $questiontype],
128+
];
129129
$event = \mod_questionnaire\event\question_deleted::create($params);
130130
$event->trigger();
131131

@@ -143,15 +143,15 @@
143143
if (!empty($questionnaire->questions)) {
144144
$pos = 1;
145145
foreach ($questionnaire->questions as $qidx => $question) {
146-
$sdata->{'pos_'.$qidx} = $pos;
146+
$sdata->{'pos_' . $qidx} = $pos;
147147
$pos++;
148148
}
149149
}
150150
$questionsform->set_data($sdata);
151151
if ($questionsform->is_cancelled()) {
152152
// Switch to main screen.
153153
$action = 'main';
154-
redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id);
154+
redirect($CFG->wwwroot . '/mod/questionnaire/questions.php?id=' . $questionnaire->cm->id);
155155
$reload = true;
156156
}
157157
if ($qformdata = $questionsform->get_data()) {
@@ -180,7 +180,7 @@
180180

181181
// Delete section breaks without asking for confirmation.
182182
if ($qtype == QUESPAGEBREAK) {
183-
redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id.'&delq='.$qid);
183+
redirect($CFG->wwwroot . '/mod/questionnaire/questions.php?id=' . $questionnaire->cm->id . '&delq=' . $qid);
184184
}
185185

186186
$action = "confirmdelquestion";
@@ -199,21 +199,18 @@
199199
// value in the <input> tag.
200200
$qid = key($qformdata->editbutton);
201201
$reload = true;
202-
203202
} else if (isset($qformdata->requiredbutton)) {
204203
// Need to use the key, since IE returns the image position as the value rather than the specified
205204
// value in the <input> tag.
206205

207206
$qid = key($qformdata->requiredbutton);
208207
if ($questionnaire->questions[$qid]->required()) {
209208
$questionnaire->questions[$qid]->set_required(false);
210-
211209
} else {
212210
$questionnaire->questions[$qid]->set_required(true);
213211
}
214212

215213
$reload = true;
216-
217214
} else if (isset($qformdata->addqbutton)) {
218215
if ($qformdata->type_id == QUESPAGEBREAK) { // Adding section break is handled right away....
219216
$questionrec = new stdClass();
@@ -230,15 +227,11 @@
230227
$qid = 0;
231228
$reload = true;
232229
}
233-
234230
} else if (isset($qformdata->movebutton)) {
235231
// Nothing I do will seem to reload the form with new data, except for moving away from the page, so...
236-
redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id.
237-
'&moveq='.key($qformdata->movebutton));
232+
redirect($CFG->wwwroot . '/mod/questionnaire/questions.php?id=' . $questionnaire->cm->id .
233+
'&moveq=' . key($qformdata->movebutton));
238234
$reload = true;
239-
240-
241-
242235
} else if (isset($qformdata->moveherebutton)) {
243236
// Need to use the key, since IE returns the image position as the value rather than the specified
244237
// value in the <input> tag.
@@ -252,17 +245,14 @@
252245
$SESSION->questionnaire->validateresults = questionnaire_check_page_breaks($questionnaire);
253246
}
254247
// Nothing I do will seem to reload the form with new data, except for moving away from the page, so...
255-
redirect($CFG->wwwroot.'/mod/questionnaire/questions.php?id='.$questionnaire->cm->id);
248+
redirect($CFG->wwwroot . '/mod/questionnaire/questions.php?id=' . $questionnaire->cm->id);
256249
$reload = true;
257-
258250
} else if (isset($qformdata->validate)) {
259251
// Validates page breaks for depend questions.
260252
$SESSION->questionnaire->validateresults = questionnaire_check_page_breaks($questionnaire);
261253
$reload = true;
262254
}
263255
}
264-
265-
266256
} else if ($action == 'question') {
267257
$question = questionnaire_prep_for_questionform($questionnaire, $qid, $qtype);
268258
$questionsform = new \mod_questionnaire\edit_question_form('questions.php');
@@ -271,7 +261,6 @@
271261
// Switch to main screen.
272262
$action = 'main';
273263
$reload = true;
274-
275264
} else if ($qformdata = $questionsform->get_data()) {
276265
// Saving question data.
277266
if (isset($qformdata->makecopy)) {
@@ -297,11 +286,11 @@
297286
if (isset($qformdata)) {
298287
$context = context_module::instance($questionnaire->cm->id);
299288
$questiontype = \mod_questionnaire\question\question::qtypename($qformdata->type_id);
300-
$params = array(
301-
'context' => $context,
302-
'courseid' => $questionnaire->course->id,
303-
'other' => array('questiontype' => $questiontype)
304-
);
289+
$params = [
290+
'context' => $context,
291+
'courseid' => $questionnaire->course->id,
292+
'other' => ['questiontype' => $questiontype],
293+
];
305294
$event = \mod_questionnaire\event\question_created::create($params);
306295
$event->trigger();
307296
}
@@ -324,7 +313,7 @@
324313
if (!empty($questionnaire->questions)) {
325314
$pos = 1;
326315
foreach ($questionnaire->questions as $qidx => $question) {
327-
$sdata->{'pos_'.$qidx} = $pos;
316+
$sdata->{'pos_' . $qidx} = $pos;
328317
$pos++;
329318
}
330319
}
@@ -354,17 +343,16 @@
354343
require('tabs.php');
355344

356345
if ($action == "confirmdelquestion" || $action == "confirmdelquestionparent") {
357-
358346
$qid = key($qformdata->removebutton);
359347
$question = $questionnaire->questions[$qid];
360348
$qtype = $question->type_id;
361349

362350
// Count responses already saved for that question.
363351
$countresps = 0;
364352
if ($qtype != QUESSECTIONTEXT) {
365-
$responsetable = $DB->get_field('questionnaire_question_type', 'response_table', array('typeid' => $qtype));
353+
$responsetable = $DB->get_field('questionnaire_question_type', 'response_table', ['typeid' => $qtype]);
366354
if (!empty($responsetable)) {
367-
$countresps = $DB->count_records('questionnaire_'.$responsetable, array('question_id' => $qid));
355+
$countresps = $DB->count_records('questionnaire_' . $responsetable, ['question_id' => $qid]);
368356
}
369357
}
370358

@@ -378,18 +366,18 @@
378366

379367
$qname = '';
380368
if ($question->name) {
381-
$qname = ' ('.$question->name.')';
369+
$qname = ' (' . $question->name . ')';
382370
}
383371

384372
$num = get_string('position', 'questionnaire');
385-
$pos = $question->position.$qname;
373+
$pos = $question->position . $qname;
386374

387-
$msg = '<div class="warning centerpara"><p>'.get_string('confirmdelquestion', 'questionnaire', $pos).'</p>';
375+
$msg = '<div class="warning centerpara"><p>' . get_string('confirmdelquestion', 'questionnaire', $pos) . '</p>';
388376
if ($countresps !== 0) {
389-
$msg .= '<p>'.get_string('confirmdelquestionresps', 'questionnaire', $countresps).'</p>';
377+
$msg .= '<p>' . get_string('confirmdelquestionresps', 'questionnaire', $countresps) . '</p>';
390378
}
391379
$msg .= '</div>';
392-
$msg .= '<div class = "qn-container">'.$num.' '.$pos.'<div class="qn-question">'.$question->content.'</div></div>';
380+
$msg .= '<div class = "qn-container">' . $num . ' ' . $pos . '<div class="qn-question">' . $question->content . '</div></div>';
393381
$args = "id={$questionnaire->cm->id}";
394382
$urlno = new moodle_url("/mod/questionnaire/questions.php?{$args}");
395383
$args .= "&delq={$qid}";
@@ -409,7 +397,6 @@
409397
}
410398
}
411399
$questionnaire->page->add_to_page('formarea', $questionnaire->renderer->confirm($msg, $buttonyes, $buttonno));
412-
413400
} else {
414401
$questionnaire->page->add_to_page('formarea', $questionsform->render());
415402
}

0 commit comments

Comments
 (0)