Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1587) +++ branches/2.8.x/CHANGELOG (revision 1588) @@ -11,6 +11,8 @@ ! = Update/Change =========================== add small Features 2.8.2 ========================== +25 Jan-2012 Build 1588 Werner v.d.Decken(DarkViper) +# all module depending code removed, some little fixes, better integration for module-upgrade 25 Jan-2012 Build 1587 Werner v.d.Decken(DarkViper) + module news: added sql-dump to create database tables # module news: some little fixes in install/upgrade Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1587) +++ branches/2.8.x/wb/upgrade-script.php (revision 1588) @@ -476,167 +476,37 @@ 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`"); -if (version_compare(WB_VERSION, '2.8') < 0) +/********************************************************** + * - Update search no results database filed to create + * valid XHTML if search is empty + */ +if (version_compare(WB_VERSION, '2.8', '<')) { - /********************************************************** - * - Update search no results database filed to create - * valid XHTML if search is empty - */ echo "
Updating database field `no_results` of search table: "; $search_no_results = addslashes('

[TEXT_NO_RESULTS]

'); - $sql = "UPDATE `" . TABLE_PREFIX . "search` SET `value` = '$search_no_results' WHERE `name`= 'no_results'"; - $database->query($sql); - echo ($database->query($sql)) ? " $OK
" : " $FAIL
"; - /********************************************************** - * - Update settings of News Modul - */ - - // These are the default setting - $header = ''."\n"; - $post_loop = ' - - - - - -'; - $footer = '
[TITLE][PUBLISHED_TIME], [PUBLISHED_DATE]
-[SHORT] -[TEXT_READ_MORE] -
- - - - - - -
[PREVIOUS_PAGE_LINK][OF][NEXT_PAGE_LINK]
'; - $post_header = addslashes(' - - - - - - - - - - -

[TITLE]

[GROUP_IMAGE]
[TEXT_POSTED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [PUBLISHED_DATE]
[PAGE_TITLE] >> [GROUP_TITLE]
'); - $post_footer = '

[TEXT_LAST_CHANGED]: [MODI_DATE] [TEXT_AT] [MODI_TIME]

-[TEXT_BACK]'; - $comments_header = addslashes('

-

[TEXT_COMMENTS]

-'); - $comments_loop = addslashes(' - - - - - -'); - $comments_footer = '
[TITLE][TEXT_BY] [DISPLAY_NAME] [TEXT_ON] [DATE] [TEXT_AT] [TIME]
[COMMENT]
-
[TEXT_ADD_COMMENT]'; - $comments_page = '

[TEXT_COMMENT]

-

[POST_TITLE]

-
'; - - if(in_array('mod_news_settings', $all_tables)) - { - // Insert default settings into database - $query_dates = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_settings where section_id != 0 and page_id != 0"); - if($query_dates->numRows() > 1) - { - while($result = $query_dates->fetchRow()) - { - - echo "
Add default settings to database for news section_id= ".$result['section_id']."
"; - $section_id = $result['section_id']; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `header` = '$header' WHERE `section_id` = $section_id")) { - echo 'Database data header added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_loop` = '$post_loop' WHERE `section_id` = $section_id")) { - echo 'Database data post_loop added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `footer` = '$footer' WHERE `section_id` = $section_id")) { - echo 'Database data footer added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_header` = '$post_header' WHERE `section_id` = $section_id")) { - echo 'Database data post_header added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `post_footer` = '$post_footer' WHERE `section_id` = $section_id")) { - echo 'Database data post_footer added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_header` = '$comments_header' WHERE `section_id` = $section_id")) { - echo 'Database data comments_header added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_loop` = '$comments_loop' WHERE `section_id` = $section_id")) { - echo 'Database data comments_loop added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_footer` = '$comments_footer' WHERE `section_id` = $section_id")) { - echo 'Database data comments_footer added successfully'; - } - echo mysql_error().'
'; - - if($database->query("UPDATE `".TABLE_PREFIX."mod_news_settings` SET `comments_page` = '$comments_page' WHERE `section_id` = $section_id")) { - echo 'Database data comments_page added successfully'; - } - echo mysql_error().'
'; - - } - } - } + $sql = 'UPDATE `'.TABLE_PREFIX.'search` '; + $sql .= 'SET `value`=\''.$search_no_results.'\' '; + $sql .= 'WHERE `name`=\'no_results\''; + echo ($database->query($sql)) ? ' $OK
' : ' $FAIL
'; } /********************************************************** * upgrade media folder index protect files */ -$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); -} - -/********************************************************** - * upgrade news if newer version is available - */ - 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"); - } + $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); } - /* ***************************************************************************** * - check for deprecated / never needed files */ -if(sizeof($filesRemove)) { -?> -

Step : Remove deprecated and old files

-Step '.(++$stepID).': Remove deprecated and old files'; + } $searches = array( '[ADMIN]', '[MEDIA]', @@ -661,10 +531,10 @@ { $file = str_replace($searches, $replacements, $file); $file = WB_PATH.'/'.$file; - if( file_exists($file) ) - { // try to unlink file - if(!is_writable( $file ) || !unlink($file)) - { // save in err-list, if failed + if( file_exists($file) ) { + // try to unlink file + if(!is_writable( $file ) || !unlink($file)) { + // save in err-list, if failed $msg .= $file.'
'; } } @@ -690,100 +560,104 @@ /********************************************************** * - check for deprecated / never needed files */ -if(sizeof($dirRemove)) { -?> -

Step : Remove deprecated and old folders

-'; + if(sizeof($dirRemove)) { + echo '

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

'; + $searches = array( + '[ADMIN]', + '[MEDIA]', + '[PAGES]', + '[TEMPLATE]' + ); + $replacements = array( + substr(ADMIN_PATH, strlen(WB_PATH)+1), + MEDIA_DIRECTORY, + PAGES_DIRECTORY, + '/templates', + ); + $msg = ''; + foreach( $dirRemove as $dir ) { + $dir = str_replace($searches, $replacements, $dir); + $dir = WB_PATH.'/'.$dir; + if( is_dir( $dir )) { + // try to delete dir + if(!rm_full_dir($dir)) { + // save in err-list, if failed + $msg .= $dir.'
'; + } } } + if($msg != '') { + $msg = '

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

Please delete them + using FTP and restart upgrade-script!

'.$msg.'
'; + status_msg($msg, 'error warning', 'div'); + echo '

WARNING: The upgrade script failed ...

'; + echo '
'; + echo ' '; + echo '
'; + echo '

'; + exit; + } } - if($msg != '') - { - $msg = '

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

Please delete them - using FTP and restart upgrade-script!

'.$msg.'
'; - status_msg($msg, 'error warning', 'div'); - echo '

WARNING: The upgrade script failed ...

'; - echo '
'; - echo ' '; - echo '
'; - echo '

'; - exit; +/********************************************************** + * upgrade modules if newer version is available + */ + $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.'

'; + require_once(WB_PATH.'/modules/'.$sModul.'/upgrade.php'); + } + } } - -} - -?> -

Step : Reload all addons database entry (no upgrade)

-query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'module'"); -// Load all 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 ); - // upgrade_module($file, true); + 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 + 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 ); + // upgrade_module($file, true); + } } + closedir($handle); } - closedir($handle); -} -echo '
Modules reloaded
'; + echo '
Modules reloaded
'; -////delete templates -//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); -// Load all 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); + ////delete templates + //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); + // Load all 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); + } } + closedir($handle); } - closedir($handle); -} -echo '
Templates reloaded
'; + echo '
Templates reloaded
'; -////delete languages -//$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); -// Load all 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); + ////delete languages + //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'language'"); + // Load all 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); + } } + closedir($handle); } - closedir($handle); -} -echo '
Languages reloaded
'; + echo '
Languages reloaded
'; /********************************************************** * - End of upgrade script @@ -791,34 +665,31 @@ // 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);} + 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.'] : '; + // 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 '

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('Warning:
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 '
'; + } -?>

- - - \ No newline at end of file + echo '

'; \ 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 1587) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1588) @@ -32,7 +32,6 @@ * @category admin * @package interface * @author WebsiteBaker Project - * @copyright 2004-2009, Ryan Djurovich * @copyright 2009-2011, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html @@ -52,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.2'); -if(!defined('REVISION')) define('REVISION', '1587'); +if(!defined('REVISION')) define('REVISION', '1588'); if(!defined('SP')) define('SP', 'SP2');