Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG (revision 643)
+++ trunk/CHANGELOG (revision 644)
@@ -11,6 +11,8 @@
! = Update/Change
------------------------------------- 2.7.0 -------------------------------------
+30-Jan-2008 Thomas Hornik
+! Updated upgrade-script. (Some upgrades still missing)
29-Jan-2008 Thomas Hornik
# strtotime()'s behavior differ in PHP4 and PHP5.
Had to fix some issues in admin/pages/sections and module news.
Index: trunk/wb/upgrade-script.php
===================================================================
--- trunk/wb/upgrade-script.php (revision 643)
+++ trunk/wb/upgrade-script.php (revision 644)
@@ -79,6 +79,25 @@
}
}
}
+function db_add_field($field, $table, $desc) {
+ global $database; global $OK; global $FAIL;
+ echo "
Adding field '$field' to table '$table'
";
+ $table = TABLE_PREFIX.$table;
+ $query = $database->query("DESCRIBE $table '$field'");
+ if($query->numRows() == 0) { // add field
+ $query = $database->query("ALTER TABLE $table ADD $field $desc");
+ echo mysql_error()?mysql_error().'
':'';
+ $query = $database->query("DESCRIBE $table '$field'");
+ echo mysql_error()?mysql_error().'
':'';
+ if($query->numRows() > 0) {
+ echo "'$field' added. $OK.
";
+ } else {
+ echo "adding '$field' $FAIL!
";
+ }
+ } else {
+ echo "'$field' allready there. $OK.
";
+ }
+}
echo "
Adding module_order and max_excerpt to search-table
";
@@ -93,6 +112,21 @@
db_add_search_key_value($key, $value);
}
+echo "
Adding some internal config-elements to search-table
";
+// These are global config-elements which don't appear in settings-page. Change them in the database if needed.
+// cfg_show_description - whether to show page-description on the results page (true/false), def: true
+// cfg_search_description - whether to search in page-description (true/false), def: true [only used while searching title/link/description/keywords]
+// cfg_search_keywords - whether to search in page-keywords (true/false), def: true [only used while searching title/link/description/keywords]
+// cfg_enable_old_search - use old search-method, too (true/false), def: true [use old method as fallback]
+$cfg = array(
+ 'cfg_show_description' => 'true',
+ 'cfg_search_description' => 'true',
+ 'cfg_search_keywords' => 'true',
+ 'cfg_enable_old_search' => 'true'
+);
+foreach($cfg as $key=>$value) {
+ db_add_search_key_value($key, $value);
+}
echo "
Changing results_loop in search-table
";
// adding [EXCERPT]
@@ -149,57 +183,13 @@
}
}
-echo "
Adding some internal config-elements to search-table
";
-// These are global config-elements which don't appear in settings-page. Change them in the database if needed.
-// cfg_show_description - whether to show page-description on the results page (true/false), def: true
-// cfg_search_description - whether to search in page-description (true/false), def: true [only used while searching title/link/description/keywords]
-// cfg_search_keywords - whether to search in page-keywords (true/false), def: true [only used while searching title/link/description/keywords]
-// cfg_enable_old_search - use old search-method, too (true/false), def: true [use old method as fallback]
-$cfg = array(
- 'cfg_show_description' => 'true',
- 'cfg_search_description' => 'true',
- 'cfg_search_keywords' => 'true',
- 'cfg_enable_old_search' => 'true'
-);
-foreach($cfg as $key=>$value) {
- db_add_search_key_value($key, $value);
-}
-
-
/**********************************************************
* - publish-by-date
*/
-echo "
Adding fields 'publ_start' and 'publ_end' to table 'sections'
";
// Add fields "publ_start" and "publ_end" to table "sections"
// check if fields are present
-$table = TABLE_PREFIX."sections";
-$query = $database->query("DESCRIBE $table 'publ_start'");
-if($query->numRows() == 0) { // add field
- $query = $database->query("ALTER TABLE $table ADD publ_start INT NOT NULL DEFAULT '0'");
- echo mysql_error()?mysql_error().'
':'';
- $query = $database->query("DESCRIBE $table 'publ_start'");
- echo mysql_error()?mysql_error().'
':'';
- if($query->numRows() > 0) {
- echo "'publ_start' added. $OK.
";
- } else {
- echo "adding 'publ_start' $FAIL!
";
- }
-} else {
- echo "'publ_start' allready there. $OK.
";
-}
-$query = $database->query("DESCRIBE $table 'publ_end'");
-if($query->numRows() == 0) { // add field
- $query = $database->query("ALTER TABLE $table ADD publ_end INT NOT NULL DEFAULT '0'");
- echo mysql_error()?mysql_error().'
':'';
- $query = $database->query("DESCRIBE $table 'publ_end'");
- if($query->numRows() > 0) {
- echo "'publ_end' added. $OK.
";
- } else {
- echo "adding 'publ_end' $FAIL!
";
- }
-} else {
- echo "'publ_end' allready there. $OK
";
-}
+db_add_field('publ_start', 'sections', "INT NOT NULL DEFAULT '0'");
+db_add_field('publ_end', 'sections', "INT NOT NULL DEFAULT '0'");
/**********************************************************
@@ -386,33 +376,14 @@
//Start of upgrade script for the form modul
//******************************************************************************
-echo "
Adding new field to database table mod_form_settings
";
+db_add_field('success_email_subject', 'mod_form_settings', "VARCHAR(255) NOT NULL AFTER `success_message`");
+db_add_field('success_email_text', 'mod_form_settings', "TEXT NOT NULL AFTER `success_message`");
+db_add_field('success_email_from', 'mod_form_settings', "VARCHAR(255) NOT NULL AFTER `success_message`");
+db_add_field('success_email_to', 'mod_form_settings', "TEXT NOT NULL AFTER `success_message`");
+db_add_field('success_page', 'mod_form_settings', "TEXT NOT NULL AFTER `success_message`");
+db_add_field('email_fromname', 'mod_form_settings', "VARCHAR( 255 ) NOT NULL AFTER email_from");
+db_add_field('success_email_fromname', 'mod_form_settings', "VARCHAR( 255 ) NOT NULL AFTER success_email_from");
-if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` ADD `success_email_subject` VARCHAR(255) NOT NULL AFTER `success_message`")) {
- echo 'Database Field success_email_subject added successfully
';
-}
-echo mysql_error().'
';
-
-if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` ADD `success_email_text` TEXT NOT NULL AFTER `success_message`")) {
- echo 'Database Field success_email_text added successfully
';
-}
-echo mysql_error().'
';
-
-if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` ADD `success_email_from` VARCHAR(255) NOT NULL AFTER `success_message`")) {
- echo 'Database Field success_email_from added successfully
';
-}
-echo mysql_error().'
';
-
-if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` ADD `success_email_to` TEXT NOT NULL AFTER `success_message`")) {
- echo 'Database Field success_email_to added successfully
';
-}
-echo mysql_error().'
';
-
-if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` ADD `success_page` TEXT NOT NULL AFTER `success_message`")) {
- echo 'Database Field success_page added successfully
';
-}
-echo mysql_error().'
';
-
echo "
Deleting field success_message from table mod_form_settings
";
if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` DROP `success_message`")) {
@@ -482,15 +453,8 @@
//Start of upgrade script for the news modul
//******************************************************************************
-echo "
Adding new fields to database table mod_news_posts
";
-if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_news_posts` ADD `published_when` INT NOT NULL AFTER `commenting`")) {
- echo 'Database Field published_when added successfully
';
-}
-echo mysql_error().'
';
-if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_news_posts` ADD `published_until` INT NOT NULL AFTER `published_when`")) {
- echo 'Database Field published_until added successfully
';
-}
-echo mysql_error().'
';
+db_add_field('published_when', 'mod_news_posts', "INT NOT NULL AFTER `commenting`");
+db_add_field('published_until', 'mod_news_posts', "INT NOT NULL AFTER `published_when`");
// UPDATING DATA INTO FIELDS
echo "
";
@@ -577,6 +541,9 @@
//End of upgrade script for the news modul
//******************************************************************************
+
+
+
echo "
Done
";
?>