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

- set version to 0.9.13.1 (support-ticket-system bugfix)

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-10-01 06:10:45 +00:00
parent 1f9caedc16
commit a86140cec0
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql
View File

@@ -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 (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 (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 (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 (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 (24, 'login', 'maxloginattempts', '3');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');

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

@@ -1075,7 +1075,7 @@ if(isFroxlorVersion('0.9.13-svn1'))
if(isFroxlorVersion('0.9.13')) 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; $update_defaultini_ownvhost = isset($_POST['update_defaultini_ownvhost']) ? (int)$_POST['update_defaultini_ownvhost'] : 1;
@@ -1083,5 +1083,16 @@ if(isFroxlorVersion('0.9.13'))
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mod_fcgid_defaultini_ownvhost', '".(int)$update_defaultini_ownvhost."');"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mod_fcgid_defaultini_ownvhost', '".(int)$update_defaultini_ownvhost."');");
lastStepStatus(0); 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');
} }

2
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -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) if((int)$settings['system']['mod_fcgid_ownvhost'] == 1)
{ {

2
lib/tables.inc.php
View File

@@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO // VERSION INFO
$version = '0.9.14-svn1'; $version = '0.9.13.1';
$dbversion = '2'; $dbversion = '2';
$branding = ''; $branding = '';