Fix no forward works only after saving sieve rule

This commit is contained in:
Hadi Nategh 2022-03-03 15:41:01 +01:00
parent cdc8ed0260
commit f0422b91ca

View File

@ -238,7 +238,6 @@ 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'])
{ {
@ -395,6 +394,9 @@ class mail_sieve
); );
// No forward should be applied regardless of content/rules
$content['no_forward'] = $this->account->acc_smtp_type !== Api\Mail\Smtp::class && !$this->account->acc_user_forward;
//Set the preselect_options for mail/folders as we are not allow free entry for folder taglist //Set the preselect_options for mail/folders as we are not allow free entry for folder taglist
$sel_options['action_folder_text'] = $this->ajax_getFolders(0,true,null,true); $sel_options['action_folder_text'] = $this->ajax_getFolders(0,true,null,true);