Revert "refactor global array"

This reverts commit 370ccbdb74.

templates/Sparkle/admin/customers/customers.tpl

@@ -3,7 +3,7 @@ $header
 		<header>
 			<h2>
 				<img src="templates/{$theme}/assets/img/icons/group_edit_big.png" alt="" /> 
-				{\Froxlor\I18N\Lang::getAll()['admin']['customers']} ({$customercount})
+				{$lng['admin']['customers']} ({$customercount})
 			</h2>
 		</header>
 
@@ -20,7 +20,7 @@ $header
 				<if \Froxlor\User::getAll()['customers_used'] < \Froxlor\User::getAll()['customers'] || \Froxlor\User::getAll()['customers'] == '-1'>
 				<div class="overviewadd">
 					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
-					<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['customer_add']}</a>
+					<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
 				</div>
 				</if>
 
@@ -28,18 +28,18 @@ $header
 					<thead>
 						<tr>
 							<th>
-								{\Froxlor\I18N\Lang::getAll()['customer']['name']},
-								{\Froxlor\I18N\Lang::getAll()['customer']['firstname']}&nbsp;{$arrowcode['c.name']}
+								{$lng['customer']['name']},
+								{$lng['customer']['firstname']}&nbsp;{$arrowcode['c.name']}
 							</th>
 							<th>
-								{\Froxlor\I18N\Lang::getAll()['login']['username']}&nbsp;{$arrowcode['c.loginname']}
+								{$lng['login']['username']}&nbsp;{$arrowcode['c.loginname']}
 							</th>
 							<th>
-								{\Froxlor\I18N\Lang::getAll()['admin']['admin']}&nbsp;{$arrowcode['a.loginname']}
+								{$lng['admin']['admin']}&nbsp;{$arrowcode['a.loginname']}
 							</th>
-							<th>{\Froxlor\I18N\Lang::getAll()['admin']['lastlogin_succ']}</th>
+							<th>{$lng['admin']['lastlogin_succ']}</th>
 							<th></th>
-							<th>{\Froxlor\I18N\Lang::getAll()['panel']['options']}</th>
+							<th>{$lng['panel']['options']}</th>
 						</tr>
 					</thead>
 			
@@ -61,7 +61,7 @@ $header
 			<if (\Froxlor\User::getAll()['customers_used'] < \Froxlor\User::getAll()['customers'] || \Froxlor\User::getAll()['customers'] == '-1') && 15 < \Froxlor\User::getAll()['customers_used'] >
 			<div class="overviewadd">
 				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
-				<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['customer_add']}</a>
+				<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
 			</div>
 			</if>
 

templates/Sparkle/admin/customers/customers_add.tpl

@@ -28,8 +28,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>

templates/Sparkle/admin/customers/customers_customer.tpl

@@ -26,16 +26,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="{\Froxlor\I18N\Lang::getAll()['panel']['used']}:<br>web: {$row['webspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}<br>mail: {$row['mailspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{\Froxlor\I18N\Lang::getAll()['panel']['assigned']}:<br>{$row['diskspace']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}">
+						<div class="progress progress-danger tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
 							<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="{\Froxlor\I18N\Lang::getAll()['panel']['used']}:<br>web: {$row['webspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}<br>mail: {$row['mailspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{\Froxlor\I18N\Lang::getAll()['panel']['assigned']}:<br>{$row['diskspace']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}">
+							<div class="progress progress-warn tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
 								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 							</div>
 						<else>
-							<div class="progress tipper" title="{\Froxlor\I18N\Lang::getAll()['panel']['used']}:<br>web: {$row['webspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}<br>mail: {$row['mailspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{\Froxlor\I18N\Lang::getAll()['panel']['assigned']}:<br>{$row['diskspace']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}">
+							<div class="progress tipper" title="{$lng['panel']['used']}:<br>web: {$row['webspace_used']} {$lng['customer']['mib']}<br>mail: {$row['mailspace_used']} {$lng['customer']['mib']}<br>mysql: {$row['dbspace_used']} MiB<br><br>{$lng['panel']['assigned']}:<br>{$row['diskspace']} {$lng['customer']['mib']}">
 								<div class="bar" aria-valuenow="{$disk_percent}" aria-valuemin="0" aria-valuemax="100"></div>
 							</div>
 						</if>
@@ -50,16 +50,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>
@@ -74,18 +74,18 @@
 	</td>
 	<td>
 		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}">
-			<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' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}">
-			<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 $islocked == 1>
 			&nbsp;<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'unlock', 'id' => $row['customerid']))}">
-				<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{\Froxlor\I18N\Lang::getAll()['panel']['unlock']}" title="{\Froxlor\I18N\Lang::getAll()['panel']['unlock']}" />
+				<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['panel']['unlock']}" title="{$lng['panel']['unlock']}" />
 			</a>
 		</if>
 		<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>

templates/Sparkle/admin/customers/customers_edit.tpl

@@ -29,8 +29,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>