maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

merged for live

Browse Source
This commit is contained in:
Udo Waechter
2016-12-16 17:22:28 +01:00
parent cb582a2947 ccc95b638b
commit 1f800f5298
7 changed files with 89 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/formfields/customer/email/formfield.emails_add.php
View File

@@ -43,6 +43,15 @@ return array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array()
),
'disablegreylist' => array(
'label' => $lng['emails']['greylist'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'visible' => (Settings::Get('mail.greylist_enabled') == '1' ? true : false),
'value' => array(Settings::Get('mail.greylist_disabled_default'))
)
)
)

5
lib/formfields/customer/email/formfield.emails_edit.php
View File

@@ -53,6 +53,11 @@ return array(
'type' => 'label',
'value' => ($result['iscatchall'] == 0 ? $lng['panel']['no'] : $lng['panel']['yes']).' [<a href="'.$filename.'?page='.$page.'&amp;action=togglecatchall&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['panel']['toggle'].'</a>]'
),
'mail_greylist' => array(
'label' => $lng['emails']['greylist'],
'type' => 'label',
'value' => ($result['disablegreylist'] == 0 ? $lng['panel']['no'] : $lng['panel']['yes']).' [<a href="'.$filename.'?page='.$page.'&amp;action=togglegreylist&amp;id='.$result['id'].'&amp;s='.$s.'">'.$lng['panel']['toggle'].'</a>]'
),
'mail_fwds' => array(
'label' => $lng['emails']['forwarders'].' ('.$forwarders_count.')',
'type' => 'label',