From 8b6f8099ea1345c06400d620397ac0ecd0452486 Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 20 Apr 2009 20:14:15 +0000 Subject: [PATCH] MDL-18910 normalised module intro and introformat --- mod/wiki/backuplib.php | 2 +- mod/wiki/db/install.xml | 13 +++++++------ mod/wiki/db/upgrade.php | 26 ++++++++++++++++++++++++++ mod/wiki/index.php | 3 ++- mod/wiki/mod_form.php | 8 ++++---- mod/wiki/restorelib.php | 2 +- mod/wiki/version.php | 4 ++-- mod/wiki/view.php | 7 ++++--- 8 files changed, 47 insertions(+), 18 deletions(-) diff --git a/mod/wiki/backuplib.php b/mod/wiki/backuplib.php index 80ea626527..78b2d12a2a 100644 --- a/mod/wiki/backuplib.php +++ b/mod/wiki/backuplib.php @@ -55,7 +55,7 @@ fwrite ($bf,full_tag("ID",4,false,$wiki->id)); fwrite ($bf,full_tag("MODTYPE",4,false,"wiki")); fwrite ($bf,full_tag("NAME",4,false,$wiki->name)); - fwrite ($bf,full_tag("SUMMARY",4,false,$wiki->summary)); + fwrite ($bf,full_tag("SUMMARY",4,false,$wiki->intro)); fwrite ($bf,full_tag("PAGENAME",4,false,$wiki->pagename)); fwrite ($bf,full_tag("WTYPE",4,false,$wiki->wtype)); fwrite ($bf,full_tag("EWIKIPRINTTITLE",4,false,$wiki->ewikiprinttitle)); diff --git a/mod/wiki/db/install.xml b/mod/wiki/db/install.xml index 742ec0f2b5..21095d0a8e 100644 --- a/mod/wiki/db/install.xml +++ b/mod/wiki/db/install.xml @@ -1,5 +1,5 @@ - @@ -8,9 +8,10 @@ - - - + + + + @@ -24,7 +25,7 @@ - + @@ -94,4 +95,4 @@ - + \ No newline at end of file diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php index 86bb4c28e4..0120a1aa58 100644 --- a/mod/wiki/db/upgrade.php +++ b/mod/wiki/db/upgrade.php @@ -28,6 +28,32 @@ function xmldb_wiki_upgrade($oldversion) { //===== 1.9.0 upgrade line ======// + if ($result && $oldversion < 2009042000) { + + /// Rename field summary on table wiki to intro + $table = new xmldb_table('wiki'); + $field = new xmldb_field('summary', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, null, null, 'name'); + + /// Launch rename field summary + $dbman->rename_field($table, $field, 'intro'); + + /// wiki savepoint reached + upgrade_mod_savepoint($result, 2009042000, 'wiki'); + } + + if ($result && $oldversion < 2009042001) { + + /// Define field introformat to be added to wiki + $table = new xmldb_table('wiki'); + $field = new xmldb_field('introformat', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0', 'intro'); + + /// Launch add field introformat + $dbman->add_field($table, $field); + + /// wiki savepoint reached + upgrade_mod_savepoint($result, 2009042001, 'wiki'); + } + return $result; } diff --git a/mod/wiki/index.php b/mod/wiki/index.php index 89a2fe9c37..35e1888b54 100644 --- a/mod/wiki/index.php +++ b/mod/wiki/index.php @@ -68,7 +68,8 @@ } $timmod = ''.userdate($wiki->timemodified).''; - $summary = '
'.format_text($wiki->summary).'
'; + $options = (object)array('noclean'=>true); + $summary = '
'.format_text($wiki->intro, $wiki->introformat, $options).'
'; $site = get_site(); switch ($wiki->wtype) { diff --git a/mod/wiki/mod_form.php b/mod/wiki/mod_form.php index 7f2b86f06e..7a21151211 100644 --- a/mod/wiki/mod_form.php +++ b/mod/wiki/mod_form.php @@ -21,10 +21,10 @@ class mod_wiki_mod_form extends moodleform_mod { $mform->setType('name', PARAM_NOTAGS); $mform->addRule('name', null, 'required', null, 'client'); - $mform->addElement('htmleditor', 'summary', get_string('summary')); - $mform->setType('summary', PARAM_RAW); - $mform->setHelpButton('summary', array('writing', 'questions', 'richtext2'), false, 'editorhelpbutton'); - $mform->addRule('summary', get_string('required'), 'required', null, 'client'); + $mform->addElement('htmleditor', 'intro', get_string('summary')); + $mform->setType('intro', PARAM_RAW); + $mform->setHelpButton('intro', array('writing', 'questions', 'richtext2'), false, 'editorhelpbutton'); + $mform->addRule('intro', get_string('required'), 'required', null, 'client'); if (!$wikihasentries){ asort($WIKI_TYPES); diff --git a/mod/wiki/restorelib.php b/mod/wiki/restorelib.php index 43dbe15b06..c2f989f747 100644 --- a/mod/wiki/restorelib.php +++ b/mod/wiki/restorelib.php @@ -44,7 +44,7 @@ //Now, build the wiki record structure $wiki->course = $restore->course_id; $wiki->name = backup_todb($info['MOD']['#']['NAME']['0']['#']); - $wiki->summary = backup_todb($info['MOD']['#']['SUMMARY']['0']['#']); + $wiki->intro = backup_todb($info['MOD']['#']['SUMMARY']['0']['#']); $wiki->pagename = backup_todb($info['MOD']['#']['PAGENAME']['0']['#']); $wiki->wtype = backup_todb($info['MOD']['#']['WTYPE']['0']['#']); $wiki->ewikiprinttitle = backup_todb($info['MOD']['#']['EWIKIPRINTTITLE']['0']['#']); diff --git a/mod/wiki/version.php b/mod/wiki/version.php index 5e54bf7584..a452a7e55e 100644 --- a/mod/wiki/version.php +++ b/mod/wiki/version.php @@ -5,8 +5,8 @@ /// This fragment is called by moodle_needs_upgrading() and /admin/index.php ///////////////////////////////////////////////////////////////////////////////// -$module->version = 2007101509; // The current module version (Date: YYYYMMDDXX) -$module->requires = 2007101509; // The current module version (Date: YYYYMMDDXX) +$module->version = 2009042001; // The current module version (Date: YYYYMMDDXX) +$module->requires = 2009041700; // The current module version (Date: YYYYMMDDXX) $module->cron = 3600; // Period for cron to check this module (secs) ?> diff --git a/mod/wiki/view.php b/mod/wiki/view.php index d92e416d00..33dccfafed 100644 --- a/mod/wiki/view.php +++ b/mod/wiki/view.php @@ -345,9 +345,10 @@
'; - if($wiki_entry && $ewiki_title==$wiki_entry->pagename && !empty($wiki->summary)) { - if (trim(strip_tags($wiki->summary))) { - print_box(format_text($wiki->summary, FORMAT_MOODLE), 'generalbox', 'intro'); + if($wiki_entry && $ewiki_title==$wiki_entry->pagename && !empty($wiki->intro)) { + if (trim(strip_tags($wiki->intro))) { + $options = (object)array('noclean'=>true); + print_box(format_text($wiki->intro, $wiki->introformat, $options), 'generalbox', 'intro'); } } -- 2.39.5