diff --git a/actions/admin/settings/120.system.php b/actions/admin/settings/120.system.php index 13030e6d..0f332b6e 100644 --- a/actions/admin/settings/120.system.php +++ b/actions/admin/settings/120.system.php @@ -101,18 +101,6 @@ return array( 'default' => true, 'save_method' => 'storeSettingField', ), - 'system_httpuser' => array( - 'settinggroup' => 'system', - 'varname' => 'httpuser', - 'type' => 'hidden', - 'default' => 'www-data', - ), - 'system_httpgroup' => array( - 'settinggroup' => 'system', - 'varname' => 'httpgroup', - 'type' => 'hidden', - 'default' => 'www-data', - ), 'system_debug_cron' => array( 'label' => $lng['serversettings']['cron']['debug'], 'settinggroup' => 'system', diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php index 91d48eaa..867fbf63 100644 --- a/actions/admin/settings/130.webserver.php +++ b/actions/admin/settings/130.webserver.php @@ -33,6 +33,20 @@ return array( 'save_method' => 'storeSettingField', 'overview_option' => true ), + 'system_httpuser' => array( + 'settinggroup' => 'system', + 'varname' => 'httpuser', + 'type' => 'string', + 'default' => 'www-data', + 'save_method' => 'storeSettingField', + ), + 'system_httpgroup' => array( + 'settinggroup' => 'system', + 'varname' => 'httpgroup', + 'type' => 'string', + 'default' => 'www-data', + 'save_method' => 'storeSettingField', + ), 'system_apacheconf_vhost' => array( 'label' => $lng['serversettings']['apacheconf_vhost'], 'settinggroup' => 'system', diff --git a/install/froxlor.sql b/install/froxlor.sql index e7e90cc6..0db4e29c 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.10-svn1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.10-svn2'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index a2248bd3..89b04294 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -834,4 +834,27 @@ 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'); +} diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 607f864e..9e46956f 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -158,4 +158,31 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) $question.= makeyesno('update_defdns_mailentry', '1', '0', '0'); eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } + + if(versionInUpdate($current_version, '0.9.10-svn2')) + { + $has_preconfig = true; + + $guessed_user = 'www-data'; + $guessed_group = 'www-data'; + + if(function_exists('posix_getuid') + && function_exists('posix_getpwuid') + ) { + $_httpuser = posix_getpwuid(posix_getuid()); + $guessed_user = $_httpuser['name']; + } + + if(function_exists('posix_getgid') + && function_exists('posix_getgrgid') + ) { + $_httpgroup = posix_getgrgid(posix_getgid()); + $guessed_group = $_httpgroup['name']; + } + + $description = 'Please enter the correct username/groupname of the webserver on your system We\'re guessing the user but it might not be correct, so please check.'; + $question = 'Please enter the webservers username: 

'; + $question = 'Please enter the webservers groupname: '; + eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + } } diff --git a/lib/classes/aps/class.ApsInstaller.php b/lib/classes/aps/class.ApsInstaller.php index e9536cc2..8afc51c5 100644 --- a/lib/classes/aps/class.ApsInstaller.php +++ b/lib/classes/aps/class.ApsInstaller.php @@ -259,6 +259,20 @@ class ApsInstaller extends ApsParser $this->db->query('DELETE FROM `' . TABLE_APS_TASKS . '` WHERE `Task` = ' . TASK_REMOVE . ' AND `InstanceID` = ' . $this->db->escape($Row['InstanceID'])); $this->db->query('DELETE FROM `' . TABLE_APS_INSTANCES . '` WHERE `ID` = ' . $this->db->escape($Row['InstanceID'])); $this->db->query('DELETE FROM `' . TABLE_APS_SETTINGS . '` WHERE `InstanceID` = ' . $this->db->escape($Row['InstanceID'])); + + + // decrease customer-counter + /* + * @TODO this is for 0.9.11 or so + * + $aps_userinfo = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid` = '" . (int)$Row['CustomerID'] . "'"); + if($aps_userinfo['mysqls_used'] == '1') + { + $resetaccnumber = " , `mysql_lastaccountnumber`='0' "; + } + + $result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`-1 ' . $resetaccnumber . 'WHERE `customerid`="' . (int)$Row['CustomerID'] . '"'); + */ } } diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 140d0bfd..7b5b732f 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.10-svn1'; +$version = '0.9.10-svn2'; $dbversion = '2'; $branding = '';