From: Petr Skoda Date: Sun, 1 Nov 2009 12:11:29 +0000 (+0000) Subject: MDL-20700 coding style cleanup - cvs keywords removed, closign php tag removed, trail... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6c3ef4103a065368d06c43372babd50d8cd943b2;p=moodle.git MDL-20700 coding style cleanup - cvs keywords removed, closign php tag removed, trailing whitespace cleanup --- diff --git a/grade/edit/letter/edit_form.php b/grade/edit/letter/edit_form.php index f1ed834c4f..d8ab832a2d 100644 --- a/grade/edit/letter/edit_form.php +++ b/grade/edit/letter/edit_form.php @@ -80,4 +80,4 @@ class edit_letter_form extends moodleform { } -?> + diff --git a/grade/edit/letter/index.php b/grade/edit/letter/index.php index 1de41a6c7c..612f763a5e 100644 --- a/grade/edit/letter/index.php +++ b/grade/edit/letter/index.php @@ -72,4 +72,4 @@ $table->data = $data; $table->tablealign = 'center'; echo $OUTPUT->table($table); -echo $OUTPUT->footer(); +echo $OUTPUT->footer(); diff --git a/grade/edit/letter/tabs.php b/grade/edit/letter/tabs.php index 226e579a95..e87dbb3066 100644 --- a/grade/edit/letter/tabs.php +++ b/grade/edit/letter/tabs.php @@ -33,4 +33,4 @@ print_tabs($tabs, $currenttab); echo ''; -?> + diff --git a/grade/edit/outcome/course.php b/grade/edit/outcome/course.php index adc22bb5b6..ee8d753dab 100644 --- a/grade/edit/outcome/course.php +++ b/grade/edit/outcome/course.php @@ -133,4 +133,4 @@ check_theme_arrows(); require('course_form.html'); echo $OUTPUT->footer(); -?> + diff --git a/grade/edit/outcome/edit_form.php b/grade/edit/outcome/edit_form.php index 3f56bc36e3..3983b87f04 100644 --- a/grade/edit/outcome/edit_form.php +++ b/grade/edit/outcome/edit_form.php @@ -146,4 +146,4 @@ class edit_outcome_form extends moodleform { } -?> + diff --git a/grade/edit/outcome/export.php b/grade/edit/outcome/export.php index 2f8c114938..5d226c1490 100644 --- a/grade/edit/outcome/export.php +++ b/grade/edit/outcome/export.php @@ -15,7 +15,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - // Exports selected outcomes in CSV format. + // Exports selected outcomes in CSV format. require_once '../../../config.php'; require_once $CFG->dirroot.'/grade/lib.php'; diff --git a/grade/edit/outcome/import_outcomes_form.php b/grade/edit/outcome/import_outcomes_form.php index 92a3766855..def8aa6495 100644 --- a/grade/edit/outcome/import_outcomes_form.php +++ b/grade/edit/outcome/import_outcomes_form.php @@ -49,4 +49,4 @@ class import_outcomes_form extends moodleform { } } -?> + diff --git a/grade/edit/outcome/tabs.php b/grade/edit/outcome/tabs.php index 40a7aa25ff..23355bd4ee 100644 --- a/grade/edit/outcome/tabs.php +++ b/grade/edit/outcome/tabs.php @@ -35,4 +35,4 @@ print_tabs($tabs, $currenttab); echo ''; -?> + diff --git a/grade/edit/scale/edit_form.php b/grade/edit/scale/edit_form.php index 19442d7a80..be72751482 100644 --- a/grade/edit/scale/edit_form.php +++ b/grade/edit/scale/edit_form.php @@ -143,4 +143,4 @@ class edit_scale_form extends moodleform { } } -?> + diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php index 37c89e6500..a4f7d1cbf1 100644 --- a/grade/edit/settings/form.php +++ b/grade/edit/settings/form.php @@ -115,4 +115,4 @@ class course_settings_form extends moodleform { $this->add_action_buttons(); } } -?> + diff --git a/grade/edit/settings/index.php b/grade/edit/settings/index.php index e4594ffcf3..485a6d1602 100644 --- a/grade/edit/settings/index.php +++ b/grade/edit/settings/index.php @@ -78,4 +78,4 @@ $mform->display(); echo $OUTPUT->footer(); -?> + diff --git a/grade/edit/tree/action.php b/grade/edit/tree/action.php index b888236079..8cd1afaf6b 100644 --- a/grade/edit/tree/action.php +++ b/grade/edit/tree/action.php @@ -99,4 +99,4 @@ switch ($action) { redirect($returnurl); //redirect($returnurl, 'debug delay', 5); -?> + diff --git a/grade/edit/tree/calculation.php b/grade/edit/tree/calculation.php index f09b062f2b..238e68fd8f 100644 --- a/grade/edit/tree/calculation.php +++ b/grade/edit/tree/calculation.php @@ -210,4 +210,4 @@ function get_grade_tree(&$gtree, $element, $current_itemid=null, $errors=null) { return $return_string; } -?> + diff --git a/grade/edit/tree/calculation_form.php b/grade/edit/tree/calculation_form.php index 5d4bb45b6b..2043aaeff5 100644 --- a/grade/edit/tree/calculation_form.php +++ b/grade/edit/tree/calculation_form.php @@ -93,4 +93,4 @@ class edit_calculation_form extends moodleform { } } -?> + diff --git a/grade/edit/tree/category.php b/grade/edit/tree/category.php index 2e80e1b3e0..f941fa2582 100644 --- a/grade/edit/tree/category.php +++ b/grade/edit/tree/category.php @@ -129,7 +129,7 @@ if ($mform->is_cancelled()) { if (!isset($itemdata->aggregationcoef)) { $itemdata->aggregationcoef = 0; } - + if (!isset($itemdata->gradepass) || $itemdata->gradepass == '') { $itemdata->gradepass = 0; } @@ -140,7 +140,7 @@ if ($mform->is_cancelled()) { if (!isset($itemdata->grademin) || $itemdata->grademin == '') { $itemdata->grademin = 0; - } + } $hidden = empty($itemdata->hidden) ? 0: $itemdata->hidden; $hiddenuntil = empty($itemdata->hiddenuntil) ? 0: $itemdata->hiddenuntil; diff --git a/grade/edit/tree/category_form.php b/grade/edit/tree/category_form.php index 59511f58d1..47ec597bb0 100644 --- a/grade/edit/tree/category_form.php +++ b/grade/edit/tree/category_form.php @@ -465,4 +465,4 @@ class edit_category_form extends moodleform { } } -?> + diff --git a/grade/edit/tree/grade_form.php b/grade/edit/tree/grade_form.php index 59c803b514..c2f7c3408f 100755 --- a/grade/edit/tree/grade_form.php +++ b/grade/edit/tree/grade_form.php @@ -206,4 +206,4 @@ class edit_grade_form extends moodleform { } } -?> + diff --git a/grade/edit/tree/index.php b/grade/edit/tree/index.php index 91b900a02e..53fbd9d2ff 100644 --- a/grade/edit/tree/index.php +++ b/grade/edit/tree/index.php @@ -364,4 +364,4 @@ if ($moving) { } die; -?> + diff --git a/grade/edit/tree/item_form.php b/grade/edit/tree/item_form.php index 67514e5b12..03b80d4d0e 100644 --- a/grade/edit/tree/item_form.php +++ b/grade/edit/tree/item_form.php @@ -329,4 +329,4 @@ class edit_item_form extends moodleform { } } -?> + diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php index 4cfa2e09b3..a3c0764aff 100755 --- a/grade/edit/tree/lib.php +++ b/grade/edit/tree/lib.php @@ -1245,4 +1245,4 @@ class grade_edit_tree_column_select extends grade_edit_tree_column { return false; } } -?> + diff --git a/grade/edit/tree/outcomeitem_form.php b/grade/edit/tree/outcomeitem_form.php index f0561d11d7..bcd9871f60 100644 --- a/grade/edit/tree/outcomeitem_form.php +++ b/grade/edit/tree/outcomeitem_form.php @@ -243,4 +243,4 @@ class edit_outcomeitem_form extends moodleform { } } -?> + diff --git a/grade/export/grade_export_form.php b/grade/export/grade_export_form.php index 7ea178d777..35f8004606 100755 --- a/grade/export/grade_export_form.php +++ b/grade/export/grade_export_form.php @@ -133,4 +133,4 @@ class grade_export_form extends moodleform { } } -?> + diff --git a/grade/export/key.php b/grade/export/key.php index 33dc58395c..962b3714f9 100644 --- a/grade/export/key.php +++ b/grade/export/key.php @@ -21,7 +21,7 @@ * @package moodlecore * @copyright 2008 Petr Skoda * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ + */ require_once('../../config.php'); require_once('key_form.php'); @@ -130,4 +130,4 @@ echo $OUTPUT->header(); $editform->display(); echo $OUTPUT->footer(); -?> + diff --git a/grade/export/keymanager.php b/grade/export/keymanager.php index 07ba3a6025..ae43b8373c 100644 --- a/grade/export/keymanager.php +++ b/grade/export/keymanager.php @@ -21,7 +21,7 @@ * @package moodlecore * @copyright 2008 Petr Skoda * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ + */ require_once '../../config.php'; require_once $CFG->dirroot.'/grade/export/lib.php'; @@ -91,4 +91,4 @@ echo $OUTPUT->button(html_form::make_button('key.php', array('courseid'=>$course echo $OUTPUT->container_end(); echo $OUTPUT->footer(); -?> + diff --git a/grade/export/lib.php b/grade/export/lib.php index 274027ba68..1c46859121 100755 --- a/grade/export/lib.php +++ b/grade/export/lib.php @@ -288,7 +288,7 @@ abstract class grade_export { public function print_continue() { global $CFG, $OUTPUT; - $params = $this->get_export_params(); + $params = $this->get_export_params(); echo $OUTPUT->heading(get_string('export', 'grades')); @@ -383,4 +383,4 @@ class grade_export_update_buffer { $this->flush(0); } } -?> + diff --git a/grade/export/ods/db/access.php b/grade/export/ods/db/access.php index 614d37b7a2..1528af655b 100644 --- a/grade/export/ods/db/access.php +++ b/grade/export/ods/db/access.php @@ -39,4 +39,4 @@ $gradeexport_ods_capabilities = array( ); -?> + diff --git a/grade/export/ods/dump.php b/grade/export/ods/dump.php index 0c8d7f3db6..1bca2f1231 100644 --- a/grade/export/ods/dump.php +++ b/grade/export/ods/dump.php @@ -35,4 +35,4 @@ require_capability('gradeexport/ods:publish', $context); // use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa require 'export.php'; -?> + diff --git a/grade/export/ods/export.php b/grade/export/ods/export.php index 678955e660..f81f1d6530 100755 --- a/grade/export/ods/export.php +++ b/grade/export/ods/export.php @@ -47,4 +47,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability(' $export = new grade_export_ods($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints); $export->print_grades(); -?> + diff --git a/grade/export/ods/grade_export_ods.php b/grade/export/ods/grade_export_ods.php index 668db21368..8d2c4c19c3 100755 --- a/grade/export/ods/grade_export_ods.php +++ b/grade/export/ods/grade_export_ods.php @@ -103,4 +103,4 @@ class grade_export_ods extends grade_export { } } -?> + diff --git a/grade/export/ods/index.php b/grade/export/ods/index.php index 75a5e1a05e..045acc4b8b 100755 --- a/grade/export/ods/index.php +++ b/grade/export/ods/index.php @@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { echo $OUTPUT->heading(get_string("notingroup")); echo $OUTPUT->footer(); - die; + die; } // process post information @@ -67,4 +67,4 @@ echo '
'; $mform->display(); echo $OUTPUT->footer(); -?> + diff --git a/grade/export/ods/version.php b/grade/export/ods/version.php index 91162a6c2f..70fc242b4b 100644 --- a/grade/export/ods/version.php +++ b/grade/export/ods/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007092701; $plugin->requires = 2007101000; -?> + diff --git a/grade/export/txt/db/access.php b/grade/export/txt/db/access.php index faaad217c6..090ec71dad 100644 --- a/grade/export/txt/db/access.php +++ b/grade/export/txt/db/access.php @@ -39,4 +39,4 @@ $gradeexport_txt_capabilities = array( ); -?> + diff --git a/grade/export/txt/dump.php b/grade/export/txt/dump.php index 106c569ebf..305b4802e3 100644 --- a/grade/export/txt/dump.php +++ b/grade/export/txt/dump.php @@ -35,4 +35,4 @@ require_capability('gradeexport/txt:publish', $context); // use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa require 'export.php'; -?> + diff --git a/grade/export/txt/export.php b/grade/export/txt/export.php index fd7c7e08f4..ab7a03b96d 100755 --- a/grade/export/txt/export.php +++ b/grade/export/txt/export.php @@ -48,4 +48,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability(' $export = new grade_export_txt($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints, $separator); $export->print_grades(); -?> + diff --git a/grade/export/txt/grade_export_txt.php b/grade/export/txt/grade_export_txt.php index 89db945dd7..c1a2c77215 100755 --- a/grade/export/txt/grade_export_txt.php +++ b/grade/export/txt/grade_export_txt.php @@ -119,4 +119,4 @@ class grade_export_txt extends grade_export { } } -?> + diff --git a/grade/export/txt/index.php b/grade/export/txt/index.php index 8a2cb4874d..1ab00356c7 100755 --- a/grade/export/txt/index.php +++ b/grade/export/txt/index.php @@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { echo $OUTPUT->heading(get_string("notingroup")); echo $OUTPUT->footer(); - die; + die; } // process post information @@ -68,4 +68,4 @@ echo '
'; $mform->display(); echo $OUTPUT->footer(); -?> + diff --git a/grade/export/txt/version.php b/grade/export/txt/version.php index f8e43036b3..eba5cbf6d7 100755 --- a/grade/export/txt/version.php +++ b/grade/export/txt/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007092700; $plugin->requires = 2007101000; -?> + diff --git a/grade/export/xls/db/access.php b/grade/export/xls/db/access.php index 3748133772..d3dc43b4db 100644 --- a/grade/export/xls/db/access.php +++ b/grade/export/xls/db/access.php @@ -39,4 +39,4 @@ $gradeexport_xls_capabilities = array( ); -?> + diff --git a/grade/export/xls/dump.php b/grade/export/xls/dump.php index 4d6e28a754..7c4ea4ee0d 100644 --- a/grade/export/xls/dump.php +++ b/grade/export/xls/dump.php @@ -35,4 +35,4 @@ require_capability('gradeexport/xls:publish', $context); // use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa require 'export.php'; -?> + diff --git a/grade/export/xls/export.php b/grade/export/xls/export.php index 92f5ea70f6..4df1fec85e 100755 --- a/grade/export/xls/export.php +++ b/grade/export/xls/export.php @@ -47,4 +47,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability(' $export = new grade_export_xls($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints); $export->print_grades(); -?> + diff --git a/grade/export/xls/grade_export_xls.php b/grade/export/xls/grade_export_xls.php index ba481a6861..89c32924d4 100755 --- a/grade/export/xls/grade_export_xls.php +++ b/grade/export/xls/grade_export_xls.php @@ -103,4 +103,4 @@ class grade_export_xls extends grade_export { } } -?> + diff --git a/grade/export/xls/index.php b/grade/export/xls/index.php index bf3ffe182f..e77a982e4e 100755 --- a/grade/export/xls/index.php +++ b/grade/export/xls/index.php @@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { echo $OUTPUT->heading(get_string("notingroup")); echo $OUTPUT->footer(); - die; + die; } // process post information @@ -67,4 +67,4 @@ echo '
'; $mform->display(); echo $OUTPUT->footer(); -?> + diff --git a/grade/export/xls/version.php b/grade/export/xls/version.php index f8e43036b3..eba5cbf6d7 100644 --- a/grade/export/xls/version.php +++ b/grade/export/xls/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007092700; $plugin->requires = 2007101000; -?> + diff --git a/grade/export/xml/db/access.php b/grade/export/xml/db/access.php index eb98b6f0de..d54cee6d44 100644 --- a/grade/export/xml/db/access.php +++ b/grade/export/xml/db/access.php @@ -39,4 +39,4 @@ $gradeexport_xml_capabilities = array( ); -?> + diff --git a/grade/export/xml/dump.php b/grade/export/xml/dump.php index 782b5558dc..5b147f83af 100644 --- a/grade/export/xml/dump.php +++ b/grade/export/xml/dump.php @@ -35,4 +35,4 @@ require_capability('gradeexport/xml:publish', $context); // use the same page parameters as export.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa require 'export.php'; -?> + diff --git a/grade/export/xml/export.php b/grade/export/xml/export.php index 250997b9ed..7807993d52 100755 --- a/grade/export/xml/export.php +++ b/grade/export/xml/export.php @@ -47,4 +47,4 @@ if (groups_get_course_groupmode($COURSE) == SEPARATEGROUPS and !has_capability(' $export = new grade_export_xml($course, $groupid, $itemids, $export_feedback, $updatedgradesonly, $displaytype, $decimalpoints); $export->print_grades(); -?> + diff --git a/grade/export/xml/grade_export_xml.php b/grade/export/xml/grade_export_xml.php index 16562e1b1e..464ce1951f 100755 --- a/grade/export/xml/grade_export_xml.php +++ b/grade/export/xml/grade_export_xml.php @@ -105,4 +105,4 @@ class grade_export_xml extends grade_export { } } -?> + diff --git a/grade/export/xml/index.php b/grade/export/xml/index.php index 3ad63e0d70..6a250c43ee 100755 --- a/grade/export/xml/index.php +++ b/grade/export/xml/index.php @@ -46,7 +46,7 @@ $currentgroup = groups_get_course_group($course, true); if ($groupmode == SEPARATEGROUPS and !$currentgroup and !has_capability('moodle/site:accessallgroups', $context)) { echo $OUTPUT->heading(get_string("notingroup")); echo $OUTPUT->footer(); - die; + die; } // process post information @@ -67,4 +67,4 @@ echo '
'; $mform->display(); echo $OUTPUT->footer(); -?> + diff --git a/grade/export/xml/version.php b/grade/export/xml/version.php index f8e43036b3..eba5cbf6d7 100644 --- a/grade/export/xml/version.php +++ b/grade/export/xml/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007092700; $plugin->requires = 2007101000; -?> + diff --git a/grade/import/csv/db/access.php b/grade/import/csv/db/access.php index 9e8f339c1f..17fe2912ee 100644 --- a/grade/import/csv/db/access.php +++ b/grade/import/csv/db/access.php @@ -27,4 +27,4 @@ $gradeimport_csv_capabilities = array( ) ); -?> + diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index f663b76c28..2d5e027a98 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -494,4 +494,4 @@ if ($formdata = $mform->get_data()) { } echo $OUTPUT->footer(); -?> + diff --git a/grade/import/csv/version.php b/grade/import/csv/version.php index b58b00ebcd..6d89285fba 100644 --- a/grade/import/csv/version.php +++ b/grade/import/csv/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007072500; $plugin->requires = 2007101000; -?> + diff --git a/grade/import/grade_import_form.php b/grade/import/grade_import_form.php index 36fc10150c..af2e71312e 100755 --- a/grade/import/grade_import_form.php +++ b/grade/import/grade_import_form.php @@ -52,7 +52,7 @@ class grade_import_form extends moodleform { if (!empty($features['verbosescales'])) { $options = array(1=>get_string('yes'), 0=>get_string('no')); - $mform->addElement('select', 'verbosescales', get_string('verbosescales', 'grades'), $options); + $mform->addElement('select', 'verbosescales', get_string('verbosescales', 'grades'), $options); } $options = array('10'=>10, '20'=>20, '100'=>100, '1000'=>1000, '100000'=>100000); diff --git a/grade/import/keymanager.php b/grade/import/keymanager.php index b9bbd44e39..b450292eb9 100644 --- a/grade/import/keymanager.php +++ b/grade/import/keymanager.php @@ -52,7 +52,7 @@ if ($keys = $DB->get_records_select('user_private_key', "script='grade/import' A $line[0] = format_string($key->value); $line[1] = $key->iprestriction; $line[2] = empty($key->validuntil) ? get_string('always') : userdate($key->validuntil); - + $icon = new moodle_action_icon(); $icon->link->url = new moodle_url('key.php', array('id' => $key->id)); $icon->image->add_class('iconsmall'); @@ -88,4 +88,4 @@ echo $OUTPUT->button(html_form::make_button('key.php', array('courseid'=>$course echo $OUTPUT->container_end(); echo $OUTPUT->footer(); -?> + diff --git a/grade/import/lib.php b/grade/import/lib.php index e86802ea19..dd04656179 100755 --- a/grade/import/lib.php +++ b/grade/import/lib.php @@ -196,4 +196,4 @@ function import_cleanup($importcode) { $DB->delete_records('grade_import_newitem', array('importcode' => $importcode, 'importer' => $USER->id)); } -?> + diff --git a/grade/import/xml/db/access.php b/grade/import/xml/db/access.php index 5095148cfe..2d3bd0c923 100644 --- a/grade/import/xml/db/access.php +++ b/grade/import/xml/db/access.php @@ -35,4 +35,4 @@ $gradeimport_xml_capabilities = array( ) ); -?> + diff --git a/grade/import/xml/fetch.php b/grade/import/xml/fetch.php index b697a5b08f..68fd62e84d 100644 --- a/grade/import/xml/fetch.php +++ b/grade/import/xml/fetch.php @@ -35,4 +35,4 @@ require_capability('gradeimport/xml:publish', $context); // use the same page parameters as import.php and append &key=sdhakjsahdksahdkjsahksadjksahdkjsadhksa require 'import.php'; -?> + diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php index 52b2e3dd8f..51929b2912 100644 --- a/grade/import/xml/grade_import_form.php +++ b/grade/import/xml/grade_import_form.php @@ -94,4 +94,4 @@ class grade_import_form extends moodleform { return $err; } } -?> + diff --git a/grade/import/xml/import.php b/grade/import/xml/import.php index a6762c2bab..ab83328a8c 100644 --- a/grade/import/xml/import.php +++ b/grade/import/xml/import.php @@ -81,4 +81,4 @@ if ($importcode !== false) { print_error('error', 'gradeimport_xml'); } -?> + diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php index fc28221c97..47a30b098c 100755 --- a/grade/import/xml/index.php +++ b/grade/import/xml/index.php @@ -93,4 +93,4 @@ $mform->display(); echo $OUTPUT->footer(); -?> + diff --git a/grade/import/xml/lib.php b/grade/import/xml/lib.php index 00c19195ac..3fe65ee362 100644 --- a/grade/import/xml/lib.php +++ b/grade/import/xml/lib.php @@ -120,4 +120,4 @@ function import_xml_grades($text, $course, &$error) { return false; } } -?> + diff --git a/grade/import/xml/version.php b/grade/import/xml/version.php index f8e43036b3..eba5cbf6d7 100644 --- a/grade/import/xml/version.php +++ b/grade/import/xml/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007092700; $plugin->requires = 2007101000; -?> + diff --git a/grade/lib.php b/grade/lib.php index 3b7b858b48..af76081f6f 100644 --- a/grade/lib.php +++ b/grade/lib.php @@ -854,7 +854,7 @@ function print_grade_page_head($courseid, $active_type, $active_plugin=null, } $PAGE->navbar->add($stractive_plugin); - + $title = ': ' . $stractive_plugin; if (empty($plugin_info[$active_type]->id) || !empty($plugin_info[$active_type]->parent)) { $title = ': ' . $stractive_type . ': ' . $stractive_plugin; diff --git a/grade/querylib.php b/grade/querylib.php index 16f6d5e4d3..2b2dd6e088 100644 --- a/grade/querylib.php +++ b/grade/querylib.php @@ -338,4 +338,4 @@ function grade_get_gradable_activities($courseid, $modulename='') { return $DB->get_records_sql($sql, $params); } -?> + diff --git a/grade/report/grader/ajax.php b/grade/report/grader/ajax.php index c289315332..18c7d1cfc3 100644 --- a/grade/report/grader/ajax.php +++ b/grade/report/grader/ajax.php @@ -70,7 +70,7 @@ YAHOO.grader_report.tooltip = function(e, dataObj) { YAHOO.grader_report.saveField = function(editedEl) { var gr = YAHOO.grader_report; var idData = gr.getIdData(editedEl.id); - + if (idData.type == 'value') { // Text input var newVal = editedEl.firstChild.value; } else if (idData.type == 'feedback') { // Textarea @@ -78,7 +78,7 @@ YAHOO.grader_report.saveField = function(editedEl) { } else if (idData.type == 'scale') { // Select var newVal = editedEl.options[editedEl.selectedIndex].value; } - + // Don't save if the new value is the same as the old if (gr.el_being_edited.value == newVal || (gr.el_being_edited.value == gr.straddfeedback && newVal == '')) { YAHOO.log("saveField: Field unchanged, not saving. (" + newVal + ")", "info"); @@ -86,10 +86,10 @@ YAHOO.grader_report.saveField = function(editedEl) { } YAHOO.log("saveField: Old value: " + gr.el_being_edited.value + ", new value: " + newVal + ". Saving field...", "info"); - - var postData = "id=" + gr.courseid + "&userid=" + idData.userId + "&itemid=" + idData.itemId + + + var postData = "id=" + gr.courseid + "&userid=" + idData.userId + "&itemid=" + idData.itemId + "&action=update&newvalue=" + newVal + "&type=" + idData.type; - + var handleSuccess = function(o) { try { var queryResult = YAHOO.lang.JSON.parse(o.responseText); @@ -107,7 +107,7 @@ YAHOO.grader_report.saveField = function(editedEl) { } } else if (idData.type == 'feedback') { editedEl.innerHTML = gr.truncateText(queryResult.gradevalue); - + YAHOO.util.Event.addListener(editedEl.id, 'mouseover', gr.tooltip, {text: queryResult.gradevalue}, true); YAHOO.util.Event.addListener(editedEl.id, 'mouseout', nd); // See overlib doc for reference gr.feedbacks[idData.userId][idData.itemId] = queryResult.gradevalue; @@ -118,7 +118,7 @@ YAHOO.grader_report.saveField = function(editedEl) { YAHOO.util.Dom.addClass(editedEl, "editable"); // TODO "highlight" the updated element using animation of color (yellow fade-out) - + // Update the row's final grade values gr.updateRow(gr.getIdData(editedEl.id).userId, queryResult.row); } else { @@ -132,7 +132,7 @@ YAHOO.grader_report.saveField = function(editedEl) { var handleFailure = function(o) { YAHOO.log("saveField: Failure to call the ajax callbacks page!", "error"); } - + var uri = gr.wwwroot + '/grade/report/grader/ajax_callbacks.php'; var callback = {success: handleSuccess, failure: handleFailure}; var conn = YAHOO.util.Connect.asyncRequest("post", uri, callback, postData); @@ -158,12 +158,12 @@ YAHOO.grader_report.displayMessage = function(result, message, elToHighlight) { YAHOO.util.Dom.removeClass(messageDiv, 'success'); YAHOO.util.Dom.removeClass(messageDiv, 'error'); YAHOO.util.Dom.removeClass(messageDiv, 'notice'); - + var attributes = {backgroundColor: { to: '#00F0F0'} }; - + // Add result class YAHOO.util.Dom.addClass(messageDiv, result); - + messageDiv.innerHTML = message; // Highlight given element @@ -183,7 +183,7 @@ YAHOO.grader_report.updateRow = function(userId, row) { // Send update request and update the row YAHOO.log("updateRow: Updating row..." + row, "info"); - + for (var i in row) { if (row[i].finalgrade != null) { // Build id string @@ -198,7 +198,7 @@ YAHOO.grader_report.updateRow = function(userId, row) { idString += row[i].userid + "-i" + row[i].itemid; var elementToUpdate = document.getElementById(idString); - + if (undefined == elementToUpdate) { YAHOO.log("updateRow: Element with id " + idString + " does not exist!", "error"); } else { @@ -207,7 +207,7 @@ YAHOO.grader_report.updateRow = function(userId, row) { } else { elementToUpdate.innerHTML = gradevalue; } - + // Add overridden class where it applies, and remove it where it does not // TODO fix the code below, it doesn't currently work. See ajax_callbacks.php for the code building the JSON data if (row[i].overridden > 0) { @@ -223,15 +223,15 @@ YAHOO.grader_report.updateRow = function(userId, row) { }; /** - * Given a gradevalue or gradefeedback element, + * Given a gradevalue or gradefeedback element, * @param object element A DOM element */ YAHOO.grader_report.openField = function(element) { - YAHOO.log("openField: Moving to next item: " + element.id, "info"); - var gr = YAHOO.grader_report; + YAHOO.log("openField: Moving to next item: " + element.id, "info"); + var gr = YAHOO.grader_report; var idData = gr.getIdData(element.id); element.inputId = element.id + "_input"; - + // If field is in error, empty it before editing if (YAHOO.util.Dom.hasClass(element, 'error')) { if (idData.type == 'feedback') { @@ -239,7 +239,7 @@ YAHOO.grader_report.openField = function(element) { } else if (idData.type == 'value') { element.value = ''; } - + YAHOO.util.Dom.removeClass(element, 'error'); } @@ -259,19 +259,19 @@ YAHOO.grader_report.openField = function(element) { } element.innerHTML = ''; - setTimeout(function() {element.firstChild.focus(); }, 0); + setTimeout(function() {element.firstChild.focus(); }, 0); } else if (idData.type == 'value') { var original = element.innerHTML.toString(); // Removes reference to original - element.innerHTML = ''; - setTimeout(function() {element.firstChild.focus(); }, 0); + setTimeout(function() {element.firstChild.focus(); }, 0); } else if (idData.type == 'scale') { var original = element.options[element.selectedIndex].value; - setTimeout(function() {element.focus(); }, 0); + setTimeout(function() {element.focus(); }, 0); } - + YAHOO.util.Dom.removeClass(element, "editable"); - + // Save the element and its original value gr.el_being_edited = {elementId: element.id, value: original, tabIndex: tabIndex}; YAHOO.log("openField: el_being_edited saved as: " + gr.el_being_edited.value, "info"); @@ -294,7 +294,7 @@ YAHOO.grader_report.closeField = function(element, forcecancel) { if (idData.type == 'feedback') { var newValue = element.firstChild.value; var originalValue = gr.feedbacks[idData.userId][idData.itemId]; - + if (!forcecancel && originalValue == newValue) { YAHOO.log("closeField: originalValue == newvalue, forcing a cancel", "info"); forcecancel = true; @@ -303,16 +303,16 @@ YAHOO.grader_report.closeField = function(element, forcecancel) { } else if (idData.type == 'value') { var originalValue = gr.el_being_edited.value; var newValue = element.firstChild.value; - } - + } + YAHOO.util.Dom.addClass(element, "editable"); - + // No need to change HTML for select element if (idData.type == 'scale') { gr.el_being_edited = null; return; } - + if (forcecancel || ((newValue == '' && idData.type == 'feedback') && idData.type != 'scale')) { // Replace the input by the original value as plain text element.innerHTML = gr.truncateText(originalValue); @@ -320,7 +320,7 @@ YAHOO.grader_report.closeField = function(element, forcecancel) { } else { // For numeric grades, round off to item decimal points if (idData.type == 'value') { - element.innerHTML = gr.roundValue(newValue, idData.itemId); + element.innerHTML = gr.roundValue(newValue, idData.itemId); } else if (idData.type == 'feedback') { element.innerHTML = newValue; } @@ -340,10 +340,10 @@ YAHOO.grader_report.truncateText = function(text) { var gr = YAHOO.grader_report; var returnString = ''; - returnString = text.substring(0, gr.feedback_trunc_length); - + returnString = text.substring(0, gr.feedback_trunc_length); + // Add ... if the string was truncated - if (returnString.length < text.length) { + if (returnString.length < text.length) { returnString += '...'; } @@ -376,7 +376,7 @@ YAHOO.grader_report.roundValue = function(value, itemId) { } } - return gradevalue; + return gradevalue; }; /** @@ -390,14 +390,14 @@ YAHOO.grader_report.getField = function(origin_element, direction) { // get all 'editable' elements var haystack = YAHOO.util.Dom.getElementsByClassName('editable'); var wrapElement = null; - + var feedbackModifier = 1; var upDownOffset = 1; var idData = gr.getIdData(origin_element.id); if (gr.showquickfeedback) { feedbackModifier = 2; - + if (idData.type == 'value' || idData.type == 'scale') { upDownOffset = gr.studentsperpage; } @@ -407,25 +407,25 @@ YAHOO.grader_report.getField = function(origin_element, direction) { if (direction == 'next') { var wrapValue = 1; var needle = origin_element.tabIndex + 1; - + } else if (direction == 'previous') { var wrapValue = haystack.length; var needle = origin_element.tabIndex - 1; - + } else if (direction == 'right') { var needle = origin_element.tabIndex + gr.studentsperpage * feedbackModifier; var wrapValue = null; // TODO implement wrapping when moving right - + } else if (direction == 'left') { var needle = origin_element.tabIndex - gr.studentsperpage * feedbackModifier; var wrapValue = null; // TODO implement wrapping when moving left - + } else if (direction == 'up') { - + // Jump up from value to feedback: origin + (studentsperpage - 1) if (idData.type == 'value' || idData.type == 'scale') { var upDownOffset = gr.studentsperpage - 1; - + // Jump up from feedback to value: origin - studentsperpage } else if (idData.type == 'feedback') { var upDownOffset = -(gr.studentsperpage); @@ -433,7 +433,7 @@ YAHOO.grader_report.getField = function(origin_element, direction) { var needle = origin_element.tabIndex + upDownOffset; var wrapValue = haystack.length; - + } else if (direction == 'down') { // Jump down from value to feedback: origin + studentsperpage if (idData.type == 'value' || idData.type == 'scale') { @@ -442,10 +442,10 @@ YAHOO.grader_report.getField = function(origin_element, direction) { // Jump down from feedback to value: origin - (studentsperpage - 1) } else if (idData.type == 'feedback') { var upDownOffset = -(gr.studentsperpage - 1); - } + } var needle = origin_element.tabIndex + upDownOffset; var wrapValue = 1; - } + } for (var i = 0; i < haystack.length; i++) { if (haystack[i].tabIndex == wrapValue) { @@ -454,7 +454,7 @@ YAHOO.grader_report.getField = function(origin_element, direction) { if (haystack[i].tabIndex == needle) { return haystack[i]; - } + } } // If we haven't returned yet, it means we have reached the end of tabindices: return the wrap element @@ -472,27 +472,27 @@ YAHOO.grader_report.init = function() { // Handle Key presses: Tab and Enter this.keyHandler = function(e) { var charCode = YAHOO.util.Event.getCharCode(e); - + YAHOO.log("init: Key pressed (" + charCode + "). el_being_edited = " + gr.el_being_edited, "info"); // Handle keys if editing if (gr.el_being_edited !== null) { var editedEl = document.getElementById(gr.el_being_edited.elementId); var idData = gr.getIdData(editedEl.id); - + // Handle Tab and Shift-Tab for navigation forward/backward if (charCode == 9) { gr.saveField(editedEl); gr.closeField(editedEl, false); if (e.shiftKey) { - var fieldToOpen = gr.getField(editedEl, 'previous'); + var fieldToOpen = gr.getField(editedEl, 'previous'); } else { - var fieldToOpen = gr.getField(editedEl, 'next'); + var fieldToOpen = gr.getField(editedEl, 'next'); } - + gr.openField(fieldToOpen); } - + // Handle Enter key press if (charCode == 13 && idData.type != 'feedback') { // textareas need [enter] // Locate element being edited @@ -503,42 +503,42 @@ YAHOO.grader_report.init = function() { // Handle ctrl-arrows var arrows = { 37: "left", 38: "up", 39: "right", 40: "down" }; - + if (e.ctrlKey && (charCode == 37 || charCode == 38 || charCode == 39 || charCode == 40)) { gr.saveField(editedEl); gr.closeField(editedEl, false); - + var fieldToOpen = gr.getField(editedEl, arrows[charCode]); gr.openField(fieldToOpen); } } } - + // Handle mouse clicks this.clickHandler = function(e) { var clickTargetElement = YAHOO.util.Event.getTarget(e); - + // Handle a click while a grade value or feedback is being edited if (gr.el_being_edited !== null) { // idData represents the element being edited, not the clicked element var idData = gr.getIdData(gr.el_being_edited.elementId); - - if (idData.type != 'scale') { + + if (idData.type != 'scale') { // If clicking in a cell being edited, no action // parentNode is the original a to which the element was added as a Child node if (gr.el_being_edited.elementId == clickTargetElement.parentNode.id) { YAHOO.log("init: Clicked within the edited element, no action.", "info"); return false; } - + // Otherwise, we CANCEL the current edit var originalTarget = document.getElementById(gr.el_being_edited.elementId); YAHOO.log("init: Clicked out of the edited element, cancelling edit.", "info"); gr.closeField(originalTarget, true); - + } else if (idData.type == 'scale' && gr.el_being_edited.elementId == clickTargetElement.id) { - + // An option has been selected, update the element gr.saveField(clickTargetElement); // Then open the element to save the new value in el_being_edited @@ -550,7 +550,7 @@ YAHOO.grader_report.init = function() { while (clickTargetElement.id != 'grade-report-grader-index') { anchor_re = /(gradevalue|gradefeedback|gradescale)(.*) editable/; anchor_matches = anchor_re.exec(clickTargetElement.className); - + // YAHOO.log("className = " + clickTargetElement.className, "info"); var nodeName = clickTargetElement.nodeName.toLowerCase(); @@ -558,7 +558,7 @@ YAHOO.grader_report.init = function() { gr.openField(clickTargetElement); break; - // If clicked anywhere else in the cell, default to editing the grade, not the feedback + // If clicked anywhere else in the cell, default to editing the grade, not the feedback } else if (clickTargetElement.nodeName.toLowerCase() == "td" && clickTargetElement.id.match(/gradecell/)) { anchors = YAHOO.util.Dom.getElementsByClassName("editable", "a", clickTargetElement); if (anchors.length > 0) { diff --git a/grade/report/grader/ajax_callbacks.php b/grade/report/grader/ajax_callbacks.php index a1ef4445e3..0fec096362 100644 --- a/grade/report/grader/ajax_callbacks.php +++ b/grade/report/grader/ajax_callbacks.php @@ -141,4 +141,4 @@ switch ($action) { break; } -?> + diff --git a/grade/report/grader/ajaxlib.php b/grade/report/grader/ajaxlib.php index 4b7411e719..e9c9b97fea 100644 --- a/grade/report/grader/ajaxlib.php +++ b/grade/report/grader/ajaxlib.php @@ -518,4 +518,4 @@ class grade_report_grader_ajax extends grade_report_grader { return json_encode($decimals); } } -?> + diff --git a/grade/report/grader/db/access.php b/grade/report/grader/db/access.php index 5906e90bb9..fa0e7ddb59 100644 --- a/grade/report/grader/db/access.php +++ b/grade/report/grader/db/access.php @@ -29,4 +29,4 @@ $gradereport_grader_capabilities = array( ) ); -?> + diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index cafdd39d92..6ad521dd7c 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -193,4 +193,4 @@ echo $OUTPUT->container('tooltip panel', '', 'hiddentooltiproot'); if ($report->get_pref('enableajax')) { require_once 'ajax.php'; } -echo $OUTPUT->footer(); +echo $OUTPUT->footer(); diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index 2573b62db6..ef8af4c969 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -1557,4 +1557,4 @@ class grade_report_grader extends grade_report { return $arrows; } } -?> + diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php index 5cd9558a2a..e1aee9779c 100644 --- a/grade/report/grader/preferences.php +++ b/grade/report/grader/preferences.php @@ -76,4 +76,4 @@ $mform->display(); echo $OUTPUT->box_end(); echo $OUTPUT->footer(); -?> + diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php index f94d8194d4..2f5ec29cc8 100644 --- a/grade/report/grader/preferences_form.php +++ b/grade/report/grader/preferences_form.php @@ -204,4 +204,4 @@ class grader_report_preferences_form extends moodleform { return parent::validation($data, $files); } } -?> + diff --git a/grade/report/grader/quickedit_item.php b/grade/report/grader/quickedit_item.php index 86a7ed9d4e..4ba3eaec5d 100644 --- a/grade/report/grader/quickedit_item.php +++ b/grade/report/grader/quickedit_item.php @@ -114,4 +114,4 @@ if (!empty($studentsperpage) && $studentsperpage >= 20) { } echo $OUTPUT->footer(); -?> + diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php index 08a3ba9249..0ac12388aa 100644 --- a/grade/report/grader/settings.php +++ b/grade/report/grader/settings.php @@ -103,4 +103,4 @@ $settings->add(new admin_setting_configselect('grade_report_rangesdecimalpoints' '5' => '5'))); -?> + diff --git a/grade/report/grader/tabs.php b/grade/report/grader/tabs.php index dd83ddbabc..590b54a2e5 100644 --- a/grade/report/grader/tabs.php +++ b/grade/report/grader/tabs.php @@ -32,4 +32,4 @@ echo '
'; print_tabs($tabs, $currenttab); echo '
'; -?> + diff --git a/grade/report/grader/version.php b/grade/report/grader/version.php index 8f324fd55d..91dd06640b 100644 --- a/grade/report/grader/version.php +++ b/grade/report/grader/version.php @@ -18,4 +18,4 @@ $plugin->version = 2009022500; $plugin->requires = 2007101000; -?> + diff --git a/grade/report/lib.php b/grade/report/lib.php index 1f6aa5dfe1..7ed656537d 100755 --- a/grade/report/lib.php +++ b/grade/report/lib.php @@ -331,4 +331,4 @@ abstract class grade_report { return $html; } } -?> + diff --git a/grade/report/outcomes/db/access.php b/grade/report/outcomes/db/access.php index 6c0381b1ab..38b8389e55 100644 --- a/grade/report/outcomes/db/access.php +++ b/grade/report/outcomes/db/access.php @@ -30,4 +30,4 @@ $gradereport_outcomes_capabilities = array( ); -?> + diff --git a/grade/report/outcomes/index.php b/grade/report/outcomes/index.php index 6d44e10253..2d20664a52 100644 --- a/grade/report/outcomes/index.php +++ b/grade/report/outcomes/index.php @@ -156,4 +156,4 @@ print_grade_page_head($courseid, 'report', 'outcomes'); echo $html; echo $OUTPUT->footer(); -?> + diff --git a/grade/report/outcomes/version.php b/grade/report/outcomes/version.php index 161337e4d4..ef422935b4 100644 --- a/grade/report/outcomes/version.php +++ b/grade/report/outcomes/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007073000; $plugin->requires = 2007101000; -?> + diff --git a/grade/report/overview/db/access.php b/grade/report/overview/db/access.php index 523c9e5d99..21a4d4971c 100644 --- a/grade/report/overview/db/access.php +++ b/grade/report/overview/db/access.php @@ -29,4 +29,4 @@ $gradereport_overview_capabilities = array( ); -?> + diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php index 177de8a8a9..ca0a3175f7 100644 --- a/grade/report/overview/index.php +++ b/grade/report/overview/index.php @@ -56,7 +56,7 @@ if (has_capability('moodle/grade:viewall', $systemcontext)) { } else if ($userid == $USER->id and has_capability('moodle/grade:viewall', $context)) { //ok - can view any own grades $access = true; - + } else if ($userid == $USER->id and has_capability('moodle/grade:view', $context) and $course->showgrades) { //ok - can view own course grades $access = true; diff --git a/grade/report/overview/lib.php b/grade/report/overview/lib.php index ab246dcb91..576c38dd18 100644 --- a/grade/report/overview/lib.php +++ b/grade/report/overview/lib.php @@ -241,4 +241,4 @@ function grade_report_overview_settings_definition(&$mform) { $mform->setHelpButton('report_overview_showrank', array('showrank', get_string('showrank', 'grades'), 'grade')); } -?> + diff --git a/grade/report/overview/settings.php b/grade/report/overview/settings.php index 3c1fff96d5..7516bbcba3 100644 --- a/grade/report/overview/settings.php +++ b/grade/report/overview/settings.php @@ -19,4 +19,4 @@ $settings->add(new admin_setting_configcheckbox('grade_report_overview_showrank', get_string('showrank', 'grades'), get_string('configshowrank', 'grades'), 0, PARAM_INT)); -?> + diff --git a/grade/report/overview/version.php b/grade/report/overview/version.php index 8f324fd55d..91dd06640b 100644 --- a/grade/report/overview/version.php +++ b/grade/report/overview/version.php @@ -18,4 +18,4 @@ $plugin->version = 2009022500; $plugin->requires = 2007101000; -?> + diff --git a/grade/report/user/db/access.php b/grade/report/user/db/access.php index fbf024ff1d..3917c28183 100644 --- a/grade/report/user/db/access.php +++ b/grade/report/user/db/access.php @@ -30,4 +30,4 @@ $gradereport_user_capabilities = array( ), ); -?> + diff --git a/grade/report/user/index.php b/grade/report/user/index.php index 296adf2401..11f33fd4fc 100644 --- a/grade/report/user/index.php +++ b/grade/report/user/index.php @@ -150,4 +150,4 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all echo $OUTPUT->footer(); -?> + diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php index d5d5e40799..ec89bab8cd 100644 --- a/grade/report/user/lib.php +++ b/grade/report/user/lib.php @@ -485,4 +485,4 @@ function grade_report_user_profilereport($course, $user) { } } -?> + diff --git a/grade/report/user/settings.php b/grade/report/user/settings.php index c0adec3674..965fd98322 100644 --- a/grade/report/user/settings.php +++ b/grade/report/user/settings.php @@ -25,4 +25,4 @@ $options = array(0 => get_string('shownohidden', 'grades'), 2 => get_string('showallhidden', 'grades')); $settings->add(new admin_setting_configselect('grade_report_user_showhiddenitems', get_string('showhiddenitems', 'grades'), get_string('configshowhiddenitems', 'grades'), 1, $options)); -?> + diff --git a/grade/report/user/version.php b/grade/report/user/version.php index c0d9a094bd..efdbeb040e 100644 --- a/grade/report/user/version.php +++ b/grade/report/user/version.php @@ -18,4 +18,4 @@ $plugin->version = 2007092500; $plugin->requires = 2007101000; -?> + diff --git a/grade/simpletest/testreportlib.php b/grade/simpletest/testreportlib.php index 10278cbca2..5950728845 100644 --- a/grade/simpletest/testreportlib.php +++ b/grade/simpletest/testreportlib.php @@ -45,4 +45,4 @@ class gradereportlib_test extends FakeDBUnitTestCase { } -?> + diff --git a/login/change_password.php b/login/change_password.php index 620253db53..109f493bd4 100644 --- a/login/change_password.php +++ b/login/change_password.php @@ -141,5 +141,3 @@ if (get_user_preferences('auth_forcepasswordchange')) { } $mform->display(); echo $OUTPUT->footer(); - -?> \ No newline at end of file diff --git a/login/change_password_form.php b/login/change_password_form.php index 7b34e56b5e..9aa6c9b11f 100644 --- a/login/change_password_form.php +++ b/login/change_password_form.php @@ -1,4 +1,4 @@ -libdir.'/formslib.php'; @@ -76,4 +76,3 @@ class login_change_password_form extends moodleform { return $errors; } } -?> diff --git a/login/confirm.php b/login/confirm.php index add9a7742c..09aa3e735d 100644 --- a/login/confirm.php +++ b/login/confirm.php @@ -78,5 +78,3 @@ if (!empty($data) || (!empty($p) && !empty($s))) { } redirect("$CFG->wwwroot/"); - -?> \ No newline at end of file diff --git a/login/forgot_password.php b/login/forgot_password.php index d5dd839ee5..74a134c628 100644 --- a/login/forgot_password.php +++ b/login/forgot_password.php @@ -161,5 +161,3 @@ echo $OUTPUT->box(get_string('passwordforgotteninstructions2'), 'generalbox boxw $mform->display(); echo $OUTPUT->footer(); - -?> diff --git a/login/forgot_password_form.php b/login/forgot_password_form.php index 1bc608c13f..0fa990e693 100644 --- a/login/forgot_password_form.php +++ b/login/forgot_password_form.php @@ -1,4 +1,4 @@ -libdir.'/formslib.php'; @@ -15,9 +15,9 @@ class login_forgot_password_form extends moodleform { $submitlabel = get_string('search'); $mform->addElement('submit', 'submitbutton', $submitlabel); - + $mform->addElement('header', '', get_string('searchbyemail'), ''); - + $mform->addElement('text', 'email', get_string('email')); $mform->setType('email', PARAM_RAW); @@ -67,5 +67,3 @@ class login_forgot_password_form extends moodleform { } } - -?> \ No newline at end of file diff --git a/login/index.php b/login/index.php index 0d03fadf53..2f102694ba 100644 --- a/login/index.php +++ b/login/index.php @@ -314,4 +314,4 @@ $PAGE->set_focuscontrol($focus); echo $OUTPUT->header(); include("index_form.html"); -echo $OUTPUT->footer(); \ No newline at end of file +echo $OUTPUT->footer(); diff --git a/login/index_form.html b/login/index_form.html index 4f5319b1eb..2be14d54fb 100644 --- a/login/index_form.html +++ b/login/index_form.html @@ -65,7 +65,7 @@ if ($show_instructions) {

-registerauth == 'email') { if (!empty($CFG->auth_instructions)) { diff --git a/login/mnet_email.php b/login/mnet_email.php index 780b97cf84..757efc6716 100644 --- a/login/mnet_email.php +++ b/login/mnet_email.php @@ -41,4 +41,4 @@ echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal'); box_end(); -echo $OUTPUT->footer(); \ No newline at end of file +echo $OUTPUT->footer(); diff --git a/login/signup.php b/login/signup.php index 6266c0f647..cbcac7c615 100644 --- a/login/signup.php +++ b/login/signup.php @@ -89,4 +89,4 @@ $PAGE->set_headingmenu("
$langmenu
"); echo $OUTPUT->header(); $mform_signup->display(); -echo $OUTPUT->footer(); \ No newline at end of file +echo $OUTPUT->footer(); diff --git a/login/signup_form.php b/login/signup_form.php index 40c79d06bf..97c02a76c7 100644 --- a/login/signup_form.php +++ b/login/signup_form.php @@ -1,4 +1,4 @@ -libdir.'/formslib.php'); require_once($CFG->dirroot.'/user/profile/lib.php'); @@ -155,5 +155,3 @@ class login_signup_form extends moodleform { } } - -?>