From 1fa0a763093a8d1e420551c02fe6363f059a871c Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 26 Jan 2010 10:12:10 +0000
Subject: [PATCH] bugfixing interactive update;

---
 install/updates/froxlor/upgrade_syscp.inc.php      |  2 +-
 install/updatesql.php                              | 14 +++-----------
 lib/functions/froxlor/function.updateFunctions.php |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/install/updates/froxlor/upgrade_syscp.inc.php b/install/updates/froxlor/upgrade_syscp.inc.php
index 48dc4705..13278c37 100644
--- a/install/updates/froxlor/upgrade_syscp.inc.php
+++ b/install/updates/froxlor/upgrade_syscp.inc.php
@@ -22,7 +22,7 @@ showUpdateStep("Upgrading SysCP ".$settings['panel']['version']." to Froxlor ".
 updateToVersion($updateto);
 
 // add field frontend
-$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system','frontend','".$frontend."')");
+$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','frontend','".$frontend."')");
 $settings['panel']['frontend'] = $frontend;
 
 ?>
diff --git a/install/updatesql.php b/install/updatesql.php
index 342c79ee..e361b29c 100644
--- a/install/updatesql.php
+++ b/install/updatesql.php
@@ -23,8 +23,7 @@ $updatelog = FroxlorLogger::getInstanceOf(array('loginname' => 'updater'), $db,
  * since froxlor, we have to check if there's still someone
  * out there using syscp and needs to upgrade
  */
-if(!isset($settings['panel']['frontend'])
-  || $settings['panel']['frontend'] != 'froxlor')
+if(!isFroxlor())
 {
 	/**
 	 * First case: We are updating from a version < 1.0.10
@@ -83,20 +82,13 @@ if(!isset($settings['panel']['frontend'])
 	 * when we reach this part, all necessary updates
 	 * should have been installes automatically by the
 	 * update scripts.
-	 * 
-	 * From now on, these update-scripts will not
-	 * do their work on their own...they will ask!
 	 */
 	include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/upgrade_syscp.inc.php'));
 
 }
-
-if(isFroxlor())
+else
 {
-	if(isFroxlorVersion('0.9-r0'))
-	{
-		include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.9/update_0.9.inc.php'));
-	}
+	include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.9/update_0.9.inc.php'));
 }
 
 ?>
diff --git a/lib/functions/froxlor/function.updateFunctions.php b/lib/functions/froxlor/function.updateFunctions.php
index 177afc6f..2c74dd8d 100644
--- a/lib/functions/froxlor/function.updateFunctions.php
+++ b/lib/functions/froxlor/function.updateFunctions.php
@@ -162,7 +162,7 @@ function lastStepStatus($status = -1)
 			break;
 	}
 	// output
-	echo "<span style=\"margin-left: 5em; color: #".$status_color."\">".$status_sign."</span>";	
+	echo "<span style=\"margin-left: 5em; font-weight: bold; color: #".$status_color."\">".$status_sign."</span>";	
 	
 	if($status == -1)
 	{