Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1670) +++ branches/2.8.x/CHANGELOG (revision 1671) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +18 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne) +# fixes installer and upgrade-script 17 Apr-2012 Build 1670 Werner v.d.Decken(DarkViper) + added new global exceptionhandler (class AppException) 17 Apr-2012 Build 1669 Werner v.d.Decken(DarkViper) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1670) +++ branches/2.8.x/wb/upgrade-script.php (revision 1671) @@ -19,6 +19,7 @@ require_once(WB_PATH.'/framework/functions.php'); require_once(WB_PATH.'/framework/class.admin.php'); +require_once(WB_PATH.'/framework/class.database.php'); $admin = new admin('Addons', 'modules', false, false); /* display a status message on the screen ************************************** @@ -48,7 +49,7 @@ $OK = ' OK '; $FAIL = ' FAILED '; $DEFAULT_THEME = 'wb_theme'; -$stepID = 1; +$stepID = 0; $dirRemove = array( /* '[TEMPLATE]/allcss/', @@ -68,7 +69,9 @@ ); -$filesRemove['1'] = array( +if(version_compare(WB_REVISION, '1671', '<')) +{ + $filesRemove['1'] = array( '[TEMPLATE]/argos_theme/templates/access.htt', '[TEMPLATE]/argos_theme/templates/addons.htt', @@ -78,10 +81,10 @@ '[TEMPLATE]/argos_theme/templates/groups_form.htt', '[TEMPLATE]/argos_theme/templates/languages.htt', '[TEMPLATE]/argos_theme/templates/languages_details.htt', -/* + /* '[TEMPLATE]/argos_theme/templates/login.htt', '[TEMPLATE]/argos_theme/templates/login_forgot.htt', -*/ + */ '[TEMPLATE]/argos_theme/templates/media.htt', '[TEMPLATE]/argos_theme/templates/media_browse.htt', '[TEMPLATE]/argos_theme/templates/media_rename.htt', @@ -110,10 +113,10 @@ '[TEMPLATE]/wb_theme/templates/languages.htt', '[TEMPLATE]/wb_theme/templates/languages_details.htt', -/* + /* '[TEMPLATE]/wb_theme/templates/login.htt', '[TEMPLATE]/wb_theme/templates/login_forgot.htt', -*/ + */ '[TEMPLATE]/wb_theme/templates/media.htt', '[TEMPLATE]/wb_theme/templates/media_browse.htt', @@ -134,6 +137,7 @@ '[TEMPLATE]/wb_theme/templates/users.htt', '[TEMPLATE]/wb_theme/templates/users_form.htt', ); +} // analyze/check database tables function mysqlCheckTables( $dbName ) @@ -196,8 +200,7 @@ // check existing tables $all_tables = check_wb_tables(); -?> - +?> Upgrade script @@ -248,7 +251,7 @@ h1 { font-size:150%; } h2 { font-size: 130%; border-bottom: 1px #CCC solid; } -h3 { font-size: 120%; } +h3 { font-size: 110%; font-weight: bold;; } .ok, .error { font-weight:bold; } .ok { color:green; } @@ -325,64 +328,15 @@ exit(); } -echo '

Step '.(++$stepID).' : Updating database entries

'; +echo '

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

'; -// function to add a var/value-pair into settings-table -function db_add_key_value($key, $value) { - global $database; global $OK; global $FAIL; - $table = TABLE_PREFIX.'settings'; - $query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1"); - if($query->numRows() > 0) { - echo "$key: already exists. $OK.
"; - return true; - } else { - $database->query("INSERT INTO $table (name,value) VALUES ('$key', '$value')"); - echo (mysql_error()?mysql_error().'
':''); - $query = $database->query("SELECT value FROM $table WHERE name = '$key' LIMIT 1"); - if($query->numRows() > 0) { - echo "$key: $OK.
"; - return true; - } else { - echo "$key: $FAIL!
"; - return false; - } - } -} - -// function to add a new field into a table -function db_add_field($field, $table, $desc) { - global $database; global $OK; global $FAIL; - $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' already exists. $OK.
"; - } -} - /********************************************************** * - Adding field default_theme to settings table */ -echo "
Adding default_theme to settings table
"; -db_update_key_value('settings', 'default_theme', $DEFAULT_THEME); -/********************************************************** - * - install droplets - */ - $drops = (!in_array ( "mod_droplets", $all_tables)) ? "
Install droplets
" : "
Upgrade droplets
"; - echo $drops; +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!
"); - $file_name = (!in_array ( "mod_droplets", $all_tables) ? "install.php" : "upgrade.php"); - require_once (WB_PATH."/modules/droplets/".$file_name); - // check again all tables, to get a new array if(sizeof($all_tables) < 22) { $all_tables = check_wb_tables(); } /********************************************************** @@ -422,120 +376,214 @@ exit(); } + +echo '

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

'; /********************************************************** * - Adding field sec_anchor to settings table */ -echo "
Adding sec_anchor to settings table
"; +echo "
Adding sec_anchor to settings table"; $cfg = array( 'sec_anchor' => 'wb_' ); -foreach($cfg as $key=>$value) { - db_add_key_value($key, $value); -} +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + + /********************************************************** * - Adding redirect timer to settings table */ -echo "
Adding redirect timer to settings table
"; +echo "Adding redirect timer to settings table"; $cfg = array( 'redirect_timer' => '1500' ); -foreach($cfg as $key=>$value) { - db_add_key_value($key, $value); -} +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); /********************************************************** * - Adding rename_files_on_upload to settings table */ -echo "
Updating rename_files_on_upload to settings table
"; +echo "Updating rename_files_on_upload to settings table"; $cfg = array( 'rename_files_on_upload' => 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js' ); -db_update_key_value('settings', 'rename_files_on_upload', $cfg['rename_files_on_upload']); +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); /********************************************************** * - Adding mediasettings to settings table */ -echo "
Adding mediasettings to settings table
"; +echo "Adding mediasettings to settings table"; $cfg = array( 'mediasettings' => '', ); -foreach($cfg as $key=>$value) { - db_add_key_value($key, $value); -} +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); /********************************************************** * - Adding fingerprint_with_ip_octets to settings table */ -echo "
Adding fingerprint_with_ip_octets to settings table
"; +echo "Adding fingerprint_with_ip_octets to settings table"; $cfg = array( 'fingerprint_with_ip_octets' => '2', 'secure_form_module' => '' ); -foreach($cfg as $key=>$value) { - db_add_key_value($key, $value); -} + +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + /********************************************************** * - Adding page_icon_dir to settings table */ -echo "
Adding page_icon_dir to settings table
"; +echo "Adding page_icon_dir to settings table"; $cfg = array( 'page_icon_dir' => '/templates/*/title_images', ); -foreach($cfg as $key=>$value) { - db_add_key_value($key, $value); -} + +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + /********************************************************** * - Adding dev_infos to settings table */ -echo "
Adding dev_infos to settings table
"; +echo "Adding dev_infos to settings table"; $cfg = array( 'dev_infos' => 'true', ); -foreach($cfg as $key=>$value) { - db_add_key_value($key, $value); -} -/********************************************************** +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + +if(version_compare(WB_REVISION, '1671', '<')) +{ + echo '

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

'; + + /********************************************************** + * - Update search no results database filed to create + * valid XHTML if search is empty + */ + if (version_compare(WB_VERSION, '2.8', '<')) + { + echo "
Updating database field `no_results` of 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
'; + } + /********************************************************** * - Add field "redirect_type" to table "mod_menu_link" */ -echo "
Adding field redirect_type to mod_menu_link table
"; -db_add_field('redirect_type', 'mod_menu_link', "INT NOT NULL DEFAULT '302' AFTER `target_page_id`"); + $table_name = TABLE_PREFIX.'mod_menu_link'; + $field_name = 'redirect_type'; + $description = "INT NOT NULL DEFAULT '302' AFTER `target_page_id`"; + if(!$database->field_exists($table_name,$field_name)) { + 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 ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + } -/********************************************************** + /********************************************************** + * - Add field "page_trail" to table "pages" + */ + $table_name = TABLE_PREFIX.'pages'; + $field_name = 'page_trail'; + $description = "VARCHAR( 255 ) NOT NULL DEFAULT ''"; + echo "Modify field page_trail to pages table"; + echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + + /********************************************************** * - Add field "page_icon" to table "pages" */ -echo "
Adding field page_icon to pagestable
"; -db_add_field('page_icon', 'pages', "TEXT NOT NULL DEFAULT '' AFTER `page_title`"); + $table_name = TABLE_PREFIX.'pages'; + $field_name = 'page_icon'; + $description = "VARCHAR( 255 ) NOT NULL DEFAULT '' AFTER `page_title`"; + if(!$database->field_exists($table_name,$field_name)) { + 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 ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + } -/********************************************************** + /********************************************************** + * - Add field "page_code" to table "pages" + */ + $table_name = TABLE_PREFIX.'pages'; + $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 ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + } else { + echo "Modify field page_code to pages table"; + echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + } + + /********************************************************** * - Add field "menu_icon_0" to table "pages" */ -echo "
Adding field menu_icon_0 to pages table
"; -db_add_field('menu_icon_0', 'pages', "TEXT NOT NULL DEFAULT '' AFTER `menu_title`"); + $table_name = TABLE_PREFIX.'pages'; + $field_name = 'menu_icon_0'; + $description = "VARCHAR( 255 ) NOT NULL DEFAULT '' AFTER `menu_title`"; + if(!$database->field_exists($table_name,$field_name)) { + 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 ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + } -/********************************************************** - * - Add field "menu_icon_1" to table "mod_menu_link" + /********************************************************** + * - Add field "menu_icon_1" to table "pages" */ -echo "
Adding field menu_icon_1 to pages table
"; -db_add_field('menu_icon_1', 'pages', "TEXT NOT NULL DEFAULT '' AFTER `menu_icon_0`"); + $table_name = TABLE_PREFIX.'pages'; + $field_name = 'menu_icon_1'; + $description = "VARCHAR( 255 ) 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 ($database->field_add($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + } else { + echo "Modify field menu_icon_1 to pages table"; + echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + } -/********************************************************** - * - Update search no results database filed to create - * valid XHTML if search is empty + /********************************************************** + * - Add field "admin_groups" to table "pages" */ -if (version_compare(WB_VERSION, '2.8', '<')) -{ - echo "
Updating database field `no_results` of 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
'; + $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 ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + + /********************************************************** + * - Add field "admin_users" to table "pages" + */ + $table_name = TABLE_PREFIX.'pages'; + $field_name = 'admin_users'; + $description = "VARCHAR( 512 ) NOT NULL DEFAULT ''"; + echo "Modify field admin_users to pages table"; + echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + + /********************************************************** + * - Add field "viewing_groups" to table "pages" + */ + $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 ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); + + /********************************************************** + * - Add field "viewing_users" to table "pages" + */ + $table_name = TABLE_PREFIX.'pages'; + $field_name = 'viewing_users'; + $description = "VARCHAR( 512 ) NOT NULL DEFAULT ''"; + echo "Modify field viewing_users to pages table"; + echo ($database->field_modify($table_name, $field_name, $description) ? " $OK
" : " $FAIL!
"); } + /********************************************************** * 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 '' */ $dir = (WB_PATH.MEDIA_DIRECTORY); echo '

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


'; @@ -562,7 +610,7 @@ * - check for deprecated / never needed files */ if(sizeof($filesRemove)) { - echo '

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

'; + echo '

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

'; } $searches = array( '[ADMIN]', @@ -618,7 +666,7 @@ * - check for deprecated / never needed files */ if(sizeof($dirRemove)) { - echo '

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

'; + echo '

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

'; $searches = array( '[ADMIN]', '[MEDIA]', @@ -666,7 +714,7 @@ $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 '

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

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

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

'; + echo '

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

'; ////delete modules //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'"); // Load all modules @@ -717,22 +765,31 @@ echo '
Languages reloaded
'; /********************************************************** + * - install new droplets + $drops = (!in_array ( "mod_droplets", $all_tables)) ? "
Install droplets
" : "
Upgrade droplets
"; + echo $drops; + $file_name = (!in_array ( "mod_droplets", $all_tables) ? "install.php" : "upgrade.php"); + require_once (WB_PATH."/modules/droplets/".$file_name); +********************************************************** */ + +/********************************************************** * - End of upgrade script */ - -// require(WB_PATH.'/framework/initialize.php'); - if(!defined('DEFAULT_THEME')) { define('DEFAULT_THEME', $DEFAULT_THEME); } if(!defined('THEME_PATH')) { define('THEME_PATH', WB_PATH.'/templates/'.DEFAULT_THEME);} /********************************************************** * - Set Version to new Version */ - echo '
Update database version number to '.VERSION.' '.SP.' '.' Revision ['.REVISION.'] : '; - // echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value`='".VERSION."' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
"; - db_update_key_value('settings', 'wb_version', VERSION); - db_update_key_value('settings', 'wb_revision', REVISION); - db_update_key_value('settings', 'wb_sp', SP); +echo '
Update database version number to '.VERSION.' '.SP.' '.' Revision ['.REVISION.'] : '; +$cfg = array( + 'wb_version' => VERSION, + 'wb_revision' => REVISION, + 'wb_sp' => SP +); + +echo (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); + 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 Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1670) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1671) @@ -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', '1670'); +if(!defined('REVISION')) define('REVISION', '1671'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/install/save.php =================================================================== --- branches/2.8.x/wb/install/save.php (revision 1670) +++ branches/2.8.x/wb/install/save.php (revision 1671) @@ -401,31 +401,33 @@ . ' `parent` INT NOT NULL DEFAULT \'0\',' . ' `root_parent` INT NOT NULL DEFAULT \'0\',' . ' `level` INT NOT NULL DEFAULT \'0\',' - . ' `link` TEXT NOT NULL,' + . ' `link` VARCHAR( 255 ) NOT NULL,' . ' `target` VARCHAR( 7 ) NOT NULL DEFAULT \'\' ,' . ' `page_title` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,' - . ' `page_icon` TEXT NOT NULL DEFAULT \'/templates/*/title_images\' ,' + . ' `page_icon` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,' . ' `menu_title` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,' - . ' `menu_icon_0` TEXT NOT NULL DEFAULT \'\' ,' - . ' `menu_icon_1` TEXT NOT NULL DEFAULT \'\' ,' + . ' `menu_icon_0` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,' + . ' `menu_icon_1` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,' . ' `description` TEXT NOT NULL ,' . ' `keywords` TEXT NOT NULL ,' - . ' `page_trail` TEXT NOT NULL ,' + . ' `page_trail` VARCHAR( 255 ) NOT NULL ,' . ' `template` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,' . ' `visibility` VARCHAR( 255 ) NOT NULL DEFAULT \'\' ,' . ' `position` INT NOT NULL DEFAULT \'0\',' . ' `menu` INT NOT NULL DEFAULT \'0\',' . ' `language` VARCHAR( 5 ) NOT NULL DEFAULT \'\' ,' + . ' `page_code` INT NOT NULL DEFAULT \'0\',' . ' `searching` INT NOT NULL DEFAULT \'0\',' - . ' `admin_groups` TEXT NOT NULL DEFAULT \'1\' ,' - . ' `admin_users` TEXT NOT NULL ,' - . ' `viewing_groups` TEXT NOT NULL DEFAULT \'1\' ,' - . ' `viewing_users` TEXT NOT NULL ,' + . ' `admin_groups` VARCHAR( 512 ) NOT NULL DEFAULT \'1\' ,' + . ' `admin_users` VARCHAR( 512 ) NOT NULL ,' + . ' `viewing_groups` VARCHAR( 512 ) NOT NULL DEFAULT \'1\' ,' + . ' `viewing_users` VARCHAR( 512 ) NOT NULL ,' . ' `modified_when` INT NOT NULL DEFAULT \'0\',' . ' `modified_by` INT NOT NULL DEFAULT \'0\',' . ' PRIMARY KEY ( `page_id` ) ' . ' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'; - $database->query($pages); + if(!$database->query($pages)) { + } // Sections table $pages = 'CREATE TABLE `'.TABLE_PREFIX.'sections` ( `section_id` INT NOT NULL auto_increment,'