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

6
templates/Sparkle/customer/index/change_language.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/flag.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['menue']['main']['changelanguage']}
{$lng['menue']['main']['changelanguage']}
</h2>
</header>
@@ -16,14 +16,14 @@ $header
<table class="tiny center">
<tbody>
<tr>
<td width="50%"><label for="def_language">{\Froxlor\I18N\Lang::getAll()['login']['language']}:</label></td>
<td width="50%"><label for="def_language">{$lng['login']['language']}:</label></td>
<td><select id="def_language" name="def_language">$language_options</select></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="2" align="center">
<input type="submit" value="{\Froxlor\I18N\Lang::getAll()['menue']['main']['changelanguage']}" />
<input type="submit" value="{$lng['menue']['main']['changelanguage']}" />
</td>
</tr>
</tfoot>

14
templates/Sparkle/customer/index/change_password.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword']}
{$lng['menue']['main']['changepassword']}
</h2>
</header>
@@ -15,35 +15,35 @@ $header
<input type="hidden" name="send" value="send" />
<table class="middle center">
<tr>
<td width="50%"><label for="old_password">{\Froxlor\I18N\Lang::getAll()['changepassword']['old_password']}:</label></td>
<td width="50%"><label for="old_password">{$lng['changepassword']['old_password']}:</label></td>
<td><input type="password" id="old_password" name="old_password" /></td>
</tr>
<tr>
<td><label for="new_password">{\Froxlor\I18N\Lang::getAll()['changepassword']['new_password']}:</label></td>
<td><label for="new_password">{$lng['changepassword']['new_password']}:</label></td>
<td><input type="password" id="new_password" name="new_password" /></td>
</tr>
<tr>
<td><label for="new_password_confirm">{\Froxlor\I18N\Lang::getAll()['changepassword']['new_password_confirm']}:</label></td>
<td><label for="new_password_confirm">{$lng['changepassword']['new_password_confirm']}:</label></td>
<td><input type="password" id="new_password_confirm" name="new_password_confirm" /></td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<input type="checkbox" name="change_main_ftp" id="change_main_ftp" value="true" />
<label for="change_main_ftp">{\Froxlor\I18N\Lang::getAll()['changepassword']['also_change_ftp']}</label>
<label for="change_main_ftp">{$lng['changepassword']['also_change_ftp']}</label>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<input type="checkbox" name="change_webalizer" id="change_webalizer" value="true" />
<label for="change_webalizer">{\Froxlor\I18N\Lang::getAll()['changepassword']['also_change_webalizer']}</label>
<label for="change_webalizer">{$lng['changepassword']['also_change_webalizer']}</label>
</td>
</tr>
<tfoot>
<tr>
<td colspan="2" align="center">
<input type="submit" value="{\Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword']}" />
<input type="submit" value="{$lng['menue']['main']['changepassword']}" />
</td>
</tr>
</tfoot>

6
templates/Sparkle/customer/index/change_theme.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/display_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['menue']['main']['changetheme']}
{$lng['menue']['main']['changetheme']}
</h2>
</header>
@@ -15,13 +15,13 @@ $header
<input type="hidden" name="send" value="send" />
<table class="tiny center">
<tr>
<td width="50%"><label for="theme">{\Froxlor\I18N\Lang::getAll()['panel']['theme']}:</label></td>
<td width="50%"><label for="theme">{$lng['panel']['theme']}:</label></td>
<td><select id="theme" name="theme">$theme_options</select></td>
</tr>
<tfoot>
<tr>
<td colspan="2" align="center">
<input class="bottom" type="submit" value="{\Froxlor\I18N\Lang::getAll()['menue']['main']['changetheme']}" />
<input class="bottom" type="submit" value="{$lng['menue']['main']['changetheme']}" />
</td>
</tr>
</tfoot>

84
templates/Sparkle/customer/index/index.tpl vendored
View File

@@ -2,7 +2,7 @@ $header
<article>
<h2>
<img src="templates/{$theme}/assets/img/icons/domains_big.png" alt="" />
{\Froxlor\I18N\Lang::getAll()['panel']['dashboard']}
{$lng['panel']['dashboard']}
</h2>
<div class="grid-g">
@@ -11,11 +11,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="subdomains" class="circular" data-used="{\Froxlor\User::getAll()['subdomains_used']}" data-available="{\Froxlor\User::getAll()['subdomains']}">
<canvas id="subdomains-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}<br />
{$lng['customer']['subdomains']}<br />
<small>
{\Froxlor\User::getAll()['subdomains_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['subdomains_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['subdomains'] != '∞'>
{\Froxlor\User::getAll()['subdomains']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['subdomains']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -25,11 +25,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="diskspace" class="circular" data-used="{\Froxlor\User::getAll()['diskspace_used']}" data-available="{\Froxlor\User::getAll()['diskspace']}">
<canvas id="diskspace-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['diskspace']}<br />
{$lng['customer']['diskspace']}<br />
<small>
{\Froxlor\User::getAll()['diskspace_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['diskspace_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['diskspace'] != '∞'>
{\Froxlor\User::getAll()['diskspace']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['diskspace']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -39,11 +39,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="traffic" class="circular" data-used="{\Froxlor\User::getAll()['traffic_used']}" data-available="{\Froxlor\User::getAll()['traffic']}">
<canvas id="traffic-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['traffic']}<br />
{$lng['customer']['traffic']}<br />
<small>
{\Froxlor\User::getAll()['traffic_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['traffic_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['traffic'] != '∞'>
{\Froxlor\User::getAll()['traffic']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['traffic']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -53,11 +53,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="emails" class="circular" data-used="{\Froxlor\User::getAll()['emails_used']}" data-available="{\Froxlor\User::getAll()['emails']}">
<canvas id="emails-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['emails']}<br />
{$lng['customer']['emails']}<br />
<small>
{\Froxlor\User::getAll()['emails_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['emails_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['emails'] != '∞'>
{\Froxlor\User::getAll()['emails']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['emails']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -67,13 +67,13 @@ $header
<div class="canvasbox">
<input type="hidden" id="email_accounts" class="circular" data-used="{\Froxlor\User::getAll()['email_accounts_used']}" data-available="{\Froxlor\User::getAll()['email_accounts']}">
<canvas id="email_accounts-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['accounts']}<br />
{$lng['customer']['accounts']}<br />
<small>
{\Froxlor\User::getAll()['email_accounts_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['email_accounts_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['email_accounts'] != '∞'>
{\Froxlor\User::getAll()['email_accounts']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}<br />
{\Froxlor\User::getAll()['email_accounts']} {$lng['panel']['available']}<br />
</if>
{\Froxlor\User::getAll()['mailspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}
{\Froxlor\User::getAll()['mailspace_used']} {$lng['customer']['mib']}
</small>
</div>
</if>
@@ -82,11 +82,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="email_forwarders" class="circular" data-used="{\Froxlor\User::getAll()['email_forwarders_used']}" data-available="{\Froxlor\User::getAll()['email_forwarders']}">
<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}<br />
{$lng['customer']['forwarders']}<br />
<small>
{\Froxlor\User::getAll()['email_forwarders_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['email_forwarders_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['email_forwarders'] != '∞'>
{\Froxlor\User::getAll()['email_forwarders']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['email_forwarders']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -96,11 +96,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" data-used="{\Froxlor\User::getAll()['email_quota_used']}" data-available="{\Froxlor\User::getAll()['email_quota']}">
<canvas id="email_quota-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['email_quota']}<br />
{$lng['customer']['email_quota']}<br />
<small>
{\Froxlor\User::getAll()['email_quota_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['email_quota_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['email_quota'] != '∞'>
{\Froxlor\User::getAll()['email_quota']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['email_quota']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -110,13 +110,13 @@ $header
<div class="canvasbox">
<input type="hidden" id="mysqls" class="circular" data-used="{\Froxlor\User::getAll()['mysqls_used']}" data-available="{\Froxlor\User::getAll()['mysqls']}">
<canvas id="mysqls-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}<br />
{$lng['customer']['mysqls']}<br />
<small>
{\Froxlor\User::getAll()['mysqls_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['mysqls_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['mysqls'] != '∞'>
{\Froxlor\User::getAll()['mysqls']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}<br />
{\Froxlor\User::getAll()['mysqls']} {$lng['panel']['available']}<br />
</if>
{\Froxlor\User::getAll()['dbspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}
{\Froxlor\User::getAll()['dbspace_used']} {$lng['customer']['mib']}
</small>
</div>
</if>
@@ -125,11 +125,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="ftps" class="circular" data-used="{\Froxlor\User::getAll()['ftps_used']}" data-available="{\Froxlor\User::getAll()['ftps']}">
<canvas id="ftps-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['customer']['ftps']}<br />
{$lng['customer']['ftps']}<br />
<small>
{\Froxlor\User::getAll()['ftps_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['ftps_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['ftps'] != '∞'>
{\Froxlor\User::getAll()['ftps']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['ftps']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -157,26 +157,26 @@ $header
<table class="dboarditem">
<thead>
<tr>
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['index']['accountdetails']}</th>
<th colspan="2">{$lng['index']['accountdetails']}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['login']['username']}:</td>
<td>{$lng['login']['username']}:</td>
<td>{\Froxlor\User::getAll()['loginname']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['domains']}:</td>
<td>{$lng['customer']['domains']}:</td>
<td>$domains</td>
</tr>
<if $stdsubdomain != ''>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain']}:</td>
<td>{$lng['admin']['stdsubdomain']}:</td>
<td>$stdsubdomain</td>
</tr>
</if>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['services']}:</td>
<td>{$lng['customer']['services']}:</td>
<td>$services_enabled</td>
</tr>
</tbody>
@@ -185,43 +185,43 @@ $header
<table class="dboarditem">
<thead>
<tr>
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['index']['customerdetails']}</th>
<th colspan="2">{$lng['index']['customerdetails']}</th>
</tr>
</thead>
<tbody>
<if \Froxlor\User::getAll()['customernumber'] >
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['customernumber']}:</td>
<td>{$lng['customer']['customernumber']}:</td>
<td>{\Froxlor\User::getAll()['customernumber']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['company'] >
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['company']}:</td>
<td>{$lng['customer']['company']}:</td>
<td>{\Froxlor\User::getAll()['company']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['name'] >
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['name']}:</td>
<td>{$lng['customer']['name']}:</td>
<td>{\Froxlor\User::getAll()['firstname']} {\Froxlor\User::getAll()['name']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['street'] >
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['street']}:</td>
<td>{$lng['customer']['street']}:</td>
<td>{\Froxlor\User::getAll()['street']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['city'] >
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['zipcode']}/{\Froxlor\I18N\Lang::getAll()['customer']['city']}:</td>
<td>{$lng['customer']['zipcode']}/{$lng['customer']['city']}:</td>
<td>{\Froxlor\User::getAll()['zipcode']} {\Froxlor\User::getAll()['city']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['email'] >
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['customer']['email']}:</td>
<td>{$lng['customer']['email']}:</td>
<td>{\Froxlor\User::getAll()['email']}</td>
</tr>
</if>

6
templates/Sparkle/customer/index/send_error_report.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/error_report_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['error']['send_report_title']}
{$lng['error']['send_report_title']}
</h2>
</header>
@@ -17,7 +17,7 @@ $header
<thead>
<tr>
<th>
<p>{\Froxlor\I18N\Lang::getAll()['error']['send_report_desc']}</p>
<p>{$lng['error']['send_report_desc']}</p>
</th>
</tr>
</thead>
@@ -31,7 +31,7 @@ $header
<tfoot>
<tr>
<td align="center">
<input class="bottom" type="submit" value="{\Froxlor\I18N\Lang::getAll()['error']['send_report']}" />
<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
</td>
</tr>
</tfoot>