From 2ea9a6bffaf037a0aaef0e1efd618239938c0bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster=20=28Dessa=29?= <Dessa@froxlor.org>
Date: Fri, 20 Jan 2012 23:25:43 +0100
Subject: [PATCH] fix the fix in 8dfd27a0dc7bbfc14210f2cc960dad075f7ebfc6,
 fixes #992
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
---
 install/froxlor.sql                           |  3 +-
 .../updates/froxlor/0.9/update_0.9.inc.php    | 52 +++++++++++--------
 lib/tables.inc.php                            |  2 +-
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/install/froxlor.sql b/install/froxlor.sql
index 39f37c8f..8ff2fde1 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -469,7 +469,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bind_enable', '1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.26');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.26-svn1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900');
@@ -628,7 +628,6 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_count', '1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_bigfile', '1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_enabled', '0');
-INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_enabled', '0');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_server', '');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_user', '');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_pass', '');
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 efaeb076..10b7f6bd 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -1640,7 +1640,7 @@ if(isFroxlorVersion('0.9.22-svn1'))
 	showUpdateStep("Updating from 0.9.22-svn1 to 0.9.22-svn2");
 	lastStepStatus(0);
 
-	/* add new settings for diskspacequota - support */
+	/* fix backup_dir for #186 */
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/var/customers/backups/' WHERE `varname` = 'backup_dir';");
 	
 	updateToVersion('0.9.22-svn2');
@@ -1733,27 +1733,6 @@ if(isFroxlorVersion('0.9.25'))
 	// enable bind by default
 	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bind_enable', '1')");
 	
-	// check for multiple backup_enabled entries
-	$handle = $db->query("SELECT `value` FROM `panel_settings` WHERE `varname` = 'backup_enabled';");
-	
-	// if there are more than one entry try to fix it
-	if ($db->num_rows($handle) > 1) {
-		$rows = $db->fetch_array($handle);
-		$state = false;
-		
-		// iterate through all found entries
-		// and try to guess what value it should be
-		foreach ($rows as $row) {
-			$state = $state | $row['value'];
-		}
-		
-		// now delete all entries
-		$db->query("DELETE FROM `panel_settings` WHERE `varname` = 'backup_enabled';");
-		
-		// and re-add it
-		$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_enabled', '". $state ."');");
-	}
-	
 	updateToVersion('0.9.26-svn1');
 }
 
@@ -1772,3 +1751,32 @@ if(isFroxlorVersion('0.9.26-rc1'))
 
 	updateToVersion('0.9.26');
 }
+
+if(isFroxlorVersion('0.9.26'))
+{
+	showUpdateStep("Updating from 0.9.26 to 0.9.26-svn1");
+	lastStepStatus(0);
+  
+	// check for multiple backup_ftp_enabled entries
+	$handle = $db->query("SELECT `value` FROM `panel_settings` WHERE `varname` = 'backup_ftp_enabled';");
+	
+	// if there are more than one entry try to fix it
+	if ($db->num_rows($handle) > 1) {
+		$rows = $db->fetch_array($handle);
+		$state = false;
+		
+		// iterate through all found entries
+		// and try to guess what value it should be
+		foreach ($rows as $row) {
+			$state = $state | $row['value'];
+		}
+		
+		// now delete all entries
+		$db->query("DELETE FROM `panel_settings` WHERE `varname` = 'backup_ftp_enabled';");
+		
+		// and re-add it
+		$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_enabled', '". $state ."');");
+	}
+
+	updateToVersion('0.9.26-svn1');
+}
\ No newline at end of file
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index b6468d26..c907dd38 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.26';
+$version = '0.9.26-svn1';
 $dbversion = '2';
 $branding = '';