Revert "refactor global array"

This reverts commit 370ccbdb74.
This commit is contained in:
Michael Kaufmann
2018-12-22 08:15:31 +01:00
parent c800e89414
commit 7e39a7bc60
220 changed files with 2244 additions and 2227 deletions

View File

@@ -3,7 +3,7 @@
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/emails_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['menue']['email']['emails']}&nbsp;({$emailscount})
{$lng['menue']['email']['emails']}&nbsp;({$emailscount})
</h2>
</header>
@@ -20,21 +20,21 @@
<if (\Froxlor\User::getAll()['emails_used'] < \Froxlor\User::getAll()['emails'] || \Froxlor\User::getAll()['emails'] == '-1') && $emaildomains_count !=0 >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['emails']['emails_add']}</a>
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a>
</div>
</if>
<table class="full hl">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['emails']['emailaddress']}&nbsp;{$arrowcode['m.email_full']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['emails']['forwarders']}&nbsp;{$arrowcode['m.destination']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['emails']['account']}</th>
<if \Froxlor\Settings::Get('catchall.catchall_enabled') == '1'><th>{\Froxlor\I18N\Lang::getAll()['emails']['catchall']}</th></if>
<th>{$lng['emails']['emailaddress']}&nbsp;{$arrowcode['m.email_full']}</th>
<th>{$lng['emails']['forwarders']}&nbsp;{$arrowcode['m.destination']}</th>
<th>{$lng['emails']['account']}</th>
<if \Froxlor\Settings::Get('catchall.catchall_enabled') == '1'><th>{$lng['emails']['catchall']}</th></if>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == '1'>
<th>{\Froxlor\I18N\Lang::getAll()['emails']['quota']}</th>
<th>{$lng['emails']['quota']}</th>
</if>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>
@@ -55,7 +55,7 @@
<if (\Froxlor\User::getAll()['emails_used'] < \Froxlor\User::getAll()['emails'] || \Froxlor\User::getAll()['emails'] == '-1') && 15 < $emails_count && $emaildomains_count !=0 >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['emails']['emails_add']}</a>
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a>
</div>
</if>