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

4
templates/Sparkle/customer/extras/backup.tpl vendored
View File

@@ -10,8 +10,8 @@ $header
<if !empty($existing_backupJob)>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{\Froxlor\I18N\Lang::getAll()['admin']['warning']}</div>
<div class="warning">{\Froxlor\I18N\Lang::getAll()['error']['customerhasongoingbackupjob']}</div>
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning">{$lng['error']['customerhasongoingbackupjob']}</div>
</div>
</div>
</if>

10
templates/Sparkle/customer/extras/backup_listexisting.tpl vendored
View File

@@ -1,9 +1,9 @@
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['path']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['extras']['backup_web']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['extras']['backup_mail']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['extras']['backup_dbs']}</th>
<th>{$lng['panel']['path']}</th>
<th>{$lng['extras']['backup_web']}</th>
<th>{$lng['extras']['backup_mail']}</th>
<th>{$lng['extras']['backup_dbs']}</th>
</tr>
</thead>
<tbody>
@@ -19,7 +19,7 @@
<td colspan="4">
<p>
<input type="hidden" name="backup_job_entry" value="{$existing_backupJob['id']}" />
<input type="submit" value="{\Froxlor\I18N\Lang::getAll()['panel']['abort']}" class="nobutton" />
<input type="submit" value="{$lng['panel']['abort']}" class="nobutton" />
</p>
</td>
</tr>

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

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

20
templates/Sparkle/customer/extras/htaccess.tpl vendored
View File

@@ -3,7 +3,7 @@
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/htaccess_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['menue']['extras']['pathoptions']}
{$lng['menue']['extras']['pathoptions']}
</h2>
</header>
@@ -19,21 +19,21 @@
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add']}</a>
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a>
</div>
<table class="full hl">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['path']}&nbsp;{$arrowcode['path']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['extras']['view_directory']}&nbsp;{$arrowcode['options_indexes']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['extras']['error404path']}&nbsp;{$arrowcode['error404path']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['extras']['error403path']}&nbsp;{$arrowcode['error403path']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['extras']['error500path']}&nbsp;{$arrowcode['error500path']}</th>
<th>{$lng['panel']['path']}&nbsp;{$arrowcode['path']}</th>
<th>{$lng['extras']['view_directory']}&nbsp;{$arrowcode['options_indexes']}</th>
<th>{$lng['extras']['error404path']}&nbsp;{$arrowcode['error404path']}</th>
<th>{$lng['extras']['error403path']}&nbsp;{$arrowcode['error403path']}</th>
<th>{$lng['extras']['error500path']}&nbsp;{$arrowcode['error500path']}</th>
<if $cperlenabled == 1 >
<th>{\Froxlor\I18N\Lang::getAll()['extras']['execute_perl']}&nbsp;{$arrowcode['options_cgi']}</th>
<th>{$lng['extras']['execute_perl']}&nbsp;{$arrowcode['options_cgi']}</th>
</if>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>
@@ -53,7 +53,7 @@
<if 15 < $count >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add']}</a>
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a>
</div>
</if>
</form>

4
templates/Sparkle/customer/extras/htaccess_htaccess.tpl vendored
View File

@@ -9,10 +9,10 @@
</if>
<td>
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', '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' => 'extras', 'page' => 'htaccess', '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>

12
templates/Sparkle/customer/extras/htpasswds.tpl vendored
View File

@@ -3,7 +3,7 @@
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/htpasswd_big.png" alt="" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['menue']['extras']['directoryprotection']}
{$lng['menue']['extras']['directoryprotection']}
</h2>
</header>
@@ -19,15 +19,15 @@
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add']}</a>
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a>
</div>
<table class="full hl">
<thead>
<tr>
<th>{\Froxlor\I18N\Lang::getAll()['login']['username']}&nbsp;{$arrowcode['username']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['path']}&nbsp;{$arrowcode['path']}</th>
<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
<th>{$lng['login']['username']}&nbsp;{$arrowcode['username']}</th>
<th>{$lng['panel']['path']}&nbsp;{$arrowcode['path']}</th>
<th>{$lng['panel']['options']}</th>
</tr>
</thead>
@@ -49,7 +49,7 @@
<if 15 < $count >
<div class="overviewadd">
<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add']}</a>
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a>
</div>
</if>

4
templates/Sparkle/customer/extras/htpasswds_htpasswd.tpl vendored
View File

@@ -3,10 +3,10 @@
<td>{$row['path']}</td>
<td>
<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', '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' => 'extras', 'page' => 'htpasswds', '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>