holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail/Admin: do NOT allow to set forwards via Sieve rules, if user forwards are disabled (not standard SMTP!)

Browse Source
This commit is contained in:
Ralf Becker 2020-08-05 14:08:05 +02:00
parent 3ece75667d
commit d8752eecf8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/inc/class.mail_sieve.inc.php
View File

@ -238,6 +238,7 @@ class mail_sieve
$rules = $this->rulesByID; $rules = $this->rulesByID;
$content= $rules; $content= $rules;
$content['no_forward'] = $this->account->acc_smtp_type !== Api\Mail\Smtp::class && !$this->account->acc_user_forward;
$content ['ruleID'] = $_GET['ruleID']; $content ['ruleID'] = $_GET['ruleID'];
switch ($rules['action']) switch ($rules['action'])
{ {

2
mail/templates/default/sieve.edit.xet
View File

@ -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" /> <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> </hbox>
</row> </row>
<row> <row disabled="@no_forward">
<radio label="Forward to address (*):" id="action" options="address"/> <radio label="Forward to address (*):" id="action" options="address"/>
<hbox> <hbox>
<taglist-email allowFreeEntries="true" id="action_address_text" class="et2_fullWidth" onfocus="app.mail.sieve_focus_radioBtn" /> <taglist-email allowFreeEntries="true" id="action_address_text" class="et2_fullWidth" onfocus="app.mail.sieve_focus_radioBtn" />