From d8752eecf8ff3e04945f86e273f7eaf242d16a5f Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Wed, 5 Aug 2020 14:08:05 +0200
Subject: [PATCH] * Mail/Admin: do NOT allow to set forwards via Sieve rules,
 if user forwards are disabled (not standard SMTP!)

---
 mail/inc/class.mail_sieve.inc.php     | 1 +
 mail/templates/default/sieve.edit.xet | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php
index 90cef69ee5..84295fe5fc 100644
--- a/mail/inc/class.mail_sieve.inc.php
+++ b/mail/inc/class.mail_sieve.inc.php
@@ -238,6 +238,7 @@ class mail_sieve
 
 				$rules = $this->rulesByID;
 				$content= $rules;
+				$content['no_forward'] = $this->account->acc_smtp_type !== Api\Mail\Smtp::class && !$this->account->acc_user_forward;
 				$content ['ruleID'] = $_GET['ruleID'];
 				switch ($rules['action'])
 				{
diff --git a/mail/templates/default/sieve.edit.xet b/mail/templates/default/sieve.edit.xet
index fdcbe1b46c..44a9d2b194 100644
--- a/mail/templates/default/sieve.edit.xet
+++ b/mail/templates/default/sieve.edit.xet
@@ -84,7 +84,7 @@
 						<taglist id="action_folder_text"  class="et2_fullWidth" autocomplete_url="mail.mail_sieve.ajax_getFolders" autocomplete_params="" allowFreeEntries="false" maxSelection="1" onfocus="app.mail.sieve_focus_radioBtn" />
 					</hbox>
 				</row>
-				<row>
+				<row disabled="@no_forward">
 					<radio label="Forward to address (*):" id="action" options="address"/>
 					<hbox>
 						<taglist-email allowFreeEntries="true" id="action_address_text" class="et2_fullWidth" onfocus="app.mail.sieve_focus_radioBtn" />