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

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

@@ -3,7 +3,7 @@
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/domains_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['domains']['domainsettings']}&nbsp;({$domains_count})
{$lng['domains']['domainsettings']}&nbsp;({$domains_count})
</h2>
</header>
@@ -20,16 +20,16 @@
<if (\Froxlor\User::getAll()['subdomains_used'] < \Froxlor\User::getAll()['subdomains'] || \Froxlor\User::getAll()['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'))}">{\Froxlor\I18N\Lang::getAll()['domains']['subdomain_add']}</a>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>
</div>
</if>
<table class="full hl">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['path']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
<th>{$lng['panel']['path']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>
@@ -50,7 +50,7 @@
<if (\Froxlor\User::getAll()['subdomains_used'] < \Froxlor\User::getAll()['subdomains'] || \Froxlor\User::getAll()['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'))}">{\Froxlor\I18N\Lang::getAll()['domains']['subdomain_add']}</a>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>
</div>
</if>

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

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

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

@@ -1,5 +1,5 @@
<tr>
<td><strong>{$row['domain']}</strong> [<a href="http://{$row['domain']}/{$statsapp}" rel="external">{\Froxlor\I18N\Lang::getAll()['domains']['statstics']}</a>]</td>
<td><strong>{$row['domain']}</strong> [<a href="http://{$row['domain']}/{$statsapp}" rel="external">{$lng['domains']['statstics']}</a>]</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>

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

@@ -7,50 +7,50 @@
<td>
<a href="http://{$row['domain']}" target="_blank"><b>{$row['domain']}</b></a>
<if $row['registration_date'] != ''>
<br><small>{\Froxlor\I18N\Lang::getAll()['domains']['registration_date']}: {$row['registration_date']}</small>
<br><small>{$lng['domains']['registration_date']}: {$row['registration_date']}</small>
</if>
<if $row['termination_date'] != ''>
<br><small><div class="red">({\Froxlor\I18N\Lang::getAll()['domains']['termination_date_overview']} {$row['termination_date']})</div></small>
<br><small><div class="red">({$lng['domains']['termination_date_overview']} {$row['termination_date']})</div></small>
</if>
</td>
<td>
<if $row['aliasdomain'] == ''>{$row['documentroot']}</if>
<if isset($row['aliasdomainid']) && $row['aliasdomainid'] != 0>{\Froxlor\I18N\Lang::getAll()['domains']['aliasdomain']} {$row['aliasdomain']}</if>
<if isset($row['aliasdomainid']) && $row['aliasdomainid'] != 0>{$lng['domains']['aliasdomain']} {$row['aliasdomain']}</if>
</td>
<td>
<if $row['caneditdomain'] == '1'>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', '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;
</if>
<if \Froxlor\User::getAll()['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="{\Froxlor\I18N\Lang::getAll()['panel']['viewlogs']}" title="{\Froxlor\I18N\Lang::getAll()['panel']['viewlogs']}" />
<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['panel']['viewlogs']}" title="{$lng['panel']['viewlogs']}" />
</a>
</if>
<if $row['parentdomainid'] != '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', '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>&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'>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{\Froxlor\I18N\Lang::getAll()['dnseditor']['edit']}" title="{\Froxlor\I18N\Lang::getAll()['dnseditor']['edit']}" />
<img src="templates/{$theme}/assets/img/icons/dns_edit.png" alt="{$lng['dnseditor']['edit']}" title="{$lng['dnseditor']['edit']}" />
</a>&nbsp;
</if>
<if $show_ssledit == 1>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domainssleditor', 'action' => 'view', 'id' => $row['id']))}">
<img src="templates/{$theme}/assets/img/icons/ssl_<if $row['domain_hascert'] == 1>customer</if><if $row['domain_hascert'] == 2>shared</if><if $row['domain_hascert'] == 0>global</if>.png" alt="{\Froxlor\I18N\Lang::getAll()['panel']['ssleditor']}" title="{\Froxlor\I18N\Lang::getAll()['panel']['ssleditor']}" />
<img src="templates/{$theme}/assets/img/icons/ssl_<if $row['domain_hascert'] == 1>customer</if><if $row['domain_hascert'] == 2>shared</if><if $row['domain_hascert'] == 0>global</if>.png" alt="{$lng['panel']['ssleditor']}" title="{$lng['panel']['ssleditor']}" />
</a>&nbsp;
</if>
<if $row['letsencrypt'] == '1'>
<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{\Froxlor\I18N\Lang::getAll()['panel']['letsencrypt']}" title="{\Froxlor\I18N\Lang::getAll()['panel']['letsencrypt']}" />
<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
</if>
<if $row['parentdomainid'] == '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>
({\Froxlor\I18N\Lang::getAll()['domains']['isassigneddomain']})&nbsp;
({$lng['domains']['isassigneddomain']})&nbsp;
</if>
<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{\Froxlor\I18N\Lang::getAll()['domains']['hasaliasdomains']}</a>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a>
</if>
</td>
</tr>

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

@@ -5,7 +5,7 @@ $header
<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'>
&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{\Froxlor\I18N\Lang::getAll()['dnseditor']['edit']}</a></small>)
&nbsp;(<small><a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domaindnseditor', 'domain_id' => $id))}">{$lng['dnseditor']['edit']}</a></small>)
</if>
</h2>
</header>