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

6
templates/Sparkle/admin/configfiles/choose.tpl vendored
View File

@@ -2,9 +2,9 @@ $header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']}" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']} &nbsp;
[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['wizard']}</a>]
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="{$lng['admin']['configfiles']['serverconfiguration']}" />&nbsp;
{$lng['admin']['configfiles']['serverconfiguration']} &nbsp;
[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'configfiles'))}">{$lng['admin']['configfiles']['wizard']}</a>]
</h2>
</header>

10
templates/Sparkle/admin/configfiles/configfiles.tpl vendored
View File

@@ -5,19 +5,19 @@ $header
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="" />&nbsp;
{$dist_display}&nbsp;&raquo;&nbsp;
{$services[$service]->title}&nbsp;&raquo;&nbsp;
{$daemons[$daemon]->title}&nbsp;[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{\Froxlor\I18N\Lang::getAll()['panel']['back']}</a>]
{$daemons[$daemon]->title}&nbsp;[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution, 'service' => $service))}">{$lng['panel']['back']}</a>]
</h2>
</header>
<section>
<div class="info">
<p>{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['legend']}</p>
<p>{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['commands']}</p>
<p>{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['files']}</p>
<p>{$lng['admin']['configfiles']['legend']}</p>
<p>{$lng['admin']['configfiles']['commands']}</p>
<p>{$lng['admin']['configfiles']['files']}</p>
<p>
<form id="configfiles_setmysqlpw" action="#">
FROXLOR_MYSQL_PASSWORD: <input type="text" class="text" id="configfiles_mysqlpw" name="configfiles_mysqlpw" value="" />
<input type="submit" value="{\Froxlor\I18N\Lang::getAll()['panel']['set']}" />
<input type="submit" value="{$lng['panel']['set']}" />
</form>
</p>
</div>

30
templates/Sparkle/admin/configfiles/wizard.tpl vendored
View File

@@ -2,16 +2,16 @@ $header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']}" />&nbsp;
{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']} &nbsp;
[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['overview']}</a>]
<img src="templates/{$theme}/assets/img/icons/settings_big.png" alt="{$lng['admin']['configfiles']['serverconfiguration']}" />&nbsp;
{$lng['admin']['configfiles']['serverconfiguration']} &nbsp;
[<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview'))}">{$lng['admin']['configfiles']['overview']}</a>]
</h2>
</header>
<div class="messagewrapperfull">
<div class="warningcontainer bradius">
<div class="warningtitle">{\Froxlor\I18N\Lang::getAll()['admin']['warning']}</div>
<div class="warning">{\Froxlor\I18N\Lang::getAll()['panel']['settings_before_configuration']}</div>
<div class="warningtitle">{$lng['admin']['warning']}</div>
<div class="warning">{$lng['panel']['settings_before_configuration']}</div>
</div>
</div>
@@ -23,46 +23,46 @@ $header
<table class="tiny center">
<tr>
<td><b>{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['distribution']}:</b></td>
<td><b>{$lng['admin']['configfiles']['distribution']}:</b></td>
<td>
<if $distribution != ''>
<input type="hidden" name="distribution" value="$distribution"/>
<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page))}">{$dist_display}</a>
<else>
<select id="config_distribution" name="distribution">
<option value="choose">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['choosedistribution']}</option>
<option value="choose">{$lng['admin']['configfiles']['choosedistribution']}</option>
{$distributions_select}
</select>
</if>
</td>
</tr>
<tr>
<td><b>{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['service']}:</b></td>
<td><b>{$lng['admin']['configfiles']['service']}:</b></td>
<td>
<if $service != ''>
<input type="hidden" name="service" value="$service"/>
<a href="{$linker->getLink(array('section' => 'configfiles', 'page' => $page, 'distribution' => $distribution))}">{$services[$service]->title}</a>
<else>
<select id="config_service" name="service">
<option value="choose">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['chooseservice']}</option>
<option value="choose">{$lng['admin']['configfiles']['chooseservice']}</option>
{$services_select}
</select>
</if>
</td>
</tr>
<tr>
<td><b>{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['daemon']}:</b></td>
<td><select id="config_daemon" name="daemon"><option value="choose">{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
<td><b>{$lng['admin']['configfiles']['daemon']}:</b></td>
<td><select id="config_daemon" name="daemon"><option value="choose">{$lng['admin']['configfiles']['choosedaemon']}</option>{$daemons_select}</select></td>
</tr>
<tfoot>
<tr>
<td colspan="2" align="center"><input class="bottom" type="submit" value="{\Froxlor\I18N\Lang::getAll()['panel']['next']}" /></td>
<td colspan="2" align="center"><input class="bottom" type="submit" value="{$lng['panel']['next']}" /></td>
</tr>
<tr>
<if \Froxlor\Settings::Get('panel.is_configured') == '0'>
<td colspan="2" align="center">{\Froxlor\I18N\Lang::getAll()['panel']['done_configuring']}:<br><br><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview', 'action' => 'setconfigured'))}" class="btnlink">{\Froxlor\I18N\Lang::getAll()['panel']['ihave_configured']}</a><br><br></td>
<td colspan="2" align="center">{$lng['panel']['done_configuring']}:<br><br><a href="{$linker->getLink(array('section' => 'configfiles', 'page' => 'overview', 'action' => 'setconfigured'))}" class="btnlink">{$lng['panel']['ihave_configured']}</a><br><br></td>
<else>
<td colspan="2" align="center">{\Froxlor\I18N\Lang::getAll()['panel']['system_is_configured']}</td>
<td colspan="2" align="center">{$lng['panel']['system_is_configured']}</td>
</if>
</tr>
</tfoot>
@@ -73,7 +73,7 @@ $header
<br><br><br>
<section>
<p><strong>{\Froxlor\I18N\Lang::getAll()['panel']['alternative_cmdline_config']}:</strong></p>
<p><strong>{$lng['panel']['alternative_cmdline_config']}:</strong></p>
<div class="pushbot">
<textarea class="shell" rows="2" readonly>php {$basedir}/install/scripts/config-services.php --froxlor-dir={$basedir} --create</textarea>
</div>