diff --git a/install/froxlor.sql b/install/froxlor.sql index e73646f5..e7e90cc6 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.9'); +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 (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 30534aec..d5630a4a 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -795,4 +795,39 @@ if(isFroxlorVersion('0.9.9-svn1')) updateToVersion('0.9.9'); } +if(isFroxlorVersion('0.9.9')) +{ + showUpdateStep("Updating from 0.9.9 to 0.9.10-svn1", false); + + showUpdateStep("Checking whether you are missing any settings", false); + $nonefound = true; + if(!isset($settings['system']['httpuser'])) + { + $nonefound = false; + showUpdateStep("Adding missing setting 'httpuser'"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpuser', 'www-data');"); + lastStepStatus(0); + } + if(!isset($settings['system']['httpgroup'])) + { + $nonefound = false; + showUpdateStep("Adding missing setting 'httpgroup'"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'httpgroup', 'www-data');"); + lastStepStatus(0); + } + if(!isset($settings['system']['debug_cron'])) + { + $nonefound = false; + showUpdateStep("Adding missing setting 'debug_cron'"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'debug_cron', '0');"); + lastStepStatus(0); + } + + if($nonefound) { + showUpdateStep("No missing settings found"); + lastStepStatus(0); + } + + updateToVersion('0.9.10-svn1'); +} ?> diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 58729288..140d0bfd 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.9'; +$version = '0.9.10-svn1'; $dbversion = '2'; $branding = '';