From afb4494bd0113779da569ee367ba5aae44d8bc9f Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Sat, 4 Jun 2011 21:04:02 +0200 Subject: [PATCH] MDL-27448 URL resource module backup conversion improved The patch also fixes invalid 'course' field in moodle2 backup code. --- mod/url/backup/moodle1/lib.php | 77 +++++++++++++++---- .../backup/moodle2/backup_url_stepslib.php | 2 +- 2 files changed, 65 insertions(+), 14 deletions(-) diff --git a/mod/url/backup/moodle1/lib.php b/mod/url/backup/moodle1/lib.php index bd6cf472eb8..862762021f1 100644 --- a/mod/url/backup/moodle1/lib.php +++ b/mod/url/backup/moodle1/lib.php @@ -31,13 +31,14 @@ defined('MOODLE_INTERNAL') || die(); */ class moodle1_mod_url_handler extends moodle1_resource_successor_handler { + /** @var moodle1_file_manager instance */ + protected $fileman = null; + /** * Converts /MOODLE_BACKUP/COURSE/MODULES/MOD/RESOURCE data * Called by moodle1_mod_resource_handler::process_resource() */ public function process_legacy_resource($data) { - $data['externalurl'] = $data['reference']; - unset($data['reference']); // get the course module id and context id $instanceid = $data['id']; @@ -45,21 +46,71 @@ class moodle1_mod_url_handler extends moodle1_resource_successor_handler { $moduleid = $cminfo['id']; $contextid = $this->converter->get_contextid(CONTEXT_MODULE, $moduleid); - // we now have all information needed to start writing into the file + // prepare the new url instance record + $url = array(); + $url['id'] = $data['id']; + $url['name'] = $data['name']; + $url['intro'] = $data['intro']; + $url['introformat'] = $data['introformat']; + $url['externalurl'] = $data['reference']; + $url['timemodified'] = $data['timemodified']; + + // populate display and displayoptions fields + $options = array('printheading' => 0, 'printintro' => 1); + if ($data['options'] == 'frame') { + $url['display'] = RESOURCELIB_DISPLAY_FRAME; + + } else if ($data['options'] == 'objectframe') { + $url['display'] = RESOURCELIB_DISPLAY_EMBED; + + } else if ($data['popup']) { + $url['display'] = RESOURCELIB_DISPLAY_POPUP; + $rawoptions = explode(',', $data['popup']); + foreach ($rawoptions as $rawoption) { + list($name, $value) = explode('=', trim($rawoption), 2); + if ($value > 0 and ($name == 'width' or $name == 'height')) { + $options['popup'.$name] = $value; + continue; + } + } + + } else { + $url['display'] = RESOURCELIB_DISPLAY_AUTO; + } + $url['displayoptions'] = serialize($options); + + // populate the parameters field + $parameters = array(); + if ($data['alltext']) { + $rawoptions = explode(',', $data['alltext']); + foreach ($rawoptions as $rawoption) { + list($variable, $parameter) = explode('=', trim($rawoption), 2); + $parameters[$parameter] = $variable; + } + } + $url['parameters'] = serialize($parameters); + + // convert course files embedded into the intro + $this->fileman = $this->converter->get_file_manager($contextid, 'mod_url', 'intro'); + $url['intro'] = moodle1_converter::migrate_referenced_files($url['intro'], $this->fileman); + + // write url.xml $this->open_xml_writer("activities/url_{$moduleid}/url.xml"); $this->xmlwriter->begin_tag('activity', array('id' => $instanceid, 'moduleid' => $moduleid, 'modulename' => 'url', 'contextid' => $contextid)); - $this->xmlwriter->begin_tag('url', array('id' => $instanceid)); - - unset($data['id']); // we already write it as attribute, do not repeat it as child element - foreach ($data as $field => $value) { - $this->xmlwriter->full_tag($field, $value); - } - } - - public function on_legacy_resource_end() { - $this->xmlwriter->end_tag('url'); + $this->write_xml('url', $url, array('/url/id')); $this->xmlwriter->end_tag('activity'); $this->close_xml_writer(); + + // write inforef.xml + $this->open_xml_writer("activities/url_{$moduleid}/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/mod/url/backup/moodle2/backup_url_stepslib.php b/mod/url/backup/moodle2/backup_url_stepslib.php index d3133fb7223..40c8892a615 100644 --- a/mod/url/backup/moodle2/backup_url_stepslib.php +++ b/mod/url/backup/moodle2/backup_url_stepslib.php @@ -37,7 +37,7 @@ class backup_url_activity_structure_step extends backup_activity_structure_step // Define each element separated $url = new backup_nested_element('url', array('id'), array( - 'course','name', 'intro', 'introformat', 'externalurl', + 'name', 'intro', 'introformat', 'externalurl', 'display', 'displayoptions', 'parameters', 'timemodified'));