Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1396)
+++ branches/2.8.x/CHANGELOG	(revision 1397)
@@ -11,6 +11,10 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 -------------------------------------
+20 Jan-2011 Build 1397 Dietmar Woellbrink (Luisehahne)
+! recoded rediect timer in print_success (tks to Chio)
+19 Jan-2011 Build 1396 Werner von den Decken (DarkViper)
+! remove header redirect and add a die message 
 17 Jan-2011 Build 1395 Frank Heyne (FrankH)
 # Security fix in admin/addons
 16 Jan-2011 Build 1394 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/start/index.php
===================================================================
--- branches/2.8.x/wb/admin/start/index.php	(revision 1396)
+++ branches/2.8.x/wb/admin/start/index.php	(revision 1397)
@@ -1,139 +1,139 @@
-<?php
-/**
- *
- * @category        admin
- * @package         start
- * @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
- * @platform        WebsiteBaker 2.8.x
- * @requirements    PHP 5.2.2 and higher
- * @version         $Id$
- * @filesource		$HeadURL$
- * @lastmodified    $Date$
- *
-*/
-
-require('../../config.php');
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Start','start');
-
-// Setup template object
-$template = new Template(THEME_PATH.'/templates');
-$template->set_file('page', 'start.htt');
-$template->set_block('page', 'main_block', 'main');
-
-// Insert values into the template object
-$template->set_var(array(
-								'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'],
-								'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'],
-								'DISPLAY_NAME' => $admin->get_display_name(),
-								'ADMIN_URL' => ADMIN_URL,
-								'WB_URL' => WB_URL,
-								'THEME_URL' => THEME_URL,
-								'WB_VERSION' => WB_VERSION
-								)
-						);
-
-// Insert permission values into the template object
-if($admin->get_permission('pages') != true)
-{
-	$template->set_var('DISPLAY_PAGES', 'display:none;');
-}
-if($admin->get_permission('media') != true)
-{
-	$template->set_var('DISPLAY_MEDIA', 'display:none;');
-}
-if($admin->get_permission('addons') != true)
-{
-	$template->set_var('DISPLAY_ADDONS', 'display:none;');
-}
-if($admin->get_permission('access') != true)
-{
-	$template->set_var('DISPLAY_ACCESS', 'display:none;');
-}
-if($admin->get_permission('settings') != true)
-{
-	$template->set_var('DISPLAY_SETTINGS', 'display:none;');
-}
-if($admin->get_permission('admintools') != true)
-{
-	$template->set_var('DISPLAY_ADMINTOOLS', 'display:none;');
-}
-
-// Check if installation directory still exists
-if(file_exists(WB_PATH.'/install/')) {
-	// Check if user is part of Adminstrators group
-	if(in_array(1, $admin->get_groups_id()))
-    {
-		$template->set_var('WARNING', $MESSAGE['START']['INSTALL_DIR_EXISTS']);
-	} else {
-		$template->set_var('DISPLAY_WARNING', 'display:none;');
-	}
-} else {
-	$template->set_var('DISPLAY_WARNING', 'display:none;');
-}
-
-// Insert "Add-ons" section overview (pretty complex compared to normal)
-$addons_overview = $TEXT['MANAGE'].' ';
-$addons_count = 0;
-if($admin->get_permission('modules') == true)
-{
-	$addons_overview .= '<a href="'.ADMIN_URL.'/modules/index.php">'.$MENU['MODULES'].'</a>';
-	$addons_count = 1;
-}
-if($admin->get_permission('templates') == true)
-{
-	if($addons_count == 1) { $addons_overview .= ', '; }
-	$addons_overview .= '<a href="'.ADMIN_URL.'/templates/index.php">'.$MENU['TEMPLATES'].'</a>';
-	$addons_count = 1;
-}
-if($admin->get_permission('languages') == true)
-{
-	if($addons_count == 1) { $addons_overview .= ', '; }
-	$addons_overview .= '<a href="'.ADMIN_URL.'/languages/index.php">'.$MENU['LANGUAGES'].'</a>';
-}
-
-// Insert "Access" section overview (pretty complex compared to normal)
-$access_overview = $TEXT['MANAGE'].' ';
-$access_count = 0;
-if($admin->get_permission('users') == true) {
-	$access_overview .= '<a href="'.ADMIN_URL.'/users/index.php">'.$MENU['USERS'].'</a>';
-	$access_count = 1;
-}
-if($admin->get_permission('groups') == true) {
-	if($access_count == 1) { $access_overview .= ', '; }
-	$access_overview .= '<a href="'.ADMIN_URL.'/groups/index.php">'.$MENU['GROUPS'].'</a>';
-	$access_count = 1;
-}
-
-// Insert section names and descriptions
-$template->set_var(array(
-								'PAGES' => $MENU['PAGES'],
-								'MEDIA' => $MENU['MEDIA'],
-								'ADDONS' => $MENU['ADDONS'],
-								'ACCESS' => $MENU['ACCESS'],
-								'PREFERENCES' => $MENU['PREFERENCES'],
-								'SETTINGS' => $MENU['SETTINGS'],
-								'ADMINTOOLS' => $MENU['ADMINTOOLS'],
-								'HOME_OVERVIEW' => $OVERVIEW['START'],
-								'PAGES_OVERVIEW' => $OVERVIEW['PAGES'],
-								'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'],
-								'ADDONS_OVERVIEW' => $addons_overview,
-								'ACCESS_OVERVIEW' => $access_overview,
-								'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'],
-								'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'],
-								'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS']
-								)
-						);
-
-// Parse template object
-$template->parse('main', 'main_block', false);
-$template->pparse('output', 'page');
-
-// Print admin footer
-$admin->print_footer();
-
+<?php
+/**
+ *
+ * @category        admin
+ * @package         start
+ * @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
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+*/
+
+require('../../config.php');
+require_once(WB_PATH.'/framework/class.admin.php');
+$admin = new admin('Start','start');
+
+// Setup template object
+$template = new Template(THEME_PATH.'/templates');
+$template->set_file('page', 'start.htt');
+$template->set_block('page', 'main_block', 'main');
+
+// Insert values into the template object
+$template->set_var(array(
+								'WELCOME_MESSAGE' => $MESSAGE['START']['WELCOME_MESSAGE'],
+								'CURRENT_USER' => $MESSAGE['START']['CURRENT_USER'],
+								'DISPLAY_NAME' => $admin->get_display_name(),
+								'ADMIN_URL' => ADMIN_URL,
+								'WB_URL' => WB_URL,
+								'THEME_URL' => THEME_URL,
+								'WB_VERSION' => WB_VERSION
+								)
+						);
+
+// Insert permission values into the template object
+if($admin->get_permission('pages') != true)
+{
+	$template->set_var('DISPLAY_PAGES', 'display:none;');
+}
+if($admin->get_permission('media') != true)
+{
+	$template->set_var('DISPLAY_MEDIA', 'display:none;');
+}
+if($admin->get_permission('addons') != true)
+{
+	$template->set_var('DISPLAY_ADDONS', 'display:none;');
+}
+if($admin->get_permission('access') != true)
+{
+	$template->set_var('DISPLAY_ACCESS', 'display:none;');
+}
+if($admin->get_permission('settings') != true)
+{
+	$template->set_var('DISPLAY_SETTINGS', 'display:none;');
+}
+if($admin->get_permission('admintools') != true)
+{
+	$template->set_var('DISPLAY_ADMINTOOLS', 'display:none;');
+}
+
+// Check if installation directory still exists
+if(file_exists(WB_PATH.'/install/')) {
+	// Check if user is part of Adminstrators group
+	if(in_array(1, $admin->get_groups_id()))
+    {
+		$template->set_var('WARNING', $MESSAGE['START']['INSTALL_DIR_EXISTS'].'<br />'.'upgrade-script.php '.$TEXT['DELETE']);
+	} else {
+		$template->set_var('DISPLAY_WARNING', 'display:none;');
+	}
+} else {
+	$template->set_var('DISPLAY_WARNING', 'display:none;');
+}
+
+// Insert "Add-ons" section overview (pretty complex compared to normal)
+$addons_overview = $TEXT['MANAGE'].' ';
+$addons_count = 0;
+if($admin->get_permission('modules') == true)
+{
+	$addons_overview .= '<a href="'.ADMIN_URL.'/modules/index.php">'.$MENU['MODULES'].'</a>';
+	$addons_count = 1;
+}
+if($admin->get_permission('templates') == true)
+{
+	if($addons_count == 1) { $addons_overview .= ', '; }
+	$addons_overview .= '<a href="'.ADMIN_URL.'/templates/index.php">'.$MENU['TEMPLATES'].'</a>';
+	$addons_count = 1;
+}
+if($admin->get_permission('languages') == true)
+{
+	if($addons_count == 1) { $addons_overview .= ', '; }
+	$addons_overview .= '<a href="'.ADMIN_URL.'/languages/index.php">'.$MENU['LANGUAGES'].'</a>';
+}
+
+// Insert "Access" section overview (pretty complex compared to normal)
+$access_overview = $TEXT['MANAGE'].' ';
+$access_count = 0;
+if($admin->get_permission('users') == true) {
+	$access_overview .= '<a href="'.ADMIN_URL.'/users/index.php">'.$MENU['USERS'].'</a>';
+	$access_count = 1;
+}
+if($admin->get_permission('groups') == true) {
+	if($access_count == 1) { $access_overview .= ', '; }
+	$access_overview .= '<a href="'.ADMIN_URL.'/groups/index.php">'.$MENU['GROUPS'].'</a>';
+	$access_count = 1;
+}
+
+// Insert section names and descriptions
+$template->set_var(array(
+								'PAGES' => $MENU['PAGES'],
+								'MEDIA' => $MENU['MEDIA'],
+								'ADDONS' => $MENU['ADDONS'],
+								'ACCESS' => $MENU['ACCESS'],
+								'PREFERENCES' => $MENU['PREFERENCES'],
+								'SETTINGS' => $MENU['SETTINGS'],
+								'ADMINTOOLS' => $MENU['ADMINTOOLS'],
+								'HOME_OVERVIEW' => $OVERVIEW['START'],
+								'PAGES_OVERVIEW' => $OVERVIEW['PAGES'],
+								'MEDIA_OVERVIEW' => $OVERVIEW['MEDIA'],
+								'ADDONS_OVERVIEW' => $addons_overview,
+								'ACCESS_OVERVIEW' => $access_overview,
+								'PREFERENCES_OVERVIEW' => $OVERVIEW['PREFERENCES'],
+								'SETTINGS_OVERVIEW' => $OVERVIEW['SETTINGS'],
+								'ADMINTOOLS_OVERVIEW' => $OVERVIEW['ADMINTOOLS']
+								)
+						);
+
+// Parse template object
+$template->parse('main', 'main_block', false);
+$template->pparse('output', 'page');
+
+// Print admin footer
+$admin->print_footer();
+
 ?>
\ 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 1396)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1397)
@@ -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.RC5');
-if(!defined('REVISION')) define('REVISION', '1395');
+if(!defined('REVISION')) define('REVISION', '1397');
 
 ?>
Index: branches/2.8.x/wb/framework/class.wb.php
===================================================================
--- branches/2.8.x/wb/framework/class.wb.php	(revision 1396)
+++ branches/2.8.x/wb/framework/class.wb.php	(revision 1397)
@@ -352,7 +352,7 @@
 	function print_success( $message, $redirect = 'index.php' ) {
 	    global $TEXT;
 	    // fetch redirect timer for sucess messages from settings table
-	    $redirect_timer = ((defined( 'REDIRECT_TIMER' )) && (REDIRECT_TIMER >= 1500)) ? REDIRECT_TIMER : 0;
+	    $redirect_timer = ((defined( 'REDIRECT_TIMER' )) && (REDIRECT_TIMER <= 10000)) ? REDIRECT_TIMER : 0;
 	    // add template variables
 	    $tpl = new Template( THEME_PATH.'/templates' );
 	    $tpl->set_file( 'page', 'success.htt' );
@@ -363,7 +363,7 @@
 	    $tpl->set_var( 'REDIRECT_TIMER', $redirect_timer );
 	    $tpl->set_var( 'NEXT', $TEXT['NEXT'] );
 	    $tpl->set_var( 'BACK', $TEXT['BACK'] );
-	    if ($redirect_timer == 0) {
+	    if ($redirect_timer == -1) {
 	        $tpl->set_block( 'show_redirect', '' );
 	    }
 	    else {