Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG (revision 719)
+++ trunk/CHANGELOG (revision 720)
@@ -14,6 +14,7 @@
20-Feb-2008 Thomas Hornik
! added workaround for language sorting-problem
20-Feb-2008 Christian Sommer
+! added WYSIWYG DB update and missing WBMAILER settings to upgrade script (added some status messages)
! modified upgrade script and suppressed headers already send message (avoid issues with error reporting E_ALL)
# added the FCKEditor module PHP connector fix found by the forum member Luisehahne (thanks man)
! Updated upgrade script (added WB2.7 basic styles, pre-checks and disclaimer)
Index: trunk/wb/upgrade-script.php
===================================================================
--- trunk/wb/upgrade-script.php (revision 719)
+++ trunk/wb/upgrade-script.php (revision 720)
@@ -143,9 +143,6 @@
.error { color:red; }
.check { color:#555; }
-.red { background-color:#FF0000 }
-.green { background-color:#00FF00 }
-
.warning {
width: 98%;
background:#FFDBDB;
@@ -201,8 +198,8 @@
will upgrade Website Baker 2.6.5 / 2.6.7 to version 2.7
OK';
-$FAIL = 'failed';
+$OK = 'OK';
+$FAIL = 'FAILED';
/**********************************************************
@@ -564,15 +561,17 @@
");
global $database;
-$database->query("INSERT INTO ".$table." (id,name,value) VALUES ('1','mod_jsadmin_persist_order','0')");
-$database->query("INSERT INTO ".$table." (id,name,value) VALUES ('2','mod_jsadmin_ajax_order_pages','0')");
-$database->query("INSERT INTO ".$table." (id,name,value) VALUES ('3','mod_jsadmin_ajax_order_sections','0')");
+echo "Insert default value for mod_jsadmin_persist_order: ";
+echo ($database->query("INSERT INTO ".$table." (id,name,value) VALUES ('1','mod_jsadmin_persist_order','0')")) ? " $OK
" : " $FAIL
";
+echo "Insert default value for mod_jsadmin_ajax_order_pages: ";
+echo ($database->query("INSERT INTO ".$table." (id,name,value) VALUES ('2','mod_jsadmin_ajax_order_pages','0')")) ? " $OK
" : " $FAIL
";
+echo "Insert default value for mod_jsadmin_ajax_order_sections: ";
+echo ($database->query("INSERT INTO ".$table." (id,name,value) VALUES ('3','mod_jsadmin_ajax_order_sections','0')")) ? " $OK
" : " $FAIL
";
-
/**********************************************************
* - Output Filter
*/
-echo "
Adding table mod_outputfilter
";
+echo "
Adding table mod_outputfilter
Status: ";
$table = TABLE_PREFIX .'mod_output_filter';
$database->query("DROP TABLE IF EXISTS `$table`");
@@ -585,22 +584,29 @@
);
// add default values to the module table
-$database->query("INSERT INTO ".TABLE_PREFIX
- ."mod_output_filter (email_filter, mailto_filter, at_replacement, dot_replacement) VALUES ('0', '0', '(at)', '(dot)')");
+echo ($database->query("INSERT INTO ".TABLE_PREFIX
+ ."mod_output_filter (email_filter, mailto_filter, at_replacement, dot_replacement) VALUES ('0', '0', '(at)', '(dot)')")) ? " $OK
" : " $FAIL
";
/**********************************************************
* - Form Modul
*/
+echo '
';
db_add_field('success_email_subject', 'mod_form_settings', "VARCHAR(255) NOT NULL AFTER `email_subject`");
+echo '
';
db_add_field('success_email_text', 'mod_form_settings', "TEXT NOT NULL AFTER `email_subject`");
+echo '
';
db_add_field('success_email_from', 'mod_form_settings', "VARCHAR(255) NOT NULL AFTER `email_subject`");
+echo '
';
db_add_field('success_email_to', 'mod_form_settings', "TEXT NOT NULL AFTER `email_subject`");
+echo '
';
db_add_field('success_page', 'mod_form_settings', "TEXT NOT NULL AFTER `email_subject`");
+echo '
';
db_add_field('email_fromname', 'mod_form_settings', "VARCHAR( 255 ) NOT NULL AFTER email_from");
+echo '
';
db_add_field('success_email_fromname', 'mod_form_settings', "VARCHAR( 255 ) NOT NULL AFTER success_email_from");
-echo "
Deleting field success_message from table mod_form_settings
";
+echo "
Deleting field success_message from table mod_form_settings
";
if($database->query("ALTER TABLE `".TABLE_PREFIX."mod_form_settings` DROP `success_message`")) {
echo 'Database field success_message droped successfully
';
@@ -743,19 +749,23 @@
echo mysql_error().'
';
}
+/**********************************************************
+ * - Alter the WYSIWYG editor content from text to longtext
+ */
+echo "
Alter WYSIWYG editor content field from text to longtext
Status: ";
+echo ($database->query("ALTER TABLE ".TABLE_PREFIX."mod_wysiwyg MODIFY content LONGTEXT NOT NULL")) ?" $OK
" : " $FAIL
";
/**********************************************************
* - Add Admintools to Administrator group
*/
-echo "
Add Admintools to Adminsitrator group
";
+echo "
Add Admintools to Adminsitrator group
Status: ";
$full_system_permissions = 'pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools';
-$database->query("UPDATE `".TABLE_PREFIX."groups` SET `system_permissions` = '$full_system_permissions' WHERE `name` = 'Administrators'");
+echo ($database->query("UPDATE `".TABLE_PREFIX."groups` SET `system_permissions` = '$full_system_permissions' WHERE `name` = 'Administrators'")) ? " $OK
" : " $FAIL
";
-
/**********************************************************
* - Add Mailer Settings to settings table
*/
-echo "
Add Mailer Settings to settings table
";
+echo "
Add Mailer Settings to settings table
Status: ";
//delete rows to prevent double entries
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_routine'");
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'server_email'");
@@ -765,17 +775,25 @@
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_smtp_username'");
$database->query("DELETE FROM ".TABLE_PREFIX."settings WHERE name = 'wbmailer_smtp_password'");
//add new rows with default values
+$wbmailer_smtp_host = (defined('WBMAILER_SMTP_HOST')) ? WBMAILER_SMTP_HOST : '';
+$wbmailer_routine = ($wbmailer_smtp_host = '') ? 'phpmail' : 'smtp';
$settings_rows= "INSERT INTO `".TABLE_PREFIX."settings` "
." (name, value) VALUES "
-." ('wbmailer_routine', 'phpmail'),"
+." ('wbmailer_routine', '$wbmailer_routine'),"
." ('server_email', 'admin@yourdomain.com')," // avoid that mail provider (e.g. mail.com) reject mails like yourname@mail.com
." ('wbmailer_default_sendername', 'WB Mailer'),"
-." ('wbmailer_smtp_host', ''),"
+." ('wbmailer_smtp_host', '$wbmailer_smtp_host'),"
." ('wbmailer_smtp_auth', ''),"
." ('wbmailer_smtp_username', ''),"
." ('wbmailer_smtp_password', '')";
-$database->query($settings_rows);
+echo ($database->query($settings_rows)) ? " $OK
" : " $FAIL
";
+/**********************************************************
+ * - Set Version to WB 2.7
+ */
+echo "
Update database version number to 2.7
Status: ";
+$version = '2.7';
+echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value` = '$version' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
";
/**********************************************************
* - Reload all addons
@@ -821,17 +839,9 @@
echo '
Languages reloaded
';
/**********************************************************
- * - Set Version to WB 2.7
- */
-echo "
Set Version number to 2.7
";
-$version = '2.7';
-$database->query("UPDATE `".TABLE_PREFIX."settings` SET `value` = '$version' WHERE `name` = 'wb_version'");
-
-
-/**********************************************************
* - End of upgrade script
*/
-echo "
Done
";
+echo "Upgrade script finished
";
}
?>