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

- only ask for httpgroup/httpuser if not set before

Browse Source 
- version decrease back to 0.9.10-svn1 (the two update-procedures have to be executed at the same update-level)
This commit is contained in:
Michael Kaufmann (d00p)
2010-06-16 12:18:14 +00:00
parent 9a41d35f98
commit 1557e5b7a3
4 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -802,22 +802,25 @@ if(isFroxlorVersion('0.9.9'))
showUpdateStep("Checking whether you are missing any settings", false);
$nonefound = true;
$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
if(!isset($result) || !isset($result['value']))
$update_httpuser = isset($_POST['update_httpuser']) ? $_POST['update_httpuser'] : false;
$update_httpgroup = isset($_POST['update_httpgroup']) ? $_POST['update_httpgroup'] : false;
if($update_httpuser !== false)
{
$nonefound = false;
showUpdateStep("Adding missing setting 'httpuser'");
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpuser', 'www-data');");
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpuser', '".$update_httpuser."');");
lastStepStatus(0);
}
$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
if(!isset($result) || !isset($result['value']))
if($update_httpgroup !== false)
{
$nonefound = false;
showUpdateStep("Adding missing setting 'httpgroup'");
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpgroup', 'www-data');");
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpgroup', '".$update_httpgroup."');");
lastStepStatus(0);
}
$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'debug_cron'");
if(!isset($result) || !isset($result['value']))
{
@@ -834,27 +837,3 @@ if(isFroxlorVersion('0.9.9'))
updateToVersion('0.9.10-svn1');
}
if(isFroxlorVersion('0.9.10-svn1'))
{
showUpdateStep("Updating from 0.9.10-svn1 to 0.9.10-svn2", false);
$update_httpuser = isset($_POST['update_httpuser']) ? $_POST['update_httpuser'] : false;
$update_httpgroup = isset($_POST['update_httpgroup']) ? $_POST['update_httpgroup'] : false;
if($update_httpuser !== false)
{
showUpdateStep("Setting httpuser to '".$update_httpuser."'");
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='".$update_httpuser."' WHERE `settinggroup` = 'system' AND `varname` = 'httpuser'");
lastStepStatus(0);
}
if($update_httpgroup !== false)
{
showUpdateStep("Setting httpgroup to '".$update_httpgroup."'");
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='".$update_httpgroup."' WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
lastStepStatus(0);
}
updateToVersion('0.9.10-svn2');
}