From c6e05a8eebc58624c675d4b10d33e94e6b6fa83b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 12 Sep 2011 10:16:19 -0400
Subject: [PATCH] Implemented: FS#1385 - Define all Email aliases in dovecot autoresponder
---
install/lib/install.lib.php | 83 ++++++++---------------------------------
1 files changed, 17 insertions(+), 66 deletions(-)
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index b6ad9a7..4ef2d37 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -30,7 +30,7 @@
/*
This function returns a string that describes the installed
- linux distribution. e.g. debian40 for Debian Linux 4.0
+ Linux distribution. e.g. debian40 for Debian GNU/Linux 4.0
*/
@@ -57,7 +57,7 @@
//** Get distribution identifier
//** IMPORTANT!
-// This is the same code as in server/mods-available/monitor_core_module.inc.php
+// This is the same code as in server/lib/classes/monitor_tools.inc.php
// So if you change it here, you also have to change it in there!
function get_distname() {
@@ -97,7 +97,7 @@
}
//** OpenSuSE
- elseif(file_exists("/etc/SuSE-release")) {
+ elseif(file_exists('/etc/SuSE-release')) {
if(stristr(file_get_contents('/etc/SuSE-release'),'11.0')) {
$distname = 'openSUSE';
$distver = '11.0';
@@ -127,7 +127,7 @@
//** Redhat
- elseif(file_exists("/etc/redhat-release")) {
+ elseif(file_exists('/etc/redhat-release')) {
$content = file_get_contents('/etc/redhat-release');
@@ -161,6 +161,12 @@
$distid = 'centos53';
$distbaseid = 'fedora';
swriteln("Operating System: CentOS 5.3 or compatible\n");
+ } elseif(stristr($content,'CentOS release 5')) {
+ $distname = 'CentOS';
+ $distver = 'Unknown';
+ $distid = 'centos53';
+ $distbaseid = 'fedora';
+ swriteln("Operating System: CentOS 5 or compatible\n");
} else {
$distname = 'Redhat';
$distver = 'Unknown';
@@ -171,7 +177,7 @@
}
//** Gentoo
- elseif(file_exists("/etc/gentoo-release")) {
+ elseif(file_exists('/etc/gentoo-release')) {
$content = file_get_contents('/etc/gentoo-release');
@@ -183,7 +189,7 @@
swriteln("Operating System: Gentoo $distver or compatible\n");
} else {
- die('unrecognized linux distribution');
+ die('Unrecognized GNU/Linux distribution');
}
return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
@@ -203,7 +209,7 @@
}
function ilog($msg){
- exec("echo `date` \"- [ISPConfig] - \"".$msg." >> ".ISPC_LOG_FILE);
+ exec("echo `date` \"- [ISPConfig] - \"".$msg.' >> '.ISPC_LOG_FILE);
}
function error($msg){
@@ -355,61 +361,6 @@
}
}
-function find_includes($file){
- global $httpd_root;
- clearstatcache();
- if(is_file($file) && filesize($file) > 0){
- $includes[] = $file;
- $inhalt = unix_nl(no_comments($file));
- $lines = explode("\n", $inhalt);
- if(!empty($lines)){
- foreach($lines as $line){
- if(stristr($line, 'include ')){
- $include_file = str_replace("\n", '', trim(shell_exec("echo \"$line\" | awk '{print \$2}'")));
- if(substr($include_file,0,1) != '/'){
- $include_file = $httpd_root.'/'.$include_file;
- }
- if(is_file($include_file)){
- if($further_includes = find_includes($include_file)){
- $includes = array_merge($includes, $further_includes);
- }
- } else {
- if(strstr($include_file, '*')){
- $more_files = explode("\n", shell_exec("ls -l $include_file | awk '{print \$9}'"));
- if(!empty($more_files)){
- foreach($more_files as $more_file){
- if(is_file($more_file)){
- if($further_includes = find_includes($more_file)){
- $includes = array_merge($includes, $further_includes);
- }
- }
- }
- }
- unset($more_files);
- $more_files = explode("\n", shell_exec("ls -l $include_file | awk '{print \$10}'"));
- if(!empty($more_files)){
- foreach($more_files as $more_file){
- if(is_file($more_file)){
- if($further_includes = find_includes($more_file)){
- $includes = array_merge($includes, $further_includes);
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- if(is_array($includes)){
- $includes = array_unique($includes);
- return $includes;
- } else {
- return false;
- }
-}
-
function comment_out($file, $string){
$inhalt = no_comments($file);
$gesamt_inhalt = rf($file);
@@ -556,8 +507,8 @@
$lines = explode("\n", $users);
if(is_array($lines)){
foreach($lines as $line){
- if(trim($line) != ""){
- list($f1, $f2, $f3, $f4, $f5, $f6, $f7) = explode(":", $line);
+ if(trim($line) != ''){
+ list($f1, $f2, $f3, $f4, $f5, $f6, $f7) = explode(':', $line);
if($f1 == $user) return true;
}
}
@@ -572,8 +523,8 @@
$lines = explode("\n", $groups);
if(is_array($lines)){
foreach($lines as $line){
- if(trim($line) != ""){
- list($f1, $f2, $f3, $f4) = explode(":", $line);
+ if(trim($line) != ''){
+ list($f1, $f2, $f3, $f4) = explode(':', $line);
if($f1 == $group) return true;
}
}
--
Gitblit v1.9.1