Revert "refactor global array"

This reverts commit 370ccbdb74.

lib/Froxlor/Api/ApiCommand.php

@@ -135,6 +135,8 @@ abstract class ApiCommand extends ApiParameter
 	 */
 	private function initLang()
 	{
+		global $lng;
+
 		// query the whole table
 		$result_stmt = \Froxlor\Database\Database::query("SELECT * FROM `" . TABLE_PANEL_LANGUAGE . "`");
 
@@ -177,7 +179,7 @@ abstract class ApiCommand extends ApiParameter
 		include_once \Froxlor\FileDir::makeSecurePath(\Froxlor\Froxlor::getInstallDir() . '/lng/lng_references.php');
 
 		// set array for ApiCommand
-		$this->lng = \Froxlor\I18N\Lang::getAll();
+		$this->lng = $lng;
 	}
 
 	/**

lib/Froxlor/Config/ConfigDaemon.php

@@ -424,12 +424,13 @@ class ConfigDaemon
 			if (preg_match('/^settings\.(.*)$/', $matches[1], $match)) {
 				return \Froxlor\Settings::Get($match[1]);
 			} elseif (preg_match('/^lng\.(.*)(?:\.(.*)(?:\.(.*)))$/U', $matches[1], $match)) {
+				global $lng;
 				if (isset($match[1]) && $match[1] != '' && isset($match[2]) && $match[2] != '' && isset($match[3]) && $match[3] != '') {
-					return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]][$match[3]];
+					return $lng[$match[1]][$match[2]][$match[3]];
 				} elseif (isset($match[1]) && $match[1] != '' && isset($match[2]) && $match[2] != '') {
-					return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]];
+					return $lng[$match[1]][$match[2]];
 				} elseif (isset($match[1]) && $match[1] != '') {
-					return \Froxlor\I18N\Lang::getAll()[$match[1]];
+					return $lng[$match[1]];
 				}
 				return '';
 			} elseif (preg_match('/^const\.(.*)$/', $matches[1], $match)) {

lib/Froxlor/Config/ConfigService.php

@@ -137,12 +137,13 @@ class ConfigService
 			if (preg_match('/^settings\.(.*)$/', $matches[1], $match)) {
 				return \Froxlor\Settings::Get($match[1]);
 			} elseif (preg_match('/^lng\.(.*)(?:\.(.*)(?:\.(.*)))$/U', $matches[1], $match)) {
+				global $lng;
 				if (isset($match[1]) && $match[1] != '' && isset($match[2]) && $match[2] != '' && isset($match[3]) && $match[3] != '') {
-					return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]][$match[3]];
+					return $lng[$match[1]][$match[2]][$match[3]];
 				} elseif (isset($match[1]) && $match[1] != '' && isset($match[2]) && $match[2] != '') {
-					return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]];
+					return $lng[$match[1]][$match[2]];
 				} elseif (isset($match[1]) && $match[1] != '') {
-					return \Froxlor\I18N\Lang::getAll()[$match[1]];
+					return $lng[$match[1]];
 				}
 				return '';
 			}

lib/Froxlor/Cron/Traffic/ReportsCron.php

@@ -106,11 +106,11 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 						'varname' => 'trafficmaxpercent_subject'
 					);
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['trafficmaxpercent']['subject']), $replace_arr));
+					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr));
 
 					$result2_data['varname'] = 'trafficmaxpercent_mailbody';
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['trafficmaxpercent']['mailbody']), $replace_arr));
+					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr));
 
 					$_mailerror = false;
 					$mailerr_msg = "";
@@ -208,11 +208,11 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 						'varname' => 'trafficmaxpercent_subject'
 					);
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['trafficmaxpercent']['subject']), $replace_arr));
+					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr));
 
 					$resul2_data['varname'] = 'trafficmaxpercent_mailbody';
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['trafficmaxpercent']['mailbody']), $replace_arr));
+					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr));
 
 					$_mailerror = false;
 					$mailerr_msg = "";
@@ -405,11 +405,11 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 						'varname' => 'diskmaxpercent_subject'
 					);
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['diskmaxpercent']['subject']), $replace_arr));
+					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr));
 
 					$result2_data['varname'] = 'diskmaxpercent_mailbody';
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['diskmaxpercent']['mailbody']), $replace_arr));
+					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr));
 
 					$_mailerror = false;
 					$mailerr_msg = "";
@@ -498,11 +498,11 @@ class ReportsCron extends \Froxlor\Cron\FroxlorCron
 						'varname' => 'diskmaxpercent_subject'
 					);
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['diskmaxpercent']['subject']), $replace_arr));
+					$mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr));
 
 					$result2_data['varname'] = 'diskmaxpercent_mailbody';
 					$result2 = Database::pexecute_first($result2_stmt, $result2_data);
-					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['diskmaxpercent']['mailbody']), $replace_arr));
+					$mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr));
 
 					$_mailerror = false;
 					$mailerr_msg = "";

lib/Froxlor/Domain/Domain.php

@@ -35,6 +35,8 @@ class Domain
 	 */
 	public static function getRedirectCodes($add_desc = true)
 	{
+		global $lng;
+
 		$sql = "SELECT * FROM `" . TABLE_PANEL_REDIRECTCODES . "` WHERE `enabled` = '1' ORDER BY `id` ASC";
 		$result_stmt = Database::query($sql);
 
@@ -42,7 +44,7 @@ class Domain
 		while ($rc = $result_stmt->fetch(\PDO::FETCH_ASSOC)) {
 			$codes[$rc['id']] = $rc['code'];
 			if ($add_desc) {
-				$codes[$rc['id']] .= ' (' . \Froxlor\I18N\Lang::getAll()['redirect_desc'][$rc['desc']] . ')';
+				$codes[$rc['id']] .= ' (' . $lng['redirect_desc'][$rc['desc']] . ')';
 			}
 		}
 
@@ -330,4 +332,4 @@ class Domain
 		}
 		return '';
 	}
-}
+}

lib/Froxlor/Domain/IpAddr.php

@@ -73,8 +73,9 @@ class IpAddr
 
 	public static function getSslIpPortCombinations()
 	{
+		global $lng;
 		return array(
-			'' => \Froxlor\I18N\Lang::getAll()['panel']['none_value']
+			'' => $lng['panel']['none_value']
 		) + self::getIpPortCombinations(true);
 	}
-}
+}

lib/Froxlor/FileDir.php

@@ -381,6 +381,8 @@ class FileDir
 	 */
 	public static function makePathfield($path, $uid, $gid, $value = '', $dom = false)
 	{
+		global $lng;
+
 		$value = str_replace($path, '', $value);
 		$field = array();
 
@@ -427,20 +429,20 @@ class FileDir
 					// remove starting slash we added
 					// for the Dropdown, #225
 					$value = substr($value, 1);
-					// $field = \Froxlor\I18N\Lang::getAll()['panel']['toomanydirs'];
+					// $field = $lng['panel']['toomanydirs'];
 					$field = array(
 						'type' => 'text',
 						'value' => htmlspecialchars($value),
-						'note' => \Froxlor\I18N\Lang::getAll()['panel']['toomanydirs']
+						'note' => $lng['panel']['toomanydirs']
 					);
 				}
 			} else {
-				// $field = \Froxlor\I18N\Lang::getAll()['panel']['dirsmissing'];
+				// $field = $lng['panel']['dirsmissing'];
 				// $field = '<input type="hidden" name="path" value="/" />';
 				$field = array(
 					'type' => 'hidden',
 					'value' => '/',
-					'note' => \Froxlor\I18N\Lang::getAll()['panel']['dirsmissing']
+					'note' => $lng['panel']['dirsmissing']
 				);
 			}
 		}

lib/Froxlor/PhpHelper.php

@@ -117,7 +117,7 @@ class PhpHelper
 	public static function loadConfigArrayDir()
 	{
 		// Workaround until we use gettext
-		global $theme;
+		global $lng, $theme;
 
 		// we now use dynamic function parameters
 		// so we can read from more than one directory

lib/Froxlor/System/Cronjob.php

@@ -188,18 +188,20 @@ class Cronjob
 
 	public static function getCronjobsLastRun()
 	{
+		global $lng;
+
 		$query = "SELECT `lastrun`, `desc_lng_key` FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `isactive` = '1' ORDER BY `cronfile` ASC";
 		$result = Database::query($query);
 
 		$cronjobs_last_run = '';
 		while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
 
-			$lastrun = \Froxlor\I18N\Lang::getAll()['cronjobs']['notyetrun'];
+			$lastrun = $lng['cronjobs']['notyetrun'];
 			if ($row['lastrun'] > 0) {
 				$lastrun = date('d.m.Y H:i:s', $row['lastrun']);
 			}
 
-			$text = \Froxlor\I18N\Lang::getAll()['crondesc'][$row['desc_lng_key']];
+			$text = $lng['crondesc'][$row['desc_lng_key']];
 			$value = $lastrun;
 
 			eval("\$cronjobs_last_run .= \"" . \Froxlor\UI\Template::getTemplate("index/overview_item") . "\";");
@@ -224,6 +226,8 @@ class Cronjob
 
 	public static function getOutstandingTasks()
 	{
+		global $lng;
+
 		$query = "SELECT * FROM `" . TABLE_PANEL_TASKS . "` ORDER BY `type` ASC";
 		$result = Database::query($query);
 
@@ -237,49 +241,49 @@ class Cronjob
 
 			// rebuilding webserver-configuration
 			if ($row['type'] == '1') {
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['rebuild_webserverconfig'];
+				$task_desc = $lng['tasks']['rebuild_webserverconfig'];
 			} // adding new user/
 			elseif ($row['type'] == '2') {
 				$loginname = '';
 				if (is_array($row['data'])) {
 					$loginname = $row['data']['loginname'];
 				}
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['adding_customer'];
+				$task_desc = $lng['tasks']['adding_customer'];
 				$task_desc = str_replace('%loginname%', $loginname, $task_desc);
 			} // rebuilding bind-configuration
 			elseif ($row['type'] == '4') {
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['rebuild_bindconfig'];
+				$task_desc = $lng['tasks']['rebuild_bindconfig'];
 			} // creating ftp-user directory
 			elseif ($row['type'] == '5') {
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['creating_ftpdir'];
+				$task_desc = $lng['tasks']['creating_ftpdir'];
 			} // deleting user-files
 			elseif ($row['type'] == '6') {
 				$loginname = '';
 				if (is_array($row['data'])) {
 					$loginname = $row['data']['loginname'];
 				}
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['deleting_customerfiles'];
+				$task_desc = $lng['tasks']['deleting_customerfiles'];
 				$task_desc = str_replace('%loginname%', $loginname, $task_desc);
 			} // deleting email-account
 			elseif ($row['type'] == '7') {
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['remove_emailacc_files'];
+				$task_desc = $lng['tasks']['remove_emailacc_files'];
 			} // deleting ftp-account
 			elseif ($row['type'] == '8') {
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['remove_ftpacc_files'];
+				$task_desc = $lng['tasks']['remove_ftpacc_files'];
 			} // Set FS - quota
 			elseif ($row['type'] == '10') {
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['diskspace_set_quota'];
+				$task_desc = $lng['tasks']['diskspace_set_quota'];
 			} // deleting user-files
 			elseif ($row['type'] == '20') {
 				$loginname = '';
 				if (is_array($row['data'])) {
 					$loginname = $row['data']['loginname'];
 				}
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['backup_customerfiles'];
+				$task_desc = $lng['tasks']['backup_customerfiles'];
 				$task_desc = str_replace('%loginname%', $loginname, $task_desc);
 			} // re-generating of cron.d-file
 			elseif ($row['type'] == '99') {
-				$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['regenerating_crond'];
+				$task_desc = $lng['tasks']['regenerating_crond'];
 			} // unknown
 			else {
 				$task_desc = "ERROR: Unknown task type '" . $row['type'] . "'";
@@ -291,13 +295,13 @@ class Cronjob
 		}
 
 		if (trim($tasks) == '') {
-			$value .= '<li>' . \Froxlor\I18N\Lang::getAll()['tasks']['noneoutstanding'] . '</li>';
+			$value .= '<li>' . $lng['tasks']['noneoutstanding'] . '</li>';
 		} else {
 			$value .= $tasks;
 		}
 
 		$value .= '</ul>';
-		$text = \Froxlor\I18N\Lang::getAll()['tasks']['outstanding_tasks'];
+		$text = $lng['tasks']['outstanding_tasks'];
 		eval("\$outstanding_tasks = \"" . \Froxlor\UI\Template::getTemplate("index/overview_item") . "\";");
 
 		return $outstanding_tasks;
@@ -342,4 +346,4 @@ class Cronjob
 
 		die($message);
 	}
-}
+}

lib/Froxlor/System/Crypt.php

@@ -116,9 +116,11 @@ class Crypt
 	 */
 	public static function getAvailablePasswordHashes()
 	{
+		global $lng;
+
 		// get available pwd-hases
 		$available_pwdhashes = array(
-			0 => \Froxlor\I18N\Lang::getAll()['serversettings']['systemdefault']
+			0 => $lng['serversettings']['systemdefault']
 		);
 		if (defined('CRYPT_MD5') && CRYPT_MD5 == 1) {
 			$available_pwdhashes[1] = 'MD5';

lib/Froxlor/UI/HTML.php

@@ -217,7 +217,7 @@ class HTML
 	 */
 	public static function makeyesno($name, $yesvalue, $novalue = '', $yesselected = '', $disabled = false)
 	{
-		global $theme;
+		global $lng, $theme;
 
 		if ($disabled) {
 			$d = ' disabled="disabled"';
@@ -230,7 +230,7 @@ class HTML
 		}
 
 		return '<select class="dropdown_noborder" id="' . $name . '" name="' . $name . '"' . $d . '>
-	<option value="' . $yesvalue . '"' . ($yesselected ? ' selected="selected"' : '') . '>' . \Froxlor\I18N\Lang::getAll()['panel']['yes'] . '</option><option value="' . $novalue . '"' . ($yesselected ? '' : ' selected="selected"') . '>' . \Froxlor\I18N\Lang::getAll()['panel']['no'] . '</option></select>';
+	<option value="' . $yesvalue . '"' . ($yesselected ? ' selected="selected"' : '') . '>' . $lng['panel']['yes'] . '</option><option value="' . $novalue . '"' . ($yesselected ? '' : ' selected="selected"') . '>' . $lng['panel']['no'] . '</option></select>';
 	}
 
 	/**
@@ -264,8 +264,8 @@ class HTML
 			}
 		}
 
-		if (isset(\Froxlor\I18N\Lang::getAll()['question'][$text])) {
-			$text = \Froxlor\I18N\Lang::getAll()['question'][$text];
+		if (isset($lng['question'][$text])) {
+			$text = $lng['question'][$text];
 		}
 
 		$text = strtr($text, array(
@@ -287,12 +287,12 @@ class HTML
 			}
 		}
 
-		if (isset(\Froxlor\I18N\Lang::getAll()['question'][$text])) {
-			$text = \Froxlor\I18N\Lang::getAll()['question'][$text];
+		if (isset($lng['question'][$text])) {
+			$text = $lng['question'][$text];
 		}
 
-		if (isset(\Froxlor\I18N\Lang::getAll()['question'][$chk_text])) {
-			$chk_text = \Froxlor\I18N\Lang::getAll()['question'][$chk_text];
+		if (isset($lng['question'][$chk_text])) {
+			$chk_text = $lng['question'][$chk_text];
 		}
 
 		if ($show_checkbox) {
@@ -308,4 +308,4 @@ class HTML
 		eval("echo \"" . Template::getTemplate('misc/question_yesno_checkbox', '1') . "\";");
 		exit();
 	}
-}
+}

lib/Froxlor/UI/HtmlForm.php

@@ -29,7 +29,7 @@ class HtmlForm
 
 	public static function genHTMLForm($data = array())
 	{
-		global $theme;
+		global $lng, $theme;
 		$nob = false;
 
 		self::$_form = '';
@@ -233,7 +233,7 @@ class HtmlForm
 	 *
 	 * <code>
 	 * $data = array(
-	 * 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_imap'],
+	 * 'label' => $lng['customer']['email_imap'],
 	 * 'type' => 'checkbox',
 	 * 'values' => array(
 	 * array( 'label' => 'active',

lib/Froxlor/UI/Paging.php

@@ -405,8 +405,8 @@ class Paging
 
 		$breakorws = ($break ? '<br />' : '&nbsp;');
 		foreach (array(
-			'asc' => \Froxlor\I18N\Lang::getAll()['panel']['ascending'],
-			'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descending']
+			'asc' => $lng['panel']['ascending'],
+			'desc' => $lng['panel']['descending']
 		) as $sortordertype => $sortorderdescription) {
 			$orderoptions .= HTML::makeoption($sortorderdescription, $sortordertype, $this->sortorder, true, true);
 		}

lib/Froxlor/UI/Response.php

@@ -94,13 +94,13 @@ class Response
 
 		$link = '';
 		if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) !== false) {
-			$link = '<a href="' . htmlentities($_SERVER['HTTP_REFERER']) . '">' . \Froxlor\I18N\Lang::getAll()['panel']['back'] . '</a>';
+			$link = '<a href="' . htmlentities($_SERVER['HTTP_REFERER']) . '">' . $lng['panel']['back'] . '</a>';
 		}
 
 		$error = '';
 		foreach ($errors as $single_error) {
-			if (isset(\Froxlor\I18N\Lang::getAll()['error'][$single_error])) {
-				$single_error = \Froxlor\I18N\Lang::getAll()['error'][$single_error];
+			if (isset($lng['error'][$single_error])) {
+				$single_error = $lng['error'][$single_error];
 				$single_error = strtr($single_error, array(
 					'%s' => $replacer
 				));
@@ -129,7 +129,7 @@ class Response
 		$_SESSION['requestData'] = $_POST;
 		$link = '';
 		if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) !== false) {
-			$link = '<a href="' . htmlentities($_SERVER['HTTP_REFERER']) . '">' . \Froxlor\I18N\Lang::getAll()['panel']['back'] . '</a>';
+			$link = '<a href="' . htmlentities($_SERVER['HTTP_REFERER']) . '">' . $lng['panel']['back'] . '</a>';
 		}
 		$error = $message;
 		eval("echo \"" . Template::getTemplate('misc/error', '1') . "\";");
@@ -152,8 +152,8 @@ class Response
 	{
 		global $s, $header, $footer, $theme;
 
-		if (isset(\Froxlor\I18N\Lang::getAll()['success'][$success_message])) {
-			$success_message = strtr(\Froxlor\I18N\Lang::getAll()['success'][$success_message], array(
+		if (isset($lng['success'][$success_message])) {
+			$success_message = strtr($lng['success'][$success_message], array(
 				'%s' => htmlentities($replacer)
 			));
 		}

lib/formfields/admin/admin/formfield.admin_add.php

@@ -16,65 +16,65 @@
  */
 return array(
 	'admin_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['admin_add'],
+		'title' => $lng['admin']['admin_add'],
 		'image' => 'icons/user_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'],
+				'title' => $lng['admin']['accountdata'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'new_loginname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'text',
 						'mandatory' => true
 					),
 					'admin_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'mandatory' => true,
 						'autocomplete' => 'off'
 					),
 					'admin_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'def_language' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
+						'label' => $lng['login']['language'],
 						'type' => 'select',
 						'select_var' => $language_options
 					)
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'],
+				'title' => $lng['admin']['contactdata'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'name' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'],
+						'label' => $lng['customer']['name'],
 						'type' => 'text',
 						'mandatory' => true
 					),
 					'email' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'],
+						'label' => $lng['customer']['email'],
 						'type' => 'text',
 						'mandatory' => true
 					),
 					'custom_notes' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'],
+						'label' => $lng['usersettings']['custom_notes']['title'],
+						'desc' => $lng['usersettings']['custom_notes']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12
 					),
 					'custom_notes_show' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'],
+						'label' => $lng['usersettings']['custom_notes']['show'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -83,27 +83,27 @@ return array(
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'],
+				'title' => $lng['admin']['servicedata'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'ipaddress' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ipaddress']['title'],
+						'label' => $lng['serversettings']['ipaddress']['title'],
 						'type' => 'select',
 						'select_var' => $ipaddress
 					),
 					'change_serversettings' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['change_serversettings'],
+						'label' => $lng['admin']['change_serversettings'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'customers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers'],
+						'label' => $lng['admin']['customers'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -111,18 +111,18 @@ return array(
 						'ul_field' => $customers_ul
 					),
 					'customers_see_all' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers_see_all'],
+						'label' => $lng['admin']['customers_see_all'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'domains' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains'],
+						'label' => $lng['admin']['domains'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -130,29 +130,29 @@ return array(
 						'ul_field' => $domains_ul
 					),
 					'domains_see_all' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains_see_all'],
+						'label' => $lng['admin']['domains_see_all'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'caneditphpsettings' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['caneditphpsettings'],
+						'label' => $lng['admin']['caneditphpsettings'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'diskspace' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'],
+						'label' => $lng['customer']['diskspace'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 6,
@@ -160,7 +160,7 @@ return array(
 						'ul_field' => $diskspace_ul
 					),
 					'traffic' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'],
+						'label' => $lng['customer']['traffic'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 4,
@@ -168,7 +168,7 @@ return array(
 						'ul_field' => $traffic_ul
 					),
 					'subdomains' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'],
+						'label' => $lng['customer']['subdomains'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -176,7 +176,7 @@ return array(
 						'ul_field' => $subdomains_ul
 					),
 					'emails' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'],
+						'label' => $lng['customer']['emails'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -184,7 +184,7 @@ return array(
 						'ul_field' => $emails_ul
 					),
 					'email_accounts' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'],
+						'label' => $lng['customer']['accounts'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -192,7 +192,7 @@ return array(
 						'ul_field' => $email_accounts_ul
 					),
 					'email_forwarders' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'],
+						'label' => $lng['customer']['forwarders'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -200,7 +200,7 @@ return array(
 						'ul_field' => $email_forwarders_ul
 					),
 					'email_quota' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'],
+						'label' => $lng['customer']['email_quota'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -209,14 +209,14 @@ return array(
 						'ul_field' => $email_quota_ul
 					),
 					'ftps' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'],
+						'label' => $lng['customer']['ftps'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
 						'ul_field' => $ftps_ul
 					),
 					'mysqls' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'],
+						'label' => $lng['customer']['mysqls'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,

lib/formfields/admin/admin/formfield.admin_edit.php

@@ -16,24 +16,24 @@
  */
 return array(
 	'admin_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['admin_edit'],
+		'title' => $lng['admin']['admin_edit'],
 		'image' => 'icons/user_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'],
+				'title' => $lng['admin']['accountdata'],
 				'image' => 'icons/user_edit.png',
 				'fields' => array(
 					'loginname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'label',
 						'value' => $result['loginname']
 					),
 					'deactivated' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['deactivated_user'],
+						'label' => $lng['admin']['deactivated_user'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -43,20 +43,20 @@ return array(
 						'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
 					),
 					'admin_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['emptyfornochanges'] . ')',
+						'label' => $lng['login']['password'] . ' (' . $lng['panel']['emptyfornochanges'] . ')',
 						'type' => 'password',
 						'autocomplete' => 'off',
 						'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
 					),
 					'admin_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword(),
 						'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
 					),
 					'def_language' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
+						'label' => $lng['login']['language'],
 						'type' => 'select',
 						'select_var' => $language_options,
 						'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true)
@@ -64,36 +64,36 @@ return array(
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'],
+				'title' => $lng['admin']['contactdata'],
 				'image' => 'icons/user_edit.png',
 				'fields' => array(
 					'name' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'],
+						'label' => $lng['customer']['name'],
 						'type' => 'text',
 						'mandatory' => true,
 						'value' => $result['name']
 					),
 					'email' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'],
+						'label' => $lng['customer']['email'],
 						'type' => 'text',
 						'mandatory' => true,
 						'value' => $result['email']
 					),
 					'custom_notes' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'],
+						'label' => $lng['usersettings']['custom_notes']['title'],
+						'desc' => $lng['usersettings']['custom_notes']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12,
 						'value' => $result['custom_notes']
 					),
 					'custom_notes_show' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'],
+						'label' => $lng['usersettings']['custom_notes']['show'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -104,21 +104,21 @@ return array(
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'],
+				'title' => $lng['admin']['servicedata'],
 				'image' => 'icons/user_add.png',
 				'visible' => ($result['adminid'] != \Froxlor\User::getAll()['userid'] ? true : false),
 				'fields' => array(
 					'ipaddress' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ipaddress']['title'],
+						'label' => $lng['serversettings']['ipaddress']['title'],
 						'type' => 'select',
 						'select_var' => $ipaddress
 					),
 					'change_serversettings' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['change_serversettings'],
+						'label' => $lng['admin']['change_serversettings'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -127,7 +127,7 @@ return array(
 						)
 					),
 					'customers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers'],
+						'label' => $lng['admin']['customers'],
 						'type' => 'textul',
 						'value' => $result['customers'],
 						'maxlength' => 9,
@@ -135,11 +135,11 @@ return array(
 						'ul_field' => $customers_ul
 					),
 					'customers_see_all' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers_see_all'],
+						'label' => $lng['admin']['customers_see_all'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -148,7 +148,7 @@ return array(
 						)
 					),
 					'domains' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains'],
+						'label' => $lng['admin']['domains'],
 						'type' => 'textul',
 						'value' => $result['domains'],
 						'maxlength' => 9,
@@ -156,11 +156,11 @@ return array(
 						'ul_field' => $domains_ul
 					),
 					'domains_see_all' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains_see_all'],
+						'label' => $lng['admin']['domains_see_all'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -169,11 +169,11 @@ return array(
 						)
 					),
 					'caneditphpsettings' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['caneditphpsettings'],
+						'label' => $lng['admin']['caneditphpsettings'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -182,7 +182,7 @@ return array(
 						)
 					),
 					'diskspace' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'],
+						'label' => $lng['customer']['diskspace'],
 						'type' => 'textul',
 						'value' => $result['diskspace'],
 						'maxlength' => 6,
@@ -190,7 +190,7 @@ return array(
 						'ul_field' => $diskspace_ul
 					),
 					'traffic' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'],
+						'label' => $lng['customer']['traffic'],
 						'type' => 'textul',
 						'value' => $result['traffic'],
 						'maxlength' => 4,
@@ -198,7 +198,7 @@ return array(
 						'ul_field' => $traffic_ul
 					),
 					'subdomains' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'],
+						'label' => $lng['customer']['subdomains'],
 						'type' => 'textul',
 						'value' => $result['subdomains'],
 						'maxlength' => 9,
@@ -206,7 +206,7 @@ return array(
 						'ul_field' => $subdomains_ul
 					),
 					'emails' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'],
+						'label' => $lng['customer']['emails'],
 						'type' => 'textul',
 						'value' => $result['emails'],
 						'maxlength' => 9,
@@ -214,7 +214,7 @@ return array(
 						'ul_field' => $emails_ul
 					),
 					'email_accounts' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'],
+						'label' => $lng['customer']['accounts'],
 						'type' => 'textul',
 						'value' => $result['email_accounts'],
 						'maxlength' => 9,
@@ -222,7 +222,7 @@ return array(
 						'ul_field' => $email_accounts_ul
 					),
 					'email_forwarders' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'],
+						'label' => $lng['customer']['forwarders'],
 						'type' => 'textul',
 						'value' => $result['email_forwarders'],
 						'maxlength' => 9,
@@ -230,7 +230,7 @@ return array(
 						'ul_field' => $email_forwarders_ul
 					),
 					'email_quota' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'],
+						'label' => $lng['customer']['email_quota'],
 						'type' => 'textul',
 						'value' => $result['email_quota'],
 						'maxlength' => 9,
@@ -239,14 +239,14 @@ return array(
 						'ul_field' => $email_quota_ul
 					),
 					'ftps' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'],
+						'label' => $lng['customer']['ftps'],
 						'type' => 'textul',
 						'value' => $result['ftps'],
 						'maxlength' => 9,
 						'ul_field' => $ftps_ul
 					),
 					'mysqls' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'],
+						'label' => $lng['customer']['mysqls'],
 						'type' => 'textul',
 						'value' => $result['mysqls'],
 						'maxlength' => 9,

lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php

@@ -16,11 +16,11 @@
  */
 return array(
 	'cronjobs_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['cronjob_edit'],
+		'title' => $lng['admin']['cronjob_edit'],
 		'image' => 'icons/clock_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['cronjob']['cronjobsettings'],
+				'title' => $lng['cronjob']['cronjobsettings'],
 				'image' => 'icons/clock_edit.png',
 				'fields' => array(
 					'cronfile' => array(
@@ -29,11 +29,11 @@ return array(
 						'value' => $result['cronfile']
 					),
 					'isactive' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['activated'],
+						'label' => $lng['admin']['activated'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -42,12 +42,12 @@ return array(
 						)
 					),
 					'interval_value' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['cronjob']['cronjobintervalv'],
+						'label' => $lng['cronjob']['cronjobintervalv'],
 						'type' => 'text',
 						'value' => $interval_value
 					),
 					'interval_interval' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['cronjob']['cronjobinterval'],
+						'label' => $lng['cronjob']['cronjobinterval'],
 						'type' => 'select',
 						'select_var' => $interval_interval
 					)

lib/formfields/admin/customer/formfield.customer_add.php

@@ -16,23 +16,23 @@
  */
 return array(
 	'customer_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['customer_add'],
+		'title' => $lng['admin']['customer_add'],
 		'image' => 'icons/user_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'],
+				'title' => $lng['admin']['accountdata'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'new_loginname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'text'
 					),
 					'createstdsubdomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain_add'] . '?',
+						'label' => $lng['admin']['stdsubdomain_add'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -41,11 +41,11 @@ return array(
 						)
 					),
 					'store_defaultindex' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['store_defaultindex'] . '?',
+						'label' => $lng['admin']['store_defaultindex'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -54,22 +54,22 @@ return array(
 						)
 					),
 					'new_customer_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'new_customer_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'sendpassword' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['sendpassword'],
+						'label' => $lng['admin']['sendpassword'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -78,79 +78,79 @@ return array(
 						)
 					),
 					'def_language' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
+						'label' => $lng['login']['language'],
 						'type' => 'select',
 						'select_var' => $language_options
 					)
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'],
+				'title' => $lng['admin']['contactdata'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'name' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'],
+						'label' => $lng['customer']['name'],
 						'type' => 'text',
 						'mandatory_ex' => true
 					),
 					'firstname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['firstname'],
+						'label' => $lng['customer']['firstname'],
 						'type' => 'text',
 						'mandatory_ex' => true
 					),
 					'gender' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['gender']['title'],
+						'label' => $lng['gender']['title'],
 						'type' => 'select',
 						'select_var' => $gender_options
 					),
 					'company' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['company'],
+						'label' => $lng['customer']['company'],
 						'type' => 'text',
 						'mandatory_ex' => true
 					),
 					'street' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['street'],
+						'label' => $lng['customer']['street'],
 						'type' => 'text'
 					),
 					'zipcode' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['zipcode'],
+						'label' => $lng['customer']['zipcode'],
 						'type' => 'text'
 					),
 					'city' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['city'],
+						'label' => $lng['customer']['city'],
 						'type' => 'text'
 					),
 					'phone' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['phone'],
+						'label' => $lng['customer']['phone'],
 						'type' => 'text'
 					),
 					'fax' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['fax'],
+						'label' => $lng['customer']['fax'],
 						'type' => 'text'
 					),
 					'email' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'],
+						'label' => $lng['customer']['email'],
 						'type' => 'text',
 						'mandatory' => true
 					),
 					'customernumber' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['customernumber'],
+						'label' => $lng['customer']['customernumber'],
 						'type' => 'text'
 					),
 					'custom_notes' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'],
+						'label' => $lng['usersettings']['custom_notes']['title'],
+						'desc' => $lng['usersettings']['custom_notes']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12
 					),
 					'custom_notes_show' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'],
+						'label' => $lng['usersettings']['custom_notes']['show'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -160,22 +160,22 @@ return array(
 			),
 			'section_cpre' => array(
 				'visible' => ! empty($hosting_plans),
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'],
+				'title' => $lng['admin']['plans']['use_plan'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'use_plan' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'],
+						'label' => $lng['admin']['plans']['use_plan'],
 						'type' => 'select',
 						'select_var' => $hosting_plans
 					)
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'],
+				'title' => $lng['admin']['servicedata'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'diskspace' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'],
+						'label' => $lng['customer']['diskspace'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 16,
@@ -183,7 +183,7 @@ return array(
 						'ul_field' => $diskspace_ul
 					),
 					'traffic' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'],
+						'label' => $lng['customer']['traffic'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 14,
@@ -191,7 +191,7 @@ return array(
 						'ul_field' => $traffic_ul
 					),
 					'subdomains' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'],
+						'label' => $lng['customer']['subdomains'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -199,7 +199,7 @@ return array(
 						'ul_field' => $subdomains_ul
 					),
 					'emails' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'],
+						'label' => $lng['customer']['emails'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -207,7 +207,7 @@ return array(
 						'ul_field' => $emails_ul
 					),
 					'email_accounts' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'],
+						'label' => $lng['customer']['accounts'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -215,7 +215,7 @@ return array(
 						'ul_field' => $email_accounts_ul
 					),
 					'email_forwarders' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'],
+						'label' => $lng['customer']['forwarders'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -223,7 +223,7 @@ return array(
 						'ul_field' => $email_forwarders_ul
 					),
 					'email_quota' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'],
+						'label' => $lng['customer']['email_quota'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -232,11 +232,11 @@ return array(
 						'ul_field' => $email_quota_ul
 					),
 					'email_imap' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_imap'],
+						'label' => $lng['customer']['email_imap'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -246,11 +246,11 @@ return array(
 						'mandatory' => true
 					),
 					'email_pop3' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_pop3'],
+						'label' => $lng['customer']['email_pop3'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -260,14 +260,14 @@ return array(
 						'mandatory' => true
 					),
 					'ftps' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'],
+						'label' => $lng['customer']['ftps'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
 						'ul_field' => $ftps_ul
 					),
 					'mysqls' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'],
+						'label' => $lng['customer']['mysqls'],
 						'type' => 'textul',
 						'value' => 0,
 						'maxlength' => 9,
@@ -275,11 +275,11 @@ return array(
 						'ul_field' => $mysqls_ul
 					),
 					'phpenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'] . '?',
+						'label' => $lng['admin']['phpenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -289,7 +289,7 @@ return array(
 					),
 					'allowed_phpconfigs' => array(
 						'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
+						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'checkbox',
 						'values' => $phpconfigs,
 						'value' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ? array(
@@ -300,32 +300,32 @@ return array(
 						'is_array' => 1
 					),
 					'perlenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['perlenabled'] . '?',
+						'label' => $lng['admin']['perlenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						)
 					),
 					'dnsenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['dnsenabled'] . '?',
+						'label' => $lng['admin']['dnsenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'visible' => (\Froxlor\Settings::Get('system.dnsenabled') == '1' ? true : false)
 					),
 					'logviewenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['logviewenabled'] . '?',
+						'label' => $lng['admin']['logviewenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						)

lib/formfields/admin/customer/formfield.customer_edit.php

@@ -16,29 +16,29 @@
  */
 return array(
 	'customer_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['customer_edit'],
+		'title' => $lng['admin']['customer_edit'],
 		'image' => 'icons/user_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'],
+				'title' => $lng['admin']['accountdata'],
 				'image' => 'icons/user_edit.png',
 				'fields' => array(
 					'loginname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'label',
 						'value' => $result['loginname']
 					),
 					'documentroot' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['documentroot'],
+						'label' => $lng['customer']['documentroot'],
 						'type' => 'label',
 						'value' => $result['documentroot']
 					),
 					'createstdsubdomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain_add'] . '?',
+						'label' => $lng['admin']['stdsubdomain_add'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -47,11 +47,11 @@ return array(
 						)
 					),
 					'deactivated' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['deactivated_user'],
+						'label' => $lng['admin']['deactivated_user'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -60,101 +60,101 @@ return array(
 						)
 					),
 					'new_customer_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['emptyfornochanges'] . ')',
+						'label' => $lng['login']['password'] . ' (' . $lng['panel']['emptyfornochanges'] . ')',
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'new_customer_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'def_language' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
+						'label' => $lng['login']['language'],
 						'type' => 'select',
 						'select_var' => $language_options
 					)
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'],
+				'title' => $lng['admin']['contactdata'],
 				'image' => 'icons/user_edit.png',
 				'fields' => array(
 					'name' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'],
+						'label' => $lng['customer']['name'],
 						'type' => 'text',
 						'mandatory_ex' => true,
 						'value' => $result['name']
 					),
 					'firstname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['firstname'],
+						'label' => $lng['customer']['firstname'],
 						'type' => 'text',
 						'mandatory_ex' => true,
 						'value' => $result['firstname']
 					),
 					'gender' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['gender']['title'],
+						'label' => $lng['gender']['title'],
 						'type' => 'select',
 						'select_var' => $gender_options
 					),
 					'company' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['company'],
+						'label' => $lng['customer']['company'],
 						'type' => 'text',
 						'mandatory_ex' => true,
 						'value' => $result['company']
 					),
 					'street' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['street'],
+						'label' => $lng['customer']['street'],
 						'type' => 'text',
 						'value' => $result['street']
 					),
 					'zipcode' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['zipcode'],
+						'label' => $lng['customer']['zipcode'],
 						'type' => 'text',
 						'value' => $result['zipcode']
 					),
 					'city' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['city'],
+						'label' => $lng['customer']['city'],
 						'type' => 'text',
 						'value' => $result['city']
 					),
 					'phone' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['phone'],
+						'label' => $lng['customer']['phone'],
 						'type' => 'text',
 						'value' => $result['phone']
 					),
 					'fax' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['fax'],
+						'label' => $lng['customer']['fax'],
 						'type' => 'text',
 						'value' => $result['fax']
 					),
 					'email' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'],
+						'label' => $lng['customer']['email'],
 						'type' => 'text',
 						'mandatory' => true,
 						'value' => $result['email']
 					),
 					'customernumber' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['customernumber'],
+						'label' => $lng['customer']['customernumber'],
 						'type' => 'text',
 						'value' => $result['customernumber']
 					),
 					'custom_notes' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'],
+						'label' => $lng['usersettings']['custom_notes']['title'],
+						'desc' => $lng['usersettings']['custom_notes']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12,
 						'value' => $result['custom_notes']
 					),
 					'custom_notes_show' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'],
+						'label' => $lng['usersettings']['custom_notes']['show'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -166,22 +166,22 @@ return array(
 			),
 			'section_cpre' => array(
 				'visible' => ! empty($hosting_plans),
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'],
+				'title' => $lng['admin']['plans']['use_plan'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'use_plan' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'],
+						'label' => $lng['admin']['plans']['use_plan'],
 						'type' => 'select',
 						'select_var' => $hosting_plans
 					)
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'],
+				'title' => $lng['admin']['servicedata'],
 				'image' => 'icons/user_edit.png',
 				'fields' => array(
 					'diskspace' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'],
+						'label' => $lng['customer']['diskspace'],
 						'type' => 'textul',
 						'value' => $result['diskspace'],
 						'maxlength' => 16,
@@ -189,7 +189,7 @@ return array(
 						'ul_field' => $diskspace_ul
 					),
 					'traffic' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'],
+						'label' => $lng['customer']['traffic'],
 						'type' => 'textul',
 						'value' => $result['traffic'],
 						'maxlength' => 14,
@@ -197,7 +197,7 @@ return array(
 						'ul_field' => $traffic_ul
 					),
 					'subdomains' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'],
+						'label' => $lng['customer']['subdomains'],
 						'type' => 'textul',
 						'value' => $result['subdomains'],
 						'maxlength' => 9,
@@ -205,7 +205,7 @@ return array(
 						'ul_field' => $subdomains_ul
 					),
 					'emails' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'],
+						'label' => $lng['customer']['emails'],
 						'type' => 'textul',
 						'value' => $result['emails'],
 						'maxlength' => 9,
@@ -213,7 +213,7 @@ return array(
 						'ul_field' => $emails_ul
 					),
 					'email_accounts' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'],
+						'label' => $lng['customer']['accounts'],
 						'type' => 'textul',
 						'value' => $result['email_accounts'],
 						'maxlength' => 9,
@@ -221,7 +221,7 @@ return array(
 						'ul_field' => $email_accounts_ul
 					),
 					'email_forwarders' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'],
+						'label' => $lng['customer']['forwarders'],
 						'type' => 'textul',
 						'value' => $result['email_forwarders'],
 						'maxlength' => 9,
@@ -229,7 +229,7 @@ return array(
 						'ul_field' => $email_forwarders_ul
 					),
 					'email_quota' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'],
+						'label' => $lng['customer']['email_quota'],
 						'type' => 'textul',
 						'value' => $result['email_quota'],
 						'maxlength' => 9,
@@ -238,11 +238,11 @@ return array(
 						'ul_field' => $email_quota_ul
 					),
 					'email_imap' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_imap'],
+						'label' => $lng['customer']['email_imap'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -252,11 +252,11 @@ return array(
 						'mandatory' => true
 					),
 					'email_pop3' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_pop3'],
+						'label' => $lng['customer']['email_pop3'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -266,14 +266,14 @@ return array(
 						'mandatory' => true
 					),
 					'ftps' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'],
+						'label' => $lng['customer']['ftps'],
 						'type' => 'textul',
 						'value' => $result['ftps'],
 						'maxlength' => 9,
 						'ul_field' => $ftps_ul
 					),
 					'mysqls' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'],
+						'label' => $lng['customer']['mysqls'],
 						'type' => 'textul',
 						'value' => $result['mysqls'],
 						'maxlength' => 9,
@@ -281,11 +281,11 @@ return array(
 						'ul_field' => $mysqls_ul
 					),
 					'phpenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'] . '?',
+						'label' => $lng['admin']['phpenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -295,18 +295,18 @@ return array(
 					),
 					'allowed_phpconfigs' => array(
 						'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
+						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'checkbox',
 						'values' => $phpconfigs,
 						'value' => isset($result['allowed_phpconfigs']) && ! empty($result['allowed_phpconfigs']) ? json_decode($result['allowed_phpconfigs'], JSON_OBJECT_AS_ARRAY) : array(),
 						'is_array' => 1
 					),
 					'perlenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['perlenabled'] . '?',
+						'label' => $lng['admin']['perlenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -315,11 +315,11 @@ return array(
 						)
 					),
 					'dnsenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['dnsenabled'] . '?',
+						'label' => $lng['admin']['dnsenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -329,11 +329,11 @@ return array(
 						'visible' => (\Froxlor\Settings::Get('system.dnsenabled') == '1' ? true : false)
 					),
 					'logviewenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['logviewenabled'] . '?',
+						'label' => $lng['admin']['logviewenabled'] . '?',
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -344,12 +344,12 @@ return array(
 				)
 			),
 			'section_d' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['movetoadmin'],
+				'title' => $lng['admin']['movetoadmin'],
 				'image' => 'icons/user_edit.png',
 				'visible' => ($admin_select_cnt > 1),
 				'fields' => array(
 					'move_to_admin' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['movecustomertoadmin'],
+						'label' => $lng['admin']['movecustomertoadmin'],
 						'type' => 'select',
 						'select_var' => $admin_select
 					)

lib/formfields/admin/domains/formfield.domains_add.php

@@ -16,11 +16,11 @@
  */
 return array(
 	'domain_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['domain_add'],
+		'title' => $lng['admin']['domain_add'],
 		'image' => 'icons/domain_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['domains']['domainsettings'],
+				'title' => $lng['domains']['domainsettings'],
 				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'domain' => array(
@@ -29,36 +29,36 @@ return array(
 						'mandatory' => true
 					),
 					'customerid' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['customer'],
+						'label' => $lng['admin']['customer'],
 						'type' => 'select',
 						'select_var' => $customers,
 						'mandatory' => true
 					),
 					'adminid' => array(
 						'visible' => (\Froxlor\User::getAll()['customers_see_all'] == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['admin'],
+						'label' => $lng['admin']['admin'],
 						'type' => 'select',
 						'select_var' => $admins,
 						'mandatory' => true
 					),
 					'alias' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'],
+						'label' => $lng['domains']['aliasdomain'],
 						'type' => 'select',
 						'select_var' => $domains
 					),
 					'issubof' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['issubof'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['issubofinfo'],
+						'label' => $lng['domains']['issubof'],
+						'desc' => $lng['domains']['issubofinfo'],
 						'type' => 'select',
 						'select_var' => $subtodomains
 					),
 					'caneditdomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['desc'],
+						'label' => $lng['admin']['domain_editable']['title'],
+						'desc' => $lng['admin']['domain_editable']['desc'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -67,38 +67,38 @@ return array(
 						)
 					),
 					'add_date' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['add_date'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'],
+						'label' => $lng['domains']['add_date'],
+						'desc' => $lng['panel']['dateformat'],
 						'type' => 'label',
 						'value' => $add_date
 					),
 					'registration_date' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['registration_date'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'],
+						'label' => $lng['domains']['registration_date'],
+						'desc' => $lng['panel']['dateformat'],
 						'type' => 'text',
 						'size' => 10
 					),
 					'termination_date' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['termination_date'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'],
+						'label' => $lng['domains']['termination_date'],
+						'desc' => $lng['panel']['dateformat'],
 						'type' => 'text',
 						'size' => 10
 					)
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings'],
+				'title' => $lng['admin']['webserversettings'],
 				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'documentroot' => array(
 						'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
 						'label' => 'DocumentRoot',
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['emptyfordefault'],
+						'desc' => $lng['panel']['emptyfordefault'],
 						'type' => 'text'
 					),
 					'ipandport' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_multi']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_multi']['description'],
+						'label' => $lng['domains']['ipandport_multi']['title'],
+						'desc' => $lng['domains']['ipandport_multi']['description'],
 						'type' => 'checkbox',
 						'values' => $ipsandports,
 						'value' => explode(',', \Froxlor\Settings::Get('system.defaultip')),
@@ -106,18 +106,18 @@ return array(
 						'mandatory' => true
 					),
 					'selectserveralias' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'],
+						'label' => $lng['admin']['selectserveralias'],
+						'desc' => $lng['admin']['selectserveralias_desc'],
 						'type' => 'select',
 						'select_var' => $serveraliasoptions
 					),
 					'speciallogfile' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['description'],
+						'label' => $lng['admin']['speciallogfile']['title'],
+						'desc' => $lng['admin']['speciallogfile']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -126,32 +126,32 @@ return array(
 					'specialsettings' => array(
 						'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf']['description'],
+						'label' => $lng['admin']['ownvhostsettings'],
+						'desc' => $lng['serversettings']['default_vhostconf']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12
 					),
 					'notryfiles' => array(
 						'visible' => (\Froxlor\Settings::Get('system.webserver') == 'nginx' && \Froxlor\User::getAll()['change_serversettings'] == '1'),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['description'],
+						'label' => $lng['admin']['notryfiles']['title'],
+						'desc' => $lng['admin']['notryfiles']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'writeaccesslog' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['description'],
+						'label' => $lng['admin']['writeaccesslog']['title'],
+						'desc' => $lng['admin']['writeaccesslog']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -160,12 +160,12 @@ return array(
 						)
 					),
 					'writeerrorlog' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['description'],
+						'label' => $lng['admin']['writeerrorlog']['title'],
+						'desc' => $lng['admin']['writeerrorlog']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -176,13 +176,13 @@ return array(
 				)
 			),
 			'section_bssl' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'],
+				'title' => $lng['admin']['webserversettings_ssl'],
 				'image' => 'icons/domain_add.png',
 				'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? true : false,
 				'fields' => array(
 					'ssl_ipandport' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_ssl_multi']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_ssl_multi']['description'],
+						'label' => $lng['domains']['ipandport_ssl_multi']['title'],
+						'desc' => $lng['domains']['ipandport_ssl_multi']['description'],
 						'type' => 'checkbox',
 						'values' => $ssl_ipsandports,
 						'value' => '',
@@ -190,12 +190,12 @@ return array(
 					),
 					'ssl_redirect' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'],
+						'label' => $lng['domains']['ssl_redirect']['title'],
+						'desc' => $lng['domains']['ssl_redirect']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -203,12 +203,12 @@ return array(
 					),
 					'letsencrypt' => array(
 						'visible' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['description'],
+						'label' => $lng['admin']['letsencrypt']['title'],
+						'desc' => $lng['admin']['letsencrypt']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -216,12 +216,12 @@ return array(
 					),
 					'http2' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['description'],
+						'label' => $lng['admin']['domain_http2']['title'],
+						'desc' => $lng['admin']['domain_http2']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -231,12 +231,12 @@ return array(
 						'visible' => ($ssl_ipsandports == '' ? true : false),
 						'label' => 'SSL',
 						'type' => 'label',
-						'value' => \Froxlor\I18N\Lang::getAll()['panel']['nosslipsavailable']
+						'value' => $lng['panel']['nosslipsavailable']
 					),
 					'hsts_maxage' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'],
+						'label' => $lng['admin']['domain_hsts_maxage']['title'],
+						'desc' => $lng['admin']['domain_hsts_maxage']['description'],
 						'type' => 'int',
 						'int_min' => 0,
 						'int_max' => 94608000, // 3-years
@@ -244,12 +244,12 @@ return array(
 					),
 					'hsts_sub' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'],
+						'label' => $lng['admin']['domain_hsts_incsub']['title'],
+						'desc' => $lng['admin']['domain_hsts_incsub']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -257,12 +257,12 @@ return array(
 					),
 					'hsts_preload' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'],
+						'label' => $lng['admin']['domain_hsts_preload']['title'],
+						'desc' => $lng['admin']['domain_hsts_preload']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -270,12 +270,12 @@ return array(
 					),
 					'ocsp_stapling' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_ocsp_stapling']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_ocsp_stapling']['description'] . (\Froxlor\Settings::Get('system.webserver') == 'nginx' ? \Froxlor\I18N\Lang::getAll()['admin']['domain_ocsp_stapling']['nginx_version_warning'] : ""),
+						'label' => $lng['admin']['domain_ocsp_stapling']['title'],
+						'desc' => $lng['admin']['domain_ocsp_stapling']['description'] . (\Froxlor\Settings::Get('system.webserver') == 'nginx' ? $lng['admin']['domain_ocsp_stapling']['nginx_version_warning'] : ""),
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -284,7 +284,7 @@ return array(
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpserversettings'],
+				'title' => $lng['admin']['phpserversettings'],
 				'image' => 'icons/domain_add.png',
 				'visible' => ((\Froxlor\User::getAll()['change_serversettings'] == '1' || \Froxlor\User::getAll()['caneditphpsettings'] == '1') ? true : false),
 				'fields' => array(
@@ -293,7 +293,7 @@ return array(
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -302,11 +302,11 @@ return array(
 						)
 					),
 					'phpenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'],
+						'label' => $lng['admin']['phpenabled'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -316,24 +316,24 @@ return array(
 					),
 					'phpsettingid' => array(
 						'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
+						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'select',
 						'select_var' => $phpconfigs
 					),
 					'mod_fcgid_starter' => array(
 						'visible' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_starter']['title'],
+						'label' => $lng['admin']['mod_fcgid_starter']['title'],
 						'type' => 'text'
 					),
 					'mod_fcgid_maxrequests' => array(
 						'visible' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'],
+						'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
 						'type' => 'text'
 					)
 				)
 			),
 			'section_d' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['nameserversettings'],
+				'title' => $lng['admin']['nameserversettings'],
 				'image' => 'icons/domain_add.png',
 				'visible' => (\Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
 				'fields' => array(
@@ -342,7 +342,7 @@ return array(
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -352,21 +352,21 @@ return array(
 					),
 					'zonefile' => array(
 						'label' => 'Zonefile',
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['bindzonewarning'],
+						'desc' => $lng['admin']['bindzonewarning'],
 						'type' => 'text'
 					)
 				)
 			),
 			'section_e' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['mailserversettings'],
+				'title' => $lng['admin']['mailserversettings'],
 				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'isemaildomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['emaildomain'],
+						'label' => $lng['admin']['emaildomain'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -375,18 +375,18 @@ return array(
 						)
 					),
 					'email_only' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['email_only'],
+						'label' => $lng['admin']['email_only'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'subcanemaildomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['subdomainforemail'],
+						'label' => $lng['admin']['subdomainforemail'],
 						'type' => 'select',
 						'select_var' => $subcanemaildomain
 					),
@@ -396,7 +396,7 @@ return array(
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/admin/domains/formfield.domains_edit.php

@@ -16,11 +16,11 @@
  */
 return array(
 	'domain_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['domain_edit'],
+		'title' => $lng['admin']['domain_edit'],
 		'image' => 'icons/domain_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['domains']['domainsettings'],
+				'title' => $lng['domains']['domainsettings'],
 				'image' => 'icons/domain_edit.png',
 				'fields' => array(
 					'domain' => array(
@@ -30,7 +30,7 @@ return array(
 						'mandatory' => true
 					),
 					'customerid' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['customer'],
+						'label' => $lng['admin']['customer'],
 						'type' => (\Froxlor\Settings::Get('panel.allow_domain_change_customer') == '1' ? 'select' : 'label'),
 						'select_var' => (isset($customers) ? $customers : null),
 						'value' => (isset($result['customername']) ? $result['customername'] : null),
@@ -38,7 +38,7 @@ return array(
 					),
 					'adminid' => array(
 						'visible' => (\Froxlor\User::getAll()['customers_see_all'] == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['admin'],
+						'label' => $lng['admin']['admin'],
 						'type' => (\Froxlor\Settings::Get('panel.allow_domain_change_admin') == '1' ? 'select' : 'label'),
 						'select_var' => (isset($admins) ? $admins : null),
 						'value' => (isset($result['adminname']) ? $result['adminname'] : null),
@@ -46,28 +46,28 @@ return array(
 					),
 					'alias' => array(
 						'visible' => ($alias_check == '0' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'],
+						'label' => $lng['domains']['aliasdomain'],
 						'type' => 'select',
 						'select_var' => $domains
 					),
 					'issubof' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['issubof'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['issubofinfo'],
+						'label' => $lng['domains']['issubof'],
+						'desc' => $lng['domains']['issubofinfo'],
 						'type' => 'select',
 						'select_var' => $subtodomains
 					),
 					'associated_info' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['associated_with_domain'],
+						'label' => $lng['domains']['associated_with_domain'],
 						'type' => 'label',
-						'value' => $subdomains . ' ' . \Froxlor\I18N\Lang::getAll()['customer']['subdomains'] . ', ' . $alias_check . ' ' . \Froxlor\I18N\Lang::getAll()['domains']['aliasdomains'] . ', ' . $emails . ' ' . \Froxlor\I18N\Lang::getAll()['customer']['emails'] . ', ' . $email_accounts . ' ' . \Froxlor\I18N\Lang::getAll()['customer']['accounts'] . ', ' . $email_forwarders . ' ' . \Froxlor\I18N\Lang::getAll()['customer']['forwarders']
+						'value' => $subdomains . ' ' . $lng['customer']['subdomains'] . ', ' . $alias_check . ' ' . $lng['domains']['aliasdomains'] . ', ' . $emails . ' ' . $lng['customer']['emails'] . ', ' . $email_accounts . ' ' . $lng['customer']['accounts'] . ', ' . $email_forwarders . ' ' . $lng['customer']['forwarders']
 					),
 					'caneditdomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['desc'],
+						'label' => $lng['admin']['domain_editable']['title'],
+						'desc' => $lng['admin']['domain_editable']['desc'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -76,21 +76,21 @@ return array(
 						)
 					),
 					'add_date' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['add_date'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'],
+						'label' => $lng['domains']['add_date'],
+						'desc' => $lng['panel']['dateformat'],
 						'type' => 'label',
 						'value' => $result['add_date']
 					),
 					'registration_date' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['registration_date'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'],
+						'label' => $lng['domains']['registration_date'],
+						'desc' => $lng['panel']['dateformat'],
 						'type' => 'text',
 						'value' => $result['registration_date'],
 						'size' => 10
 					),
 					'termination_date' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['termination_date'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'],
+						'label' => $lng['domains']['termination_date'],
+						'desc' => $lng['panel']['dateformat'],
 						'type' => 'text',
 						'value' => $result['termination_date'],
 						'size' => 10
@@ -98,19 +98,19 @@ return array(
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings'],
+				'title' => $lng['admin']['webserversettings'],
 				'image' => 'icons/domain_edit.png',
 				'fields' => array(
 					'documentroot' => array(
 						'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
 						'label' => 'DocumentRoot',
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['emptyfordefault'],
+						'desc' => $lng['panel']['emptyfordefault'],
 						'type' => 'text',
 						'value' => $result['documentroot']
 					),
 					'ipandport' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_multi']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_multi']['description'],
+						'label' => $lng['domains']['ipandport_multi']['title'],
+						'desc' => $lng['domains']['ipandport_multi']['description'],
 						'type' => 'checkbox',
 						'values' => $ipsandports,
 						'value' => $usedips,
@@ -118,18 +118,18 @@ return array(
 						'mandatory' => true
 					),
 					'selectserveralias' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'],
+						'label' => $lng['admin']['selectserveralias'],
+						'desc' => $lng['admin']['selectserveralias_desc'],
 						'type' => 'select',
 						'select_var' => $serveraliasoptions
 					),
 					'speciallogfile' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['description'],
+						'label' => $lng['admin']['speciallogfile']['title'],
+						'desc' => $lng['admin']['speciallogfile']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -140,8 +140,8 @@ return array(
 					'specialsettings' => array(
 						'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf']['description'],
+						'label' => $lng['admin']['ownvhostsettings'],
+						'desc' => $lng['serversettings']['default_vhostconf']['description'],
 						'type' => 'textarea',
 						'value' => $result['specialsettings'],
 						'cols' => 60,
@@ -149,12 +149,12 @@ return array(
 					),
 					'specialsettingsforsubdomains' => array(
 						'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['specialsettingsforsubdomains'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['specialsettingsforsubdomains']['description'],
+						'label' => $lng['admin']['specialsettingsforsubdomains'],
+						'desc' => $lng['serversettings']['specialsettingsforsubdomains']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -164,12 +164,12 @@ return array(
 					),
 					'notryfiles' => array(
 						'visible' => (\Froxlor\Settings::Get('system.webserver') == 'nginx' && \Froxlor\User::getAll()['change_serversettings'] == '1'),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['description'],
+						'label' => $lng['admin']['notryfiles']['title'],
+						'desc' => $lng['admin']['notryfiles']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -178,12 +178,12 @@ return array(
 						)
 					),
 					'writeaccesslog' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['description'],
+						'label' => $lng['admin']['writeaccesslog']['title'],
+						'desc' => $lng['admin']['writeaccesslog']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -192,12 +192,12 @@ return array(
 						)
 					),
 					'writeerrorlog' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['description'],
+						'label' => $lng['admin']['writeerrorlog']['title'],
+						'desc' => $lng['admin']['writeerrorlog']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -208,13 +208,13 @@ return array(
 				)
 			),
 			'section_bssl' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'],
+				'title' => $lng['admin']['webserversettings_ssl'],
 				'image' => 'icons/domain_edit.png',
 				'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? true : false,
 				'fields' => array(
 					'ssl_ipandport' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_ssl_multi']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_ssl_multi']['description'],
+						'label' => $lng['domains']['ipandport_ssl_multi']['title'],
+						'desc' => $lng['domains']['ipandport_ssl_multi']['description'],
 						'type' => 'checkbox',
 						'values' => $ssl_ipsandports,
 						'value' => $usedips,
@@ -222,12 +222,12 @@ return array(
 					),
 					'ssl_redirect' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect_temporarilydisabled'] : ''),
+						'label' => $lng['domains']['ssl_redirect']['title'],
+						'desc' => $lng['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? $lng['domains']['ssl_redirect_temporarilydisabled'] : ''),
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -237,12 +237,12 @@ return array(
 					),
 					'letsencrypt' => array(
 						'visible' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['description'],
+						'label' => $lng['admin']['letsencrypt']['title'],
+						'desc' => $lng['admin']['letsencrypt']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -252,12 +252,12 @@ return array(
 					),
 					'http2' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd' && \Froxlor\Settings::Get('system.http2_support') == '1',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['description'],
+						'label' => $lng['admin']['domain_http2']['title'],
+						'desc' => $lng['admin']['domain_http2']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -269,12 +269,12 @@ return array(
 						'visible' => ($ssl_ipsandports == '' ? true : false),
 						'label' => 'SSL',
 						'type' => 'label',
-						'value' => \Froxlor\I18N\Lang::getAll()['panel']['nosslipsavailable']
+						'value' => $lng['panel']['nosslipsavailable']
 					),
 					'hsts_maxage' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'],
+						'label' => $lng['admin']['domain_hsts_maxage']['title'],
+						'desc' => $lng['admin']['domain_hsts_maxage']['description'],
 						'type' => 'int',
 						'int_min' => 0,
 						'int_max' => 94608000, // 3-years
@@ -282,12 +282,12 @@ return array(
 					),
 					'hsts_sub' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'],
+						'label' => $lng['admin']['domain_hsts_incsub']['title'],
+						'desc' => $lng['admin']['domain_hsts_incsub']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -297,12 +297,12 @@ return array(
 					),
 					'hsts_preload' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'],
+						'label' => $lng['admin']['domain_hsts_preload']['title'],
+						'desc' => $lng['admin']['domain_hsts_preload']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -312,12 +312,12 @@ return array(
 					),
 					'ocsp_stapling' => array(
 						'visible' => ($ssl_ipsandports != '' ? true : false) && \Froxlor\Settings::Get('system.webserver') != 'lighttpd',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_ocsp_stapling']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_ocsp_stapling']['description'] . (\Froxlor\Settings::Get('system.webserver') == 'nginx' ? \Froxlor\I18N\Lang::getAll()['admin']['domain_ocsp_stapling']['nginx_version_warning'] : ""),
+						'label' => $lng['admin']['domain_ocsp_stapling']['title'],
+						'desc' => $lng['admin']['domain_ocsp_stapling']['description'] . (\Froxlor\Settings::Get('system.webserver') == 'nginx' ? $lng['admin']['domain_ocsp_stapling']['nginx_version_warning'] : ""),
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -328,7 +328,7 @@ return array(
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpserversettings'],
+				'title' => $lng['admin']['phpserversettings'],
 				'image' => 'icons/domain_edit.png',
 				'visible' => ((\Froxlor\User::getAll()['change_serversettings'] == '1' || \Froxlor\User::getAll()['caneditphpsettings'] == '1') ? true : false),
 				'fields' => array(
@@ -337,7 +337,7 @@ return array(
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -346,11 +346,11 @@ return array(
 						)
 					),
 					'phpenabled' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'],
+						'label' => $lng['admin']['phpenabled'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -360,18 +360,18 @@ return array(
 					),
 					'phpsettingid' => array(
 						'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
+						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'select',
 						'select_var' => $phpconfigs
 					),
 					'phpsettingsforsubdomains' => array(
 						'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettingsforsubdomains'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpsettingsforsubdomains']['description'],
+						'label' => $lng['admin']['phpsettingsforsubdomains'],
+						'desc' => $lng['serversettings']['phpsettingsforsubdomains']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -381,20 +381,20 @@ return array(
 					),
 					'mod_fcgid_starter' => array(
 						'visible' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_starter']['title'],
+						'label' => $lng['admin']['mod_fcgid_starter']['title'],
 						'type' => 'text',
 						'value' => ((int) $result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '')
 					),
 					'mod_fcgid_maxrequests' => array(
 						'visible' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'],
+						'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
 						'type' => 'text',
 						'value' => ((int) $result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '')
 					)
 				)
 			),
 			'section_d' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['nameserversettings'],
+				'title' => $lng['admin']['nameserversettings'],
 				'image' => 'icons/domain_edit.png',
 				'visible' => (\Froxlor\Settings::Get('system.bind_enable') == '1' && \Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false),
 				'fields' => array(
@@ -403,7 +403,7 @@ return array(
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -413,22 +413,22 @@ return array(
 					),
 					'zonefile' => array(
 						'label' => 'Zonefile',
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['bindzonewarning'],
+						'desc' => $lng['admin']['bindzonewarning'],
 						'type' => 'text',
 						'value' => $result['zonefile']
 					)
 				)
 			),
 			'section_e' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['mailserversettings'],
+				'title' => $lng['admin']['mailserversettings'],
 				'image' => 'icons/domain_edit.png',
 				'fields' => array(
 					'isemaildomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['emaildomain'],
+						'label' => $lng['admin']['emaildomain'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -437,11 +437,11 @@ return array(
 						)
 					),
 					'email_only' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['email_only'],
+						'label' => $lng['admin']['email_only'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -450,7 +450,7 @@ return array(
 						)
 					),
 					'subcanemaildomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['subdomainforemail'],
+						'label' => $lng['admin']['subdomainforemail'],
 						'type' => 'select',
 						'select_var' => $subcanemaildomain
 					),
@@ -460,7 +460,7 @@ return array(
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/admin/domains/formfield.domains_import.php

@@ -16,35 +16,35 @@
  */
 return array(
 	'domain_import' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['domains']['domain_import'],
+		'title' => $lng['domains']['domain_import'],
 		'image' => 'icons/domain_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['domains']['domain_import'],
+				'title' => $lng['domains']['domain_import'],
 				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'customerid' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['customer'],
+						'label' => $lng['admin']['customer'],
 						'type' => 'select',
 						'select_var' => $customers,
 						'mandatory' => true
 					),
 					'separator' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['import_separator'],
+						'label' => $lng['domains']['import_separator'],
 						'type' => 'text',
 						'mandatory' => true,
 						'size' => 5,
 						'value' => ';'
 					),
 					'offset' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['import_offset'],
+						'label' => $lng['domains']['import_offset'],
 						'type' => 'text',
 						'mandatory' => true,
 						'size' => 10,
 						'value' => '0'
 					),
 					'file' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['import_file'],
+						'label' => $lng['domains']['import_file'],
 						'type' => 'file',
 						'mandatory' => true
 					)

lib/formfields/admin/ipsandports/formfield.ipsandports_add.php

@@ -16,35 +16,35 @@
  */
 return array(
 	'ipsandports_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['add'],
+		'title' => $lng['admin']['ipsandports']['add'],
 		'image' => 'icons/ipsports_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ipandport'],
+				'title' => $lng['admin']['ipsandports']['ipandport'],
 				'image' => 'icons/ipsports_add.png',
 				'fields' => array(
 					'ip' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip'],
+						'label' => $lng['admin']['ipsandports']['ip'],
 						'type' => 'text'
 					),
 					'port' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['port'],
+						'label' => $lng['admin']['ipsandports']['port'],
 						'type' => 'text',
 						'size' => 5
 					)
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdefaultconfig'],
+				'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'],
 				'image' => 'icons/ipsports_add.png',
 				'fields' => array(
 					'listen_statement' => array(
 						'visible' => ! $is_nginx,
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_listen_statement'],
+						'label' => $lng['admin']['ipsandports']['create_listen_statement'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -54,11 +54,11 @@ return array(
 					),
 					'namevirtualhost_statement' => array(
 						'visible' => $is_apache && ! $is_apache24,
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_namevirtualhost_statement'],
+						'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -67,11 +67,11 @@ return array(
 						)
 					),
 					'vhostcontainer' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer'],
+						'label' => $lng['admin']['ipsandports']['create_vhostcontainer'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -80,25 +80,25 @@ return array(
 						)
 					),
 					'docroot' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['description'],
+						'label' => $lng['admin']['ipsandports']['docroot']['title'],
+						'desc' => $lng['admin']['ipsandports']['docroot']['description'],
 						'type' => 'text'
 					),
 					'specialsettings' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf']['description'],
+						'label' => $lng['admin']['ownvhostsettings'],
+						'desc' => $lng['serversettings']['default_vhostconf']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12
 					),
 					'vhostcontainer_servername_statement' => array(
 						'visible' => $is_apache,
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer_servername_statement'],
+						'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -109,13 +109,13 @@ return array(
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdomainconfig'],
+				'title' => $lng['admin']['ipsandports']['webserverdomainconfig'],
 				'image' => 'icons/ipsports_add.png',
 				'fields' => array(
 					'default_vhostconf_domain' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['default_vhostconf_domain'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf_domain']['description'],
+						'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'],
+						'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12
@@ -123,36 +123,36 @@ return array(
 				)
 			),
 			'section_d' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverssldomainconfig'],
+				'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'],
 				'image' => 'icons/ipsports_add.png',
 				'visible' => (\Froxlor\Settings::Get('system.use_ssl') == 1 ? true : false),
 				'fields' => array(
 					'ssl' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['enable_ssl'],
+						'label' => $lng['admin']['ipsandports']['enable_ssl'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'ssl_cert_file' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_file'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_file'],
 						'type' => 'text'
 					),
 					'ssl_key_file' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_key_file'],
+						'label' => $lng['admin']['ipsandports']['ssl_key_file'],
 						'type' => 'text'
 					),
 					'ssl_ca_file' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file'],
+						'label' => $lng['admin']['ipsandports']['ssl_ca_file'],
 						'type' => 'text'
 					),
 					'ssl_cert_chainfile' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['description'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'],
+						'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'],
 						'type' => 'text'
 					)
 				)

lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php

@@ -16,20 +16,20 @@
  */
 return array(
 	'ipsandports_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['edit'],
+		'title' => $lng['admin']['ipsandports']['edit'],
 		'image' => 'icons/ipsports_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ipandport'],
+				'title' => $lng['admin']['ipsandports']['ipandport'],
 				'image' => 'icons/ipsports_add.png',
 				'fields' => array(
 					'ip' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip'],
+						'label' => $lng['admin']['ipsandports']['ip'],
 						'type' => 'text',
 						'value' => $result['ip']
 					),
 					'port' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['port'],
+						'label' => $lng['admin']['ipsandports']['port'],
 						'type' => 'text',
 						'value' => $result['port'],
 						'size' => 5
@@ -37,16 +37,16 @@ return array(
 				)
 			),
 			'section_b' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdefaultconfig'],
+				'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'],
 				'image' => 'icons/ipsports_edit.png',
 				'fields' => array(
 					'listen_statement' => array(
 						'visible' => ! $is_nginx,
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_listen_statement'],
+						'label' => $lng['admin']['ipsandports']['create_listen_statement'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -56,11 +56,11 @@ return array(
 					),
 					'namevirtualhost_statement' => array(
 						'visible' => $is_apache && ! $is_apache24,
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_namevirtualhost_statement'],
+						'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -69,11 +69,11 @@ return array(
 						)
 					),
 					'vhostcontainer' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer'],
+						'label' => $lng['admin']['ipsandports']['create_vhostcontainer'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -82,15 +82,15 @@ return array(
 						)
 					),
 					'docroot' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['description'],
+						'label' => $lng['admin']['ipsandports']['docroot']['title'],
+						'desc' => $lng['admin']['ipsandports']['docroot']['description'],
 						'type' => 'text',
 						'value' => $result['docroot']
 					),
 					'specialsettings' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf']['description'],
+						'label' => $lng['admin']['ownvhostsettings'],
+						'desc' => $lng['serversettings']['default_vhostconf']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12,
@@ -98,11 +98,11 @@ return array(
 					),
 					'vhostcontainer_servername_statement' => array(
 						'visible' => $is_apache,
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer_servername_statement'],
+						'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -113,13 +113,13 @@ return array(
 				)
 			),
 			'section_c' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdomainconfig'],
+				'title' => $lng['admin']['ipsandports']['webserverdomainconfig'],
 				'image' => 'icons/ipsports_edit.png',
 				'fields' => array(
 					'default_vhostconf_domain' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['default_vhostconf_domain'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf_domain']['description'],
+						'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'],
+						'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12,
@@ -128,16 +128,16 @@ return array(
 				)
 			),
 			'section_d' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverssldomainconfig'],
+				'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'],
 				'image' => 'icons/ipsports_edit.png',
 				'visible' => (\Froxlor\Settings::Get('system.use_ssl') == 1 ? true : false),
 				'fields' => array(
 					'ssl' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['enable_ssl'],
+						'label' => $lng['admin']['ipsandports']['enable_ssl'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -146,23 +146,23 @@ return array(
 						)
 					),
 					'ssl_cert_file' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_file'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_file'],
 						'type' => 'text',
 						'value' => $result['ssl_cert_file']
 					),
 					'ssl_key_file' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_key_file'],
+						'label' => $lng['admin']['ipsandports']['ssl_key_file'],
 						'type' => 'text',
 						'value' => $result['ssl_key_file']
 					),
 					'ssl_ca_file' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file'],
+						'label' => $lng['admin']['ipsandports']['ssl_ca_file'],
 						'type' => 'text',
 						'value' => $result['ssl_ca_file']
 					),
 					'ssl_cert_chainfile' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['description'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'],
+						'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'],
 						'type' => 'text',
 						'value' => $result['ssl_cert_chainfile']
 					)

lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php

@@ -16,74 +16,74 @@
  */
 return array(
 	'fpmconfig_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'],
+		'title' => $lng['admin']['phpsettings']['addsettings'],
 		'image' => 'icons/phpsettings_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'],
+				'title' => $lng['admin']['phpsettings']['addsettings'],
 				'image' => 'icons/phpsettings_add.png',
 				'fields' => array(
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'],
+						'label' => $lng['admin']['phpsettings']['description'],
 						'type' => 'text',
 						'maxlength' => 50
 					),
 					'reload_cmd' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['reload'],
+						'label' => $lng['serversettings']['phpfpm_settings']['reload'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => 'service php7.0-fpm restart'
 					),
 					'config_dir' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['configdir'],
+						'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => '/etc/php/7.0/fpm/pool.d/'
 					),
 					'pm' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'],
+						'label' => $lng['serversettings']['phpfpm_settings']['pm'],
 						'type' => 'select',
 						'select_var' => $pm_select
 					),
 					'max_children' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'],
 						'type' => 'int',
 						'value' => 1
 					),
 					'start_servers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'],
 						'type' => 'int',
 						'value' => 20
 					),
 					'min_spare_servers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'],
 						'type' => 'int',
 						'value' => 5
 					),
 					'max_spare_servers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'],
 						'type' => 'int',
 						'value' => 35
 					),
 					'max_requests' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'],
 						'type' => 'int',
 						'value' => 0
 					),
 					'idle_timeout' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'],
 						'type' => 'int',
 						'value' => 30
 					),
 					'limit_extensions' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'],
 						'type' => 'text',
 						'value' => '.php'
 					)

lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php

@@ -16,75 +16,75 @@
  */
 return array(
 	'fpmconfig_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'],
+		'title' => $lng['admin']['phpsettings']['editsettings'],
 		'image' => 'icons/phpsettings_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'],
+				'title' => $lng['admin']['phpsettings']['editsettings'],
 				'image' => 'icons/phpsettings_edit.png',
 				'fields' => array(
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'],
+						'label' => $lng['admin']['phpsettings']['description'],
 						'type' => 'text',
 						'maxlength' => 50,
 						'value' => $result['description']
 					),
 					'reload_cmd' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['reload'],
+						'label' => $lng['serversettings']['phpfpm_settings']['reload'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => $result['reload_cmd']
 					),
 					'config_dir' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['configdir'],
+						'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => $result['config_dir']
 					),
 					'pm' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'],
+						'label' => $lng['serversettings']['phpfpm_settings']['pm'],
 						'type' => 'select',
 						'select_var' => $pm_select
 					),
 					'max_children' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'],
 						'type' => 'int',
 						'value' => $result['max_children']
 					),
 					'start_servers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'],
 						'type' => 'int',
 						'value' => $result['start_servers']
 					),
 					'min_spare_servers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'],
 						'type' => 'int',
 						'value' => $result['min_spare_servers']
 					),
 					'max_spare_servers' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'],
 						'type' => 'int',
 						'value' => $result['max_spare_servers']
 					),
 					'max_requests' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'],
 						'type' => 'int',
 						'value' => $result['max_requests']
 					),
 					'idle_timeout' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'],
 						'type' => 'int',
 						'value' => $result['idle_timeout']
 					),
 					'limit_extensions' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['description'],
+						'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'],
 						'type' => 'text',
 						'value' => $result['limit_extensions']
 					)

lib/formfields/admin/phpconfig/formfield.phpconfig_add.php

@@ -16,63 +16,63 @@
  */
 return array(
 	'phpconfig_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'],
+		'title' => $lng['admin']['phpsettings']['addsettings'],
 		'image' => 'icons/phpsettings_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'],
+				'title' => $lng['admin']['phpsettings']['addsettings'],
 				'image' => 'icons/phpsettings_add.png',
 				'fields' => array(
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'],
+						'label' => $lng['admin']['phpsettings']['description'],
 						'type' => 'text',
 						'maxlength' => 50
 					),
 					'binary' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['binary'],
+						'label' => $lng['admin']['phpsettings']['binary'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => '/usr/bin/php-cgi'
 					),
 					'fpmconfig' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['fpmdesc'],
+						'label' => $lng['admin']['phpsettings']['fpmdesc'],
 						'type' => 'select',
 						'select_var' => $fpmconfigs
 					),
 					'file_extensions' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions_note'],
+						'label' => $lng['admin']['phpsettings']['file_extensions'],
+						'desc' => $lng['admin']['phpsettings']['file_extensions_note'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => 'php'
 					),
 					'mod_fcgid_starter' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_starter']['title'],
+						'label' => $lng['admin']['mod_fcgid_starter']['title'],
 						'type' => 'text'
 					),
 					'mod_fcgid_maxrequests' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'],
+						'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
 						'type' => 'text'
 					),
 					'mod_fcgid_umask' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_umask']['title'],
+						'label' => $lng['admin']['mod_fcgid_umask']['title'],
 						'type' => 'text',
 						'maxlength' => 3,
 						'value' => '022'
 					),
 					'phpfpm_enable_slowlog' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['enable_slowlog'],
+						'label' => $lng['admin']['phpsettings']['enable_slowlog'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -80,25 +80,25 @@ return array(
 					),
 					'phpfpm_reqtermtimeout' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['request_terminate_timeout'],
+						'label' => $lng['admin']['phpsettings']['request_terminate_timeout'],
 						'type' => 'text',
 						'maxlength' => 10,
 						'value' => '60s'
 					),
 					'phpfpm_reqslowtimeout' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['request_slowlog_timeout'],
+						'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'],
 						'type' => 'text',
 						'maxlength' => 10,
 						'value' => '5s'
 					),
 					'phpfpm_pass_authorizationheader' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['pass_authorizationheader'],
+						'label' => $lng['admin']['phpsettings']['pass_authorizationheader'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -106,11 +106,11 @@ return array(
 					),
 					'override_fpmconfig' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig'],
+						'label' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -118,63 +118,63 @@ return array(
 					),
 					'pm' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['pm'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'select',
 						'select_var' => $pm_select
 					),
 					'max_children' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => 1
 					),
 					'start_servers' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => 20
 					),
 					'min_spare_servers' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => 5
 					),
 					'max_spare_servers' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => 35
 					),
 					'max_requests' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => 0
 					),
 					'idle_timeout' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => 30
 					),
 					'limit_extensions' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'text',
 						'value' => '.php'
 					),
 					'phpsettings' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['phpinisettings'],
+						'label' => $lng['admin']['phpsettings']['phpinisettings'],
 						'type' => 'textarea',
 						'cols' => 80,
 						'rows' => 20,

lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php

@@ -16,66 +16,66 @@
  */
 return array(
 	'phpconfig_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'],
+		'title' => $lng['admin']['phpsettings']['editsettings'],
 		'image' => 'icons/phpsettings_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'],
+				'title' => $lng['admin']['phpsettings']['editsettings'],
 				'image' => 'icons/phpsettings_edit.png',
 				'fields' => array(
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'],
+						'label' => $lng['admin']['phpsettings']['description'],
 						'type' => 'text',
 						'maxlength' => 50,
 						'value' => $result['description']
 					),
 					'binary' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['binary'],
+						'label' => $lng['admin']['phpsettings']['binary'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => $result['binary']
 					),
 					'fpmconfig' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['fpmdesc'],
+						'label' => $lng['admin']['phpsettings']['fpmdesc'],
 						'type' => 'select',
 						'select_var' => $fpmconfigs
 					),
 					'file_extensions' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions_note'],
+						'label' => $lng['admin']['phpsettings']['file_extensions'],
+						'desc' => $lng['admin']['phpsettings']['file_extensions_note'],
 						'type' => 'text',
 						'maxlength' => 255,
 						'value' => $result['file_extensions']
 					),
 					'mod_fcgid_starter' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_starter']['title'],
+						'label' => $lng['admin']['mod_fcgid_starter']['title'],
 						'type' => 'text',
 						'value' => ((int) $result['mod_fcgid_starter'] != - 1 ? $result['mod_fcgid_starter'] : '')
 					),
 					'mod_fcgid_maxrequests' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'],
+						'label' => $lng['admin']['mod_fcgid_maxrequests']['title'],
 						'type' => 'text',
 						'value' => ((int) $result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '')
 					),
 					'mod_fcgid_umask' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_umask']['title'],
+						'label' => $lng['admin']['mod_fcgid_umask']['title'],
 						'type' => 'text',
 						'maxlength' => 3,
 						'value' => $result['mod_fcgid_umask']
 					),
 					'phpfpm_enable_slowlog' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['enable_slowlog'],
+						'label' => $lng['admin']['phpsettings']['enable_slowlog'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -85,25 +85,25 @@ return array(
 					),
 					'phpfpm_reqtermtimeout' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['request_terminate_timeout'],
+						'label' => $lng['admin']['phpsettings']['request_terminate_timeout'],
 						'type' => 'text',
 						'maxlength' => 10,
 						'value' => $result['fpm_reqterm']
 					),
 					'phpfpm_reqslowtimeout' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['request_slowlog_timeout'],
+						'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'],
 						'type' => 'text',
 						'maxlength' => 10,
 						'value' => $result['fpm_reqslow']
 					),
 					'phpfpm_pass_authorizationheader' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['pass_authorizationheader'],
+						'label' => $lng['admin']['phpsettings']['pass_authorizationheader'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -112,11 +112,11 @@ return array(
 						)
 					),
 					'override_fpmconfig' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig'],
+						'label' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -126,63 +126,63 @@ return array(
 					),
 					'pm' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['pm'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'select',
 						'select_var' => $pm_select
 					),
 					'max_children' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => $result['max_children']
 					),
 					'start_servers' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => $result['start_servers']
 					),
 					'min_spare_servers' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => $result['min_spare_servers']
 					),
 					'max_spare_servers' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => $result['max_spare_servers']
 					),
 					'max_requests' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => $result['max_requests']
 					),
 					'idle_timeout' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'int',
 						'value' => $result['idle_timeout']
 					),
 					'limit_extensions' => array(
 						'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['description'] . \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
+						'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'],
+						'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'],
 						'type' => 'text',
 						'value' => $result['limit_extensions']
 					),
 					'phpsettings' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['phpinisettings'],
+						'label' => $lng['admin']['phpsettings']['phpinisettings'],
 						'type' => 'textarea',
 						'cols' => 80,
 						'rows' => 20,

lib/formfields/admin/plans/formfield.plans_add.php

@@ -16,19 +16,19 @@
  */
 return array(
 	'plans_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['add'],
+		'title' => $lng['admin']['plans']['add'],
 		'image' => 'icons/templates_add_big.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['plan_details'],
+				'title' => $lng['admin']['plans']['plan_details'],
 				'image' => 'icons/templates_add_big.png',
 				'fields' => array(
 					'name' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['name'],
+						'label' => $lng['admin']['plans']['name'],
 						'type' => 'text'
 					),
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['description'],
+						'label' => $lng['admin']['plans']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12

lib/formfields/admin/plans/formfield.plans_edit.php

@@ -16,20 +16,20 @@
  */
 return array(
 	'plans_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['edit'],
+		'title' => $lng['admin']['plans']['edit'],
 		'image' => 'icons/templates_edit_big.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['plan_details'],
+				'title' => $lng['admin']['plans']['plan_details'],
 				'image' => 'icons/templates_edit_big.png',
 				'fields' => array(
 					'name' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['name'],
+						'label' => $lng['admin']['plans']['name'],
 						'type' => 'text',
 						'value' => $result['name']
 					),
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['description'],
+						'label' => $lng['admin']['plans']['description'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12,

lib/formfields/admin/templates/formfield.filetemplate_add.php

@@ -16,20 +16,20 @@
  */
 return array(
 	'filetemplate_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'],
+		'title' => $lng['admin']['templates']['template_add'],
 		'image' => 'icons/templates_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'],
+				'title' => $lng['admin']['templates']['template_add'],
 				'image' => 'icons/templates_add.png',
 				'fields' => array(
 					'template' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'],
+						'label' => $lng['admin']['templates']['action'],
 						'type' => 'select',
 						'select_var' => $free_templates
 					),
 					'filecontent' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['filecontent'],
+						'label' => $lng['admin']['templates']['filecontent'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12

lib/formfields/admin/templates/formfield.filetemplate_edit.php

@@ -16,21 +16,21 @@
  */
 return array(
 	'filetemplate_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'],
+		'title' => $lng['admin']['templates']['template_edit'],
 		'image' => 'icons/templates_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'],
+				'title' => $lng['admin']['templates']['template_edit'],
 				'image' => 'icons/templates_edit.png',
 				'fields' => array(
 					'template' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'],
+						'label' => $lng['admin']['templates']['action'],
 						'type' => 'hidden',
-						'value' => \Froxlor\I18N\Lang::getAll()['admin']['templates'][$row['varname']],
-						'display' => \Froxlor\I18N\Lang::getAll()['admin']['templates'][$row['varname']]
+						'value' => $lng['admin']['templates'][$row['varname']],
+						'display' => $lng['admin']['templates'][$row['varname']]
 					),
 					'filecontent' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['filecontent'],
+						'label' => $lng['admin']['templates']['filecontent'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12,

lib/formfields/admin/templates/formfield.template_add.php

@@ -16,32 +16,32 @@
  */
 return array(
 	'template_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'],
+		'title' => $lng['admin']['templates']['template_add'],
 		'image' => 'icons/templates_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'],
+				'title' => $lng['admin']['templates']['template_add'],
 				'image' => 'icons/templates_add.png',
 				'fields' => array(
 					'language' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
+						'label' => $lng['login']['language'],
 						'type' => 'hidden',
 						'value' => $language,
 						'display' => $language
 					),
 					'template' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'],
+						'label' => $lng['admin']['templates']['action'],
 						'type' => 'hidden',
 						'value' => $template,
-						'display' => \Froxlor\I18N\Lang::getAll()['admin']['templates'][$template]
+						'display' => $lng['admin']['templates'][$template]
 					),
 					'subject' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['subject'],
+						'label' => $lng['admin']['templates']['subject'],
 						'type' => 'text',
 						'value' => $subject
 					),
 					'mailbody' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['mailbody'],
+						'label' => $lng['admin']['templates']['mailbody'],
 						'type' => 'textarea',
 						'value' => $body,
 						'cols' => 60,

lib/formfields/admin/templates/formfield.template_edit.php

@@ -16,32 +16,32 @@
  */
 return array(
 	'template_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'],
+		'title' => $lng['admin']['templates']['template_edit'],
 		'image' => 'icons/templates_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'],
+				'title' => $lng['admin']['templates']['template_edit'],
 				'image' => 'icons/templates_edit.png',
 				'fields' => array(
 					'language' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['language'],
+						'label' => $lng['login']['language'],
 						'type' => 'hidden',
 						'value' => $language,
 						'display' => $language
 					),
 					'template' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'],
+						'label' => $lng['admin']['templates']['action'],
 						'type' => 'hidden',
 						'value' => $template,
 						'display' => $template
 					),
 					'subject' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['subject'],
+						'label' => $lng['admin']['templates']['subject'],
 						'type' => 'text',
 						'value' => $subject
 					),
 					'mailbody' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['mailbody'],
+						'label' => $lng['admin']['templates']['mailbody'],
 						'type' => 'textarea',
 						'cols' => 60,
 						'rows' => 12,

lib/formfields/customer/domains/formfield.domain_ssleditor.php

@@ -16,7 +16,7 @@
  */
 return array(
 	'domain_ssleditor' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['panel']['ssleditor'],
+		'title' => $lng['panel']['ssleditor'],
 		'image' => 'icons/ssl.png',
 		'sections' => array(
 			'section_a' => array(
@@ -25,8 +25,8 @@ return array(
 				'fields' => array(
 					'ssl_cert_file' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_file_content'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_file_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
 						'type' => 'textarea',
 						'cols' => 100,
 						'rows' => 15,
@@ -34,8 +34,8 @@ return array(
 					),
 					'ssl_key_file' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_key_file_content'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'],
+						'label' => $lng['admin']['ipsandports']['ssl_key_file_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
 						'type' => 'textarea',
 						'cols' => 100,
 						'rows' => 15,
@@ -43,8 +43,8 @@ return array(
 					),
 					'ssl_cert_chainfile' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile_content'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'] . \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile_content_desc'],
+						'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'] . $lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'],
 						'type' => 'textarea',
 						'cols' => 100,
 						'rows' => 15,
@@ -52,8 +52,8 @@ return array(
 					),
 					'ssl_ca_file' => array(
 						'style' => 'align-top',
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file_content'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_paste_description'] . \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file_content_desc'],
+						'label' => $lng['admin']['ipsandports']['ssl_ca_file_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'] . $lng['admin']['ipsandports']['ssl_ca_file_content_desc'],
 						'type' => 'textarea',
 						'cols' => 100,
 						'rows' => 15,

lib/formfields/customer/domains/formfield.domains_add.php

@@ -16,15 +16,15 @@
  */
 return array(
 	'domain_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_add'],
+		'title' => $lng['domains']['subdomain_add'],
 		'image' => 'icons/domain_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_add'],
+				'title' => $lng['domains']['subdomain_add'],
 				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'subdomain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'],
+						'label' => $lng['domains']['domainname'],
 						'type' => 'textul',
 						'ul_field' => '',
 						'has_nextto' => true
@@ -36,60 +36,60 @@ return array(
 						'select_var' => $domains
 					),
 					'alias' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'],
+						'label' => $lng['domains']['aliasdomain'],
 						'type' => 'select',
 						'select_var' => $aliasdomains
 					),
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
-						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? $pathSelect['note'] . '<br />' . $pathSelect['value'] : ''),
+						'label' => $lng['panel']['path'],
+						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? $pathSelect['note'] . '<br />' . $pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
 					),
 					'url' => array(
 						'visible' => (\Froxlor\Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['urloverridespath'],
+						'label' => $lng['panel']['urloverridespath'],
 						'type' => 'text'
 					),
 					'redirectcode' => array(
 						'visible' => (\Froxlor\Settings::Get('customredirect.enabled') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurl'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurlinfo'],
+						'label' => $lng['domains']['redirectifpathisurl'],
+						'desc' => $lng['domains']['redirectifpathisurlinfo'],
 						'type' => 'select',
 						'select_var' => isset($redirectcode) ? $redirectcode : null
 					),
 					'selectserveralias' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'],
+						'label' => $lng['admin']['selectserveralias'],
+						'desc' => $lng['admin']['selectserveralias_desc'],
 						'type' => 'label',
-						'value' => \Froxlor\I18N\Lang::getAll()['customer']['selectserveralias_addinfo']
+						'value' => $lng['customer']['selectserveralias_addinfo']
 					),
 					'openbasedir_path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domain']['openbasedirpath'],
+						'label' => $lng['domain']['openbasedirpath'],
 						'type' => 'select',
 						'select_var' => $openbasedir
 					),
 					'phpsettingid' => array(
 						'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) && $has_phpconfigs ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
+						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'select',
 						'select_var' => $phpconfigs
 					)
 				)
 			),
 			'section_bssl' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'],
+				'title' => $lng['admin']['webserversettings_ssl'],
 				'image' => 'icons/domain_add.png',
 				'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports != '' ? true : false) : false,
 				'fields' => array(
 					'ssl_redirect' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'],
+						'label' => $lng['domains']['ssl_redirect']['title'],
+						'desc' => $lng['domains']['ssl_redirect']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -97,44 +97,44 @@ return array(
 					),
 					'letsencrypt' => array(
 						'visible' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['description'],
+						'label' => $lng['customer']['letsencrypt']['title'],
+						'desc' => $lng['customer']['letsencrypt']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'hsts_maxage' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'],
+						'label' => $lng['admin']['domain_hsts_maxage']['title'],
+						'desc' => $lng['admin']['domain_hsts_maxage']['description'],
 						'type' => 'int',
 						'int_min' => 0,
 						'int_max' => 94608000, // 3-years
 						'value' => 0
 					),
 					'hsts_sub' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'],
+						'label' => $lng['admin']['domain_hsts_incsub']['title'],
+						'desc' => $lng['admin']['domain_hsts_incsub']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'hsts_preload' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'],
+						'label' => $lng['admin']['domain_hsts_preload']['title'],
+						'desc' => $lng['admin']['domain_hsts_preload']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/customer/domains/formfield.domains_edit.php

@@ -16,53 +16,53 @@
  */
 return array(
 	'domain_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_edit'],
+		'title' => $lng['domains']['subdomain_edit'],
 		'image' => 'icons/domain_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_edit'],
+				'title' => $lng['domains']['subdomain_edit'],
 				'image' => 'icons/domain_edit.png',
 				'fields' => array(
 					'domain' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'],
+						'label' => $lng['domains']['domainname'],
 						'type' => 'label',
 						'value' => $result['domain']
 					),
 					'dns' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['dns']['destinationip'],
+						'label' => $lng['dns']['destinationip'],
 						'type' => 'label',
 						'value' => $domainip
 					),
 					'alias' => array(
 						'visible' => ($alias_check == '0' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'],
+						'label' => $lng['domains']['aliasdomain'],
 						'type' => 'select',
 						'select_var' => $domains
 					),
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
-						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
+						'label' => $lng['panel']['path'],
+						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
 					),
 					'url' => array(
 						'visible' => (\Froxlor\Settings::Get('panel.pathedit') == 'Dropdown' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['urloverridespath'],
+						'label' => $lng['panel']['urloverridespath'],
 						'type' => 'text',
 						'value' => $urlvalue
 					),
 					'redirectcode' => array(
 						'visible' => (\Froxlor\Settings::Get('customredirect.enabled') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurl'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurlinfo'],
+						'label' => $lng['domains']['redirectifpathisurl'],
+						'desc' => $lng['domains']['redirectifpathisurlinfo'],
 						'type' => 'select',
 						'select_var' => $redirectcode
 					),
 					'selectserveralias' => array(
 						'visible' => ((($result['parentdomainid'] == '0' && \Froxlor\User::getAll()['subdomains'] != '0') || $result['parentdomainid'] != '0') ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'],
+						'label' => $lng['admin']['selectserveralias'],
+						'desc' => $lng['admin']['selectserveralias_desc'],
 						'type' => 'select',
 						'select_var' => $serveraliasoptions
 					),
@@ -72,7 +72,7 @@ return array(
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -82,30 +82,30 @@ return array(
 					),
 					'openbasedir_path' => array(
 						'visible' => ($result['openbasedir'] == '1') ? true : false,
-						'label' => \Froxlor\I18N\Lang::getAll()['domain']['openbasedirpath'],
+						'label' => $lng['domain']['openbasedirpath'],
 						'type' => 'select',
 						'select_var' => $openbasedir
 					),
 					'phpsettingid' => array(
 						'visible' => (((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 || (int) \Froxlor\Settings::Get('phpfpm.enabled') == 1) && $has_phpconfigs ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'],
+						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'select',
 						'select_var' => $phpconfigs
 					)
 				)
 			),
 			'section_bssl' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'],
+				'title' => $lng['admin']['webserversettings_ssl'],
 				'image' => 'icons/domain_edit.png',
 				'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? ($ssl_ipsandports != '' ? (\Froxlor\Domain\Domain::domainHasSslIpPort($result['id']) ? true : false) : false) : false,
 				'fields' => array(
 					'ssl_redirect' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect_temporarilydisabled'] : ''),
+						'label' => $lng['domains']['ssl_redirect']['title'],
+						'desc' => $lng['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? $lng['domains']['ssl_redirect_temporarilydisabled'] : ''),
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -115,12 +115,12 @@ return array(
 					),
 					'letsencrypt' => array(
 						'visible' => \Froxlor\Settings::Get('system.leenabled') == '1' ? true : false,
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['description'],
+						'label' => $lng['customer']['letsencrypt']['title'],
+						'desc' => $lng['customer']['letsencrypt']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -129,20 +129,20 @@ return array(
 						)
 					),
 					'hsts_maxage' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'],
+						'label' => $lng['admin']['domain_hsts_maxage']['title'],
+						'desc' => $lng['admin']['domain_hsts_maxage']['description'],
 						'type' => 'int',
 						'int_min' => 0,
 						'int_max' => 94608000, // 3-years
 						'value' => $result['hsts']
 					),
 					'hsts_sub' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'],
+						'label' => $lng['admin']['domain_hsts_incsub']['title'],
+						'desc' => $lng['admin']['domain_hsts_incsub']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -151,12 +151,12 @@ return array(
 						)
 					),
 					'hsts_preload' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'],
+						'label' => $lng['admin']['domain_hsts_preload']['title'],
+						'desc' => $lng['admin']['domain_hsts_preload']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/customer/email/formfield.emails_accountchangepasswd.php

@@ -16,25 +16,25 @@
  */
 return array(
 	'emails_accountchangepasswd' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword'],
+		'title' => $lng['menue']['main']['changepassword'],
 		'image' => 'icons/email_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword'],
+				'title' => $lng['menue']['main']['changepassword'],
 				'image' => 'icons/email_edit.png',
 				'fields' => array(
 					'email_full' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'],
+						'label' => $lng['emails']['emailaddress'],
 						'type' => 'label',
 						'value' => $result['email_full']
 					),
 					'email_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'email_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()

lib/formfields/customer/email/formfield.emails_accountchangequota.php

@@ -16,20 +16,20 @@
  */
 return array(
 	'emails_accountchangequota' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['emails']['quota_edit'],
+		'title' => $lng['emails']['quota_edit'],
 		'image' => 'icons/email_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['emails']['quota_edit'],
+				'title' => $lng['emails']['quota_edit'],
 				'image' => 'icons/email_edit.png',
 				'fields' => array(
 					'email_full' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'],
+						'label' => $lng['emails']['emailaddress'],
 						'type' => 'label',
 						'value' => $result['email_full']
 					),
 					'email_quota' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['quota'] . ' (MiB)',
+						'label' => $lng['emails']['quota'] . ' (MiB)',
 						'type' => 'text',
 						'value' => $result['quota']
 					)

lib/formfields/customer/email/formfield.emails_add.php

@@ -16,15 +16,15 @@
  */
 return array(
 	'emails_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_add'],
+		'title' => $lng['emails']['emails_add'],
 		'image' => 'icons/email_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_add'],
+				'title' => $lng['emails']['emails_add'],
 				'image' => 'icons/email_add.png',
 				'fields' => array(
 					'email_part' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'],
+						'label' => $lng['emails']['emailaddress'],
 						'type' => 'textul',
 						'ul_field' => '',
 						'has_nextto' => true
@@ -36,11 +36,11 @@ return array(
 						'select_var' => $domains
 					),
 					'iscatchall' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['iscatchall'],
+						'label' => $lng['emails']['iscatchall'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/customer/email/formfield.emails_addaccount.php

@@ -16,39 +16,39 @@
  */
 return array(
 	'emails_addaccount' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['emails']['account_add'],
+		'title' => $lng['emails']['account_add'],
 		'image' => 'icons/email_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['emails']['account_add'],
+				'title' => $lng['emails']['account_add'],
 				'image' => 'icons/email_add.png',
 				'fields' => array(
 					'email_full' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'],
+						'label' => $lng['emails']['emailaddress'],
 						'type' => 'label',
 						'value' => $result['email_full']
 					),
 					'email_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'email_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'email_quota' => array(
 						'visible' => (\Froxlor\Settings::Get('system.mail_quota_enabled') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['quota'],
+						'label' => $lng['emails']['quota'],
 						'desc' => "MiB",
 						'type' => 'text',
 						'value' => $quota
 					),
 					'alternative_email' => array(
 						'visible' => (\Froxlor\Settings::Get('panel.sendalternativemail') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['alternative_emailaddress'],
+						'label' => $lng['emails']['alternative_emailaddress'],
 						'type' => 'text'
 					)
 				)

lib/formfields/customer/email/formfield.emails_addforwarder.php

@@ -16,20 +16,20 @@
  */
 return array(
 	'emails_addforwarder' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['emails']['forwarder_add'],
+		'title' => $lng['emails']['forwarder_add'],
 		'image' => 'icons/autoresponder_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['emails']['forwarder_add'],
+				'title' => $lng['emails']['forwarder_add'],
 				'image' => 'icons/autoresponder_add.png',
 				'fields' => array(
 					'email_full' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['from'],
+						'label' => $lng['emails']['from'],
 						'type' => 'label',
 						'value' => $result['email_full']
 					),
 					'destination' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['to'],
+						'label' => $lng['emails']['to'],
 						'type' => 'text'
 					)
 				)

lib/formfields/customer/email/formfield.emails_edit.php

@@ -16,46 +16,46 @@
  */
 return array(
 	'emails_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_edit'],
+		'title' => $lng['emails']['emails_edit'],
 		'image' => 'icons/email_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_edit'],
+				'title' => $lng['emails']['emails_edit'],
 				'image' => 'icons/email_edit.png',
 				'nobuttons' => true,
 				'fields' => array(
 					'email_full' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'],
+						'label' => $lng['emails']['emailaddress'],
 						'type' => 'label',
 						'value' => $result['email_full']
 					),
 					'account_yes' => array(
 						'visible' => ($result['popaccountid'] != 0 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['account'],
+						'label' => $lng['emails']['account'],
 						'type' => 'label',
-						'value' => \Froxlor\I18N\Lang::getAll()['panel']['yes'] . '&nbsp;[<a href="' . $filename . '?page=accounts&amp;action=changepw&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword'] . '</a>] [<a href="' . $filename . '?page=accounts&amp;action=delete&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . \Froxlor\I18N\Lang::getAll()['emails']['account_delete'] . '</a>]'
+						'value' => $lng['panel']['yes'] . '&nbsp;[<a href="' . $filename . '?page=accounts&amp;action=changepw&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . $lng['menue']['main']['changepassword'] . '</a>] [<a href="' . $filename . '?page=accounts&amp;action=delete&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . $lng['emails']['account_delete'] . '</a>]'
 					),
 					'account_no' => array(
 						'visible' => ($result['popaccountid'] == 0 ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['account'],
+						'label' => $lng['emails']['account'],
 						'type' => 'label',
-						'value' => \Froxlor\I18N\Lang::getAll()['panel']['no'] . '&nbsp;[<a href="' . $filename . '?page=accounts&amp;action=add&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . \Froxlor\I18N\Lang::getAll()['emails']['account_add'] . '</a>]'
+						'value' => $lng['panel']['no'] . '&nbsp;[<a href="' . $filename . '?page=accounts&amp;action=add&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . $lng['emails']['account_add'] . '</a>]'
 					),
 					'mail_quota' => array(
 						'visible' => ($result['popaccountid'] != 0 && \Froxlor\Settings::Get('system.mail_quota_enabled')),
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'],
+						'label' => $lng['customer']['email_quota'],
 						'type' => 'label',
-						'value' => $result['quota'] . ' MiB [<a href="' . $filename . '?page=accounts&amp;action=changequota&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . \Froxlor\I18N\Lang::getAll()['emails']['quota_edit'] . '</a>]'
+						'value' => $result['quota'] . ' MiB [<a href="' . $filename . '?page=accounts&amp;action=changequota&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . $lng['emails']['quota_edit'] . '</a>]'
 					),
 					'mail_catchall' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['catchall'],
+						'label' => $lng['emails']['catchall'],
 						'type' => 'label',
-						'value' => ($result['iscatchall'] == 0 ? \Froxlor\I18N\Lang::getAll()['panel']['no'] : \Froxlor\I18N\Lang::getAll()['panel']['yes']) . ' [<a href="' . $filename . '?page=' . $page . '&amp;action=togglecatchall&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . \Froxlor\I18N\Lang::getAll()['panel']['toggle'] . '</a>]'
+						'value' => ($result['iscatchall'] == 0 ? $lng['panel']['no'] : $lng['panel']['yes']) . ' [<a href="' . $filename . '?page=' . $page . '&amp;action=togglecatchall&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . $lng['panel']['toggle'] . '</a>]'
 					),
 					'mail_fwds' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['emails']['forwarders'] . ' (' . $forwarders_count . ')',
+						'label' => $lng['emails']['forwarders'] . ' (' . $forwarders_count . ')',
 						'type' => 'label',
-						'value' => $forwarders . ' <a href="' . $filename . '?page=forwarders&amp;action=add&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . \Froxlor\I18N\Lang::getAll()['emails']['forwarder_add'] . '</a>'
+						'value' => $forwarders . ' <a href="' . $filename . '?page=forwarders&amp;action=add&amp;id=' . $result['id'] . '&amp;s=' . $s . '">' . $lng['emails']['forwarder_add'] . '</a>'
 					)
 				)
 			)

lib/formfields/customer/extras/formfield.backup.php

@@ -16,31 +16,31 @@
  */
 return array(
 	'backup' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['extras']['backup'],
+		'title' => $lng['extras']['backup'],
 		'image' => 'icons/backup_big.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['extras']['backup'],
+				'title' => $lng['extras']['backup'],
 				'image' => 'icons/backup_big.png',
 				'fields' => array(
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['backuppath']['title'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['backuppath']['description'] . '<br>' . (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
+						'label' => $lng['panel']['backuppath']['title'],
+						'desc' => $lng['panel']['backuppath']['description'] . '<br>' . (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
 					),
 					'path_protection_info' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['path_protection_label'],
+						'label' => $lng['extras']['path_protection_label'],
 						'type' => 'label',
-						'value' => \Froxlor\I18N\Lang::getAll()['extras']['path_protection_info']
+						'value' => $lng['extras']['path_protection_info']
 					),
 					'backup_web' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['backup_web'],
+						'label' => $lng['extras']['backup_web'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -49,11 +49,11 @@ return array(
 						)
 					),
 					'backup_mail' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['backup_mail'],
+						'label' => $lng['extras']['backup_mail'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -62,11 +62,11 @@ return array(
 						)
 					),
 					'backup_dbs' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['backup_dbs'],
+						'label' => $lng['extras']['backup_dbs'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/customer/extras/formfield.htaccess_add.php

@@ -16,55 +16,55 @@
  */
 return array(
 	'htaccess_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add'],
+		'title' => $lng['extras']['pathoptions_add'],
 		'image' => 'icons/htpasswd_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add'],
+				'title' => $lng['extras']['pathoptions_add'],
 				'image' => 'icons/htpasswd_add.png',
 				'fields' => array(
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
-						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
+						'label' => $lng['panel']['path'],
+						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
 					),
 					'options_indexes' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['directory_browsing'],
+						'label' => $lng['extras']['directory_browsing'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
 						'value' => array()
 					),
 					'error404path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument404path'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'],
+						'label' => $lng['extras']['errordocument404path'],
+						'desc' => $lng['panel']['descriptionerrordocument'],
 						'type' => 'text'
 					),
 					'error403path' => array(
 						'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument403path'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'],
+						'label' => $lng['extras']['errordocument403path'],
+						'desc' => $lng['panel']['descriptionerrordocument'],
 						'type' => 'text'
 					),
 					'error500path' => array(
 						'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument500path'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'],
+						'label' => $lng['extras']['errordocument500path'],
+						'desc' => $lng['panel']['descriptionerrordocument'],
 						'type' => 'text'
 					),
 					'options_cgi' => array(
 						'visible' => ($cperlenabled == 1),
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['execute_perl'],
+						'label' => $lng['extras']['execute_perl'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/customer/extras/formfield.htaccess_edit.php

@@ -16,24 +16,24 @@
  */
 return array(
 	'htaccess_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_edit'],
+		'title' => $lng['extras']['pathoptions_edit'],
 		'image' => 'icons/htpasswd_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_edit'],
+				'title' => $lng['extras']['pathoptions_edit'],
 				'image' => 'icons/htpasswd_edit.png',
 				'fields' => array(
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
+						'label' => $lng['panel']['path'],
 						'type' => 'label',
 						'value' => $result['path']
 					),
 					'options_indexes' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['directory_browsing'],
+						'label' => $lng['extras']['directory_browsing'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -42,32 +42,32 @@ return array(
 						)
 					),
 					'error404path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument404path'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'],
+						'label' => $lng['extras']['errordocument404path'],
+						'desc' => $lng['panel']['descriptionerrordocument'],
 						'type' => 'text',
 						'value' => $result['error404path']
 					),
 					'error403path' => array(
 						'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument403path'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'],
+						'label' => $lng['extras']['errordocument403path'],
+						'desc' => $lng['panel']['descriptionerrordocument'],
 						'type' => 'text',
 						'value' => $result['error403path']
 					),
 					'error500path' => array(
 						'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'),
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument500path'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'],
+						'label' => $lng['extras']['errordocument500path'],
+						'desc' => $lng['panel']['descriptionerrordocument'],
 						'type' => 'text',
 						'value' => $result['error500path']
 					),
 					'options_cgi' => array(
 						'visible' => ($cperlenabled == 1),
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['execute_perl'],
+						'label' => $lng['extras']['execute_perl'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/customer/extras/formfield.htpasswd_add.php

@@ -16,37 +16,37 @@
  */
 return array(
 	'htpasswd_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add'],
+		'title' => $lng['extras']['directoryprotection_add'],
 		'image' => 'icons/htpasswd_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add'],
+				'title' => $lng['extras']['directoryprotection_add'],
 				'image' => 'icons/htpasswd_add.png',
 				'fields' => array(
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
-						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
+						'label' => $lng['panel']['path'],
+						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
 					),
 					'username' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'text'
 					),
 					'directory_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'directory_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'directory_authname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['htpasswdauthname'],
+						'label' => $lng['extras']['htpasswdauthname'],
 						'type' => 'text'
 					)
 				)

lib/formfields/customer/extras/formfield.htpasswd_edit.php

@@ -16,36 +16,36 @@
  */
 return array(
 	'htpasswd_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_edit'],
+		'title' => $lng['extras']['directoryprotection_edit'],
 		'image' => 'icons/htpasswd_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_edit'],
+				'title' => $lng['extras']['directoryprotection_edit'],
 				'image' => 'icons/htpasswd_edit.png',
 				'fields' => array(
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
+						'label' => $lng['panel']['path'],
 						'type' => 'label',
 						'value' => $result['path']
 					),
 					'username' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'label',
 						'value' => $result['username']
 					),
 					'directory_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'directory_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'directory_authname' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['extras']['htpasswdauthname'],
+						'label' => $lng['extras']['htpasswdauthname'],
 						'type' => 'text',
 						'value' => $result['authname']
 					)

lib/formfields/customer/ftp/formfield.ftp_add.php

@@ -15,52 +15,52 @@
  */
 return array(
 	'ftp_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_add'],
+		'title' => $lng['ftp']['account_add'],
 		'image' => 'icons/user_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_add'],
+				'title' => $lng['ftp']['account_add'],
 				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'ftp_username' => array(
 						'visible' => (\Froxlor\Settings::Get('customer.ftpatdomain') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'text'
 					),
 					'ftp_domain' => array(
 						'visible' => (\Froxlor\Settings::Get('customer.ftpatdomain') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'],
+						'label' => $lng['domains']['domainname'],
 						'type' => 'select',
 						'select_var' => (isset($domains) ? $domains : "")
 					),
 					'ftp_description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['ftpdesc'] = 'FTP description',
+						'label' => $lng['panel']['ftpdesc'] = 'FTP description',
 						'type' => 'text'
 					),
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
-						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
+						'label' => $lng['panel']['path'],
+						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
 					),
 					'ftp_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'ftp_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'sendinfomail' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['sendinfomail'],
+						'label' => $lng['customer']['sendinfomail'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),
@@ -68,7 +68,7 @@ return array(
 					),
 					'shell' => array(
 						'visible' => (\Froxlor\Settings::Get('system.allow_customer_shell') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['shell'],
+						'label' => $lng['panel']['shell'],
 						'type' => 'select',
 						'select_var' => (isset($shells) ? $shells : "")
 					)

lib/formfields/customer/ftp/formfield.ftp_edit.php

@@ -15,45 +15,45 @@
  */
 return array(
 	'ftp_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_edit'],
+		'title' => $lng['ftp']['account_edit'],
 		'image' => 'icons/user_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_edit'],
+				'title' => $lng['ftp']['account_edit'],
 				'image' => 'icons/user_edit.png',
 				'fields' => array(
 					'username' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['username'],
+						'label' => $lng['login']['username'],
 						'type' => 'label',
 						'value' => $result['username']
 					),
 					'ftp_description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['ftpdesc'] = 'FTP description',
+						'label' => $lng['panel']['ftpdesc'] = 'FTP description',
 						'type' => 'text',
 						'value' => $result['description']
 					),
 					'path' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'],
-						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
+						'label' => $lng['panel']['path'],
+						'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '<br />' . $pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
 					),
 					'ftp_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
-						'desc' => \Froxlor\I18N\Lang::getAll()['ftp']['editpassdescription'],
+						'label' => $lng['login']['password'],
+						'desc' => $lng['ftp']['editpassdescription'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'ftp_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'shell' => array(
 						'visible' => (\Froxlor\Settings::Get('system.allow_customer_shell') == '1' ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['panel']['shell'],
+						'label' => $lng['panel']['shell'],
 						'type' => 'select',
 						'select_var' => (isset($shells) ? $shells : "")
 					)

lib/formfields/customer/mysql/formfield.mysql_add.php

@@ -15,40 +15,40 @@
  */
 return array(
 	'mysql_add' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_create'],
+		'title' => $lng['mysql']['database_create'],
 		'image' => 'icons/mysql_add.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_create'],
+				'title' => $lng['mysql']['database_create'],
 				'image' => 'icons/mysql_add.png',
 				'fields' => array(
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['mysql']['databasedescription'],
+						'label' => $lng['mysql']['databasedescription'],
 						'type' => 'text'
 					),
 					'mysql_server' => array(
 						'visible' => (1 < $count_mysqlservers ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['mysql']['mysql_server'],
+						'label' => $lng['mysql']['mysql_server'],
 						'type' => 'select',
 						'select_var' => $mysql_servers
 					),
 					'mysql_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['login']['password'],
+						'label' => $lng['login']['password'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'mysql_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()
 					),
 					'sendinfomail' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['sendinfomail'],
+						'label' => $lng['customer']['sendinfomail'],
 						'type' => 'checkbox',
 						'values' => array(
 							array(
-								'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'],
+								'label' => $lng['panel']['yes'],
 								'value' => '1'
 							)
 						),

lib/formfields/customer/mysql/formfield.mysql_edit.php

@@ -15,36 +15,36 @@
  */
 return array(
 	'mysql_edit' => array(
-		'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_edit'],
+		'title' => $lng['mysql']['database_edit'],
 		'image' => 'icons/mysql_edit.png',
 		'sections' => array(
 			'section_a' => array(
-				'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_edit'],
+				'title' => $lng['mysql']['database_edit'],
 				'image' => 'icons/mysql_edit.png',
 				'fields' => array(
 					'databasename' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['mysql']['databasename'],
+						'label' => $lng['mysql']['databasename'],
 						'type' => 'label',
 						'value' => $result['databasename']
 					),
 					'description' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['mysql']['databasedescription'],
+						'label' => $lng['mysql']['databasedescription'],
 						'type' => 'text',
 						'value' => $result['description']
 					),
 					'mysql_server' => array(
 						'visible' => (1 < $count_mysqlservers ? true : false),
-						'label' => \Froxlor\I18N\Lang::getAll()['mysql']['mysql_server'],
+						'label' => $lng['mysql']['mysql_server'],
 						'type' => 'label',
 						'value' => $sql_root['caption']
 					),
 					'mysql_password' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['changepassword']['new_password_ifnotempty'],
+						'label' => $lng['changepassword']['new_password_ifnotempty'],
 						'type' => 'password',
 						'autocomplete' => 'off'
 					),
 					'mysql_password_suggestion' => array(
-						'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'],
+						'label' => $lng['customer']['generated_pwd'],
 						'type' => 'text',
 						'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''),
 						'value' => \Froxlor\System\Crypt::generatePassword()

lib/functions/formfields/function.getFormFieldOutput.php

@@ -18,6 +18,8 @@
  */
 function getFormFieldOutput($fieldname, $fielddata)
 {
+	global $lng;
+
 	$returnvalue = '';
 	if (is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldOutput' . ucfirst($fielddata['type']))) {
 		if (isset($fielddata['label']) && is_array($fielddata['label'])) {
@@ -47,7 +49,7 @@ function getFormFieldOutput($fieldname, $fielddata)
 			$websrv = Settings::Get('system.webserver');
 			if (! in_array($websrv, $fielddata['websrv_avail'])) {
 				$do_show = false;
-				$fielddata['label'] .= sprintf(\Froxlor\I18N\Lang::getAll()['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail']));
+				$fielddata['label'] .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail']));
 			}
 		}
 
@@ -57,7 +59,7 @@ function getFormFieldOutput($fieldname, $fielddata)
 		if (isset($fielddata['visible']) && $do_show) {
 			$do_show = $fielddata['visible'];
 			if (! $do_show) {
-				$fielddata['label'] .= \Froxlor\I18N\Lang::getAll()['serversettings']['option_unavailable'];
+				$fielddata['label'] .= $lng['serversettings']['option_unavailable'];
 			}
 		}
 

lib/functions/formfields/function.getFormGroupOutput.php

@@ -18,14 +18,14 @@
  */
 function getFormGroupOutput($groupname, $groupdetails)
 {
-	global $theme;
+	global $lng, $theme;
 	eval("\$group = \"" . \Froxlor\UI\Template::getTemplate("settings/settings_group") . "\";");
 	return $group;
 }
 
 function getFormOverviewGroupOutput($groupname, $groupdetails)
 {
-	global $filename, $s, $theme;
+	global $lng, $filename, $s, $theme;
 
 	$group = '';
 	$title = $groupdetails['title'];
@@ -52,7 +52,7 @@ function getFormOverviewGroupOutput($groupname, $groupdetails)
 					$option .= '</select>';
 					$activated = true;
 				} else {
-					$option .= \Froxlor\I18N\Lang::getAll()['admin']['activated'] . ':&nbsp;';
+					$option .= $lng['admin']['activated'] . ':&nbsp;';
 					$option .= \Froxlor\UI\HTML::makeyesno($fieldname, '1', '0', Settings::Get($fielddetails['settinggroup'] . '.' . $fielddetails['varname']));
 					$activated = (int) Settings::Get($fielddetails['settinggroup'] . '.' . $fielddetails['varname']);
 				}
@@ -71,7 +71,7 @@ function getFormOverviewGroupOutput($groupname, $groupdetails)
 		$websrv = Settings::Get('system.webserver');
 		if (! in_array($websrv, $groupdetails['websrv_avail'])) {
 			$do_show = false;
-			$title .= sprintf(\Froxlor\I18N\Lang::getAll()['serversettings']['option_unavailable_websrv'], implode(", ", $groupdetails['websrv_avail']));
+			$title .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $groupdetails['websrv_avail']));
 			// hack disabled flag into select-box
 			$option = str_replace('<select class', '<select disabled="disabled" class', $option);
 		}

lib/init.php

@@ -397,24 +397,24 @@ if (AREA == 'admin' || AREA == 'customer') {
 			'admin' => array(
 				'index' => array(
 					'url' => 'admin_index.php',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['overview'],
+					'label' => $lng['admin']['overview'],
 					'elements' => array(
 						array(
-							'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['username']
+							'label' => $lng['menue']['main']['username']
 						),
 						array(
 							'url' => 'admin_index.php?action=logout',
-							'label' => \Froxlor\I18N\Lang::getAll()['login']['logout']
+							'label' => $lng['login']['logout']
 						)
 					)
 				),
 				'server' => array(
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['server'],
+					'label' => $lng['admin']['server'],
 					'required_resources' => 'change_serversettings',
 					'elements' => array(
 						array(
 							'url' => 'admin_updates.php?page=overview',
-							'label' => \Froxlor\I18N\Lang::getAll()['update']['update'],
+							'label' => $lng['update']['update'],
 							'required_resources' => 'change_serversettings'
 						)
 					)

lib/navigation/00.froxlor.main.php

@@ -20,59 +20,59 @@ return array(
 	'customer' => array(
 		'index' => array(
 			'url' => 'customer_index.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['admin']['overview'],
+			'label' => $lng['admin']['overview'],
 			'elements' => array(
 				array(
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['username'] . (isset(\Froxlor\User::getAll()['loginname']) && \Froxlor\User::getAll()['loginname'] != '' ? " " . \Froxlor\User::getAll()['loginname'] : "")
+					'label' => $lng['menue']['main']['username'] . (isset(\Froxlor\User::getAll()['loginname']) && \Froxlor\User::getAll()['loginname'] != '' ? " " . \Froxlor\User::getAll()['loginname'] : "")
 				),
 				array(
 					'url' => 'customer_index.php?page=change_password',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword']
+					'label' => $lng['menue']['main']['changepassword']
 				),
 				array(
 					'url' => 'customer_index.php?page=change_language',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changelanguage']
+					'label' => $lng['menue']['main']['changelanguage']
 				),
 				array(
 					'url' => 'customer_index.php?page=change_theme',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changetheme'],
+					'label' => $lng['menue']['main']['changetheme'],
 					'show_element' => (\Froxlor\Settings::Get('panel.allow_theme_change_customer') == true)
 				),
 				array(
 					'url' => 'customer_index.php?page=apikeys',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['apikeys'],
+					'label' => $lng['menue']['main']['apikeys'],
 					'show_element' => (\Froxlor\Settings::Get('api.enabled') == true)
 				),
 				array(
 					'url' => 'customer_index.php?page=apihelp',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['apihelp'],
+					'label' => $lng['menue']['main']['apihelp'],
 					'show_element' => (\Froxlor\Settings::Get('api.enabled') == true)
 				),
 				array(
 					'url' => 'customer_index.php?action=logout',
-					'label' => \Froxlor\I18N\Lang::getAll()['login']['logout']
+					'label' => $lng['login']['logout']
 				)
 			)
 		),
 		'email' => array(
 			'url' => 'customer_email.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['menue']['email']['email'],
+			'label' => $lng['menue']['email']['email'],
 			'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'email')),
 			'elements' => array(
 				array(
 					'url' => 'customer_email.php?page=emails',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['email']['emails'],
+					'label' => $lng['menue']['email']['emails'],
 					'required_resources' => 'emails'
 				),
 				array(
 					'url' => 'customer_email.php?page=emails&action=add',
-					'label' => \Froxlor\I18N\Lang::getAll()['emails']['emails_add'],
+					'label' => $lng['emails']['emails_add'],
 					'required_resources' => 'emails'
 				),
 				array(
 					'url' => \Froxlor\Settings::Get('panel.webmail_url'),
 					'new_window' => true,
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['email']['webmail'],
+					'label' => $lng['menue']['email']['webmail'],
 					'required_resources' => 'emails_used',
 					'show_element' => (\Froxlor\Settings::Get('panel.webmail_url') != '')
 				)
@@ -80,18 +80,18 @@ return array(
 		),
 		'mysql' => array(
 			'url' => 'customer_mysql.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['menue']['mysql']['mysql'],
+			'label' => $lng['menue']['mysql']['mysql'],
 			'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'mysql')),
 			'elements' => array(
 				array(
 					'url' => 'customer_mysql.php?page=mysqls',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['mysql']['databases'],
+					'label' => $lng['menue']['mysql']['databases'],
 					'required_resources' => 'mysqls'
 				),
 				array(
 					'url' => \Froxlor\Settings::Get('panel.phpmyadmin_url'),
 					'new_window' => true,
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['mysql']['phpmyadmin'],
+					'label' => $lng['menue']['mysql']['phpmyadmin'],
 					'required_resources' => 'mysqls_used',
 					'show_element' => (\Froxlor\Settings::Get('panel.phpmyadmin_url') != '')
 				)
@@ -99,71 +99,71 @@ return array(
 		),
 		'domains' => array(
 			'url' => 'customer_domains.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['menue']['domains']['domains'],
+			'label' => $lng['menue']['domains']['domains'],
 			'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'domains')),
 			'elements' => array(
 				array(
 					'url' => 'customer_domains.php?page=domains',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['domains']['settings']
+					'label' => $lng['menue']['domains']['settings']
 				),
 				array(
 					'url' => 'customer_domains.php?page=sslcertificates',
-					'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_certificates']
+					'label' => $lng['domains']['ssl_certificates']
 				)
 			)
 		),
 		'ftp' => array(
 			'url' => 'customer_ftp.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['menue']['ftp']['ftp'],
+			'label' => $lng['menue']['ftp']['ftp'],
 			'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'ftp')),
 			'elements' => array(
 				array(
 					'url' => 'customer_ftp.php?page=accounts',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['ftp']['accounts']
+					'label' => $lng['menue']['ftp']['accounts']
 				),
 				array(
 					'url' => \Froxlor\Settings::Get('panel.webftp_url'),
 					'new_window' => true,
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['ftp']['webftp'],
+					'label' => $lng['menue']['ftp']['webftp'],
 					'show_element' => (\Froxlor\Settings::Get('panel.webftp_url') != '')
 				)
 			)
 		),
 		'extras' => array(
 			'url' => 'customer_extras.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['extras'],
+			'label' => $lng['menue']['extras']['extras'],
 			'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'extras')),
 			'elements' => array(
 				array(
 					'url' => 'customer_extras.php?page=htpasswds',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['directoryprotection'],
+					'label' => $lng['menue']['extras']['directoryprotection'],
 					'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'extras.directoryprotection'))
 				),
 				array(
 					'url' => 'customer_extras.php?page=htaccess',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['pathoptions'],
+					'label' => $lng['menue']['extras']['pathoptions'],
 					'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'extras.pathoptions'))
 				),
 				array(
 					'url' => 'customer_logger.php?page=log',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['logger']['logger'],
+					'label' => $lng['menue']['logger']['logger'],
 					'show_element' => (\Froxlor\Settings::Get('logger.enabled') == true) && (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'extras.logger'))
 				),
 				array(
 					'url' => 'customer_extras.php?page=backup',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['backup'],
+					'label' => $lng['menue']['extras']['backup'],
 					'show_element' => (\Froxlor\Settings::Get('system.backupenabled') == true) && (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'extras.backup'))
 				)
 			)
 		),
 		'traffic' => array(
 			'url' => 'customer_traffic.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['menue']['traffic']['traffic'],
+			'label' => $lng['menue']['traffic']['traffic'],
 			'show_element' => (! \Froxlor\Settings::IsInList('panel.customer_hide_options', 'traffic')),
 			'elements' => array(
 				array(
 					'url' => 'customer_traffic.php?page=current',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['traffic']['current']
+					'label' => $lng['menue']['traffic']['current']
 				)
 			)
 		)
@@ -171,189 +171,189 @@ return array(
 	'admin' => array(
 		'index' => array(
 			'url' => 'admin_index.php',
-			'label' => \Froxlor\I18N\Lang::getAll()['admin']['overview'],
+			'label' => $lng['admin']['overview'],
 			'elements' => array(
 				array(
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['username']
+					'label' => $lng['menue']['main']['username']
 				),
 				array(
 					'url' => 'admin_index.php?page=change_password',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword']
+					'label' => $lng['menue']['main']['changepassword']
 				),
 				array(
 					'url' => 'admin_index.php?page=change_language',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changelanguage']
+					'label' => $lng['menue']['main']['changelanguage']
 				),
 				array(
 					'url' => 'admin_index.php?page=change_theme',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changetheme'],
+					'label' => $lng['menue']['main']['changetheme'],
 					'show_element' => (\Froxlor\Settings::Get('panel.allow_theme_change_admin') == true)
 				),
 				array(
 					'url' => 'admin_index.php?page=apikeys',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['apikeys'],
+					'label' => $lng['menue']['main']['apikeys'],
 					'show_element' => (\Froxlor\Settings::Get('api.enabled') == true)
 				),
 				array(
 					'url' => 'admin_index.php?page=apihelp',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['main']['apihelp'],
+					'label' => $lng['menue']['main']['apihelp'],
 					'show_element' => (\Froxlor\Settings::Get('api.enabled') == true)
 				),
 				array(
 					'url' => 'admin_index.php?action=logout',
-					'label' => \Froxlor\I18N\Lang::getAll()['login']['logout']
+					'label' => $lng['login']['logout']
 				)
 			)
 		),
 		'resources' => array(
-			'label' => \Froxlor\I18N\Lang::getAll()['admin']['resources'],
+			'label' => $lng['admin']['resources'],
 			'required_resources' => 'customers',
 			'elements' => array(
 				array(
 					'url' => 'admin_customers.php?page=customers',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers'],
+					'label' => $lng['admin']['customers'],
 					'required_resources' => 'customers'
 				),
 				array(
 					'url' => 'admin_admins.php?page=admins',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['admins'],
+					'label' => $lng['admin']['admins'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_domains.php?page=domains',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains'],
+					'label' => $lng['admin']['domains'],
 					'required_resources' => 'domains'
 				),
 				array(
 					'url' => 'admin_domains.php?page=sslcertificates',
-					'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_certificates'],
+					'label' => $lng['domains']['ssl_certificates'],
 					'required_resources' => 'domains'
 				),
 				array(
 					'url' => 'admin_ipsandports.php?page=ipsandports',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ipsandports'],
+					'label' => $lng['admin']['ipsandports']['ipsandports'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_plans.php?page=overview',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['plans'],
+					'label' => $lng['admin']['plans']['plans'],
 					'required_resources' => 'customers'
 				),
 				array(
 					'url' => 'admin_settings.php?page=updatecounters',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['updatecounters'],
+					'label' => $lng['admin']['updatecounters'],
 					'required_resources' => 'change_serversettings'
 				)
 			)
 		),
 		'traffic' => array(
-			'label' => \Froxlor\I18N\Lang::getAll()['admin']['traffic'],
+			'label' => $lng['admin']['traffic'],
 			'required_resources' => 'customers',
 			'elements' => array(
 				array(
 					'url' => 'admin_traffic.php?page=customers',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['customertraffic'],
+					'label' => $lng['admin']['customertraffic'],
 					'required_resources' => 'customers'
 				)
 			)
 		),
 		'server' => array(
-			'label' => \Froxlor\I18N\Lang::getAll()['admin']['server'],
+			'label' => $lng['admin']['server'],
 			'required_resources' => 'change_serversettings',
 			'elements' => array(
 				array(
 					'url' => 'admin_configfiles.php?page=configfiles',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration'],
+					'label' => $lng['admin']['configfiles']['serverconfiguration'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_settings.php?page=overview',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['serversettings'],
+					'label' => $lng['admin']['serversettings'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_cronjobs.php?page=overview',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['cron']['cronsettings'],
+					'label' => $lng['admin']['cron']['cronsettings'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_logger.php?page=log',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['logger']['logger'],
+					'label' => $lng['menue']['logger']['logger'],
 					'required_resources' => 'change_serversettings',
 					'show_element' => (\Froxlor\Settings::Get('logger.enabled') == true)
 				),
 				array(
 					'url' => 'admin_settings.php?page=rebuildconfigs',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['rebuildconf'],
+					'label' => $lng['admin']['rebuildconf'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_autoupdate.php?page=overview',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['autoupdate'],
+					'label' => $lng['admin']['autoupdate'],
 					'required_resources' => 'change_serversettings',
 					'show_element' => extension_loaded('zip')
 				),
 				array(
 					'url' => 'admin_settings.php?page=wipecleartextmailpws',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['wipecleartextmailpwd'],
+					'label' => $lng['admin']['wipecleartextmailpwd'],
 					'required_resources' => 'change_serversettings',
 					'show_element' => (\Froxlor\Settings::Get('system.mailpwcleartext') == true)
 				)
 			)
 		),
 		'server_php' => array(
-			'label' => \Froxlor\I18N\Lang::getAll()['admin']['server_php'],
+			'label' => $lng['admin']['server_php'],
 			'required_resources' => 'change_serversettings',
 			'elements' => array(
 				array(
 					'url' => 'admin_phpsettings.php?page=overview',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['phpsettings']['maintitle'],
+					'label' => $lng['menue']['phpsettings']['maintitle'],
 					'show_element' => (\Froxlor\Settings::Get('system.mod_fcgid') == true || \Froxlor\Settings::Get('phpfpm.enabled') == true)
 				),
 				array(
 					'url' => 'admin_phpsettings.php?page=fpmdaemons',
-					'label' => \Froxlor\I18N\Lang::getAll()['menue']['phpsettings']['fpmdaemons'],
+					'label' => $lng['menue']['phpsettings']['fpmdaemons'],
 					'required_resources' => 'change_serversettings',
 					'show_element' => \Froxlor\Settings::Get('phpfpm.enabled') == true
 				),
 				array(
 					'url' => 'admin_settings.php?page=phpinfo',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpinfo'],
+					'label' => $lng['admin']['phpinfo'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_apcuinfo.php?page=showinfo',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['apcuinfo'],
+					'label' => $lng['admin']['apcuinfo'],
 					'required_resources' => 'change_serversettings',
 					'show_element' => (function_exists('apcu_cache_info') === true)
 				),
 				array(
 					'url' => 'admin_opcacheinfo.php?page=showinfo',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['opcacheinfo'],
+					'label' => $lng['admin']['opcacheinfo'],
 					'required_resources' => 'change_serversettings',
 					'show_element' => (function_exists('opcache_get_configuration') === true)
 				)
 			)
 		),
 		'misc' => array(
-			'label' => \Froxlor\I18N\Lang::getAll()['admin']['misc'],
+			'label' => $lng['admin']['misc'],
 			'elements' => array(
 				array(
 					'url' => 'admin_settings.php?page=integritycheck',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['integritycheck'],
+					'label' => $lng['admin']['integritycheck'],
 					'required_resources' => 'change_serversettings'
 				),
 				array(
 					'url' => 'admin_templates.php?page=email',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['email']
+					'label' => $lng['admin']['templates']['email']
 				),
 				array(
 					'url' => 'admin_message.php?page=message',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['message']
+					'label' => $lng['admin']['message']
 				),
 				array(
 					'url' => 'admin_settings.php?page=testmail',
-					'label' => \Froxlor\I18N\Lang::getAll()['admin']['testmail']
+					'label' => $lng['admin']['testmail']
 				)
 			)
 		)