maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

bugfixing interactive update;

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-01-26 10:12:10 +00:00
parent 3610c4aa23
commit 1fa0a76309
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/updates/froxlor/upgrade_syscp.inc.php
View File

@@ -22,7 +22,7 @@ showUpdateStep("Upgrading SysCP ".$settings['panel']['version']." to Froxlor ".
updateToVersion($updateto); updateToVersion($updateto);
// add field frontend // 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; $settings['panel']['frontend'] = $frontend;
?> ?>

12
install/updatesql.php
View File

@@ -23,8 +23,7 @@ $updatelog = FroxlorLogger::getInstanceOf(array('loginname' => 'updater'), $db,
* since froxlor, we have to check if there's still someone * since froxlor, we have to check if there's still someone
* out there using syscp and needs to upgrade * out there using syscp and needs to upgrade
*/ */
if(!isset($settings['panel']['frontend']) if(!isFroxlor())
|| $settings['panel']['frontend'] != 'froxlor')
{ {
/** /**
* First case: We are updating from a version < 1.0.10 * 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 * when we reach this part, all necessary updates
* should have been installes automatically by the * should have been installes automatically by the
* update scripts. * 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')); include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/upgrade_syscp.inc.php'));
} }
else
if(isFroxlor())
{ {
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'));
}
} }
?> ?>

2
lib/functions/froxlor/function.updateFunctions.php
View File

@@ -162,7 +162,7 @@ function lastStepStatus($status = -1)
break; break;
} }
// output // 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) if($status == -1)
{ {