From 230c2a1cf318ced4d7fe72a53cf69adfef94bd31 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Mon, 29 Mar 2010 12:06:50 +0000
Subject: [PATCH] - added freebsd to configfiles array so it shows up in the
 menu, fixes #97 - check for mysqldump also in /usr/local/bin (freebsd), fixes
 #99

---
 install/install.php           | 23 ++++++++++++++++++-----
 lib/configfiles_index.inc.php |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/install/install.php b/install/install.php
index 7eac3334..40ac61eb 100644
--- a/install/install.php
+++ b/install/install.php
@@ -507,7 +507,23 @@ if(isset($_POST['installstep'])
 
 		if(is_file("/usr/bin/mysqldump"))
 		{
-			$command = "/usr/bin/mysqldump " . $mysql_database . " -u " . $mysql_root_user . " --password='" . $mysql_root_pass . "' --result-file=" . $filename;
+			$do_backup = true;
+			$mysql_dump = '/usr/bin/mysqldump';
+		}
+		elseif(is_file("/usr/local/bin/mysqldump"))
+		{
+			$do_backup = true;
+			$mysql_dump = '/usr/local/bin/mysqldump';
+		}
+		else
+		{
+			$do_backup = false;
+			status_message('red', $lng['install']['backing_up_binary_missing']);
+		}
+		
+		if($do_backup) {
+			
+			$command = $mysql_dump . " " . $mysql_database . " -u " . $mysql_root_user . " --password='" . $mysql_root_pass . "' --result-file=" . $filename;
 			$output = exec($command);
 
 			if(stristr($output, "error"))
@@ -518,10 +534,7 @@ if(isset($_POST['installstep'])
 			{
 				status_message('green', 'OK');
 			}
-		}
-		else
-		{
-			status_message('red', $lng['install']['backing_up_binary_missing']);
+
 		}
 	}
 
diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php
index 677f658f..0c89a73f 100644
--- a/lib/configfiles_index.inc.php
+++ b/lib/configfiles_index.inc.php
@@ -45,6 +45,6 @@ else
 
 $cfgPath = 'lib/configfiles/';
 $configfiles = Array();
-$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'etch.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php');
+$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'etch.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php');
 
 ?>
\ No newline at end of file