From 8e12d4d9d102094e047f4ffa7c83833087f16d52 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Mar 2010 13:27:33 -0400
Subject: [PATCH] Fixed: FS#1131 - error in php-cgi-starter Fixed: FS#1118 - [client_id] is not resolved in .php-fcgi-starter
---
install/lib/install.lib.php | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 889821c..d742337 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -72,12 +72,18 @@
$distid = 'debian40';
$distbaseid = 'debian';
swriteln("Operating System: Debian 4.0 or compatible\n");
- } elseif(strstr(trim(file_get_contents('/etc/debian_version')),'5.0') || trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
+ } elseif(strstr(trim(file_get_contents('/etc/debian_version')),'5.0')) {
$distname = 'Debian';
- $distver = 'Lenny/Sid';
+ $distver = 'Lenny';
$distid = 'debian40';
$distbaseid = 'debian';
- swriteln("Operating System: Debian Lenny/Sid or compatible\n");
+ swriteln("Operating System: Debian Lenny or compatible\n");
+ } elseif(strstr(trim(file_get_contents('/etc/debian_version')),'6.0') || trim(file_get_contents('/etc/debian_version')) == 'squeeze/sid') {
+ $distname = 'Debian';
+ $distver = 'Squeeze/Sid';
+ $distid = 'debian40';
+ $distbaseid = 'debian';
+ swriteln("Operating System: Debian Squeeze/Sid or compatible\n");
} else {
$distname = 'Debian';
$distver = 'Unknown';
@@ -253,10 +259,14 @@
function rf($file){
clearstatcache();
- if(!$fp = fopen ($file, 'rb')){
- ilog('WARNING: could not open file '.$file);
+ if(is_file($file)) {
+ if(!$fp = fopen ($file, 'rb')){
+ ilog('WARNING: could not open file '.$file);
+ }
+ return filesize($file) > 0 ? fread($fp, filesize($file)) : '';
+ } else {
+ return '';
}
- return filesize($file) > 0 ? fread($fp, filesize($file)) : '';
}
function wf($file, $content){
--
Gitblit v1.9.1