From 9e7e1b1c9e8dab3a8ec8a37dc5cc4e4d08bfe04b Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 15 Feb 2013 02:13:32 +0100 Subject: [PATCH] MDL-38040 Clean core from CRLFs --- blocks/html/backup/moodle1/lib.php | 92 ++++++++++++------------ blocks/rss_client/backup/moodle1/lib.php | 68 +++++++++--------- blog/edit_form.php | 4 +- enrol/imsenterprise/locallib.php | 6 +- mod/data/renderer.php | 10 +-- mod/scorm/report/graphs/graph.php | 10 +-- tag/coursetagslib.php | 2 +- 7 files changed, 96 insertions(+), 96 deletions(-) diff --git a/blocks/html/backup/moodle1/lib.php b/blocks/html/backup/moodle1/lib.php index d4a491f1c86b6..6373a017571b5 100644 --- a/blocks/html/backup/moodle1/lib.php +++ b/blocks/html/backup/moodle1/lib.php @@ -1,46 +1,46 @@ -converter->get_contextid(CONTEXT_BLOCK, $olddata['id']); - $configdata = unserialize(base64_decode($olddata['configdata'])); - - // get a fresh new file manager for this instance - $this->fileman = $this->converter->get_file_manager($contextid, 'block_html'); - - // convert course files embedded in the block content - $this->fileman->filearea = 'content'; - $this->fileman->itemid = 0; - $configdata->text = moodle1_converter::migrate_referenced_files($configdata->text, $this->fileman); - $configdata->format = FORMAT_HTML; - - return base64_encode(serialize($configdata)); - } - - protected function write_inforef_xml($newdata, $data) { - $this->open_xml_writer("course/blocks/{$data['name']}_{$data['id']}/inforef.xml"); - $this->xmlwriter->begin_tag('inforef'); - $this->xmlwriter->begin_tag('fileref'); - foreach ($this->fileman->get_fileids() as $fileid) { - $this->write_xml('file', array('id' => $fileid)); - } - $this->xmlwriter->end_tag('fileref'); - $this->xmlwriter->end_tag('inforef'); - $this->close_xml_writer(); - } -} \ No newline at end of file +converter->get_contextid(CONTEXT_BLOCK, $olddata['id']); + $configdata = unserialize(base64_decode($olddata['configdata'])); + + // get a fresh new file manager for this instance + $this->fileman = $this->converter->get_file_manager($contextid, 'block_html'); + + // convert course files embedded in the block content + $this->fileman->filearea = 'content'; + $this->fileman->itemid = 0; + $configdata->text = moodle1_converter::migrate_referenced_files($configdata->text, $this->fileman); + $configdata->format = FORMAT_HTML; + + return base64_encode(serialize($configdata)); + } + + protected function write_inforef_xml($newdata, $data) { + $this->open_xml_writer("course/blocks/{$data['name']}_{$data['id']}/inforef.xml"); + $this->xmlwriter->begin_tag('inforef'); + $this->xmlwriter->begin_tag('fileref'); + foreach ($this->fileman->get_fileids() as $fileid) { + $this->write_xml('file', array('id' => $fileid)); + } + $this->xmlwriter->end_tag('fileref'); + $this->xmlwriter->end_tag('inforef'); + $this->close_xml_writer(); + } +} diff --git a/blocks/rss_client/backup/moodle1/lib.php b/blocks/rss_client/backup/moodle1/lib.php index 95da634ac0a17..d6983656adfa7 100644 --- a/blocks/rss_client/backup/moodle1/lib.php +++ b/blocks/rss_client/backup/moodle1/lib.php @@ -1,34 +1,34 @@ -converter->get_contextid(CONTEXT_BLOCK, $data['id']); - - // Moodle 1.9 backups do not include sufficient data to restore feeds, so we need an empty shell rss_client.xml - // for the restore process to find - $this->open_xml_writer("course/blocks/{$data['name']}_{$instanceid}/rss_client.xml"); - $this->xmlwriter->begin_tag('block', array('id' => $instanceid, 'contextid' => $contextid, 'blockname' => 'rss_client')); - $this->xmlwriter->begin_tag('rss_client', array('id' => $instanceid)); - $this->xmlwriter->full_tag('feeds', ''); - $this->xmlwriter->end_tag('rss_client'); - $this->xmlwriter->end_tag('block'); - $this->close_xml_writer(); - - return $data; - } -} \ No newline at end of file +converter->get_contextid(CONTEXT_BLOCK, $data['id']); + + // Moodle 1.9 backups do not include sufficient data to restore feeds, so we need an empty shell rss_client.xml + // for the restore process to find + $this->open_xml_writer("course/blocks/{$data['name']}_{$instanceid}/rss_client.xml"); + $this->xmlwriter->begin_tag('block', array('id' => $instanceid, 'contextid' => $contextid, 'blockname' => 'rss_client')); + $this->xmlwriter->begin_tag('rss_client', array('id' => $instanceid)); + $this->xmlwriter->full_tag('feeds', ''); + $this->xmlwriter->end_tag('rss_client'); + $this->xmlwriter->end_tag('block'); + $this->close_xml_writer(); + + return $data; + } +} diff --git a/blog/edit_form.php b/blog/edit_form.php index 919fed1caacd1..42ab6e310da8f 100644 --- a/blog/edit_form.php +++ b/blog/edit_form.php @@ -87,8 +87,8 @@ function definition() { } if (has_capability('moodle/blog:associatecourse', $context)) { - $mform->addElement('header', 'assochdr', get_string('associations', 'blog')); - $mform->addElement('advcheckbox', 'courseassoc', get_string('associatewithcourse', 'blog', $a), null, null, array(0, $contextid)); + $mform->addElement('header', 'assochdr', get_string('associations', 'blog')); + $mform->addElement('advcheckbox', 'courseassoc', get_string('associatewithcourse', 'blog', $a), null, null, array(0, $contextid)); $mform->setDefault('courseassoc', $contextid); } diff --git a/enrol/imsenterprise/locallib.php b/enrol/imsenterprise/locallib.php index 13c61143dc417..921bb306ba663 100644 --- a/enrol/imsenterprise/locallib.php +++ b/enrol/imsenterprise/locallib.php @@ -114,9 +114,9 @@ function __construct() { * @return array Array of assignable values */ function get_imsnames($courseattr) { - - $values = $this->imsnames; - if ($courseattr == 'summary') { + + $values = $this->imsnames; + if ($courseattr == 'summary') { $values = array_merge(array('ignore' => get_string('emptyattribute', 'enrol_imsenterprise')), $values); } return $values; diff --git a/mod/data/renderer.php b/mod/data/renderer.php index 3a2394163e275..1dff332839fbd 100644 --- a/mod/data/renderer.php +++ b/mod/data/renderer.php @@ -3,7 +3,7 @@ defined('MOODLE_INTERNAL') || die(); class mod_data_renderer extends plugin_renderer_base { - + public function import_setting_mappings($datamodule, data_preset_importer $importer) { $strblank = get_string('blank', 'data'); @@ -24,7 +24,7 @@ public function import_setting_mappings($datamodule, data_preset_importer $impor $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'action', 'value'=>'finishimport')); $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'sesskey', 'value'=>sesskey())); $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'d', 'value'=>$datamodule->id)); - + if ($importer instanceof data_preset_existing_importer) { $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'fullname', 'value'=>$importer->get_userid().'/'.$importer->get_directory())); } else { @@ -60,7 +60,7 @@ public function import_setting_mappings($datamodule, data_preset_importer $impor } else { $row[1] .= html_writer::tag('option', get_string('mapnewfield', 'data'), array('value'=>'-1', 'selected'=>'selected')); } - + $row[1] .= html_writer::end_tag('select'); $table->data[] = $row; } @@ -82,5 +82,5 @@ public function import_setting_mappings($datamodule, data_preset_importer $impor return $html; } - -} \ No newline at end of file + +} diff --git a/mod/scorm/report/graphs/graph.php b/mod/scorm/report/graphs/graph.php index 1a294dcdf57f7..4350157613044 100644 --- a/mod/scorm/report/graphs/graph.php +++ b/mod/scorm/report/graphs/graph.php @@ -79,11 +79,11 @@ // Do this only if we have students to report if(!$nostudents) { - // Construct the SQL - $select = 'SELECT DISTINCT '.$DB->sql_concat('st.userid', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, '; - $select .= 'st.userid AS userid, st.scormid AS scormid, st.attempt AS attempt, st.scoid AS scoid '; - $from = 'FROM {scorm_scoes_track} st '; - $where = ' WHERE st.userid ' .$usql. ' and st.scoid = ?'; + // Construct the SQL + $select = 'SELECT DISTINCT '.$DB->sql_concat('st.userid', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, '; + $select .= 'st.userid AS userid, st.scormid AS scormid, st.attempt AS attempt, st.scoid AS scoid '; + $from = 'FROM {scorm_scoes_track} st '; + $where = ' WHERE st.userid ' .$usql. ' and st.scoid = ?'; $attempts = $DB->get_records_sql($select.$from.$where, $params); foreach ($attempts as $attempt) { diff --git a/tag/coursetagslib.php b/tag/coursetagslib.php index bde390df00941..97c27333e631d 100644 --- a/tag/coursetagslib.php +++ b/tag/coursetagslib.php @@ -24,7 +24,7 @@ */ require_once $CFG->dirroot.'/tag/lib.php'; -require_once $CFG->dirroot.'/tag/locallib.php'; +require_once $CFG->dirroot.'/tag/locallib.php'; /** * Returns an ordered array of tags associated with visible courses