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 | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 94 insertions(+), 9 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 78ef578..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
-
*/
@@ -65,11 +64,17 @@
if(file_exists('/etc/debian_version')) {
if(trim(file_get_contents('/etc/debian_version')) == '4.0') {
- $distname = 'debian40';
+ $distname = 'Debian';
+ $distver = '4.0';
+ $distid = 'debian40';
+ $distbaseid = 'debian';
swriteln("Operating System: Debian 4.0 or compatible\n");
}
- if(trim(file_get_contents('/etc/debian_version')) == 'lenny/sid') {
- $distname = 'debian40';
+ 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';
+ $distbaseid = 'debian';
swriteln("Operating System: Debian Lenny/Sid or compatible\n");
}
}
@@ -77,20 +82,42 @@
//** OpenSuSE
elseif(file_exists("/etc/SuSE-release")) {
if(stristr(file_get_contents('/etc/SuSE-release'),'11.0')) {
- $distname = 'opensuse110';
+ $distname = 'openSUSE';
+ $distver = '11.0';
+ $distid = 'opensuse110';
+ $distbaseid = 'opensuse';
swriteln("Operating System: openSUSE 11.0 or compatible\n");
}
}
//** Redhat
- elseif(file_exists("/etc/redhat_release")) {
-
+ elseif(file_exists("/etc/redhat-release")) {
+
+ $content = file_get_contents('/etc/redhat-release');
+
+ if(stristr($content,'Fedora release 9 (Sulphur)')) {
+ $distname = 'Fedora';
+ $distver = '9';
+ $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");
+ }
+
+
} else {
die('unrecognized linux distribution');
}
- return $distname;
+ return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
}
function sread() {
@@ -481,6 +508,64 @@
return false;
}
+function replaceLine($filename,$search_pattern,$new_line,$strict = 0) {
+ if($lines = @file($filename)) {
+ $out = '';
+ $found = 0;
+ foreach($lines as $line) {
+ if($strict == 0) {
+ if(stristr($line,$search_pattern)) {
+ $out .= $new_line."\n";
+ $found = 1;
+ } else {
+ $out .= $line;
+ }
+ } else {
+ if(trim($line) == $search_pattern) {
+ $out .= $new_line."\n";
+ $found = 1;
+ } else {
+ $out .= $line;
+ }
+ }
+ }
+ 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) {
+ if($lines = @file($filename)) {
+ $out = '';
+ foreach($lines as $line) {
+ if($strict == 0) {
+ if(!stristr($line,$search_pattern)) {
+ $out .= $line;
+ }
+ } else {
+ if(!trim($line) == $search_pattern) {
+ $out .= $line;
+ }
+ }
+ }
+ 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