Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1764) +++ branches/2.8.x/CHANGELOG (revision 1765) @@ -13,6 +13,8 @@ +22 Sep-2012 Build 1765 Dietmar Woellbrink (Luisehahne) +! recoded module news,form,wysiwyg upgrade to work with upgrade-script 22 Sep-2012 Build 1764 Dietmar Woellbrink (Luisehahne) # remove jquery core backups 22 Sep-2012 Build 1763 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1764) +++ branches/2.8.x/wb/upgrade-script.php (revision 1765) @@ -29,12 +29,14 @@ $newVersion .= (defined('SP') ? SP : ''); $newRevision = (defined('REVISION') ? ' Revision ['.REVISION.'] ' : ''); +$bDebugModus = false; + // set addition settings if not exists, otherwise upgrade will be breaks if(!defined('WB_SP')) { define('WB_SP',''); } if(!defined('WB_REVISION')) { define('WB_REVISION',''); } // database tables including in WB package -$aTable = array ( +$aPackage = array ( 'settings','groups','addons','pages','sections','search','users', 'mod_captcha_control','mod_code','mod_droplets','mod_form_fields', 'mod_form_settings','mod_form_submissions','mod_jsadmin','mod_menu_link', @@ -47,6 +49,7 @@ $DEFAULT_THEME = 'wb_theme'; $stepID = 0; +$aFilesToRemove = array(); $dirRemove = array( /* '[TEMPLATE]/allcss/', @@ -57,7 +60,9 @@ '[ADMIN]/themes/', ); -$filesRemove['0'] = array( +if(version_compare(WB_REVISION, '1762', '<')) +{ + $filesRemove['0'] = array( '[ADMIN]/preferences/details.php', '[ADMIN]/preferences/email.php', @@ -70,8 +75,6 @@ ); -if(version_compare(WB_REVISION, '1681', '<')) -{ $filesRemove['1'] = array( '[TEMPLATE]/argos_theme/templates/access.htt', @@ -138,6 +141,9 @@ '[TEMPLATE]/wb_theme/templates/users.htt', '[TEMPLATE]/wb_theme/templates/users_form.htt', ); + + $aFilesToRemove = array_merge($filesRemove['0'],$filesRemove['1']); + } /* display a status message on the screen ************************************** @@ -146,7 +152,7 @@ * @param string $element: witch HTML-tag use to cover the message * @return void */ -function status_msg($message, $class='check', $element='span') +function status_msg($message, $class='check', $element='div') { // returns a status message $msg = '<'.$element.' class="'.$class.'">'; @@ -191,26 +197,28 @@ // check existings tables for upgrade or install function check_wb_tables() { - global $database,$aTable; + global $database,$aPackage; - // if prefix inludes '_' or '%' - $search_for = addcslashes ( TABLE_PREFIX, '%_' ); - $get_result = $database->query( 'SHOW TABLES LIKE "'.$search_for.'%"'); +// if prefix inludes '_' or '%' + $search_for = addcslashes ( TABLE_PREFIX, '%_' ); + $get_result = $database->query( 'SHOW TABLES LIKE "'.$search_for.'%"'); - // $get_result = $database->query( "SHOW TABLES FROM ".DB_NAME); - $all_tables = array(); - if($get_result->numRows() > 0) - { - while ($data = $get_result->fetchRow()) - { - $tmp = str_replace(TABLE_PREFIX, '', $data[0]); - if(in_array($tmp,$aTable)) - { - $all_tables[] = $tmp; - } + // $get_result = $database->query( "SHOW TABLES FROM ".DB_NAME); + $all_tables = array(); + $aTable = array(); + if($get_result->numRows() > 0) + { + while ($data = $get_result->fetchRow()) { + $tmp = str_replace(TABLE_PREFIX, '', $data[0]); + if(in_array($tmp,$aPackage)) { + $all_tables[] = $tmp; + } else { + $aTable[] = $tmp; } } - return $all_tables; + } + + return array_merge ( $all_tables, $aTable ); } // check existing tables @@ -236,16 +244,23 @@ } #container { - width:85%; + min-width:48em; + width: 70%; background: #A8BCCB url(templates/wb_theme/images/background.png) repeat-x; border:1px solid #000; color:#000; margin:2em auto; - padding:0 15px; + padding:0 20px; min-height: 500px; text-align:left; } - +.page { + width:100%; + overflow: hidden; +} +.content { + padding: 10px; +} p { line-height:1.5em; } form { @@ -260,7 +275,7 @@ h1,h2,h3,h4,h5,h6 { font-family: Verdana, Arial, Helvetica, sans-serif; - color: #369; + color: #26527D; margin-top: 1.0em; margin-bottom: 0.1em; } @@ -267,26 +282,36 @@ h1 { font-size:150%; } h2 { font-size: 130%; border-bottom: 1px #CCC solid; } -h3 { font-size: 110%; font-weight: bold;; } +h3 { font-size: 110%; font-weight: bold; } +textarea { + width:100%; + border: 2px groove #0F1D44; + padding: 2px; + color: #000; + font-weight: normal; +} .ok, .error { font-weight:bold; } .ok { color:green; } .error { color:red; } .check { color:#555; } +span.ok, +span.error { + margin-left: 0em; +} + .warning { - width: 98%; background:#FFDBDB; - padding:0.2em; + padding:1em; margin-top:0.5em; - border: 1px solid black; + border: 1px solid #DB0909; } .info { - width: 98%; - background:#99CC99; - padding:0.2em; + background:#C7F4C7; + padding:1em; margin-top:0.5em; - border: 1px solid black; + border: 1px solid #277A29; } @@ -293,7 +318,9 @@
+
WebsiteBaker Project +

WebsiteBaker Upgrade

Warning:
It is not possible to upgrade from WebsiteBaker Versions before 2.7.
For upgrading to version '.VERSION.' you must upgrade first to v.2.7 at least!!!', 'warning', 'div'); echo '

'; echo "
+
+
"; @@ -307,27 +336,32 @@ } ?> -

This script upgrades an existing WebsiteBaker installation to the .
The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x

+

This script upgrades an existing WebsiteBaker installation to the .
The upgrade script alters the existing WB database to reflect the changes introduced with WB 2.8.x

Step 1: Backup your files

-

It is highly recommended to create a manual backup of the entire /pages folder and the MySQL database before proceeding.
Note: The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.

+

It is highly recommended to create a manual backup of the entire / folder and the MySQL database before proceeding.
Note: The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.

- -

 I confirm that a manual backup of the /pages folder and the MySQL database was created. + +

 I confirm that a manual backup of the / folder and the MySQL database was created. +

 Here you can get more details during running upgrade.


Notice:
You need to confirm that you have created a manual backup of the /pages directory and the MySQL database before you can proceed.', 'warning', 'div'); + status_msg(' Notice:
You need to confirm that you have created a manual backup of the '.PAGES_DIRECTORY.'/ directory and the MySQL database before you can proceed.', 'warning', 'div'); echo '

'; echo " + + "; @@ -334,148 +368,197 @@ exit(); } -echo '

Step '.(++$stepID).': Setting default_theme

'; - -/********************************************************** - * - Adding field default_theme to settings table - */ -echo "
Adding default_theme to settings table"; -// db_update_key_value('settings', 'default_theme', $DEFAULT_THEME); -echo (db_update_key_value( 'settings', 'default_theme', $DEFAULT_THEME ) ? " $OK
" : " $FAIL!
"); - // check again all tables, to get a new array - if(sizeof($all_tables) < 22) { $all_tables = check_wb_tables(); } +// if(sizeof($all_tables) < sizeof($aTable)) { $all_tables = check_wb_tables(); } /********************************************************** - * - check tables comin with WebsiteBaker + * - check tables coming with WebsiteBaker */ $check_text = 'total '; // $check_tables = mysqlCheckTables( DB_NAME ) ; + $aTable = array(); + foreach ($all_tables as $data) { + $tmp = str_replace(TABLE_PREFIX, '', $data); + if(in_array($tmp,$aPackage)) { + $aTable[] = $tmp; + } + } - if(sizeof($all_tables) == 22) + if( (sizeof($all_tables) >= sizeof($aPackage)) && (sizeof($aTable) == sizeof($aPackage)) ) { - echo '

NOTICE: Your database '.DB_NAME.' has '.sizeof($all_tables).' '.$check_text.' tables from '.sizeof($aTable).' included in package '.$OK.'

'; + echo '

NOTICE: Your database '.DB_NAME.' has '.sizeof($all_tables).' '.$check_text.' tables from '.sizeof($aPackage).' included in package '.$OK.'

'; } else { - status_msg('WARNING:
can\'t run Upgrade, missing tables', 'warning', 'div'); - echo '

Missing required tables. You can install them in backend->addons->modules->advanced. Then again run upgrade-script.php

'; - $result = array_diff ( $aTable, $all_tables ); + status_msg(':
can\'t run Upgrade, missing tables', 'warning', 'div'); + echo '

Missing required tables. You can install them in backend->addons->modules.
'; + echo 'Or if you uploaded per FTP install possible by backend->addons->modules->advanced.
'; + echo 'After installingT again run upgrade-script.php

'; + $result = array_diff ( $aPackage, $aTable ); + echo '


'; while ( list ( $key, $val ) = each ( $result ) ) { - echo TABLE_PREFIX.$val.' '.$FAIL.'
'; + echo 'TABLE ´'.TABLE_PREFIX.$val.'´ '.$FAIL.'
'; } + echo '

'; - echo '
'; - echo ''; - echo '
'; - if(defined('ADMIN_URL')) - { - echo '
'; + echo '

'; + if(isset($_SERVER['SCRIPT_NAME'])) { + echo ''; + echo ' '; + echo '
'; + } + if(defined('ADMIN_URL')) { + echo '
'; echo ' '; echo '
'; } + echo "

+ + "; + exit(); } +echo '

Step '.(++$stepID).': Setting default_theme

'; -echo '

Step '.(++$stepID).': Updating settings

'; -/********************************************************** - * - Adding field sec_anchor to settings table - */ -echo "
Adding/updating sec_anchor to settings table"; -$cfg = array( - 'sec_anchor' => defined('SEC_ANCHOR') ? SEC_ANCHOR : 'wb_' -); +if($bDebugModus) { + /********************************************************** + * - Adding field default_theme to settings table + */ + echo '
'; + echo "
Adding default_theme to settings table"; + // db_update_key_value('settings', 'default_theme', $DEFAULT_THEME); + echo (db_update_key_value( 'settings', 'default_theme', $DEFAULT_THEME ) ? " $OK
" : " $FAIL!
"); + echo '
'; -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); +} + echo '

Step '.(++$stepID).': Updating core tables

'; +if($bDebugModus) { + /********************************************************** + * - Adding field sec_anchor to settings table + */ + echo '
'; + echo "

Adding/updating entries on table settings

"; + echo "Adding/updating sec_anchor to settings table"; + $cfg = array( + 'sec_anchor' => defined('SEC_ANCHOR') ? SEC_ANCHOR : 'section_' + ); -/********************************************************** - * - Adding redirect timer to settings table - */ -echo "Adding/updating redirect timer to settings table"; -$cfg = array( - 'redirect_timer' => defined('REDIRECT_TIMER') ? REDIRECT_TIMER : '1500' -); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -/********************************************************** - * - Adding rename_files_on_upload to settings table - */ -echo "Adding/Updating rename_files_on_upload to settings table"; -$cfg = array( - 'rename_files_on_upload' => (defined('RENAME_FILES_ON_UPLOAD') ? RENAME_FILES_ON_UPLOAD : 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js') -); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -/********************************************************** - * - Adding mediasettings to settings table - */ -echo "Adding/updating mediasettings to settings table"; -$cfg = array( - 'mediasettings' => (defined('MEDIASETTINGS') ? MEDIASETTINGS : ''), -); + /********************************************************** + * - Adding redirect timer to settings table + */ + echo "Adding/updating redirect timer to settings table"; + $cfg = array( + 'redirect_timer' => defined('REDIRECT_TIMER') ? REDIRECT_TIMER : '1500' + ); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + /********************************************************** + * - Adding rename_files_on_upload to settings table + */ + echo "Adding/Updating rename_files_on_upload to settings table"; + $cfg = array( + 'rename_files_on_upload' => (defined('RENAME_FILES_ON_UPLOAD') ? RENAME_FILES_ON_UPLOAD : 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js') + ); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -/********************************************************** - * - Adding fingerprint_with_ip_octets to settings table - */ -echo "Adding/updating fingerprint_with_ip_octets to settings table"; -$cfg = array( - 'fingerprint_with_ip_octets' => (defined('FINGERPRINT_WITH_IP_OCTETS') ? FINGERPRINT_WITH_IP_OCTETS : '2'), - 'secure_form_module' => (defined('SECURE_FORM_MODULE') ? SECURE_FORM_MODULE : '') -); + /********************************************************** + * - Adding mediasettings to settings table + */ + echo "Adding/updating mediasettings to settings table"; + $cfg = array( + 'mediasettings' => (defined('MEDIASETTINGS') ? MEDIASETTINGS : ''), + ); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -/********************************************************** - * - Adding page_icon_dir to settings table - */ -echo "Adding/updating page_icon_dir to settings table"; -$cfg = array( - 'page_icon_dir' => (defined('PAGE_ICON_DIR') ? PAGE_ICON_DIR : '/templates/*/title_images'), -); + /********************************************************** + * - Adding fingerprint_with_ip_octets to settings table + */ + echo "Adding/updating fingerprint_with_ip_octets to settings table"; + $cfg = array( + 'fingerprint_with_ip_octets' => (defined('FINGERPRINT_WITH_IP_OCTETS') ? FINGERPRINT_WITH_IP_OCTETS : '2'), + 'secure_form_module' => (defined('SECURE_FORM_MODULE') ? SECURE_FORM_MODULE : '') + ); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -/********************************************************** - * - Adding page_extended to settings table - */ -echo "Adding/updating page_extended to settings table"; -$cfg = array( - 'page_extended' => (defined('PAGE_EXTENDED') ? PAGE_EXTENDED : 'true'), -); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + /********************************************************** + * - Adding page_icon_dir to settings table + */ + echo "Adding/updating page_icon_dir to settings table"; + $cfg = array( + 'page_icon_dir' => (defined('PAGE_ICON_DIR') ? PAGE_ICON_DIR : '/templates/*/title_images'), + ); -/********************************************************** - * - Adding sec_anchor to settings table - */ -echo "Adding/updating sec_anchor to settings table"; -$cfg = array( - 'sec_anchor' => (defined('SEC_ANCHOR') && (SEC_ANCHOR=='') ? 'section_' : SEC_ANCHOR) -); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + /********************************************************** + * - Adding page_extended to settings table + */ + echo "Adding/updating page_extended to settings table"; + $cfg = array( + 'page_extended' => (defined('PAGE_EXTENDED') ? PAGE_EXTENDED : 'true'), + ); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -/********************************************************** - * - Adding dev_infos to settings table - */ -echo "Adding/updating dev_infos to settings table"; -$cfg = array( - 'dev_infos' => (defined('DEV_INFOS') ? DEV_INFOS : 'false') -); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); -echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + /********************************************************** + * - Adding website_signature to settings table + */ + echo "Adding/updating website_signature to settings table"; + $cfg = array( + 'website_signature' => (defined('WEBSITE_SIGNATURE') && (WEBSITE_SIGNATURE=='') ? '' : WEBSITE_SIGNATURE) + ); + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + + /********************************************************** + * - Adding confirmed_registration to settings table + */ + echo "Adding/updating confirmed_registration to settings table"; + $cfg = array( + 'confirmed_registration' => (defined('CONFIRMED_REGISTRATION') && (CONFIRMED_REGISTRATION=='') ? '' : CONFIRMED_REGISTRATION) + ); + + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + + /********************************************************** + * - Adding dev_infos to settings table + */ + echo "Adding/updating dev_infos to settings table"; + $cfg = array( + 'dev_infos' => (defined('DEV_INFOS') ? DEV_INFOS : 'false') + ); + + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + + /********************************************************** + * - Adding dev_infos to settings table + */ + echo "Adding/updating modules_upgrade_list to settings table"; + $cfg = array( + 'modules_upgrade_list' => (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : 'news') + ); + + echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + + echo '
'; + + +} + if(version_compare(WB_REVISION, REVISION, '<')) { - echo '

Step '.(++$stepID).': Updating core tables

'; - + echo '
'; /********************************************************** * - Update search no results database filed to create * valid XHTML if search is empty @@ -482,14 +565,16 @@ */ if (version_compare(WB_VERSION, '2.8', '<')) { - echo "
Updating database field `no_results` of search table: "; + echo "

Adding/updating fields on table search

"; + echo "Updating database field `no_results` on search table: "; $search_no_results = addslashes('

[TEXT_NO_RESULTS]

'); $sql = 'UPDATE `'.TABLE_PREFIX.'search` '; $sql .= 'SET `value`=\''.$search_no_results.'\' '; $sql .= 'WHERE `name`=\'no_results\''; - echo ($database->query($sql)) ? ' $OK
' : ' $FAIL
'; + echo ($database->query($sql)) ? " $OK
" : " $FAIL!
"; } + echo "

Adding/updating fiekds on table mod_menu_link

"; /********************************************************** * - Add field "redirect_type" to table "mod_menu_link" * has to be moved later to upgrade.php in modul menu_link, because modul can be removed @@ -498,13 +583,14 @@ $field_name = 'redirect_type'; $description = "INT NOT NULL DEFAULT '301' AFTER `target_page_id`"; if(!$database->field_exists($table_name,$field_name)) { - echo "
Adding field redirect_type to mod_menu_link table"; + echo "Adding field redirect_type to mod_menu_link table"; echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } else { - echo "
Modify field redirect_type to mod_menu_link table"; + echo "Modify field redirect_type to mod_menu_link table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } + echo "

Adding/updating fiekds on table pages

"; /********************************************************** * - Add field "page_trail" to table "pages" */ @@ -511,7 +597,7 @@ $table_name = TABLE_PREFIX.'pages'; $field_name = 'page_trail'; $description = "VARCHAR( 255 ) NOT NULL DEFAULT ''"; - echo "Modify field page_trail to pages table"; + echo "Modify field page_trail to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); /********************************************************** @@ -521,10 +607,10 @@ $field_name = 'page_icon'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `page_title`"; if(!$database->field_exists($table_name,$field_name)) { - echo "Adding field page_icon to pages table"; + echo "Adding field page_icon to pages table"; echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } else { - echo "Modify field page_icon to pages table"; + echo "Modify field page_icon to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } @@ -535,10 +621,10 @@ $field_name = 'page_code'; $description = "INT NOT NULL DEFAULT '0' AFTER `language`"; if(!$database->field_exists($table_name,$field_name)) { - echo "Adding field page_code to pages table"; + echo "Adding field page_code to pages table"; echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } else { - echo "Modify field page_code to pages table"; + echo "Modify field page_code to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } @@ -549,10 +635,10 @@ $field_name = 'menu_icon_0'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `menu_title`"; if(!$database->field_exists($table_name,$field_name)) { - echo "Adding field menu_icon_0 to pages table"; + echo "Adding field menu_icon_0 to pages table"; echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } else { - echo "Modify field menu_icon_0 to pages table"; + echo "Modify field menu_icon_0 to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } @@ -563,10 +649,10 @@ $field_name = 'menu_icon_1'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `menu_icon_0`"; if(!$database->field_exists($table_name,$field_name)) { - echo "Adding field menu_icon_1 to pages table"; + echo "Adding field menu_icon_1 to pages table"; echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } else { - echo "Modify field menu_icon_1 to pages table"; + echo "Modify field menu_icon_1 to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } @@ -577,10 +663,10 @@ $field_name = 'tooltip'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT '' AFTER `menu_icon_1`"; if(!$database->field_exists($table_name,$field_name)) { - echo "Adding field tooltip to pages table"; + echo "Adding field tooltip to pages table"; echo ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } else { - echo "Modify field tooltip to pages table"; + echo "Modify field tooltip to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } @@ -590,7 +676,7 @@ $table_name = TABLE_PREFIX.'pages'; $field_name = 'admin_groups'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT '1'"; - echo "Modify field admin_groups to pages table"; + echo "Modify field admin_groups to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); /********************************************************** @@ -599,7 +685,7 @@ $table_name = TABLE_PREFIX.'pages'; $field_name = 'admin_users'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT ''"; - echo "Modify field admin_users to pages table"; + echo "Modify field admin_users to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); /********************************************************** @@ -608,7 +694,7 @@ $table_name = TABLE_PREFIX.'pages'; $field_name = 'viewing_groups'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT '1'"; - echo "Modify field viewing_groups to pages table"; + echo "Modify field viewing_groups to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); /********************************************************** @@ -617,160 +703,119 @@ $table_name = TABLE_PREFIX.'pages'; $field_name = 'viewing_users'; $description = "VARCHAR( 512 ) NOT NULL DEFAULT ''"; - echo "Modify field viewing_users to pages table"; + echo "Modify field viewing_users to pages table"; echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); -/** - * This part with changing in mod_wysiwyg will be removed in the final version - * special workout for the tester - */ - /********************************************************** - * - Remove/add PRIMARY KEY from/to "section_id" from table "mod_wysiwygs" - */ - $sTable = TABLE_PREFIX.'mod_wysiwyg'; - $field_name = 'wysiwyg_id'; - if($database->field_exists($sTable,$field_name)) { - echo "Remove PRIMARY KEY from table mod_wysiwygs"; -//ALTER TABLE `wb283_mod_wysiwyg` DROP `wysiwyg_id` - $sql = 'ALTER TABLE `'.DB_NAME.'`.`'.$sTable.'` DROP `wysiwyg_id`'; - echo ($database->query($sql) ? " $OK
" : " $FAIL!
"); + /********************************************************** + * modify wrong strucre on table sections + * wrong structure let crash wb + */ + echo "

Change field structure on table sections

"; + $table_name = TABLE_PREFIX.'sections'; + $description = "VARCHAR( 255 ) NOT NULL DEFAULT ''"; + echo "Modify field module on sections table"; + echo ($database->field_modify($table_name, 'module', $description) ? " $OK
" : " $FAIL!
"); + echo "Modify field block on sections table"; + echo ($database->field_modify($table_name, 'block', $description) ? " $OK
" : " $FAIL!
"); + echo "Modify field publ_start on sections table"; + echo ($database->field_modify($table_name, 'publ_start', $description) ? " $OK
" : " $FAIL!
"); + echo "Modify field publ_end on sections table"; + echo ($database->field_modify($table_name, 'publ_end', $description) ? " $OK
" : " $FAIL!
"); -// echo "add new PRIMARY KEY to table mod_wysiwygs"; -// $sql = 'ALTER TABLE `'.$sTable.'` DROP `wysiwyg_id`'; -// echo ($database->query($sql) ? " $OK
" : " $FAIL!
"); - } - echo "Change PRIMARY KEY from table mod_wysiwygs"; - $sql = 'ALTER TABLE `'.DB_NAME.'`.`'.$sTable.'` ADD PRIMARY KEY (`section_id`)'; - echo ($database->query($sql) ? " $OK
" : " $FAIL!
"); + echo '
'; - } /********************************************************** - * upgrade media folder index protect files - ALTER TABLE `wb_pages` CHANGE `page_icon` `page_icon` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' + * This part with changing in mod_wysiwyg will be removed in the final version + * special workout for the tester + * - Remove/add PRIMARY KEY from/to "section_id" from table "mod_wysiwygs" */ - $dir = (WB_PATH.MEDIA_DIRECTORY); - echo '

Upgrade '.MEDIA_DIRECTORY.'/ index.php protect files

'; - $array = rebuildFolderProtectFile($dir); - if( sizeof( $array ) ){ - print 'Upgrade '.sizeof( $array ).' '.MEDIA_DIRECTORY.'/ protect files'." $OK
"; - } else { - print '<Upgrade '.MEDIA_DIRECTORY.'/ protect files'." $FAIL!
"; - print implode ('
',$array); - } +if($bDebugModus) { + echo '
'; -/********************************************************** - * upgrade pages folder index access files - */ - echo '

Upgrade /pages/ index.php access files

'; - - ///********************************************************** - // * - try to remove access files - // */ - $sTempDir = (defined('PAGES_DIRECTORY') && (PAGES_DIRECTORY != '') ? PAGES_DIRECTORY : ''); - if(($sTempDir!='') && is_readable(WB_PATH.$sTempDir)==true) { - if(rm_full_dir (WB_PATH.$sTempDir, true )==false) { - $msg[] = 'Could not delete existing access files'; - } else { - $msg[] = createFolderProtectFile(rtrim( WB_PATH.$sTempDir,'/') ); + $sTable = TABLE_PREFIX.'mod_wysiwyg'; + $field_name = 'wysiwyg_id'; + if($database->field_exists($sTable, 'wysiwyg_id')) { + if($database->index_exists($sTable, 'PRIMARY')) { + echo "Remove PRIMARY KEY from table mod_wysiwyg.wysiwyg_id"; + echo $database->index_remove($sTable, 'PRIMARY') ? " $OK
" : " $FAIL!
"; } - } + echo "Remove field 'wysiwyg_id' from table mod_wysiwyg"; + echo $database->field_remove($sTable, 'wysiwyg_id') ? " $OK
" : " $FAIL!
"; + } - ///********************************************************** - // * - Reformat/rebuild all existing access files - // */ - $msg[] = "Refresh all existing access files "; - $sql = 'SELECT `page_id`,`root_parent`,`link`, `level` FROM `'.TABLE_PREFIX.'pages` ORDER BY `link`'; - if (($oPage = $database->query($sql))) - { - $x = 0; - while (($page = $oPage->fetchRow(MYSQL_ASSOC))) - { - // Work out level - $level = level_count($page['page_id']); - // Work out root parent - $root_parent = root_parent($page['page_id']); - // Work out page trail - $page_trail = get_page_trail($page['page_id']); - // Update page with new level and link - $sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET '; - $sql .= '`root_parent` = '.$root_parent.', '; - $sql .= '`level` = '.$level.', '; - $sql .= '`page_trail` = "'.$page_trail.'" '; - $sql .= 'WHERE `page_id` = '.$page['page_id']; + echo "
Create PRIMARY KEY ( `section_id` ) on table mod_wysiwygs."; + echo $database->index_add($sTable, '', 'section_id', 'PRIMARY') ? " $OK
" : " $FAIL!
"; + echo '
'; +} - if(!$database->query($sql)) {} - $filename = WB_PATH.PAGES_DIRECTORY.$page['link'].PAGE_EXTENSION; - $msg = create_access_file($filename, $page['page_id'], $page['level']); - $x++; - } - $msg[] = 'Number of new formatted access files: '.$x.''; +echo '

Step '.(++$stepID).': Updating acess and protected files in folders

'; + +echo '
'; + /********************************************************** + * upgrade media directory index protect files + */ + $dir = (WB_PATH.MEDIA_DIRECTORY); + echo '

Upgrade media directory '.MEDIA_DIRECTORY.'/ index.php protect files

'; + $array = rebuildFolderProtectFile($dir); + if( sizeof( $array ) ){ + print 'Upgrade '.sizeof( $array ).' directory '.MEDIA_DIRECTORY.'/ protect files'." $OK
"; + } else { + print 'Upgrade directory '.MEDIA_DIRECTORY.'/ protect files'." $FAIL!
"; + print implode ('
',$array); } - print implode ('
',$msg); + /********************************************************** + * upgrade pages directory index access files + */ + echo '

Upgrade pages directory '.PAGES_DIRECTORY.'/ protect and access files

'; -/* - if( sizeof( $msg ) ){ + /********************************************************** + * - Reformat/rebuild all existing access files + */ + $sPagePath = (defined('PAGES_DIRECTORY') && (PAGES_DIRECTORY != '') ? PAGES_DIRECTORY : ''); + $msg = rebuild_all_accessfiles(); - print '
Upgrade '.sizeof( $msg ).' /pages/ access files'." $OK
"; - } else { - print '
Upgrade /pages/ access files'." $FAIL!
"; - print implode ('
',$msg); - } -*/ -/********************************************************** - * upgrade posts folder index protect files - */ - $sPostsPath = WB_PATH.PAGES_DIRECTORY.'/posts'; - echo '

Upgrade /posts/ index.php protect files

'; - $array = rebuildFolderProtectFile($sPostsPath); - if( sizeof( $array ) ){ - print 'Upgrade '.sizeof( $array ).' /posts/ protect files'." $OK
"; - } else { - print 'Upgrade /posts/ protect files'." $FAIL!
"; - print implode ('
',$array); - } + print implode ('
',$msg); + echo '
'; + /* ***************************************************************************** + * - check for deprecated / never needed files + */ + if(sizeof($aFilesToRemove)) { + echo '

Step '.(++$stepID).': Remove deprecated and old files

'; + $searches = array( + '[ADMIN]', + '[MEDIA]', + '[PAGES]', + '[FRAMEWORK]', + '[MODULES]', + '[TEMPLATE]' + ); + $replacements = array( + '/'.substr(ADMIN_PATH, strlen(WB_PATH)+1), + MEDIA_DIRECTORY, + PAGES_DIRECTORY, + '/framework', + '/modules', + '/templates' + ); -/* ***************************************************************************** - * - check for deprecated / never needed files - */ - if(sizeof($filesRemove)) { - echo '

Step '.(++$stepID).': Remove deprecated and old files

'; - } - $searches = array( - '[ADMIN]', - '[MEDIA]', - '[PAGES]', - '[FRAMEWORK]', - '[MODULES]', - '[TEMPLATE]' - ); - $replacements = array( - substr(ADMIN_PATH, strlen(WB_PATH)+1), - MEDIA_DIRECTORY, - PAGES_DIRECTORY, - '/framework', - '/modules', - '/templates' - ); - - foreach( $filesRemove as $filesId ) - { $msg = ''; - foreach( $filesId as $file ) - { + foreach( $aFilesToRemove as $file ) + { $file = str_replace($searches, $replacements, $file); - $file = WB_PATH.'/'.$file; - if( file_exists($file) ) { + if( is_writable(WB_PATH.'/'.$file) ) { // try to unlink file - if(!is_writable( $file ) || !unlink($file)) { + if(!unlink(WB_PATH.$file)) { // save in err-list, if failed $msg .= $file.'
'; - } + } else { + $msg .= $file.'
'; + } } - } + } if($msg != '') { @@ -783,10 +828,15 @@ echo '
'; echo ' '; echo '
'; - echo '

'; + echo "

+ + + + + "; exit; } - } + } /********************************************************** @@ -818,6 +868,7 @@ } } } + if($msg != '') { $msg = '

Following directories are deprecated, outdated or a security risk and can not be removed automatically.

Please delete them @@ -827,30 +878,45 @@ echo '
'; echo ' '; echo '
'; - echo '

'; + echo "

+ + + + + "; exit; } } -/********************************************************** - * upgrade modules if newer version is available - */ - $aModuleList = array('news'); + /********************************************************** + * upgrade modules if newer version is available + * $aModuleList list of proofed modules + */ + $sModuleList = 'news,wysiwyg,form'; + $aModuleList = explode(',', (defined('MODULES_UPGRADE_LIST') ? MODULES_UPGRADE_LIST : $sModuleList)); + echo '

Step '.(++$stepID).': Upgrade proofed modules

'; +// $aModuleList = array('news'); foreach($aModuleList as $sModul) { if(file_exists(WB_PATH.'/modules/'.$sModul.'/upgrade.php')) { $currModulVersion = get_modul_version ($sModul, false); $newModulVersion = get_modul_version ($sModul, true); if((version_compare($currModulVersion, $newModulVersion) <= 0)) { - echo '

Step '.(++$stepID).' : Upgrade module \''.$sModul.'\' to version '.$newModulVersion.'

'; + echo '
'; + echo '

'.'Upgrade module \''.$sModul.'\' version '.$newModulVersion.'

'; require_once(WB_PATH.'/modules/'.$sModul.'/upgrade.php'); + echo '
'; } } } + /********************************************************** * - Reload all addons */ - echo '

Step '.(++$stepID).' : Reload all addons database entry (no upgrade)

'; + echo '

Step '.(++$stepID).' : Reload all addons database entry (no upgrade)


'; + echo '
'; + $iFound = 0; + $iLoaded = 0; ////delete modules //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'"); // Load all modules @@ -857,14 +923,17 @@ if( ($handle = opendir(WB_PATH.'/modules/')) ) { while(false !== ($file = readdir($handle))) { if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { - load_module(WB_PATH.'/modules/'.$file ); + $iFound++; + $iLoaded = load_module(WB_PATH.'/modules/'.$file ) ? $iLoaded+1 : $iLoaded; // upgrade_module($file, true); } } closedir($handle); } - echo '
Modules reloaded
'; + echo ''.$iLoaded.' Modules reloaded, found '.$iFound.' directories in folder /modules/
'; + $iFound = 0; + $iLoaded = 0; ////delete templates //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); // Load all templates @@ -871,13 +940,16 @@ if( ($handle = opendir(WB_PATH.'/templates/')) ) { while(false !== ($file = readdir($handle))) { if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { - load_template(WB_PATH.'/templates/'.$file); + $iFound++; + $iLoaded = (load_template(WB_PATH.'/templates/'.$file)==true) ? $iLoaded+1 : $iLoaded; } } closedir($handle); } - echo '
Templates reloaded
'; + echo ''.$iLoaded.' Templates reloaded, found '.$iFound.' directories in folder /templates/
'; + $iFound = 0; + $iLoaded = 0; ////delete languages //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); // Load all languages @@ -884,12 +956,14 @@ if( ($handle = opendir(WB_PATH.'/languages/')) ) { while(false !== ($file = readdir($handle))) { if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'index.php') { - load_language(WB_PATH.'/languages/'.$file); + $iFound++; + $iLoaded = load_language(WB_PATH.'/languages/'.$file) ? $iLoaded+1 : $iLoaded; } } closedir($handle); } - echo '
Languages reloaded
'; + echo ''.$iLoaded.' Languages reloaded, found '.$iFound.' files in folder /languages/
'; + echo '
'; /********************************************************** * - install new droplets @@ -907,7 +981,8 @@ /********************************************************** * - Set Version to new Version */ -echo '
Update database version number to '.VERSION.' '.SP.' '.' Revision ['.REVISION.'] : '; +echo '

Step '.(++$stepID).': Update database version number

'; +echo '
'; $cfg = array( 'wb_version' => VERSION, @@ -914,23 +989,30 @@ 'wb_revision' => REVISION, 'wb_sp' => SP ); - +echo '
Set database version number to '.VERSION.' '.SP.' '.' Revision ['.REVISION.'] : '; echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); +echo '
'; - echo '

Congratulations: The upgrade script is finished ...

'; - status_msg('Warning:
Please delete the file upgrade-script.php via FTP before proceeding.', 'warning', 'div'); - // show buttons to go to the backend or frontend - echo '
'; +echo '

Congratulations: The upgrade script is finished ...

'; +status_msg(':
Please delete the file upgrade-script.php via FTP before proceeding.', 'warning', 'div'); +// show buttons to go to the backend or frontend +echo '
'; - if(defined('WB_URL')) { - echo '
'; - echo ' '; - echo '
'; - } - if(defined('ADMIN_URL')) { - echo '
'; - echo ' '; - echo '
'; - } +if(defined('WB_URL')) { + echo '
'; + echo ' '; + echo '
'; +} +if(defined('ADMIN_URL')) { + echo '
'; + echo ' '; + echo '
'; +} - echo '

'; \ No newline at end of file +echo "

+ + + + +"; +exit(); \ No newline at end of file Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1764) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1765) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.3'); -if(!defined('REVISION')) define('REVISION', '1764'); +if(!defined('REVISION')) define('REVISION', '1765'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 1764) +++ branches/2.8.x/wb/framework/functions.php (revision 1765) @@ -34,18 +34,22 @@ */ function rm_full_dir($directory, $empty = false) { + $iErrorReporting = error_reporting(0); if(substr($directory,-1) == "/") { $directory = substr($directory,0,-1); } // If suplied dirname is a file then unlink it if (is_file( $directory )&& is_writable( $directory )) { - $retval = unlink($directory); - clearstatcache(); - return $retval; + $retval = unlink($directory); + clearstatcache(); + error_reporting($iErrorReporting); + return $retval; } if(!is_writable($directory) || !is_dir($directory)) { + error_reporting($iErrorReporting); return false; } elseif(!is_readable($directory)) { + error_reporting($iErrorReporting); return false; } else { $directoryHandle = opendir($directory); @@ -65,11 +69,15 @@ closedir($directoryHandle); if($empty == false) { if(is_dir($directory) && is_writable(dirname($directory))) { - return rmdir($directory); + $retval = rmdir($directory); + error_reporting($iErrorReporting); + return $retval; } else { + error_reporting($iErrorReporting); return false; } } + error_reporting($iErrorReporting); return true; } } @@ -407,12 +415,12 @@ // Function to create directories function make_dir($dir_name, $dir_mode = OCTAL_DIR_MODE, $recursive=true) { - $retVal = false; + $retVal = is_dir($dir_name); if(!is_dir($dir_name)) { // To create the folder with 0777 permissions, we need to set umask to zero. $oldumask = umask(0) ; - $retVal = mkdir($dir_name, $dir_mode,$recursive); + $retVal = mkdir($dir_name, $dir_mode, $recursive); umask( $oldumask ) ; } return $retVal; @@ -692,7 +700,7 @@ if(file_put_contents($filename, $content)) { // print 'create => '.str_replace( $wb_path,'',$filename).'
'; change_mode($filename, 'file'); - }else { + } else { $retVal[] = $MESSAGE['GENERIC_BAD_PERMISSIONS'].' :: '.$filename; } } @@ -728,6 +736,7 @@ function create_access_file($filename,$page_id,$level) { global $admin, $MESSAGE; + $retVal = array(); // First make sure parent folder exists $parent_folders = explode('/',str_replace(WB_PATH.PAGES_DIRECTORY, '', dirname($filename))); $parents = ''; @@ -740,7 +749,8 @@ // can only be dirs if(!file_exists($acces_file)) { if(!make_dir($acces_file)) { - $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE_FOLDER']); +// $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE_FOLDER']); + $retVal[] = $MESSAGE['MEDIA_DIR_ACCESS_DENIED']; } } } @@ -770,9 +780,10 @@ // Chmod the file change_mode($filename); } else { - $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); +// $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); + $retVal[] = $MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']; } - return; + return $retVal; } // Function for working out a file mime type (if the in-built PHP one is not enabled) @@ -1082,7 +1093,7 @@ $sql .= '`author`=\''.addslashes($module_author).'\', '; $sql .= '`license`=\''.addslashes($module_license).'\''; $sql .= $sqlwhere; - $retVal = $database->query($sql); + $retVal = intval($database->query($sql) ? true : false); // Run installation script if($install == true) { if(file_exists($directory.'/install.php')) { @@ -1090,6 +1101,7 @@ } } } + return $retVal; } } @@ -1132,7 +1144,7 @@ $sql .= '`author`=\''.addslashes($template_author).'\', '; $sql .= '`license`=\''.addslashes($template_license).'\' '; $sql .= $sqlwhere; - $retVal = $database->query($sql); + $retVal = intval($database->query($sql) ? true : false); } } return $retVal; @@ -1179,7 +1191,7 @@ $sql .= '`author`=\''.addslashes($language_author).'\', '; $sql .= '`license`=\''.addslashes($language_license).'\' '; $sql .= $sqlwhere; - $retVal = $database->query($sql); + $retVal = intval($database->query($sql) ? true : false); } } return $retVal; @@ -1330,3 +1342,66 @@ return str_replace($entities,$replacements, rawurlencode($string)); } } + +if(!function_exists('rebuild_all_accessfiles')){ + function rebuild_all_accessfiles() { + global $database; + $retVal = array(); + /** + * try to remove access files and build new folder protect files + */ + $sTempDir = (defined('PAGES_DIRECTORY') && (PAGES_DIRECTORY != '') ? PAGES_DIRECTORY : ''); + if(($sTempDir!='') && is_writeable(WB_PATH.$sTempDir)==true) { + if(rm_full_dir (WB_PATH.$sTempDir, true )==false) { + $retVal[] = 'Could not delete existing access files'; + } + } + $retVal[] = createFolderProtectFile(rtrim( WB_PATH.PAGES_DIRECTORY,'/') ); + /** + * Reformat/rebuild all existing access files + */ + $sql = 'SELECT `page_id`,`root_parent`,`link`, `level` FROM `'.TABLE_PREFIX.'pages` ORDER BY `link`'; + if (($oPage = $database->query($sql))) + { + $x = 0; + while (($page = $oPage->fetchRow(MYSQL_ASSOC))) + { + // Work out level + $level = level_count($page['page_id']); + // Work out root parent + $root_parent = root_parent($page['page_id']); + // Work out page trail + $page_trail = get_page_trail($page['page_id']); + // Update page with new level and link + $sql = 'UPDATE `'.TABLE_PREFIX.'pages` SET '; + $sql .= '`root_parent` = '.$root_parent.', '; + $sql .= '`level` = '.$level.', '; + $sql .= '`page_trail` = "'.$page_trail.'" '; + $sql .= 'WHERE `page_id` = '.$page['page_id']; + + if(!$database->query($sql)) {} + $filename = WB_PATH.PAGES_DIRECTORY.$page['link'].PAGE_EXTENSION; + $retVal = create_access_file($filename, $page['page_id'], $page['level']); + $x++; + } + $retVal[] = 'Number of new formated access files: '.$x.''; + } + return $retVal; + } +} + +if(!function_exists('upgrade_modules')){ + function upgrade_modules($aModuleList) { + global $database; + foreach($aModuleList as $sModul) { + if(file_exists(WB_PATH.'/modules/'.$sModul.'/upgrade.php')) { + $currModulVersion = get_modul_version ($sModul, false); + $newModulVersion = get_modul_version ($sModul, true); + if((version_compare($currModulVersion, $newModulVersion) <= 0)) { + require_once(WB_PATH.'/modules/'.$sModul.'/upgrade.php'); + } + } + } + } +} + Index: branches/2.8.x/wb/modules/wysiwyg/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/wysiwyg/upgrade.php (revision 1764) +++ branches/2.8.x/wb/modules/wysiwyg/upgrade.php (revision 1765) @@ -21,34 +21,68 @@ throw new IllegalFileException(); } /* -------------------------------------------------------- */ -$msg = ''; -$sTable = TABLE_PREFIX.'mod_wysiwyg'; -if(($sOldType = $database->getTableEngine($sTable))) { - if(('myisam' != strtolower($sOldType))) { - if(!$database->query('ALTER TABLE `'.$sTable.'` Engine = \'MyISAM\' ')) { - $msg = $database->get_error(); - } - } -} else { - $msg .= $database->get_error().'
'; -} -$sql = 'ALTER TABLE `'.DB_NAME.'`.`'.$sTable.'` DROP PRIMARY KEY'; -if(!$database->query($sql)) { - $msg .= $database->get_error().'
'; -} +if(!function_exists('mod_wysiwyg_upgrade')) +{ + function mod_wysiwyg_upgrade () { + global $database,$bDebugModus; + $callingScript = $_SERVER["SCRIPT_NAME"]; + // check if upgrade startet by upgrade-script to echo a message + $tmp = 'upgrade-script.php'; + $globalStarted = substr_compare($callingScript, $tmp,(0-strlen($tmp)),strlen($tmp)) === 0; -$sql = 'ALTER TABLE `'.$sTable.'` ADD `wysiwyg_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST'; -if(!$database->query($sql)) { - $msg .= $database->get_error().'
'; -} + $msg = array(); + $aTable = array('mod_wysiwyg'); + for($x=0; $xgetTableEngine(TABLE_PREFIX.$aTable[$x]))) { + if(('myisam' != strtolower($sOldType))) { + if(!$database->query('ALTER TABLE `'.TABLE_PREFIX.$aTable[$x].'` Engine = \'MyISAM\' ')) { + $msg[] = $database->get_error(); + } else{ + $msg[] = 'TABLE `'.TABLE_PREFIX.$aTable[$x].'` changed to Engine = \'MyISAM\''; + } + } else { + $msg[] = 'TABLE `'.TABLE_PREFIX.$aTable[$x].'` has Engine = \'MyISAM\''; + } + } else { + $msg[] = $database->get_error(); + } + } -// change internal absolute links into relative links -$sTable = TABLE_PREFIX.'mod_wysiwyg'; -$sql = 'UPDATE `'.$sTable.'` '; -$sql .= 'SET `content` = REPLACE(`content`, \'"'.WB_URL.MEDIA_DIRECTORY.'\', \'"{SYSVAR:MEDIA_REL}\')'; -if (!$database->query($sql)) { - $msg .= $database->get_error().'
'; + $sTable = TABLE_PREFIX.'mod_wysiwyg'; + if($database->index_exists($sTable, 'PRIMARY')) { + $sql = 'ALTER TABLE `'.DB_NAME.'`.`'.$sTable.'` DROP PRIMARY KEY'; + if(!$database->query($sql)) { + $msg[] = ''.$database->get_error().''; + } + } + + if(!$database->index_add($sTable, '', 'section_id', 'PRIMARY')) { + $msg[] = ''.$database->get_error().''; + } else { + $msg[] = 'Create PRIMARY KEY ( `section_id` )'; + } + + // change internal absolute links into relative links + $sTable = TABLE_PREFIX.'mod_wysiwyg'; + $sql = 'UPDATE `'.$sTable.'` '; + $sql .= 'SET `content` = REPLACE(`content`, \'"'.WB_URL.MEDIA_DIRECTORY.'\', \'"{SYSVAR:MEDIA_REL}\')'; + if (!$database->query($sql)) { + $msg[] = ''.$database->get_error().''; + } else { + $msg[] = 'Change internal absolute links into relative links'; + } + // only for upgrade-script + if($globalStarted) { + if($bDebugModus) { + foreach($msg as $title) { + echo ''.$title.'
'; + } + } + } + return $msg; + } } +// ------------------------------------ -// ------------------------------------ \ No newline at end of file +$msg = mod_wysiwyg_upgrade(); Index: branches/2.8.x/wb/modules/form/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/form/upgrade.php (revision 1764) +++ branches/2.8.x/wb/modules/form/upgrade.php (revision 1765) @@ -15,34 +15,61 @@ * @description */ -// Must include code to stop this file being access directly /* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('

Cannot access this file directly

<'); +// Must include code to stop this file being accessed directly +if(!defined('WB_PATH')) { + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ -$msg = array(); -$aTable = array('mod_form_fields','mod_form_settings','mod_form_submissions'); -for($x=0; $xgetTableEngine(TABLE_PREFIX.$aTable[$x]))) { - if(('myisam' != strtolower($sOldType))) { - if(!$database->query('ALTER TABLE `'.TABLE_PREFIX.$aTable[$x].'` Engine = \'MyISAM\' ')) { - $msg[] = $database->get_error(); - } - } - } else { - $msg[] = $database->get_error(); - } -} +if(!function_exists('mod_form_upgrade')) +{ + function mod_form_upgrade() { + $msg = array(); + global $database,$bDebugModus; + $callingScript = $_SERVER["SCRIPT_NAME"]; + // check if upgrade startet by upgrade-script to echo a message + $tmp = 'upgrade-script.php'; + $globalStarted = substr_compare($callingScript, $tmp,(0-strlen($tmp)),strlen($tmp)) === 0; + $aTable = array('mod_form_fields','mod_form_settings','mod_form_submissions'); + for($x=0; $xgetTableEngine(TABLE_PREFIX.$aTable[$x]))) { + if(('myisam' != strtolower($sOldType))) { + if(!$database->query('ALTER TABLE `'.TABLE_PREFIX.$aTable[$x].'` Engine = \'MyISAM\' ')) { + $msg[] = $database->get_error(); + } else{ + $msg[] = 'TABLE `'.TABLE_PREFIX.$aTable[$x].'` changed to Engine = \'MyISAM\''; + } + } else { + $msg[] = 'TABLE `'.TABLE_PREFIX.$aTable[$x].'` has Engine = \'MyISAM\''; + } + } else { + $msg[] = $database->get_error(); + } + } -// later in upgrade.php -$table_name = TABLE_PREFIX.'mod_form_settings'; -$field_name = 'perpage_submissions'; -$description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`"; -if(!$database->field_exists($table_name,$field_name)) { - $database->field_add($table_name, $field_name, $description); + $table_name = TABLE_PREFIX.'mod_form_settings'; + $field_name = 'perpage_submissions'; + $description = "INT NOT NULL DEFAULT '10' AFTER `max_submissions`"; + if(!$database->field_exists($table_name,$field_name)) { + $database->field_add($table_name, $field_name, $description); + $msg[] = 'Add field `perpage_submissions` AFTER `max_submissions`'; + } else { + $msg[] = 'Field `perpage_submissions` already exists'; + } + + // only for upgrade-script + if($globalStarted) { + if($bDebugModus) { + foreach($msg as $title) { + echo ''.$title.'
'; + } + } + } + return $msg; + } } // ------------------------------------ + +$msg = mod_form_upgrade(); Index: branches/2.8.x/wb/modules/news/upgrade.php =================================================================== --- branches/2.8.x/wb/modules/news/upgrade.php (revision 1764) +++ branches/2.8.x/wb/modules/news/upgrade.php (revision 1765) @@ -1,10 +1,10 @@ getTableEngine(TABLE_PREFIX.$aTable[$x]))) { + if(('myisam' != strtolower($sOldType))) { + if(!$database->query('ALTER TABLE `'.TABLE_PREFIX.$aTable[$x].'` Engine = \'MyISAM\' ')) { + $msg[] = $database->get_error(); + } else{ + $msg[] = 'TABLE `'.TABLE_PREFIX.$aTable[$x].'` changed to Engine = \'MyISAM\''; + } + } else { + $msg[] = 'TABLE `'.TABLE_PREFIX.$aTable[$x].'` has Engine = \'MyISAM\''; + } + } else { + $msg[] = $database->get_error(); + } + } + $sPagesPath = WB_PATH.PAGES_DIRECTORY; $sPostsPath = $sPagesPath.'/posts'; // create /posts/ - directory if not exists @@ -36,15 +58,19 @@ if(!file_exists($sPostsPath)) { if(is_writable($sPagesPath)) { make_dir(WB_PATH.PAGES_DIRECTORY.'/posts/'); - }else { + } else { if(!$globalStarted){ $msg[] = ($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); - }else { - $msg[] = $MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'].'
'; +// $admin->print_error($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); + return $msg; + } else { + echo ''.$MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'].''; return; } } - if($globalStarted) {echo 'directory "'.PAGES_DIRECTORY.'/posts/" created.
'; } + $msg[] = 'Directory "'.PAGES_DIRECTORY.'/posts/" created'; + } else { + $msg[] = 'Directory "'.PAGES_DIRECTORY.'/posts/" already exists.'; } // check if new fields must be added $doImportDate = true; @@ -52,25 +78,35 @@ if(!$database->field_add(TABLE_PREFIX.'mod_news_posts', 'created_when', 'INT NOT NULL DEFAULT \'0\' AFTER `commenting`')) { if($globalStarted){ - echo $MESSAGE['RECORD_MODIFIED_FAILED'].'
'; + echo ''.$MESSAGE['RECORD_MODIFIED_FAILED'].''; return; - }else { - $admin->print_error($MESSAGE['RECORD_MODIFIED_FAILED']); + } else { +// $admin->print_error($MESSAGE['RECORD_MODIFIED_FAILED']); + $msg[] = $$MESSAGE['RECORD_MODIFIED_FAILED']; + return $msg; } } - if($globalStarted) { echo 'datafield `'.TABLE_PREFIX.'mod_news_posts`.`created_when` added.
'; } - }else { $doImportDate = false; } + + if($globalStarted) { + echo 'Datafield `'.TABLE_PREFIX.'mod_news_posts`.`created_when` added.
'; + } + } else { $doImportDate = false; } + if(!$database->field_exists(TABLE_PREFIX.'mod_news_posts', 'created_by')) { if(!$database->field_add(TABLE_PREFIX.'mod_news_posts', 'created_by', 'INT NOT NULL DEFAULT \'0\' AFTER `created_when`')) { if($globalStarted){ - echo $MESSAGE['RECORD_MODIFIED_FAILED'].'
'; + echo ''.$MESSAGE['RECORD_MODIFIED_FAILED'].''; return; }else { - $admin->print_error($MESSAGE['RECORD_MODIFIED_FAILED']); +// $admin->print_error($MESSAGE['RECORD_MODIFIED_FAILED']); + $msg[] = $$MESSAGE['RECORD_MODIFIED_FAILED']; + return $msg; } } - if($globalStarted) {echo 'datafield `'.TABLE_PREFIX.'mod_news_posts`.`created_by` added.
'; } + if($globalStarted) { + echo 'datafield `'.TABLE_PREFIX.'mod_news_posts`.`created_by` added.
'; + } } // preset new fields `created_by` and `created_when` from existing values if($doImportDate) { @@ -79,6 +115,9 @@ $database->query($sql); } + /** + * rebuild news post folder + */ $array = rebuildFolderProtectFile($sPostsPath); // now iterate through all existing accessfiles, // write its creation date into database @@ -106,8 +145,9 @@ } } unset($oDir); - if($globalStarted && $count > 0) { - $msg[] = 'save date of creation from '.$count.' old accessfiles and delete these files.
'; + + if($count > 0) { + $msg[] = 'save date of creation from '.$count.' old accessfiles and delete these files.'; } // ************************************************ // Check the validity of 'create-file-timestamp' and balance against 'posted-timestamp' @@ -150,33 +190,28 @@ // Chmod the file change_mode($file); }else { - if($globalStarted){ - $msg[] = $MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE'].'
'; - return; - }else { - $msg[] = ($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); - } + $msg[] = ($MESSAGE['PAGES_CANNOT_CREATE_ACCESS_FILE']); } $count++; } + $msg[] = 'Number of new created access files: '.$count.''; } - if($globalStarted) { $msg[] = 'created '.$count.' new accessfiles.'; } + // only for upgrade-script + if($globalStarted) { + if($bDebugModus) { + foreach($msg as $title) { + echo ''.$title.'
'; + } + } + } + return $msg; } } +// end mod_news_Upgrade - $msg = array(); - $aTable = array('mod_news_posts','mod_news_groups','mod_news_comments','mod_news_settings'); - for($x=0; $xgetTableEngine(TABLE_PREFIX.$aTable[$x]))) { - if(('myisam' != strtolower($sOldType))) { - if(!$database->query('ALTER TABLE `'.TABLE_PREFIX.$aTable[$x].'` Engine = \'MyISAM\' ')) { - $msg[] = $database->get_error(); - } - } - } else { - $msg[] = $database->get_error(); - } - } // ------------------------------------ - mod_news_Upgrade(); + +$msg = mod_news_Upgrade(); + + /* **** END UPGRADE ********************************************************* */ \ No newline at end of file