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/admin/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>
@@ -15,13 +15,13 @@ $header
<input type="hidden" name="send" value="send" />
<table class="tiny center">
<tr>
<td><label for="def_language">{\Froxlor\I18N\Lang::getAll()['login']['language']}:</label></td>
<td><label for="def_language">{$lng['login']['language']}:</label></td>
<td><select id="def_language" name="def_language">$language_options</select></td>
</tr>
<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>

10
templates/Sparkle/admin/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,21 +15,21 @@ $header
<input type="hidden" name="send" value="send" />
<table class="middle center">
<tr>
<td><label for="old_password">{\Froxlor\I18N\Lang::getAll()['changepassword']['old_password']}:</label></td>
<td><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>
<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/admin/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><label for="theme">{\Froxlor\I18N\Lang::getAll()['panel']['theme']}:</label></td>
<td><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>

110
templates/Sparkle/admin/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">
@@ -10,11 +10,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="customers" class="circular" data-used="{$overview['number_customers']}" data-available="{\Froxlor\User::getAll()['customers']}">
<canvas id="customers-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['admin']['customers']}<br />
{$lng['admin']['customers']}<br />
<small>
{$overview['number_customers']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{$overview['number_customers']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['customers'] != '∞'>
{\Froxlor\User::getAll()['customers']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['customers']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -22,11 +22,11 @@ $header
<div class="canvasbox">
<input type="hidden" id="domains" class="circular" data-used="{$overview['number_domains']}" data-available="{\Froxlor\User::getAll()['domains']}">
<canvas id="domains-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['domains']}<br />
{$lng['customer']['domains']}<br />
<small>
{$overview['number_domains']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{$overview['number_domains']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['domains'] != '∞'>
{\Froxlor\User::getAll()['domains']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['domains']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -34,12 +34,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="subdomains" class="circular" data-used="{$overview['subdomains_used']}" data-available="{\Froxlor\User::getAll()['subdomains']}" data-assigned="{\Froxlor\User::getAll()['subdomains_used']}">
<canvas id="subdomains-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}<br />
{$lng['customer']['subdomains']}<br />
<small>
{$overview['subdomains_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['subdomains_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['subdomains_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['subdomains_used']} {$lng['panel']['assigned']}<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>
@@ -47,12 +47,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="diskspace" class="circular" data-used="{$overview['diskspace_used']}" data-available="{\Froxlor\User::getAll()['diskspace']}" data-assigned="{\Froxlor\User::getAll()['diskspace_used']}">
<canvas id="diskspace-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['diskspace']}<br />
{$lng['customer']['diskspace']}<br />
<small>
{$overview['diskspace_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['diskspace_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['diskspace_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['diskspace_used']} {$lng['panel']['assigned']}<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>
@@ -60,12 +60,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="traffic" class="circular" data-used="{$overview['traffic_used']}" data-available="{\Froxlor\User::getAll()['traffic']}" data-assigned="{\Froxlor\User::getAll()['traffic_used']}">
<canvas id="traffic-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['traffic']}<br />
{$lng['customer']['traffic']}<br />
<small>
{$overview['traffic_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['traffic_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['traffic_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['traffic_used']} {$lng['panel']['assigned']}<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>
@@ -73,12 +73,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="mysqls" class="circular" data-used="{$overview['mysqls_used']}" data-available="{\Froxlor\User::getAll()['mysqls']}" data-assigned="{\Froxlor\User::getAll()['mysqls_used']}">
<canvas id="mysqls-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}<br />
{$lng['customer']['mysqls']}<br />
<small>
{$overview['mysqls_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['mysqls_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['mysqls_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['mysqls_used']} {$lng['panel']['assigned']}<br />
<if \Froxlor\User::getAll()['mysqls'] != '∞'>
{\Froxlor\User::getAll()['mysqls']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['mysqls']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -86,12 +86,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="emails" class="circular" data-used="{$overview['emails_used']}" data-available="{\Froxlor\User::getAll()['emails']}" data-assigned="{\Froxlor\User::getAll()['emails_used']}">
<canvas id="emails-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['emails']}<br />
{$lng['customer']['emails']}<br />
<small>
{$overview['emails_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['emails_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['emails_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['emails_used']} {$lng['panel']['assigned']}<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>
@@ -99,12 +99,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="email_accounts" class="circular" data-used="{$overview['email_accounts_used']}" data-available="{\Froxlor\User::getAll()['email_accounts']}" data-assigned="{\Froxlor\User::getAll()['email_accounts_used']}">
<canvas id="email_accounts-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['accounts']}<br />
{$lng['customer']['accounts']}<br />
<small>
{$overview['email_accounts_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['email_accounts_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['email_accounts_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['email_accounts_used']} {$lng['panel']['assigned']}<br />
<if \Froxlor\User::getAll()['email_accounts'] != '∞'>
{\Froxlor\User::getAll()['email_accounts']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
{\Froxlor\User::getAll()['email_accounts']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -112,12 +112,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="email_forwarders" class="circular" data-used="{$overview['email_forwarders_used']}" data-available="{\Froxlor\User::getAll()['email_forwarders']}" data-assigned="{\Froxlor\User::getAll()['email_forwarders_used']}">
<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}<br />
{$lng['customer']['forwarders']}<br />
<small>
{$overview['email_forwarders_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['email_forwarders_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['email_forwarders_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['email_forwarders_used']} {$lng['panel']['assigned']}<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>
@@ -126,12 +126,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="email_quota" class="circular" data-used="{$overview['email_quota_used']}" data-available="{\Froxlor\User::getAll()['email_quota']}" data-assigned="{\Froxlor\User::getAll()['email_quota_used']}">
<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>
{$overview['email_quota_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['email_quota_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['email_quota_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['email_quota_used']} {$lng['panel']['assigned']}<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>
@@ -140,12 +140,12 @@ $header
<div class="canvasbox">
<input type="hidden" id="ftps" class="circular" data-used="{$overview['ftps_used']}" data-available="{\Froxlor\User::getAll()['ftps']}" data-assigned="{\Froxlor\User::getAll()['ftps_used']}">
<canvas id="ftps-canvas" width="120" height="76"></canvas><br/>
{\Froxlor\I18N\Lang::getAll()['customer']['ftps']}<br />
{$lng['customer']['ftps']}<br />
<small>
{$overview['ftps_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}<br />
{\Froxlor\User::getAll()['ftps_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}<br />
{$overview['ftps_used']} {$lng['panel']['used']}<br />
{\Froxlor\User::getAll()['ftps_used']} {$lng['panel']['assigned']}<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>
@@ -172,7 +172,7 @@ $header
<tbody>
<tr><td>
<img src="templates/{$theme}/assets/img/icons/warning_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['panel']['newsfeed_disabled']}&nbsp;
{$lng['panel']['newsfeed_disabled']}&nbsp;
<a href="{$linker->getLink(array('section' => 'settings', 'part' => 'panel'))}">
<img src="templates/{$theme}/assets/img/icons/edit_20.png" alt="" />
</a>
@@ -192,36 +192,36 @@ $header
<table class="dboarditem">
<thead>
<tr>
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['admin']['systemdetails']}</th>
<th colspan="2">{$lng['admin']['systemdetails']}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['hostname']}:</td>
<td>{$lng['admin']['hostname']}:</td>
<td>{$system_hostname}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['serversoftware']}:</td>
<td>{$lng['admin']['serversoftware']}:</td>
<td>{$_SERVER['SERVER_SOFTWARE']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpversion']}:</td>
<td>{$lng['admin']['phpversion']}:</td>
<td><a href="{$linker->getLink(array('section' => 'settings', 'page' => 'phpinfo'))}">$phpversion</a></td>
</tr>
<tr>
<td class="nowrap">{\Froxlor\I18N\Lang::getAll()['admin']['mysqlserverversion']}:</td>
<td class="nowrap">{$lng['admin']['mysqlserverversion']}:</td>
<td>$mysqlserverversion</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['webserverinterface']}:</td>
<td>{$lng['admin']['webserverinterface']}:</td>
<td>$webserverinterface</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['memory']}:</td>
<td>{$lng['admin']['memory']}:</td>
<td><pre>$memory</pre></td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['sysload']}:</td>
<td>{$lng['admin']['sysload']}:</td>
<td>$load</td>
</tr>
<if $showkernel == 1>
@@ -242,18 +242,18 @@ $header
<table class="dboarditem">
<thead>
<tr>
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['admin']['froxlordetails']}</th>
<th colspan="2">{$lng['admin']['froxlordetails']}</th>
</tr>
</thead>
<tbody>
{$outstanding_tasks}
{$cron_last_runs}
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['installedversion']}:</td>
<td>{$lng['admin']['installedversion']}:</td>
<td>{$version}{$branding} (DB: {$dbversion})</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['latestversion']}:</td>
<td>{$lng['admin']['latestversion']}:</td>
<if $isnewerversion != 0 >
<td><a href="$lookfornewversion_link"><strong>$lookfornewversion_lable</strong></a></td>
<else>

6
templates/Sparkle/admin/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>