Index: branches/2.8.x/INSTALL =================================================================== --- branches/2.8.x/INSTALL (revision 1529) +++ branches/2.8.x/INSTALL (revision 1530) @@ -1,15 +1,26 @@ -WebsiteBaker 2.8.2 Installation Instructions -============================================ +WebsiteBaker 2.8.2 SP2 Installation Instructions +================================================= -You can find detailed informations in the INSTALL -file of the needed installer interface. +Step 1 - Preparing your existing webspace: +- Login to your webspace account and create a database. -Short Instruction: +Step 2 - Download WebsiteBaker from http://www.websitebaker2.org/en/download/latest-version.php +- Download "WebsiteBaker 2.8.2 [R1528] including ServicePack 2" +- Unzip the package to your lokal machine +- rename config.php.new to config.php +- change favicon to your own +- upload all files to your Webspace. -1.: create empty database and remember access data -2.: Unzip WB and move it to the Server -3.: Unzip Fix-Packet and move it to the Server !!! very important !!! -4.: chmod directories/files as usual if needed (most with mod-apache running) -5.: rename config.php.new into config.php (never needed with micro-installer) -6.: start installation +Step 3 - Installation: +- call in your Browser www.yourdomainname.com +- follow the Installation Instructions +Step 4 - Installation folder: +- Delete folder install + +Step 5 - Upgrade-script: +- Delete File upgrade-script.php + +Have fun with WB 2.8.2 SP2 + + Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1529) +++ branches/2.8.x/CHANGELOG (revision 1530) @@ -11,6 +11,11 @@ ! = Update/Change =========================== add small Features 2.8.2 ========================== +27 Nov-2011 Build 1530 Dietmar Woellbrink (Luisehahne) +! update templates allcss and round (Tks to Rübenwurzel) ++ Add UPGRADE Instructions +! Update INSTALL Instructions +! Optimize config.php handling for installation 25 Nov-2011 Build 1529 Dietmar Woellbrink (Luisehahne) + add new backend theme handling (Tks to Stefek) ----------------------------------- Fixes 2.8.2 -------------------------------- Index: branches/2.8.x/UPGRADE =================================================================== --- branches/2.8.x/UPGRADE (nonexistent) +++ branches/2.8.x/UPGRADE (revision 1530) @@ -0,0 +1,44 @@ +WebsiteBaker 2.8.2 SP2 UPGRADE Instructions +================================================= + +Upgrade from WB 2.8.0 to WB 2.8.2 SP2 +Upgrade from WB 2.8.1 to WB 2.8.2 SP2 +- need full package "WebsiteBaker 2.8.2 [R1528] including ServicePack 2" + +Upgrade from WB 2.8.2 to WB 2.8.2 SP2 +- download "ServicePack 2 for WebsiteBaker 2.8.2 all fixes" + +Download WebsiteBaker from http://www.websitebaker2.org/en/download/latest-version.php + +Step 1 - Preparing your existing system: +- Login to your backend and set "Settings" - "Backend-Theme" to "wb_theme" and don't forget to store. +- Backup your changed Files in modules and templates folder like .css, .js, wb_config.js for the Editor + +Step 2 - Download Instructions +- Download "WebsiteBaker 2.8.2 [R1528] including ServicePack 2" +- If you already installed WB 2.8.2 + Download "ServicePack 2 for WebsiteBaker 2.8.2 all fixes" + +Step 3 - upgrading +- Unzip the packages to your lokal machine +- upload all files to your Webspace. +- Be shure that existing files are overwritten. + +Step 4 - Cleanup Files and Folders on your Webspace: +- Delete File admin/preferences/details.php +- Delete File admin/preferences/email.php +- Delete File admin/preferences/password.php +- Delete Folder modules/backup +- Delete Folder modules/droplets/js +- Delete Folder templates/classic_theme + +Step 5 - Upgrade the database: +- call in your Browser www.yourdomainname. com/upgrade-script.php + +Step 6 - Delete the upgrade-script: +- Delete File upgrade-script.php + +Step 7 - Delete the config.php.new: +- to solve the problem with overwritten config.php by upgrade to 2.8.2 we upload a config.php.new. + +Have fun with WB 2.8.2 SP2 Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1529) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1530) @@ -52,4 +52,4 @@ // 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', '1529'); +if(!defined('REVISION')) define('REVISION', '1530'); Index: branches/2.8.x/wb/templates/allcss/template.css =================================================================== --- branches/2.8.x/wb/templates/allcss/template.css (revision 1529) +++ branches/2.8.x/wb/templates/allcss/template.css (revision 1530) @@ -130,14 +130,14 @@ display: block; padding: 2px; } -.menu_default a:link, .menu_default a:visited, .menu_default a:active { +.menu-default a:link, .menu-default a:visited, .menu-default a:active { border-bottom: 1px dashed #999; } -.menu_default a:hover { +.menu-default a:hover { border-bottom: 1px dashed #333; } -.menu_current { +.menu-current { border-bottom: 1px dashed #999; font-weight:bold; } Index: branches/2.8.x/wb/templates/allcss/index.php =================================================================== --- branches/2.8.x/wb/templates/allcss/index.php (revision 1529) +++ branches/2.8.x/wb/templates/allcss/index.php (revision 1530) @@ -79,13 +79,12 @@
- -[ac][menu_title]','',''); // CODE FOR WEBSITE BAKER FRONTEND LOGIN if (FRONTEND_LOGIN == 'enabled' && VISIBILITY != 'private' && $wb->get_session('USER_ID') == '') { - $redirect_url = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : WB_URL ); - $redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url ); -?> + $redirect_url = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : WB_URL ); + $redirect_url = (isset($thisApp->redirect_url) ? $thisApp->redirect_url : $redirect_url );?>
Index: branches/2.8.x/wb/templates/round/template.css =================================================================== --- branches/2.8.x/wb/templates/round/template.css (revision 1529) +++ branches/2.8.x/wb/templates/round/template.css (revision 1530) @@ -99,7 +99,7 @@ background-color: #369; text-decoration: none; } -.menu_current { +.menu-current { font-weight: bold; } .highlight { Index: branches/2.8.x/wb/templates/round/index.php =================================================================== --- branches/2.8.x/wb/templates/round/index.php (revision 1529) +++ branches/2.8.x/wb/templates/round/index.php (revision 1530) @@ -78,7 +78,7 @@ - + [ac][menu_title]','','');?> Index: branches/2.8.x/wb/install/index.php =================================================================== --- branches/2.8.x/wb/install/index.php (revision 1529) +++ branches/2.8.x/wb/install/index.php (revision 1530) @@ -21,12 +21,13 @@ session_start(); define('SESSION_STARTED', true); } - $mod_path = dirname(str_replace('\\', '/', __FILE__)); - $doc_root = rtrim(str_replace('\\', '/',$_SERVER['DOCUMENT_ROOT']),'/'); - $mod_name = basename($mod_path); - $wb_path = dirname(dirname(str_replace('\\', '/', __FILE__))); - $wb_root = str_replace($doc_root,'',$wb_path); +$mod_path = dirname(str_replace('\\', '/', __FILE__)); +$doc_root = rtrim(str_replace('\\', '/',$_SERVER['DOCUMENT_ROOT']),'/'); +$mod_name = basename($mod_path); +$wb_path = dirname(dirname(str_replace('\\', '/', __FILE__))); +$wb_root = str_replace(realpath($doc_root),'',$wb_path); + // Function to highlight input fields which contain wrong/missing data function field_error($field_name='') { if(!defined('SESSION_STARTED') || $field_name == '') return; @@ -89,7 +90,6 @@ document.getElementById('file_perms_box').style.display = 'none'; } } - @@ -189,29 +189,28 @@ Writeable'; -$configFile = '/config.php'; -if(!isset($_SESSION['config_rename'])) { - if( ( file_exists($wb_path.$configFile)==false ) && (file_exists($wb_path.'/config.php.new')==true ) ){ - if( (is_writeable($wb_path.'/config.php.new')==true) && (rename($wb_path.'/config.php.new',$wb_path.'/config.php')) ) { - $config = 'Writeable'; - $_SESSION['config_rename'] = true; - } else { - $installFlag = false; + $config = 'Writeable'; + $configFile = '/config.php'; + if(!isset($_SESSION['config_rename']) ) { + + if( (file_exists($wb_path.$configFile)==true)) { + if ( filesize($wb_path.$configFile) > 128) { + $installFlag = false; + $config = 'Not empty!!?'; + } elseif( is_writeable($wb_path.$configFile)==true ) { + $config = 'isWriteable'; + $_SESSION['config_rename'] = true; + } + } elseif((file_exists($wb_path.'/config.php.new')==true)) { $configFile = '/config.php.new'; - $config = 'Unwriteable'; - } - } elseif( (file_exists($wb_path.'/config.php.new')==true) && ( file_exists($wb_path.$configFile)==true ) ) { - if( (file_exists($wb_path.$configFile)==true) ) { $installFlag = false; - $config = 'Already installed?'; + $config = 'Please rename'; + } else { + $installFlag = false; + $config = 'Missing!!?'; } - } elseif( (is_writeable($wb_path.'/config.php.new')==false) ) { - $installFlag = false; - $configFile = '/config.php.new'; - $config = 'Unwriteable'; + } -} ?>