From 74e28b263a52b85b7f8f8ec274205f0ab914cc2a Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Mon, 4 Jan 2010 17:52:45 +0000 Subject: [PATCH] Petr's review: Removing assignment by reference --- mod/workshop/allocation/manual/allocator.php | 1 + mod/workshop/allocation/random/settings_form.php | 4 ++-- mod/workshop/grading/noerrors/edit_form.php | 16 ++++++++-------- mod/workshop/mod_form.php | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/mod/workshop/allocation/manual/allocator.php b/mod/workshop/allocation/manual/allocator.php index 2c31d55aec..871ccafadf 100644 --- a/mod/workshop/allocation/manual/allocator.php +++ b/mod/workshop/allocation/manual/allocator.php @@ -132,6 +132,7 @@ class workshop_manual_allocator implements workshop_allocator { */ public function ui(moodle_mod_workshop_renderer $wsoutput) { global $PAGE; + global $CFG; // bacause we include other libs here $hlauthorid = -1; // highlight this author $hlreviewerid = -1; // highlight this reviewer diff --git a/mod/workshop/allocation/random/settings_form.php b/mod/workshop/allocation/random/settings_form.php index 787a6554df..4570c839b2 100644 --- a/mod/workshop/allocation/random/settings_form.php +++ b/mod/workshop/allocation/random/settings_form.php @@ -64,9 +64,9 @@ class workshop_random_allocator_form extends moodleform { $options_numper = array(WORKSHOP_USERTYPE_AUTHOR => get_string('numperauthor', 'workshop'), WORKSHOP_USERTYPE_REVIEWER => get_string('numperreviewer', 'workshop')); $grpnumofreviews = array(); - $grpnumofreviews[] =& $mform->createElement('select', 'numofreviews', '', $options_numofreviewes); + $grpnumofreviews[] = $mform->createElement('select', 'numofreviews', '', $options_numofreviewes); $mform->setDefault('numofreviews', 4); - $grpnumofreviews[] =& $mform->createElement('select', 'numper', '', $options_numper); + $grpnumofreviews[] = $mform->createElement('select', 'numper', '', $options_numper); $mform->setDefault('numper', WORKSHOP_USERTYPE_AUTHOR); $mform->addGroup($grpnumofreviews, 'grpnumofreviews', get_string('numofreviews', 'workshop'), array(' '), false); diff --git a/mod/workshop/grading/noerrors/edit_form.php b/mod/workshop/grading/noerrors/edit_form.php index 42e58caadf..c67db15906 100644 --- a/mod/workshop/grading/noerrors/edit_form.php +++ b/mod/workshop/grading/noerrors/edit_form.php @@ -48,14 +48,14 @@ class workshop_edit_noerrors_strategy_form extends workshop_edit_strategy_form { $weights = workshop_get_dimension_weights(); $repeated = array(); - $repeated[] =& $mform->createElement('hidden', 'dimensionid', 0); - $repeated[] =& $mform->createElement('header', 'dimension', + $repeated[] = $mform->createElement('hidden', 'dimensionid', 0); + $repeated[] = $mform->createElement('header', 'dimension', get_string('dimensionnumbernoerrors', 'workshop', '{no}')); - $repeated[] =& $mform->createElement('htmleditor', 'description', + $repeated[] = $mform->createElement('htmleditor', 'description', get_string('dimensiondescription', 'workshop'), array()); - $repeated[] =& $mform->createElement('text', 'grade0', get_string('noerrorsgrade0', 'workshop'), array('size'=>'15')); - $repeated[] =& $mform->createElement('text', 'grade1', get_string('noerrorsgrade1', 'workshop'), array('size'=>'15')); - $repeated[] =& $mform->createElement('select', 'weight', get_string('dimensionweight', 'workshop'), $weights); + $repeated[] = $mform->createElement('text', 'grade0', get_string('noerrorsgrade0', 'workshop'), array('size'=>'15')); + $repeated[] = $mform->createElement('text', 'grade1', get_string('noerrorsgrade1', 'workshop'), array('size'=>'15')); + $repeated[] = $mform->createElement('select', 'weight', get_string('dimensionweight', 'workshop'), $weights); $repeatedoptions = array(); $repeatedoptions['description']['type'] = PARAM_CLEANHTML; @@ -86,8 +86,8 @@ class workshop_edit_noerrors_strategy_form extends workshop_edit_strategy_form { $mform->addElement('hidden', 'map[0]', 100); for ($i = 1; $i <= $numofdisplaydimensions; $i++) { $selects = array(); - $selects[] =& $mform->createElement('select', "map[$i]", $i, $percents); - $selects[] =& $mform->createElement('static', "mapdefault[$i]", '', + $selects[] = $mform->createElement('select', "map[$i]", $i, $percents); + $selects[] = $mform->createElement('static', "mapdefault[$i]", '', get_string('percents', 'workshop', floor(100 - $i * 100 / $numofdisplaydimensions))); $mform->addGroup($selects, "grademapping$i", $i, array(' '), false); $mform->setDefault("map[$i]", ''); diff --git a/mod/workshop/mod_form.php b/mod/workshop/mod_form.php index 95c7934e39..56c806b250 100644 --- a/mod/workshop/mod_form.php +++ b/mod/workshop/mod_form.php @@ -37,7 +37,7 @@ class mod_workshop_mod_form extends moodleform_mod { global $CFG, $COURSE; $workshopconfig = get_config('workshop'); - $mform =& $this->_form; + $mform = $this->_form; /// General -------------------------------------------------------------------- $mform->addElement('header', 'general', get_string('general', 'form')); -- 2.39.5