Revert "refactor global array"

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

View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/ipsports_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ipsandports']}
{$lng['admin']['ipsandports']['ipsandports']}
</h2>
</header>
@@ -18,21 +18,21 @@ $header
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['add']}</a>
<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
</div>
<table class="full hl">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip']}&nbsp;{$arrowcode['ip']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['port']}&nbsp;{$arrowcode['port']}</th>
<th>{$lng['admin']['ipsandports']['ip']}&nbsp;{$arrowcode['ip']}</th>
<th>{$lng['admin']['ipsandports']['port']}&nbsp;{$arrowcode['port']}</th>
<if !$is_nginx><th>Listen</th></if>
<if $is_apache && !$is_apache24><th>NameVirtualHost</th></if>
<th>vHost-Container</th>
<th>Specialsettings</th>
<if $is_apache><th>ServerName</th></if>
<th>SSL</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>
@@ -53,7 +53,7 @@ $header
<if 15 < $count>
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['add']}</a>
<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
</div>
</if>

View File

@@ -1,18 +1,18 @@
<tr>
<td>{$row['ip']}</td>
<td>{$row['port']}</td>
<if !$is_nginx><td><if $row['listen_statement']=='1'>{\Froxlor\I18N\Lang::getAll()['panel']['yes']}<else>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td></if>
<if $is_apache && !$is_apache24><td><if $row['namevirtualhost_statement']=='1'>{\Froxlor\I18N\Lang::getAll()['panel']['yes']}<else>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td></if>
<td><if $row['vhostcontainer']=='1'>{\Froxlor\I18N\Lang::getAll()['panel']['yes']}<else>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td>
<td><if $row['specialsettings']!=''>{\Froxlor\I18N\Lang::getAll()['panel']['yes']}<else>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td>
<if $is_apache><td><if $row['vhostcontainer_servername_statement']=='1'>{\Froxlor\I18N\Lang::getAll()['panel']['yes']}<else>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td></if>
<td><if $row['ssl']=='1'>{\Froxlor\I18N\Lang::getAll()['panel']['yes']}<else>{\Froxlor\I18N\Lang::getAll()['panel']['no']}</if></td>
<if !$is_nginx><td><if $row['listen_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td></if>
<if $is_apache && !$is_apache24><td><if $row['namevirtualhost_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td></if>
<td><if $row['vhostcontainer']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
<td><if $row['specialsettings']!=''>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
<if $is_apache><td><if $row['vhostcontainer_servername_statement']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td></if>
<td><if $row['ssl']=='1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if></td>
<td>
<a href="{$linker->getLink(array('section' => 'ipsandports', '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>&nbsp;
<a href="{$linker->getLink(array('section' => 'ipsandports', '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>
</td>
</tr>