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

18
templates/Sparkle/admin/phpconfig/fpmdaemons.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/phpsettings_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['menue']['phpsettings']['fpmdaemons']}
{$lng['menue']['phpsettings']['fpmdaemons']}
</h2>
</header>
@@ -11,18 +11,18 @@ $header
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}</a>
<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
</div>
<table class="full hl">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['activephpconfigs']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['reload']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['configdir']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['admin']['phpsettings']['description']}</th>
<th>{$lng['admin']['phpsettings']['activephpconfigs']}</th>
<th>{$lng['serversettings']['phpfpm_settings']['reload']}</th>
<th>{$lng['serversettings']['phpfpm_settings']['configdir']}</th>
<th>{$lng['serversettings']['phpfpm_settings']['pm']}</th>
<th>{$lng['panel']['options']}</th>
</thead>
<tbody>
$tablecontent
@@ -32,7 +32,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' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}</a>
<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
</div>
</if>

4
templates/Sparkle/admin/phpconfig/fpmdaemons_overview.tpl vendored
View File

@@ -6,11 +6,11 @@
<td>{$row['pm']}</td>
<td>
<a href="{$linker->getLink(array('section' => 'phpsettings', '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>
<if $row['id'] != 1>
&nbsp;<a href="{$linker->getLink(array('section' => 'phpsettings', '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>
</td>

18
templates/Sparkle/admin/phpconfig/overview.tpl vendored
View File

@@ -3,7 +3,7 @@ $header
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/phpsettings_big.png"
alt="" />&nbsp; {\Froxlor\I18N\Lang::getAll()['menue']['phpsettings']['maintitle']}
alt="" />&nbsp; {$lng['menue']['phpsettings']['maintitle']}
</h2>
</header>
@@ -12,20 +12,20 @@ $header
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a
href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}</a>
href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
</div>
<table class="full hl">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['activedomains']}</th>
<th>{$lng['admin']['phpsettings']['description']}</th>
<th>{$lng['admin']['phpsettings']['activedomains']}</th>
<if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['fpmdesc']}</th>
<th>{$lng['admin']['phpsettings']['fpmdesc']}</th>
<else>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['binary']}</th></if>
<th>{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['admin']['phpsettings']['binary']}</th></if>
<th>{$lng['admin']['phpsettings']['file_extensions']}</th>
<th>{$lng['panel']['options']}</th>
</thead>
<tbody>$tablecontent
</tbody>
@@ -34,7 +34,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' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}</a>
<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
</div>
</if>

32
templates/Sparkle/admin/phpconfig/overview_add.tpl vendored
View File

@@ -25,7 +25,7 @@ $header
<article>
<header>
<h3>
{\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}
{$lng['admin']['templates']['template_replace_vars']}
</h3>
</header>
@@ -34,63 +34,63 @@ $header
<table class="full">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['variable']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['description']}</th>
<th>{$lng['panel']['variable']}</th>
<th>{$lng['panel']['description']}</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="2">
<strong>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['template_replace_vars']}</strong>
<strong>{$lng['admin']['phpconfig']['template_replace_vars']}</strong>
</td>
</tr>
<tr>
<td><em>{PEAR_DIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['pear_dir']}</td>
<td>{$lng['admin']['phpconfig']['pear_dir']}</td>
</tr>
<tr>
<td><em>{OPEN_BASEDIR_C}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_c']}</td>
<td>{$lng['admin']['phpconfig']['open_basedir_c']}</td>
</tr>
<tr>
<td><em>{OPEN_BASEDIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir']}</td>
<td>{$lng['admin']['phpconfig']['open_basedir']}</td>
</tr>
<tr>
<td><em>{OPEN_BASEDIR_GLOBAL}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_global']}</td>
<td>{$lng['admin']['phpconfig']['open_basedir_global']}</td>
</tr>
<tr>
<td><em>{TMP_DIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['tmp_dir']}</td>
<td>{$lng['admin']['phpconfig']['tmp_dir']}</td>
</tr>
<tr>
<td><em>{CUSTOMER_EMAIL}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer_email']}</td>
<td>{$lng['admin']['phpconfig']['customer_email']}</td>
</tr>
<tr>
<td><em>{ADMIN_EMAIL}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin_email']}</td>
<td>{$lng['admin']['phpconfig']['admin_email']}</td>
</tr>
<tr>
<td><em>{DOMAIN}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['domain']}</td>
<td>{$lng['admin']['phpconfig']['domain']}</td>
</tr>
<tr>
<td><em>{CUSTOMER}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer']}</td>
<td>{$lng['admin']['phpconfig']['customer']}</td>
</tr>
<tr>
<td><em>{ADMIN}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin']}</td>
<td>{$lng['admin']['phpconfig']['admin']}</td>
</tr>
<tr>
<td><em>{DOCUMENT_ROOT}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['docroot']}</td>
<td>{$lng['admin']['phpconfig']['docroot']}</td>
</tr>
<tr>
<td><em>{CUSTOMER_HOMEDIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['homedir']}</td>
<td>{$lng['admin']['phpconfig']['homedir']}</td>
</tr>
</tbody>
</table>

30
templates/Sparkle/admin/phpconfig/overview_edit.tpl vendored
View File

@@ -26,7 +26,7 @@ $header
<article>
<header>
<h3>
{\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}
{$lng['admin']['templates']['template_replace_vars']}
</h3>
</header>
@@ -35,58 +35,58 @@ $header
<table class="full">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['variable']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['description']}</th>
<th>{$lng['panel']['variable']}</th>
<th>{$lng['panel']['description']}</th>
</tr>
</thead>
<tbody>
<tr>
<td><em>{PEAR_DIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['pear_dir']}</td>
<td>{$lng['admin']['phpconfig']['pear_dir']}</td>
</tr>
<tr>
<td><em>{OPEN_BASEDIR_C}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_c']}</td>
<td>{$lng['admin']['phpconfig']['open_basedir_c']}</td>
</tr>
<tr>
<td><em>{OPEN_BASEDIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir']}</td>
<td>{$lng['admin']['phpconfig']['open_basedir']}</td>
</tr>
<tr>
<td><em>{OPEN_BASEDIR_GLOBAL}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_global']}</td>
<td>{$lng['admin']['phpconfig']['open_basedir_global']}</td>
</tr>
<tr>
<td><em>{TMP_DIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['tmp_dir']}</td>
<td>{$lng['admin']['phpconfig']['tmp_dir']}</td>
</tr>
<tr>
<td><em>{CUSTOMER_EMAIL}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer_email']}</td>
<td>{$lng['admin']['phpconfig']['customer_email']}</td>
</tr>
<tr>
<td><em>{ADMIN_EMAIL}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin_email']}</td>
<td>{$lng['admin']['phpconfig']['admin_email']}</td>
</tr>
<tr>
<td><em>{DOMAIN}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['domain']}</td>
<td>{$lng['admin']['phpconfig']['domain']}</td>
</tr>
<tr>
<td><em>{CUSTOMER}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer']}</td>
<td>{$lng['admin']['phpconfig']['customer']}</td>
</tr>
<tr>
<td><em>{ADMIN}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin']}</td>
<td>{$lng['admin']['phpconfig']['admin']}</td>
</tr>
<tr>
<td><em>{DOCUMENT_ROOT}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['docroot']}</td>
<td>{$lng['admin']['phpconfig']['docroot']}</td>
</tr>
<tr>
<td><em>{CUSTOMER_HOMEDIR}</em></td>
<td>{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['homedir']}</td>
<td>{$lng['admin']['phpconfig']['homedir']}</td>
</tr>
</tbody>
</table>

6
templates/Sparkle/admin/phpconfig/overview_overview.tpl vendored
View File

@@ -1,6 +1,6 @@
<tr class="top">
<td><strong>{$row['description']}</strong></td>
<td>{$domains}<if 0 < $subdomains_count><if !empty($domains)>+ </if>{$subdomains_count} {\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}</if></td>
<td>{$domains}<if 0 < $subdomains_count><if !empty($domains)>+ </if>{$subdomains_count} {$lng['customer']['subdomains']}</if></td>
<if \Froxlor\Settings::Get('phpfpm.enabled') == '1'>
<td>{$row['fpmdesc']}</td>
<else>
@@ -9,11 +9,11 @@
<td>{$row['file_extensions']}</td>
<td>
<a href="{$linker->getLink(array('section' => 'phpsettings', '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>
<if $row['id'] != 1>
&nbsp;<a href="{$linker->getLink(array('section' => 'phpsettings', '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>
</td>