Updates mail module

Author: tbrehm

config/exim4/exim4.conf.template

@@ -126,8 +126,11 @@ acl_check_rcpt:
           domains       = +local_domains
 
   require verify        = sender
+  
+  # Whitelist
+  
 
-  # Blacklist management
+  # Blacklist
   deny    senders = ${lookup mysql {SELECT DISTINCT address FROM MYSQL_BLACKTABLE WHERE '${quote_mysql:$sender_address}' LIKE address \
                                     AND (recipient = '' OR recipient = '${quote_mysql:$domain}' OR recipient = '${quote_mysql:$local_part}@${quote_mysql:$domain}') \
                                     AND active = '1' AND server_id = 'MAILSERVER_ID'}{$value}}
@@ -159,11 +162,11 @@ acl_check_host:
 
 acl_check_helo:
         accept  hosts = +relay_from_hosts
-	# If the HELO pretend to be this host
-	deny	condition = ${if or { \
-					{eq {${lc:$sender_helo_name}}{MAILSERVER_HOSTNAME}} \
-					{eq {${lc:$sender_helo_name}}{MAILSERVER_IP}} \
-				    } {true}{false} }
+		# If the HELO pretend to be this host
+		deny	condition = ${if or { \
+						{eq {${lc:$sender_helo_name}}{MAILSERVER_HOSTNAME}} \
+						{eq {${lc:$sender_helo_name}}{MAILSERVER_IP}} \
+				    	} {true}{false} }
         # by default we accept
         accept
 
@@ -182,9 +185,9 @@ acl_check_data:
 
         warn    message = X-SA-Report: $spam_report 
                 spam = nobody:true
-
                 condition = ${if >{$spam_score_int}{0}{true}{false}}
-        warn    message = X-SA-Status: Yes 
+        
+		warn    message = X-SA-Status: Yes 
                 spam = nobody:true
                 condition = ${if >{$spam_score_int}{50}{true}{false}}
 
@@ -261,7 +264,7 @@ dnslookup:
 #  allow_fail
 #  allow_defer
 #  data = ${lookup{$local_part}lsearch{/etc/aliases}}
-# user = exim
+#  user = exim
 #  file_transport = address_file
 #  pipe_transport = address_pipe
 
@@ -347,14 +350,14 @@ autoresponder_router:
   transport = autoresponder_transport
   unseen  
 
-cc_router:
-  driver = redirect
-  data = ${lookup mysql {SELECT cc FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}')}{$value}}
-  unseen
+# cc_router:
+#   driver = redirect
+#   data = ${lookup mysql {SELECT cc FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}')}{$value}}
+#   unseen
 
-forward_router:
-  driver = redirect
-  data = ${lookup mysql {SELECT forward FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}') AND forward != ''}{$value}}
+# forward_router:
+#   driver = redirect
+#   data = ${lookup mysql {SELECT forward FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}') AND forward != ''}{$value}}
 
 local_mailbox_router:
   driver = accept

interface/lib/classes/getconf.inc.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+Copyright (c) 2006, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class getconf {
+
+	var $config;
+	
+	function get_server_config($server_id, $section = '') {
+		global $app;
+		
+		if(!is_array($this->config[$server_id])) {
+			$app->uses('ini_parser');
+			$server_id = intval($server_id);
+			$server = $app->db->queryOneRecord("SELECT config FROM server WHERE server_id = $server_id");
+			$this->config[$server_id] = $app->ini_parser->parse_ini_string(stripslashes($server["config"]));
+		}
+		
+		if($section == '') {
+			return $this->config[$server_id];
+		} else {
+			return $this->config[$server_id][$section];
+		}
+	}
+	
+	function get_global_config() {
+		
+		die("not yet implemented");
+		
+	}
+	
+}
+
+?>

interface/lib/classes/ini_parser.inc.php

@@ -0,0 +1,69 @@
+<?php
+
+/*
+Copyright (c) 2006, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+class ini_parser {
+
+	var $config;
+
+	function parse_ini_string($ini) {
+		$ini = str_replace("\r\n","\n",$ini);
+		$lines = explode("\n",$ini);
+		
+		foreach($lines as $line) {
+			
+			if($line != '') {
+				$line = trim($line);
+				if(preg_match("/^\[([\w\d_]+)\]$/", $line, $matches)) {
+					$section = strtolower($matches[1]);
+				} elseif(preg_match("/^([\w\d_]+)=(.*)$/", $line, $matches) && $section != null) {
+					$item = trim($matches[1]);
+					$this->config[$section][$item] = trim($matches[2]);
+				}
+			}
+		}
+		return $this->config;
+	}
+
+
+
+	function get_ini_string($file) {
+		$content = '';
+		foreach($this->config as $section => $data) {
+			$content .= "[$section]\n";
+			foreach($data as $item => $value) {
+				if($value != '') $content .= "$item=$value\n";
+			}
+		}
+		return $content;
+	}
+
+}
+
+?>