From baecd8cd720f25b8881d7502c02031aee8a81beb Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Wed, 15 Nov 2006 03:15:59 +0000 Subject: [PATCH] dropping studentcanpost in glossary, MDL_7170 --- mod/glossary/backuplib.php | 1 - mod/glossary/db/install.xml | 12 +++++++----- mod/glossary/db/upgrade.php | 10 ++++++++++ mod/glossary/deleteentry.php | 2 +- mod/glossary/import.php | 5 ----- mod/glossary/lib.php | 1 - mod/glossary/restorelib.php | 1 - mod/glossary/version.php | 2 +- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/mod/glossary/backuplib.php b/mod/glossary/backuplib.php index 8ad9dd81a3..2f0c0b3f9f 100644 --- a/mod/glossary/backuplib.php +++ b/mod/glossary/backuplib.php @@ -63,7 +63,6 @@ fwrite ($bf,full_tag("MODTYPE",4,false,"glossary")); fwrite ($bf,full_tag("NAME",4,false,$glossary->name)); fwrite ($bf,full_tag("INTRO",4,false,$glossary->intro)); - fwrite ($bf,full_tag("STUDENTCANPOST",4,false,$glossary->studentcanpost)); fwrite ($bf,full_tag("ALLOWDUPLICATEDENTRIES",4,false,$glossary->allowduplicatedentries)); fwrite ($bf,full_tag("DISPLAYFORMAT",4,false,$glossary->displayformat)); fwrite ($bf,full_tag("MAINGLOSSARY",4,false,$glossary->mainglossary)); diff --git a/mod/glossary/db/install.xml b/mod/glossary/db/install.xml index 5db7489b30..9a3134c2f5 100644 --- a/mod/glossary/db/install.xml +++ b/mod/glossary/db/install.xml @@ -1,14 +1,16 @@ - + - - - + + @@ -169,4 +171,4 @@ - + \ No newline at end of file diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php index e22f49c1fc..f8d09080f2 100644 --- a/mod/glossary/db/upgrade.php +++ b/mod/glossary/db/upgrade.php @@ -31,7 +31,17 @@ function xmldb_glossary_upgrade($oldversion=0) { /// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php /// $result = result of "/lib/ddllib.php" function calls /// } + + if ($result && $oldversion < 2006111400) { + /// Define field studentcanpost to be dropped from glossary + $table = new XMLDBTable('glossary'); + $field = new XMLDBField('studentcanpost'); + + /// Launch drop field studentcanpost + $result = $result && drop_field($table, $field); + } + return $result; } diff --git a/mod/glossary/deleteentry.php b/mod/glossary/deleteentry.php index a9bf26b444..fc89e74d0d 100644 --- a/mod/glossary/deleteentry.php +++ b/mod/glossary/deleteentry.php @@ -49,7 +49,7 @@ error("You can't delete other people's entries!"); } $ineditperiod = ((time() - $entry->timecreated < $CFG->maxeditingtime) || $glossary->editalways); - if ((!$ineditperiod or !$glossary->studentcanpost) and !$manageentries) { + if (!$ineditperiod and !$manageentries) { error("You can't delete this. Time expired!"); } diff --git a/mod/glossary/import.php b/mod/glossary/import.php index 1a83a4bca3..fbc6f9acb2 100644 --- a/mod/glossary/import.php +++ b/mod/glossary/import.php @@ -108,11 +108,6 @@ $glossary->timemodified = time(); // Setting the default values if no values were passed - if ( isset($xmlglossary['STUDENTCANPOST'][0]['#']) ) { - $glossary->studentcanpost = addslashes($xmlglossary['STUDENTCANPOST'][0]['#']); - } else { - $glossary->studentcanpost = $CFG->glossary_studentspost; - } if ( isset($xmlglossary['ENTBYPAGE'][0]['#']) ) { $glossary->entbypage = addslashes($xmlglossary['ENTBYPAGE'][0]['#']); } else { diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 9f5b7ba291..3fe3caa96b 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1690,7 +1690,6 @@ function glossary_generate_export_file($glossary, $hook = "", $hook = 0) { $co .= glossary_start_tag("INFO",1,true); $co .= glossary_full_tag("NAME",2,false,$glossary->name); $co .= glossary_full_tag("INTRO",2,false,$glossary->intro); - $co .= glossary_full_tag("STUDENTCANPOST",2,false,$glossary->studentcanpost); $co .= glossary_full_tag("ALLOWDUPLICATEDENTRIES",2,false,$glossary->allowduplicatedentries); $co .= glossary_full_tag("DISPLAYFORMAT",2,false,$glossary->displayformat); $co .= glossary_full_tag("SHOWSPECIAL",2,false,$glossary->showspecial); diff --git a/mod/glossary/restorelib.php b/mod/glossary/restorelib.php index acbdb368bb..7c93daa4d0 100644 --- a/mod/glossary/restorelib.php +++ b/mod/glossary/restorelib.php @@ -53,7 +53,6 @@ $glossary->course = $restore->course_id; $glossary->name = backup_todb($info['MOD']['#']['NAME']['0']['#']); $glossary->intro = backup_todb($info['MOD']['#']['INTRO']['0']['#']); - $glossary->studentcanpost = backup_todb($info['MOD']['#']['STUDENTCANPOST']['0']['#']); $glossary->allowduplicatedentries = backup_todb($info['MOD']['#']['ALLOWDUPLICATEDENTRIES']['0']['#']); $glossary->displayformat = backup_todb($info['MOD']['#']['DISPLAYFORMAT']['0']['#']); $glossary->mainglossary = backup_todb($info['MOD']['#']['MAINGLOSSARY']['0']['#']); diff --git a/mod/glossary/version.php b/mod/glossary/version.php index 46d9369020..38cbadc391 100644 --- a/mod/glossary/version.php +++ b/mod/glossary/version.php @@ -5,7 +5,7 @@ /// This fragment is called by moodle_needs_upgrading() and /admin/index.php ///////////////////////////////////////////////////////////////////////////////// -$module->version = 2006091801; +$module->version = 2006111400; $module->requires = 2006082600; // Requires this Moodle version $module->cron = 0; // Period for cron to check this module (secs) -- 2.39.5