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

62
templates/Sparkle/admin/settings/apcuinfo/showinfo.tpl vendored
View File

@@ -3,118 +3,118 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['apcuinfo']}
{$lng['admin']['apcuinfo']}
</h2>
</header>
<section>
<table class="full">
<tr class="section">
<th>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['generaltitle']}</th>
<th>{$lng['apcuinfo']['generaltitle']}</th>
<th class="right">
<a href="{$linker->getLink(array('section' => 'apcuinfo', 'page' => 'showinfo', 'action' => 'delete'))}">{\Froxlor\I18N\Lang::getAll()['apcuinfo']['clearcache']}</a>
<a href="{$linker->getLink(array('section' => 'apcuinfo', 'page' => 'showinfo', 'action' => 'delete'))}">{$lng['apcuinfo']['clearcache']}</a>
&nbsp;
</th>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['version']}</td>
<td>{$lng['apcuinfo']['version']}</td>
<td>{$apcversion}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['phpversion']}</td>
<td>{$lng['apcuinfo']['phpversion']}</td>
<td>{$phpversion}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['sharedmem']}</td>
<td>{$lng['apcuinfo']['sharedmem']}</td>
<td>{$sharedmem}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['start']}</td>
<td>{$lng['apcuinfo']['start']}</td>
<td>{$starttime}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['uptime']}</td>
<td>{$lng['apcuinfo']['uptime']}</td>
<td>{$uptime_duration}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['upload']}</td>
<td>{$lng['apcuinfo']['upload']}</td>
<td>{$cache['file_upload_progress']}</td>
</tr>
<tr class="section">
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['apcuinfo']['cachetitle']}</th>
<th colspan="2">{$lng['apcuinfo']['cachetitle']}</th>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['cvar']}</td>
<td>{$lng['apcuinfo']['cvar']}</td>
<td>{$number_vars} ({$size_vars})</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hit']}</td>
<td>{$lng['apcuinfo']['hit']}</td>
<td>{$cache['num_hits']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['miss']}</td>
<td>{$lng['apcuinfo']['miss']}</td>
<td>{$cache['num_misses']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['reqrate']}</td>
<td>{$req_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}</td>
<td>{$lng['apcuinfo']['reqrate']}</td>
<td>{$req_rate_user} {$lng['apcuinfo']['creqsec']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hitrate']}</td>
<td>{$hit_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}</td>
<td>{$lng['apcuinfo']['hitrate']}</td>
<td>{$hit_rate_user} {$lng['apcuinfo']['creqsec']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['missrate']}</td>
<td>{$miss_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}</td>
<td>{$lng['apcuinfo']['missrate']}</td>
<td>{$miss_rate_user} {$lng['apcuinfo']['creqsec']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['insrate']}</td>
<td>{$insert_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}</td>
<td>{$lng['apcuinfo']['insrate']}</td>
<td>{$insert_rate_user} {$lng['apcuinfo']['creqsec']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['cachefull']}</td>
<td>{$lng['apcuinfo']['cachefull']}</td>
<td>{$cache['num_expunges']}</td>
</tr>
<tr class="section">
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['apcuinfo']['memnote']}</th>
<th colspan="2">{$lng['apcuinfo']['memnote']}</th>
</tr>
{$img_src1}
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['free']}</td>
<td>{$lng['apcuinfo']['free']}</td>
<td>{$freemem}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['used']}</td>
<td>{$lng['apcuinfo']['used']}</td>
<td>{$usedmem}</td>
</tr>
<tr class="section">
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hitmiss']}</th>
<th colspan="2">{$lng['apcuinfo']['hitmiss']}</th>
</tr>
{$img_src2}
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hit']}</td>
<td>{$lng['apcuinfo']['hit']}</td>
<td>{$hits}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['miss']}</td>
<td>{$lng['apcuinfo']['miss']}</td>
<td>{$misses}</td>
</tr>
<tr class="section">
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['apcuinfo']['detailmem']}</th>
<th colspan="2">{$lng['apcuinfo']['detailmem']}</th>
</tr>
{$img_src3}
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['apcuinfo']['fragment']}</td>
<td>{$lng['apcuinfo']['fragment']}</td>
<td>{$frag}</td>
</tr>
<tr class="section">
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['apcuinfo']['runtime']}</th>
<th colspan="2">{$lng['apcuinfo']['runtime']}</th>
</tr>
{$runtimelines}
</table>

4
templates/Sparkle/admin/settings/importexport/index.tpl vendored
View File

@@ -3,13 +3,13 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['importexport']}
{$lng['admin']['configfiles']['importexport']}
</h2>
</header>
<section>
<a href="{$linker->getLink(array('section' => 'settings', 'page' => $page, 'action' => 'export'))}">
<input class="yesbutton" type="button" value="Download/Export {\Froxlor\I18N\Lang::getAll()['admin']['serversettings']}" />
<input class="yesbutton" type="button" value="Download/Export {$lng['admin']['serversettings']}" />
</a>
</section>
<br><br>

10
templates/Sparkle/admin/settings/integritycheck.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['integritycheck']}
{$lng['admin']['integritycheck']}
</h2>
</header>
@@ -11,13 +11,13 @@ $header
<table class="full">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['integrityid']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['integrityname']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['integrityresult']}</th>
<th>{$lng['admin']['integrityid']}</th>
<th>{$lng['admin']['integrityname']}</th>
<th>{$lng['admin']['integrityresult']}</th>
</tr>
</thead>
<tfoot>
<td colspan="3"><a href="{$linker->getLink(array('section' => 'settings', 'page' => $page, 'action' => 'fix'))}">{\Froxlor\I18N\Lang::getAll()['admin']['integrityfix']}</a></td>
<td colspan="3"><a href="{$linker->getLink(array('section' => 'settings', 'page' => $page, 'action' => 'fix'))}">{$lng['admin']['integrityfix']}</a></td>
</tfoot>
<tbody>
{$integritycheck}

80
templates/Sparkle/admin/settings/opcacheinfo/showinfo.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['opcacheinfo']}
{$lng['admin']['opcacheinfo']}
</h2>
</header>
@@ -14,16 +14,16 @@ $header
<div class="canvasbox">
<input type="hidden" id="usedmem" class="circular" data-used="{$usedmem}" data-available="{$totalmem}">
<canvas id="usedmem-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['memusage']}<br />
{$lng['opcacheinfo']['memusage']}<br />
<small>
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['used']}: {$usedmemstr} <br />
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['free']}: {$freememstr}
{$lng['opcacheinfo']['used']}: {$usedmemstr} <br />
{$lng['opcacheinfo']['free']}: {$freememstr}
</small>
</div>
<div class="canvasbox">
<input type="hidden" id="wastedmem" class="circular" data-used="{$wastedmem}" data-available="{$totalmem}">
<canvas id="wastedmem-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['wastedmem']}<br />
{$lng['opcacheinfo']['wastedmem']}<br />
<small>
{$wastedmemstr}
</small>
@@ -33,10 +33,10 @@ $header
<div class="canvasbox">
<input type="hidden" id="stringused" class="circular" data-used="{$usedstring}" data-available="{$totalstring}">
<canvas id="stringused-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['strinterning']}<br />
{$lng['opcacheinfo']['strinterning']}<br />
<small>
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['used']}: {$usedstringstr} <br />
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['free']}: {$freestringstr}
{$lng['opcacheinfo']['used']}: {$usedstringstr} <br />
{$lng['opcacheinfo']['free']}: {$freestringstr}
</small>
</div>
</if>
@@ -44,7 +44,7 @@ $header
<div class="canvasbox">
<input type="hidden" id="usedkeystat" class="circular" data-used="{$usedkey}" data-available="{$totalkey}">
<canvas id="usedkeystat-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedkey']}<br />
{$lng['opcacheinfo']['usedkey']}<br />
<small>
{$usedkeystr}
</small>
@@ -54,7 +54,7 @@ $header
<div class="canvasbox">
<input type="hidden" id="cachehit" class="circular" data-used="{$cachehits}" data-available="{$cachetotal}">
<canvas id="cachehit-canvas" width="120" height="76"></canvas><br />
{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['hitsc']}
{$lng['opcacheinfo']['hitsc']}
</div>
</if>
@@ -62,133 +62,133 @@ $header
<table class="full">
<tr class="section">
<th>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['generaltitle']}</th>
<th>{$lng['opcacheinfo']['generaltitle']}</th>
<th class="right">
<a href="{$linker->getLink(array('section' => 'opcacheinfo', 'page' => 'showinfo', 'action' => 'reset'))}">{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['resetcache']}</a>
<a href="{$linker->getLink(array('section' => 'opcacheinfo', 'page' => 'showinfo', 'action' => 'reset'))}">{$lng['opcacheinfo']['resetcache']}</a>
&nbsp;
</th>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['version']}</td>
<td>{$lng['opcacheinfo']['version']}</td>
<td>{$general['version']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['phpversion']}</td>
<td>{$lng['opcacheinfo']['phpversion']}</td>
<td>{$general['phpversion']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['start']}</td>
<td>{$lng['opcacheinfo']['start']}</td>
<td>{$general['start_time']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['lastreset']}</td>
<td>{$lng['opcacheinfo']['lastreset']}</td>
<td>{$general['last_restart_time']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['oomrestarts']}</td>
<td>{$lng['opcacheinfo']['oomrestarts']}</td>
<td>{$general['oom_restarts']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['hashrestarts']}</td>
<td>{$lng['opcacheinfo']['hashrestarts']}</td>
<td>{$general['hash_restarts']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['manualrestarts']}</td>
<td>{$lng['opcacheinfo']['manualrestarts']}</td>
<td>{$general['manual_restarts']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['status']}</td>
<td>{$lng['opcacheinfo']['status']}</td>
<td>{$general['status']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['cachedscripts']}</td>
<td>{$lng['opcacheinfo']['cachedscripts']}</td>
<td>{$general['cachedscripts']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['hitsc']}</td>
<td>{$lng['opcacheinfo']['hitsc']}</td>
<td>{$general['cachehits']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['missc']}</td>
<td>{$lng['opcacheinfo']['missc']}</td>
<td>{$general['cachemiss']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['blmissc']}</td>
<td>{$lng['opcacheinfo']['blmissc']}</td>
<td>{$general['blacklistmiss']}</td>
</tr>
<if ($totalmem) >
<tr>
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['memusage']}</th>
<th colspan="2">{$lng['opcacheinfo']['memusage']}</th>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['totalmem']}</td>
<td>{$lng['opcacheinfo']['totalmem']}</td>
<td>{$memory['total']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedmem']}</td>
<td>{$lng['opcacheinfo']['usedmem']}</td>
<td>{$memory['used']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['freemem']}</td>
<td>{$lng['opcacheinfo']['freemem']}</td>
<td>{$memory['free']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['wastedmem']}</td>
<td>{$lng['opcacheinfo']['wastedmem']}</td>
<td>{$memory['wasted']}</td>
</tr>
</if>
<if (isset($stringbuffer)) >
<tr>
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['strinterning']}</th>
<th colspan="2">{$lng['opcacheinfo']['strinterning']}</th>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['totalmem']}</td>
<td>{$lng['opcacheinfo']['totalmem']}</td>
<td>{$stringbuffer['total']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedmem']}</td>
<td>{$lng['opcacheinfo']['usedmem']}</td>
<td>{$stringbuffer['used']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['freemem']}</td>
<td>{$lng['opcacheinfo']['freemem']}</td>
<td>{$stringbuffer['free']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['strcount']}</td>
<td>{$lng['opcacheinfo']['strcount']}</td>
<td>{$stringbuffer['strcount']}</td>
</tr>
</if>
<if (isset($keystat)) >
<tr>
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['keystat']}</th>
<th colspan="2">{$lng['opcacheinfo']['keystat']}</th>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['maxkey']}</td>
<td>{$lng['opcacheinfo']['maxkey']}</td>
<td>{$keystat['total']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedkey']}</td>
<td>{$lng['opcacheinfo']['usedkey']}</td>
<td>{$keystat['used']}</td>
</tr>
<tr>
<td>{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['wastedkey']}</td>
<td>{$lng['opcacheinfo']['wastedkey']}</td>
<td>{$keystat['wasted']}</td>
</tr>
</if>
<if $runtimelines >
<tr class="section">
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['runtimeconf']}</th>
<th colspan="2">{$lng['opcacheinfo']['runtimeconf']}</th>
</tr>
{$runtimelines}
</if>
<if $blacklistlines >
<tr class="section">
<th colspan="2">{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['blacklist']}</th>
<th colspan="2">{$lng['opcacheinfo']['blacklist']}</th>
</tr>
{$blacklistlines}
</if>

2
templates/Sparkle/admin/settings/phpinfo.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['phpinfo']}
{$lng['admin']['phpinfo']}
</h2>
</header>

8
templates/Sparkle/admin/settings/settings.tpl vendored
View File

@@ -2,9 +2,9 @@
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['serversettings']} &nbsp;
[<a href="$filename?page=overview&amp;part=&amp;s=$s">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['compactoverview']}</a>] &nbsp;
[<a href="$filename?page=importexport&amp;s=$s">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['importexport']}</a>]
{$lng['admin']['serversettings']} &nbsp;
[<a href="$filename?page=overview&amp;part=&amp;s=$s">{$lng['admin']['configfiles']['compactoverview']}</a>] &nbsp;
[<a href="$filename?page=importexport&amp;s=$s">{$lng['admin']['configfiles']['importexport']}</a>]
</h2>
</header>
@@ -14,7 +14,7 @@
<tfoot>
<tr>
<td class="maintitle_apply_right" nowrap="nowrap" colspan="2" align="right">
<input class="bottom" type="reset" value="{\Froxlor\I18N\Lang::getAll()['panel']['reset']}" /><input class="bottom" type="submit" value="{\Froxlor\I18N\Lang::getAll()['panel']['save']}" />
<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
</td>
</tr>
</tfoot>

2
templates/Sparkle/admin/settings/settings_group.tpl vendored
View File

@@ -3,6 +3,6 @@
{$groupdetails['title']}
</th>
<th class="right nolbr">
<input type="reset" value="{\Froxlor\I18N\Lang::getAll()['panel']['reset']}" /><input type="submit" value="{\Froxlor\I18N\Lang::getAll()['panel']['save']}" />
<input type="reset" value="{$lng['panel']['reset']}" /><input type="submit" value="{$lng['panel']['save']}" />
</th>
</tr>

10
templates/Sparkle/admin/settings/settings_overview.tpl vendored
View File

@@ -2,9 +2,9 @@
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['serversettings']} &nbsp;
[<a href="$filename?page=overview&amp;part=all&amp;s=$s">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['overview']}</a>] &nbsp;
[<a href="$filename?page=importexport&amp;s=$s">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['importexport']}</a>]
{$lng['admin']['serversettings']} &nbsp;
[<a href="$filename?page=overview&amp;part=all&amp;s=$s">{$lng['admin']['configfiles']['overview']}</a>] &nbsp;
[<a href="$filename?page=importexport&amp;s=$s">{$lng['admin']['configfiles']['importexport']}</a>]
</h2>
</header>
@@ -13,7 +13,7 @@
<thead>
<tr>
<th colspan="3" class="right">
<input class="bottom" type="reset" value="{\Froxlor\I18N\Lang::getAll()['panel']['reset']}" /><input class="bottom" type="submit" value="{\Froxlor\I18N\Lang::getAll()['panel']['save']}" />
<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
</th>
</tr>
</thead>
@@ -23,7 +23,7 @@
<tfoot>
<tr>
<td nowrap="nowrap" colspan="3" class="right">
<input class="bottom" type="reset" value="{\Froxlor\I18N\Lang::getAll()['panel']['reset']}" /><input class="bottom" type="submit" value="{\Froxlor\I18N\Lang::getAll()['panel']['save']}" />
<input class="bottom" type="reset" value="{$lng['panel']['reset']}" /><input class="bottom" type="submit" value="{$lng['panel']['save']}" />
</td>
</tr>
</tfoot>

2
templates/Sparkle/admin/settings/settings_overviewgroup.tpl vendored
View File

@@ -5,7 +5,7 @@
<td>{$option}</td>
<td>
<if $activated == 1>
<a href="$filename?page=overview&amp;part=$part&amp;s=$s">{\Froxlor\I18N\Lang::getAll()['admin']['serversettings']}</a>
<a href="$filename?page=overview&amp;part=$part&amp;s=$s">{$lng['admin']['serversettings']}</a>
</if>
</td>
</tr>

6
templates/Sparkle/admin/settings/testmail.tpl vendored
View File

@@ -3,14 +3,14 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/email_edit_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['testmail']}
{$lng['admin']['testmail']}
</h2>
</header>
<if !empty($_mailerror)>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{\Froxlor\I18N\Lang::getAll()['admin']['warning']}</div>
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning">{$mailerr_msg}</div>
</div>
</div>
@@ -19,7 +19,7 @@ $header
<section>
<table class="full">
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_user']}</th>
<th>{$lng['serversettings']['mail_smtp_user']}</th>
<th>Host</th>
<th>Port</th>
<th>SMTP Auth</th>

6
templates/Sparkle/admin/settings/updatecounters.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/res_recalculate_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['updatecounters']}
{$lng['admin']['updatecounters']}
</h2>
</header>
@@ -11,13 +11,13 @@ $header
<table class="full">
<thead>
<tr>
<th colspan="3">{\Froxlor\I18N\Lang::getAll()['admin']['customers']}</th>
<th colspan="3">{$lng['admin']['customers']}</th>
</tr>
</thead>
{$customers}
<thead>
<tr>
<th colspan="3">{\Froxlor\I18N\Lang::getAll()['admin']['admins']}</th>
<th colspan="3">{$lng['admin']['admins']}</th>
</tr>
</thead>
{$admins}

22
templates/Sparkle/admin/settings/updatecounters_row_admin.tpl vendored
View File

@@ -3,20 +3,20 @@
<b><if $admin['adminid'] != \Froxlor\User::getAll()['userid']><a href="{$linker->getLink(array('section' => 'admins', 'page' => 'admins', 'action' => 'su', 'id' => $admin['adminid']))}" target="_blank">{$admin['loginname']}</a></if><if $admin['adminid'] == \Froxlor\User::getAll()['userid']>{$admin['loginname']}</if></b>
</td>
<td>
{\Froxlor\I18N\Lang::getAll()['admin']['customers']}: <span <if $admin['customers_used'] == $admin['customers_used_new']>class="green"<else>class="red"</if>><b>{$admin['customers_used']} -&gt; {$admin['customers_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['domains']}: <span <if $admin['domains_used'] == $admin['domains_used_new']>class="green"<else>class="red"</if>><b>{$admin['domains_used']} -&gt; {$admin['domains_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}: <span <if $admin['subdomains_used'] == $admin['subdomains_used_new']>class="green"<else>class="red"</if>><b>{$admin['subdomains_used']} -&gt; {$admin['subdomains_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['diskspace']}: <span <if $admin['diskspace_used'] == $admin['diskspace_used_new']>class="green"<else>class="red"</if>><b>{$admin['diskspace_used']} -&gt; {$admin['diskspace_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['traffic']}: <span <if $admin['traffic_used'] == $admin['traffic_used_new']>class="green"<else>class="red"</if>><b>{$admin['traffic_used']} -&gt; {$admin['traffic_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}: <span <if $admin['mysqls_used'] == $admin['mysqls_used_new']>class="green"<else>class="red"</if>><b>{$admin['mysqls_used']} -&gt; {$admin['mysqls_used_new']}</b></span>
{$lng['admin']['customers']}: <span <if $admin['customers_used'] == $admin['customers_used_new']>class="green"<else>class="red"</if>><b>{$admin['customers_used']} -&gt; {$admin['customers_used_new']}</b></span><br />
{$lng['customer']['domains']}: <span <if $admin['domains_used'] == $admin['domains_used_new']>class="green"<else>class="red"</if>><b>{$admin['domains_used']} -&gt; {$admin['domains_used_new']}</b></span><br />
{$lng['customer']['subdomains']}: <span <if $admin['subdomains_used'] == $admin['subdomains_used_new']>class="green"<else>class="red"</if>><b>{$admin['subdomains_used']} -&gt; {$admin['subdomains_used_new']}</b></span><br />
{$lng['customer']['diskspace']}: <span <if $admin['diskspace_used'] == $admin['diskspace_used_new']>class="green"<else>class="red"</if>><b>{$admin['diskspace_used']} -&gt; {$admin['diskspace_used_new']}</b></span><br />
{$lng['customer']['traffic']}: <span <if $admin['traffic_used'] == $admin['traffic_used_new']>class="green"<else>class="red"</if>><b>{$admin['traffic_used']} -&gt; {$admin['traffic_used_new']}</b></span><br />
{$lng['customer']['mysqls']}: <span <if $admin['mysqls_used'] == $admin['mysqls_used_new']>class="green"<else>class="red"</if>><b>{$admin['mysqls_used']} -&gt; {$admin['mysqls_used_new']}</b></span>
</td>
<td>
{\Froxlor\I18N\Lang::getAll()['customer']['emails']}: <span <if $admin['emails_used'] == $admin['emails_used_new']>class="green"<else>class="red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['accounts']}: <span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}: <span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span><br />
{$lng['customer']['emails']}: <span <if $admin['emails_used'] == $admin['emails_used_new']>class="green"<else>class="red"</if>><b>{$admin['emails_used']} -&gt; {$admin['emails_used_new']}</b></span><br />
{$lng['customer']['accounts']}: <span <if $admin['email_accounts_used'] == $admin['email_accounts_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_accounts_used']} -&gt; {$admin['email_accounts_used_new']}</b></span><br />
{$lng['customer']['forwarders']}: <span <if $admin['email_forwarders_used'] == $admin['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_forwarders_used']} -&gt; {$admin['email_forwarders_used_new']}</b></span><br />
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
{\Froxlor\I18N\Lang::getAll()['customer']['email_quota']}: <span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span><br />
{$lng['customer']['email_quota']}: <span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span><br />
</if>
{\Froxlor\I18N\Lang::getAll()['customer']['ftps']}: <span <if $admin['ftps_used'] == $admin['ftps_used_new']>class="green"<else>class="red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span><br />
{$lng['customer']['ftps']}: <span <if $admin['ftps_used'] == $admin['ftps_used_new']>class="green"<else>class="red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span><br />
</td>
</tr>

14
templates/Sparkle/admin/settings/updatecounters_row_customer.tpl vendored
View File

@@ -3,16 +3,16 @@
<b><if $customer['name'] != '' && $customer['firstname'] != ''>{$customer['name']}, {$customer['firstname']}</if><if $customer['name'] != '' && $customer['firstname'] != '' && $customer['company'] != ''> | </if><if $customer['company'] != ''>{$customer['company']}</if> (<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $customer['customerid']))}" target="_blank">{$customer['loginname']}</a>)</b>
</td>
<td>
{\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}: <span <if $customer['subdomains_used'] == $customer['subdomains_used_new']>class="green"<else>class="red"</if>><b>{$customer['subdomains_used']} -&gt; {$customer['subdomains_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}: <span <if $customer['mysqls_used'] == $customer['mysqls_used_new']>class="green"<else>class="red"</if>><b>{$customer['mysqls_used']} -&gt; {$customer['mysqls_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['emails']}: <span <if $customer['emails_used'] == $customer['emails_used_new']>class="green"<else>class="red"</if>><b>{$customer['emails_used']} -&gt; {$customer['emails_used_new']}</b></span><br />
{\Froxlor\I18N\Lang::getAll()['customer']['accounts']}: <span <if $customer['email_accounts_used'] == $customer['email_accounts_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_accounts_used']} -&gt; {$customer['email_accounts_used_new']}</b></span><br />
{$lng['customer']['subdomains']}: <span <if $customer['subdomains_used'] == $customer['subdomains_used_new']>class="green"<else>class="red"</if>><b>{$customer['subdomains_used']} -&gt; {$customer['subdomains_used_new']}</b></span><br />
{$lng['customer']['mysqls']}: <span <if $customer['mysqls_used'] == $customer['mysqls_used_new']>class="green"<else>class="red"</if>><b>{$customer['mysqls_used']} -&gt; {$customer['mysqls_used_new']}</b></span><br />
{$lng['customer']['emails']}: <span <if $customer['emails_used'] == $customer['emails_used_new']>class="green"<else>class="red"</if>><b>{$customer['emails_used']} -&gt; {$customer['emails_used_new']}</b></span><br />
{$lng['customer']['accounts']}: <span <if $customer['email_accounts_used'] == $customer['email_accounts_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_accounts_used']} -&gt; {$customer['email_accounts_used_new']}</b></span><br />
</td>
<td>
{\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}: <span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span><br />
{$lng['customer']['forwarders']}: <span <if $customer['email_forwarders_used'] == $customer['email_forwarders_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_forwarders_used']} -&gt; {$customer['email_forwarders_used_new']}</b></span><br />
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1>
{\Froxlor\I18N\Lang::getAll()['customer']['email_quota']}: <span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span><br />
{$lng['customer']['email_quota']}: <span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>class="green"<else>class="red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span><br />
</if>
{\Froxlor\I18N\Lang::getAll()['customer']['ftps']}: <span <if $customer['ftps_used'] == $customer['ftps_used_new']>class="green"<else>class="red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span><br />
{$lng['customer']['ftps']}: <span <if $customer['ftps_used'] == $customer['ftps_used_new']>class="green"<else>class="red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span><br />
</td>
</tr>