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

Revert "refactor global array"

Browse Source 
This reverts commit c5a58e3f36.
This commit is contained in:
Michael Kaufmann
2018-12-22 08:15:31 +01:00
parent 7e39a7bc60
commit 0401e6971a
68 changed files with 613 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/Sparkle/customer/domains/domainlist.tpl vendored
View File

@@ -17,7 +17,7 @@
{$searchcode}
</div>
<if (\Froxlor\User::getAll()['subdomains_used'] < \Froxlor\User::getAll()['subdomains'] || \Froxlor\User::getAll()['subdomains'] == '-1') && $parentdomains_count != 0 >
<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0 >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>
@@ -47,7 +47,7 @@
</table>
</form>
<if (\Froxlor\User::getAll()['subdomains_used'] < \Froxlor\User::getAll()['subdomains'] || \Froxlor\User::getAll()['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 >
<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>

4
templates/Sparkle/customer/domains/domains_domain.tpl vendored
View File

@@ -23,7 +23,7 @@
<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" title="{$lng['panel']['edit']}" />
</a>&nbsp;
</if>
<if \Froxlor\User::getAll()['logviewenabled'] == '1'>
<if $userinfo['logviewenabled'] == '1'>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'logfiles', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['panel']['viewlogs']}" title="{$lng['panel']['viewlogs']}" />
</a>
@@ -33,7 +33,7 @@
<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" title="{$lng['panel']['delete']}" />
</a>&nbsp;
</if>
<if $row['isbinddomain'] == '1' && \Froxlor\User::getAll()['dnsenabled'] == '1' && $row['caneditdomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
<if $row['isbinddomain'] == '1' && $userinfo['dnsenabled'] == '1' && $row['caneditdomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" />
</a>&nbsp;

2
templates/Sparkle/customer/domains/domains_edit.tpl vendored
View File

@@ -4,7 +4,7 @@ $header
<h2>
<img src="templates/{$theme}/assets/img/icons/domain_edit_big.png" alt="{$title}" />&nbsp;
{$title}
<if $result['isbinddomain'] == '1' && \Froxlor\User::getAll()['dnsenabled'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
<if $result['isbinddomain'] == '1' && $userinfo['dnsenabled'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>)
</if>
</h2>

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

@@ -17,7 +17,7 @@
</div>
<if (\Froxlor\User::getAll()['emails_used'] < \Froxlor\User::getAll()['emails'] || \Froxlor\User::getAll()['emails'] == '-1') && $emaildomains_count !=0 >
<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['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'))}">{$lng['emails']['emails_add']}</a>
@@ -52,7 +52,7 @@
</table>
</form>
<if (\Froxlor\User::getAll()['emails_used'] < \Froxlor\User::getAll()['emails'] || \Froxlor\User::getAll()['emails'] == '-1') && 15 < $emails_count && $emaildomains_count !=0 >
<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['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'))}">{$lng['emails']['emails_add']}</a>

4
templates/Sparkle/customer/ftp/accounts.tpl vendored
View File

@@ -17,7 +17,7 @@
{$searchcode}
</div>
<if (\Froxlor\User::getAll()['ftps_used'] < \Froxlor\User::getAll()['ftps'] || \Froxlor\User::getAll()['ftps'] == '-1') >
<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'add'))}">{$lng['ftp']['account_add']}</a>
@@ -51,7 +51,7 @@
</table>
</form>
<if (\Froxlor\User::getAll()['ftps_used'] < \Froxlor\User::getAll()['ftps'] || \Froxlor\User::getAll()['ftps'] == '-1') && 15 < $ftps_count >
<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') && 15 < $ftps_count >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'add'))}">{$lng['ftp']['account_add']}</a>

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

@@ -7,129 +7,129 @@ $header
<div class="grid-g">
<div class="grid-u-1-2" id="statsbox">
<if \Froxlor\User::getAll()['subdomains'] != '0'>
<if $userinfo['subdomains'] != '0'>
<div class="canvasbox">
<input type="hidden" id="subdomains" class="circular" data-used="{\Froxlor\User::getAll()['subdomains_used']}" data-available="{\Froxlor\User::getAll()['subdomains']}">
<input type="hidden" id="subdomains" class="circular" data-used="{$userinfo['subdomains_used']}" data-available="{$userinfo['subdomains']}">
<canvas id="subdomains-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['subdomains']}<br />
<small>
{\Froxlor\User::getAll()['subdomains_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['subdomains'] != '∞'>
{\Froxlor\User::getAll()['subdomains']} {$lng['panel']['available']}
{$userinfo['subdomains_used']} {$lng['panel']['used']}<br />
<if $userinfo['subdomains'] != '∞'>
{$userinfo['subdomains']} {$lng['panel']['available']}
</if>
</small>
</div>
</if>
<if \Froxlor\User::getAll()['diskspace'] != '0'>
<if $userinfo['diskspace'] != '0'>
<div class="canvasbox">
<input type="hidden" id="diskspace" class="circular" data-used="{\Froxlor\User::getAll()['diskspace_used']}" data-available="{\Froxlor\User::getAll()['diskspace']}">
<input type="hidden" id="diskspace" class="circular" data-used="{$userinfo['diskspace_used']}" data-available="{$userinfo['diskspace']}">
<canvas id="diskspace-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['diskspace']}<br />
<small>
{\Froxlor\User::getAll()['diskspace_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['diskspace'] != '∞'>
{\Froxlor\User::getAll()['diskspace']} {$lng['panel']['available']}
{$userinfo['diskspace_used']} {$lng['panel']['used']}<br />
<if $userinfo['diskspace'] != '∞'>
{$userinfo['diskspace']} {$lng['panel']['available']}
</if>
</small>
</div>
</if>
<if \Froxlor\User::getAll()['traffic'] != '0'>
<if $userinfo['traffic'] != '0'>
<div class="canvasbox">
<input type="hidden" id="traffic" class="circular" data-used="{\Froxlor\User::getAll()['traffic_used']}" data-available="{\Froxlor\User::getAll()['traffic']}">
<input type="hidden" id="traffic" class="circular" data-used="{$userinfo['traffic_used']}" data-available="{$userinfo['traffic']}">
<canvas id="traffic-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['traffic']}<br />
<small>
{\Froxlor\User::getAll()['traffic_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['traffic'] != '∞'>
{\Froxlor\User::getAll()['traffic']} {$lng['panel']['available']}
{$userinfo['traffic_used']} {$lng['panel']['used']}<br />
<if $userinfo['traffic'] != '∞'>
{$userinfo['traffic']} {$lng['panel']['available']}
</if>
</small>
</div>
</if>
<if \Froxlor\User::getAll()['emails'] != '0'>
<if $userinfo['emails'] != '0'>
<div class="canvasbox">
<input type="hidden" id="emails" class="circular" data-used="{\Froxlor\User::getAll()['emails_used']}" data-available="{\Froxlor\User::getAll()['emails']}">
<input type="hidden" id="emails" class="circular" data-used="{$userinfo['emails_used']}" data-available="{$userinfo['emails']}">
<canvas id="emails-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['emails']}<br />
<small>
{\Froxlor\User::getAll()['emails_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['emails'] != '∞'>
{\Froxlor\User::getAll()['emails']} {$lng['panel']['available']}
{$userinfo['emails_used']} {$lng['panel']['used']}<br />
<if $userinfo['emails'] != '∞'>
{$userinfo['emails']} {$lng['panel']['available']}
</if>
</small>
</div>
</if>
<if \Froxlor\User::getAll()['email_accounts'] != '0'>
<if $userinfo['email_accounts'] != '0'>
<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']}">
<input type="hidden" id="email_accounts" class="circular" data-used="{$userinfo['email_accounts_used']}" data-available="{$userinfo['email_accounts']}">
<canvas id="email_accounts-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['accounts']}<br />
<small>
{\Froxlor\User::getAll()['email_accounts_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['email_accounts'] != '∞'>
{\Froxlor\User::getAll()['email_accounts']} {$lng['panel']['available']}<br />
{$userinfo['email_accounts_used']} {$lng['panel']['used']}<br />
<if $userinfo['email_accounts'] != '∞'>
{$userinfo['email_accounts']} {$lng['panel']['available']}<br />
</if>
{\Froxlor\User::getAll()['mailspace_used']} {$lng['customer']['mib']}
{$userinfo['mailspace_used']} {$lng['customer']['mib']}
</small>
</div>
</if>
<if \Froxlor\User::getAll()['email_forwarders'] != '0'>
<if $userinfo['email_forwarders'] != '0'>
<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']}">
<input type="hidden" id="email_forwarders" class="circular" data-used="{$userinfo['email_forwarders_used']}" data-available="{$userinfo['email_forwarders']}">
<canvas id="email_forwarders-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['forwarders']}<br />
<small>
{\Froxlor\User::getAll()['email_forwarders_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['email_forwarders'] != '∞'>
{\Froxlor\User::getAll()['email_forwarders']} {$lng['panel']['available']}
{$userinfo['email_forwarders_used']} {$lng['panel']['used']}<br />
<if $userinfo['email_forwarders'] != '∞'>
{$userinfo['email_forwarders']} {$lng['panel']['available']}
</if>
</small>
</div>
</if>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1 && \Froxlor\User::getAll()['email_quota'] != '0'>
<if \Froxlor\Settings::Get('system.mail_quota_enabled') == 1 && $userinfo['email_quota'] != '0'>
<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']}">
<input type="hidden" id="email_quota" class="circular" data-used="{$userinfo['email_quota_used']}" data-available="{$userinfo['email_quota']}">
<canvas id="email_quota-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['email_quota']}<br />
<small>
{\Froxlor\User::getAll()['email_quota_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['email_quota'] != '∞'>
{\Froxlor\User::getAll()['email_quota']} {$lng['panel']['available']}
{$userinfo['email_quota_used']} {$lng['panel']['used']}<br />
<if $userinfo['email_quota'] != '∞'>
{$userinfo['email_quota']} {$lng['panel']['available']}
</if>
</small>
</div>
</if>
<if \Froxlor\User::getAll()['mysqls'] != '0'>
<if $userinfo['mysqls'] != '0'>
<div class="canvasbox">
<input type="hidden" id="mysqls" class="circular" data-used="{\Froxlor\User::getAll()['mysqls_used']}" data-available="{\Froxlor\User::getAll()['mysqls']}">
<input type="hidden" id="mysqls" class="circular" data-used="{$userinfo['mysqls_used']}" data-available="{$userinfo['mysqls']}">
<canvas id="mysqls-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['mysqls']}<br />
<small>
{\Froxlor\User::getAll()['mysqls_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['mysqls'] != '∞'>
{\Froxlor\User::getAll()['mysqls']} {$lng['panel']['available']}<br />
{$userinfo['mysqls_used']} {$lng['panel']['used']}<br />
<if $userinfo['mysqls'] != '∞'>
{$userinfo['mysqls']} {$lng['panel']['available']}<br />
</if>
{\Froxlor\User::getAll()['dbspace_used']} {$lng['customer']['mib']}
{$userinfo['dbspace_used']} {$lng['customer']['mib']}
</small>
</div>
</if>
<if \Froxlor\User::getAll()['ftps'] != '0'>
<if $userinfo['ftps'] != '0'>
<div class="canvasbox">
<input type="hidden" id="ftps" class="circular" data-used="{\Froxlor\User::getAll()['ftps_used']}" data-available="{\Froxlor\User::getAll()['ftps']}">
<input type="hidden" id="ftps" class="circular" data-used="{$userinfo['ftps_used']}" data-available="{$userinfo['ftps']}">
<canvas id="ftps-canvas" width="120" height="76"></canvas><br />
{$lng['customer']['ftps']}<br />
<small>
{\Froxlor\User::getAll()['ftps_used']} {$lng['panel']['used']}<br />
<if \Froxlor\User::getAll()['ftps'] != '∞'>
{\Froxlor\User::getAll()['ftps']} {$lng['panel']['available']}
{$userinfo['ftps_used']} {$lng['panel']['used']}<br />
<if $userinfo['ftps'] != '∞'>
{$userinfo['ftps']} {$lng['panel']['available']}
</if>
</small>
</div>
@@ -163,7 +163,7 @@ $header
<tbody>
<tr>
<td>{$lng['login']['username']}:</td>
<td>{\Froxlor\User::getAll()['loginname']}</td>
<td>{$userinfo['loginname']}</td>
</tr>
<tr>
<td>{$lng['customer']['domains']}:</td>
@@ -189,45 +189,45 @@ $header
</tr>
</thead>
<tbody>
<if \Froxlor\User::getAll()['customernumber'] >
<if $userinfo['customernumber'] >
<tr>
<td>{$lng['customer']['customernumber']}:</td>
<td>{\Froxlor\User::getAll()['customernumber']}</td>
<td>{$userinfo['customernumber']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['company'] >
<if $userinfo['company'] >
<tr>
<td>{$lng['customer']['company']}:</td>
<td>{\Froxlor\User::getAll()['company']}</td>
<td>{$userinfo['company']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['name'] >
<if $userinfo['name'] >
<tr>
<td>{$lng['customer']['name']}:</td>
<td>{\Froxlor\User::getAll()['firstname']} {\Froxlor\User::getAll()['name']}</td>
<td>{$userinfo['firstname']} {$userinfo['name']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['street'] >
<if $userinfo['street'] >
<tr>
<td>{$lng['customer']['street']}:</td>
<td>{\Froxlor\User::getAll()['street']}</td>
<td>{$userinfo['street']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['city'] >
<if $userinfo['city'] >
<tr>
<td>{$lng['customer']['zipcode']}/{$lng['customer']['city']}:</td>
<td>{\Froxlor\User::getAll()['zipcode']} {\Froxlor\User::getAll()['city']}</td>
<td>{$userinfo['zipcode']} {$userinfo['city']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['email'] >
<if $userinfo['email'] >
<tr>
<td>{$lng['customer']['email']}:</td>
<td>{\Froxlor\User::getAll()['email']}</td>
<td>{$userinfo['email']}</td>
</tr>
</if>
<if \Froxlor\User::getAll()['custom_notes'] != '' && \Froxlor\User::getAll()['custom_notes_show'] == '1'>
<if $userinfo['custom_notes'] != '' && $userinfo['custom_notes_show'] == '1'>
<tr>
<td colspan="2">{\Froxlor\User::getAll()['custom_notes']}</td>
<td colspan="2">{$userinfo['custom_notes']}</td>
</tr>
</if>
</tbody>

4
templates/Sparkle/customer/mysql/mysqls.tpl vendored
View File

@@ -17,7 +17,7 @@
{$searchcode}
</div>
<if (\Froxlor\User::getAll()['mysqls_used'] < \Froxlor\User::getAll()['mysqls'] || \Froxlor\User::getAll()['mysqls'] == '-1') >
<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a>
@@ -49,7 +49,7 @@
</table>
</form>
<if (\Froxlor\User::getAll()['mysqls_used'] < \Froxlor\User::getAll()['mysqls'] || \Froxlor\User::getAll()['mysqls'] == '-1') && 15 < $mysqls_count >
<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a>