From 411fd747cff6f27ba85dcab8e4d4ab2bc4ea6e15 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 6 May 2012 12:02:54 +0200 Subject: [PATCH] MDL-32735 fix multiple E_STRICT feedback issues --- mod/feedback/edit_form.php | 20 +++++++++++++------- mod/feedback/item/info/lib.php | 2 +- mod/feedback/item/multichoice/lib.php | 4 ++-- mod/feedback/item/multichoicerated/lib.php | 2 +- mod/feedback/item/numeric/lib.php | 2 +- mod/feedback/item/textarea/lib.php | 2 +- mod/feedback/item/textfield/lib.php | 2 +- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/mod/feedback/edit_form.php b/mod/feedback/edit_form.php index 88354c7c941..e80db0eaa07 100644 --- a/mod/feedback/edit_form.php +++ b/mod/feedback/edit_form.php @@ -31,7 +31,7 @@ require_once($CFG->libdir.'/formslib.php'); class feedback_edit_add_question_form extends moodleform { public function definition() { - $mform =& $this->_form; + $mform = $this->_form; //headline $mform->addElement('header', 'general', get_string('add_items', 'feedback')); @@ -66,6 +66,9 @@ class feedback_edit_use_template_form extends moodleform { //eg: array('course' => $course) public function set_feedbackdata($data) { if (is_array($data)) { + if (!isset($this->feedbackdata)) { + $this->feedbackdata = new stdClass(); + } foreach ($data as $key => $val) { $this->feedbackdata->{$key} = $val; } @@ -111,13 +114,13 @@ class feedback_edit_use_template_form extends moodleform { } $attributes = 'onChange="this.form.submit()"'; - $elementgroup[] =& $mform->createElement('selectgroups', + $elementgroup[] = $mform->createElement('selectgroups', 'templateid', '', $options, $attributes); - $elementgroup[] =& $mform->createElement('submit', + $elementgroup[] = $mform->createElement('submit', 'use_template', get_string('use_this_template', 'feedback')); } else { @@ -140,6 +143,9 @@ class feedback_edit_create_template_form extends moodleform { public function set_feedbackdata($data) { if (is_array($data)) { + if (!isset($this->feedbackdata)) { + $this->feedbackdata = new stdClass(); + } foreach ($data as $key => $val) { $this->feedbackdata->{$key} = $val; } @@ -163,24 +169,24 @@ class feedback_edit_create_template_form extends moodleform { // visible elements $elementgroup = array(); - $elementgroup[] =& $mform->createElement('static', + $elementgroup[] = $mform->createElement('static', 'templatenamelabel', get_string('name', 'feedback')); - $elementgroup[] =& $mform->createElement('text', + $elementgroup[] = $mform->createElement('text', 'templatename', get_string('name', 'feedback'), array('size'=>'40', 'maxlength'=>'200')); if (has_capability('mod/feedback:createpublictemplate', get_system_context())) { - $elementgroup[] =& $mform->createElement('checkbox', + $elementgroup[] = $mform->createElement('checkbox', 'ispublic', get_string('public', 'feedback'), get_string('public', 'feedback')); } // buttons - $elementgroup[] =& $mform->createElement('submit', + $elementgroup[] = $mform->createElement('submit', 'create_template', get_string('save_as_new_template', 'feedback')); diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php index 870c3287bb4..299fef24b04 100644 --- a/mod/feedback/item/info/lib.php +++ b/mod/feedback/item/info/lib.php @@ -106,7 +106,7 @@ class feedback_item_info extends feedback_item_base { public function get_analysed($item, $groupid = false, $courseid = false) { $presentation = $item->presentation; - $analysed_val = null; + $analysed_val = new stdClass();; $analysed_val->data = null; $analysed_val->name = $item->name; $values = feedback_get_group_values($item, $groupid, $courseid); diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php index 4c836e0d850..cfba141be16 100644 --- a/mod/feedback/item/multichoice/lib.php +++ b/mod/feedback/item/multichoice/lib.php @@ -144,7 +144,7 @@ class feedback_item_multichoice extends feedback_item_base { if ($info->subtype == 'c') { $sizeofanswers = count($answers); for ($i = 1; $i <= $sizeofanswers; $i++) { - $ans = null; + $ans = new stdClass(); $ans->answertext = $answers[$i-1]; $ans->answercount = 0; foreach ($values as $value) { @@ -162,7 +162,7 @@ class feedback_item_multichoice extends feedback_item_base { } else { $sizeofanswers = count($answers); for ($i = 1; $i <= $sizeofanswers; $i++) { - $ans = null; + $ans = new stdClass(); $ans->answertext = $answers[$i-1]; $ans->answercount = 0; foreach ($values as $value) { diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php index 050f7ebc050..031f7b89540 100644 --- a/mod/feedback/item/multichoicerated/lib.php +++ b/mod/feedback/item/multichoicerated/lib.php @@ -148,7 +148,7 @@ class feedback_item_multichoicerated extends feedback_item_base { $sizeoflines = count($lines); for ($i = 1; $i <= $sizeoflines; $i++) { $item_values = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $lines[$i-1]); - $ans = null; + $ans = new stdClass(); $ans->answertext = $item_values[1]; $avg = 0.0; $anscount = 0; diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php index ae19cf9fcdb..23694137d8f 100644 --- a/mod/feedback/item/numeric/lib.php +++ b/mod/feedback/item/numeric/lib.php @@ -136,7 +136,7 @@ class feedback_item_numeric extends feedback_item_base { public function get_analysed($item, $groupid = false, $courseid = false) { global $DB; - $analysed = null; + $analysed = new stdClass(); $analysed->data = array(); $analysed->name = $item->name; $values = feedback_get_group_values($item, $groupid, $courseid); diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php index e6aaec5529f..54df5e6e47e 100644 --- a/mod/feedback/item/textarea/lib.php +++ b/mod/feedback/item/textarea/lib.php @@ -123,7 +123,7 @@ class feedback_item_textarea extends feedback_item_base { public function get_analysed($item, $groupid = false, $courseid = false) { global $DB; - $analysed_val = null; + $analysed_val = new stdClass(); $analysed_val->data = array(); $analysed_val->name = $item->name; diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php index 083069ed033..4051ffb97c0 100644 --- a/mod/feedback/item/textfield/lib.php +++ b/mod/feedback/item/textfield/lib.php @@ -120,7 +120,7 @@ class feedback_item_textfield extends feedback_item_base { public function get_analysed($item, $groupid = false, $courseid = false) { global $DB; - $analysed_val = null; + $analysed_val = new stdClass(); $analysed_val->data = null; $analysed_val->name = $item->name;