Merge branch 'feature/imap4flags' into 'master'

Support for "Mark as read" in user's mail filters

A few people on the internet have already requested support for the `imap4flags`. This pull request provides two things:

 - The templates for Sieve have been updated to include and load the `imap4flags` module. This is available also for Doctrine 1.1 and provides the ability to use the command `setflat "\\Seen";` which marks mails as read.
 - The web interface has been updated for a new action beside delete and more, named "Mark as read". This allows users to define mail filters which mark mails automatically as read. This currently only works for Sieve. Servers using Maildrop will silently ignore that specific user filter.

I would be happy to see that feature in ISPConfig 3.1!

See merge request !402

Author: Till Brehm

interface/lib/plugins/mail_user_filter_plugin.inc.php

@@ -193,6 +193,8 @@ private function mail_user_filter_get_rule($page_form) {
 				$content .= "    stop;\n";
 			} elseif ($page_form->dataRecord["action"] == 'reject') {
 				$content .= '    reject "'.$page_form->dataRecord["target"].'";    stop;\n\n';
+			} elseif ($page_form->dataRecord["action"] == 'read') {
+				$content .= '    setflag "\\\\Seen";\n    stop;\n';
 			} else {
 				$content .= "    discard;\n    stop;\n";
 			}
@@ -254,6 +256,8 @@ private function mail_user_filter_get_rule($page_form) {
 				$content .= 'ID' . "$page_form->id" . 'EndFolder = "$DEFAULT/.' . $page_form->dataRecord['target'] . '/"' . "\n";
 				$content .= "xfilter \"/usr/bin/formail -A \\\"X-User-Mail-Filter-ID"."$page_form->id".": Yes\\\"\"" . "\n";
 				$content .= "to ". '$ID' . "$page_form->id" . 'EndFolder' . "\n";
+			} elseif ($page_form->dataRecord["action"] == 'read') {
+				$content .= ''; // mark as read currently not supported for Maildrop
 			} else {
 				$content .= "to /dev/null\n";
 			}

interface/web/mail/form/mail_user_filter.tform.php

@@ -106,7 +106,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'SELECT',
 			'default' => '',
-			'value'  => array('move' => 'move_to_txt', 'delete'=>'delete_txt')
+			'value'  => array('move' => 'move_to_txt', 'delete'=>'delete_txt', 'read'=>'mark_read_txt')
 		),
 		'target' => array (
 			'datatype' => 'VARCHAR',

interface/web/mail/lib/lang/ar_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Keep';
 $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
+$wb['mark_read_txt'] = 'Mark as read';
 ?>

interface/web/mail/lib/lang/bg_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Keep';
 $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
+$wb['mark_read_txt'] = 'Mark as read';
 ?>

interface/web/mail/lib/lang/br_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Keep';
 $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
+$wb['mark_read_txt'] = 'Mark as read';
 ?>

interface/web/mail/lib/lang/ca_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Keep';
 $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
+$wb['mark_read_txt'] = 'Mark as read';
 ?>

interface/web/mail/lib/lang/cz_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Keep';
 $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
+$wb['mark_read_txt'] = 'Mark as read';
 ?>

interface/web/mail/lib/lang/de_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Behalten';
 $wb['reject_txt'] = 'Abweisen';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Verschiebe nach';
+$wb['mark_read_txt'] = 'Als gelesen markieren';
 ?>

interface/web/mail/lib/lang/el_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Keep';
 $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
+$wb['mark_read_txt'] = 'Mark as read';
 ?>

interface/web/mail/lib/lang/en_mail_user_filter.lng

@@ -26,4 +26,5 @@ $wb['keep_txt'] = 'Keep';
 $wb['reject_txt'] = 'Reject';
 $wb['stop_txt'] = 'Stop';
 $wb['move_to_txt'] = 'Move to';
+$wb['mark_read_txt'] = 'Mark as read';
 ?>