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

20
templates/Sparkle/admin/domains/domains.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()['admin']['domains']}&nbsp;({$domainscount})
{$lng['admin']['domains']}&nbsp;({$domainscount})
</h2>
</header>
@@ -20,20 +20,20 @@
<if (\Froxlor\User::getAll()['domains_used'] < \Froxlor\User::getAll()['domains'] || \Froxlor\User::getAll()['domains'] == '-1') && $countcustomers !=0 >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['domain_add']}</a>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
&nbsp;
<img src="templates/{$theme}/assets/img/icons/archive.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'import'))}">{\Froxlor\I18N\Lang::getAll()['domains']['domain_import']}</a>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'import'))}">{$lng['domains']['domain_import']}</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()['admin']['ipsandports']['ip']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['customer']}&nbsp;{$arrowcode['c.loginname']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['domains']['domainname']}&nbsp;{$arrowcode['d.domain']}</th>
<th>{$lng['admin']['ipsandports']['ip']}</th>
<th>{$lng['admin']['customer']}&nbsp;{$arrowcode['c.loginname']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>
@@ -54,9 +54,9 @@
<if $countcustomers == 0 >
<div class="warningcontainer bradius">
<div class="warningtitle">{\Froxlor\I18N\Lang::getAll()['admin']['warning']}</div>
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning">
<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['domain_nocustomeraddingavailable']}</a>
<a href="{$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'add'))}">{$lng['admin']['domain_nocustomeraddingavailable']}</a>
</div>
</div>
</if>
@@ -64,7 +64,7 @@
<if (\Froxlor\User::getAll()['domains_used'] < \Froxlor\User::getAll()['domains'] || \Froxlor\User::getAll()['domains'] == '-1') && 15 < $count && 0 < $countcustomers >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['domain_add']}</a>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
</div>
</if>

2
templates/Sparkle/admin/domains/domains_add.tpl vendored
View File

@@ -25,7 +25,7 @@ $header
<br />
<section>
<p>
<span class="red">*</span>: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}
<span class="red">*</span>: {$lng['admin']['valuemandatory']}
</p>
</section>
</article>

18
templates/Sparkle/admin/domains/domains_domain.tpl vendored
View File

@@ -6,13 +6,13 @@
</if>
<td><b>{$row['domain']}</b>
<if (isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
&nbsp;({\Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain']})
&nbsp;({$lng['admin']['stdsubdomain']})
</if>
<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>{$row['ipandport']}</td>
@@ -21,28 +21,28 @@
</td>
<td>
<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, '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>
<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 $row['isbinddomain'] == '1' && \Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\Settings::Get('system.dnsenabled') == '1'>
&nbsp;<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>
</if>
<if $row['letsencrypt'] == '1'>
&nbsp;<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{\Froxlor\I18N\Lang::getAll()['panel']['letsencrypt']}" title="{\Froxlor\I18N\Lang::getAll()['panel']['letsencrypt']}" />
&nbsp;<img src="templates/{$theme}/assets/img/icons/ssl_letsencrypt.png" alt="{$lng['panel']['letsencrypt']}" title="{$lng['panel']['letsencrypt']}" />
</if>
<if !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0) && $row['id'] != \Froxlor\Settings::Get('system.hostname_id')>
<if !(isset($row['standardsubdomain']) && $row['standardsubdomain'] == $row['id'])>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, '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>
</if>
</if>
<if isset($row['domainaliasid']) && $row['domainaliasid'] != 0>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{\Froxlor\I18N\Lang::getAll()['domains']['hasaliasdomains']}</a>
&nbsp;<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'searchfield' => 'd.aliasdomain', 'searchtext' => $row['id']))}">{$lng['domains']['hasaliasdomains']}</a>
</if>
</td>
</tr>

12
templates/Sparkle/admin/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\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>
@@ -13,7 +13,7 @@ $header
<section>
<form action="{$linker->getLink(array('section' => 'domains'))}" method="post" enctype="application/x-www-form-urlencoded">
<input type="hidden" name="delete_statistics_str" id="delete_statistics_str" value="{\Froxlor\I18N\Lang::getAll()['admin']['delete_statistics']}">
<input type="hidden" name="delete_statistics_str" id="delete_statistics_str" value="{$lng['admin']['delete_statistics']}">
<input type="hidden" name="speciallogverified" id="speciallogverified" value="0" />
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
@@ -22,12 +22,12 @@ $header
<input type="hidden" name="send" value="send" />
<div id="speciallogwarningpopup" name="speciallogwarningpopup" align="center">
<div class="warningtitle">{\Froxlor\I18N\Lang::getAll()['admin']['delete_statistics']}</div>
<div class="warningtitle">{$lng['admin']['delete_statistics']}</div>
</p>{$speciallogwarning}</p>
<input type="text" name="delete_stats" id="delete_stats"></p>
<div>
<input type="button" class="yesbutton" name="verifybutton" value="{\Froxlor\I18N\Lang::getAll()['panel']['delete']}" id="speciallogyesbutton" />&nbsp;
<input type="button" class="nobutton" value="{\Froxlor\I18N\Lang::getAll()['panel']['cancel']}" id="speciallognobutton" />
<input type="button" class="yesbutton" name="verifybutton" value="{$lng['panel']['delete']}" id="speciallogyesbutton" />&nbsp;
<input type="button" class="nobutton" value="{$lng['panel']['cancel']}" id="speciallognobutton" />
</div>
</div>
@@ -39,7 +39,7 @@ $header
<br />
<section>
<p>
<span class="red">*</span>: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}
<span class="red">*</span>: {$lng['admin']['valuemandatory']}
</p>
</section>
</article>

6
templates/Sparkle/admin/domains/domains_import.tpl vendored
View File

@@ -9,8 +9,8 @@ $header
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{\Froxlor\I18N\Lang::getAll()['admin']['note']}</div>
<div class="warning">{\Froxlor\I18N\Lang::getAll()['domains']['import_description']}</div>
<div class="warningtitle">{$lng['admin']['note']}</div>
<div class="warning">{$lng['domains']['import_description']}</div>
</div>
</div>
@@ -31,7 +31,7 @@ $header
<br />
<section>
<p>
<span class="red">*</span>: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}
<span class="red">*</span>: {$lng['admin']['valuemandatory']}
</p>
</section>
</article>