From 3d229b05ddfb1b75b10a7e8f66d3b1b847d4afd2 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 25 Oct 2009 08:44:48 -0400
Subject: [PATCH] Added: FS#613 - Add email domain aliases
---
install/lib/install.lib.php | 107 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 94 insertions(+), 13 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index aad7b4a..d27ff11 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
-
*/
@@ -60,25 +59,60 @@
function get_distname() {
$distname = '';
+ $distver = '';
+ $distid = '';
+ $distbaseid = '';
//** Debian or Ubuntu
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';
+ } elseif(strstr(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");
+ } else {
+ $distname = 'Debian';
+ $distver = 'Unknown';
+ $distid = 'debian40';
+ $distbaseid = 'debian';
+ swriteln("Operating System: Debian or compatible, unknown version.\n");
}
}
//** 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");
+ } elseif(stristr(file_get_contents('/etc/SuSE-release'),'11.1')) {
+ $distname = 'openSUSE';
+ $distver = '11.1';
+ $distid = 'opensuse110';
+ $distbaseid = 'opensuse';
+ swriteln("Operating System: openSUSE 11.1 or compatible\n");
+ } elseif(stristr(file_get_contents('/etc/SuSE-release'),'11.2')) {
+ $distname = 'openSUSE';
+ $distver = '11.1';
+ $distid = 'opensuse110';
+ $distbaseid = 'opensuse';
+ swriteln("Operating System: openSUSE 11.2 or compatible\n");
+ } else {
+ $distname = 'openSUSE';
+ $distver = 'Unknown';
+ $distid = 'opensuse110';
+ $distbaseid = 'opensuse';
+ swriteln("Operating System: openSUSE or compatible, unknown version.\n");
}
}
@@ -89,8 +123,41 @@
$content = file_get_contents('/etc/redhat-release');
if(stristr($content,'Fedora release 9 (Sulphur)')) {
- $distname = 'fedora9';
+ $distname = 'Fedora';
+ $distver = '9';
+ $distid = 'fedora9';
+ $distbaseid = 'fedora';
swriteln("Operating System: Fedora 9 or compatible\n");
+ } elseif(stristr($content,'Fedora release 10 (Cambridge)')) {
+ $distname = 'Fedora';
+ $distver = '10';
+ $distid = 'fedora9';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: Fedora 10 or compatible\n");
+ } elseif(stristr($content,'Fedora release 10')) {
+ $distname = 'Fedora';
+ $distver = '11';
+ $distid = 'fedora9';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: Fedora 11 or compatible\n");
+ } elseif(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");
+ } elseif(stristr($content,'CentOS release 5.3 (Final)')) {
+ $distname = 'CentOS';
+ $distver = '5.3';
+ $distid = 'centos53';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: CentOS 5.3 or compatible\n");
+ } else {
+ $distname = 'Redhat';
+ $distver = 'Unknown';
+ $distid = 'fedora9';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: Redhat or compatible, unknown version.\n");
}
@@ -98,7 +165,7 @@
die('unrecognized linux distribution');
}
- return $distname;
+ return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
}
function sread() {
@@ -489,8 +556,8 @@
return false;
}
-function replaceLine($filename,$search_pattern,$new_line,$strict = 0) {
- $lines = file($filename);
+function replaceLine($filename,$search_pattern,$new_line,$strict = 0,$append = 1) {
+ if($lines = @file($filename)) {
$out = '';
$found = 0;
foreach($lines as $line) {
@@ -511,13 +578,17 @@
}
}
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);
+ }
}
function removeLine($filename,$search_pattern,$strict = 0) {
- $lines = file($filename);
+ if($lines = @file($filename)) {
$out = '';
foreach($lines as $line) {
if($strict == 0) {
@@ -531,8 +602,18 @@
}
}
file_put_contents($filename,$out);
+ }
+}
+
+function is_installed($appname) {
+ exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
+ if(isset($out[0]) && stristr($out[0],$appname)) {
+ return true;
+ } else {
+ return false;
+ }
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1