Merge branch 'master' into 'master'

Till Brehm · Till Brehm · commit 00c5c51e0f15 · 2018-01-17T16:47:55.000+01:00
Support mail filtering by envelope :detail (+ part in mail addresses)

See merge request ispconfig/ispconfig3!703
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
@@ -61,7 +61,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -394,7 +394,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -303,7 +303,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -404,7 +404,7 @@ public function configure_dovecot()
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1322,7 +1322,7 @@ public function configure_dovecot() {
 			}
 			//* Configure master.cf and add a line for deliver
 			$content = rf($conf["postfix"]["config_dir"].'/master.cf');
-			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";
+			$deliver_content = 'dovecot   unix  -       n       n       -       -       pipe'."\n".'  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";
 			af($config_dir.'/master.cf', $deliver_content);
 			unset($content);
 			unset($deliver_content);
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -148,17 +148,20 @@ private function mail_user_filter_get_rule($page_form) {
 				}
 				$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);
+				if($page_form->dataRecord["source"] == 'Detail') {
+					$content .= 'if envelope :detail :regex "to" ["';
+				} 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"]).'"] ["';
 				}
 
-				$content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
-
 				$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
 				$searchterm = str_replace(
 					array(
diff --git a/interface/web/mail/form/mail_user_filter.tform.php b/interface/web/mail/form/mail_user_filter.tform.php
@@ -88,7 +88,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => '',
-			'value'  => array('Subject' => 'subject_txt', 'From'=>'from_txt', 'To'=>'to_txt')
+			'value'  => array('Subject' => 'subject_txt', 'From'=>'from_txt', 'To'=>'to_txt', 'Detail'=>'detail_txt')
 		),
 		'op' => array (
 			'datatype' => 'VARCHAR',
diff --git a/interface/web/mail/lib/lang/de_mail_user_filter.lng b/interface/web/mail/lib/lang/de_mail_user_filter.lng
@@ -27,4 +27,5 @@ $wb['reject_txt'] = 'Abweisen';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Verschiebe nach';
 $wb['mark_read_txt'] = 'Als gelesen markieren';
+$wb['detail_txt'] = 'Detail-Angabe des Empfängers (user+detail@domain.com)';
 ?>
diff --git a/interface/web/mail/lib/lang/en_mail_user_filter.lng b/interface/web/mail/lib/lang/en_mail_user_filter.lng
@@ -27,4 +27,5 @@ $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
 $wb['mark_read_txt'] = 'Mark as read';
+$wb['detail_txt'] = 'Detail part in recipient (user+detail@domain.com)';
 ?>
diff --git a/interface/web/mailuser/lib/lang/de_mail_user_filter.lng b/interface/web/mailuser/lib/lang/de_mail_user_filter.lng
@@ -18,4 +18,5 @@ $wb['begins_with_txt'] = 'Startet mit';
 $wb['ends_with_txt'] = 'Endet mit';
 $wb['move_to_txt'] = 'Verschieben nach';
 $wb['delete_txt'] = 'Löschen';
+$wb['detail_txt'] = 'Detail-Angabe des Empfängers (user+detail@domain.com)';
 ?>
diff --git a/interface/web/mailuser/lib/lang/en_mail_user_filter.lng b/interface/web/mailuser/lib/lang/en_mail_user_filter.lng
@@ -18,4 +18,5 @@ $wb['begins_with_txt'] = 'Begins with';
 $wb['ends_with_txt'] = 'Ends with';
 $wb['move_to_txt'] = 'Move to';
 $wb['delete_txt'] = 'Delete';
+$wb['detail_txt'] = 'Detail part in recipient (user+detail@domain.com)';
 ?>
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
@@ -1,4 +1,4 @@
-require ["fileinto", "regex", "vacation", "imap4flags"];
+require ["fileinto", "regex", "vacation", "imap4flags", "envelope", "subaddress"];
 
 <tmpl_if name="cc">
 # Send a copy of email to
diff --git a/server/conf/sieve_filter_1.2.master b/server/conf/sieve_filter_1.2.master
@@ -1,4 +1,4 @@
-require ["fileinto", "regex", "date", "relational", "vacation", "imap4flags"];
+require ["fileinto", "regex", "date", "relational", "vacation", "imap4flags", "envelope", "subaddress"];
 
 <tmpl_if name="cc">
 # Send a copy of email to

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function configure_dovecot()`
`61`	`61`	`}`
`62`	`62`	`//* Configure master.cf and add a line for deliver`
`63`	`63`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`64`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`64`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`65`	`65`	`af($config_dir.'/master.cf', $deliver_content);`
`66`	`66`	`unset($content);`
`67`	`67`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ public function configure_dovecot()`
`394`	`394`	`}`
`395`	`395`	`//* Configure master.cf and add a line for deliver`
`396`	`396`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`397`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`397`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`398`	`398`	`af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);`
`399`	`399`	`unset($content);`
`400`	`400`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ public function configure_dovecot()`
`303`	`303`	`}`
`304`	`304`	`//* Configure master.cf and add a line for deliver`
`305`	`305`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`306`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`306`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`307`	`307`	`af($config_dir.'/master.cf', $deliver_content);`
`308`	`308`	`unset($content);`
`309`	`309`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ public function configure_dovecot()`
`404`	`404`	`}`
`405`	`405`	`//* Configure master.cf and add a line for deliver`
`406`	`406`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`407`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`407`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`408`	`408`	`af($conf["postfix"]["config_dir"].'/master.cf', $deliver_content);`
`409`	`409`	`unset($content);`
`410`	`410`	`unset($deliver_content);`
Original file line number	Diff line number	Diff line change
`@@ -1322,7 +1322,7 @@ public function configure_dovecot() {`
`1322`	`1322`	`}`
`1323`	`1323`	`//* Configure master.cf and add a line for deliver`
`1324`	`1324`	`$content = rf($conf["postfix"]["config_dir"].'/master.cf');`
`1325`		`- $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}'."\n";`
	`1325`	`+ $deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -a ${original_recipient}'."\n";`
`1326`	`1326`	`af($config_dir.'/master.cf', $deliver_content);`
`1327`	`1327`	`unset($content);`
`1328`	`1328`	`unset($deliver_content);`