Revert "refactor global array"

This reverts commit 370ccbdb74.
2018-12-22 08:15:31 +01:00
parent c800e89414
commit 7e39a7bc60
220 changed files with 2244 additions and 2227 deletions
--- a/templates/Sparkle/admin/admins/admins.tpl
+++ b/templates/Sparkle/admin/admins/admins.tpl
@@ -3,7 +3,7 @@ $header
 		<header>
 			<h2>
 				<img src="templates/{$theme}/assets/img/icons/group_edit_big.png" alt="" />&nbsp;
-				{\Froxlor\I18N\Lang::getAll()['admin']['admins']}&nbsp;({$admincount})
+				{$lng['admin']['admins']}&nbsp;({$admincount})
 			</h2>
 		</header>

@@ -19,17 +19,17 @@ $header

 				<div class="overviewadd">
 					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
-					<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['admin_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a>
 				</div>

 				<table class="full hl">
 					<thead>
 						<tr>
-							<th>{\Froxlor\I18N\Lang::getAll()['customer']['name']}&nbsp;{$arrowcode['name']}</th>
-							<th>{\Froxlor\I18N\Lang::getAll()['login']['username']}&nbsp;{$arrowcode['loginname']}</th>
-							<th>{\Froxlor\I18N\Lang::getAll()['admin']['customers']}</th>
+							<th>{$lng['customer']['name']}&nbsp;{$arrowcode['name']}</th>
+							<th>{$lng['login']['username']}&nbsp;{$arrowcode['loginname']}</th>
+							<th>{$lng['admin']['customers']}</th>
 							<th>&nbsp;</th>
-							<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
+							<th>{$lng['panel']['options']}</th>
 						</tr>
 					</thead>
 			
@@ -50,7 +50,7 @@ $header
 			<if 15 < $count >
 			<div class="overviewadd">
 				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
-				<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['admin_add']}</a>
+				<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a>
 			</div>
 			</if>

--- a/templates/Sparkle/admin/admins/admins_add.tpl
+++ b/templates/Sparkle/admin/admins/admins_add.tpl
@@ -27,8 +27,8 @@ $header
 	<article>
 		<section>
 			<p>
-				<span class="red">*</span>: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}<br />
-				<span class="red">**</span>: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatorycompany']}
+				<span class="red">*</span>: {$lng['admin']['valuemandatory']}<br />
+				<span class="red">**</span>: {$lng['admin']['valuemandatorycompany']}
 			</p>
 		</section>
 	</article>
--- a/templates/Sparkle/admin/admins/admins_admin.tpl
+++ b/templates/Sparkle/admin/admins/admins_admin.tpl
@@ -19,16 +19,16 @@
 				<span>Webspace:</span>
 				<if $row['diskspace'] != 'UL'>
 					<if (($row['diskspace']/100)*(int)\Froxlor\Settings::Get('system.report_webmax')) < $row['diskspace_used']>
-						<div class="progress progress-danger tipper" title="{$row['diskspace_used']} MiB {\Froxlor\I18N\Lang::getAll()['panel']['used']}, {$row['diskspace']} MiB {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}">
+						<div class="progress progress-danger tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
 							<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 						</div>
 					<else>
 						<if (($row['diskspace']/100)*((int)\Froxlor\Settings::Get('system.report_webmax') - 15)) < $row['diskspace_used']>
-							<div class="progress progress-warn tipper" title="{$row['diskspace_used']} MiB {\Froxlor\I18N\Lang::getAll()['panel']['used']}, {$row['diskspace']} MiB {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}">
+							<div class="progress progress-warn tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
 								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 							</div>
 						<else>
-							<div class="progress tipper" title="{$row['diskspace_used']} MiB {\Froxlor\I18N\Lang::getAll()['panel']['used']}, {$row['diskspace']} MiB {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}">
+							<div class="progress tipper" title="{$row['diskspace_used']} MiB {$lng['panel']['used']}, {$row['diskspace']} MiB {$lng['panel']['assigned']}">
 								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 							</div>
 						</if>
@@ -43,16 +43,16 @@
 				<span>Traffic:</span>
 				<if $row['traffic'] != 'UL'>
 					<if (($row['traffic']/100)*(int)\Froxlor\Settings::Get('system.report_trafficmax')) < $row['traffic_used']>
-						<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {\Froxlor\I18N\Lang::getAll()['panel']['used']}, {$row['traffic']} GiB {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}">
+						<div class="progress progress-danger tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
 							<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 						</div>
 					<else>
 						<if (($row['traffic']/100)*((int)\Froxlor\Settings::Get('system.report_trafficmax') - 15)) < $row['traffic_used']>
-							<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {\Froxlor\I18N\Lang::getAll()['panel']['used']}, {$row['traffic']} GiB {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}">
+							<div class="progress progress-warn tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
 								<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 							</div>
 						<else>
-							<div class="progress tipper" title="{$row['traffic_used']} GiB {\Froxlor\I18N\Lang::getAll()['panel']['used']}, {$row['traffic']} GiB {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}">
+							<div class="progress tipper" title="{$row['traffic_used']} GiB {$lng['panel']['used']}, {$row['traffic']} GiB {$lng['panel']['assigned']}">
 								<div class="bar" aria-valuenow="{$traffic_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 							</div>
 						</if>
@@ -67,13 +67,13 @@
 	</td>
 	<td>
 		<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'edit', 'id' => $row['adminid']))}">
-			<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' => 'admins', 'page' => $page, 'action' => 'delete', 'id' => $row['adminid']))}">
-			<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 $row['custom_notes'] != ''>
-			&nbsp;<img src="templates/{$theme}/assets/img/icons/info.png" class="notes" data-id="{$row['loginname']}" alt="{\Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title']}" title="{\Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title']}" />
+			&nbsp;<img src="templates/{$theme}/assets/img/icons/info.png" class="notes" data-id="{$row['loginname']}" alt="{$lng['usersettings']['custom_notes']['title']}" title="{$lng['usersettings']['custom_notes']['title']}" />
 		</if>
 	</td>
 </tr>
--- a/templates/Sparkle/admin/admins/admins_edit.tpl
+++ b/templates/Sparkle/admin/admins/admins_edit.tpl
@@ -8,7 +8,7 @@ $header

 		<if $result['adminid'] == \Froxlor\User::getAll()['userid']>
 			<div class="warningcontainer bradius">
-				<div class="warning">{\Froxlor\I18N\Lang::getAll()['error']['youcanteditallfieldsofyourself']}</div>
+				<div class="warning">{$lng['error']['youcanteditallfieldsofyourself']}</div>
 			</div>
 		</if>

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