From c28a0291d759937dfe702cc494e840e8f30c2c84 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 3 May 2010 12:08:45 +0000 Subject: [PATCH] - setting version to 0.9.6 --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 7 +++++++ lib/tables.inc.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index aa43dac8..069c8522 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.6-svn6'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.6'); 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 8f59be45..7ba2ae9e 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -654,4 +654,11 @@ if(isFroxlorVersion('0.9.6-svn5')) updateToVersion('0.9.6-svn6'); } +if(isFroxlorVersion('0.9.6-svn6')) +{ + showUpdateStep("Updating from 0.9.6-svn6 to 0.9.6 final"); + lastStepStatus(0); + updateToVersion('0.9.6'); +} + ?> diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 6df46241..ba751de2 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -70,7 +70,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.6-svn6'; +$version = '0.9.6'; $dbversion = '2'; $branding = '';