From cbda30058c0f61ae2afbd9085afcf841f32751a5 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Jan 2009 11:50:52 -0500
Subject: [PATCH] Fixed: FS#431 - jailkit users cannot login
---
install/lib/install.lib.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 473dc9f..4af0d54 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';
@@ -530,6 +530,9 @@
}
}
if($found == 0) {
+ //* 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";
}
file_put_contents($filename,$out);
@@ -556,7 +559,7 @@
function is_installed($appname) {
exec('which '.escapeshellcmd($appname),$out);
- if(stristr($out[0],$appname)) {
+ if(isset($out[0]) && stristr($out[0],$appname)) {
return true;
} else {
return false;
@@ -565,4 +568,4 @@
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1