diff --git a/install/froxlor.sql b/install/froxlor.sql index e8f28bf1..7de4f634 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -460,7 +460,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.14-svn1'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.13.1'); 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 9af63ca4..a66c4c05 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1075,13 +1075,24 @@ if(isFroxlorVersion('0.9.13-svn1')) if(isFroxlorVersion('0.9.13')) { - showUpdateStep("Updating from 0.9.13 to 0.9.14-svn1", false); - + showUpdateStep("Updating from 0.9.13 to 0.9.13.1 final", false); + $update_defaultini_ownvhost = isset($_POST['update_defaultini_ownvhost']) ? (int)$_POST['update_defaultini_ownvhost'] : 1; showUpdateStep("Adding settings for Froxlor-vhost's PHP-configuration"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mod_fcgid_defaultini_ownvhost', '".(int)$update_defaultini_ownvhost."');"); lastStepStatus(0); - updateToVersion('0.9.14-svn1'); + updateToVersion('0.9.13.1'); +} + +/** + * be compatible with the few who already use 0.9.14-svn1 + */ +if(isFroxlorVersion('0.9.14-svn1')) +{ + showUpdateStep("Resetting version 0.9.14-svn1 to 0.9.13.1"); + lastStepStatus(0); + + updateToVersion('0.9.13.1'); } 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 5f5a71d1..179f094b 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -292,7 +292,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) } } - if(versionInUpdate($current_version, '0.9.14-svn1')) + if(versionInUpdate($current_version, '0.9.13.1')) { if((int)$settings['system']['mod_fcgid_ownvhost'] == 1) { diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 1142e628..99d7b1cf 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.14-svn1'; +$version = '0.9.13.1'; $dbversion = '2'; $branding = '';