From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Sat, 30 Jan 2016 07:44:29 -0500 Subject: [PATCH] Merge branch 'master' into 'stable-3.1' --- interface/web/mail/form/mail_forward.tform.php | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/interface/web/mail/form/mail_forward.tform.php b/interface/web/mail/form/mail_forward.tform.php index dcd5e54..3c89150 100644 --- a/interface/web/mail/form/mail_forward.tform.php +++ b/interface/web/mail/form/mail_forward.tform.php @@ -118,6 +118,18 @@ 'default' => 'y', 'value' => array(0 => 'n', 1 => 'y') ), + 'allow_send_as' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(1 => 'y', 0 => 'n') + ), + 'greylisting' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(1 => 'y', 0 => 'n') + ), //################################# // ENDE Datatable fields //################################# -- Gitblit v1.9.1