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

fix incorrect database-field regarding Maildir setting, fixes #1242 ; set version to 0.9.29-rc1

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-07-04 19:20:20 +02:00
parent 272de00af2
commit 7589e7a21b
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/froxlor.sql
View File

@@ -424,7 +424,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('system', 'vmail_uid', '2000'), ('system', 'vmail_uid', '2000'),
('system', 'vmail_gid', '2000'), ('system', 'vmail_gid', '2000'),
('system', 'vmail_homedir', '/var/customers/mail/'), ('system', 'vmail_homedir', '/var/customers/mail/'),
('system', 'vmail_maildir', 'Maildir'), ('system', 'vmail_maildirname', 'Maildir'),
('system', 'bind_enable', '1'), ('system', 'bind_enable', '1'),
('system', 'bindconf_directory', '/etc/bind/'), ('system', 'bindconf_directory', '/etc/bind/'),
('system', 'bindreload_command', '/etc/init.d/bind9 reload'), ('system', 'bindreload_command', '/etc/init.d/bind9 reload'),
@@ -540,7 +540,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'phpconfigs_hidestdsubdomain', '0'), ('panel', 'phpconfigs_hidestdsubdomain', '0'),
('panel', 'allow_theme_change_admin', '1'), ('panel', 'allow_theme_change_admin', '1'),
('panel', 'allow_theme_change_customer', '1'), ('panel', 'allow_theme_change_customer', '1'),
('panel', 'version', '0.9.29-dev4'); ('panel', 'version', '0.9.29-rc1');

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

@@ -2114,7 +2114,7 @@ if (isFroxlorVersion('0.9.29-dev3')) {
showUpdateStep("Updating from 0.9.29-dev3 to 0.9.29-dev4", true); showUpdateStep("Updating from 0.9.29-dev3 to 0.9.29-dev4", true);
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Adding new tables to database"); showUpdateStep("Adding new tables to database", true);
$db->query("CREATE TABLE IF NOT EXISTS `domain_ssl_settings` ( $db->query("CREATE TABLE IF NOT EXISTS `domain_ssl_settings` (
`id` int(5) NOT NULL auto_increment, `id` int(5) NOT NULL auto_increment,
`domainid` int(11) NOT NULL, `domainid` int(11) NOT NULL,
@@ -2130,3 +2130,15 @@ if (isFroxlorVersion('0.9.29-dev3')) {
$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'customer_ssl_path', '".$db->escape($system_customersslpath)."');"); $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'customer_ssl_path', '".$db->escape($system_customersslpath)."');");
updateToVersion('0.9.29-dev4'); updateToVersion('0.9.29-dev4');
} }
if (isFroxlorVersion('0.9.29-dev4')) {
showUpdateStep("Updating from 0.9.29-dev4 to 0.9.29-rc1", true);
lastStepStatus(0);
// check for wrong vmail_maildirname database-field-name (bug #1242)
showUpdateStep("correcting Maildir setting database-field-name (if needed).", true);
$db->query("UPDATE `panel_settings` SET `varname` = 'vmail_maildirname' WHERE `settinggroup` = 'system' AND `varname` = 'vmail_maildir'");
lastStepStatus(0);
updateToVersion('0.9.29-rc1');
}

2
lib/tables.inc.php
View File

@@ -74,6 +74,6 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO // VERSION INFO
$version = '0.9.29-dev4'; $version = '0.9.29-rc1';
$dbversion = '2'; $dbversion = '2';
$branding = ''; $branding = '';