Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2096) +++ branches/2.8.x/CHANGELOG (revision 2097) @@ -11,6 +11,10 @@ ! = Update/Change =============================================================================== +11 Feb-2014 Build 2097 Manuela v.d.Decken(DarkViper) +# droplet >> [[SiteModified]] typo corrected +! upgrade-script.php >> new classes activated and little corrections +! WbAdaptor::getWbConstants() >> PageIconDir added 03 Feb-2014 Build 2096 Manuela v.d.Decken(DarkViper) + Translate::enablePrivateTable() allows to add more private language definitions + Translate::disablePrivateTable() Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 2096) +++ branches/2.8.x/wb/upgrade-script.php (revision 2097) @@ -34,7 +34,6 @@ * @deprecated * @description xyz */ -include_once(dirname(__FILE__).'/framework/UpgradeHelper.php'); // PHP less then 5.3.2 is prohibited --- if (version_compare(PHP_VERSION, '5.3.2', '<')) { $sMsg = '

WebsiteBaker 2.8.4 and above is not able to run with PHP-Version less then 5.3.2!!
' @@ -43,22 +42,22 @@ . 'The very best solution is the use of PHP-5.4 and up

'; die($sMsg); } +// --- load UpgradeHelper --- +if (!class_exists('UpgradeHelper', false)) { + require(__DIR__.'/framework/UpgradeHelper.php'); +} // --- delete fatal disturbing files before upgrade starts ------------------------------- $aPreDeleteFiles = array( // list of files dirname(__FILE__).'/framework/PasswordHash.php' ); -if(sizeof($aPreDeleteFiles > 0)) -{ +$sMsg = ''; +if (sizeof($aPreDeleteFiles > 0)) { // if there are files defined - $sMsg = ''; - foreach($aPreDeleteFiles as $sFileToDelete) - { + foreach ($aPreDeleteFiles as $sFileToDelete) { // iterate the list - if(file_exists($sFileToDelete)) - { - if(!is_writeable($sFileToDelete) || !@unlink($sFileToDelete)) - { + if (file_exists($sFileToDelete)) { + if (!is_writeable($sFileToDelete) || !@unlink($sFileToDelete)) { // notice if deleting fails $sMsg .= 'FAILED deleting: ' . $sFileToDelete.'
'.PHP_EOL; @@ -65,38 +64,52 @@ } } } - if($sMsg) { + if ($sMsg) { // stop script if there's an error occured - $sMsg = $sMsg.'
'.PHP_EOL.'Please delete all of the files above manually!'; - UpgradeHelper::dieWithMessage($sMsg); + $sMsg .= '
'.PHP_EOL.'Please delete all of the files above manually!'; + $sMsg .= '
'.PHP_EOL.'----------------------------------------------'; } } +if ($sMsg) { +// stop script if there's an error occured + $sMsg = $sMsg.'
'.PHP_EOL.'Please delete all of the files above manually!'; + UpgradeHelper::dieWithMessage($sMsg); +} unset($aPreDeleteFiles); $sMsg = ''; // --------------------------------------------------------------------------------------- // Include config file -$config_file = dirname(__FILE__).'/config.php'; +$config_file = __DIR__.'/config.php'; if (is_readable($config_file) && !defined('WB_URL')) { require_once($config_file); } +$oDb = WbDatabase::getInstance(); $oReg = WbAdaptor::getInstance(); -UpgradeHelper::checkSetupFiles(dirname(__FILE__).'/'); - -if (!class_exists('admin', false)) { - include(WB_PATH.'/framework/class.admin.php'); +UpgradeHelper::checkSetupFiles(str_replace('\\', '/', __DIR__).'/'); +// --- set DEFAULT_THEME and restart if needed ------------------------------------------- +if (isset($oReg->DefaultTheme) && $oReg->DefaultTheme != 'WbTheme') { + db_update_key_value('settings', 'default_theme', 'WbTheme'); + $sLocation = 'Location: '.$oReg->AppUrl.filename(__FILE__); + header($sLocation); + exit; } +// --------------------------------------------------------------------------------------- +//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\''; -$sPagesDirectory = WbDatabase::getInstance()->get_one($sql); +$sPagesDirectory = $oDb->getOne($sql); $sTmp = trim($sPagesDirectory, '/'); $sTmpDir = ($sTmp == '' ? '' : '/'.$sTmp); if($sTmp != $sPagesDirectory) { - $sql = 'UPDATE `'.TABLE_PREFIX.'settings` ' - . 'SET `value` = \''.$sTmpDir.'\' ' + $sql = 'UPDATE `'.$oDb->TablePrefix.'settings` ' + . 'SET `value`=\''.$sTmpDir.'\' ' . 'WHERE `name`=\'pages_directory\' '; - WbDatabase::getInstance()->query($sql); + $oDb->doQuery($sql); +// WbDatabase::getInstance()->query($sql); } require_once(WB_PATH.'/framework/functions.php'); // require_once(WB_PATH.'/framework/Database.php'); @@ -1113,15 +1126,13 @@ $iFound = 0; $iLoaded = 0; ////delete templates - //$database->query("DELETE FROM ".TABLE_PREFIX."addons WHERE type = 'template'"); + $oDb->doQuery('DELETE FROM `'.$oDb->TablePrefix.'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') { - $iFound++; $iLoaded = (load_template(WB_PATH.'/templates/'.$file)==true) ? $iLoaded+1 : $iLoaded; - } } closedir($handle); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2096) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2097) @@ -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.4'); -if(!defined('REVISION')) define('REVISION', '2096'); +if(!defined('REVISION')) define('REVISION', '2097'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/WbAdaptor.php =================================================================== --- branches/2.8.x/wb/framework/WbAdaptor.php (revision 2096) +++ branches/2.8.x/wb/framework/WbAdaptor.php (revision 2097) @@ -184,6 +184,11 @@ $sKey = 'DefaultTemplate'; $this->_aSys['Request'][$sKey] = $sVal; break; + case 'TEMPLATE': + $sVal = trim(str_replace('\\', '/', $sVal), '/').'/'; + $sKey = 'Template'; + $this->_aSys['Request'][$sKey] = $sVal; + break; case 'DEFAULT_THEME': $sVal = trim(str_replace('\\', '/', $sVal), '/').'/'; $sKey = 'DefaultTheme'; @@ -211,6 +216,15 @@ $sKey = 'AppServicePack'; $this->_aSys['System'][$sKey] = $sVal; break; + case 'PAGE_ICON_DIR': + $sKey = 'PageIconDir'; + $sVal = trim(str_replace('\\', '/', $sVal), '/').'/'; + if (!isset($this->_aSys['Request']['Template'])) { + $this->_aSys['Request']['Template'] = $this->_aSys['Request']['DefaultTemplate']; + } + $sVal = str_replace('/*/', '/'.$this->_aSys['Request']['Template'], $sVal); + $this->_aSys['System'][$sKey] = $sVal; + break; default: $sVal = ($sVal == 'true' ? true : ($sVal == 'false' ? false : $sVal)); $sKey = str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($sKey)))); Index: branches/2.8.x/wb/modules/droplets/example/SiteModified.php =================================================================== --- branches/2.8.x/wb/modules/droplets/example/SiteModified.php (revision 2096) +++ branches/2.8.x/wb/modules/droplets/example/SiteModified.php (revision 2097) @@ -1,4 +1,3 @@ -