From d907c0ce889a71b1ac5fb49e8dd5229b9459bd0e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 6 Nov 2014 18:23:24 +0100
Subject: [PATCH] Fix for gentoo:
 http://www.howtoforge.com/forums/showpost.php?p=321184&postcount=10

---
 .../plugins/mail_user_filter_plugin.inc.php   | 86 ++++++++++++-------
 server/plugins-available/bind_plugin.inc.php  |  4 +-
 2 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
index 774da83994..12322ff947 100644
--- a/interface/lib/plugins/mail_user_filter_plugin.inc.php
+++ b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -137,41 +137,69 @@ class mail_user_filter_plugin {
 			$content .= '### BEGIN FILTER_ID:'.$page_form->id."\n";
 
 			//$content .= 'require ["fileinto", "regex", "vacation"];'."\n";
-
-			$content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
-
-			$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
-			$searchterm = str_replace(
-				array(
-					'"',
-					'\\[',
-					'\\]'
-				),
-				array(
-					'\\"',
-					'\\\\[',
-					'\\\\]'
-				), $searchterm);
-
-			if($page_form->dataRecord["op"] == 'contains') {
-				$content .= ".*".$searchterm;
-			} elseif ($page_form->dataRecord["op"] == 'is') {
-				$content .= "^".$searchterm."$";
-			} elseif ($page_form->dataRecord["op"] == 'begins') {
-				$content .= " ".$searchterm."";
-			} elseif ($page_form->dataRecord["op"] == 'ends') {
-				$content .= ".*".$searchterm."$";
+			
+			if($page_form->dataRecord["op"] == 'domain') {
+				$content .= 'if address :domain :is "'.strtolower($page_form->dataRecord["source"]).'" "'.$page_form->dataRecord["searchterm"].'" {'."\n";
+			} elseif ($page_form->dataRecord["op"] == 'localpart') {
+				$content .= 'if address :localpart :is "'.strtolower($page_form->dataRecord["source"]).'" "'.$page_form->dataRecord["searchterm"].'" {'."\n";
+			} elseif ($page_form->dataRecord["source"] == 'Size') {
+				if(substr(trim($page_form->dataRecord["searchterm"]),-1) == 'k' || substr(trim($page_form->dataRecord["searchterm"]),-1) == 'K') {
+					$unit = 'k';
+				} else {
+					$unit = 'm';
+				}
+				$content .= 'if size :over '.intval($page_form->dataRecord["searchterm"]).$unit.' {'."\n";
+			} else {
+			
+				if($page_form->dataRecord["source"] == 'Header') {
+					$parts = explode(':',trim($page_form->dataRecord["searchterm"]));
+					$page_form->dataRecord["source"] = trim($parts[0]);
+					unset($parts[0]);
+					$page_form->dataRecord["searchterm"] = trim(implode(':',$parts));
+					unset($parts);
+				}
+
+				$content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
+
+				$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
+				$searchterm = str_replace(
+					array(
+						'"',
+						'\\[',
+						'\\]'
+					),
+					array(
+						'\\"',
+						'\\\\[',
+						'\\\\]'
+					), $searchterm);
+
+				if($page_form->dataRecord["op"] == 'contains') {
+					$content .= ".*".$searchterm;
+				} elseif ($page_form->dataRecord["op"] == 'is') {
+					$content .= "^".$searchterm."$";
+				} elseif ($page_form->dataRecord["op"] == 'begins') {
+					$content .= " ".$searchterm."";
+				} elseif ($page_form->dataRecord["op"] == 'ends') {
+					$content .= ".*".$searchterm."$";
+				}
+
+				$content .= '"] {'."\n";
 			}
 
-			$content .= '"] {'."\n";
-
 			if($page_form->dataRecord["action"] == 'move') {
-				$content .= '    fileinto "'.$page_form->dataRecord["target"].'";' . "\n";
+				$content .= '    fileinto "'.$page_form->dataRecord["target"].'";' . "\n    stop;\n";
+			} elseif ($page_form->dataRecord["action"] == 'keep') {
+				$content .= "    keep;\n";
+			} elseif ($page_form->dataRecord["action"] == 'stop') {
+				$content .= "    stop;\n";
+			} elseif ($page_form->dataRecord["action"] == 'reject') {
+				$content .= '    reject "'.$page_form->dataRecord["target"].'";    stop;\n\n';
 			} else {
-				$content .= "    discard;\n";
+				$content .= "    discard;\n    stop;\n";
 			}
 
-			$content .= "    stop;\n}\n";
+			$content .= "}\n";
 
 			$content .= '### END FILTER_ID:'.$page_form->id."\n";
 
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index 2f7f932224..9bc36f5d80 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -117,7 +117,7 @@ class bind_plugin {
 
 			//TODO : change this when distribution information has been integrated into server record
 			if (file_exists('/etc/gentoo-release')) {
-				$filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'], 0, -1)));
+				$filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri/'.str_replace("/", "_", substr($zone['origin'], 0, -1)));
 			}
 			else {
 				$filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'], 0, -1)));
@@ -151,7 +151,7 @@ class bind_plugin {
 		if($data['old']['origin'] != $data['new']['origin']) {
 			//TODO : change this when distribution information has been integrated into server record
 			if (file_exists('/etc/gentoo-release')) {
-				$filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'], 0, -1));
+				$filename = $dns_config['bind_zonefiles_dir'].'/pri/'.str_replace("/", "_", substr($data['old']['origin'], 0, -1));
 			}
 			else {
 				$filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'], 0, -1));
-- 
GitLab