Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1964) +++ branches/2.8.x/CHANGELOG (revision 1965) @@ -11,6 +11,11 @@ ! = Update/Change =============================================================================== +19 Sep-2013 Build 1965 Manuela v.d.Decken(DarkViper) ++ framework/UpgradeHelper::getMissingTables() ++ alias framework/UpgradeHelper::getMissingTables() with existsAllTables() ++ upgrade-script.php add loading class PasswordHash +! some corrections of typos in upgrade-sript.php 18 Sep-2013 Build 1964 Manuela v.d.Decken(DarkViper) ! modified loading sequence of Password classes 18 Sep-2013 Build 1963 Manuela v.d.Decken(DarkViper) Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1964) +++ branches/2.8.x/wb/upgrade-script.php (revision 1965) @@ -34,17 +34,21 @@ * @deprecated * @description xyz */ +if(!class_exists('PasswordHash', false)) +{ + include(dirname(__FILE__).'/include/phpass/PasswordHash.php'); +} // Include config file -$config_file = realpath('config.php'); +$config_file = dirname(__FILE__).'/config.php'; if(file_exists($config_file) && !defined('WB_URL')) { require($config_file); - } -//require_once(WB_PATH.'/framework/class.admin.php'); -if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); } +if(!class_exists('admin', false)) +{ + include(WB_PATH.'/framework/class.admin.php'); +} $admin = new admin('Addons', 'modules', false, false); - // solved wrong pages_directory value before creating access files $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` ' . 'WHERE `name`=\'pages_directory\''; @@ -52,10 +56,10 @@ $sTmp = trim($sPagesDirectory, '/'); $sTmp = ($sTmp == '' ? '' : '/'.$sTmp); if($sTmp != $sPagesDirectory) { - $sql = 'UPDATE `'.TABLE_PREFIX.'settings` ' - . 'SET `value` = \''.$sTmpDir.'\' ' - . 'WHERE `name`=\'pages_directory\' '; - WbDatabase::getInstance()->query($sql); + $sql = 'UPDATE `'.TABLE_PREFIX.'settings` ' + . 'SET `value` = \''.$sTmpDir.'\' ' + . 'WHERE `name`=\'pages_directory\' '; + WbDatabase::getInstance()->query($sql); } require_once(WB_PATH.'/framework/functions.php'); // require_once(WB_PATH.'/framework/Database.php'); @@ -330,48 +334,49 @@ exit(); } if($admin->get_user_id()!=1){ - status_msg('

WebsiteBaker upgrading is not possible!
Before upgrading to Revision '.REVISION.' you have to login as System-Administrator!

', 'warning', 'div'); - echo '

'; + status_msg('

WebsiteBaker upgrading is not possible!
Before upgrading ' + .'to Revision '.REVISION.' you have to login as System-Administrator!

', + 'warning', 'div'); + echo '

'; // delete remember key of current user from database -//if (isset($_SESSION['USER_ID']) && isset($database)) { -// $table = TABLE_PREFIX . 'users'; -// $sql = "UPDATE `$table` SET `remember_key` = '' WHERE `user_id` = '" . (int) $_SESSION['USER_ID'] . "'"; -// $database->query($sql); -//} - + //if (isset($_SESSION['USER_ID']) && isset($database)) { + // $table = TABLE_PREFIX . 'users'; + // $sql = "UPDATE `$table` SET `remember_key` = '' WHERE `user_id` = '" . (int) $_SESSION['USER_ID'] . "'"; + // $database->query($sql); + //} // delete remember key cookie if set -if (isset($_COOKIE['REMEMBER_KEY']) && !headers_sent() ) { - setcookie('REMEMBER_KEY', '', time() - 3600, '/'); -} - -// delete most critical session variables manually -$_SESSION['USER_ID'] = null; -$_SESSION['GROUP_ID'] = null; -$_SESSION['GROUPS_ID'] = null; -$_SESSION['USERNAME'] = null; -$_SESSION['PAGE_PERMISSIONS'] = null; -$_SESSION['SYSTEM_PERMISSIONS'] = null; -// overwrite session array -$_SESSION = array(); -// delete session cookie if set -if (isset($_COOKIE[session_name()]) && !headers_sent()) { - setcookie(session_name(), '', time() - 42000, '/'); -} -// delete the session itself -session_destroy(); -status_msg('

After login as System-Adminstrator you have to start upgrade-script.php again!

', 'info', 'div'); - echo '

'; - if(defined('ADMIN_URL')) { - echo '
'; - echo ' '; - echo '
'; - } -echo "

- - - - - "; + if (isset($_COOKIE['REMEMBER_KEY']) && !headers_sent() ) { + setcookie('REMEMBER_KEY', '', time() - 3600, '/'); + } + // delete most critical session variables manually + $_SESSION['USER_ID'] = null; + $_SESSION['GROUP_ID'] = null; + $_SESSION['GROUPS_ID'] = null; + $_SESSION['USERNAME'] = null; + $_SESSION['PAGE_PERMISSIONS'] = null; + $_SESSION['SYSTEM_PERMISSIONS'] = null; + // overwrite session array + $_SESSION = array(); + // delete session cookie if set + if (isset($_COOKIE[session_name()]) && !headers_sent()) { + setcookie(session_name(), '', time() - 42000, '/'); + } + // delete the session itself + session_destroy(); + status_msg('

You have to login as System-Adminstrator start ' + .'upgrade-script.php again!

', + 'info', 'div'); + echo '

'; + if(defined('ADMIN_URL')) { + echo '
' + .' ' + .'
'; + } + echo '

' + .'' + .'' + .'' + .''; exit(); } @@ -399,12 +404,15 @@
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 "

- - - - "; + 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 '

' + .'' + .'' + .'' + .''; exit(); } @@ -411,41 +419,42 @@ /********************************************************** * - check tables coming with WebsiteBaker */ - $aMissingTables = UpgradeHelper::existsAllTables($aPackage); + $aMissingTables = UpgradeHelper::getMissingTables($aPackage); if( sizeof($aMissingTables) == 0){ - echo '

NOTICE: '.sizeof($aPackage).' total tables included in package are successfully installed into your database `'.$database->DbName.'` '.$OK.'

'; + echo '

NOTICE: '.sizeof($aPackage).' total tables ' + .'included in package are successfully installed into your database `' + .$database->DbName.'` '.$OK.'

'; } else { 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 'First rename or delete the upgrade-script.php, so the script can\'t start automatically by backend
'; - echo 'After installing missing tables upload and run again upgrade-script.php

'; - echo '

'; - echo 'Missing required tables.

'; - echo 'TABLE `'.implode('` missing! '.$FAIL.'
TABLE `',$aMissingTables).'` missing! '.$FAIL; - echo '

'; - echo '

'; + echo '

Missing required tables. You can install them in backend->addons->modules.
' + .'Or if you uploaded per FTP install possible by backend->addons->modules->advanced.
' + .'First rename or delete the upgrade-script.php, so the script can\'t start automatically by backend
' + .'After installing missing tables upload and run again upgrade-script.php

' + .'

' + .'Missing required tables.

' + .'TABLE `'.implode('` missing! '.$FAIL.'
TABLE `',$aMissingTables).'` missing! '.$FAIL + .'

' + .'

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

- - - - "; - + echo '

' + .'' + .'' + .'' + .''; exit(); } -echo '

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

'; -$aDebugMessage = array(); + echo '

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

'; + $aDebugMessage = array(); /********************************************************** * - Adding field default_theme to settings table */ @@ -458,11 +467,11 @@ $aDebugMessage[] = (db_update_key_value( 'settings', $cfg ) ? " $OK
" : " $FAIL!
"); $aDebugMessage[] = ''; -if($bDebugModus) { - echo implode(PHP_EOL,$aDebugMessage); -} -$aDebugMessage = array(); -echo'

Step '.(++$stepID).': Updating core table included in package

'; + if($bDebugModus) { + echo implode(PHP_EOL,$aDebugMessage); + } + $aDebugMessage = array(); + echo'

Step '.(++$stepID).': Updating core table included in package

'; /********************************************************** * - Adding field sec_anchor to settings table */ Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1964) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1965) @@ -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', '1964'); +if(!defined('REVISION')) define('REVISION', '1965'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/UpgradeHelper.php =================================================================== --- branches/2.8.x/wb/framework/UpgradeHelper.php (revision 1964) +++ branches/2.8.x/wb/framework/UpgradeHelper.php (revision 1965) @@ -36,10 +36,11 @@ /** * Compare available tables against a list of tables - * @param array list of needed table names without TablePrefix + * @param array list of needed table names without TablePrefix * @return array list of missing tables + * @description this method is the replaement for self::existsAllTables() */ - public static function existsAllTables(array $aTablesList) + public static function getMissingTables(array $aTablesList) { $aTablesList = array_flip($aTablesList); $oDb = WbDatabase::getInstance(); @@ -54,6 +55,15 @@ } return array_flip($aTablesList); } +/** + * Alias for self::getMissingTables() + * @param array list of needed table names without TablePrefix + * @return array list of missing tables + */ + public static function existsAllTables(array $aTablesList) + { + return self::getMissingTables($aTablesList); + } } // end of class UpgradeHelper