From 7589e7a21b65d1973e11637a49b4cd2d37545c60 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Thu, 4 Jul 2013 19:20:20 +0200
Subject: [PATCH] fix incorrect database-field regarding Maildir setting, fixes
 #1242 ; set version to 0.9.29-rc1

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 install/froxlor.sql                            |  4 ++--
 install/updates/froxlor/0.9/update_0.9.inc.php | 14 +++++++++++++-
 lib/tables.inc.php                             |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/install/froxlor.sql b/install/froxlor.sql
index 76337d89..f286e1b7 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -424,7 +424,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'vmail_uid', '2000'),
 	('system', 'vmail_gid', '2000'),
 	('system', 'vmail_homedir', '/var/customers/mail/'),
-	('system', 'vmail_maildir', 'Maildir'),
+	('system', 'vmail_maildirname', 'Maildir'),
 	('system', 'bind_enable', '1'),
 	('system', 'bindconf_directory', '/etc/bind/'),
 	('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', 'allow_theme_change_admin', '1'),
 	('panel', 'allow_theme_change_customer', '1'),
-	('panel', 'version', '0.9.29-dev4');
+	('panel', 'version', '0.9.29-rc1');
 
 
 
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 c1796c9b..6e441162 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -2114,7 +2114,7 @@ if (isFroxlorVersion('0.9.29-dev3')) {
 	showUpdateStep("Updating from 0.9.29-dev3 to 0.9.29-dev4", true);
 	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` (
 	`id` int(5) NOT NULL auto_increment,
 	`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)."');");
 	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');
+}
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index f8c59f2c..09da1072 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -74,6 +74,6 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.29-dev4';
+$version = '0.9.29-rc1';
 $dbversion = '2';
 $branding = '';