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

Revert "refactor global array"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/Sparkle/customer/email/email.tpl vendored
View File

@@ -1,8 +1,8 @@
$header
<div class="messagewrapper">
<div class="neutralcontainer bradius">
<div class="neutraltitle">{\Froxlor\I18N\Lang::getAll()['menue']['email']['email']}</div>
<div class="neutral">{\Froxlor\I18N\Lang::getAll()['emails']['description']}</div>
<div class="neutraltitle">{$lng['menue']['email']['email']}</div>
<div class="neutral">{$lng['emails']['description']}</div>
</div>
</div>
$footer

18
templates/Sparkle/customer/email/emails.tpl vendored
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>

4
templates/Sparkle/customer/email/emails_add.tpl vendored
View File

@@ -11,8 +11,8 @@ $header
<if $domains == ''>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{\Froxlor\I18N\Lang::getAll()['admin']['warning']}</div>
<div class="warning"><br /><strong>{\Froxlor\I18N\Lang::getAll()['emails']['noemaildomainaddedyet']}</strong></div>
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
</div>
</div>
<else>

2
templates/Sparkle/customer/email/emails_edit.tpl vendored
View File

@@ -17,7 +17,7 @@ $header
{$email_edit_form}
<tfoot>
<tr>
<td colspan="2"><a href="{$linker->getLink(array('section' => 'email', 'page' => 'emails'))}">{\Froxlor\I18N\Lang::getAll()['emails']['back_to_overview']}</a></td>
<td colspan="2"><a href="{$linker->getLink(array('section' => 'email', 'page' => 'emails'))}">{$lng['emails']['back_to_overview']}</a></td>
</tr>
</tfoot>
</table>

2
templates/Sparkle/customer/email/emails_edit_forwarder.tpl vendored
View File

@@ -1,2 +1,2 @@
$destination [<a href="{$linker->getLink(array('section' => 'email', 'page' => 'forwarders', 'action' => 'delete', 'id' => $id, 'forwarderid' => $dest_id))}">{\Froxlor\I18N\Lang::getAll()['panel']['delete']}</a>]
$destination [<a href="{$linker->getLink(array('section' => 'email', 'page' => 'forwarders', 'action' => 'delete', 'id' => $id, 'forwarderid' => $dest_id))}">{$lng['panel']['delete']}</a>]
<br />

10
templates/Sparkle/customer/email/emails_email.tpl vendored
View File

@@ -1,15 +1,15 @@
<tr>
<td>{$row['email_full']}</td>
<td><if $row['destination'] == ''>&nbsp;<else>{$row['destination']}</if></td>
<td><if $row['popaccountid'] != 0>{\Froxlor\I18N\Lang::getAll()['panel']['yes']} ({$row['mboxsize']})</if><if $row['popaccountid'] == 0>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td>
<if \Froxlor\Settings::Get('catchall.catchall_enabled') == '1'><td><if $row['iscatchall'] != 0>{\Froxlor\I18N\Lang::getAll()['panel']['yes']}</if><if $row['iscatchall'] == 0>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td></if>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == '1'><td><if $row['quota'] == 0>{\Froxlor\I18N\Lang::getAll()['emails']['noquota']}<else>{$row['quota']} MiB</if></if></td>
<td><if $row['popaccountid'] != 0>{$lng['panel']['yes']} ({$row['mboxsize']})</if><if $row['popaccountid'] == 0>{$lng['panel']['no']}</if></td>
<if \Froxlor\Settings::Get('catchall.catchall_enabled') == '1'><td><if $row['iscatchall'] != 0>{$lng['panel']['yes']}</if><if $row['iscatchall'] == 0>{$lng['panel']['no']}</if></td></if>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == '1'><td><if $row['quota'] == 0>{$lng['emails']['noquota']}<else>{$row['quota']} MiB</if></if></td>
<td>
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'edit', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{\Froxlor\I18N\Lang::getAll()['panel']['edit']}" title="{\Froxlor\I18N\Lang::getAll()['panel']['edit']}" />
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
</a>&nbsp;
<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'delete', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{\Froxlor\I18N\Lang::getAll()['panel']['delete']}" title="{\Froxlor\I18N\Lang::getAll()['panel']['delete']}" />
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
</a>
</td>
</tr>