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

Implement *deactivate-catchall*-feature, refs #fixes 1114

Browse Source 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
This commit is contained in:
Arnold Bechtoldt
2012-08-21 20:08:20 +02:00
parent 3655055030
commit 78f286cbda
10 changed files with 121 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/Froxlor/customer/email/emails.tpl
View File

@@ -28,7 +28,7 @@
<th>{$lng['emails']['emailaddress']}&nbsp;{$arrowcode['m.email_full']}</th>
<th>{$lng['emails']['forwarders']}&nbsp;{$arrowcode['m.destination']}</th>
<th>{$lng['emails']['account']}</th>
<th>{$lng['emails']['catchall']}</th>
<if $settings['catchall']['catchall_enabled'] == '1'><th>{$lng['emails']['catchall']}</th></if>
<if $settings['system']['mail_quota_enabled'] == '1'>
<th>{$lng['emails']['quota']}</th>
</if>

2
templates/Froxlor/customer/email/emails_email.tpl
View File

@@ -2,7 +2,7 @@
<td>{$row['email_full']}</td>
<td><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td>
<td><if $row['popaccountid'] != 0>{$lng['panel']['yes']}</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
<td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td>
<if $settings['catchall']['catchall_enabled'] == '1'><td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td></if>
<if $settings['system']['mail_quota_enabled'] == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MB</if></if></td>
<td>
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">