From 3764dc4ad0b85b25cfe1247f68c5df00a2f0445d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Oct 2009 11:34:34 -0400
Subject: [PATCH] Implemented: FS#539 - ssl domain must be selectable
---
install/lib/install.lib.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index fb2fb15..d27ff11 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -59,6 +59,9 @@
function get_distname() {
$distname = '';
+ $distver = '';
+ $distid = '';
+ $distbaseid = '';
//** Debian or Ubuntu
if(file_exists('/etc/debian_version')) {
@@ -69,13 +72,18 @@
$distid = 'debian40';
$distbaseid = 'debian';
swriteln("Operating System: Debian 4.0 or compatible\n");
- }
- if(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') || 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");
}
}
@@ -87,6 +95,24 @@
$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");
}
}
@@ -102,14 +128,36 @@
$distid = 'fedora9';
$distbaseid = 'fedora';
swriteln("Operating System: Fedora 9 or compatible\n");
- }
-
- if(stristr($content,'CentOS release 5.2 (Final)')) {
+ } 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");
}
@@ -558,7 +606,7 @@
}
function is_installed($appname) {
- exec('which '.escapeshellcmd($appname).' > /dev/null 2> /dev/null',$out);
+ exec('which '.escapeshellcmd($appname).' 2> /dev/null',$out);
if(isset($out[0]) && stristr($out[0],$appname)) {
return true;
} else {
--
Gitblit v1.9.1