Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1453) +++ branches/2.8.x/CHANGELOG (revision 1454) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.2 ------------------------------------- +06 Jun-2011 Build 1454 Werner v.d.Decken(DarkViper) +# in /framework/functions.php::media_filename - replace whitespaces by _ +# /upgrade-script.php - some small fixes 02 Jun-2011 Build 1453 Dietmar Woellbrink (Luisehahne) # fix target in admin/media/browse.php # http://www.websitebaker2.org/forum/index.php/topic,21688.msg145812.html#msg145812 Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1453) +++ branches/2.8.x/wb/upgrade-script.php (revision 1454) @@ -24,7 +24,6 @@ echo '<'.$element .' class="' .$class .'">' .$message .''; } -$version = '2.8.2'; // database tables including in WB package $table_list = array ( 'settings','groups','addons','pages','sections','search','users', @@ -108,6 +107,9 @@ print ''; } +require_once(WB_PATH.'/framework/functions.php'); +require_once(WB_PATH.'/framework/class.admin.php'); +$admin = new admin('Addons', 'modules', false, false); ?> @@ -177,9 +179,19 @@

WebsiteBaker Upgrade

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

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

'; + echo "

+ + + "; + exit(); + } +?> +

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

Step 2: Updating database entries'; - -require_once(WB_PATH.'/framework/functions.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Addons', 'modules', false, false); - $OK = 'OK'; $FAIL = 'FAILED'; @@ -493,34 +499,36 @@ echo mysql_error().'
'; } - - - if ((version_compare(WB_VERSION, '2.8.1') <= 0) && file_exists(WB_PATH."/modules/news/upgrade.php")) - { - echo '

Upgrade existings postfiles to new format

'; - // change old postfiles to new postfiles - require_once(WB_PATH."/modules/news/upgrade.php"); - } - } - + } } - } - /********************************************************** - * - Set Version to WB 2.8.2 + * upgrade news if newer version is available */ -echo "
Update database version number to 2.8.2 : "; -echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value` = '$version' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
"; + if(file_exists(WB_PATH.'/modules/news/upgrade.php')) + { + $currNewsVersion = get_modul_version ('news', false); + $newNewsVersion = get_modul_version ('news', true); + if((version_compare($currNewsVersion, $newNewsVersion) <= 0)) { + echo '

Upgrade existings basically news module

'; + // change old postfiles to new postfiles + require_once(WB_PATH."/modules/news/upgrade.php"); + } + } +/********************************************************** + * - Set Version to new Version + */ +echo '
Update database version number to '.VERSION.' : '; +echo ($database->query("UPDATE `".TABLE_PREFIX."settings` SET `value`='".VERSION."' WHERE `name` = 'wb_version'")) ? " $OK
" : " $FAIL
"; /********************************************************** * - Reload all addons */ -//delete modules -$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'"); +////delete modules +//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'"); // Load all modules -if($handle = opendir(WB_PATH.'/modules/')) { +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); @@ -530,10 +538,10 @@ } echo '
Modules reloaded
'; -//delete templates -$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); +////delete templates +//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); // Load all templates -if($handle = opendir(WB_PATH.'/templates/')) { +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); @@ -543,10 +551,10 @@ } echo '
Templates reloaded
'; -//delete languages -$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); +////delete languages +//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); // Load all languages -if($handle = opendir(WB_PATH.'/languages/')) { +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); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1453) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1454) @@ -52,6 +52,6 @@ // 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.2.RC6'); -if(!defined('REVISION')) define('REVISION', '1453'); +if(!defined('REVISION')) define('REVISION', '1454'); ?> Index: branches/2.8.x/wb/framework/functions.php =================================================================== --- branches/2.8.x/wb/framework/functions.php (revision 1453) +++ branches/2.8.x/wb/framework/functions.php (revision 1454) @@ -682,31 +682,10 @@ require_once(WB_PATH.'/framework/functions-utf8.php'); $string = entities_to_7bit($string); // Now remove all bad characters - $bad = array( - '\'', // ' - '"', // " - '`', // ` - '!', // ! - '@', // @ - '#', // # - '$', // $ - '%', // % - '^', // ^ - '&', // & - '*', // * - '=', // = - '+', // + - '|', // | - '/', // / - '\\', // \ - ';', // ; - ':', // : - ',', // , - '?' // ? - ); + $bad = array('\'','"','`','!','@','#','$','%','^','&','*','=','+','|','/','\\',';',':',',','?'); $string = str_replace($bad, '', $string); // replace multiple dots in filename to single dot and (multiple) dots at the end of the filename to nothing - $string = preg_replace(array('/\.+/', '/\.+$/'), array('.', ''), $string); + $string = preg_replace(array('/\.+/', '/\.+$/', '/\s/'), array('.', '', '_'), $string); // Clean any page spacers at the end of string $string = trim($string); // Finally, return the cleaned string