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 | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index ff47eee..4af0d54 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -31,7 +31,6 @@
/*
This function returns a string that describes the installed
linux distribution. e.g. debian40 for Debian Linux 4.0
-
*/
@@ -71,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';
@@ -103,6 +102,14 @@
$distid = 'fedora9';
$distbaseid = 'fedora';
swriteln("Operating System: Fedora 9 or compatible\n");
+ }
+
+ if(stristr($content,'CentOS release 5.2 (Final)')) {
+ $distname = 'CentOS';
+ $distver = '5.2';
+ $distid = 'centos52';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: CentOS 5.2 or compatible\n");
}
@@ -502,7 +509,7 @@
}
function replaceLine($filename,$search_pattern,$new_line,$strict = 0) {
- $lines = file($filename);
+ if($lines = @file($filename)) {
$out = '';
$found = 0;
foreach($lines as $line) {
@@ -523,13 +530,17 @@
}
}
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);
+ }
}
function removeLine($filename,$search_pattern,$strict = 0) {
- $lines = file($filename);
+ if($lines = @file($filename)) {
$out = '';
foreach($lines as $line) {
if($strict == 0) {
@@ -543,8 +554,18 @@
}
}
file_put_contents($filename,$out);
+ }
+}
+
+function is_installed($appname) {
+ exec('which '.escapeshellcmd($appname),$out);
+ if(isset($out[0]) && stristr($out[0],$appname)) {
+ return true;
+ } else {
+ return false;
+ }
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1