From e28564dbde4f922a6a8263e3dea32d56b60b5b5b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 16 Jun 2010 11:41:46 -0400
Subject: [PATCH] Implemented: FS#468 - Client name conversion in FTP user too restricted
---
install/lib/install.lib.php | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 889821c..3c2adc1 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -56,6 +56,10 @@
$FILE = realpath('../install.php');
//** Get distribution identifier
+//** IMPORTANT!
+// This is the same code as in /server/mods-available/monitor_core_module.inc.php
+// So if you change it here, you also have to change it in
+// /server/mods-available/monitor_core_module.inc.php!
function get_distname() {
$distname = '';
@@ -72,12 +76,18 @@
$distid = 'debian40';
$distbaseid = 'debian';
swriteln("Operating System: Debian 4.0 or compatible\n");
- } elseif(strstr(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')) {
$distname = 'Debian';
- $distver = 'Lenny/Sid';
+ $distver = 'Lenny';
$distid = 'debian40';
$distbaseid = 'debian';
- swriteln("Operating System: Debian Lenny/Sid or compatible\n");
+ swriteln("Operating System: Debian Lenny or compatible\n");
+ } elseif(strstr(trim(file_get_contents('/etc/debian_version')),'6.0') || trim(file_get_contents('/etc/debian_version')) == 'squeeze/sid') {
+ $distname = 'Debian';
+ $distver = 'Squeeze/Sid';
+ $distid = 'debian60';
+ $distbaseid = 'debian';
+ swriteln("Operating System: Debian 6.0 (Squeeze/Sid) or compatible\n");
} else {
$distname = 'Debian';
$distver = 'Unknown';
@@ -103,14 +113,14 @@
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';
+ $distver = '11.2';
+ $distid = 'opensuse112';
$distbaseid = 'opensuse';
swriteln("Operating System: openSUSE 11.2 or compatible\n");
} else {
$distname = 'openSUSE';
$distver = 'Unknown';
- $distid = 'opensuse110';
+ $distid = 'opensuse112';
$distbaseid = 'opensuse';
swriteln("Operating System: openSUSE or compatible, unknown version.\n");
}
@@ -253,10 +263,14 @@
function rf($file){
clearstatcache();
- if(!$fp = fopen ($file, 'rb')){
- ilog('WARNING: could not open file '.$file);
+ if(is_file($file)) {
+ if(!$fp = fopen ($file, 'rb')){
+ ilog('WARNING: could not open file '.$file);
+ }
+ return filesize($file) > 0 ? fread($fp, filesize($file)) : '';
+ } else {
+ return '';
}
- return filesize($file) > 0 ? fread($fp, filesize($file)) : '';
}
function wf($file, $content){
--
Gitblit v1.9.1