From 4a0e2e632f230488d8406e2ab65f6064d2561ec6 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Sun, 1 Nov 2009 11:42:23 +0000 Subject: [PATCH] MDL-20700 coding style cleanup - cvs keywords removed, closign php tag removed, trailing whitespace cleanup --- lib/form/advcheckbox.php | 15 +++-- lib/form/button.php | 1 - lib/form/cancel.php | 5 +- lib/form/checkbox.php | 1 - lib/form/choosecoursefile.php | 3 +- lib/form/choosecoursefileorimsrepo.php | 3 +- lib/form/dateselector.php | 3 +- lib/form/datetimeselector.php | 3 +- lib/form/duration.php | 2 +- lib/form/editorhelp.php | 2 - lib/form/file.php | 1 - lib/form/format.php | 1 - lib/form/group.php | 1 - lib/form/header.php | 2 - lib/form/hidden.php | 1 - lib/form/htmleditor.php | 1 - lib/form/modgrade.php | 3 +- lib/form/modvisible.php | 1 - lib/form/password.php | 1 - lib/form/passwordunmask.php | 3 +- lib/form/questioncategory.php | 1 - lib/form/radio.php | 1 - lib/form/recaptcha.php | 12 ++-- lib/form/select.php | 1 - lib/form/selectgroups.php | 69 +++++++++++----------- lib/form/selectwithlink.php | 1 - lib/form/selectyesno.php | 1 - lib/form/simpletest/testduration.php | 3 +- lib/form/static.php | 1 - lib/form/submit.php | 5 +- lib/form/submitlink.php | 9 ++- lib/form/tags.php | 1 - lib/form/textarea.php | 1 - lib/form/texturl.php | 2 +- lib/form/url.php | 2 +- lib/form/warning.php | 1 - lib/grade/grade_grade.php | 1 - lib/grade/grade_item.php | 3 +- lib/grade/grade_object.php | 11 ++-- lib/grade/grade_outcome.php | 3 +- lib/grade/grade_scale.php | 3 +- lib/grade/simpletest/testgradecategory.php | 3 +- lib/grade/simpletest/testgradegrades.php | 3 +- lib/grade/simpletest/testgradeitem.php | 3 +- lib/grade/simpletest/testgradeoutcome.php | 3 +- lib/grade/simpletest/testgradescale.php | 3 +- lib/packer/file_archive.php | 2 +- lib/packer/file_packer.php | 2 +- lib/portfolio/caller.php | 2 - lib/portfolio/constants.php | 2 - lib/portfolio/exceptions.php | 1 - lib/portfolio/exporter.php | 2 - lib/portfolio/formats.php | 3 - lib/portfolio/forms.php | 2 - lib/portfolio/plugin.php | 2 - lib/xmldb/xmldb_constants.php | 3 +- lib/xmldb/xmldb_field.php | 4 +- lib/xmldb/xmldb_file.php | 4 +- lib/xmldb/xmldb_index.php | 4 +- lib/xmldb/xmldb_key.php | 4 +- lib/xmldb/xmldb_object.php | 12 ++-- lib/xmldb/xmldb_statement.php | 4 +- lib/xmldb/xmldb_structure.php | 4 +- lib/xmldb/xmldb_table.php | 4 +- 64 files changed, 92 insertions(+), 169 deletions(-) diff --git a/lib/form/advcheckbox.php b/lib/form/advcheckbox.php index 63938e7072..7507627ab6 100644 --- a/lib/form/advcheckbox.php +++ b/lib/form/advcheckbox.php @@ -43,27 +43,27 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox{ if ($values === null){ $values = array(0, 1); } - + if (!is_null($attributes['group'])) { - + $this->_group = 'checkboxgroup' . $attributes['group']; unset($attributes['group']); if (is_null($attributes)) { $attributes = array(); - $attributes['class'] .= " $this->_group"; + $attributes['class'] .= " $this->_group"; } elseif (is_array($attributes)) { if (isset($attributes['class'])) { $attributes['class'] .= " $this->_group"; } else { - $attributes['class'] = $this->_group; + $attributes['class'] = $this->_group; } } elseif ($strpos = stripos($attributes, 'class="')) { $attributes = str_ireplace('class="', 'class="' . $this->_group . ' ', $attributes); } else { $attributes .= ' class="' . $this->_group . '"'; - } - } - + } + } + parent::HTML_QuickForm_advcheckbox($elementName, $elementLabel, $text, $attributes, $values); } //end constructor @@ -140,4 +140,3 @@ class MoodleQuickForm_advcheckbox extends HTML_QuickForm_advcheckbox{ } //end func getFrozenHtml } -?> \ No newline at end of file diff --git a/lib/form/button.php b/lib/form/button.php index 31aa6673f7..0a239f1c14 100644 --- a/lib/form/button.php +++ b/lib/form/button.php @@ -84,4 +84,3 @@ class MoodleQuickForm_button extends HTML_QuickForm_button } } } //end class MoodleQuickForm_button -?> diff --git a/lib/form/cancel.php b/lib/form/cancel.php index fa7c64506a..79ab00a44e 100644 --- a/lib/form/cancel.php +++ b/lib/form/cancel.php @@ -46,14 +46,13 @@ class MoodleQuickForm_cancel extends MoodleQuickForm_submit } return parent::onQuickFormEvent($event, $arg, $caller); } // end func onQuickFormEvent - + function getFrozenHtml(){ return HTML_QuickForm_submit::getFrozenHtml(); } - + function freeze(){ return HTML_QuickForm_submit::freeze(); } // }}} } //end class MoodleQuickForm_cancel -?> \ No newline at end of file diff --git a/lib/form/checkbox.php b/lib/form/checkbox.php index d3c026214a..c621213bba 100644 --- a/lib/form/checkbox.php +++ b/lib/form/checkbox.php @@ -124,4 +124,3 @@ class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox{ return $output; } //end func getFrozenHtml } -?> \ No newline at end of file diff --git a/lib/form/choosecoursefile.php b/lib/form/choosecoursefile.php index ab0e921662..5c90293ffd 100644 --- a/lib/form/choosecoursefile.php +++ b/lib/form/choosecoursefile.php @@ -1,4 +1,4 @@ -libdir/form/group.php"; @@ -149,4 +149,3 @@ class MoodleQuickForm_choosecoursefile extends MoodleQuickForm_group } // end func onQuickFormEvent } -?> diff --git a/lib/form/choosecoursefileorimsrepo.php b/lib/form/choosecoursefileorimsrepo.php index 0429282f86..4d8ecf516c 100644 --- a/lib/form/choosecoursefileorimsrepo.php +++ b/lib/form/choosecoursefileorimsrepo.php @@ -1,4 +1,4 @@ -libdir/form/group.php"; @@ -156,4 +156,3 @@ class MoodleQuickForm_choosecoursefileorimsrepo extends MoodleQuickForm_group } // end func onQuickFormEvent } -?> diff --git a/lib/form/dateselector.php b/lib/form/dateselector.php index f94058665c..2f5cbdf311 100644 --- a/lib/form/dateselector.php +++ b/lib/form/dateselector.php @@ -1,4 +1,4 @@ - diff --git a/lib/form/datetimeselector.php b/lib/form/datetimeselector.php index d1feef157d..25c2098ff6 100644 --- a/lib/form/datetimeselector.php +++ b/lib/form/datetimeselector.php @@ -1,4 +1,4 @@ - diff --git a/lib/form/duration.php b/lib/form/duration.php index 10fcbe1f50..ba4082d17e 100644 --- a/lib/form/duration.php +++ b/lib/form/duration.php @@ -1,4 +1,4 @@ -wwwroot/help.php?module=$module&file=$page.html\">$linktext"; } - -?> diff --git a/lib/form/file.php b/lib/form/file.php index 6d7726f11b..b34062a06d 100644 --- a/lib/form/file.php +++ b/lib/form/file.php @@ -75,4 +75,3 @@ class MoodleQuickForm_file extends HTML_QuickForm_file{ } } -?> \ No newline at end of file diff --git a/lib/form/format.php b/lib/form/format.php index ce08b6b5ef..49f4ab0fa8 100644 --- a/lib/form/format.php +++ b/lib/form/format.php @@ -124,4 +124,3 @@ class MoodleQuickForm_format extends MoodleQuickForm_select{ } } -?> diff --git a/lib/form/group.php b/lib/form/group.php index a8f5633790..1f91e48b94 100644 --- a/lib/form/group.php +++ b/lib/form/group.php @@ -74,4 +74,3 @@ class MoodleQuickForm_group extends HTML_QuickForm_group{ } } } -?> \ No newline at end of file diff --git a/lib/form/header.php b/lib/form/header.php index cc6425b5bd..4825c2337d 100644 --- a/lib/form/header.php +++ b/lib/form/header.php @@ -1,5 +1,4 @@ _helpbutton; } } //end class MoodleQuickForm_header -?> diff --git a/lib/form/hidden.php b/lib/form/hidden.php index 1c5997d85d..4aa14a7a04 100644 --- a/lib/form/hidden.php +++ b/lib/form/hidden.php @@ -39,4 +39,3 @@ class MoodleQuickForm_hidden extends HTML_QuickForm_hidden{ return ''; } } -?> \ No newline at end of file diff --git a/lib/form/htmleditor.php b/lib/form/htmleditor.php index 853979e7e1..c1961d7629 100644 --- a/lib/form/htmleditor.php +++ b/lib/form/htmleditor.php @@ -97,4 +97,3 @@ class MoodleQuickForm_htmleditor extends MoodleQuickForm_textarea{ return $html . $this->_getPersistantData(); } //end func getFrozenHtml } -?> diff --git a/lib/form/modgrade.php b/lib/form/modgrade.php index 7238b292d6..aaec045693 100644 --- a/lib/form/modgrade.php +++ b/lib/form/modgrade.php @@ -12,7 +12,7 @@ require_once "$CFG->libdir/form/select.php"; class MoodleQuickForm_modgrade extends MoodleQuickForm_select{ var $_hidenograde = false; - + /** * Class constructor * @@ -71,4 +71,3 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_select{ } } -?> \ No newline at end of file diff --git a/lib/form/modvisible.php b/lib/form/modvisible.php index 0f91e668ed..0b7b30536c 100644 --- a/lib/form/modvisible.php +++ b/lib/form/modvisible.php @@ -51,4 +51,3 @@ class MoodleQuickForm_modvisible extends MoodleQuickForm_select{ return parent::onQuickFormEvent($event, $arg, $caller); } } -?> \ No newline at end of file diff --git a/lib/form/password.php b/lib/form/password.php index a17b8327a6..33ba3bd615 100644 --- a/lib/form/password.php +++ b/lib/form/password.php @@ -48,4 +48,3 @@ class MoodleQuickForm_password extends HTML_QuickForm_password{ return $this->_helpbutton; } } -?> \ No newline at end of file diff --git a/lib/form/passwordunmask.php b/lib/form/passwordunmask.php index 59dad0acdd..9c485b23c0 100644 --- a/lib/form/passwordunmask.php +++ b/lib/form/passwordunmask.php @@ -17,7 +17,7 @@ class MoodleQuickForm_passwordunmask extends MoodleQuickForm_password { function MoodleQuickForm_passwordunmask($elementName=null, $elementLabel=null, $attributes=null) { parent::MoodleQuickForm_password($elementName, $elementLabel, $attributes); } - + function toHtml() { global $PAGE; if ($this->_flagFrozen) { @@ -32,4 +32,3 @@ class MoodleQuickForm_passwordunmask extends MoodleQuickForm_password { } //end func toHtml } -?> \ No newline at end of file diff --git a/lib/form/questioncategory.php b/lib/form/questioncategory.php index 2347af82c8..779e8d5895 100644 --- a/lib/form/questioncategory.php +++ b/lib/form/questioncategory.php @@ -42,4 +42,3 @@ class MoodleQuickForm_questioncategory extends MoodleQuickForm_selectgroups { } } -?> \ No newline at end of file diff --git a/lib/form/radio.php b/lib/form/radio.php index 66384bda2b..abc66b76b8 100644 --- a/lib/form/radio.php +++ b/lib/form/radio.php @@ -82,4 +82,3 @@ class MoodleQuickForm_radio extends HTML_QuickForm_radio{ return '' . parent::toHtml() . ''; } } -?> \ No newline at end of file diff --git a/lib/form/recaptcha.php b/lib/form/recaptcha.php index 81bd2477e1..2613e227b9 100644 --- a/lib/form/recaptcha.php +++ b/lib/form/recaptcha.php @@ -23,7 +23,7 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input { * @var string */ var $_helpbutton=''; - + var $_https=false; /** @@ -61,7 +61,7 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input { } $error = $attributes['error_message']; unset($attributes['error_message']); - + $strincorrectpleasetryagain = get_string('incorrectpleasetryagain', 'auth'); $strenterthewordsabove = get_string('enterthewordsabove', 'auth'); $strenterthenumbersyouhear = get_string('enterthenumbersyouhear', 'auth'); @@ -83,11 +83,11 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input {
' . $strgetanothercaptcha . '
' . $strgetanaudiocaptcha . '
' . $strgetanimagecaptcha . '
-'; +'; return $html . recaptcha_get_html($CFG->recaptchapublickey, $error, $this->_https); } - + /** * set html for help button * @@ -109,7 +109,7 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input { } $this->_helpbutton=call_user_func_array($function, $helpbuttonargs); } - + /** * get html for help button * @@ -137,5 +137,3 @@ class MoodleQuickForm_recaptcha extends HTML_QuickForm_input { return true; } } - -?> diff --git a/lib/form/select.php b/lib/form/select.php index bdb81c3573..83c1787141 100644 --- a/lib/form/select.php +++ b/lib/form/select.php @@ -129,4 +129,3 @@ class MoodleQuickForm_select extends HTML_QuickForm_select{ } } } -?> diff --git a/lib/form/selectgroups.php b/lib/form/selectgroups.php index 733b415402..afc760204d 100644 --- a/lib/form/selectgroups.php +++ b/lib/form/selectgroups.php @@ -31,7 +31,7 @@ require_once('HTML/QuickForm/element.php'); * @access public */ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { - + // {{{ properties /** add choose option */ @@ -45,10 +45,10 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { * @access private */ var $_optGroups = array(); - + /** * Default values of the SELECT - * + * * @var string * @since 1.0 * @access private @@ -62,15 +62,15 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { */ var $_helpbutton=''; var $_hiddenLabel=false; - + /** * Class constructor - * + * * @param string Select name attribute * @param mixed Label(s) for the select * @param mixed Data to be used to populate options * @param mixed An array whose keys are labels for optgroups and whose values are arrays similar to those passed - * to the select element with keys that are values for options and values are strings for display. + * to the select element with keys that are values for options and values are strings for display. * @param mixed Either a typical HTML attribute string or an associative array * @param bool add standard moodle "Choose..." option as first item * @since 1.0 @@ -87,14 +87,14 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { $this->loadArrayOptGroups($optgrps); } } //end constructor - + // }}} // {{{ apiVersion() /** * Sets the default values of the select box - * + * * @param mixed $values Array or comma delimited string of selected values * @since 1.0 * @access public @@ -111,13 +111,13 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { $this->_values = array($values); } } //end func setSelected - + // }}} // {{{ getSelected() /** * Returns an array of the selected values - * + * * @since 1.0 * @access public * @return array of selected values @@ -132,7 +132,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { /** * Sets the input field name - * + * * @param string $name Input field name attribute * @since 1.0 * @access public @@ -142,13 +142,13 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { { $this->updateAttributes(array('name' => $name)); } //end func setName - + // }}} // {{{ getName() /** * Returns the element name - * + * * @since 1.0 * @access public * @return string @@ -163,7 +163,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { /** * Returns the element name (possibly with brackets appended) - * + * * @since 1.0 * @access public * @return string @@ -198,7 +198,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { /** * Returns an array of the selected values - * + * * @since 1.0 * @access public * @return array of selected values @@ -213,7 +213,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { /** * Sets the select field size, only applies to 'multiple' selects - * + * * @param int $size Size of select field * @since 1.0 * @access public @@ -223,13 +223,13 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { { $this->updateAttributes(array('size' => $size)); } //end func setSize - + // }}} // {{{ getSize() /** * Returns the select field size - * + * * @since 1.0 * @access public * @return int @@ -244,7 +244,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { /** * Sets the select mutiple attribute - * + * * @param bool $multiple Whether the select supports multi-selections * @since 1.2 * @access public @@ -258,13 +258,13 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { $this->removeAttribute('multiple'); } } //end func setMultiple - + // }}} // {{{ getMultiple() /** * Returns the select mutiple attribute - * + * * @since 1.2 * @access public * @return bool true if multiple select, false otherwise @@ -276,7 +276,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { /** * Loads the options from an associative array - * + * * @param array $arr Associative array of options * @param mixed $values (optional) Array or comma delimited string of selected values * @since 1.0 @@ -297,13 +297,13 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { $this->addOptGroup($key, $val); } return true; - } + } /** * Adds a new OPTION to the SELECT * * @param string $text Display text for the OPTION * @param string $value Value for the OPTION - * @param mixed $attributes Either a typical HTML attribute string + * @param mixed $attributes Either a typical HTML attribute string * or an associative array * @since 1.0 * @access public @@ -320,11 +320,11 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { $index = count($this->_optGroups); $this->_optGroups[$index] = array('attr' => $attributes); $this->loadArrayOptions($index, $value); - } - + } + /** * Loads the options from an associative array - * + * * @param array $arr Associative array of options * @param mixed $values (optional) Array or comma delimited string of selected values * @since 1.0 @@ -345,14 +345,14 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { $this->addOption($optgroup, $val, $key); } return true; - } + } /** * Adds a new OPTION to an optgroup * * @param string $text Display text for the OPTION * @param string $value Value for the OPTION - * @param mixed $attributes Either a typical HTML attribute string + * @param mixed $attributes Either a typical HTML attribute string * or an associative array * @since 1.0 * @access public @@ -376,7 +376,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { $this->_updateAttrArray($attributes, array('value' => $value)); } $this->_optGroups[$optgroup]['options'][] = array('text' => $text, 'attr' => $attributes); - } + } /** * Returns the SELECT in HTML @@ -433,13 +433,13 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { return $strHtml . $tabs . ''; } } //end func toHtml - + // }}} // {{{ getFrozenHtml() /** * Returns the value of field without HTML tags - * + * * @since 1.0 * @access public * @return string @@ -519,7 +519,7 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { return $this->_prepareValue($cleanValue, $assoc); } } - + // }}} // {{{ onQuickFormEvent() @@ -608,6 +608,5 @@ class MoodleQuickForm_selectgroups extends HTML_QuickForm_element { } else { return 'default'; } - } + } } -?> diff --git a/lib/form/selectwithlink.php b/lib/form/selectwithlink.php index 5e697a7d81..53e5d71e64 100755 --- a/lib/form/selectwithlink.php +++ b/lib/form/selectwithlink.php @@ -160,4 +160,3 @@ class MoodleQuickForm_selectwithlink extends HTML_QuickForm_select{ } } } -?> diff --git a/lib/form/selectyesno.php b/lib/form/selectyesno.php index 1f4df1c6ea..f451b8d6ac 100644 --- a/lib/form/selectyesno.php +++ b/lib/form/selectyesno.php @@ -52,4 +52,3 @@ class MoodleQuickForm_selectyesno extends MoodleQuickForm_select{ } } -?> \ No newline at end of file diff --git a/lib/form/simpletest/testduration.php b/lib/form/simpletest/testduration.php index 7ff6f32ced..ee8b4daa8f 100644 --- a/lib/form/simpletest/testduration.php +++ b/lib/form/simpletest/testduration.php @@ -1,4 +1,4 @@ -assertEqual($el->exportValue(array('testel' => array('number' => 20, 'timeunit' => 1, 'enabled' => 1))), array('testel' => 20)); } } -?> diff --git a/lib/form/static.php b/lib/form/static.php index 56274c09c5..1c976ee67a 100644 --- a/lib/form/static.php +++ b/lib/form/static.php @@ -53,4 +53,3 @@ class MoodleQuickForm_static extends HTML_QuickForm_static{ return $this->_elementTemplateType; } } -?> \ No newline at end of file diff --git a/lib/form/submit.php b/lib/form/submit.php index e990721051..3b6fd906f2 100644 --- a/lib/form/submit.php +++ b/lib/form/submit.php @@ -57,10 +57,9 @@ class MoodleQuickForm_submit extends HTML_QuickForm_submit { return 'default'; } } - + function freeze(){ $this->_flagFrozen = true; } - + } -?> \ No newline at end of file diff --git a/lib/form/submitlink.php b/lib/form/submitlink.php index fca8f5fec5..d9904c8f1e 100644 --- a/lib/form/submitlink.php +++ b/lib/form/submitlink.php @@ -7,15 +7,14 @@ class MoodleQuickForm_submitlink extends MoodleQuickForm_submit { function MoodleQuickForm_submitlink($elementName=null, $value=null, $attributes=null) { parent::MoodleQuickForm_submit($elementName, $value, $attributes); } - + function toHtml() { $text = $this->_attributes['value']; $onmouseover = "window.status=\'" . $text . "\';"; - $onmouseout = "window.status=\'\';"; + $onmouseout = "window.status=\'\';"; - return ""; } } -?> diff --git a/lib/form/tags.php b/lib/form/tags.php index bc2ba49812..400f821aac 100644 --- a/lib/form/tags.php +++ b/lib/form/tags.php @@ -249,4 +249,3 @@ class MoodleQuickForm_tags extends MoodleQuickForm_group { return array($this->getName() => $tags); } } -?> diff --git a/lib/form/textarea.php b/lib/form/textarea.php index fc4dc04fa9..21a7a89215 100644 --- a/lib/form/textarea.php +++ b/lib/form/textarea.php @@ -114,4 +114,3 @@ class MoodleQuickForm_textarea extends HTML_QuickForm_textarea{ } } } -?> \ No newline at end of file diff --git a/lib/form/texturl.php b/lib/form/texturl.php index 6ea41b1117..f7d5dc0798 100755 --- a/lib/form/texturl.php +++ b/lib/form/texturl.php @@ -26,7 +26,7 @@ class MoodleQuickForm_texturl extends HTML_QuickForm_text{ parent::HTML_QuickForm_text($elementName, $elementLabel, $attributes); repository_head_setup(); } - + function setHiddenLabel($hiddenLabel){ $this->_hiddenLabel = $hiddenLabel; } diff --git a/lib/form/url.php b/lib/form/url.php index 2c82eeb1a7..30dab1ae7b 100755 --- a/lib/form/url.php +++ b/lib/form/url.php @@ -29,7 +29,7 @@ class MoodleQuickForm_url extends HTML_QuickForm_text{ parent::HTML_QuickForm_text($elementName, $elementLabel, $attributes); repository_head_setup(); } - + function setHiddenLabel($hiddenLabel){ $this->_hiddenLabel = $hiddenLabel; } diff --git a/lib/form/warning.php b/lib/form/warning.php index 48e373c1f3..4e9053b317 100644 --- a/lib/form/warning.php +++ b/lib/form/warning.php @@ -67,4 +67,3 @@ class MoodleQuickForm_warning extends HTML_QuickForm_static{ return $this->_elementTemplateType; } } -?> diff --git a/lib/grade/grade_grade.php b/lib/grade/grade_grade.php index 6053b737cf..f48ae52caf 100644 --- a/lib/grade/grade_grade.php +++ b/lib/grade/grade_grade.php @@ -798,4 +798,3 @@ class grade_grade extends grade_object { $completion->inform_grade_changed($cm, $this->grade_item, $this, $deleted); } } -?> diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php index 62b752bd3c..56cf6bcdba 100644 --- a/lib/grade/grade_item.php +++ b/lib/grade/grade_item.php @@ -1,4 +1,4 @@ - diff --git a/lib/grade/grade_object.php b/lib/grade/grade_object.php index 7fde11cff4..72c9ec618e 100644 --- a/lib/grade/grade_object.php +++ b/lib/grade/grade_object.php @@ -1,4 +1,4 @@ -get_records_select($table, $wheresql, $params)) { - + $result = array(); foreach($datas as $data) { $instance = new $classname(); @@ -183,7 +183,7 @@ abstract class grade_object { return $result; } else { - + return false; } } @@ -346,8 +346,8 @@ abstract class grade_object { } /** - * Called immediately after the object data has been inserted, updated, or - * deleted in the database. Default does nothing, can be overridden to + * Called immediately after the object data has been inserted, updated, or + * deleted in the database. Default does nothing, can be overridden to * hook in special behaviour. * * @param bool $deleted @@ -355,4 +355,3 @@ abstract class grade_object { function notify_changed($deleted) { } } -?> diff --git a/lib/grade/grade_outcome.php b/lib/grade/grade_outcome.php index c6648f6a24..2cb6a3cf45 100644 --- a/lib/grade/grade_outcome.php +++ b/lib/grade/grade_outcome.php @@ -1,4 +1,4 @@ - diff --git a/lib/grade/grade_scale.php b/lib/grade/grade_scale.php index d9666a7190..4b317c97bf 100644 --- a/lib/grade/grade_scale.php +++ b/lib/grade/grade_scale.php @@ -1,4 +1,4 @@ - diff --git a/lib/grade/simpletest/testgradecategory.php b/lib/grade/simpletest/testgradecategory.php index 0b7f15a769..788d583fae 100755 --- a/lib/grade/simpletest/testgradecategory.php +++ b/lib/grade/simpletest/testgradecategory.php @@ -1,4 +1,4 @@ -rawgrade; } } -?> diff --git a/lib/grade/simpletest/testgradegrades.php b/lib/grade/simpletest/testgradegrades.php index 9dafcdad09..d3bef89413 100755 --- a/lib/grade/simpletest/testgradegrades.php +++ b/lib/grade/simpletest/testgradegrades.php @@ -1,4 +1,4 @@ - diff --git a/lib/grade/simpletest/testgradeitem.php b/lib/grade/simpletest/testgradeitem.php index 62afda7424..91bb819774 100755 --- a/lib/grade/simpletest/testgradeitem.php +++ b/lib/grade/simpletest/testgradeitem.php @@ -1,4 +1,4 @@ - diff --git a/lib/grade/simpletest/testgradeoutcome.php b/lib/grade/simpletest/testgradeoutcome.php index 366c2081e3..2b7db990f6 100644 --- a/lib/grade/simpletest/testgradeoutcome.php +++ b/lib/grade/simpletest/testgradeoutcome.php @@ -1,4 +1,4 @@ -assertEqual(count($this->grade_outcomes), count($grade_outcomes)); } } -?> diff --git a/lib/grade/simpletest/testgradescale.php b/lib/grade/simpletest/testgradescale.php index 1ba6c9362d..8bdcd0bdc3 100755 --- a/lib/grade/simpletest/testgradescale.php +++ b/lib/grade/simpletest/testgradescale.php @@ -1,4 +1,4 @@ -assertEqual(preg_replace('/\s*,\s*/', ',', $this->scale[0]->scale), $scale->scale); } } -?> diff --git a/lib/packer/file_archive.php b/lib/packer/file_archive.php index 7f1385893d..81543ee3bd 100644 --- a/lib/packer/file_archive.php +++ b/lib/packer/file_archive.php @@ -197,4 +197,4 @@ abstract class file_archive implements Iterator { */ //public abstract function valid(); -} \ No newline at end of file +} diff --git a/lib/packer/file_packer.php b/lib/packer/file_packer.php index 10dd489567..38b8b5a12a 100644 --- a/lib/packer/file_packer.php +++ b/lib/packer/file_packer.php @@ -74,4 +74,4 @@ abstract class file_packer { * @return array of file infos */ public abstract function list_files($archivefile); -} \ No newline at end of file +} diff --git a/lib/portfolio/caller.php b/lib/portfolio/caller.php index 86f0dd3b2e..fb9be145d5 100644 --- a/lib/portfolio/caller.php +++ b/lib/portfolio/caller.php @@ -470,5 +470,3 @@ abstract class portfolio_module_caller_base extends portfolio_caller_base { return get_string('exportingcontentfrom', 'portfolio', $this->display_name() . ': ' . $this->cm->name); } } - -?> diff --git a/lib/portfolio/constants.php b/lib/portfolio/constants.php index 5a0c36a43b..22d7901662 100644 --- a/lib/portfolio/constants.php +++ b/lib/portfolio/constants.php @@ -183,5 +183,3 @@ define('PORTFOLIO_ADD_ICON_LINK', 3); */ define('PORTFOLIO_ADD_TEXT_LINK', 4); - -?> diff --git a/lib/portfolio/exceptions.php b/lib/portfolio/exceptions.php index 2e4c5fd004..3c249f0a6c 100644 --- a/lib/portfolio/exceptions.php +++ b/lib/portfolio/exceptions.php @@ -85,4 +85,3 @@ class portfolio_plugin_exception extends portfolio_exception {} * exception for interacting with the button class */ class portfolio_button_exception extends portfolio_exception {} -?> diff --git a/lib/portfolio/exporter.php b/lib/portfolio/exporter.php index 7a13499867..da50f0ff26 100644 --- a/lib/portfolio/exporter.php +++ b/lib/portfolio/exporter.php @@ -805,5 +805,3 @@ class portfolio_exporter { } } - -?> diff --git a/lib/portfolio/formats.php b/lib/portfolio/formats.php index 982d3f60bf..88d14d152c 100644 --- a/lib/portfolio/formats.php +++ b/lib/portfolio/formats.php @@ -117,6 +117,3 @@ class portfolio_format_leap extends portfolio_format_rich { } * it's commented out in portfolio_supported_formats so cannot currently be used. */ class portfolio_format_mbkp extends portfolio_format_rich {} - - -?> diff --git a/lib/portfolio/forms.php b/lib/portfolio/forms.php index 0892d2cab6..6559eff60f 100644 --- a/lib/portfolio/forms.php +++ b/lib/portfolio/forms.php @@ -269,5 +269,3 @@ class portfolio_instance_select extends moodleform { $this->add_action_buttons(true, get_string('next')); } } - -?> diff --git a/lib/portfolio/plugin.php b/lib/portfolio/plugin.php index 71f59c18d6..56055d2e09 100644 --- a/lib/portfolio/plugin.php +++ b/lib/portfolio/plugin.php @@ -772,5 +772,3 @@ abstract class portfolio_plugin_pull_base extends portfolio_plugin_base { } } - -?> diff --git a/lib/xmldb/xmldb_constants.php b/lib/xmldb/xmldb_constants.php index 6dd828763e..39139f4c89 100644 --- a/lib/xmldb/xmldb_constants.php +++ b/lib/xmldb/xmldb_constants.php @@ -1,4 +1,4 @@ - diff --git a/lib/xmldb/xmldb_field.php b/lib/xmldb/xmldb_field.php index 8ac5546dbb..ceffdc413b 100644 --- a/lib/xmldb/xmldb_field.php +++ b/lib/xmldb/xmldb_field.php @@ -1,4 +1,4 @@ - diff --git a/lib/xmldb/xmldb_file.php b/lib/xmldb/xmldb_file.php index 85fc25dffd..62768e3deb 100644 --- a/lib/xmldb/xmldb_file.php +++ b/lib/xmldb/xmldb_file.php @@ -1,4 +1,4 @@ - diff --git a/lib/xmldb/xmldb_index.php b/lib/xmldb/xmldb_index.php index b4d6d2b713..dbbb30f0ac 100644 --- a/lib/xmldb/xmldb_index.php +++ b/lib/xmldb/xmldb_index.php @@ -1,4 +1,4 @@ - diff --git a/lib/xmldb/xmldb_key.php b/lib/xmldb/xmldb_key.php index bf77741cf3..cf429eb877 100644 --- a/lib/xmldb/xmldb_key.php +++ b/lib/xmldb/xmldb_key.php @@ -1,4 +1,4 @@ - diff --git a/lib/xmldb/xmldb_object.php b/lib/xmldb/xmldb_object.php index 4da1e6b489..a5c182e19a 100644 --- a/lib/xmldb/xmldb_object.php +++ b/lib/xmldb/xmldb_object.php @@ -1,4 +1,4 @@ -$value) { @@ -481,5 +481,3 @@ class xmldb_object { return $arr; } } - -?> diff --git a/lib/xmldb/xmldb_statement.php b/lib/xmldb/xmldb_statement.php index dea35a86e6..53ab00dfca 100644 --- a/lib/xmldb/xmldb_statement.php +++ b/lib/xmldb/xmldb_statement.php @@ -1,4 +1,4 @@ - diff --git a/lib/xmldb/xmldb_structure.php b/lib/xmldb/xmldb_structure.php index 481cc528d1..252639a8d8 100644 --- a/lib/xmldb/xmldb_structure.php +++ b/lib/xmldb/xmldb_structure.php @@ -1,4 +1,4 @@ - diff --git a/lib/xmldb/xmldb_table.php b/lib/xmldb/xmldb_table.php index 29f0afba25..8f3712c5c2 100644 --- a/lib/xmldb/xmldb_table.php +++ b/lib/xmldb/xmldb_table.php @@ -1,4 +1,4 @@ - -- 2.39.5