From bde98e025a98abb7bb6b9b6e384e63dc72ba15f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 27 Feb 2009 13:24:04 -0500
Subject: [PATCH] add code to modify suphp.conf in fedora nd centos installations.
---
install/lib/install.lib.php | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index b624be4..fb2fb15 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -70,7 +70,7 @@
$distbaseid = 'debian';
swriteln("Operating System: Debian 4.0 or compatible\n");
}
- if(trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
+ if(trim(file_get_contents('/etc/debian_version')) == '5.0' || trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
$distname = 'Debian';
$distver = 'Lenny/Sid';
$distid = 'debian40';
@@ -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;
@@ -530,7 +530,10 @@
}
}
if($found == 0) {
- $out .= $new_line."\n";
+ //* 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
+ if($append == 1) $out .= $new_line."\n";
}
file_put_contents($filename,$out);
}
@@ -555,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 {
@@ -565,4 +568,4 @@
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1