From 3d46303ec61d08b006f2c32417486fd3bcb5f599 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 01 Mar 2009 10:02:38 -0500
Subject: [PATCH] Enabled locking mechanism for server script.

---
 install/lib/install.lib.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 4af0d54..fb2fb15 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -508,7 +508,7 @@
   return false;
 }
 
-function replaceLine($filename,$search_pattern,$new_line,$strict = 0) {
+function replaceLine($filename,$search_pattern,$new_line,$strict = 0,$append = 1) {
 	if($lines = @file($filename)) {
 		$out = '';
 		$found = 0;
@@ -533,7 +533,7 @@
 			//* add \n if the last line does not end with \n or \r
 			if(substr($out,-1) != "\n" && substr($out,-1) != "\r") $out .= "\n";
 			//* add the new line at the end of the file
-			$out .= $new_line."\n";
+			if($append == 1) $out .= $new_line."\n";
 		}
 		file_put_contents($filename,$out);
 	}
@@ -558,7 +558,7 @@
 }
 
 function is_installed($appname) {
-	exec('which '.escapeshellcmd($appname),$out);
+	exec('which '.escapeshellcmd($appname).' > /dev/null 2> /dev/null',$out);
 	if(isset($out[0]) && stristr($out[0],$appname)) {
 		return true;
 	} else {

--
Gitblit v1.9.1