diff --git a/2fa.php b/2fa.php index fc9ea66c..e4997833 100644 --- a/2fa.php +++ b/2fa.php @@ -47,7 +47,7 @@ if ($action == 'delete') { 'd2fa' => "", 'id' => $uid )); - \Froxlor\UI\Response::standard_success($lng['2fa']['2fa_removed']); + \Froxlor\UI\Response::standard_success(\Froxlor\I18N\Lang::getAll()['2fa']['2fa_removed']); } elseif ($action == 'add') { $type = isset($_POST['type_2fa']) ? $_POST['type_2fa'] : '0'; @@ -63,7 +63,7 @@ if ($action == 'delete') { 'd2fa' => $data, 'id' => $uid )); - \Froxlor\UI\Response::standard_success(sprintf($lng['2fa']['2fa_added'], $filename, $s)); + \Froxlor\UI\Response::standard_success(sprintf(\Froxlor\I18N\Lang::getAll()['2fa']['2fa_added'], $filename, $s)); } $log->logAction(USR_ACTION, LOG_NOTICE, "viewed 2fa::overview"); diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index d5be46cc..bd385e5b 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -19,12 +19,12 @@ return array( 'groups' => array( 'panel' => array( - 'title' => $lng['admin']['panelsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['panelsettings'], 'fields' => array( 'panel_standardlanguage' => array( 'label' => array( - 'title' => $lng['login']['language'], - 'description' => $lng['serversettings']['language']['description'] + 'title' => \Froxlor\I18N\Lang::getAll()['login']['language'], + 'description' => \Froxlor\I18N\Lang::getAll()['serversettings']['language']['description'] ), 'settinggroup' => 'panel', 'varname' => 'standardlanguage', @@ -36,8 +36,8 @@ return array( ), 'panel_default_theme' => array( 'label' => array( - 'title' => $lng['panel']['theme'], - 'description' => $lng['serversettings']['default_theme'] + 'title' => \Froxlor\I18N\Lang::getAll()['panel']['theme'], + 'description' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_theme'] ), 'settinggroup' => 'panel', 'varname' => 'default_theme', @@ -48,7 +48,7 @@ return array( 'save_method' => 'storeSettingDefaultTheme' ), 'panel_allow_theme_change_customer' => array( - 'label' => $lng['serversettings']['panel_allow_theme_change_customer'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_allow_theme_change_customer'], 'settinggroup' => 'panel', 'varname' => 'allow_theme_change_customer', 'type' => 'bool', @@ -56,7 +56,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_allow_theme_change_admin' => array( - 'label' => $lng['serversettings']['panel_allow_theme_change_admin'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_allow_theme_change_admin'], 'settinggroup' => 'panel', 'varname' => 'allow_theme_change_admin', 'type' => 'bool', @@ -64,7 +64,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_natsorting' => array( - 'label' => $lng['serversettings']['natsorting'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['natsorting'], 'settinggroup' => 'panel', 'varname' => 'natsorting', 'type' => 'bool', @@ -72,7 +72,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_no_robots' => array( - 'label' => $lng['serversettings']['no_robots'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['no_robots'], 'settinggroup' => 'panel', 'varname' => 'no_robots', 'type' => 'bool', @@ -80,7 +80,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_paging' => array( - 'label' => $lng['serversettings']['paging'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['paging'], 'settinggroup' => 'panel', 'varname' => 'paging', 'type' => 'int', @@ -89,20 +89,20 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_pathedit' => array( - 'label' => $lng['serversettings']['pathedit'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['pathedit'], 'settinggroup' => 'panel', 'varname' => 'pathedit', 'type' => 'option', 'default' => 'Manual', 'option_mode' => 'one', 'option_options' => array( - 'Manual' => $lng['serversettings']['manual'], - 'Dropdown' => $lng['serversettings']['dropdown'] + 'Manual' => \Froxlor\I18N\Lang::getAll()['serversettings']['manual'], + 'Dropdown' => \Froxlor\I18N\Lang::getAll()['serversettings']['dropdown'] ), 'save_method' => 'storeSettingField' ), 'panel_adminmail' => array( - 'label' => $lng['serversettings']['adminmail'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['adminmail'], 'settinggroup' => 'panel', 'varname' => 'adminmail', 'type' => 'string', @@ -112,7 +112,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_adminmail_defname' => array( - 'label' => $lng['serversettings']['adminmail_defname'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['adminmail_defname'], 'settinggroup' => 'panel', 'varname' => 'adminmail_defname', 'type' => 'string', @@ -120,7 +120,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_adminmail_return' => array( - 'label' => $lng['serversettings']['adminmail_return'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['adminmail_return'], 'settinggroup' => 'panel', 'varname' => 'adminmail_return', 'type' => 'string', @@ -130,7 +130,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_decimal_places' => array( - 'label' => $lng['serversettings']['decimal_places'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['decimal_places'], 'settinggroup' => 'panel', 'varname' => 'decimal_places', 'type' => 'int', @@ -140,7 +140,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_phpmyadmin_url' => array( - 'label' => $lng['serversettings']['phpmyadmin_url'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpmyadmin_url'], 'settinggroup' => 'panel', 'varname' => 'phpmyadmin_url', 'type' => 'string', @@ -150,7 +150,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_webmail_url' => array( - 'label' => $lng['serversettings']['webmail_url'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['webmail_url'], 'settinggroup' => 'panel', 'varname' => 'webmail_url', 'type' => 'string', @@ -160,7 +160,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_webftp_url' => array( - 'label' => $lng['serversettings']['webftp_url'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['webftp_url'], 'settinggroup' => 'panel', 'varname' => 'webftp_url', 'type' => 'string', @@ -170,7 +170,7 @@ return array( 'save_method' => 'storeSettingField' ), 'admin_show_version_login' => array( - 'label' => $lng['admin']['show_version_login'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['show_version_login'], 'settinggroup' => 'admin', 'varname' => 'show_version_login', 'type' => 'bool', @@ -178,7 +178,7 @@ return array( 'save_method' => 'storeSettingField' ), 'admin_show_version_footer' => array( - 'label' => $lng['admin']['show_version_footer'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['show_version_footer'], 'settinggroup' => 'admin', 'varname' => 'show_version_footer', 'type' => 'bool', @@ -186,7 +186,7 @@ return array( 'save_method' => 'storeSettingField' ), 'admin_show_news_feed' => array( - 'label' => $lng['admin']['show_news_feed'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['show_news_feed'], 'settinggroup' => 'admin', 'varname' => 'show_news_feed', 'type' => 'bool', @@ -194,7 +194,7 @@ return array( 'save_method' => 'storeSettingField' ), 'customer_show_news_feed' => array( - 'label' => $lng['admin']['customer_show_news_feed'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customer_show_news_feed'], 'settinggroup' => 'customer', 'varname' => 'show_news_feed', 'type' => 'bool', @@ -202,7 +202,7 @@ return array( 'save_method' => 'storeSettingField' ), 'customer_news_feed_url' => array( - 'label' => $lng['admin']['customer_news_feed_url'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customer_news_feed_url'], 'settinggroup' => 'customer', 'varname' => 'news_feed_url', 'type' => 'string', @@ -212,7 +212,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_allow_domain_change_admin' => array( - 'label' => $lng['serversettings']['panel_allow_domain_change_admin'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_allow_domain_change_admin'], 'settinggroup' => 'panel', 'varname' => 'allow_domain_change_admin', 'type' => 'bool', @@ -220,7 +220,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_allow_domain_change_customer' => array( - 'label' => $lng['serversettings']['panel_allow_domain_change_customer'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_allow_domain_change_customer'], 'settinggroup' => 'panel', 'varname' => 'allow_domain_change_customer', 'type' => 'bool', @@ -228,7 +228,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_phpconfigs_hidestdsubdomain' => array( - 'label' => $lng['serversettings']['panel_phpconfigs_hidestdsubdomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_phpconfigs_hidestdsubdomain'], 'settinggroup' => 'panel', 'varname' => 'phpconfigs_hidestdsubdomain', 'type' => 'bool', @@ -236,7 +236,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_customer_hide_options' => array( - 'label' => $lng['serversettings']['panel_customer_hide_options'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_customer_hide_options'], 'settinggroup' => 'panel', 'varname' => 'customer_hide_options', 'type' => 'option', @@ -244,19 +244,19 @@ return array( 'option_mode' => 'multiple', 'option_emptyallowed' => true, 'option_options' => array( - 'email' => $lng['menue']['email']['email'], - 'mysql' => $lng['menue']['mysql']['mysql'], - 'domains' => $lng['menue']['domains']['domains'], - 'ftp' => $lng['menue']['ftp']['ftp'], - 'extras' => $lng['menue']['extras']['extras'], - 'extras.directoryprotection' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['directoryprotection'], - 'extras.pathoptions' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['pathoptions'], - 'extras.logger' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['logger']['logger'], - 'extras.backup' => $lng['menue']['extras']['extras'] . " / " . $lng['menue']['extras']['backup'], - 'traffic' => $lng['menue']['traffic']['traffic'], - 'traffic.http' => $lng['menue']['traffic']['traffic'] . " / HTTP", - 'traffic.ftp' => $lng['menue']['traffic']['traffic'] . " / FTP", - 'traffic.mail' => $lng['menue']['traffic']['traffic'] . " / Mail" + 'email' => \Froxlor\I18N\Lang::getAll()['menue']['email']['email'], + 'mysql' => \Froxlor\I18N\Lang::getAll()['menue']['mysql']['mysql'], + 'domains' => \Froxlor\I18N\Lang::getAll()['menue']['domains']['domains'], + 'ftp' => \Froxlor\I18N\Lang::getAll()['menue']['ftp']['ftp'], + 'extras' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['extras'], + 'extras.directoryprotection' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['extras'] . " / " . \Froxlor\I18N\Lang::getAll()['menue']['extras']['directoryprotection'], + 'extras.pathoptions' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['extras'] . " / " . \Froxlor\I18N\Lang::getAll()['menue']['extras']['pathoptions'], + 'extras.logger' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['extras'] . " / " . \Froxlor\I18N\Lang::getAll()['menue']['logger']['logger'], + 'extras.backup' => \Froxlor\I18N\Lang::getAll()['menue']['extras']['extras'] . " / " . \Froxlor\I18N\Lang::getAll()['menue']['extras']['backup'], + 'traffic' => \Froxlor\I18N\Lang::getAll()['menue']['traffic']['traffic'], + 'traffic.http' => \Froxlor\I18N\Lang::getAll()['menue']['traffic']['traffic'] . " / HTTP", + 'traffic.ftp' => \Froxlor\I18N\Lang::getAll()['menue']['traffic']['traffic'] . " / FTP", + 'traffic.mail' => \Froxlor\I18N\Lang::getAll()['menue']['traffic']['traffic'] . " / Mail" ), 'save_method' => 'storeSettingField' ) diff --git a/actions/admin/settings/110.accounts.php b/actions/admin/settings/110.accounts.php index 71628dec..bd5a5c7e 100644 --- a/actions/admin/settings/110.accounts.php +++ b/actions/admin/settings/110.accounts.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'accounts' => array( - 'title' => $lng['admin']['accountsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountsettings'], 'fields' => array( 'session_sessiontimeout' => array( - 'label' => $lng['serversettings']['session_timeout'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['session_timeout'], 'settinggroup' => 'session', 'varname' => 'sessiontimeout', 'type' => 'int', @@ -30,7 +30,7 @@ return array( 'save_method' => 'storeSettingField' ), 'session_allow_multiple_login' => array( - 'label' => $lng['serversettings']['session_allow_multiple_login'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['session_allow_multiple_login'], 'settinggroup' => 'session', 'varname' => 'allow_multiple_login', 'type' => 'bool', @@ -38,7 +38,7 @@ return array( 'save_method' => 'storeSettingField' ), 'login_domain_login' => array( - 'label' => $lng['serversettings']['login_domain_login'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['login_domain_login'], 'settinggroup' => 'login', 'varname' => 'domain_login', 'type' => 'bool', @@ -46,7 +46,7 @@ return array( 'save_method' => 'storeSettingField' ), 'login_maxloginattempts' => array( - 'label' => $lng['serversettings']['maxloginattempts'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['maxloginattempts'], 'settinggroup' => 'login', 'varname' => 'maxloginattempts', 'type' => 'int', @@ -54,7 +54,7 @@ return array( 'save_method' => 'storeSettingField' ), 'login_deactivatetime' => array( - 'label' => $lng['serversettings']['deactivatetime'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['deactivatetime'], 'settinggroup' => 'login', 'varname' => 'deactivatetime', 'type' => 'int', @@ -62,7 +62,7 @@ return array( 'save_method' => 'storeSettingField' ), '2fa_enabled' => array( - 'label' => $lng['2fa']['2fa_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['2fa']['2fa_enabled'], 'settinggroup' => '2fa', 'varname' => 'enabled', 'type' => 'bool', @@ -70,7 +70,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_password_min_length' => array( - 'label' => $lng['serversettings']['panel_password_min_length'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_password_min_length'], 'settinggroup' => 'panel', 'varname' => 'password_min_length', 'type' => 'int', @@ -78,7 +78,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_password_alpha_lower' => array( - 'label' => $lng['serversettings']['panel_password_alpha_lower'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_password_alpha_lower'], 'settinggroup' => 'panel', 'varname' => 'password_alpha_lower', 'type' => 'bool', @@ -86,7 +86,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_password_alpha_upper' => array( - 'label' => $lng['serversettings']['panel_password_alpha_upper'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_password_alpha_upper'], 'settinggroup' => 'panel', 'varname' => 'password_alpha_upper', 'type' => 'bool', @@ -94,7 +94,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_password_numeric' => array( - 'label' => $lng['serversettings']['panel_password_numeric'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_password_numeric'], 'settinggroup' => 'panel', 'varname' => 'password_numeric', 'type' => 'bool', @@ -102,7 +102,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_password_special_char_required' => array( - 'label' => $lng['serversettings']['panel_password_special_char_required'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_password_special_char_required'], 'settinggroup' => 'panel', 'varname' => 'password_special_char_required', 'type' => 'bool', @@ -110,7 +110,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_password_special_char' => array( - 'label' => $lng['serversettings']['panel_password_special_char'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_password_special_char'], 'settinggroup' => 'panel', 'varname' => 'password_special_char', 'type' => 'string', @@ -118,7 +118,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_password_regex' => array( - 'label' => $lng['serversettings']['panel_password_regex'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['panel_password_regex'], 'settinggroup' => 'panel', 'varname' => 'password_regex', 'type' => 'string', @@ -126,7 +126,7 @@ return array( 'save_method' => 'storeSettingField' ), 'customer_accountprefix' => array( - 'label' => $lng['serversettings']['accountprefix'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['accountprefix'], 'settinggroup' => 'customer', 'varname' => 'accountprefix', 'type' => 'string', @@ -138,7 +138,7 @@ return array( 'save_method' => 'storeSettingField' ), 'customer_mysqlprefix' => array( - 'label' => $lng['serversettings']['mysqlprefix'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mysqlprefix'], 'settinggroup' => 'customer', 'varname' => 'mysqlprefix', 'type' => 'string', @@ -150,7 +150,7 @@ return array( 'save_method' => 'storeSettingField' ), 'customer_ftpprefix' => array( - 'label' => $lng['serversettings']['ftpprefix'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ftpprefix'], 'settinggroup' => 'customer', 'varname' => 'ftpprefix', 'type' => 'string', @@ -158,7 +158,7 @@ return array( 'save_method' => 'storeSettingField' ), 'customer_ftpatdomain' => array( - 'label' => $lng['serversettings']['ftpdomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ftpdomain'], 'settinggroup' => 'customer', 'varname' => 'ftpatdomain', 'type' => 'bool', @@ -166,7 +166,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_allow_preset' => array( - 'label' => $lng['serversettings']['allow_password_reset'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['allow_password_reset'], 'settinggroup' => 'panel', 'varname' => 'allow_preset', 'type' => 'bool', @@ -182,7 +182,7 @@ return array( ) ), 'panel_allow_preset_admin' => array( - 'label' => $lng['serversettings']['allow_password_reset_admin'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['allow_password_reset_admin'], 'settinggroup' => 'panel', 'varname' => 'allow_preset_admin', 'type' => 'bool', @@ -198,7 +198,7 @@ return array( ) ), 'system_backupenabled' => array( - 'label' => $lng['serversettings']['backupenabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['backupenabled'], 'settinggroup' => 'system', 'varname' => 'backupenabled', 'type' => 'bool', diff --git a/actions/admin/settings/120.system.php b/actions/admin/settings/120.system.php index b691b988..7b9fffee 100644 --- a/actions/admin/settings/120.system.php +++ b/actions/admin/settings/120.system.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'system' => array( - 'title' => $lng['admin']['systemsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['systemsettings'], 'fields' => array( 'system_documentroot_prefix' => array( - 'label' => $lng['serversettings']['documentroot_prefix'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['documentroot_prefix'], 'settinggroup' => 'system', 'varname' => 'documentroot_prefix', 'type' => 'string', @@ -35,7 +35,7 @@ return array( ) ), 'system_documentroot_use_default_value' => array( - 'label' => $lng['serversettings']['documentroot_use_default_value'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['documentroot_use_default_value'], 'settinggroup' => 'system', 'varname' => 'documentroot_use_default_value', 'type' => 'bool', @@ -43,7 +43,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_ipaddress' => array( - 'label' => $lng['serversettings']['ipaddress'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ipaddress'], 'settinggroup' => 'system', 'varname' => 'ipaddress', 'type' => 'option', @@ -56,7 +56,7 @@ return array( 'save_method' => 'storeSettingIpAddress' ), 'system_defaultip' => array( - 'label' => $lng['serversettings']['defaultip'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultip'], 'settinggroup' => 'system', 'varname' => 'defaultip', 'type' => 'option', @@ -69,7 +69,7 @@ return array( 'save_method' => 'storeSettingDefaultIp' ), 'system_defaultsslip' => array( - 'label' => $lng['serversettings']['defaultsslip'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultsslip'], 'settinggroup' => 'system', 'varname' => 'defaultsslip', 'type' => 'option', @@ -82,7 +82,7 @@ return array( 'save_method' => 'storeSettingDefaultSslIp' ), 'system_hostname' => array( - 'label' => $lng['serversettings']['hostname'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['hostname'], 'settinggroup' => 'system', 'varname' => 'hostname', 'type' => 'string', @@ -94,7 +94,7 @@ return array( ) ), 'api_enabled' => array( - 'label' => $lng['serversettings']['enable_api'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['enable_api'], 'settinggroup' => 'api', 'varname' => 'enabled', 'type' => 'bool', @@ -102,7 +102,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_validatedomain' => array( - 'label' => $lng['serversettings']['validate_domain'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['validate_domain'], 'settinggroup' => 'system', 'varname' => 'validate_domain', 'type' => 'bool', @@ -110,7 +110,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_stdsubdomain' => array( - 'label' => $lng['serversettings']['stdsubdomainhost'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['stdsubdomainhost'], 'settinggroup' => 'system', 'varname' => 'stdsubdomain', 'type' => 'string', @@ -118,7 +118,7 @@ return array( 'save_method' => 'storeSettingHostname' ), 'system_mysql_access_host' => array( - 'label' => $lng['serversettings']['mysql_access_host'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mysql_access_host'], 'settinggroup' => 'system', 'varname' => 'mysql_access_host', 'type' => 'string', @@ -130,7 +130,7 @@ return array( 'save_method' => 'storeSettingMysqlAccessHost' ), 'system_nssextrausers' => array( - 'label' => $lng['serversettings']['nssextrausers'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['nssextrausers'], 'settinggroup' => 'system', 'varname' => 'nssextrausers', 'type' => 'bool', @@ -138,7 +138,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_index_file_extension' => array( - 'label' => $lng['serversettings']['index_file_extension'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['index_file_extension'], 'settinggroup' => 'system', 'varname' => 'index_file_extension', 'type' => 'string', @@ -147,7 +147,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_store_index_file_subs' => array( - 'label' => $lng['serversettings']['system_store_index_file_subs'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['system_store_index_file_subs'], 'settinggroup' => 'system', 'varname' => 'store_index_file_subs', 'type' => 'bool', @@ -167,7 +167,7 @@ return array( 'default' => 'www-data' ), 'system_report_enable' => array( - 'label' => $lng['serversettings']['report']['report'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['report']['report'], 'settinggroup' => 'system', 'varname' => 'report_enable', 'type' => 'bool', @@ -176,7 +176,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_report_webmax' => array( - 'label' => $lng['serversettings']['report']['webmax'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['report']['webmax'], 'settinggroup' => 'system', 'varname' => 'report_webmax', 'type' => 'int', @@ -186,7 +186,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_report_trafficmax' => array( - 'label' => $lng['serversettings']['report']['trafficmax'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['report']['trafficmax'], 'settinggroup' => 'system', 'varname' => 'report_trafficmax', 'type' => 'int', @@ -197,7 +197,7 @@ return array( ), 'system_mail_use_smtp' => array( - 'label' => $lng['serversettings']['mail_use_smtp'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_use_smtp'], 'settinggroup' => 'system', 'varname' => 'mail_use_smtp', 'type' => 'bool', @@ -205,7 +205,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_smtp_host' => array( - 'label' => $lng['serversettings']['mail_smtp_host'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_host'], 'settinggroup' => 'system', 'varname' => 'mail_smtp_host', 'type' => 'string', @@ -213,7 +213,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_smtp_port' => array( - 'label' => $lng['serversettings']['mail_smtp_port'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_port'], 'settinggroup' => 'system', 'varname' => 'mail_smtp_port', 'type' => 'int', @@ -223,7 +223,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_smtp_usetls' => array( - 'label' => $lng['serversettings']['mail_smtp_usetls'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_usetls'], 'settinggroup' => 'system', 'varname' => 'mail_smtp_usetls', 'type' => 'bool', @@ -231,7 +231,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_smtp_auth' => array( - 'label' => $lng['serversettings']['mail_smtp_auth'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_auth'], 'settinggroup' => 'system', 'varname' => 'mail_smtp_auth', 'type' => 'bool', @@ -239,7 +239,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_smtp_user' => array( - 'label' => $lng['serversettings']['mail_smtp_user'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_user'], 'settinggroup' => 'system', 'varname' => 'mail_smtp_user', 'type' => 'string', @@ -247,7 +247,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_smtp_passwd' => array( - 'label' => $lng['serversettings']['mail_smtp_passwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_passwd'], 'settinggroup' => 'system', 'varname' => 'mail_smtp_passwd', 'type' => 'hiddenString', diff --git a/actions/admin/settings/122.froxlorvhost.php b/actions/admin/settings/122.froxlorvhost.php index b8994b82..98ee1b64 100644 --- a/actions/admin/settings/122.froxlorvhost.php +++ b/actions/admin/settings/122.froxlorvhost.php @@ -17,13 +17,13 @@ return array( 'groups' => array( 'froxlorvhost' => array( - 'title' => $lng['admin']['froxlorvhost'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['froxlorvhost'], 'fields' => array( /** * Webserver-Vhost */ 'system_froxlordirectlyviahostname' => array( - 'label' => $lng['serversettings']['froxlordirectlyviahostname'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['froxlordirectlyviahostname'], 'settinggroup' => 'system', 'varname' => 'froxlordirectlyviahostname', 'type' => 'bool', @@ -34,7 +34,7 @@ return array( * SSL / Let's Encrypt */ 'system_le_froxlor_enabled' => array( - 'label' => $lng['serversettings']['le_froxlor_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['le_froxlor_enabled'], 'settinggroup' => 'system', 'varname' => 'le_froxlor_enabled', 'type' => 'bool', @@ -43,7 +43,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.leenabled') ), 'system_le_froxlor_redirect' => array( - 'label' => $lng['serversettings']['le_froxlor_redirect'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['le_froxlor_redirect'], 'settinggroup' => 'system', 'varname' => 'le_froxlor_redirect', 'type' => 'bool', @@ -52,7 +52,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.use_ssl') ), 'system_hsts_maxage' => array( - 'label' => $lng['admin']['domain_hsts_maxage'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage'], 'settinggroup' => 'system', 'varname' => 'hsts_maxage', 'type' => 'int', @@ -63,7 +63,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.use_ssl') ), 'system_hsts_incsub' => array( - 'label' => $lng['admin']['domain_hsts_incsub'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub'], 'settinggroup' => 'system', 'varname' => 'hsts_incsub', 'type' => 'bool', @@ -72,7 +72,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.use_ssl') ), 'system_hsts_preload' => array( - 'label' => $lng['admin']['domain_hsts_preload'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload'], 'settinggroup' => 'system', 'varname' => 'hsts_preload', 'type' => 'bool', @@ -84,7 +84,7 @@ return array( * FCGID */ 'system_mod_fcgid_enabled_ownvhost' => array( - 'label' => $lng['serversettings']['mod_fcgid_ownvhost'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid_ownvhost'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_ownvhost', 'type' => 'bool', @@ -96,7 +96,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.mod_fcgid') ), 'system_mod_fcgid_httpuser' => array( - 'label' => $lng['admin']['mod_fcgid_user'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_user'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_httpuser', 'type' => 'string', @@ -108,7 +108,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.mod_fcgid') ), 'system_mod_fcgid_httpgroup' => array( - 'label' => $lng['admin']['mod_fcgid_group'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_group'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_httpgroup', 'type' => 'string', @@ -120,7 +120,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.mod_fcgid') ), 'system_mod_fcgid_defaultini_ownvhost' => array( - 'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['defaultini_ownvhost'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_defaultini_ownvhost', 'type' => 'option', @@ -137,7 +137,7 @@ return array( * php-fpm */ 'system_phpfpm_enabled_ownvhost' => array( - 'label' => $lng['phpfpm']['ownvhost'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['ownvhost'], 'settinggroup' => 'phpfpm', 'varname' => 'enabled_ownvhost', 'type' => 'bool', @@ -146,7 +146,7 @@ return array( 'visible' => \Froxlor\Settings::Get('phpfpm.enabled') ), 'system_phpfpm_httpuser' => array( - 'label' => $lng['phpfpm']['vhost_httpuser'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['vhost_httpuser'], 'settinggroup' => 'phpfpm', 'varname' => 'vhost_httpuser', 'type' => 'string', @@ -155,7 +155,7 @@ return array( 'visible' => \Froxlor\Settings::Get('phpfpm.enabled') ), 'system_phpfpm_httpgroup' => array( - 'label' => $lng['phpfpm']['vhost_httpgroup'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['vhost_httpgroup'], 'settinggroup' => 'phpfpm', 'varname' => 'vhost_httpgroup', 'type' => 'string', @@ -164,7 +164,7 @@ return array( 'visible' => \Froxlor\Settings::Get('phpfpm.enabled') ), 'system_phpfpm_defaultini_ownvhost' => array( - 'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['defaultini_ownvhost'], 'settinggroup' => 'phpfpm', 'varname' => 'vhost_defaultini', 'type' => 'option', @@ -178,7 +178,7 @@ return array( * DNS */ 'system_dns_createhostnameentry' => array( - 'label' => $lng['serversettings']['dns_createhostnameentry'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['dns_createhostnameentry'], 'settinggroup' => 'system', 'varname' => 'dns_createhostnameentry', 'type' => 'bool', diff --git a/actions/admin/settings/125.cronjob.php b/actions/admin/settings/125.cronjob.php index 66a72754..6bc2131d 100644 --- a/actions/admin/settings/125.cronjob.php +++ b/actions/admin/settings/125.cronjob.php @@ -17,10 +17,10 @@ return array( 'groups' => array( 'crond' => array( - 'title' => $lng['admin']['cronsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['cronsettings'], 'fields' => array( 'system_cronconfig' => array( - 'label' => $lng['serversettings']['system_cronconfig'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['system_cronconfig'], 'settinggroup' => 'system', 'varname' => 'cronconfig', 'type' => 'string', @@ -29,7 +29,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_croncmdline' => array( - 'label' => $lng['serversettings']['system_croncmdline'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['system_croncmdline'], 'settinggroup' => 'system', 'varname' => 'croncmdline', 'type' => 'string', @@ -37,7 +37,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_crondreload' => array( - 'label' => $lng['serversettings']['system_crondreload'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['system_crondreload'], 'settinggroup' => 'system', 'varname' => 'crondreload', 'type' => 'string', @@ -45,7 +45,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_cron_allowautoupdate' => array( - 'label' => $lng['serversettings']['system_cron_allowautoupdate'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['system_cron_allowautoupdate'], 'settinggroup' => 'system', 'varname' => 'cron_allowautoupdate', 'type' => 'bool', @@ -53,7 +53,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_debug_cron' => array( - 'label' => $lng['serversettings']['cron']['debug'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['cron']['debug'], 'settinggroup' => 'system', 'varname' => 'debug_cron', 'type' => 'bool', diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php index 6585a571..05d3f3f0 100644 --- a/actions/admin/settings/130.webserver.php +++ b/actions/admin/settings/130.webserver.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'webserver' => array( - 'title' => $lng['admin']['webserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings'], 'fields' => array( 'system_webserver' => array( - 'label' => $lng['admin']['webserver'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['webserver'], 'settinggroup' => 'system', 'varname' => 'webserver', 'type' => 'option', @@ -41,7 +41,7 @@ return array( 'overview_option' => true ), 'system_apache_24' => array( - 'label' => $lng['serversettings']['apache_24'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apache_24'], 'settinggroup' => 'system', 'varname' => 'apache24', 'type' => 'bool', @@ -52,7 +52,7 @@ return array( ) ), 'system_apache_itksupport' => array( - 'label' => $lng['serversettings']['apache_itksupport'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apache_itksupport'], 'settinggroup' => 'system', 'varname' => 'apacheitksupport', 'type' => 'bool', @@ -64,7 +64,7 @@ return array( ) ), 'system_http2_support' => array( - 'label' => $lng['serversettings']['http2_support'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['http2_support'], 'settinggroup' => 'system', 'varname' => 'http2_support', 'type' => 'bool', @@ -77,7 +77,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.use_ssl') ), 'system_dhparams_file' => array( - 'label' => $lng['serversettings']['dhparams_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['dhparams_file'], 'settinggroup' => 'system', 'varname' => 'dhparams_file', 'type' => 'string', @@ -88,7 +88,7 @@ return array( 'visible' => \Froxlor\Settings::Get('system.use_ssl') ), 'system_httpuser' => array( - 'label' => $lng['admin']['webserver_user'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['webserver_user'], 'settinggroup' => 'system', 'varname' => 'httpuser', 'type' => 'string', @@ -96,7 +96,7 @@ return array( 'save_method' => 'storeSettingWebserverFcgidFpmUser' ), 'system_httpgroup' => array( - 'label' => $lng['admin']['webserver_group'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['webserver_group'], 'settinggroup' => 'system', 'varname' => 'httpgroup', 'type' => 'string', @@ -104,7 +104,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_apacheconf_vhost' => array( - 'label' => $lng['serversettings']['apacheconf_vhost'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apacheconf_vhost'], 'settinggroup' => 'system', 'varname' => 'apacheconf_vhost', 'type' => 'string', @@ -113,7 +113,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_apacheconf_diroptions' => array( - 'label' => $lng['serversettings']['apacheconf_diroptions'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apacheconf_diroptions'], 'settinggroup' => 'system', 'varname' => 'apacheconf_diroptions', 'type' => 'string', @@ -122,7 +122,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_apacheconf_htpasswddir' => array( - 'label' => $lng['serversettings']['apacheconf_htpasswddir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apacheconf_htpasswddir'], 'settinggroup' => 'system', 'varname' => 'apacheconf_htpasswddir', 'type' => 'string', @@ -131,7 +131,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_logfiles_directory' => array( - 'label' => $lng['serversettings']['logfiles_directory'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_directory'], 'settinggroup' => 'system', 'varname' => 'logfiles_directory', 'type' => 'string', @@ -140,7 +140,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_logfiles_script' => array( - 'label' => $lng['serversettings']['logfiles_script'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_script'], 'settinggroup' => 'system', 'varname' => 'logfiles_script', 'type' => 'string', @@ -152,7 +152,7 @@ return array( ) ), 'system_logfiles_piped' => array( - 'label' => $lng['serversettings']['logfiles_piped'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_piped'], 'settinggroup' => 'system', 'varname' => 'logfiles_piped', 'type' => 'bool', @@ -163,7 +163,7 @@ return array( ) ), 'system_logfiles_format' => array( - 'label' => $lng['serversettings']['logfiles_format'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_format'], 'settinggroup' => 'system', 'varname' => 'logfiles_format', 'type' => 'string', @@ -176,7 +176,7 @@ return array( ) ), 'system_logfiles_type' => array( - 'label' => $lng['serversettings']['logfiles_type'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logfiles_type'], 'settinggroup' => 'system', 'varname' => 'logfiles_type', 'type' => 'option', @@ -192,7 +192,7 @@ return array( ) ), 'system_customersslpath' => array( - 'label' => $lng['serversettings']['customerssl_directory'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['customerssl_directory'], 'settinggroup' => 'system', 'varname' => 'customer_ssl_path', 'type' => 'string', @@ -201,7 +201,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpappendopenbasedir' => array( - 'label' => $lng['serversettings']['phpappendopenbasedir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpappendopenbasedir'], 'settinggroup' => 'system', 'varname' => 'phpappendopenbasedir', 'type' => 'string', @@ -210,7 +210,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_deactivateddocroot' => array( - 'label' => $lng['serversettings']['deactivateddocroot'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['deactivateddocroot'], 'settinggroup' => 'system', 'varname' => 'deactivateddocroot', 'type' => 'string', @@ -220,7 +220,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_default_vhostconf' => array( - 'label' => $lng['serversettings']['default_vhostconf'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf'], 'settinggroup' => 'system', 'varname' => 'default_vhostconf', 'type' => 'text', @@ -228,7 +228,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_apache_globaldiropt' => array( - 'label' => $lng['serversettings']['apache_globaldiropt'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apache_globaldiropt'], 'settinggroup' => 'system', 'varname' => 'apacheglobaldiropt', 'type' => 'text', @@ -240,7 +240,7 @@ return array( ) ), 'system_apachereload_command' => array( - 'label' => $lng['serversettings']['apachereload_command'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['apachereload_command'], 'settinggroup' => 'system', 'varname' => 'apachereload_command', 'type' => 'string', @@ -248,7 +248,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpreload_command' => array( - 'label' => $lng['serversettings']['phpreload_command'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpreload_command'], 'settinggroup' => 'system', 'varname' => 'phpreload_command', 'type' => 'string', @@ -259,7 +259,7 @@ return array( ) ), 'system_nginx_php_backend' => array( - 'label' => $lng['serversettings']['nginx_php_backend'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['nginx_php_backend'], 'settinggroup' => 'system', 'varname' => 'nginx_php_backend', 'type' => 'string', @@ -270,7 +270,7 @@ return array( ) ), 'nginx_fastcgiparams' => array( - 'label' => $lng['serversettings']['nginx_fastcgiparams'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['nginx_fastcgiparams'], 'settinggroup' => 'nginx', 'varname' => 'fastcgiparams', 'type' => 'string', @@ -282,7 +282,7 @@ return array( ) ), 'defaultwebsrverrhandler_enabled' => array( - 'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_enabled'], 'settinggroup' => 'defaultwebsrverrhandler', 'varname' => 'enabled', 'type' => 'bool', @@ -290,7 +290,7 @@ return array( 'save_method' => 'storeSettingField' ), 'defaultwebsrverrhandler_err401' => array( - 'label' => $lng['serversettings']['defaultwebsrverrhandler_err401'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err401'], 'settinggroup' => 'defaultwebsrverrhandler', 'varname' => 'err401', 'type' => 'string', @@ -302,7 +302,7 @@ return array( ) ), 'defaultwebsrverrhandler_err403' => array( - 'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err403'], 'settinggroup' => 'defaultwebsrverrhandler', 'varname' => 'err403', 'type' => 'string', @@ -314,7 +314,7 @@ return array( ) ), 'defaultwebsrverrhandler_err404' => array( - 'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err404'], 'settinggroup' => 'defaultwebsrverrhandler', 'varname' => 'err404', 'type' => 'string', @@ -322,7 +322,7 @@ return array( 'save_method' => 'storeSettingField' ), 'defaultwebsrverrhandler_err500' => array( - 'label' => $lng['serversettings']['defaultwebsrverrhandler_err500'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultwebsrverrhandler_err500'], 'settinggroup' => 'defaultwebsrverrhandler', 'varname' => 'err500', 'type' => 'string', @@ -334,7 +334,7 @@ return array( ) ), 'customredirect_enabled' => array( - 'label' => $lng['serversettings']['customredirect_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['customredirect_enabled'], 'settinggroup' => 'customredirect', 'varname' => 'enabled', 'type' => 'bool', @@ -342,7 +342,7 @@ return array( 'save_method' => 'storeSettingField' ), 'customredirect_default' => array( - 'label' => $lng['serversettings']['customredirect_default'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['customredirect_default'], 'settinggroup' => 'customredirect', 'varname' => 'default', 'type' => 'option', diff --git a/actions/admin/settings/131.ssl.php b/actions/admin/settings/131.ssl.php index 3300f567..411b2618 100644 --- a/actions/admin/settings/131.ssl.php +++ b/actions/admin/settings/131.ssl.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'ssl' => array( - 'title' => $lng['admin']['sslsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['sslsettings'], 'fields' => array( 'system_ssl_enabled' => array( - 'label' => $lng['serversettings']['ssl']['use_ssl'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ssl']['use_ssl'], 'settinggroup' => 'system', 'varname' => 'use_ssl', 'type' => 'bool', @@ -31,7 +31,7 @@ return array( 'overview_option' => true ), 'system_ssl_protocols' => array( - 'label' => $lng['serversettings']['ssl']['ssl_protocols'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ssl']['ssl_protocols'], 'settinggroup' => 'system', 'varname' => 'ssl_protocols', 'type' => 'option', @@ -46,7 +46,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_ssl_cipher_list' => array( - 'label' => $lng['serversettings']['ssl']['ssl_cipher_list'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ssl']['ssl_cipher_list'], 'settinggroup' => 'system', 'varname' => 'ssl_cipher_list', 'type' => 'string', @@ -55,7 +55,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_ssl_cert_file' => array( - 'label' => $lng['serversettings']['ssl']['ssl_cert_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ssl']['ssl_cert_file'], 'settinggroup' => 'system', 'varname' => 'ssl_cert_file', 'type' => 'string', @@ -65,7 +65,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_ssl_key_file' => array( - 'label' => $lng['serversettings']['ssl']['ssl_key_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ssl']['ssl_key_file'], 'settinggroup' => 'system', 'varname' => 'ssl_key_file', 'type' => 'string', @@ -75,7 +75,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_ssl_cert_chainfile' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile'], 'settinggroup' => 'system', 'varname' => 'ssl_cert_chainfile', 'type' => 'string', @@ -85,7 +85,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_ssl_ca_file' => array( - 'label' => $lng['serversettings']['ssl']['ssl_ca_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ssl']['ssl_ca_file'], 'settinggroup' => 'system', 'varname' => 'ssl_ca_file', 'type' => 'string', @@ -95,7 +95,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_apache24_ocsp_cache_path' => array( - 'label' => $lng['serversettings']['ssl']['apache24_ocsp_cache_path'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ssl']['apache24_ocsp_cache_path'], 'settinggroup' => 'system', 'varname' => 'apache24_ocsp_cache_path', 'type' => 'string', @@ -106,7 +106,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_leenabled' => array( - 'label' => $lng['serversettings']['leenabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['leenabled'], 'settinggroup' => 'system', 'varname' => 'leenabled', 'type' => 'bool', @@ -115,7 +115,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_letsencryptacmeconf' => array( - 'label' => $lng['serversettings']['letsencryptacmeconf'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['letsencryptacmeconf'], 'settinggroup' => 'system', 'varname' => 'letsencryptacmeconf', 'type' => 'string', @@ -124,7 +124,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_leapiversion' => array( - 'label' => $lng['serversettings']['leapiversion'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['leapiversion'], 'settinggroup' => 'system', 'varname' => 'leapiversion', 'type' => 'option', @@ -137,7 +137,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_letsencryptca' => array( - 'label' => $lng['serversettings']['letsencryptca'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['letsencryptca'], 'settinggroup' => 'system', 'varname' => 'letsencryptca', 'type' => 'option', @@ -150,7 +150,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_letsencryptcountrycode' => array( - 'label' => $lng['serversettings']['letsencryptcountrycode'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['letsencryptcountrycode'], 'settinggroup' => 'system', 'varname' => 'letsencryptcountrycode', 'type' => 'string', @@ -159,7 +159,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_letsencryptstate' => array( - 'label' => $lng['serversettings']['letsencryptstate'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['letsencryptstate'], 'settinggroup' => 'system', 'varname' => 'letsencryptstate', 'type' => 'string', @@ -168,7 +168,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_letsencryptchallengepath' => array( - 'label' => $lng['serversettings']['letsencryptchallengepath'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['letsencryptchallengepath'], 'settinggroup' => 'system', 'varname' => 'letsencryptchallengepath', 'type' => 'string', @@ -177,7 +177,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_letsencryptkeysize' => array( - 'label' => $lng['serversettings']['letsencryptkeysize'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['letsencryptkeysize'], 'settinggroup' => 'system', 'varname' => 'letsencryptkeysize', 'type' => 'int', @@ -186,7 +186,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_letsencryptreuseold' => array( - 'label' => $lng['serversettings']['letsencryptreuseold'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['letsencryptreuseold'], 'settinggroup' => 'system', 'varname' => 'letsencryptreuseold', 'type' => 'bool', @@ -194,7 +194,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_disable_le_selfcheck' => array( - 'label' => $lng['serversettings']['disable_le_selfcheck'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['disable_le_selfcheck'], 'settinggroup' => 'system', 'varname' => 'disable_le_selfcheck', 'type' => 'bool', diff --git a/actions/admin/settings/135.fcgid.php b/actions/admin/settings/135.fcgid.php index cfa14dda..ba685f5a 100644 --- a/actions/admin/settings/135.fcgid.php +++ b/actions/admin/settings/135.fcgid.php @@ -17,14 +17,14 @@ return array( 'groups' => array( 'fcgid' => array( - 'title' => $lng['admin']['fcgid_settings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['fcgid_settings'], 'websrv_avail' => array( 'apache2', 'lighttpd' ), 'fields' => array( 'system_mod_fcgid_enabled' => array( - 'label' => $lng['serversettings']['mod_fcgid'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid', 'type' => 'bool', @@ -37,7 +37,7 @@ return array( 'overview_option' => true ), 'system_mod_fcgid_configdir' => array( - 'label' => $lng['serversettings']['mod_fcgid']['configdir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['configdir'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_configdir', 'type' => 'string', @@ -50,7 +50,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mod_fcgid_tmpdir' => array( - 'label' => $lng['serversettings']['mod_fcgid']['tmpdir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['tmpdir'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_tmpdir', 'type' => 'string', @@ -59,7 +59,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mod_fcgid_peardir' => array( - 'label' => $lng['serversettings']['mod_fcgid']['peardir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['peardir'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_peardir', 'type' => 'string', @@ -70,7 +70,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mod_fcgid_wrapper' => array( - 'label' => $lng['serversettings']['mod_fcgid']['wrapper'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['wrapper'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_wrapper', 'type' => 'option', @@ -85,7 +85,7 @@ return array( ) ), 'system_mod_fcgid_starter' => array( - 'label' => $lng['serversettings']['mod_fcgid']['starter'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['starter'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_starter', 'type' => 'int', @@ -93,7 +93,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mod_fcgid_maxrequests' => array( - 'label' => $lng['serversettings']['mod_fcgid']['maxrequests'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['maxrequests'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_maxrequests', 'type' => 'int', @@ -101,7 +101,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mod_fcgid_defaultini' => array( - 'label' => $lng['serversettings']['mod_fcgid']['defaultini'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['defaultini'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_defaultini', 'type' => 'option', @@ -111,7 +111,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mod_fcgid_idle_timeout' => array( - 'label' => $lng['serversettings']['mod_fcgid']['idle_timeout'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['idle_timeout'], 'settinggroup' => 'system', 'varname' => 'mod_fcgid_idle_timeout', 'type' => 'int', diff --git a/actions/admin/settings/136.phpfpm.php b/actions/admin/settings/136.phpfpm.php index 6b47af76..f279dcd1 100644 --- a/actions/admin/settings/136.phpfpm.php +++ b/actions/admin/settings/136.phpfpm.php @@ -17,10 +17,10 @@ return array( 'groups' => array( 'phpfpm' => array( - 'title' => $lng['admin']['phpfpm_settings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpfpm_settings'], 'fields' => array( 'system_phpfpm_enabled' => array( - 'label' => $lng['serversettings']['phpfpm'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm'], 'settinggroup' => 'phpfpm', 'varname' => 'enabled', 'type' => 'bool', @@ -33,7 +33,7 @@ return array( 'overview_option' => true ), 'system_phpfpm_defaultini' => array( - 'label' => $lng['serversettings']['mod_fcgid']['defaultini'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['defaultini'], 'settinggroup' => 'phpfpm', 'varname' => 'defaultini', 'type' => 'option', @@ -43,7 +43,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_aliasconfigdir' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['aliasconfigdir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['aliasconfigdir'], 'settinggroup' => 'phpfpm', 'varname' => 'aliasconfigdir', 'type' => 'string', @@ -52,7 +52,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_tmpdir' => array( - 'label' => $lng['serversettings']['mod_fcgid']['tmpdir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['tmpdir'], 'settinggroup' => 'phpfpm', 'varname' => 'tmpdir', 'type' => 'string', @@ -61,7 +61,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_peardir' => array( - 'label' => $lng['serversettings']['mod_fcgid']['peardir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mod_fcgid']['peardir'], 'settinggroup' => 'phpfpm', 'varname' => 'peardir', 'type' => 'string', @@ -72,7 +72,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_envpath' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['envpath'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['envpath'], 'settinggroup' => 'phpfpm', 'varname' => 'envpath', 'type' => 'string', @@ -83,7 +83,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_fastcgi_ipcdir' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['ipcdir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['ipcdir'], 'settinggroup' => 'phpfpm', 'varname' => 'fastcgi_ipcdir', 'type' => 'string', @@ -92,7 +92,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_use_mod_proxy' => array( - 'label' => $lng['phpfpm']['use_mod_proxy'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['use_mod_proxy'], 'settinggroup' => 'phpfpm', 'varname' => 'use_mod_proxy', 'type' => 'bool', @@ -101,7 +101,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_ini_flags' => array( - 'label' => $lng['phpfpm']['ini_flags'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['ini_flags'], 'settinggroup' => 'phpfpm', 'varname' => 'ini_flags', 'type' => 'text', @@ -109,7 +109,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_ini_values' => array( - 'label' => $lng['phpfpm']['ini_values'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['ini_values'], 'settinggroup' => 'phpfpm', 'varname' => 'ini_values', 'type' => 'text', @@ -117,7 +117,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_ini_admin_flags' => array( - 'label' => $lng['phpfpm']['ini_admin_flags'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['ini_admin_flags'], 'settinggroup' => 'phpfpm', 'varname' => 'ini_admin_flags', 'type' => 'text', @@ -125,7 +125,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_phpfpm_ini_admin_values' => array( - 'label' => $lng['phpfpm']['ini_admin_values'], + 'label' => \Froxlor\I18N\Lang::getAll()['phpfpm']['ini_admin_values'], 'settinggroup' => 'phpfpm', 'varname' => 'ini_admin_values', 'type' => 'text', diff --git a/actions/admin/settings/137.perl.php b/actions/admin/settings/137.perl.php index 9244fec2..252d0221 100644 --- a/actions/admin/settings/137.perl.php +++ b/actions/admin/settings/137.perl.php @@ -17,10 +17,10 @@ return array( 'groups' => array( 'perl' => array( - 'title' => $lng['admin']['perl_settings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['perl_settings'], 'fields' => array( 'perl_path' => array( - 'label' => $lng['serversettings']['perl_path'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['perl_path'], 'settinggroup' => 'system', 'varname' => 'perl_path', 'type' => 'string', @@ -31,7 +31,7 @@ return array( ) ), 'system_perl_suexecworkaround' => array( - 'label' => $lng['serversettings']['perl']['suexecworkaround'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['perl']['suexecworkaround'], 'settinggroup' => 'perl', 'varname' => 'suexecworkaround', 'type' => 'bool', @@ -42,7 +42,7 @@ return array( ) ), 'system_perl_suexeccgipath' => array( - 'label' => $lng['serversettings']['perl']['suexeccgipath'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['perl']['suexeccgipath'], 'settinggroup' => 'perl', 'varname' => 'suexecpath', 'type' => 'string', @@ -54,7 +54,7 @@ return array( ) ), 'perl_server' => array( - 'label' => $lng['serversettings']['perl_server'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['perl_server'], 'settinggroup' => 'serversettings', 'varname' => 'perl_server', 'type' => 'string', diff --git a/actions/admin/settings/140.statistics.php b/actions/admin/settings/140.statistics.php index badf3f8c..f3ea0064 100644 --- a/actions/admin/settings/140.statistics.php +++ b/actions/admin/settings/140.statistics.php @@ -19,24 +19,24 @@ return array( 'groups' => array( 'statistics' => array( - 'title' => $lng['admin']['statisticsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['statisticsettings'], 'fields' => array( 'system_webalizer_quiet' => array( - 'label' => $lng['serversettings']['webalizer_quiet'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['webalizer_quiet'], 'settinggroup' => 'system', 'varname' => 'webalizer_quiet', 'type' => 'option', 'default' => 2, 'option_mode' => 'one', 'option_options' => array( - 0 => $lng['admin']['webalizer']['normal'], - 1 => $lng['admin']['webalizer']['quiet'], - 2 => $lng['admin']['webalizer']['veryquiet'] + 0 => \Froxlor\I18N\Lang::getAll()['admin']['webalizer']['normal'], + 1 => \Froxlor\I18N\Lang::getAll()['admin']['webalizer']['quiet'], + 2 => \Froxlor\I18N\Lang::getAll()['admin']['webalizer']['veryquiet'] ), 'save_method' => 'storeSettingField' ), 'system_awstats_enabled' => array( - 'label' => $lng['serversettings']['awstats_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['awstats_enabled'], 'settinggroup' => 'system', 'varname' => 'awstats_enabled', 'type' => 'bool', @@ -44,7 +44,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_awstats_path' => array( - 'label' => $lng['serversettings']['awstats_path'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['awstats_path'], 'settinggroup' => 'system', 'varname' => 'awstats_path', 'type' => 'string', @@ -53,7 +53,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_awstats_awstatspath' => array( - 'label' => $lng['serversettings']['awstats_awstatspath'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['awstats_awstatspath'], 'settinggroup' => 'system', 'varname' => 'awstats_awstatspath', 'type' => 'string', @@ -62,7 +62,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_awstats_conf' => array( - 'label' => $lng['serversettings']['awstats_conf'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['awstats_conf'], 'settinggroup' => 'system', 'varname' => 'awstats_conf', 'type' => 'string', @@ -71,7 +71,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_awstats_icons' => array( - 'label' => $lng['serversettings']['awstats_icons'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['awstats_icons'], 'settinggroup' => 'system', 'varname' => 'awstats_icons', 'type' => 'string', diff --git a/actions/admin/settings/150.mail.php b/actions/admin/settings/150.mail.php index 260471d2..6acf2935 100644 --- a/actions/admin/settings/150.mail.php +++ b/actions/admin/settings/150.mail.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'mail' => array( - 'title' => $lng['admin']['mailserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['mailserversettings'], 'fields' => array( 'system_vmail_uid' => array( - 'label' => $lng['serversettings']['vmail_uid'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['vmail_uid'], 'settinggroup' => 'system', 'varname' => 'vmail_uid', 'type' => 'int', @@ -32,7 +32,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_vmail_gid' => array( - 'label' => $lng['serversettings']['vmail_gid'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['vmail_gid'], 'settinggroup' => 'system', 'varname' => 'vmail_gid', 'type' => 'int', @@ -42,7 +42,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_vmail_homedir' => array( - 'label' => $lng['serversettings']['vmail_homedir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['vmail_homedir'], 'settinggroup' => 'system', 'varname' => 'vmail_homedir', 'type' => 'string', @@ -51,7 +51,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_vmail_maildirname' => array( - 'label' => $lng['serversettings']['vmail_maildirname'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['vmail_maildirname'], 'settinggroup' => 'system', 'varname' => 'vmail_maildirname', 'type' => 'string', @@ -61,7 +61,7 @@ return array( 'save_method' => 'storeSettingField' ), 'panel_sendalternativemail' => array( - 'label' => $lng['serversettings']['sendalternativemail'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['sendalternativemail'], 'settinggroup' => 'panel', 'varname' => 'sendalternativemail', 'type' => 'bool', @@ -69,7 +69,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_quota_enabled' => array( - 'label' => $lng['serversettings']['mail_quota_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_quota_enabled'], 'settinggroup' => 'system', 'varname' => 'mail_quota_enabled', 'type' => 'bool', @@ -77,7 +77,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mail_quota' => array( - 'label' => $lng['serversettings']['mail_quota'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_quota'], 'settinggroup' => 'system', 'varname' => 'mail_quota', 'type' => 'int', @@ -85,7 +85,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_catchall_enabled' => array( - 'label' => $lng['serversettings']['catchall_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['catchall_enabled'], 'settinggroup' => 'catchall', 'varname' => 'catchall_enabled', 'type' => 'bool', @@ -93,7 +93,7 @@ return array( 'save_method' => 'storeSettingResetCatchall' ), 'system_mailtraffic_enabled' => array( - 'label' => $lng['serversettings']['mailtraffic_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mailtraffic_enabled'], 'settinggroup' => 'system', 'varname' => 'mailtraffic_enabled', 'type' => 'bool', @@ -101,7 +101,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mdaserver' => array( - 'label' => $lng['serversettings']['mdaserver'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mdaserver'], 'settinggroup' => 'system', 'varname' => 'mdaserver', 'type' => 'option', @@ -114,7 +114,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mdalog' => array( - 'label' => $lng['serversettings']['mdalog'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mdalog'], 'settinggroup' => 'system', 'varname' => 'mdalog', 'type' => 'string', @@ -124,7 +124,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mtaserver' => array( - 'label' => $lng['serversettings']['mtaserver'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mtaserver'], 'settinggroup' => 'system', 'varname' => 'mtaserver', 'type' => 'option', @@ -137,7 +137,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mtalog' => array( - 'label' => $lng['serversettings']['mtalog'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mtalog'], 'settinggroup' => 'system', 'varname' => 'mtalog', 'type' => 'string', diff --git a/actions/admin/settings/155.ftpserver.php b/actions/admin/settings/155.ftpserver.php index e6797127..ce2abf49 100644 --- a/actions/admin/settings/155.ftpserver.php +++ b/actions/admin/settings/155.ftpserver.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'ftpserver' => array( - 'title' => $lng['admin']['ftpserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ftpserversettings'], 'fields' => array( 'ftpserver' => array( - 'label' => $lng['admin']['ftpserver'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ftpserver'], 'settinggroup' => 'system', 'varname' => 'ftpserver', 'type' => 'option', diff --git a/actions/admin/settings/160.nameserver.php b/actions/admin/settings/160.nameserver.php index 54ac6314..a8bb51fb 100644 --- a/actions/admin/settings/160.nameserver.php +++ b/actions/admin/settings/160.nameserver.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'nameserver' => array( - 'title' => $lng['admin']['nameserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['nameserversettings'], 'fields' => array( 'nameserver_enable' => array( - 'label' => $lng['serversettings']['bindenable'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['bindenable'], 'settinggroup' => 'system', 'varname' => 'bind_enable', 'type' => 'bool', @@ -31,7 +31,7 @@ return array( 'overview_option' => true ), 'system_dnsenabled' => array( - 'label' => $lng['serversettings']['dnseditorenable'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['dnseditorenable'], 'settinggroup' => 'system', 'varname' => 'dnsenabled', 'type' => 'bool', @@ -39,7 +39,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_dns_server' => array( - 'label' => $lng['serversettings']['dns_server'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['dns_server'], 'settinggroup' => 'system', 'varname' => 'dns_server', 'type' => 'option', @@ -52,7 +52,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_bindconf_directory' => array( - 'label' => $lng['serversettings']['bindconf_directory'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['bindconf_directory'], 'settinggroup' => 'system', 'varname' => 'bindconf_directory', 'type' => 'string', @@ -61,7 +61,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_bindreload_command' => array( - 'label' => $lng['serversettings']['bindreload_command'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['bindreload_command'], 'settinggroup' => 'system', 'varname' => 'bindreload_command', 'type' => 'string', @@ -69,7 +69,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_nameservers' => array( - 'label' => $lng['serversettings']['nameservers'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['nameservers'], 'settinggroup' => 'system', 'varname' => 'nameservers', 'type' => 'string', @@ -79,7 +79,7 @@ return array( 'save_method' => 'storeSettingFieldInsertBindTask' ), 'system_mxservers' => array( - 'label' => $lng['serversettings']['mxservers'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mxservers'], 'settinggroup' => 'system', 'varname' => 'mxservers', 'type' => 'string', @@ -89,7 +89,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_axfrservers' => array( - 'label' => $lng['serversettings']['axfrservers'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['axfrservers'], 'settinggroup' => 'system', 'varname' => 'axfrservers', 'type' => 'string', @@ -100,7 +100,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_dns_createmailentry' => array( - 'label' => $lng['serversettings']['mail_also_with_mxservers'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mail_also_with_mxservers'], 'settinggroup' => 'system', 'varname' => 'dns_createmailentry', 'type' => 'bool', @@ -108,7 +108,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_defaultttl' => array( - 'label' => $lng['serversettings']['defaultttl'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['defaultttl'], 'settinggroup' => 'system', 'varname' => 'defaultttl', 'type' => 'int', diff --git a/actions/admin/settings/170.logger.php b/actions/admin/settings/170.logger.php index 023a5ce3..9dc6d200 100644 --- a/actions/admin/settings/170.logger.php +++ b/actions/admin/settings/170.logger.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'logging' => array( - 'title' => $lng['admin']['loggersettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['loggersettings'], 'fields' => array( 'logger_enabled' => array( - 'label' => $lng['serversettings']['logger']['enable'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['enable'], 'settinggroup' => 'logger', 'varname' => 'enabled', 'type' => 'bool', @@ -31,20 +31,20 @@ return array( 'overview_option' => true ), 'logger_severity' => array( - 'label' => $lng['serversettings']['logger']['severity'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['severity'], 'settinggroup' => 'logger', 'varname' => 'severity', 'type' => 'option', 'default' => 1, 'option_mode' => 'one', 'option_options' => array( - 1 => $lng['admin']['logger']['normal'], - 2 => $lng['admin']['logger']['paranoid'] + 1 => \Froxlor\I18N\Lang::getAll()['admin']['logger']['normal'], + 2 => \Froxlor\I18N\Lang::getAll()['admin']['logger']['paranoid'] ), 'save_method' => 'storeSettingField' ), 'logger_logtypes' => array( - 'label' => $lng['serversettings']['logger']['types'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['types'], 'settinggroup' => 'logger', 'varname' => 'logtypes', 'type' => 'option', @@ -58,7 +58,7 @@ return array( 'save_method' => 'storeSettingField' ), 'logger_logfile' => array( - 'label' => $lng['serversettings']['logger']['logfile'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['logfile'], 'settinggroup' => 'logger', 'varname' => 'logfile', 'type' => 'string', @@ -68,16 +68,16 @@ return array( 'save_method' => 'storeSettingField' ), 'logger_log_cron' => array( - 'label' => $lng['serversettings']['logger']['logcron'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['logcron'], 'settinggroup' => 'logger', 'varname' => 'log_cron', 'type' => 'option', 'default' => 0, 'option_mode' => 'one', 'option_options' => array( - 0 => $lng['serversettings']['logger']['logcronoption']['never'], - 1 => $lng['serversettings']['logger']['logcronoption']['once'], - 2 => $lng['serversettings']['logger']['logcronoption']['always'] + 0 => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['logcronoption']['never'], + 1 => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['logcronoption']['once'], + 2 => \Froxlor\I18N\Lang::getAll()['serversettings']['logger']['logcronoption']['always'] ), 'save_method' => 'storeSettingField' ) diff --git a/actions/admin/settings/180.dkim.php b/actions/admin/settings/180.dkim.php index 0027af48..cf97b462 100644 --- a/actions/admin/settings/180.dkim.php +++ b/actions/admin/settings/180.dkim.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'dkim' => array( - 'title' => $lng['admin']['dkimsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['dkimsettings'], 'fields' => array( 'dkim_enabled' => array( - 'label' => $lng['dkim']['use_dkim'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['use_dkim'], 'settinggroup' => 'dkim', 'varname' => 'use_dkim', 'type' => 'bool', @@ -31,7 +31,7 @@ return array( 'overview_option' => true ), 'dkim_prefix' => array( - 'label' => $lng['dkim']['dkim_prefix'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_prefix'], 'settinggroup' => 'dkim', 'varname' => 'dkim_prefix', 'type' => 'string', @@ -40,7 +40,7 @@ return array( 'save_method' => 'storeSettingField' ), 'dkim_domains' => array( - 'label' => $lng['dkim']['dkim_domains'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_domains'], 'settinggroup' => 'dkim', 'varname' => 'dkim_domains', 'type' => 'string', @@ -49,7 +49,7 @@ return array( 'save_method' => 'storeSettingField' ), 'dkim_dkimkeys' => array( - 'label' => $lng['dkim']['dkim_dkimkeys'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_dkimkeys'], 'settinggroup' => 'dkim', 'varname' => 'dkim_dkimkeys', 'type' => 'string', @@ -58,7 +58,7 @@ return array( 'save_method' => 'storeSettingField' ), 'dkim_algorithm' => array( - 'label' => $lng['dkim']['dkim_algorithm'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_algorithm'], 'settinggroup' => 'dkim', 'varname' => 'dkim_algorithm', 'type' => 'option', @@ -72,7 +72,7 @@ return array( 'save_method' => 'storeSettingFieldInsertBindTask' ), 'dkim_servicetype' => array( - 'label' => $lng['dkim']['dkim_servicetype'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_servicetype'], 'settinggroup' => 'dkim', 'varname' => 'dkim_servicetype', 'type' => 'option', @@ -86,8 +86,8 @@ return array( ), 'dkim_keylength' => array( 'label' => array( - 'title' => $lng['dkim']['dkim_keylength']['title'], - 'description' => sprintf($lng['dkim']['dkim_keylength']['description'], \Froxlor\Settings::Get('dkim.dkim_prefix')) + 'title' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_keylength']['title'], + 'description' => sprintf(\Froxlor\I18N\Lang::getAll()['dkim']['dkim_keylength']['description'], \Froxlor\Settings::Get('dkim.dkim_prefix')) ), 'settinggroup' => 'dkim', 'varname' => 'dkim_keylength', @@ -101,7 +101,7 @@ return array( 'save_method' => 'storeSettingFieldInsertBindTask' ), 'dkim_notes' => array( - 'label' => $lng['dkim']['dkim_notes'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_notes'], 'settinggroup' => 'dkim', 'varname' => 'dkim_notes', 'type' => 'string', @@ -110,7 +110,7 @@ return array( 'save_method' => 'storeSettingFieldInsertBindTask' ), 'dkim_add_adsp' => array( - 'label' => $lng['dkim']['dkim_add_adsp'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_add_adsp'], 'settinggroup' => 'dkim', 'varname' => 'dkim_add_adsp', 'type' => 'bool', @@ -118,7 +118,7 @@ return array( 'save_method' => 'storeSettingFieldInsertBindTask' ), 'dkim_add_adsppolicy' => array( - 'label' => $lng['dkim']['dkim_add_adsppolicy'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkim_add_adsppolicy'], 'settinggroup' => 'dkim', 'varname' => 'dkim_add_adsppolicy', 'type' => 'option', @@ -132,7 +132,7 @@ return array( 'save_method' => 'storeSettingFieldInsertBindTask' ), 'dkimrestart_command' => array( - 'label' => $lng['dkim']['dkimrestart_command'], + 'label' => \Froxlor\I18N\Lang::getAll()['dkim']['dkimrestart_command'], 'settinggroup' => 'dkim', 'varname' => 'dkimrestart_command', 'type' => 'string', diff --git a/actions/admin/settings/185.spf.php b/actions/admin/settings/185.spf.php index 9d0fbcee..b5986c46 100644 --- a/actions/admin/settings/185.spf.php +++ b/actions/admin/settings/185.spf.php @@ -17,10 +17,10 @@ return array( 'groups' => array( 'spf' => array( - 'title' => $lng['admin']['spfsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['spfsettings'], 'fields' => array( 'spf_enabled' => array( - 'label' => $lng['spf']['use_spf'], + 'label' => \Froxlor\I18N\Lang::getAll()['spf']['use_spf'], 'settinggroup' => 'spf', 'varname' => 'use_spf', 'type' => 'bool', @@ -29,7 +29,7 @@ return array( 'overview_option' => true ), 'spf_entry' => array( - 'label' => $lng['spf']['spf_entry'], + 'label' => \Froxlor\I18N\Lang::getAll()['spf']['spf_entry'], 'settinggroup' => 'spf', 'varname' => 'spf_entry', 'type' => 'string', diff --git a/actions/admin/settings/210.security.php b/actions/admin/settings/210.security.php index 62542c67..65b7dc04 100644 --- a/actions/admin/settings/210.security.php +++ b/actions/admin/settings/210.security.php @@ -19,10 +19,10 @@ return array( 'groups' => array( 'security' => array( - 'title' => $lng['admin']['security_settings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['security_settings'], 'fields' => array( 'panel_unix_names' => array( - 'label' => $lng['serversettings']['unix_names'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['unix_names'], 'settinggroup' => 'panel', 'varname' => 'unix_names', 'type' => 'bool', @@ -30,7 +30,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_mailpwcleartext' => array( - 'label' => $lng['serversettings']['mailpwcleartext'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['mailpwcleartext'], 'settinggroup' => 'system', 'varname' => 'mailpwcleartext', 'type' => 'bool', @@ -38,7 +38,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_passwordcryptfunc' => array( - 'label' => $lng['serversettings']['passwordcryptfunc'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['passwordcryptfunc'], 'settinggroup' => 'system', 'varname' => 'passwordcryptfunc', 'type' => 'option', @@ -51,7 +51,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_allow_error_report_admin' => array( - 'label' => $lng['serversettings']['allow_error_report_admin'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['allow_error_report_admin'], 'settinggroup' => 'system', 'varname' => 'allow_error_report_admin', 'type' => 'bool', @@ -59,7 +59,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_allow_error_report_customer' => array( - 'label' => $lng['serversettings']['allow_error_report_customer'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['allow_error_report_customer'], 'settinggroup' => 'system', 'varname' => 'allow_error_report_customer', 'type' => 'bool', @@ -67,7 +67,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_allow_customer_shell' => array( - 'label' => $lng['serversettings']['allow_allow_customer_shell'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['allow_allow_customer_shell'], 'settinggroup' => 'system', 'varname' => 'allow_customer_shell', 'type' => 'bool', @@ -75,7 +75,7 @@ return array( 'save_method' => 'storeSettingField' ), 'system_available_shells' => array( - 'label' => $lng['serversettings']['available_shells'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['available_shells'], 'settinggroup' => 'system', 'varname' => 'available_shells', 'type' => 'string', diff --git a/actions/admin/settings/220.quota.php b/actions/admin/settings/220.quota.php index cf79b4e1..fb211278 100644 --- a/actions/admin/settings/220.quota.php +++ b/actions/admin/settings/220.quota.php @@ -16,10 +16,10 @@ return array( 'groups' => array( 'diskquota' => array( - 'title' => $lng['diskquota'], + 'title' => \Froxlor\I18N\Lang::getAll()['diskquota'], 'fields' => array( 'diskquota_enabled' => array( - 'label' => $lng['serversettings']['diskquota_enabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['diskquota_enabled'], 'settinggroup' => 'system', 'varname' => 'diskquota_enabled', 'type' => 'bool', @@ -28,7 +28,7 @@ return array( 'overview_option' => true ), 'diskquota_repquota_path' => array( - 'label' => $lng['serversettings']['diskquota_repquota_path']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['diskquota_repquota_path']['description'], 'settinggroup' => 'system', 'varname' => 'diskquota_repquota_path', 'type' => 'string', @@ -36,7 +36,7 @@ return array( 'save_method' => 'storeSettingField' ), 'diskquota_quotatool_path' => array( - 'label' => $lng['serversettings']['diskquota_quotatool_path']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['diskquota_quotatool_path']['description'], 'settinggroup' => 'system', 'varname' => 'diskquota_quotatool_path', 'type' => 'string', @@ -44,7 +44,7 @@ return array( 'save_method' => 'storeSettingField' ), 'diskquota_customer_partition' => array( - 'label' => $lng['serversettings']['diskquota_customer_partition']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['diskquota_customer_partition']['description'], 'settinggroup' => 'system', 'varname' => 'diskquota_customer_partition', 'type' => 'string', diff --git a/admin_admins.php b/admin_admins.php index 3df15de6..41f717bf 100644 --- a/admin_admins.php +++ b/admin_admins.php @@ -35,13 +35,13 @@ if ($page == 'admins' && \Froxlor\User::getAll()['change_serversettings'] == '1' $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_admins"); $fields = array( - 'loginname' => $lng['login']['username'], - 'name' => $lng['customer']['name'], - 'diskspace' => $lng['customer']['diskspace'], - 'diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')', - 'traffic' => $lng['customer']['traffic'], - 'traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')', - 'deactivated' => $lng['admin']['deactivated'] + 'loginname' => \Froxlor\I18N\Lang::getAll()['login']['username'], + 'name' => \Froxlor\I18N\Lang::getAll()['customer']['name'], + 'diskspace' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'], + 'diskspace_used' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['used'] . ')', + 'traffic' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'], + 'traffic_used' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['used'] . ')', + 'deactivated' => \Froxlor\I18N\Lang::getAll()['admin']['deactivated'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_ADMINS, $fields); $admins = ''; @@ -200,7 +200,7 @@ if ($page == 'admins' && \Froxlor\User::getAll()['change_serversettings'] == '1' $language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, \Froxlor\User::getAll()['language'], true); } - $ipaddress = \Froxlor\UI\HTML::makeoption($lng['admin']['allips'], "-1"); + $ipaddress = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['allips'], "-1"); $ipsandports_stmt = Database::query(" SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `ip` ORDER BY `ip` ASC "); @@ -209,17 +209,17 @@ if ($page == 'admins' && \Froxlor\User::getAll()['change_serversettings'] == '1' $ipaddress .= \Froxlor\UI\HTML::makeoption($row['ip'], $row['id']); } - $customers_ul = \Froxlor\UI\HTML::makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $domains_ul = \Froxlor\UI\HTML::makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $customers_ul = \Froxlor\UI\HTML::makecheckbox('customers_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $domains_ul = \Froxlor\UI\HTML::makecheckbox('domains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); $admin_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/admin/formfield.admin_add.php'; $admin_add_form = \Froxlor\UI\HtmlForm::genHTMLForm($admin_add_data); @@ -258,57 +258,57 @@ if ($page == 'admins' && \Froxlor\User::getAll()['change_serversettings'] == '1' $result['diskspace'] = round($result['diskspace'] / 1024, $dec_places); $result['email'] = $idna_convert->decode($result['email']); - $customers_ul = \Froxlor\UI\HTML::makecheckbox('customers_ul', $lng['customer']['unlimited'], '-1', false, $result['customers'], true, true); + $customers_ul = \Froxlor\UI\HTML::makecheckbox('customers_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['customers'], true, true); if ($result['customers'] == '-1') { $result['customers'] = ''; } - $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); + $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); if ($result['diskspace'] == '-1') { $result['diskspace'] = ''; } - $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true); + $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['traffic'], true, true); if ($result['traffic'] == '-1') { $result['traffic'] = ''; } - $domains_ul = \Froxlor\UI\HTML::makecheckbox('domains_ul', $lng['customer']['unlimited'], '-1', false, $result['domains'], true, true); + $domains_ul = \Froxlor\UI\HTML::makecheckbox('domains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['domains'], true, true); if ($result['domains'] == '-1') { $result['domains'] = ''; } - $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); + $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); if ($result['subdomains'] == '-1') { $result['subdomains'] = ''; } - $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true); + $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['emails'], true, true); if ($result['emails'] == '-1') { $result['emails'] = ''; } - $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); + $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); if ($result['email_accounts'] == '-1') { $result['email_accounts'] = ''; } - $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); + $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); if ($result['email_forwarders'] == '-1') { $result['email_forwarders'] = ''; } - $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); + $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); if ($result['email_quota'] == '-1') { $result['email_quota'] = ''; } - $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); + $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['ftps'], true, true); if ($result['ftps'] == '-1') { $result['ftps'] = ''; } - $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); + $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); if ($result['mysqls'] == '-1') { $result['mysqls'] = ''; } @@ -318,7 +318,7 @@ if ($page == 'admins' && \Froxlor\User::getAll()['change_serversettings'] == '1' $language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, $result['def_language'], true); } - $ipaddress = \Froxlor\UI\HTML::makeoption($lng['admin']['allips'], "-1", $result['ip']); + $ipaddress = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['allips'], "-1", $result['ip']); $ipsandports_stmt = Database::query(" SELECT `id`, `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` GROUP BY `id`, `ip` ORDER BY `ip`, `port` ASC "); diff --git a/admin_apcuinfo.php b/admin_apcuinfo.php index a27ad0b9..a0d3fa46 100644 --- a/admin_apcuinfo.php +++ b/admin_apcuinfo.php @@ -41,7 +41,7 @@ if ($action == 'delete' && function_exists('apcu_clear_cache') && \Froxlor\User: } if (! function_exists('apcu_cache_info') || ! function_exists('apcu_sma_info')) { - \Froxlor\UI\Response::standard_error($lng['error']['no_apcuinfo']); + \Froxlor\UI\Response::standard_error(\Froxlor\I18N\Lang::getAll()['error']['no_apcuinfo']); } if ($page == 'showinfo') { @@ -55,7 +55,7 @@ if ($page == 'showinfo') { $mem_avail = $mem['avail_mem']; $mem_used = $mem_size - $mem_avail; $seg_size = bsize($mem['seg_size']); - $sharedmem = sprintf($lng['apcuinfo']['sharedmemval'], $mem['num_seg'], $seg_size, $cache['memory_type']); + $sharedmem = sprintf(\Froxlor\I18N\Lang::getAll()['apcuinfo']['sharedmemval'], $mem['num_seg'], $seg_size, $cache['memory_type']); $req_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits'] + $cache['num_misses']) / $passtime) : 0); $hit_rate_user = sprintf("%.2f", $cache['num_hits'] ? (($cache['num_hits']) / $passtime) : 0); $miss_rate_user = sprintf("%.2f", $cache['num_misses'] ? (($cache['num_misses']) / $passtime) : 0); @@ -69,11 +69,11 @@ if ($page == 'showinfo') { // check for possible empty values that are used in the templates if (! isset($cache['file_upload_progress'])) { - $cache['file_upload_progress'] = $lng['logger']['unknown']; + $cache['file_upload_progress'] = \Froxlor\I18N\Lang::getAll()['logger']['unknown']; } if (! isset($cache['num_expunges'])) { - $cache['num_expunges'] = $lng['logger']['unknown']; + $cache['num_expunges'] = \Froxlor\I18N\Lang::getAll()['logger']['unknown']; } $runtimelines = ''; diff --git a/admin_configfiles.php b/admin_configfiles.php index dc019d45..ea79f291 100644 --- a/admin_configfiles.php +++ b/admin_configfiles.php @@ -116,7 +116,7 @@ if (\Froxlor\User::getAll()['change_serversettings'] == '1') { foreach ($daemons as $di => $dd) { $title = $dd->title; if ($dd->default) { - $title = $title . " (" . strtolower($lng['panel']['default']) . ")"; + $title = $title . " (" . strtolower(\Froxlor\I18N\Lang::getAll()['panel']['default']) . ")"; } $daemons_select .= \Froxlor\UI\HTML::makeoption($title, $di); } diff --git a/admin_cronjobs.php b/admin_cronjobs.php index 701ee2b6..0e77a7f3 100644 --- a/admin_cronjobs.php +++ b/admin_cronjobs.php @@ -31,9 +31,9 @@ if ($page == 'cronjobs' || $page == 'overview') { $log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs'); $fields = array( - 'c.lastrun' => $lng['cron']['lastrun'], - 'c.interval' => $lng['cron']['interval'], - 'c.isactive' => $lng['cron']['isactive'] + 'c.lastrun' => \Froxlor\I18N\Lang::getAll()['cron']['lastrun'], + 'c.interval' => \Froxlor\I18N\Lang::getAll()['cron']['interval'], + 'c.isactive' => \Froxlor\I18N\Lang::getAll()['cron']['isactive'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_CRONRUNS, $fields); @@ -61,9 +61,9 @@ if ($page == 'cronjobs' || $page == 'overview') { $row = \Froxlor\PhpHelper::htmlentities_array($row); $row['lastrun'] = date('d.m.Y H:i', $row['lastrun']); - $row['isactive'] = ((int) $row['isactive'] == 1) ? $lng['panel']['yes'] : $lng['panel']['no']; + $row['isactive'] = ((int) $row['isactive'] == 1) ? \Froxlor\I18N\Lang::getAll()['panel']['yes'] : \Froxlor\I18N\Lang::getAll()['panel']['no']; - $description = $lng['crondesc'][$row['desc_lng_key']]; + $description = \Froxlor\I18N\Lang::getAll()['crondesc'][$row['desc_lng_key']]; eval("\$crons.=\"" . \Froxlor\UI\Template::getTemplate('cronjobs/cronjobs_cronjob') . "\";"); $count ++; @@ -104,11 +104,11 @@ if ($page == 'cronjobs' || $page == 'overview') { $interval_value = $interval_nfo[0]; $interval_interval = ''; - $interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]); - $interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]); - $interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]); - $interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]); - $interval_interval .= \Froxlor\UI\HTML::makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]); + $interval_interval .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]); + $interval_interval .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]); + $interval_interval .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['cronmgmt']['days'], 'DAY', $interval_nfo[1]); + $interval_interval .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]); + $interval_interval .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['cronmgmt']['months'], 'MONTH', $interval_nfo[1]); // end of interval $change_cronfile = false; diff --git a/admin_customers.php b/admin_customers.php index 38c77512..2ed7cc09 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -36,16 +36,16 @@ if ($page == 'customers' && \Froxlor\User::getAll()['customers'] != '0') { $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_customers"); $fields = array( - 'c.loginname' => $lng['login']['username'], - 'a.loginname' => $lng['admin']['admin'], - 'c.name' => $lng['customer']['name'], - 'c.email' => $lng['customer']['email'], - 'c.firstname' => $lng['customer']['firstname'], - 'c.company' => $lng['customer']['company'], - 'c.diskspace' => $lng['customer']['diskspace'], - 'c.diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')', - 'c.traffic' => $lng['customer']['traffic'], - 'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')' + 'c.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username'], + 'a.loginname' => \Froxlor\I18N\Lang::getAll()['admin']['admin'], + 'c.name' => \Froxlor\I18N\Lang::getAll()['customer']['name'], + 'c.email' => \Froxlor\I18N\Lang::getAll()['customer']['email'], + 'c.firstname' => \Froxlor\I18N\Lang::getAll()['customer']['firstname'], + 'c.company' => \Froxlor\I18N\Lang::getAll()['customer']['company'], + 'c.diskspace' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'], + 'c.diskspace_used' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['used'] . ')', + 'c.traffic' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'], + 'c.traffic_used' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['used'] . ')' ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_CUSTOMERS, $fields); @@ -99,7 +99,7 @@ if ($page == 'customers' && \Froxlor\User::getAll()['customers'] != '0') { $row['traffic'] = round($row['traffic'] / (1024 * 1024), $dec_places); $row['diskspace_used'] = round($row['diskspace_used'] / 1024, $dec_places); $row['diskspace'] = round($row['diskspace'] / 1024, $dec_places); - $last_login = ((int) $row['lastlogin_succ'] == 0) ? $lng['panel']['neverloggedin'] : date('d.m.Y', $row['lastlogin_succ']); + $last_login = ((int) $row['lastlogin_succ'] == 0) ? \Froxlor\I18N\Lang::getAll()['panel']['neverloggedin'] : date('d.m.Y', $row['lastlogin_succ']); /** * percent-values for progressbar @@ -285,19 +285,19 @@ if ($page == 'customers' && \Froxlor\User::getAll()['customers'] != '0') { $language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, Settings::Get('panel.standardlanguage'), true); } - $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); - $gender_options = \Froxlor\UI\HTML::makeoption($lng['gender']['undef'], 0, true, true, true); - $gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['male'], 1, null, true, true); - $gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['female'], 2, null, true, true); + $gender_options = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['gender']['undef'], 0, true, true, true); + $gender_options .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['gender']['male'], 1, null, true, true); + $gender_options .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['gender']['female'], 2, null, true, true); $phpconfigs = array(); $configs = Database::query(" @@ -393,56 +393,56 @@ if ($page == 'customers' && \Froxlor\User::getAll()['customers'] != '0') { $result['diskspace'] = round($result['diskspace'] / 1024, $dec_places); $result['email'] = $idna_convert->decode($result['email']); - $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); + $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); if ($result['diskspace'] == '-1') { $result['diskspace'] = ''; } - $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true); + $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['traffic'], true, true); if ($result['traffic'] == '-1') { $result['traffic'] = ''; } - $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); + $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); if ($result['subdomains'] == '-1') { $result['subdomains'] = ''; } - $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true); + $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['emails'], true, true); if ($result['emails'] == '-1') { $result['emails'] = ''; } - $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); + $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); if ($result['email_accounts'] == '-1') { $result['email_accounts'] = ''; } - $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); + $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); if ($result['email_forwarders'] == '-1') { $result['email_forwarders'] = ''; } - $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); + $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); if ($result['email_quota'] == '-1') { $result['email_quota'] = ''; } - $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); + $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['ftps'], true, true); if ($result['ftps'] == '-1') { $result['ftps'] = ''; } - $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); + $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); if ($result['mysqls'] == '-1') { $result['mysqls'] = ''; } $result = \Froxlor\PhpHelper::htmlentities_array($result); - $gender_options = \Froxlor\UI\HTML::makeoption($lng['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true); - $gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['male'], 1, ($result['gender'] == '1' ? true : false), true, true); - $gender_options .= \Froxlor\UI\HTML::makeoption($lng['gender']['female'], 2, ($result['gender'] == '2' ? true : false), true, true); + $gender_options = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true); + $gender_options .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['gender']['male'], 1, ($result['gender'] == '1' ? true : false), true, true); + $gender_options .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['gender']['female'], 2, ($result['gender'] == '2' ? true : false), true, true); $phpconfigs = array(); $configs = Database::query(" diff --git a/admin_domains.php b/admin_domains.php index 20c94c26..daaff957 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -44,12 +44,12 @@ if ($page == 'domains' || $page == 'overview') { $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_domains"); $fields = array( - 'd.domain' => $lng['domains']['domainname'], - 'c.name' => $lng['customer']['name'], - 'c.firstname' => $lng['customer']['firstname'], - 'c.company' => $lng['customer']['company'], - 'c.loginname' => $lng['login']['username'], - 'd.aliasdomain' => $lng['domains']['aliasdomain'] + 'd.domain' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'], + 'c.name' => \Froxlor\I18N\Lang::getAll()['customer']['name'], + 'c.firstname' => \Froxlor\I18N\Lang::getAll()['customer']['firstname'], + 'c.company' => \Froxlor\I18N\Lang::getAll()['customer']['company'], + 'c.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username'], + 'd.aliasdomain' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_DOMAINS, $fields); $domains = ""; @@ -180,7 +180,7 @@ if ($page == 'domains' || $page == 'overview') { )); } else { - $customers = \Froxlor\UI\HTML::makeoption($lng['panel']['please_choose'], 0, 0, true); + $customers = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['panel']['please_choose'], 0, 0, true); $result_customers_stmt = Database::prepare(" SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` " . (\Froxlor\User::getAll()['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int) \Froxlor\User::getAll()['adminid'] . "' ") . " ORDER BY COALESCE(NULLIF(`name`,''), `company`) ASC"); @@ -279,7 +279,7 @@ if ($page == 'domains' || $page == 'overview') { $standardsubdomains = ''; } - $domains = \Froxlor\UI\HTML::makeoption($lng['domains']['noaliasdomain'], 0, NULL, true); + $domains = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['noaliasdomain'], 0, NULL, true); $result_domains_stmt = Database::prepare(" SELECT `d`.`id`, `d`.`domain`, `c`.`loginname` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`parentdomainid` = 0" . $standardsubdomains . (\Froxlor\User::getAll()['customers_see_all'] ? '' : " AND `d`.`adminid` = :adminid") . " @@ -295,7 +295,7 @@ if ($page == 'domains' || $page == 'overview') { $domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row_domain['domain']) . ' (' . $row_domain['loginname'] . ')', $row_domain['id']); } - $subtodomains = \Froxlor\UI\HTML::makeoption($lng['domains']['nosubtomaindomain'], 0, NULL, true); + $subtodomains = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['nosubtomaindomain'], 0, NULL, true); $result_domains_stmt = Database::prepare(" SELECT `d`.`id`, `d`.`domain`, `c`.`loginname` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`parentdomainid` = 0 AND `d`.`ismainbutsubto` = 0 " . $standardsubdomains . (\Froxlor\User::getAll()['customers_see_all'] ? '' : " AND `d`.`adminid` = :adminid") . " @@ -325,14 +325,14 @@ if ($page == 'domains' || $page == 'overview') { // create serveralias options $serveraliasoptions = ""; - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_wildcard'], '0', '0', true, true); - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_www'], '1', '0', true, true); - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_none'], '2', '0', true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_wildcard'], '0', '0', true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_www'], '1', '0', true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_none'], '2', '0', true, true); - $subcanemaildomain = \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['never'], '0', '0', true, true); - $subcanemaildomain .= \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['choosableno'], '1', '0', true, true); - $subcanemaildomain .= \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['choosableyes'], '2', '0', true, true); - $subcanemaildomain .= \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['always'], '3', '0', true, true); + $subcanemaildomain = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['never'], '0', '0', true, true); + $subcanemaildomain .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['choosableno'], '1', '0', true, true); + $subcanemaildomain .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['choosableyes'], '2', '0', true, true); + $subcanemaildomain .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['always'], '3', '0', true, true); $add_date = date('Y-m-d'); @@ -489,7 +489,7 @@ if ($page == 'domains' || $page == 'overview') { } $result['domain'] = $idna_convert->decode($result['domain']); - $domains = \Froxlor\UI\HTML::makeoption($lng['domains']['noaliasdomain'], 0, null, true); + $domains = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['noaliasdomain'], 0, null, true); $result_domains_stmt = Database::prepare(" SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` @@ -506,7 +506,7 @@ if ($page == 'domains' || $page == 'overview') { $domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id'], $result['aliasdomain']); } - $subtodomains = \Froxlor\UI\HTML::makeoption($lng['domains']['nosubtomaindomain'], 0, null, true); + $subtodomains = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['nosubtomaindomain'], 0, null, true); $result_domains_stmt = Database::prepare(" SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`parentdomainid` = '0' AND `d`.`id` <> :id @@ -591,15 +591,15 @@ if ($page == 'domains' || $page == 'overview') { $result['temporary_ssl_redirect'] = $result['ssl_redirect']; $result['ssl_redirect'] = ($result['ssl_redirect'] == 0 ? 0 : 1); - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_wildcard'], '0', $_value, true, true); - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_www'], '1', $_value, true, true); - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_none'], '2', $_value, true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_wildcard'], '0', $_value, true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_www'], '1', $_value, true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_none'], '2', $_value, true, true); - $subcanemaildomain = \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['never'], '0', $result['subcanemaildomain'], true, true); - $subcanemaildomain .= \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['choosableno'], '1', $result['subcanemaildomain'], true, true); - $subcanemaildomain .= \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['choosableyes'], '2', $result['subcanemaildomain'], true, true); - $subcanemaildomain .= \Froxlor\UI\HTML::makeoption($lng['admin']['subcanemaildomain']['always'], '3', $result['subcanemaildomain'], true, true); - $speciallogfile = ($result['speciallogfile'] == 1 ? $lng['panel']['yes'] : $lng['panel']['no']); + $subcanemaildomain = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['never'], '0', $result['subcanemaildomain'], true, true); + $subcanemaildomain .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['choosableno'], '1', $result['subcanemaildomain'], true, true); + $subcanemaildomain .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['choosableyes'], '2', $result['subcanemaildomain'], true, true); + $subcanemaildomain .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['subcanemaildomain']['always'], '3', $result['subcanemaildomain'], true, true); + $speciallogfile = ($result['speciallogfile'] == 1 ? \Froxlor\I18N\Lang::getAll()['panel']['yes'] : \Froxlor\I18N\Lang::getAll()['panel']['no']); $result['add_date'] = date('Y-m-d', $result['add_date']); $phpconfigs = ''; @@ -632,7 +632,7 @@ if ($page == 'domains' || $page == 'overview') { $title = $domain_edit_data['domain_edit']['title']; $image = $domain_edit_data['domain_edit']['image']; - $speciallogwarning = sprintf($lng['admin']['speciallogwarning'], $lng['admin']['delete_statistics']); + $speciallogwarning = sprintf(\Froxlor\I18N\Lang::getAll()['admin']['speciallogwarning'], \Froxlor\I18N\Lang::getAll()['admin']['delete_statistics']); eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domains_edit") . "\";"); } @@ -678,7 +678,7 @@ if ($page == 'domains' || $page == 'overview') { 'page' => 'domains' )); } else { - $customers = \Froxlor\UI\HTML::makeoption($lng['panel']['please_choose'], 0, 0, true); + $customers = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['panel']['please_choose'], 0, 0, true); $result_customers_stmt = Database::prepare(" SELECT `customerid`, `loginname`, `name`, `firstname`, `company` FROM `" . TABLE_PANEL_CUSTOMERS . "` " . (\Froxlor\User::getAll()['customers_see_all'] ? '' : " WHERE `adminid` = '" . (int) \Froxlor\User::getAll()['adminid'] . "' ") . " ORDER BY `name` ASC"); diff --git a/admin_index.php b/admin_index.php index 80ad7377..feeeab80 100644 --- a/admin_index.php +++ b/admin_index.php @@ -103,7 +103,7 @@ if ($page == 'overview') { $lookfornewversion_addinfo = $result['additional_info']; $isnewerversion = $result['isnewerversion']; } else { - $lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere']; + $lookfornewversion_lable = \Froxlor\I18N\Lang::getAll()['admin']['lookfornewversion']['clickhere']; $lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes'); $lookfornewversion_message = ''; $lookfornewversion_addinfo = ''; @@ -115,7 +115,7 @@ if ($page == 'overview') { \Froxlor\User::getAll()['diskspace_used'] = round(\Froxlor\User::getAll()['diskspace_used'] / 1024, $dec_places); \Froxlor\User::getAll()['traffic'] = round(\Froxlor\User::getAll()['traffic'] / (1024 * 1024), $dec_places); \Froxlor\User::getAll()['traffic_used'] = round(\Froxlor\User::getAll()['traffic_used'] / (1024 * 1024), $dec_places); - \Froxlor\User::getAll() = \Froxlor\PhpHelper::str_replace_array('-1', $lng['customer']['unlimited'], \Froxlor\User::getAll(), 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains'); + \Froxlor\User::getAll() = \Froxlor\PhpHelper::str_replace_array('-1', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], \Froxlor\User::getAll(), 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains'); \Froxlor\User::getAll()['custom_notes'] = (\Froxlor\User::getAll()['custom_notes'] != '') ? nl2br(\Froxlor\User::getAll()['custom_notes']) : ''; @@ -138,7 +138,7 @@ if ($page == 'overview') { $load = @file_get_contents('/proc/loadavg'); if (! $load) { - $load = $lng['admin']['noloadavailable']; + $load = \Froxlor\I18N\Lang::getAll()['admin']['noloadavailable']; } } diff --git a/admin_ipsandports.php b/admin_ipsandports.php index b6880882..73e88cdf 100644 --- a/admin_ipsandports.php +++ b/admin_ipsandports.php @@ -40,8 +40,8 @@ if ($page == 'ipsandports' || $page == 'overview') { $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_ipsandports"); $fields = array( - 'ip' => $lng['admin']['ipsandports']['ip'], - 'port' => $lng['admin']['ipsandports']['port'] + 'ip' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip'], + 'port' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['port'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_IPSANDPORTS, $fields); $ipsandports = ''; diff --git a/admin_logger.php b/admin_logger.php index e3efda38..c95f0656 100644 --- a/admin_logger.php +++ b/admin_logger.php @@ -24,10 +24,10 @@ use Froxlor\Database\Database; if ($page == 'log' && \Froxlor\User::getAll()['change_serversettings'] == '1') { if ($action == '') { $fields = array( - 'date' => $lng['logger']['date'], - 'type' => $lng['logger']['type'], - 'user' => $lng['logger']['user'], - 'text' => $lng['logger']['action'] + 'date' => \Froxlor\I18N\Lang::getAll()['logger']['date'], + 'type' => \Froxlor\I18N\Lang::getAll()['logger']['type'], + 'user' => \Froxlor\I18N\Lang::getAll()['logger']['user'], + 'text' => \Froxlor\I18N\Lang::getAll()['logger']['action'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_LOG, $fields, null, null, 0, 'desc', 30); $query = 'SELECT * FROM `' . TABLE_PANEL_LOG . '` ' . $paging->getSqlWhere(false) . ' ' . $paging->getSqlOrderBy(); @@ -69,25 +69,25 @@ if ($page == 'log' && \Froxlor\User::getAll()['change_serversettings'] == '1') { if ($_action != $action) { switch ($action) { case USR_ACTION: - $_action = $lng['admin']['customer']; + $_action = \Froxlor\I18N\Lang::getAll()['admin']['customer']; break; case RES_ACTION: - $_action = $lng['logger']['reseller']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['reseller']; break; case ADM_ACTION: - $_action = $lng['logger']['admin']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['admin']; break; case CRON_ACTION: - $_action = $lng['logger']['cron']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['cron']; break; case LOGIN_ACTION: - $_action = $lng['logger']['login']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['login']; break; case LOG_ERROR: - $_action = $lng['logger']['intern']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['intern']; break; default: - $_action = $lng['logger']['unknown']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['unknown']; break; } diff --git a/admin_message.php b/admin_message.php index b4f6726f..01515357 100644 --- a/admin_message.php +++ b/admin_message.php @@ -105,9 +105,9 @@ if ($page == 'message') { $sentitems = isset($_GET['sentitems']) ? (int) $_GET['sentitems'] : 0; if ($sentitems == 0) { - $successmessage = $lng['message']['noreceipients']; + $successmessage = \Froxlor\I18N\Lang::getAll()['message']['noreceipients']; } else { - $successmessage = str_replace('%s', $sentitems, $lng['message']['success']); + $successmessage = str_replace('%s', $sentitems, \Froxlor\I18N\Lang::getAll()['message']['success']); } } else { $success = 0; @@ -119,9 +119,9 @@ if ($page == 'message') { $receipients = ''; if (\Froxlor\User::getAll()['customers_see_all'] == '1') { - $receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['reseller'], 0); + $receipients .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['panel']['reseller'], 0); } - $receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['customer'], 1); + $receipients .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['panel']['customer'], 1); eval("echo \"" . \Froxlor\UI\Template::getTemplate('message/message') . "\";"); } diff --git a/admin_opcacheinfo.php b/admin_opcacheinfo.php index f7b0877b..126b06ab 100644 --- a/admin_opcacheinfo.php +++ b/admin_opcacheinfo.php @@ -31,7 +31,7 @@ if ($action == 'reset' && function_exists('opcache_reset') && \Froxlor\User::get } if (! function_exists('opcache_get_configuration')) { - \Froxlor\UI\Response::standard_error($lng['error']['no_opcacheinfo']); + \Froxlor\UI\Response::standard_error(\Froxlor\I18N\Lang::getAll()['error']['no_opcacheinfo']); } if ($page == 'showinfo') { @@ -52,13 +52,13 @@ if ($page == 'showinfo') { $value = $value / (1024 * 1024); } if ($value === null || $value === '') { - $value = $lng['opcacheinfo']['novalue']; + $value = \Froxlor\I18N\Lang::getAll()['opcacheinfo']['novalue']; } if ($value === true) { - $value = $lng['opcacheinfo']['true']; + $value = \Froxlor\I18N\Lang::getAll()['opcacheinfo']['true']; } if ($value === false) { - $value = $lng['opcacheinfo']['false']; + $value = \Froxlor\I18N\Lang::getAll()['opcacheinfo']['false']; } if (is_integer($value)) { $value = number_format($value, 0, '.', ' '); @@ -77,11 +77,11 @@ if ($page == 'showinfo') { 'version' => (isset($opcache_info['version']['opcache_product_name']) ? $opcache_info['version']['opcache_product_name'] . ' ' : '') . $opcache_info['version']['version'], 'phpversion' => phpversion(), 'start_time' => @$opcache_status['opcache_statistics']['start_time'] ? date('Y-m-d H:i:s', $opcache_status['opcache_statistics']['start_time']) : '', - 'last_restart_time' => @$opcache_status['opcache_statistics']['last_restart_time'] ? date('Y-m-d H:i:s', $opcache_status['opcache_statistics']['last_restart_time']) : $lng['opcacheinfo']['never'], + 'last_restart_time' => @$opcache_status['opcache_statistics']['last_restart_time'] ? date('Y-m-d H:i:s', $opcache_status['opcache_statistics']['last_restart_time']) : \Froxlor\I18N\Lang::getAll()['opcacheinfo']['never'], 'oom_restarts' => number_format(@$opcache_status['opcache_statistics']['oom_restarts'] ?: 0, 0, '.', ' '), 'hash_restarts' => number_format(@$opcache_status['opcache_statistics']['hash_restarts'] ?: 0, 0, '.', ' '), 'manual_restarts' => number_format(@$opcache_status['opcache_statistics']['manual_restarts'] ?: 0, 0, '.', ' '), - 'status' => (@$opcache_status['restart_in_progress'] ? $lng['opcacheinfo']['restartinprogress'] : (@$opcache_status['restart_pending'] ? $lng['opcacheinfo']['restartpending'] : (@$opcache_status['cache_full'] ? $lng['opcacheinfo']['cachefull'] : (@$opcache_status['opcache_enabled'] ? $lng['opcacheinfo']['enabled'] : $lng['opcacheinfo']['novalue'])))), + 'status' => (@$opcache_status['restart_in_progress'] ? \Froxlor\I18N\Lang::getAll()['opcacheinfo']['restartinprogress'] : (@$opcache_status['restart_pending'] ? \Froxlor\I18N\Lang::getAll()['opcacheinfo']['restartpending'] : (@$opcache_status['cache_full'] ? \Froxlor\I18N\Lang::getAll()['opcacheinfo']['cachefull'] : (@$opcache_status['opcache_enabled'] ? \Froxlor\I18N\Lang::getAll()['opcacheinfo']['enabled'] : \Froxlor\I18N\Lang::getAll()['opcacheinfo']['novalue'])))), 'cachedscripts' => number_format(@$opcache_status['opcache_statistics']['num_cached_scripts'] ?: 0, 0, '.', ' '), 'cachehits' => number_format($cachehits, 0, '.', ' ') . ($cachetotal > 0 ? sprintf(" (%.1f %%)", $cachehits / ($cachetotal) * 100) : ''), 'cachemiss' => number_format($cachemiss, 0, '.', ' ') . ($cachetotal > 0 ? sprintf(" (%.1f %%)", $cachemiss / ($cachetotal) * 100) : ''), diff --git a/admin_phpsettings.php b/admin_phpsettings.php index 34890e08..0d25c8d2 100644 --- a/admin_phpsettings.php +++ b/admin_phpsettings.php @@ -56,7 +56,7 @@ if ($page == 'overview') { } $count ++; if ($subdomains_count == 0 && empty($domains)) { - $domains = $lng['admin']['phpsettings']['notused']; + $domains = \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['notused']; } eval("\$tablecontent.=\"" . \Froxlor\UI\Template::getTemplate("phpconfig/overview_overview") . "\";"); } diff --git a/admin_plans.php b/admin_plans.php index 35aea12e..d8aae0e4 100644 --- a/admin_plans.php +++ b/admin_plans.php @@ -32,10 +32,10 @@ if ($page == '' || $page == 'overview') { $log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_plans"); $fields = array( - 'p.name' => $lng['admin']['plans']['name'], - 'p.description' => $lng['admin']['plans']['description'], - 'adminname' => $lng['admin']['admin'], - 'p.ts' => $lng['admin']['plans']['last_update'] + 'p.name' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['name'], + 'p.description' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['description'], + 'adminname' => \Froxlor\I18N\Lang::getAll()['admin']['admin'], + 'p.ts' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['last_update'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_PLANS, $fields); $plans = ''; @@ -211,15 +211,15 @@ if ($page == '' || $page == 'overview') { )); } else { - $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); - $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); + $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, '0', true, true); $phpconfigs = array(); $configs = Database::query(" @@ -390,47 +390,47 @@ if ($page == '' || $page == 'overview') { )); } else { - $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); + $diskspace_ul = \Froxlor\UI\HTML::makecheckbox('diskspace_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['diskspace'], true, true); if ($result['diskspace'] == '-1') { $result['diskspace'] = ''; } - $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', $lng['customer']['unlimited'], '-1', false, $result['traffic'], true, true); + $traffic_ul = \Froxlor\UI\HTML::makecheckbox('traffic_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['traffic'], true, true); if ($result['traffic'] == '-1') { $result['traffic'] = ''; } - $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', $lng['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); + $subdomains_ul = \Froxlor\UI\HTML::makecheckbox('subdomains_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['subdomains'], true, true); if ($result['subdomains'] == '-1') { $result['subdomains'] = ''; } - $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', $lng['customer']['unlimited'], '-1', false, $result['emails'], true, true); + $emails_ul = \Froxlor\UI\HTML::makecheckbox('emails_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['emails'], true, true); if ($result['emails'] == '-1') { $result['emails'] = ''; } - $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); + $email_accounts_ul = \Froxlor\UI\HTML::makecheckbox('email_accounts_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_accounts'], true, true); if ($result['email_accounts'] == '-1') { $result['email_accounts'] = ''; } - $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); + $email_forwarders_ul = \Froxlor\UI\HTML::makecheckbox('email_forwarders_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_forwarders'], true, true); if ($result['email_forwarders'] == '-1') { $result['email_forwarders'] = ''; } - $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); + $email_quota_ul = \Froxlor\UI\HTML::makecheckbox('email_quota_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['email_quota'], true, true); if ($result['email_quota'] == '-1') { $result['email_quota'] = ''; } - $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); + $ftps_ul = \Froxlor\UI\HTML::makecheckbox('ftps_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['ftps'], true, true); if ($result['ftps'] == '-1') { $result['ftps'] = ''; } - $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); + $mysqls_ul = \Froxlor\UI\HTML::makecheckbox('mysqls_ul', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, $result['mysqls'], true, true); if ($result['mysqls'] == '-1') { $result['mysqls'] = ''; } diff --git a/admin_settings.php b/admin_settings.php index 1cb03278..0c50d5b8 100644 --- a/admin_settings.php +++ b/admin_settings.php @@ -56,7 +56,7 @@ if ($page == 'overview' && \Froxlor\User::getAll()['change_serversettings'] == ' // check if the session timeout is too low #815 if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] < 60) { - \Froxlor\UI\Response::standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']); + \Froxlor\UI\Response::standard_error(\Froxlor\I18N\Lang::getAll()['error']['session_timeout'], \Froxlor\I18N\Lang::getAll()['error']['session_timeout_desc']); } if (processFormEx($settings_data, $_POST, array( @@ -136,7 +136,7 @@ if ($page == 'overview' && \Froxlor\User::getAll()['change_serversettings'] == ' } $phpinfo = $phpinfohtml; } else { - \Froxlor\UI\Response::standard_error($lng['error']['no_phpinfo']); + \Froxlor\UI\Response::standard_error(\Froxlor\I18N\Lang::getAll()['error']['no_phpinfo']); } eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/phpinfo") . "\";"); } elseif ($page == 'rebuildconfigs' && \Froxlor\User::getAll()['change_serversettings'] == '1') { @@ -267,7 +267,7 @@ if ($page == 'overview' && \Froxlor\User::getAll()['change_serversettings'] == ' foreach ($integrity->available as $id => $check) { $displayid = $id + 1; $result = $integrity->$check(); - $checkdesc = $lng['integrity_check'][$check]; + $checkdesc = \Froxlor\I18N\Lang::getAll()['integrity_check'][$check]; eval("\$integritycheck.=\"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck_row") . "\";"); } eval("echo \"" . \Froxlor\UI\Template::getTemplate("settings/integritycheck") . "\";"); diff --git a/admin_templates.php b/admin_templates.php index eb5a9844..ca561ab2 100644 --- a/admin_templates.php +++ b/admin_templates.php @@ -81,7 +81,7 @@ if ($action == '') { foreach ($template_defs as $action => $email) { $subjectid = $email['subject']; $mailbodyid = $email['mailbody']; - $template = $lng['admin']['templates'][$action]; + $template = \Froxlor\I18N\Lang::getAll()['admin']['templates'][$action]; eval("\$templates.=\"" . \Froxlor\UI\Template::getTemplate("templates/templates_template") . "\";"); } } @@ -148,7 +148,7 @@ if ($action == '') { 'ida' => $subjectid, 'idb' => $mailbodyid )); - $log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])] . "'"); + $log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $result['language'] . ' - ' . \Froxlor\I18N\Lang::getAll()['admin']['templates'][str_replace('_subject', '', $result['varname'])] . "'"); \Froxlor\UI\Response::redirectTo($filename, array( 'page' => $page, 's' => $s @@ -159,7 +159,7 @@ if ($action == '') { 'mailbodyid' => $mailbodyid, 'page' => $page, 'action' => $action - ), $result['language'] . ' - ' . $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])]); + ), $result['language'] . ' - ' . \Froxlor\I18N\Lang::getAll()['admin']['templates'][str_replace('_subject', '', $result['varname'])]); } } } elseif ($action == 'deletef' && $id != 0) { @@ -184,7 +184,7 @@ if ($action == '') { 'adminid' => \Froxlor\User::getAll()['adminid'], 'id' => $id )); - $log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . $lng['admin']['templates'][$row['varname']] . "'"); + $log->logAction(ADM_ACTION, LOG_INFO, "deleted template '" . \Froxlor\I18N\Lang::getAll()['admin']['templates'][$row['varname']] . "'"); \Froxlor\UI\Response::redirectTo($filename, array( 'page' => $page, 's' => $s @@ -194,7 +194,7 @@ if ($action == '') { 'id' => $id, 'page' => $page, 'action' => $action - ), $lng['admin']['templates'][$row['varname']]); + ), \Froxlor\I18N\Lang::getAll()['admin']['templates'][$row['varname']]); } } else { \Froxlor\UI\Response::standard_error('templatenotfound'); @@ -220,8 +220,8 @@ if ($action == '') { } } - $subject = $lng['mails'][$template]['subject']; - $body = str_replace('\n', "\n", $lng['mails'][$template]['mailbody']); + $subject = \Froxlor\I18N\Lang::getAll()['mails'][$template]['subject']; + $body = str_replace('\n', "\n", \Froxlor\I18N\Lang::getAll()['mails'][$template]['mailbody']); $lng = $lng_bak; @@ -342,7 +342,7 @@ if ($action == '') { $templates = array_diff($available_templates, $templates); foreach ($templates as $template) { - $template_options .= \Froxlor\UI\HTML::makeoption($lng['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n"; + $template_options .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['templates'][$template], $template, NULL, true, true, $language_file) . "\n"; } } } @@ -373,7 +373,7 @@ if ($action == '') { } foreach (array_diff($file_templates, $templatesdefined) as $template) { - $free_templates .= \Froxlor\UI\HTML::makeoption($lng['admin']['templates'][$template], $template, '', true); + $free_templates .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['admin']['templates'][$template], $template, '', true); } $filetemplate_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.filetemplate_add.php'; @@ -427,7 +427,7 @@ if ($action == '') { } else { $result = \Froxlor\PhpHelper::htmlentities_array($result); - $template = $lng['admin']['templates'][str_replace('_subject', '', $result['varname'])]; + $template = \Froxlor\I18N\Lang::getAll()['admin']['templates'][str_replace('_subject', '', $result['varname'])]; $subject = $result['value']; $result_stmt = Database::prepare(" SELECT `language`, `varname`, `value` diff --git a/admin_traffic.php b/admin_traffic.php index b2522bd7..b3854d08 100644 --- a/admin_traffic.php +++ b/admin_traffic.php @@ -59,7 +59,7 @@ if ($page == 'overview' || $page == 'customers') { for ($years = 0; $years <= $maxyears; $years ++) { $overview['year'] = date("Y") - $years; - $overview['type'] = $lng['traffic']['customer']; + $overview['type'] = \Froxlor\I18N\Lang::getAll()['traffic']['customer']; $domain_list = ''; $totals = array( 'jan' => 0, @@ -122,7 +122,7 @@ if ($page == 'overview' || $page == 'customers') { } // sum up totals $virtual_host = array( - 'name' => $lng['traffic']['months']['total'] + 'name' => \Froxlor\I18N\Lang::getAll()['traffic']['months']['total'] ); foreach ($totals as $month => $bytes) { $virtual_host[$month] = ($bytes == 0 ? '-' : \Froxlor\PhpHelper::size_readable($bytes, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s')); diff --git a/admin_updates.php b/admin_updates.php index 22fddc34..21385ddb 100644 --- a/admin_updates.php +++ b/admin_updates.php @@ -83,7 +83,7 @@ if ($page == 'overview') { $new_version = $version; $new_db_version = $dbversion; - $ui_text = $lng['update']['update_information']['part_a']; + $ui_text = \Froxlor\I18N\Lang::getAll()['update']['update_information']['part_a']; if ($version != $current_version) { $ui_text = str_replace('%curversion', $current_version, $ui_text); $ui_text = str_replace('%newversion', $new_version, $ui_text); @@ -100,12 +100,12 @@ if ($page == 'overview') { $update_information .= '
' . $preconfig . $message; } - $update_information .= $lng['update']['update_information']['part_b']; + $update_information .= \Froxlor\I18N\Lang::getAll()['update']['update_information']['part_b']; eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/index') . "\";"); } } else { - $success_message = $lng['update']['noupdatesavail']; + $success_message = \Froxlor\I18N\Lang::getAll()['update']['noupdatesavail']; $redirect_url = 'admin_index.php?s=' . $s; eval("echo \"" . \Froxlor\UI\Template::getTemplate('update/noupdatesavail') . "\";"); } diff --git a/api_keys.php b/api_keys.php index 7c3f3130..14772e4c 100644 --- a/api_keys.php +++ b/api_keys.php @@ -59,7 +59,7 @@ if ($action == 'delete') { Database::pexecute($del_stmt, array( 'id' => $id )); - $success_message = sprintf($lng['apikeys']['apikey_removed'], $id); + $success_message = sprintf(\Froxlor\I18N\Lang::getAll()['apikeys']['apikey_removed'], $id); } } } elseif ($action == 'add') { @@ -81,7 +81,7 @@ if ($action == 'delete') { 'aid' => \Froxlor\User::getAll()['adminid'], 'cid' => $cid )); - $success_message = $lng['apikeys']['apikey_added']; + $success_message = \Froxlor\I18N\Lang::getAll()['apikeys']['apikey_added']; } elseif ($action == 'jqEditApiKey') { $keyid = isset($_POST['id']) ? (int) $_POST['id'] : 0; $allowed_from = isset($_POST['allowed_from']) ? $_POST['allowed_from'] : ""; @@ -138,20 +138,20 @@ if (AREA == 'admin' && \Froxlor\User::getAll()['customers_see_all'] == '0') { $keys_stmt_query .= "ak.adminid = :adminid "; $qry_params['adminid'] = \Froxlor\User::getAll()['adminid']; $fields = array( - 'a.loginname' => $lng['login']['username'] + 'a.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username'] ); } elseif (AREA == 'customer') { // customer-area $keys_stmt_query .= "ak.customerid = :cid "; $qry_params['cid'] = \Froxlor\User::getAll()['customerid']; $fields = array( - 'c.loginname' => $lng['login']['username'] + 'c.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username'] ); } else { // admin who can see all customers / reseller / admins $keys_stmt_query .= "1 "; $fields = array( - 'a.loginname' => $lng['login']['username'] + 'a.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username'] ); } @@ -165,7 +165,7 @@ $apikeys = ""; if (count($all_keys) == 0) { $count = 0; - $message = $lng['apikeys']['no_api_keys']; + $message = \Froxlor\I18N\Lang::getAll()['apikeys']['no_api_keys']; $sortcode = ""; $searchcode = ""; $pagingcode = ""; diff --git a/customer_domains.php b/customer_domains.php index 55f92364..2cf96030 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -42,7 +42,7 @@ if ($page == 'overview') { if ($action == '') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains"); $fields = array( - 'd.domain' => $lng['domains']['domainname'] + 'd.domain' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_DOMAINS, $fields); $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`letsencrypt`, `d`.`registration_date`, `d`.`termination_date`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` @@ -249,7 +249,7 @@ if ($page == 'overview') { $domains .= \Froxlor\UI\HTML::makeoption($idna_convert->decode($row['domain']), $row['domain']); } - $aliasdomains = \Froxlor\UI\HTML::makeoption($lng['domains']['noaliasdomain'], 0, NULL, true); + $aliasdomains = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['noaliasdomain'], 0, NULL, true); $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`id` <> `c`.`standardsubdomain` @@ -270,7 +270,7 @@ if ($page == 'overview') { if (Settings::Get('customredirect.enabled') == '1') { $codes = \Froxlor\Domain\Domain::getRedirectCodesArray(); foreach ($codes as $rc) { - $redirectcode .= \Froxlor\UI\HTML::makeoption($rc['code'] . ' (' . $lng['redirect_desc'][$rc['desc']] . ')', $rc['id']); + $redirectcode .= \Froxlor\UI\HTML::makeoption($rc['code'] . ' (' . \Froxlor\I18N\Lang::getAll()['redirect_desc'][$rc['desc']] . ')', $rc['id']); } } @@ -288,7 +288,7 @@ if ($page == 'overview') { $ssl_ipsandports = 'notempty'; } - $openbasedir = \Froxlor\UI\HTML::makeoption($lng['domain']['docroot'], 0, NULL, true) . \Froxlor\UI\HTML::makeoption($lng['domain']['homedir'], 1, NULL, true); + $openbasedir = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domain']['docroot'], 0, NULL, true) . \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domain']['homedir'], 1, NULL, true); $pathSelect = \Froxlor\FileDir::makePathfield(\Froxlor\User::getAll()['documentroot'], \Froxlor\User::getAll()['guid'], \Froxlor\User::getAll()['guid']); $phpconfigs = ''; @@ -345,7 +345,7 @@ if ($page == 'overview') { } else { $result['domain'] = $idna_convert->decode($result['domain']); - $domains = \Froxlor\UI\HTML::makeoption($lng['domains']['noaliasdomain'], 0, $result['aliasdomain'], true); + $domains = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['noaliasdomain'], 0, $result['aliasdomain'], true); // also check ip/port combination to be the same, #176 $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d` , `" . TABLE_PANEL_CUSTOMERS . "` `c` , `" . TABLE_DOMAINTOIP . "` `dip` WHERE `d`.`aliasdomain` IS NULL @@ -387,7 +387,7 @@ if ($page == 'overview') { $def_code = \Froxlor\Domain\Domain::getDomainRedirectId($id); $codes = \Froxlor\Domain\Domain::getRedirectCodesArray(); foreach ($codes as $rc) { - $redirectcode .= \Froxlor\UI\HTML::makeoption($rc['code'] . ' (' . $lng['redirect_desc'][$rc['desc']] . ')', $rc['id'], $def_code); + $redirectcode .= \Froxlor\UI\HTML::makeoption($rc['code'] . ' (' . \Froxlor\I18N\Lang::getAll()['redirect_desc'][$rc['desc']] . ')', $rc['id'], $def_code); } } @@ -411,7 +411,7 @@ if ($page == 'overview') { $result['temporary_ssl_redirect'] = $result['ssl_redirect']; $result['ssl_redirect'] = ($result['ssl_redirect'] == 0 ? 0 : 1); - $openbasedir = \Froxlor\UI\HTML::makeoption($lng['domain']['docroot'], 0, $result['openbasedir_path'], true) . \Froxlor\UI\HTML::makeoption($lng['domain']['homedir'], 1, $result['openbasedir_path'], true); + $openbasedir = \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domain']['docroot'], 0, $result['openbasedir_path'], true) . \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domain']['homedir'], 1, $result['openbasedir_path'], true); // create serveralias options $serveraliasoptions = ""; @@ -421,9 +421,9 @@ if ($page == 'overview') { } elseif ($result['wwwserveralias'] == '1') { $_value = '1'; } - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_wildcard'], '0', $_value, true, true); - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_www'], '1', $_value, true, true); - $serveraliasoptions .= \Froxlor\UI\HTML::makeoption($lng['domains']['serveraliasoption_none'], '2', $_value, true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_wildcard'], '0', $_value, true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_www'], '1', $_value, true, true); + $serveraliasoptions .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['domains']['serveraliasoption_none'], '2', $_value, true, true); $ips_stmt = Database::prepare("SELECT `p`.`ip` AS `ip` FROM `" . TABLE_PANEL_IPSANDPORTS . "` `p` LEFT JOIN `" . TABLE_DOMAINTOIP . "` `dip` diff --git a/customer_email.php b/customer_email.php index de851c3b..acb7b6be 100644 --- a/customer_email.php +++ b/customer_email.php @@ -43,9 +43,9 @@ if ($page == 'overview') { if ($action == '') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_email::emails"); $fields = array( - 'd.domain' => $lng['domains']['domainname'], - 'm.email_full' => $lng['emails']['emailaddress'], - 'm.destination' => $lng['emails']['forwarders'] + 'd.domain' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'], + 'm.email_full' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'], + 'm.destination' => \Froxlor\I18N\Lang::getAll()['emails']['forwarders'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_MAIL_VIRTUAL, $fields); $result_stmt = Database::prepare('SELECT `m`.`id`, `m`.`domainid`, `m`.`email`, `m`.`email_full`, `m`.`iscatchall`, `u`.`quota`, `m`.`destination`, `m`.`popaccountid`, `d`.`domain`, `u`.`mboxsize` FROM `' . TABLE_MAIL_VIRTUAL . '` `m` diff --git a/customer_extras.php b/customer_extras.php index 29163af9..31aa7b5c 100644 --- a/customer_extras.php +++ b/customer_extras.php @@ -49,8 +49,8 @@ if ($page == 'overview') { if ($action == '') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htpasswds"); $fields = array( - 'username' => $lng['login']['username'], - 'path' => $lng['panel']['path'] + 'username' => \Froxlor\I18N\Lang::getAll()['login']['username'], + 'path' => \Froxlor\I18N\Lang::getAll()['panel']['path'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_HTPASSWDS, $fields); $result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` @@ -185,12 +185,12 @@ if ($page == 'overview') { if ($action == '') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras::htaccess"); $fields = array( - 'path' => $lng['panel']['path'], - 'options_indexes' => $lng['extras']['view_directory'], - 'error404path' => $lng['extras']['error404path'], - 'error403path' => $lng['extras']['error403path'], - 'error500path' => $lng['extras']['error500path'], - 'options_cgi' => $lng['extras']['execute_perl'] + 'path' => \Froxlor\I18N\Lang::getAll()['panel']['path'], + 'options_indexes' => \Froxlor\I18N\Lang::getAll()['extras']['view_directory'], + 'error404path' => \Froxlor\I18N\Lang::getAll()['extras']['error404path'], + 'error403path' => \Froxlor\I18N\Lang::getAll()['extras']['error403path'], + 'error500path' => \Froxlor\I18N\Lang::getAll()['extras']['error500path'], + 'options_cgi' => \Froxlor\I18N\Lang::getAll()['extras']['execute_perl'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_HTACCESS, $fields); $result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "` @@ -215,10 +215,10 @@ if ($page == 'overview') { $row['path'] = str_replace(\Froxlor\User::getAll()['documentroot'], "/", $row['path']); } $row['path'] = \Froxlor\FileDir::makeCorrectDir($row['path']); - $row['options_indexes'] = str_replace('1', $lng['panel']['yes'], $row['options_indexes']); - $row['options_indexes'] = str_replace('0', $lng['panel']['no'], $row['options_indexes']); - $row['options_cgi'] = str_replace('1', $lng['panel']['yes'], $row['options_cgi']); - $row['options_cgi'] = str_replace('0', $lng['panel']['no'], $row['options_cgi']); + $row['options_indexes'] = str_replace('1', \Froxlor\I18N\Lang::getAll()['panel']['yes'], $row['options_indexes']); + $row['options_indexes'] = str_replace('0', \Froxlor\I18N\Lang::getAll()['panel']['no'], $row['options_indexes']); + $row['options_cgi'] = str_replace('1', \Froxlor\I18N\Lang::getAll()['panel']['yes'], $row['options_cgi']); + $row['options_cgi'] = str_replace('0', \Froxlor\I18N\Lang::getAll()['panel']['no'], $row['options_cgi']); $row = \Froxlor\PhpHelper::htmlentities_array($row); eval("\$htaccess.=\"" . \Froxlor\UI\Template::getTemplate("extras/htaccess_htaccess") . "\";"); $count ++; @@ -377,9 +377,9 @@ if ($page == 'overview') { $row = $existing_backupJob['data']; $row['path'] = \Froxlor\FileDir::makeCorrectDir(str_replace(\Froxlor\User::getAll()['documentroot'], "/", $row['destdir'])); - $row['backup_web'] = ($row['backup_web'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no']; - $row['backup_mail'] = ($row['backup_mail'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no']; - $row['backup_dbs'] = ($row['backup_dbs'] == '1') ? $lng['panel']['yes'] : $lng['panel']['no']; + $row['backup_web'] = ($row['backup_web'] == '1') ? \Froxlor\I18N\Lang::getAll()['panel']['yes'] : \Froxlor\I18N\Lang::getAll()['panel']['no']; + $row['backup_mail'] = ($row['backup_mail'] == '1') ? \Froxlor\I18N\Lang::getAll()['panel']['yes'] : \Froxlor\I18N\Lang::getAll()['panel']['no']; + $row['backup_dbs'] = ($row['backup_dbs'] == '1') ? \Froxlor\I18N\Lang::getAll()['panel']['yes'] : \Froxlor\I18N\Lang::getAll()['panel']['no']; } $pathSelect = \Froxlor\FileDir::makePathfield(\Froxlor\User::getAll()['documentroot'], \Froxlor\User::getAll()['guid'], \Froxlor\User::getAll()['guid']); $backup_data = include_once dirname(__FILE__) . '/lib/formfields/customer/extras/formfield.backup.php'; diff --git a/customer_ftp.php b/customer_ftp.php index 0498f6ef..078170f9 100644 --- a/customer_ftp.php +++ b/customer_ftp.php @@ -42,9 +42,9 @@ if ($page == 'overview') { if ($action == '') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts"); $fields = array( - 'username' => $lng['login']['username'], - 'homedir' => $lng['panel']['path'], - 'description' => $lng['panel']['ftpdesc'] + 'username' => \Froxlor\I18N\Lang::getAll()['login']['username'], + 'homedir' => \Froxlor\I18N\Lang::getAll()['panel']['path'], + 'description' => \Froxlor\I18N\Lang::getAll()['panel']['ftpdesc'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_FTP_USERS, $fields); diff --git a/customer_index.php b/customer_index.php index 62cf49d6..5fd8cb99 100644 --- a/customer_index.php +++ b/customer_index.php @@ -100,7 +100,7 @@ if ($page == 'overview') { \Froxlor\User::getAll()['traffic'] = round(\Froxlor\User::getAll()['traffic'] / (1024 * 1024), Settings::Get('panel.decimal_places')); \Froxlor\User::getAll()['traffic_used'] = round(\Froxlor\User::getAll()['traffic_used'] / (1024 * 1024), Settings::Get('panel.decimal_places')); - \Froxlor\User::getAll() = \Froxlor\PhpHelper::str_replace_array('-1', $lng['customer']['unlimited'], \Froxlor\User::getAll(), 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains'); + \Froxlor\User::getAll() = \Froxlor\PhpHelper::str_replace_array('-1', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], \Froxlor\User::getAll(), 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains'); \Froxlor\User::getAll()['custom_notes'] = (\Froxlor\User::getAll()['custom_notes'] != '') ? nl2br(\Froxlor\User::getAll()['custom_notes']) : ''; diff --git a/customer_logger.php b/customer_logger.php index b655c674..dc454ce0 100644 --- a/customer_logger.php +++ b/customer_logger.php @@ -30,10 +30,10 @@ if (Settings::IsInList('panel.customer_hide_options', 'extras.logger')) { if ($page == 'log') { if ($action == '') { $fields = array( - 'date' => $lng['logger']['date'], - 'type' => $lng['logger']['type'], - 'user' => $lng['logger']['user'], - 'text' => $lng['logger']['action'] + 'date' => \Froxlor\I18N\Lang::getAll()['logger']['date'], + 'type' => \Froxlor\I18N\Lang::getAll()['logger']['type'], + 'user' => \Froxlor\I18N\Lang::getAll()['logger']['user'], + 'text' => \Froxlor\I18N\Lang::getAll()['logger']['action'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_LOG, $fields, null, null, 0, 'desc', 30); $query = 'SELECT * FROM `' . TABLE_PANEL_LOG . '` WHERE `user` = :loginname ' . $paging->getSqlWhere(true) . ' ' . $paging->getSqlOrderBy(); @@ -82,25 +82,25 @@ if ($page == 'log') { if ($_action != $action) { switch ($action) { case USR_ACTION: - $_action = $lng['admin']['customer']; + $_action = \Froxlor\I18N\Lang::getAll()['admin']['customer']; break; case RES_ACTION: - $_action = $lng['logger']['reseller']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['reseller']; break; case ADM_ACTION: - $_action = $lng['logger']['admin']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['admin']; break; case CRON_ACTION: - $_action = $lng['logger']['cron']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['cron']; break; case LOGIN_ACTION: - $_action = $lng['logger']['login']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['login']; break; case LOG_ERROR: - $_action = $lng['logger']['intern']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['intern']; break; default: - $_action = $lng['logger']['unknown']; + $_action = \Froxlor\I18N\Lang::getAll()['logger']['unknown']; break; } diff --git a/customer_mysql.php b/customer_mysql.php index 9cc84aac..9f54c745 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -44,14 +44,14 @@ if ($page == 'overview') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql"); Database::needSqlData(); $sql = Database::getSqlData(); - $lng['mysql']['description'] = str_replace('', $sql['host'], $lng['mysql']['description']); + \Froxlor\I18N\Lang::getAll()['mysql']['description'] = str_replace('', $sql['host'], \Froxlor\I18N\Lang::getAll()['mysql']['description']); eval("echo \"" . \Froxlor\UI\Template::getTemplate('mysql/mysql') . "\";"); } elseif ($page == 'mysqls') { if ($action == '') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls"); $fields = array( - 'databasename' => $lng['mysql']['databasename'], - 'description' => $lng['mysql']['databasedescription'] + 'databasename' => \Froxlor\I18N\Lang::getAll()['mysql']['databasename'], + 'description' => \Froxlor\I18N\Lang::getAll()['mysql']['databasedescription'] ); $paging = new \Froxlor\UI\Paging(\Froxlor\User::getAll(), TABLE_PANEL_DATABASES, $fields); $result_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DATABASES . "` diff --git a/customer_traffic.php b/customer_traffic.php index 9c8604e1..bd488a80 100644 --- a/customer_traffic.php +++ b/customer_traffic.php @@ -103,7 +103,7 @@ if (! is_null($month) && ! is_null($year)) { } eval("\$traffic.=\"" . \Froxlor\UI\Template::getTemplate('traffic/traffic_month') . "\";"); - $show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year']; + $show = \Froxlor\I18N\Lang::getAll()['traffic']['months'][intval($row['month'])] . ' ' . $row['year']; } $traffic_complete['http'] = \Froxlor\PhpHelper::size_readable($traffic_complete['http'] * 1024, 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s'); @@ -134,7 +134,7 @@ if (! is_null($month) && ! is_null($year)) { $traffic_complete['mail'] += $mail; $traf['month'] = $row['month']; $traf['year'] = $row['year']; - $traf['monthname'] = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year']; + $traf['monthname'] = \Froxlor\I18N\Lang::getAll()['traffic']['months'][intval($row['month'])] . " " . $row['year']; $traf['byte'] = $http + $ftp_up + $ftp_down + $mail; if (extension_loaded('bcmath')) { diff --git a/dns_editor.php b/dns_editor.php index 6d161725..5f64dd51 100644 --- a/dns_editor.php +++ b/dns_editor.php @@ -57,7 +57,7 @@ if ($action == 'add_record' && ! empty($_POST)) { 'content' => $content, 'ttl' => $ttl ))->add(); - $success_message = $lng['success']['dns_record_added']; + $success_message = \Froxlor\I18N\Lang::getAll()['success']['dns_record_added']; } catch (Exception $e) { \Froxlor\UI\Response::dynamic_error($e->getMessage()); } @@ -85,7 +85,7 @@ if ($action == 'add_record' && ! empty($_POST)) { } unset($_t); // success message (inline) - $success_message = $lng['success']['dns_record_deleted']; + $success_message = \Froxlor\I18N\Lang::getAll()['success']['dns_record_deleted']; } } } diff --git a/index.php b/index.php index ef0e065c..0eefe927 100644 --- a/index.php +++ b/index.php @@ -281,10 +281,10 @@ if ($action == '2fa_entercode') { $replace_arr = array( 'CODE' => $code ); - $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables($lng['mails']['2fa']['mailbody'], $replace_arr)); + $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables(\Froxlor\I18N\Lang::getAll()['mails']['2fa']['mailbody'], $replace_arr)); try { - $mail->Subject = $lng['mails']['2fa']['subject']; + $mail->Subject = \Froxlor\I18N\Lang::getAll()['mails']['2fa']['subject']; $mail->AltBody = $mail_body; $mail->MsgHTML(str_replace("\n", "
", $mail_body)); $mail->AddAddress(\Froxlor\User::getAll()['email'], \Froxlor\User::getCorrectUserSalutation(\Froxlor\User::getAll())); @@ -325,7 +325,7 @@ if ($action == '2fa_entercode') { exit(); } else { $language_options = ''; - $language_options .= \Froxlor\UI\HTML::makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true); + $language_options .= \Froxlor\UI\HTML::makeoption(\Froxlor\I18N\Lang::getAll()['login']['profile_lng'], 'profile', 'profile', true, true); foreach ($languages as $language_file => $language_name) { $language_options .= \Froxlor\UI\HTML::makeoption($language_name, $language_file, 'profile', true); @@ -337,35 +337,35 @@ if ($action == '2fa_entercode') { switch ($smessage) { case 1: - $successmessage = $lng['pwdreminder']['success']; + $successmessage = \Froxlor\I18N\Lang::getAll()['pwdreminder']['success']; break; case 2: - $message = $lng['error']['login']; + $message = \Froxlor\I18N\Lang::getAll()['error']['login']; break; case 3: - $message = sprintf($lng['error']['login_blocked'], Settings::Get('login.deactivatetime')); + $message = sprintf(\Froxlor\I18N\Lang::getAll()['error']['login_blocked'], Settings::Get('login.deactivatetime')); break; case 4: $cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown'; - $message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']); + $message = str_replace('%s', $cmail, \Froxlor\I18N\Lang::getAll()['error']['errorsendingmail']); break; case 5: - $message = $lng['error']['user_banned']; + $message = \Froxlor\I18N\Lang::getAll()['error']['user_banned']; break; case 6: - $successmessage = $lng['pwdreminder']['changed']; + $successmessage = \Froxlor\I18N\Lang::getAll()['pwdreminder']['changed']; break; case 7: - $message = $lng['pwdreminder']['wrongcode']; + $message = \Froxlor\I18N\Lang::getAll()['pwdreminder']['wrongcode']; break; case 8: - $message = $lng['pwdreminder']['notallowed']; + $message = \Froxlor\I18N\Lang::getAll()['pwdreminder']['notallowed']; break; } $update_in_progress = ''; if (\Froxlor\Froxlor::hasUpdates() || \Froxlor\Froxlor::hasDbUpdates()) { - $update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin']; + $update_in_progress = \Froxlor\I18N\Lang::getAll()['update']['updateinprogress_onlyadmincanlogin']; } // Pass the last used page if needed @@ -496,7 +496,7 @@ if ($action == 'forgotpwd') { "lang" => $def_language )); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result['value'] != '') ? $result['value'] : \Froxlor\I18N\Lang::getAll()['mails']['password_reset']['subject']), $replace_arr)); $result_stmt = Database::prepare('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`= :adminid @@ -508,7 +508,7 @@ if ($action == 'forgotpwd') { "lang" => $def_language )); $result = $result_stmt->fetch(PDO::FETCH_ASSOC); - $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['password_reset']['mailbody']), $replace_arr)); + $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result['value'] != '') ? $result['value'] : \Froxlor\I18N\Lang::getAll()['mails']['password_reset']['mailbody']), $replace_arr)); $_mailerror = false; $mailerr_msg = ""; @@ -548,24 +548,24 @@ if ($action == 'forgotpwd') { 'loginname' => 'password_reset' )); $rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' requested to set a new password, but was not found in database!"); - $message = $lng['login']['combination_not_found']; + $message = \Froxlor\I18N\Lang::getAll()['login']['combination_not_found']; } unset($user); } } else { - $message = $lng['login']['usernotfound']; + $message = \Froxlor\I18N\Lang::getAll()['login']['usernotfound']; } } if ($adminchecked) { if (Settings::Get('panel.allow_preset_admin') != '1') { - $message = $lng['pwdreminder']['notallowed']; + $message = \Froxlor\I18N\Lang::getAll()['pwdreminder']['notallowed']; unset($adminchecked); } } else { if (Settings::Get('panel.allow_preset') != '1') { - $message = $lng['pwdreminder']['notallowed']; + $message = \Froxlor\I18N\Lang::getAll()['pwdreminder']['notallowed']; } } diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index e247b6cc..b324f157 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -42,7 +42,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question = 'Do you want to use wildcard-entries for existing domains?: '; $question .= \Froxlor\UI\HTML::makeyesno('update_domainwildcardentry', '1', '0', '1'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.6-svn2')) { @@ -50,7 +50,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $has_preconfig = true; $description = 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.'; $question = 'Please specify a new admin-email address: '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -65,7 +65,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= 'Path/URL for error 403: 

'; } $question .= 'Path/URL for error 404: '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.6-svn4')) { @@ -73,11 +73,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.'; $question = 'Which should be the default ticket-priority?: '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.6-svn5')) { @@ -88,10 +88,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $configs_array = getPhpConfigs(); $configs = ''; foreach ($configs_array as $idx => $desc) { - $configs .= makeoption($desc, $idx, '1'); + $configs .= \Froxlor\UI\HTML::makeoption($desc, $idx, '1'); } $question .= $configs . ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.6-svn6')) { @@ -99,10 +99,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'For the new FTP-quota feature, you can now chose the currently used ftpd-software.'; $question = 'Used FTPd-software: '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.7-svn1')) { @@ -112,13 +112,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= \Froxlor\UI\HTML::makeyesno('update_customredirect_enable', '1', '0', '1') . '

'; $question .= 'Select default redirect code (default: empty): '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.7-svn2')) { @@ -138,7 +138,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= '
  • ' . $idna_convert->decode($domain) . '
    • '; } $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -147,7 +147,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'When entering MX servers to Froxlor there was no mail-, imap-, pop3- and smtp-"A record" created. You can now chose whether this should be done or not.'; $question = 'Do you want these A-records to be created even with MX servers given?: '; $question .= \Froxlor\UI\HTML::makeyesno('update_defdns_mailentry', '1', '0', '0'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.10-svn1')) { @@ -192,7 +192,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question = $question2; } } - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -201,7 +201,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'you can now decide whether Froxlor should be reached via hostname/froxlor or directly via the hostname.'; $question = 'Do you want Froxlor to be reached directly via the hostname?: '; $question .= \Froxlor\UI\HTML::makeyesno('update_directlyviahostname', '1', '0', '0'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.11-svn1')) { @@ -209,7 +209,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'It is possible to enhance security with setting a regular expression to force your customers to enter more complex passwords.'; $question = 'Enter a regular expression to force a higher password complexity (leave empty for none): '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.11-svn3')) { @@ -217,7 +217,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'As Froxlor can now handle perl, you have to specify where the perl executable is (only if you\'re running lighttpd, else just leave empty).'; $question = 'Path to perl (default \'/usr/bin/perl\'): '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.12-svn1')) { @@ -231,7 +231,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= '

    '; $question .= 'Local group: '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -243,7 +243,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= 'If \'yes\', please specify a path within the suexec path where Froxlor will create symlinks to customer perl-enabled paths:

    '; $question .= 'Path for symlinks (must be within suexec path): '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.12-svn4')) { @@ -252,7 +252,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'Due to different paths of awstats_buildstaticpages.pl and awstats.pl you can set a different path for awstats.pl now.'; $question = 'Path to \'awstats.pl\'?: '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -261,8 +261,8 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $has_preconfig = true; $description = 'Froxlor can now limit the number of autoresponder-entries for each user. Here you can set the value which will be available for each customer (Of course you can change the value for each customer separately after the update).'; $question = 'How many autoresponders should your customers be able to add?: '; - $question .= ' ' . \Froxlor\UI\HTML::makecheckbox('update_autoresponder_default', $lng['customer']['unlimited'], '-1', false, 0, true, true) . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + $question .= ' ' . \Froxlor\UI\HTML::makecheckbox('update_autoresponder_default', \Froxlor\I18N\Lang::getAll()['customer']['unlimited'], '-1', false, 0, true, true) . '
    '; + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -275,10 +275,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $configs_array = getPhpConfigs(); $configs = ''; foreach ($configs_array as $idx => $desc) { - $configs .= makeoption($desc, $idx, '1'); + $configs .= \Froxlor\UI\HTML::makeoption($desc, $idx, '1'); } $question .= $configs . ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -288,7 +288,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'To have icons in AWStats statistic-pages please enter the path to AWStats icons folder.'; $question = 'Path to AWSTats icons folder: '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -298,7 +298,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'Froxlor now has the possibility to set \'SSLCertificateChainFile\' for the apache webserver.'; $question = 'Enter filename (leave empty for none): '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -307,14 +307,14 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can now allow customers to use any of their domains as username for the login.'; $question = 'Do you want to enable domain-login for all customers?: '; $question .= \Froxlor\UI\HTML::makeyesno('update_allow_domain_login', '1', '0', '0'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.14-svn10')) { $has_preconfig = true; $description = 'This update removes the unsupported real-time option. Additionally the deprecated tables for navigation and cronscripts are removed, any modules using these tables need to be updated to the new structure!'; $question = ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.16-svn1')) { @@ -332,8 +332,8 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= '

    '; $question .= 'Please specify the php-fpm rocess manager control: '; $question .= '

    '; $question .= 'Please specify the number of child processes: '; $question .= '

    '; @@ -346,7 +346,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= '

    '; $question .= 'Please specify the desired maximum number of idle server processes: '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.16-svn2')) { @@ -360,7 +360,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= '

    '; $question .= 'Local group: '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -374,7 +374,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= '

    '; $question .= 'Traffic warning level: '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.18-svn2')) { @@ -385,10 +385,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $themes = getThemes(); foreach ($themes as $cur_theme) // $theme is already in use { - $question .= makeoption($cur_theme, $cur_theme, 'Froxlor'); + $question .= \Froxlor\UI\HTML::makeoption($cur_theme, $cur_theme, 'Froxlor'); } $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.28-svn4')) { @@ -403,11 +403,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.28-svn6')) { @@ -419,13 +419,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c LoadModule authz_host_module modules/mod_authz_host.so
    '; $question = 'Do you want to enable the Apache-2.4 modification?: '; $question .= \Froxlor\UI\HTML::makeyesno('update_system_apache24', '1', '0', '0'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } elseif (Settings::Get('system.webserver') == 'nginx') { $has_preconfig = true; $description = 'The path to nginx\'s fastcgi_params file is now customizable.

    '; $question = 'Please enter full path to you nginx/fastcgi_params file (including filename): '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -439,7 +439,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question = 'Do you want to automatically append the domain-name to the documentroot of newly created domains?: '; $question .= \Froxlor\UI\HTML::makeyesno('update_system_documentroot_use_default_value', '1', '0', '0'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.28')) { @@ -457,7 +457,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c } $question = ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.29-dev1')) { @@ -467,7 +467,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'Standard-subdomains can now be hidden from the php-configuration overview.
    '; $question = 'Do you want to hide the standard-subdomains (this can be changed in the settings any time)?: '; $question .= \Froxlor\UI\HTML::makeyesno('hide_stdsubdomains', '1', '0', '0'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -477,7 +477,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question = 'If you want to disallow theme-changing, select "no" from the dropdowns: '; $question .= "Admins: " . \Froxlor\UI\HTML::makeyesno('allow_themechange_a', '1', '0', '1') . '  '; $question .= "Customers: " . \Froxlor\UI\HTML::makeyesno('allow_themechange_c', '1', '0', '1'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.29-dev3')) { @@ -485,7 +485,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'There is now a possibility to specify AXFR servers for your bind zone-configuration
    '; $question = 'Enter a comma-separated list of AXFR servers or leave empty (default): '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.29-dev4')) { @@ -493,14 +493,14 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'As customers can now specify ssl-certificate data for their domains, you need to specify where the generated files are stored
    '; $question = 'Specify the directory for customer ssl-certificates: '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.29.1-dev3')) { $has_preconfig = true; $description = 'The build in logrotation-feature has been removed. Please follow the configuration-instructions for your system to enable logrotating again.'; $question = ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } // let the apache+fpm users know that they MUST change their config @@ -519,7 +519,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c </Location> </IfModule>'; $question = ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -528,7 +528,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $has_preconfig = true; $description = 'The FPM socket directory is now a setting in froxlor. Its default is /var/lib/apache2/fastcgi/.
    If you are using /var/run/apache2 in the "fastcgi.conf" (Debian/Ubuntu) or "70_fastcgi.conf" (Gentoo) please correct this path accordingly
    '; $question = ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -536,7 +536,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $has_preconfig = true; $description = 'The template-variable {PASSWORD} has been replaced with {LINK}. Please update your password reset templates!
    '; $question = ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.31-dev5')) { @@ -546,7 +546,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= \Froxlor\UI\HTML::makeyesno('update_error_report_admin', '1', '0', '1') . '
    '; $question .= 'Do you want to enable error-reporting for customers? (default: no): '; $question .= \Froxlor\UI\HTML::makeyesno('update_error_report_customer', '1', '0', '0'); - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.31-rc2')) { @@ -554,7 +554,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can enable/disable the display/usage of the news-feed for admins

    '; $question = 'Do you want to enable the news-feed for admins? (default: yes): '; $question .= \Froxlor\UI\HTML::makeyesno('update_admin_news_feed', '1', '0', '1') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.32-dev2')) { @@ -565,20 +565,20 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= 'Mail Transfer Agent
    '; $question .= 'Type of your MTA: '; $question .= '
    '; $question .= 'Logfile for your MTA: '; $question .= '
    '; $question .= 'Mail Delivery Agent
    '; $question .= 'Type of your MDA: '; $question .= '

    '; $question .= 'Logfile for your MDA: '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.32-dev5')) { @@ -586,7 +586,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'Froxlor now generates a cron-configuration file for the cron-daemon. Please set a filename which will be included automatically by your crond (e.g. files in /etc/cron.d/)

    '; $question = 'Path to the cron-service configuration-file. This file will be updated regularly and automatically by froxlor.
    Note: please be sure to use the same filename as for the main froxlor cronjob (default: /etc/cron.d/froxlor)!
    '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.32-dev6')) { @@ -594,7 +594,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'In order for the new cron.d file to work properly, we need to know about the cron-service reload command.

    '; $question = 'Please specify the reload-command of your cron-daemon (default: /etc/init.d/cron reload)
    '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.32-rc2')) { @@ -602,7 +602,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'To customize the command which executes the cronjob (php - basically) change the path below according to your system.

    '; $question = 'Please specify the command to execute cronscripts (default: "/usr/bin/nice -n 5 /usr/bin/php5 -q")
    '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.33-dev1')) { @@ -612,7 +612,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= \Froxlor\UI\HTML::makeyesno('customer_show_news_feed', '1', '0', '0') . '
    '; $question .= 'You have to set the URL for your RSS-feed here, if you have chosen to enable the custom newsfeed on the customer-dashboard: '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.33-dev2')) { @@ -622,7 +622,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can enable/disable the generation of the bind-zone / config for the system hostname.

    '; $question = 'Do you want to generate a bind-zone for the system-hostname? (default: no): '; $question .= \Froxlor\UI\HTML::makeyesno('dns_createhostnameentry', '1', '0', '0') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -631,7 +631,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can chose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes.

    '; $question = 'Do you want to receive cron-errors via mail? (default: no): '; $question .= \Froxlor\UI\HTML::makeyesno('system_send_cron_errors', '1', '0', '0') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_version, '0.9.34-dev3')) { @@ -645,7 +645,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= 'installed/loaded'; } $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_db_version, '201603070')) { @@ -653,7 +653,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation.
    Please remember that you need to go through the webserver-configuration when enabled because this feature needs a special configuration.

    '; $question = 'Do you want to enable Let\'s Encrypt? (default: yes): '; $question .= \Froxlor\UI\HTML::makeyesno('enable_letsencrypt', '1', '0', '1') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_db_version, '201604270')) { @@ -661,7 +661,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can chose whether you want to enable or disable our backup function.

    '; $question = 'Do you want to enable Backup? (default: no): '; $question .= \Froxlor\UI\HTML::makeyesno('enable_backup', '1', '0', '0') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_db_version, '201605090')) { @@ -669,7 +669,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can chose whether you want to enable or disable our DNS editor

    '; $question = 'Do you want to enable the DNS editor? (default: no): '; $question .= \Froxlor\UI\HTML::makeyesno('enable_dns', '1', '0', '0') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_db_version, '201605170')) { @@ -677,10 +677,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'Froxlor now supports the dns-daemon Power-DNS, you can chose between bind and powerdns now.'; $question = 'Select dns-daemon you want to use: '; $question .= ''; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_db_version, '201609120')) { @@ -689,7 +689,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'You can now customize the path to your acme.conf file (global alias for Let\'s Encrypt). If you already set up Let\'s Encrypt and the acme.conf file, please set this to the complete path to the file!

    '; $question = 'Path to the acme.conf alias-file.
    '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } @@ -710,7 +710,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $question .= '
    '; $question .= 'SMTP password?
    '; $question .= '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_db_version, '201705050')) { @@ -718,7 +718,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'DEBIAN/UBUNTU ONLY: Enable usage of libnss-extrausers as alternative to libnss-mysql (NOTE: if enabled, go through the configuration steps right after the update!!!)

    '; $question = 'Enable usage of libnss-extrausers?
    '; $question .= \Froxlor\UI\HTML::makeyesno('system_nssextrausers', '1', '0', '0') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } if (versionInUpdate($current_db_version, '201712310')) { @@ -727,7 +727,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c $description = 'Chose whether you want to disable the Let\'s Encrypt selfcheck as it causes false positives for some configurations.

    '; $question = 'Disable Let\'s Encrypt self-check?
    '; $question .= \Froxlor\UI\HTML::makeyesno('system_disable_le_selfcheck', '1', '0', '0') . '
    '; - eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";"); } } } diff --git a/lib/Froxlor/Api/ApiCommand.php b/lib/Froxlor/Api/ApiCommand.php index c8c5b3da..c46a2d52 100644 --- a/lib/Froxlor/Api/ApiCommand.php +++ b/lib/Froxlor/Api/ApiCommand.php @@ -135,8 +135,6 @@ 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 . "`"); @@ -179,7 +177,7 @@ abstract class ApiCommand extends ApiParameter include_once \Froxlor\FileDir::makeSecurePath(\Froxlor\Froxlor::getInstallDir() . '/lng/lng_references.php'); // set array for ApiCommand - $this->lng = $lng; + $this->lng = \Froxlor\I18N\Lang::getAll(); } /** diff --git a/lib/Froxlor/Config/ConfigDaemon.php b/lib/Froxlor/Config/ConfigDaemon.php index ef6d9c99..3fb515c6 100644 --- a/lib/Froxlor/Config/ConfigDaemon.php +++ b/lib/Froxlor/Config/ConfigDaemon.php @@ -424,13 +424,12 @@ 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 $lng[$match[1]][$match[2]][$match[3]]; + return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]][$match[3]]; } elseif (isset($match[1]) && $match[1] != '' && isset($match[2]) && $match[2] != '') { - return $lng[$match[1]][$match[2]]; + return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]]; } elseif (isset($match[1]) && $match[1] != '') { - return $lng[$match[1]]; + return \Froxlor\I18N\Lang::getAll()[$match[1]]; } return ''; } elseif (preg_match('/^const\.(.*)$/', $matches[1], $match)) { diff --git a/lib/Froxlor/Config/ConfigService.php b/lib/Froxlor/Config/ConfigService.php index 92e490a7..a6c586ac 100644 --- a/lib/Froxlor/Config/ConfigService.php +++ b/lib/Froxlor/Config/ConfigService.php @@ -137,13 +137,12 @@ 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 $lng[$match[1]][$match[2]][$match[3]]; + return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]][$match[3]]; } elseif (isset($match[1]) && $match[1] != '' && isset($match[2]) && $match[2] != '') { - return $lng[$match[1]][$match[2]]; + return \Froxlor\I18N\Lang::getAll()[$match[1]][$match[2]]; } elseif (isset($match[1]) && $match[1] != '') { - return $lng[$match[1]]; + return \Froxlor\I18N\Lang::getAll()[$match[1]]; } return ''; } diff --git a/lib/Froxlor/Cron/Traffic/ReportsCron.php b/lib/Froxlor/Cron/Traffic/ReportsCron.php index d0580ba9..99b1cabc 100644 --- a/lib/Froxlor/Cron/Traffic/ReportsCron.php +++ b/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'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['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'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr)); + $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['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'] : $lng['mails']['trafficmaxpercent']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['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'] : $lng['mails']['trafficmaxpercent']['mailbody']), $replace_arr)); + $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['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'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['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'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); + $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['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'] : $lng['mails']['diskmaxpercent']['subject']), $replace_arr)); + $mail_subject = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['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'] : $lng['mails']['diskmaxpercent']['mailbody']), $replace_arr)); + $mail_body = html_entity_decode(\Froxlor\PhpHelper::replace_variables((($result2['value'] != '') ? $result2['value'] : \Froxlor\I18N\Lang::getAll()['mails']['diskmaxpercent']['mailbody']), $replace_arr)); $_mailerror = false; $mailerr_msg = ""; diff --git a/lib/Froxlor/Domain/Domain.php b/lib/Froxlor/Domain/Domain.php index bb3bfcc6..f05eecc1 100644 --- a/lib/Froxlor/Domain/Domain.php +++ b/lib/Froxlor/Domain/Domain.php @@ -35,8 +35,6 @@ 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); @@ -44,7 +42,7 @@ class Domain while ($rc = $result_stmt->fetch(\PDO::FETCH_ASSOC)) { $codes[$rc['id']] = $rc['code']; if ($add_desc) { - $codes[$rc['id']] .= ' (' . $lng['redirect_desc'][$rc['desc']] . ')'; + $codes[$rc['id']] .= ' (' . \Froxlor\I18N\Lang::getAll()['redirect_desc'][$rc['desc']] . ')'; } } @@ -332,4 +330,4 @@ class Domain } return ''; } -} \ No newline at end of file +} diff --git a/lib/Froxlor/Domain/IpAddr.php b/lib/Froxlor/Domain/IpAddr.php index a61fe3d8..3e950315 100644 --- a/lib/Froxlor/Domain/IpAddr.php +++ b/lib/Froxlor/Domain/IpAddr.php @@ -73,9 +73,8 @@ class IpAddr public static function getSslIpPortCombinations() { - global $lng; return array( - '' => $lng['panel']['none_value'] + '' => \Froxlor\I18N\Lang::getAll()['panel']['none_value'] ) + self::getIpPortCombinations(true); } -} \ No newline at end of file +} diff --git a/lib/Froxlor/FileDir.php b/lib/Froxlor/FileDir.php index d3260c6d..4f17e909 100644 --- a/lib/Froxlor/FileDir.php +++ b/lib/Froxlor/FileDir.php @@ -381,8 +381,6 @@ class FileDir */ public static function makePathfield($path, $uid, $gid, $value = '', $dom = false) { - global $lng; - $value = str_replace($path, '', $value); $field = array(); @@ -429,20 +427,20 @@ class FileDir // remove starting slash we added // for the Dropdown, #225 $value = substr($value, 1); - // $field = $lng['panel']['toomanydirs']; + // $field = \Froxlor\I18N\Lang::getAll()['panel']['toomanydirs']; $field = array( 'type' => 'text', 'value' => htmlspecialchars($value), - 'note' => $lng['panel']['toomanydirs'] + 'note' => \Froxlor\I18N\Lang::getAll()['panel']['toomanydirs'] ); } } else { - // $field = $lng['panel']['dirsmissing']; + // $field = \Froxlor\I18N\Lang::getAll()['panel']['dirsmissing']; // $field = ''; $field = array( 'type' => 'hidden', 'value' => '/', - 'note' => $lng['panel']['dirsmissing'] + 'note' => \Froxlor\I18N\Lang::getAll()['panel']['dirsmissing'] ); } } diff --git a/lib/Froxlor/PhpHelper.php b/lib/Froxlor/PhpHelper.php index 5f33377b..75af316e 100644 --- a/lib/Froxlor/PhpHelper.php +++ b/lib/Froxlor/PhpHelper.php @@ -117,7 +117,7 @@ class PhpHelper public static function loadConfigArrayDir() { // Workaround until we use gettext - global $lng, $theme; + global $theme; // we now use dynamic function parameters // so we can read from more than one directory diff --git a/lib/Froxlor/System/Cronjob.php b/lib/Froxlor/System/Cronjob.php index ce939cbb..550e2922 100644 --- a/lib/Froxlor/System/Cronjob.php +++ b/lib/Froxlor/System/Cronjob.php @@ -188,20 +188,18 @@ 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 = $lng['cronjobs']['notyetrun']; + $lastrun = \Froxlor\I18N\Lang::getAll()['cronjobs']['notyetrun']; if ($row['lastrun'] > 0) { $lastrun = date('d.m.Y H:i:s', $row['lastrun']); } - $text = $lng['crondesc'][$row['desc_lng_key']]; + $text = \Froxlor\I18N\Lang::getAll()['crondesc'][$row['desc_lng_key']]; $value = $lastrun; eval("\$cronjobs_last_run .= \"" . \Froxlor\UI\Template::getTemplate("index/overview_item") . "\";"); @@ -226,8 +224,6 @@ class Cronjob public static function getOutstandingTasks() { - global $lng; - $query = "SELECT * FROM `" . TABLE_PANEL_TASKS . "` ORDER BY `type` ASC"; $result = Database::query($query); @@ -241,49 +237,49 @@ class Cronjob // rebuilding webserver-configuration if ($row['type'] == '1') { - $task_desc = $lng['tasks']['rebuild_webserverconfig']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['rebuild_webserverconfig']; } // adding new user/ elseif ($row['type'] == '2') { $loginname = ''; if (is_array($row['data'])) { $loginname = $row['data']['loginname']; } - $task_desc = $lng['tasks']['adding_customer']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['adding_customer']; $task_desc = str_replace('%loginname%', $loginname, $task_desc); } // rebuilding bind-configuration elseif ($row['type'] == '4') { - $task_desc = $lng['tasks']['rebuild_bindconfig']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['rebuild_bindconfig']; } // creating ftp-user directory elseif ($row['type'] == '5') { - $task_desc = $lng['tasks']['creating_ftpdir']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['creating_ftpdir']; } // deleting user-files elseif ($row['type'] == '6') { $loginname = ''; if (is_array($row['data'])) { $loginname = $row['data']['loginname']; } - $task_desc = $lng['tasks']['deleting_customerfiles']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['deleting_customerfiles']; $task_desc = str_replace('%loginname%', $loginname, $task_desc); } // deleting email-account elseif ($row['type'] == '7') { - $task_desc = $lng['tasks']['remove_emailacc_files']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['remove_emailacc_files']; } // deleting ftp-account elseif ($row['type'] == '8') { - $task_desc = $lng['tasks']['remove_ftpacc_files']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['remove_ftpacc_files']; } // Set FS - quota elseif ($row['type'] == '10') { - $task_desc = $lng['tasks']['diskspace_set_quota']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['diskspace_set_quota']; } // deleting user-files elseif ($row['type'] == '20') { $loginname = ''; if (is_array($row['data'])) { $loginname = $row['data']['loginname']; } - $task_desc = $lng['tasks']['backup_customerfiles']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['backup_customerfiles']; $task_desc = str_replace('%loginname%', $loginname, $task_desc); } // re-generating of cron.d-file elseif ($row['type'] == '99') { - $task_desc = $lng['tasks']['regenerating_crond']; + $task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['regenerating_crond']; } // unknown else { $task_desc = "ERROR: Unknown task type '" . $row['type'] . "'"; @@ -295,13 +291,13 @@ class Cronjob } if (trim($tasks) == '') { - $value .= '
  • ' . $lng['tasks']['noneoutstanding'] . '
    • '; + $value .= '
  • ' . \Froxlor\I18N\Lang::getAll()['tasks']['noneoutstanding'] . '
    • '; } else { $value .= $tasks; } $value .= ''; - $text = $lng['tasks']['outstanding_tasks']; + $text = \Froxlor\I18N\Lang::getAll()['tasks']['outstanding_tasks']; eval("\$outstanding_tasks = \"" . \Froxlor\UI\Template::getTemplate("index/overview_item") . "\";"); return $outstanding_tasks; @@ -346,4 +342,4 @@ class Cronjob die($message); } -} \ No newline at end of file +} diff --git a/lib/Froxlor/System/Crypt.php b/lib/Froxlor/System/Crypt.php index 407b2e93..78eb91e1 100644 --- a/lib/Froxlor/System/Crypt.php +++ b/lib/Froxlor/System/Crypt.php @@ -116,11 +116,9 @@ class Crypt */ public static function getAvailablePasswordHashes() { - global $lng; - // get available pwd-hases $available_pwdhashes = array( - 0 => $lng['serversettings']['systemdefault'] + 0 => \Froxlor\I18N\Lang::getAll()['serversettings']['systemdefault'] ); if (defined('CRYPT_MD5') && CRYPT_MD5 == 1) { $available_pwdhashes[1] = 'MD5'; diff --git a/lib/Froxlor/UI/HTML.php b/lib/Froxlor/UI/HTML.php index 3976a2eb..95fb402b 100644 --- a/lib/Froxlor/UI/HTML.php +++ b/lib/Froxlor/UI/HTML.php @@ -217,7 +217,7 @@ class HTML */ public static function makeyesno($name, $yesvalue, $novalue = '', $yesselected = '', $disabled = false) { - global $lng, $theme; + global $theme; if ($disabled) { $d = ' disabled="disabled"'; @@ -230,7 +230,7 @@ class HTML } return ''; + '; } /** @@ -264,8 +264,8 @@ class HTML } } - if (isset($lng['question'][$text])) { - $text = $lng['question'][$text]; + if (isset(\Froxlor\I18N\Lang::getAll()['question'][$text])) { + $text = \Froxlor\I18N\Lang::getAll()['question'][$text]; } $text = strtr($text, array( @@ -287,12 +287,12 @@ class HTML } } - if (isset($lng['question'][$text])) { - $text = $lng['question'][$text]; + if (isset(\Froxlor\I18N\Lang::getAll()['question'][$text])) { + $text = \Froxlor\I18N\Lang::getAll()['question'][$text]; } - if (isset($lng['question'][$chk_text])) { - $chk_text = $lng['question'][$chk_text]; + if (isset(\Froxlor\I18N\Lang::getAll()['question'][$chk_text])) { + $chk_text = \Froxlor\I18N\Lang::getAll()['question'][$chk_text]; } if ($show_checkbox) { @@ -308,4 +308,4 @@ class HTML eval("echo \"" . Template::getTemplate('misc/question_yesno_checkbox', '1') . "\";"); exit(); } -} \ No newline at end of file +} diff --git a/lib/Froxlor/UI/HtmlForm.php b/lib/Froxlor/UI/HtmlForm.php index b62ea78a..1fc4f4a3 100644 --- a/lib/Froxlor/UI/HtmlForm.php +++ b/lib/Froxlor/UI/HtmlForm.php @@ -29,7 +29,7 @@ class HtmlForm public static function genHTMLForm($data = array()) { - global $lng, $theme; + global $theme; $nob = false; self::$_form = ''; @@ -233,7 +233,7 @@ class HtmlForm * * * $data = array( - * 'label' => $lng['customer']['email_imap'], + * 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_imap'], * 'type' => 'checkbox', * 'values' => array( * array( 'label' => 'active', diff --git a/lib/Froxlor/UI/Paging.php b/lib/Froxlor/UI/Paging.php index 9d7c2589..31fca29d 100644 --- a/lib/Froxlor/UI/Paging.php +++ b/lib/Froxlor/UI/Paging.php @@ -405,8 +405,8 @@ class Paging $breakorws = ($break ? '
    ' : ' '); foreach (array( - 'asc' => $lng['panel']['ascending'], - 'desc' => $lng['panel']['descending'] + 'asc' => \Froxlor\I18N\Lang::getAll()['panel']['ascending'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descending'] ) as $sortordertype => $sortorderdescription) { $orderoptions .= HTML::makeoption($sortorderdescription, $sortordertype, $this->sortorder, true, true); } diff --git a/lib/Froxlor/UI/Response.php b/lib/Froxlor/UI/Response.php index de13b19c..808522e9 100644 --- a/lib/Froxlor/UI/Response.php +++ b/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 = '' . $lng['panel']['back'] . ''; + $link = '' . \Froxlor\I18N\Lang::getAll()['panel']['back'] . ''; } $error = ''; foreach ($errors as $single_error) { - if (isset($lng['error'][$single_error])) { - $single_error = $lng['error'][$single_error]; + if (isset(\Froxlor\I18N\Lang::getAll()['error'][$single_error])) { + $single_error = \Froxlor\I18N\Lang::getAll()['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 = '' . $lng['panel']['back'] . ''; + $link = '' . \Froxlor\I18N\Lang::getAll()['panel']['back'] . ''; } $error = $message; eval("echo \"" . Template::getTemplate('misc/error', '1') . "\";"); @@ -152,8 +152,8 @@ class Response { global $s, $header, $footer, $theme; - if (isset($lng['success'][$success_message])) { - $success_message = strtr($lng['success'][$success_message], array( + if (isset(\Froxlor\I18N\Lang::getAll()['success'][$success_message])) { + $success_message = strtr(\Froxlor\I18N\Lang::getAll()['success'][$success_message], array( '%s' => htmlentities($replacer) )); } diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php index d2ac4b67..51a7c30a 100644 --- a/lib/formfields/admin/admin/formfield.admin_add.php +++ b/lib/formfields/admin/admin/formfield.admin_add.php @@ -16,65 +16,65 @@ */ return array( 'admin_add' => array( - 'title' => $lng['admin']['admin_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['admin_add'], 'image' => 'icons/user_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['accountdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'], 'image' => 'icons/user_add.png', 'fields' => array( 'new_loginname' => array( - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'text', 'mandatory' => true ), 'admin_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'mandatory' => true, 'autocomplete' => 'off' ), 'admin_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() ), 'def_language' => array( - 'label' => $lng['login']['language'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['language'], 'type' => 'select', 'select_var' => $language_options ) ) ), 'section_b' => array( - 'title' => $lng['admin']['contactdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'], 'image' => 'icons/user_add.png', 'fields' => array( 'name' => array( - 'label' => $lng['customer']['name'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'], 'type' => 'text', 'mandatory' => true ), 'email' => array( - 'label' => $lng['customer']['email'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'], 'type' => 'text', 'mandatory' => true ), 'custom_notes' => array( 'style' => 'align-top', - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12 ), 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -83,27 +83,27 @@ return array( ) ), 'section_c' => array( - 'title' => $lng['admin']['servicedata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'], 'image' => 'icons/user_add.png', 'fields' => array( 'ipaddress' => array( - 'label' => $lng['serversettings']['ipaddress']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ipaddress']['title'], 'type' => 'select', 'select_var' => $ipaddress ), 'change_serversettings' => array( - 'label' => $lng['admin']['change_serversettings'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['change_serversettings'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'customers' => array( - 'label' => $lng['admin']['customers'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -111,18 +111,18 @@ return array( 'ul_field' => $customers_ul ), 'customers_see_all' => array( - 'label' => $lng['admin']['customers_see_all'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers_see_all'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'domains' => array( - 'label' => $lng['admin']['domains'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -130,29 +130,29 @@ return array( 'ul_field' => $domains_ul ), 'domains_see_all' => array( - 'label' => $lng['admin']['domains_see_all'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains_see_all'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'caneditphpsettings' => array( - 'label' => $lng['admin']['caneditphpsettings'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['caneditphpsettings'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'], 'type' => 'textul', 'value' => 0, 'maxlength' => 6, @@ -160,7 +160,7 @@ return array( 'ul_field' => $diskspace_ul ), 'traffic' => array( - 'label' => $lng['customer']['traffic'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'], 'type' => 'textul', 'value' => 0, 'maxlength' => 4, @@ -168,7 +168,7 @@ return array( 'ul_field' => $traffic_ul ), 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -176,7 +176,7 @@ return array( 'ul_field' => $subdomains_ul ), 'emails' => array( - 'label' => $lng['customer']['emails'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -184,7 +184,7 @@ return array( 'ul_field' => $emails_ul ), 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -192,7 +192,7 @@ return array( 'ul_field' => $email_accounts_ul ), 'email_forwarders' => array( - 'label' => $lng['customer']['forwarders'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -200,7 +200,7 @@ return array( 'ul_field' => $email_forwarders_ul ), 'email_quota' => array( - 'label' => $lng['customer']['email_quota'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -209,14 +209,14 @@ return array( 'ul_field' => $email_quota_ul ), 'ftps' => array( - 'label' => $lng['customer']['ftps'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, 'ul_field' => $ftps_ul ), 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php index e5301d3f..2e2f1ade 100644 --- a/lib/formfields/admin/admin/formfield.admin_edit.php +++ b/lib/formfields/admin/admin/formfield.admin_edit.php @@ -16,24 +16,24 @@ */ return array( 'admin_edit' => array( - 'title' => $lng['admin']['admin_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['admin_edit'], 'image' => 'icons/user_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['accountdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'], 'image' => 'icons/user_edit.png', 'fields' => array( 'loginname' => array( - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'label', 'value' => $result['loginname'] ), 'deactivated' => array( - 'label' => $lng['admin']['deactivated_user'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['deactivated_user'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -43,20 +43,20 @@ return array( 'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true) ), 'admin_password' => array( - 'label' => $lng['login']['password'] . ' (' . $lng['panel']['emptyfornochanges'] . ')', + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['emptyfornochanges'] . ')', 'type' => 'password', 'autocomplete' => 'off', 'visible' => ($result['adminid'] == \Froxlor\User::getAll()['userid'] ? false : true) ), 'admin_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['login']['language'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['contactdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'], 'image' => 'icons/user_edit.png', 'fields' => array( 'name' => array( - 'label' => $lng['customer']['name'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'], 'type' => 'text', 'mandatory' => true, 'value' => $result['name'] ), 'email' => array( - 'label' => $lng['customer']['email'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'], 'type' => 'text', 'mandatory' => true, 'value' => $result['email'] ), 'custom_notes' => array( 'style' => 'align-top', - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, 'value' => $result['custom_notes'] ), 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -104,21 +104,21 @@ return array( ) ), 'section_c' => array( - 'title' => $lng['admin']['servicedata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'], 'image' => 'icons/user_add.png', 'visible' => ($result['adminid'] != \Froxlor\User::getAll()['userid'] ? true : false), 'fields' => array( 'ipaddress' => array( - 'label' => $lng['serversettings']['ipaddress']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['ipaddress']['title'], 'type' => 'select', 'select_var' => $ipaddress ), 'change_serversettings' => array( - 'label' => $lng['admin']['change_serversettings'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['change_serversettings'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -127,7 +127,7 @@ return array( ) ), 'customers' => array( - 'label' => $lng['admin']['customers'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers'], 'type' => 'textul', 'value' => $result['customers'], 'maxlength' => 9, @@ -135,11 +135,11 @@ return array( 'ul_field' => $customers_ul ), 'customers_see_all' => array( - 'label' => $lng['admin']['customers_see_all'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customers_see_all'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -148,7 +148,7 @@ return array( ) ), 'domains' => array( - 'label' => $lng['admin']['domains'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains'], 'type' => 'textul', 'value' => $result['domains'], 'maxlength' => 9, @@ -156,11 +156,11 @@ return array( 'ul_field' => $domains_ul ), 'domains_see_all' => array( - 'label' => $lng['admin']['domains_see_all'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domains_see_all'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -169,11 +169,11 @@ return array( ) ), 'caneditphpsettings' => array( - 'label' => $lng['admin']['caneditphpsettings'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['caneditphpsettings'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -182,7 +182,7 @@ return array( ) ), 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'], 'type' => 'textul', 'value' => $result['diskspace'], 'maxlength' => 6, @@ -190,7 +190,7 @@ return array( 'ul_field' => $diskspace_ul ), 'traffic' => array( - 'label' => $lng['customer']['traffic'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'], 'type' => 'textul', 'value' => $result['traffic'], 'maxlength' => 4, @@ -198,7 +198,7 @@ return array( 'ul_field' => $traffic_ul ), 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'], 'type' => 'textul', 'value' => $result['subdomains'], 'maxlength' => 9, @@ -206,7 +206,7 @@ return array( 'ul_field' => $subdomains_ul ), 'emails' => array( - 'label' => $lng['customer']['emails'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'], 'type' => 'textul', 'value' => $result['emails'], 'maxlength' => 9, @@ -214,7 +214,7 @@ return array( 'ul_field' => $emails_ul ), 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['customer']['forwarders'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['customer']['email_quota'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['customer']['ftps'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'], 'type' => 'textul', 'value' => $result['ftps'], 'maxlength' => 9, 'ul_field' => $ftps_ul ), 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'], 'type' => 'textul', 'value' => $result['mysqls'], 'maxlength' => 9, diff --git a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php index 75607699..c3af7abd 100644 --- a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php +++ b/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php @@ -16,11 +16,11 @@ */ return array( 'cronjobs_edit' => array( - 'title' => $lng['admin']['cronjob_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['cronjob_edit'], 'image' => 'icons/clock_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['cronjob']['cronjobsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['cronjob']['cronjobsettings'], 'image' => 'icons/clock_edit.png', 'fields' => array( 'cronfile' => array( @@ -29,11 +29,11 @@ return array( 'value' => $result['cronfile'] ), 'isactive' => array( - 'label' => $lng['admin']['activated'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['activated'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -42,12 +42,12 @@ return array( ) ), 'interval_value' => array( - 'label' => $lng['cronjob']['cronjobintervalv'], + 'label' => \Froxlor\I18N\Lang::getAll()['cronjob']['cronjobintervalv'], 'type' => 'text', 'value' => $interval_value ), 'interval_interval' => array( - 'label' => $lng['cronjob']['cronjobinterval'], + 'label' => \Froxlor\I18N\Lang::getAll()['cronjob']['cronjobinterval'], 'type' => 'select', 'select_var' => $interval_interval ) diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php index 2afb1b2b..1ed689d8 100644 --- a/lib/formfields/admin/customer/formfield.customer_add.php +++ b/lib/formfields/admin/customer/formfield.customer_add.php @@ -16,23 +16,23 @@ */ return array( 'customer_add' => array( - 'title' => $lng['admin']['customer_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['customer_add'], 'image' => 'icons/user_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['accountdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'], 'image' => 'icons/user_add.png', 'fields' => array( 'new_loginname' => array( - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'text' ), 'createstdsubdomain' => array( - 'label' => $lng['admin']['stdsubdomain_add'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain_add'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -41,11 +41,11 @@ return array( ) ), 'store_defaultindex' => array( - 'label' => $lng['admin']['store_defaultindex'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['store_defaultindex'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -54,22 +54,22 @@ return array( ) ), 'new_customer_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'autocomplete' => 'off' ), 'new_customer_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() ), 'sendpassword' => array( - 'label' => $lng['admin']['sendpassword'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['sendpassword'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -78,79 +78,79 @@ return array( ) ), 'def_language' => array( - 'label' => $lng['login']['language'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['language'], 'type' => 'select', 'select_var' => $language_options ) ) ), 'section_b' => array( - 'title' => $lng['admin']['contactdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'], 'image' => 'icons/user_add.png', 'fields' => array( 'name' => array( - 'label' => $lng['customer']['name'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'], 'type' => 'text', 'mandatory_ex' => true ), 'firstname' => array( - 'label' => $lng['customer']['firstname'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['firstname'], 'type' => 'text', 'mandatory_ex' => true ), 'gender' => array( - 'label' => $lng['gender']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['gender']['title'], 'type' => 'select', 'select_var' => $gender_options ), 'company' => array( - 'label' => $lng['customer']['company'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['company'], 'type' => 'text', 'mandatory_ex' => true ), 'street' => array( - 'label' => $lng['customer']['street'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['street'], 'type' => 'text' ), 'zipcode' => array( - 'label' => $lng['customer']['zipcode'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['zipcode'], 'type' => 'text' ), 'city' => array( - 'label' => $lng['customer']['city'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['city'], 'type' => 'text' ), 'phone' => array( - 'label' => $lng['customer']['phone'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['phone'], 'type' => 'text' ), 'fax' => array( - 'label' => $lng['customer']['fax'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['fax'], 'type' => 'text' ), 'email' => array( - 'label' => $lng['customer']['email'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'], 'type' => 'text', 'mandatory' => true ), 'customernumber' => array( - 'label' => $lng['customer']['customernumber'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['customernumber'], 'type' => 'text' ), 'custom_notes' => array( 'style' => 'align-top', - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12 ), 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -160,22 +160,22 @@ return array( ), 'section_cpre' => array( 'visible' => ! empty($hosting_plans), - 'title' => $lng['admin']['plans']['use_plan'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'], 'image' => 'icons/user_add.png', 'fields' => array( 'use_plan' => array( - 'label' => $lng['admin']['plans']['use_plan'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'], 'type' => 'select', 'select_var' => $hosting_plans ) ) ), 'section_c' => array( - 'title' => $lng['admin']['servicedata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'], 'image' => 'icons/user_add.png', 'fields' => array( 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'], 'type' => 'textul', 'value' => 0, 'maxlength' => 16, @@ -183,7 +183,7 @@ return array( 'ul_field' => $diskspace_ul ), 'traffic' => array( - 'label' => $lng['customer']['traffic'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'], 'type' => 'textul', 'value' => 0, 'maxlength' => 14, @@ -191,7 +191,7 @@ return array( 'ul_field' => $traffic_ul ), 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -199,7 +199,7 @@ return array( 'ul_field' => $subdomains_ul ), 'emails' => array( - 'label' => $lng['customer']['emails'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -207,7 +207,7 @@ return array( 'ul_field' => $emails_ul ), 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['accounts'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -215,7 +215,7 @@ return array( 'ul_field' => $email_accounts_ul ), 'email_forwarders' => array( - 'label' => $lng['customer']['forwarders'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['forwarders'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -223,7 +223,7 @@ return array( 'ul_field' => $email_forwarders_ul ), 'email_quota' => array( - 'label' => $lng['customer']['email_quota'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -232,11 +232,11 @@ return array( 'ul_field' => $email_quota_ul ), 'email_imap' => array( - 'label' => $lng['customer']['email_imap'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_imap'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -246,11 +246,11 @@ return array( 'mandatory' => true ), 'email_pop3' => array( - 'label' => $lng['customer']['email_pop3'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_pop3'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -260,14 +260,14 @@ return array( 'mandatory' => true ), 'ftps' => array( - 'label' => $lng['customer']['ftps'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, 'ul_field' => $ftps_ul ), 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'], 'type' => 'textul', 'value' => 0, 'maxlength' => 9, @@ -275,11 +275,11 @@ return array( 'ul_field' => $mysqls_ul ), 'phpenabled' => array( - 'label' => $lng['admin']['phpenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['perlenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['perlenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ) ), 'dnsenabled' => array( - 'label' => $lng['admin']['dnsenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['dnsenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'visible' => (\Froxlor\Settings::Get('system.dnsenabled') == '1' ? true : false) ), 'logviewenabled' => array( - 'label' => $lng['admin']['logviewenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['logviewenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ) diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php index 9f5879da..1a184a43 100644 --- a/lib/formfields/admin/customer/formfield.customer_edit.php +++ b/lib/formfields/admin/customer/formfield.customer_edit.php @@ -16,29 +16,29 @@ */ return array( 'customer_edit' => array( - 'title' => $lng['admin']['customer_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['customer_edit'], 'image' => 'icons/user_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['accountdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['accountdata'], 'image' => 'icons/user_edit.png', 'fields' => array( 'loginname' => array( - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'label', 'value' => $result['loginname'] ), 'documentroot' => array( - 'label' => $lng['customer']['documentroot'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['documentroot'], 'type' => 'label', 'value' => $result['documentroot'] ), 'createstdsubdomain' => array( - 'label' => $lng['admin']['stdsubdomain_add'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain_add'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -47,11 +47,11 @@ return array( ) ), 'deactivated' => array( - 'label' => $lng['admin']['deactivated_user'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['deactivated_user'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -60,101 +60,101 @@ return array( ) ), 'new_customer_password' => array( - 'label' => $lng['login']['password'] . ' (' . $lng['panel']['emptyfornochanges'] . ')', + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'] . ' (' . \Froxlor\I18N\Lang::getAll()['panel']['emptyfornochanges'] . ')', 'type' => 'password', 'autocomplete' => 'off' ), 'new_customer_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() ), 'def_language' => array( - 'label' => $lng['login']['language'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['language'], 'type' => 'select', 'select_var' => $language_options ) ) ), 'section_b' => array( - 'title' => $lng['admin']['contactdata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['contactdata'], 'image' => 'icons/user_edit.png', 'fields' => array( 'name' => array( - 'label' => $lng['customer']['name'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['name'], 'type' => 'text', 'mandatory_ex' => true, 'value' => $result['name'] ), 'firstname' => array( - 'label' => $lng['customer']['firstname'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['firstname'], 'type' => 'text', 'mandatory_ex' => true, 'value' => $result['firstname'] ), 'gender' => array( - 'label' => $lng['gender']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['gender']['title'], 'type' => 'select', 'select_var' => $gender_options ), 'company' => array( - 'label' => $lng['customer']['company'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['company'], 'type' => 'text', 'mandatory_ex' => true, 'value' => $result['company'] ), 'street' => array( - 'label' => $lng['customer']['street'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['street'], 'type' => 'text', 'value' => $result['street'] ), 'zipcode' => array( - 'label' => $lng['customer']['zipcode'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['zipcode'], 'type' => 'text', 'value' => $result['zipcode'] ), 'city' => array( - 'label' => $lng['customer']['city'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['city'], 'type' => 'text', 'value' => $result['city'] ), 'phone' => array( - 'label' => $lng['customer']['phone'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['phone'], 'type' => 'text', 'value' => $result['phone'] ), 'fax' => array( - 'label' => $lng['customer']['fax'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['fax'], 'type' => 'text', 'value' => $result['fax'] ), 'email' => array( - 'label' => $lng['customer']['email'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email'], 'type' => 'text', 'mandatory' => true, 'value' => $result['email'] ), 'customernumber' => array( - 'label' => $lng['customer']['customernumber'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['customernumber'], 'type' => 'text', 'value' => $result['customernumber'] ), 'custom_notes' => array( 'style' => 'align-top', - 'label' => $lng['usersettings']['custom_notes']['title'], - 'desc' => $lng['usersettings']['custom_notes']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, 'value' => $result['custom_notes'] ), 'custom_notes_show' => array( - 'label' => $lng['usersettings']['custom_notes']['show'], + 'label' => \Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['show'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -166,22 +166,22 @@ return array( ), 'section_cpre' => array( 'visible' => ! empty($hosting_plans), - 'title' => $lng['admin']['plans']['use_plan'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'], 'image' => 'icons/user_add.png', 'fields' => array( 'use_plan' => array( - 'label' => $lng['admin']['plans']['use_plan'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['use_plan'], 'type' => 'select', 'select_var' => $hosting_plans ) ) ), 'section_c' => array( - 'title' => $lng['admin']['servicedata'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['servicedata'], 'image' => 'icons/user_edit.png', 'fields' => array( 'diskspace' => array( - 'label' => $lng['customer']['diskspace'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['diskspace'], 'type' => 'textul', 'value' => $result['diskspace'], 'maxlength' => 16, @@ -189,7 +189,7 @@ return array( 'ul_field' => $diskspace_ul ), 'traffic' => array( - 'label' => $lng['customer']['traffic'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['traffic'], 'type' => 'textul', 'value' => $result['traffic'], 'maxlength' => 14, @@ -197,7 +197,7 @@ return array( 'ul_field' => $traffic_ul ), 'subdomains' => array( - 'label' => $lng['customer']['subdomains'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['subdomains'], 'type' => 'textul', 'value' => $result['subdomains'], 'maxlength' => 9, @@ -205,7 +205,7 @@ return array( 'ul_field' => $subdomains_ul ), 'emails' => array( - 'label' => $lng['customer']['emails'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['emails'], 'type' => 'textul', 'value' => $result['emails'], 'maxlength' => 9, @@ -213,7 +213,7 @@ return array( 'ul_field' => $emails_ul ), 'email_accounts' => array( - 'label' => $lng['customer']['accounts'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['customer']['forwarders'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['customer']['email_quota'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['customer']['email_imap'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_imap'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -252,11 +252,11 @@ return array( 'mandatory' => true ), 'email_pop3' => array( - 'label' => $lng['customer']['email_pop3'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_pop3'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -266,14 +266,14 @@ return array( 'mandatory' => true ), 'ftps' => array( - 'label' => $lng['customer']['ftps'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['ftps'], 'type' => 'textul', 'value' => $result['ftps'], 'maxlength' => 9, 'ul_field' => $ftps_ul ), 'mysqls' => array( - 'label' => $lng['customer']['mysqls'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['mysqls'], 'type' => 'textul', 'value' => $result['mysqls'], 'maxlength' => 9, @@ -281,11 +281,11 @@ return array( 'ul_field' => $mysqls_ul ), 'phpenabled' => array( - 'label' => $lng['admin']['phpenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['perlenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['perlenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -315,11 +315,11 @@ return array( ) ), 'dnsenabled' => array( - 'label' => $lng['admin']['dnsenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['dnsenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -329,11 +329,11 @@ return array( 'visible' => (\Froxlor\Settings::Get('system.dnsenabled') == '1' ? true : false) ), 'logviewenabled' => array( - 'label' => $lng['admin']['logviewenabled'] . '?', + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['logviewenabled'] . '?', 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -344,12 +344,12 @@ return array( ) ), 'section_d' => array( - 'title' => $lng['admin']['movetoadmin'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['movetoadmin'], 'image' => 'icons/user_edit.png', 'visible' => ($admin_select_cnt > 1), 'fields' => array( 'move_to_admin' => array( - 'label' => $lng['admin']['movecustomertoadmin'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['movecustomertoadmin'], 'type' => 'select', 'select_var' => $admin_select ) diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php index 7ffc3f95..82ed6cdf 100644 --- a/lib/formfields/admin/domains/formfield.domains_add.php +++ b/lib/formfields/admin/domains/formfield.domains_add.php @@ -16,11 +16,11 @@ */ return array( 'domain_add' => array( - 'title' => $lng['admin']['domain_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['domain_add'], 'image' => 'icons/domain_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['domains']['domainsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['domainsettings'], 'image' => 'icons/domain_add.png', 'fields' => array( 'domain' => array( @@ -29,36 +29,36 @@ return array( 'mandatory' => true ), 'customerid' => array( - 'label' => $lng['admin']['customer'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customer'], 'type' => 'select', 'select_var' => $customers, 'mandatory' => true ), 'adminid' => array( 'visible' => (\Froxlor\User::getAll()['customers_see_all'] == '1' ? true : false), - 'label' => $lng['admin']['admin'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['admin'], 'type' => 'select', 'select_var' => $admins, 'mandatory' => true ), 'alias' => array( - 'label' => $lng['domains']['aliasdomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'], 'type' => 'select', 'select_var' => $domains ), 'issubof' => array( - 'label' => $lng['domains']['issubof'], - 'desc' => $lng['domains']['issubofinfo'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['issubof'], + 'desc' => \Froxlor\I18N\Lang::getAll()['domains']['issubofinfo'], 'type' => 'select', 'select_var' => $subtodomains ), 'caneditdomain' => array( - 'label' => $lng['admin']['domain_editable']['title'], - 'desc' => $lng['admin']['domain_editable']['desc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['desc'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -67,38 +67,38 @@ return array( ) ), 'add_date' => array( - 'label' => $lng['domains']['add_date'], - 'desc' => $lng['panel']['dateformat'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['add_date'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'], 'type' => 'label', 'value' => $add_date ), 'registration_date' => array( - 'label' => $lng['domains']['registration_date'], - 'desc' => $lng['panel']['dateformat'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['registration_date'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'], 'type' => 'text', 'size' => 10 ), 'termination_date' => array( - 'label' => $lng['domains']['termination_date'], - 'desc' => $lng['panel']['dateformat'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['termination_date'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'], 'type' => 'text', 'size' => 10 ) ) ), 'section_b' => array( - 'title' => $lng['admin']['webserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings'], 'image' => 'icons/domain_add.png', 'fields' => array( 'documentroot' => array( 'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false), 'label' => 'DocumentRoot', - 'desc' => $lng['panel']['emptyfordefault'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['emptyfordefault'], 'type' => 'text' ), 'ipandport' => array( - 'label' => $lng['domains']['ipandport_multi']['title'], - 'desc' => $lng['domains']['ipandport_multi']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_multi']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['selectserveralias'], - 'desc' => $lng['admin']['selectserveralias_desc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'], 'type' => 'select', 'select_var' => $serveraliasoptions ), 'speciallogfile' => array( - 'label' => $lng['admin']['speciallogfile']['title'], - 'desc' => $lng['admin']['speciallogfile']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['ownvhostsettings'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['notryfiles']['title'], - 'desc' => $lng['admin']['notryfiles']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'writeaccesslog' => array( - 'label' => $lng['admin']['writeaccesslog']['title'], - 'desc' => $lng['admin']['writeaccesslog']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -160,12 +160,12 @@ return array( ) ), 'writeerrorlog' => array( - 'label' => $lng['admin']['writeerrorlog']['title'], - 'desc' => $lng['admin']['writeerrorlog']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -176,13 +176,13 @@ return array( ) ), 'section_bssl' => array( - 'title' => $lng['admin']['webserversettings_ssl'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'], 'image' => 'icons/domain_add.png', 'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? true : false, 'fields' => array( 'ssl_ipandport' => array( - 'label' => $lng['domains']['ipandport_ssl_multi']['title'], - 'desc' => $lng['domains']['ipandport_ssl_multi']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_ssl_multi']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['domains']['ssl_redirect']['title'], - 'desc' => $lng['domains']['ssl_redirect']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['letsencrypt']['title'], - 'desc' => $lng['admin']['letsencrypt']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['domain_http2']['title'], - 'desc' => $lng['admin']['domain_http2']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -231,12 +231,12 @@ return array( 'visible' => ($ssl_ipsandports == '' ? true : false), 'label' => 'SSL', 'type' => 'label', - 'value' => $lng['panel']['nosslipsavailable'] + 'value' => \Froxlor\I18N\Lang::getAll()['panel']['nosslipsavailable'] ), 'hsts_maxage' => array( 'visible' => ($ssl_ipsandports != '' ? true : false), - 'label' => $lng['admin']['domain_hsts_maxage']['title'], - 'desc' => $lng['admin']['domain_hsts_maxage']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['domain_hsts_incsub']['title'], - 'desc' => $lng['admin']['domain_hsts_incsub']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -257,12 +257,12 @@ return array( ), 'hsts_preload' => array( 'visible' => ($ssl_ipsandports != '' ? true : false), - 'label' => $lng['admin']['domain_hsts_preload']['title'], - 'desc' => $lng['admin']['domain_hsts_preload']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $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'] : ""), + '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'] : ""), 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -284,7 +284,7 @@ return array( ) ), 'section_c' => array( - 'title' => $lng['admin']['phpserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['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' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -302,11 +302,11 @@ return array( ) ), 'phpenabled' => array( - 'label' => $lng['admin']['phpenabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'], 'type' => 'select', 'select_var' => $phpconfigs ), 'mod_fcgid_starter' => array( 'visible' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_starter']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_starter']['title'], 'type' => 'text' ), 'mod_fcgid_maxrequests' => array( 'visible' => ((int) \Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'], 'type' => 'text' ) ) ), 'section_d' => array( - 'title' => $lng['admin']['nameserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['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' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -352,21 +352,21 @@ return array( ), 'zonefile' => array( 'label' => 'Zonefile', - 'desc' => $lng['admin']['bindzonewarning'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['bindzonewarning'], 'type' => 'text' ) ) ), 'section_e' => array( - 'title' => $lng['admin']['mailserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['mailserversettings'], 'image' => 'icons/domain_add.png', 'fields' => array( 'isemaildomain' => array( - 'label' => $lng['admin']['emaildomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['emaildomain'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -375,18 +375,18 @@ return array( ) ), 'email_only' => array( - 'label' => $lng['admin']['email_only'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['email_only'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'subcanemaildomain' => array( - 'label' => $lng['admin']['subdomainforemail'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['subdomainforemail'], 'type' => 'select', 'select_var' => $subcanemaildomain ), @@ -396,7 +396,7 @@ return array( 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php index c33db1b7..4224057a 100644 --- a/lib/formfields/admin/domains/formfield.domains_edit.php +++ b/lib/formfields/admin/domains/formfield.domains_edit.php @@ -16,11 +16,11 @@ */ return array( 'domain_edit' => array( - 'title' => $lng['admin']['domain_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['domain_edit'], 'image' => 'icons/domain_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['domains']['domainsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['domainsettings'], 'image' => 'icons/domain_edit.png', 'fields' => array( 'domain' => array( @@ -30,7 +30,7 @@ return array( 'mandatory' => true ), 'customerid' => array( - 'label' => $lng['admin']['customer'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['admin'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['domains']['aliasdomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'], 'type' => 'select', 'select_var' => $domains ), 'issubof' => array( - 'label' => $lng['domains']['issubof'], - 'desc' => $lng['domains']['issubofinfo'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['issubof'], + 'desc' => \Froxlor\I18N\Lang::getAll()['domains']['issubofinfo'], 'type' => 'select', 'select_var' => $subtodomains ), 'associated_info' => array( - 'label' => $lng['domains']['associated_with_domain'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['associated_with_domain'], 'type' => 'label', - 'value' => $subdomains . ' ' . $lng['customer']['subdomains'] . ', ' . $alias_check . ' ' . $lng['domains']['aliasdomains'] . ', ' . $emails . ' ' . $lng['customer']['emails'] . ', ' . $email_accounts . ' ' . $lng['customer']['accounts'] . ', ' . $email_forwarders . ' ' . $lng['customer']['forwarders'] + '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'] ), 'caneditdomain' => array( - 'label' => $lng['admin']['domain_editable']['title'], - 'desc' => $lng['admin']['domain_editable']['desc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_editable']['desc'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -76,21 +76,21 @@ return array( ) ), 'add_date' => array( - 'label' => $lng['domains']['add_date'], - 'desc' => $lng['panel']['dateformat'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['add_date'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'], 'type' => 'label', 'value' => $result['add_date'] ), 'registration_date' => array( - 'label' => $lng['domains']['registration_date'], - 'desc' => $lng['panel']['dateformat'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['registration_date'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'], 'type' => 'text', 'value' => $result['registration_date'], 'size' => 10 ), 'termination_date' => array( - 'label' => $lng['domains']['termination_date'], - 'desc' => $lng['panel']['dateformat'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['termination_date'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['dateformat'], 'type' => 'text', 'value' => $result['termination_date'], 'size' => 10 @@ -98,19 +98,19 @@ return array( ) ), 'section_b' => array( - 'title' => $lng['admin']['webserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings'], 'image' => 'icons/domain_edit.png', 'fields' => array( 'documentroot' => array( 'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false), 'label' => 'DocumentRoot', - 'desc' => $lng['panel']['emptyfordefault'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['emptyfordefault'], 'type' => 'text', 'value' => $result['documentroot'] ), 'ipandport' => array( - 'label' => $lng['domains']['ipandport_multi']['title'], - 'desc' => $lng['domains']['ipandport_multi']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_multi']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_multi']['description'], 'type' => 'checkbox', 'values' => $ipsandports, 'value' => $usedips, @@ -118,18 +118,18 @@ return array( 'mandatory' => true ), 'selectserveralias' => array( - 'label' => $lng['admin']['selectserveralias'], - 'desc' => $lng['admin']['selectserveralias_desc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'], 'type' => 'select', 'select_var' => $serveraliasoptions ), 'speciallogfile' => array( - 'label' => $lng['admin']['speciallogfile']['title'], - 'desc' => $lng['admin']['speciallogfile']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['speciallogfile']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['ownvhostsettings'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['specialsettingsforsubdomains'], - 'desc' => $lng['serversettings']['specialsettingsforsubdomains']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['specialsettingsforsubdomains'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['specialsettingsforsubdomains']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['notryfiles']['title'], - 'desc' => $lng['admin']['notryfiles']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['notryfiles']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -178,12 +178,12 @@ return array( ) ), 'writeaccesslog' => array( - 'label' => $lng['admin']['writeaccesslog']['title'], - 'desc' => $lng['admin']['writeaccesslog']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeaccesslog']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -192,12 +192,12 @@ return array( ) ), 'writeerrorlog' => array( - 'label' => $lng['admin']['writeerrorlog']['title'], - 'desc' => $lng['admin']['writeerrorlog']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['writeerrorlog']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -208,13 +208,13 @@ return array( ) ), 'section_bssl' => array( - 'title' => $lng['admin']['webserversettings_ssl'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['webserversettings_ssl'], 'image' => 'icons/domain_edit.png', 'visible' => \Froxlor\Settings::Get('system.use_ssl') == '1' ? true : false, 'fields' => array( 'ssl_ipandport' => array( - 'label' => $lng['domains']['ipandport_ssl_multi']['title'], - 'desc' => $lng['domains']['ipandport_ssl_multi']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['ipandport_ssl_multi']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['domains']['ssl_redirect']['title'], - 'desc' => $lng['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? $lng['domains']['ssl_redirect_temporarilydisabled'] : ''), + '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'] : ''), 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['letsencrypt']['title'], - 'desc' => $lng['admin']['letsencrypt']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['letsencrypt']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['domain_http2']['title'], - 'desc' => $lng['admin']['domain_http2']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_http2']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -269,12 +269,12 @@ return array( 'visible' => ($ssl_ipsandports == '' ? true : false), 'label' => 'SSL', 'type' => 'label', - 'value' => $lng['panel']['nosslipsavailable'] + 'value' => \Froxlor\I18N\Lang::getAll()['panel']['nosslipsavailable'] ), 'hsts_maxage' => array( 'visible' => ($ssl_ipsandports != '' ? true : false), - 'label' => $lng['admin']['domain_hsts_maxage']['title'], - 'desc' => $lng['admin']['domain_hsts_maxage']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['domain_hsts_incsub']['title'], - 'desc' => $lng['admin']['domain_hsts_incsub']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -297,12 +297,12 @@ return array( ), 'hsts_preload' => array( 'visible' => ($ssl_ipsandports != '' ? true : false), - 'label' => $lng['admin']['domain_hsts_preload']['title'], - 'desc' => $lng['admin']['domain_hsts_preload']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $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'] : ""), + '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'] : ""), 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -328,7 +328,7 @@ return array( ) ), 'section_c' => array( - 'title' => $lng['admin']['phpserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['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' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -346,11 +346,11 @@ return array( ) ), 'phpenabled' => array( - 'label' => $lng['admin']['phpenabled'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpenabled'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'], 'type' => 'select', 'select_var' => $phpconfigs ), 'phpsettingsforsubdomains' => array( 'visible' => (\Froxlor\User::getAll()['change_serversettings'] == '1' ? true : false), - 'label' => $lng['admin']['phpsettingsforsubdomains'], - 'desc' => $lng['serversettings']['phpsettingsforsubdomains']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettingsforsubdomains'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpsettingsforsubdomains']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['mod_fcgid_starter']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'], 'type' => 'text', 'value' => ((int) $result['mod_fcgid_maxrequests'] != - 1 ? $result['mod_fcgid_maxrequests'] : '') ) ) ), 'section_d' => array( - 'title' => $lng['admin']['nameserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['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' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -413,22 +413,22 @@ return array( ), 'zonefile' => array( 'label' => 'Zonefile', - 'desc' => $lng['admin']['bindzonewarning'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['bindzonewarning'], 'type' => 'text', 'value' => $result['zonefile'] ) ) ), 'section_e' => array( - 'title' => $lng['admin']['mailserversettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['mailserversettings'], 'image' => 'icons/domain_edit.png', 'fields' => array( 'isemaildomain' => array( - 'label' => $lng['admin']['emaildomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['emaildomain'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -437,11 +437,11 @@ return array( ) ), 'email_only' => array( - 'label' => $lng['admin']['email_only'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['email_only'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -450,7 +450,7 @@ return array( ) ), 'subcanemaildomain' => array( - 'label' => $lng['admin']['subdomainforemail'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['subdomainforemail'], 'type' => 'select', 'select_var' => $subcanemaildomain ), @@ -460,7 +460,7 @@ return array( 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/admin/domains/formfield.domains_import.php b/lib/formfields/admin/domains/formfield.domains_import.php index 060b8111..0430ee20 100644 --- a/lib/formfields/admin/domains/formfield.domains_import.php +++ b/lib/formfields/admin/domains/formfield.domains_import.php @@ -16,35 +16,35 @@ */ return array( 'domain_import' => array( - 'title' => $lng['domains']['domain_import'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['domain_import'], 'image' => 'icons/domain_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['domains']['domain_import'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['domain_import'], 'image' => 'icons/domain_add.png', 'fields' => array( 'customerid' => array( - 'label' => $lng['admin']['customer'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['customer'], 'type' => 'select', 'select_var' => $customers, 'mandatory' => true ), 'separator' => array( - 'label' => $lng['domains']['import_separator'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['import_separator'], 'type' => 'text', 'mandatory' => true, 'size' => 5, 'value' => ';' ), 'offset' => array( - 'label' => $lng['domains']['import_offset'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['import_offset'], 'type' => 'text', 'mandatory' => true, 'size' => 10, 'value' => '0' ), 'file' => array( - 'label' => $lng['domains']['import_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['import_file'], 'type' => 'file', 'mandatory' => true ) diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php index 9a1348f0..b012f59d 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php @@ -16,35 +16,35 @@ */ return array( 'ipsandports_add' => array( - 'title' => $lng['admin']['ipsandports']['add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['add'], 'image' => 'icons/ipsports_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['ipsandports']['ipandport'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ipandport'], 'image' => 'icons/ipsports_add.png', 'fields' => array( 'ip' => array( - 'label' => $lng['admin']['ipsandports']['ip'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip'], 'type' => 'text' ), 'port' => array( - 'label' => $lng['admin']['ipsandports']['port'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['port'], 'type' => 'text', 'size' => 5 ) ) ), 'section_b' => array( - 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdefaultconfig'], 'image' => 'icons/ipsports_add.png', 'fields' => array( 'listen_statement' => array( 'visible' => ! $is_nginx, - 'label' => $lng['admin']['ipsandports']['create_listen_statement'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_listen_statement'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -54,11 +54,11 @@ return array( ), 'namevirtualhost_statement' => array( 'visible' => $is_apache && ! $is_apache24, - 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_namevirtualhost_statement'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -67,11 +67,11 @@ return array( ) ), 'vhostcontainer' => array( - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -80,25 +80,25 @@ return array( ) ), 'docroot' => array( - 'label' => $lng['admin']['ipsandports']['docroot']['title'], - 'desc' => $lng['admin']['ipsandports']['docroot']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['description'], 'type' => 'text' ), 'specialsettings' => array( 'style' => 'align-top', - 'label' => $lng['admin']['ownvhostsettings'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12 ), 'vhostcontainer_servername_statement' => array( 'visible' => $is_apache, - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer_servername_statement'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -109,13 +109,13 @@ return array( ) ), 'section_c' => array( - 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdomainconfig'], 'image' => 'icons/ipsports_add.png', 'fields' => array( 'default_vhostconf_domain' => array( 'style' => 'align-top', - 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], - 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['default_vhostconf_domain'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf_domain']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12 @@ -123,36 +123,36 @@ return array( ) ), 'section_d' => array( - 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverssldomainconfig'], 'image' => 'icons/ipsports_add.png', 'visible' => (\Froxlor\Settings::Get('system.use_ssl') == 1 ? true : false), 'fields' => array( 'ssl' => array( - 'label' => $lng['admin']['ipsandports']['enable_ssl'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['enable_ssl'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'ssl_cert_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_file'], 'type' => 'text' ), 'ssl_key_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_key_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_key_file'], 'type' => 'text' ), 'ssl_ca_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file'], 'type' => 'text' ), 'ssl_cert_chainfile' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], - 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['description'], 'type' => 'text' ) ) diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php index efa5161b..6fa845f1 100644 --- a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php +++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php @@ -16,20 +16,20 @@ */ return array( 'ipsandports_edit' => array( - 'title' => $lng['admin']['ipsandports']['edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['edit'], 'image' => 'icons/ipsports_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['ipsandports']['ipandport'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ipandport'], 'image' => 'icons/ipsports_add.png', 'fields' => array( 'ip' => array( - 'label' => $lng['admin']['ipsandports']['ip'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip'], 'type' => 'text', 'value' => $result['ip'] ), 'port' => array( - 'label' => $lng['admin']['ipsandports']['port'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['port'], 'type' => 'text', 'value' => $result['port'], 'size' => 5 @@ -37,16 +37,16 @@ return array( ) ), 'section_b' => array( - 'title' => $lng['admin']['ipsandports']['webserverdefaultconfig'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdefaultconfig'], 'image' => 'icons/ipsports_edit.png', 'fields' => array( 'listen_statement' => array( 'visible' => ! $is_nginx, - 'label' => $lng['admin']['ipsandports']['create_listen_statement'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_listen_statement'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -56,11 +56,11 @@ return array( ), 'namevirtualhost_statement' => array( 'visible' => $is_apache && ! $is_apache24, - 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_namevirtualhost_statement'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -69,11 +69,11 @@ return array( ) ), 'vhostcontainer' => array( - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -82,15 +82,15 @@ return array( ) ), 'docroot' => array( - 'label' => $lng['admin']['ipsandports']['docroot']['title'], - 'desc' => $lng['admin']['ipsandports']['docroot']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['docroot']['description'], 'type' => 'text', 'value' => $result['docroot'] ), 'specialsettings' => array( 'style' => 'align-top', - 'label' => $lng['admin']['ownvhostsettings'], - 'desc' => $lng['serversettings']['default_vhostconf']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ownvhostsettings'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, @@ -98,11 +98,11 @@ return array( ), 'vhostcontainer_servername_statement' => array( 'visible' => $is_apache, - 'label' => $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['create_vhostcontainer_servername_statement'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -113,13 +113,13 @@ return array( ) ), 'section_c' => array( - 'title' => $lng['admin']['ipsandports']['webserverdomainconfig'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverdomainconfig'], 'image' => 'icons/ipsports_edit.png', 'fields' => array( 'default_vhostconf_domain' => array( 'style' => 'align-top', - 'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'], - 'desc' => $lng['serversettings']['default_vhostconf_domain']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['default_vhostconf_domain'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['default_vhostconf_domain']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, @@ -128,16 +128,16 @@ return array( ) ), 'section_d' => array( - 'title' => $lng['admin']['ipsandports']['webserverssldomainconfig'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['webserverssldomainconfig'], 'image' => 'icons/ipsports_edit.png', 'visible' => (\Froxlor\Settings::Get('system.use_ssl') == 1 ? true : false), 'fields' => array( 'ssl' => array( - 'label' => $lng['admin']['ipsandports']['enable_ssl'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['enable_ssl'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -146,23 +146,23 @@ return array( ) ), 'ssl_cert_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_file'], 'type' => 'text', 'value' => $result['ssl_cert_file'] ), 'ssl_key_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_key_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_key_file'], 'type' => 'text', 'value' => $result['ssl_key_file'] ), 'ssl_ca_file' => array( - 'label' => $lng['admin']['ipsandports']['ssl_ca_file'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_ca_file'], 'type' => 'text', 'value' => $result['ssl_ca_file'] ), 'ssl_cert_chainfile' => array( - 'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['title'], - 'desc' => $lng['admin']['ipsandports']['ssl_cert_chainfile']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_chainfile']['description'], 'type' => 'text', 'value' => $result['ssl_cert_chainfile'] ) diff --git a/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php b/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php index b2074877..18387f9e 100644 --- a/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php +++ b/lib/formfields/admin/phpconfig/formfield.fpmconfig_add.php @@ -16,74 +16,74 @@ */ return array( 'fpmconfig_add' => array( - 'title' => $lng['admin']['phpsettings']['addsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'], 'image' => 'icons/phpsettings_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['phpsettings']['addsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'], 'image' => 'icons/phpsettings_add.png', 'fields' => array( 'description' => array( - 'label' => $lng['admin']['phpsettings']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'], 'type' => 'text', 'maxlength' => 50 ), 'reload_cmd' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['reload'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['reload'], 'type' => 'text', 'maxlength' => 255, 'value' => 'service php7.0-fpm restart' ), 'config_dir' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['configdir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['configdir'], 'type' => 'text', 'maxlength' => 255, 'value' => '/etc/php/7.0/fpm/pool.d/' ), 'pm' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['pm'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'], 'type' => 'select', 'select_var' => $pm_select ), 'max_children' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['description'], 'type' => 'int', 'value' => 1 ), 'start_servers' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['description'], 'type' => 'int', 'value' => 20 ), 'min_spare_servers' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['description'], 'type' => 'int', 'value' => 5 ), 'max_spare_servers' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['description'], 'type' => 'int', 'value' => 35 ), 'max_requests' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['description'], 'type' => 'int', 'value' => 0 ), 'idle_timeout' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['description'], 'type' => 'int', 'value' => 30 ), 'limit_extensions' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['description'], 'type' => 'text', 'value' => '.php' ) diff --git a/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php b/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php index 01209b21..aa7ed0bf 100644 --- a/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php +++ b/lib/formfields/admin/phpconfig/formfield.fpmconfig_edit.php @@ -16,75 +16,75 @@ */ return array( 'fpmconfig_edit' => array( - 'title' => $lng['admin']['phpsettings']['editsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'], 'image' => 'icons/phpsettings_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['phpsettings']['editsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'], 'image' => 'icons/phpsettings_edit.png', 'fields' => array( 'description' => array( - 'label' => $lng['admin']['phpsettings']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'], 'type' => 'text', 'maxlength' => 50, 'value' => $result['description'] ), 'reload_cmd' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['reload'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['reload'], 'type' => 'text', 'maxlength' => 255, 'value' => $result['reload_cmd'] ), 'config_dir' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['configdir'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['configdir'], 'type' => 'text', 'maxlength' => 255, 'value' => $result['config_dir'] ), 'pm' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['pm'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'], 'type' => 'select', 'select_var' => $pm_select ), 'max_children' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['max_children']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_children']['description'], 'type' => 'int', 'value' => $result['max_children'] ), 'start_servers' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['start_servers']['description'], 'type' => 'int', 'value' => $result['start_servers'] ), 'min_spare_servers' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['min_spare_servers']['description'], 'type' => 'int', 'value' => $result['min_spare_servers'] ), 'max_spare_servers' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_spare_servers']['description'], 'type' => 'int', 'value' => $result['max_spare_servers'] ), 'max_requests' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['max_requests']['description'], 'type' => 'int', 'value' => $result['max_requests'] ), 'idle_timeout' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['idle_timeout']['description'], 'type' => 'int', 'value' => $result['idle_timeout'] ), 'limit_extensions' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['limit_extensions']['description'], 'type' => 'text', 'value' => $result['limit_extensions'] ) diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php index 4c032912..53b5b724 100644 --- a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php @@ -16,63 +16,63 @@ */ return array( 'phpconfig_add' => array( - 'title' => $lng['admin']['phpsettings']['addsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'], 'image' => 'icons/phpsettings_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['phpsettings']['addsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addsettings'], 'image' => 'icons/phpsettings_add.png', 'fields' => array( 'description' => array( - 'label' => $lng['admin']['phpsettings']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'], 'type' => 'text', 'maxlength' => 50 ), 'binary' => array( 'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['binary'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['binary'], 'type' => 'text', 'maxlength' => 255, 'value' => '/usr/bin/php-cgi' ), 'fpmconfig' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['fpmdesc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['fpmdesc'], 'type' => 'select', 'select_var' => $fpmconfigs ), 'file_extensions' => array( 'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['file_extensions'], - 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['mod_fcgid_starter']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_starter']['title'], 'type' => 'text' ), 'mod_fcgid_maxrequests' => array( 'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['mod_fcgid_maxrequests']['title'], 'type' => 'text' ), 'mod_fcgid_umask' => array( 'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['mod_fcgid_umask']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['enable_slowlog'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['enable_slowlog'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -80,25 +80,25 @@ return array( ), 'phpfpm_reqtermtimeout' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['request_terminate_timeout'], 'type' => 'text', 'maxlength' => 10, 'value' => '60s' ), 'phpfpm_reqslowtimeout' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['request_slowlog_timeout'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['pass_authorizationheader'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['pass_authorizationheader'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -106,11 +106,11 @@ return array( ), 'override_fpmconfig' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -118,63 +118,63 @@ return array( ), 'pm' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['pm'], - 'desc' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['serversettings']['phpfpm_settings']['max_children']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => 1 ), 'start_servers' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => 20 ), 'min_spare_servers' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - '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'], + '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'], 'type' => 'int', 'value' => 5 ), 'max_spare_servers' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - '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'], + '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'], 'type' => 'int', 'value' => 35 ), 'max_requests' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => 0 ), 'idle_timeout' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => 30 ), 'limit_extensions' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'text', 'value' => '.php' ), 'phpsettings' => array( 'style' => 'align-top', - 'label' => $lng['admin']['phpsettings']['phpinisettings'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['phpinisettings'], 'type' => 'textarea', 'cols' => 80, 'rows' => 20, diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php index ef6acff5..200adeaa 100644 --- a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php +++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php @@ -16,66 +16,66 @@ */ return array( 'phpconfig_edit' => array( - 'title' => $lng['admin']['phpsettings']['editsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'], 'image' => 'icons/phpsettings_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['phpsettings']['editsettings'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['editsettings'], 'image' => 'icons/phpsettings_edit.png', 'fields' => array( 'description' => array( - 'label' => $lng['admin']['phpsettings']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description'], 'type' => 'text', 'maxlength' => 50, 'value' => $result['description'] ), 'binary' => array( 'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['binary'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['binary'], 'type' => 'text', 'maxlength' => 255, 'value' => $result['binary'] ), 'fpmconfig' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['fpmdesc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['fpmdesc'], 'type' => 'select', 'select_var' => $fpmconfigs ), 'file_extensions' => array( 'visible' => (\Froxlor\Settings::Get('system.mod_fcgid') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['file_extensions'], - 'desc' => $lng['admin']['phpsettings']['file_extensions_note'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['mod_fcgid_starter']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['mod_fcgid_maxrequests']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['mod_fcgid_umask']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['enable_slowlog'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['enable_slowlog'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -85,25 +85,25 @@ return array( ), 'phpfpm_reqtermtimeout' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['admin']['phpsettings']['request_terminate_timeout'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['request_slowlog_timeout'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['pass_authorizationheader'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['pass_authorizationheader'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -112,11 +112,11 @@ return array( ) ), 'override_fpmconfig' => array( - 'label' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['override_fpmconfig'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -126,63 +126,63 @@ return array( ), 'pm' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['pm'], - 'desc' => $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + 'label' => \Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['serversettings']['phpfpm_settings']['max_children']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_children']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => $result['max_children'] ), 'start_servers' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['start_servers']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['start_servers']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => $result['start_servers'] ), 'min_spare_servers' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - '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'], + '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'], 'type' => 'int', 'value' => $result['min_spare_servers'] ), 'max_spare_servers' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - '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'], + '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'], 'type' => 'int', 'value' => $result['max_spare_servers'] ), 'max_requests' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['max_requests']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['max_requests']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => $result['max_requests'] ), 'idle_timeout' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'int', 'value' => $result['idle_timeout'] ), 'limit_extensions' => array( 'visible' => (\Froxlor\Settings::Get('phpfpm.enabled') == 1 ? true : false), - 'label' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['title'], - 'desc' => $lng['serversettings']['phpfpm_settings']['limit_extensions']['description'] . $lng['serversettings']['phpfpm_settings']['override_fpmconfig_addinfo'], + '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'], 'type' => 'text', 'value' => $result['limit_extensions'] ), 'phpsettings' => array( 'style' => 'align-top', - 'label' => $lng['admin']['phpsettings']['phpinisettings'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['phpinisettings'], 'type' => 'textarea', 'cols' => 80, 'rows' => 20, diff --git a/lib/formfields/admin/plans/formfield.plans_add.php b/lib/formfields/admin/plans/formfield.plans_add.php index 7228ba32..15572423 100644 --- a/lib/formfields/admin/plans/formfield.plans_add.php +++ b/lib/formfields/admin/plans/formfield.plans_add.php @@ -16,19 +16,19 @@ */ return array( 'plans_add' => array( - 'title' => $lng['admin']['plans']['add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['add'], 'image' => 'icons/templates_add_big.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['plans']['plan_details'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['plan_details'], 'image' => 'icons/templates_add_big.png', 'fields' => array( 'name' => array( - 'label' => $lng['admin']['plans']['name'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['name'], 'type' => 'text' ), 'description' => array( - 'label' => $lng['admin']['plans']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12 diff --git a/lib/formfields/admin/plans/formfield.plans_edit.php b/lib/formfields/admin/plans/formfield.plans_edit.php index 5efb6b2c..7a59db2c 100644 --- a/lib/formfields/admin/plans/formfield.plans_edit.php +++ b/lib/formfields/admin/plans/formfield.plans_edit.php @@ -16,20 +16,20 @@ */ return array( 'plans_edit' => array( - 'title' => $lng['admin']['plans']['edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['edit'], 'image' => 'icons/templates_edit_big.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['plans']['plan_details'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['plan_details'], 'image' => 'icons/templates_edit_big.png', 'fields' => array( 'name' => array( - 'label' => $lng['admin']['plans']['name'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['name'], 'type' => 'text', 'value' => $result['name'] ), 'description' => array( - 'label' => $lng['admin']['plans']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['plans']['description'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, diff --git a/lib/formfields/admin/templates/formfield.filetemplate_add.php b/lib/formfields/admin/templates/formfield.filetemplate_add.php index ace5c880..37cb9ec8 100644 --- a/lib/formfields/admin/templates/formfield.filetemplate_add.php +++ b/lib/formfields/admin/templates/formfield.filetemplate_add.php @@ -16,20 +16,20 @@ */ return array( 'filetemplate_add' => array( - 'title' => $lng['admin']['templates']['template_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'], 'image' => 'icons/templates_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['templates']['template_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'], 'image' => 'icons/templates_add.png', 'fields' => array( 'template' => array( - 'label' => $lng['admin']['templates']['action'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'], 'type' => 'select', 'select_var' => $free_templates ), 'filecontent' => array( - 'label' => $lng['admin']['templates']['filecontent'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['filecontent'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12 diff --git a/lib/formfields/admin/templates/formfield.filetemplate_edit.php b/lib/formfields/admin/templates/formfield.filetemplate_edit.php index 91d6885b..744de7f0 100644 --- a/lib/formfields/admin/templates/formfield.filetemplate_edit.php +++ b/lib/formfields/admin/templates/formfield.filetemplate_edit.php @@ -16,21 +16,21 @@ */ return array( 'filetemplate_edit' => array( - 'title' => $lng['admin']['templates']['template_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'], 'image' => 'icons/templates_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['templates']['template_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'], 'image' => 'icons/templates_edit.png', 'fields' => array( 'template' => array( - 'label' => $lng['admin']['templates']['action'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'], 'type' => 'hidden', - 'value' => $lng['admin']['templates'][$row['varname']], - 'display' => $lng['admin']['templates'][$row['varname']] + 'value' => \Froxlor\I18N\Lang::getAll()['admin']['templates'][$row['varname']], + 'display' => \Froxlor\I18N\Lang::getAll()['admin']['templates'][$row['varname']] ), 'filecontent' => array( - 'label' => $lng['admin']['templates']['filecontent'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['filecontent'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, diff --git a/lib/formfields/admin/templates/formfield.template_add.php b/lib/formfields/admin/templates/formfield.template_add.php index ce9c277f..b74fc62f 100644 --- a/lib/formfields/admin/templates/formfield.template_add.php +++ b/lib/formfields/admin/templates/formfield.template_add.php @@ -16,32 +16,32 @@ */ return array( 'template_add' => array( - 'title' => $lng['admin']['templates']['template_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'], 'image' => 'icons/templates_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['templates']['template_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add'], 'image' => 'icons/templates_add.png', 'fields' => array( 'language' => array( - 'label' => $lng['login']['language'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['language'], 'type' => 'hidden', 'value' => $language, 'display' => $language ), 'template' => array( - 'label' => $lng['admin']['templates']['action'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'], 'type' => 'hidden', 'value' => $template, - 'display' => $lng['admin']['templates'][$template] + 'display' => \Froxlor\I18N\Lang::getAll()['admin']['templates'][$template] ), 'subject' => array( - 'label' => $lng['admin']['templates']['subject'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['subject'], 'type' => 'text', 'value' => $subject ), 'mailbody' => array( - 'label' => $lng['admin']['templates']['mailbody'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['mailbody'], 'type' => 'textarea', 'value' => $body, 'cols' => 60, diff --git a/lib/formfields/admin/templates/formfield.template_edit.php b/lib/formfields/admin/templates/formfield.template_edit.php index d6b1c70a..986c5ce4 100644 --- a/lib/formfields/admin/templates/formfield.template_edit.php +++ b/lib/formfields/admin/templates/formfield.template_edit.php @@ -16,32 +16,32 @@ */ return array( 'template_edit' => array( - 'title' => $lng['admin']['templates']['template_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'], 'image' => 'icons/templates_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['admin']['templates']['template_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['template_edit'], 'image' => 'icons/templates_edit.png', 'fields' => array( 'language' => array( - 'label' => $lng['login']['language'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['language'], 'type' => 'hidden', 'value' => $language, 'display' => $language ), 'template' => array( - 'label' => $lng['admin']['templates']['action'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['action'], 'type' => 'hidden', 'value' => $template, 'display' => $template ), 'subject' => array( - 'label' => $lng['admin']['templates']['subject'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['subject'], 'type' => 'text', 'value' => $subject ), 'mailbody' => array( - 'label' => $lng['admin']['templates']['mailbody'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['templates']['mailbody'], 'type' => 'textarea', 'cols' => 60, 'rows' => 12, diff --git a/lib/formfields/customer/domains/formfield.domain_ssleditor.php b/lib/formfields/customer/domains/formfield.domain_ssleditor.php index e6a14faa..097f38f8 100644 --- a/lib/formfields/customer/domains/formfield.domain_ssleditor.php +++ b/lib/formfields/customer/domains/formfield.domain_ssleditor.php @@ -16,7 +16,7 @@ */ return array( 'domain_ssleditor' => array( - 'title' => $lng['panel']['ssleditor'], + 'title' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['ipsandports']['ssl_cert_file_content'], - 'desc' => $lng['admin']['ipsandports']['ssl_paste_description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_cert_file_content'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['ipsandports']['ssl_key_file_content'], - 'desc' => $lng['admin']['ipsandports']['ssl_paste_description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ssl_key_file_content'], + 'desc' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['ipsandports']['ssl_cert_chainfile_content'], - 'desc' => $lng['admin']['ipsandports']['ssl_paste_description'] . $lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'], + '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'], 'type' => 'textarea', 'cols' => 100, 'rows' => 15, @@ -52,8 +52,8 @@ return array( ), 'ssl_ca_file' => array( 'style' => 'align-top', - 'label' => $lng['admin']['ipsandports']['ssl_ca_file_content'], - 'desc' => $lng['admin']['ipsandports']['ssl_paste_description'] . $lng['admin']['ipsandports']['ssl_ca_file_content_desc'], + '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'], 'type' => 'textarea', 'cols' => 100, 'rows' => 15, diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php index 00d9fca6..e59c29a9 100644 --- a/lib/formfields/customer/domains/formfield.domains_add.php +++ b/lib/formfields/customer/domains/formfield.domains_add.php @@ -16,15 +16,15 @@ */ return array( 'domain_add' => array( - 'title' => $lng['domains']['subdomain_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_add'], 'image' => 'icons/domain_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['domains']['subdomain_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_add'], 'image' => 'icons/domain_add.png', 'fields' => array( 'subdomain' => array( - 'label' => $lng['domains']['domainname'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'], 'type' => 'textul', 'ul_field' => '', 'has_nextto' => true @@ -36,60 +36,60 @@ return array( 'select_var' => $domains ), 'alias' => array( - 'label' => $lng['domains']['aliasdomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'], 'type' => 'select', 'select_var' => $aliasdomains ), 'path' => array( - 'label' => $lng['panel']['path'], - 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? $pathSelect['note'] . '
    ' . $pathSelect['value'] : ''), + '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'] . '
    ' . $pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] ), 'url' => array( 'visible' => (\Froxlor\Settings::Get('panel.pathedit') == 'Dropdown' ? true : false), - 'label' => $lng['panel']['urloverridespath'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['urloverridespath'], 'type' => 'text' ), 'redirectcode' => array( 'visible' => (\Froxlor\Settings::Get('customredirect.enabled') == '1' ? true : false), - 'label' => $lng['domains']['redirectifpathisurl'], - 'desc' => $lng['domains']['redirectifpathisurlinfo'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurl'], + 'desc' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurlinfo'], 'type' => 'select', 'select_var' => isset($redirectcode) ? $redirectcode : null ), 'selectserveralias' => array( - 'label' => $lng['admin']['selectserveralias'], - 'desc' => $lng['admin']['selectserveralias_desc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'], 'type' => 'label', - 'value' => $lng['customer']['selectserveralias_addinfo'] + 'value' => \Froxlor\I18N\Lang::getAll()['customer']['selectserveralias_addinfo'] ), 'openbasedir_path' => array( - 'label' => $lng['domain']['openbasedirpath'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'], 'type' => 'select', 'select_var' => $phpconfigs ) ) ), 'section_bssl' => array( - 'title' => $lng['admin']['webserversettings_ssl'], + 'title' => \Froxlor\I18N\Lang::getAll()['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' => $lng['domains']['ssl_redirect']['title'], - 'desc' => $lng['domains']['ssl_redirect']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['domains']['ssl_redirect']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -97,44 +97,44 @@ return array( ), 'letsencrypt' => array( 'visible' => (\Froxlor\Settings::Get('system.leenabled') == '1' ? true : false), - 'label' => $lng['customer']['letsencrypt']['title'], - 'desc' => $lng['customer']['letsencrypt']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'hsts_maxage' => array( - 'label' => $lng['admin']['domain_hsts_maxage']['title'], - 'desc' => $lng['admin']['domain_hsts_maxage']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'], 'type' => 'int', 'int_min' => 0, 'int_max' => 94608000, // 3-years 'value' => 0 ), 'hsts_sub' => array( - 'label' => $lng['admin']['domain_hsts_incsub']['title'], - 'desc' => $lng['admin']['domain_hsts_incsub']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'hsts_preload' => array( - 'label' => $lng['admin']['domain_hsts_preload']['title'], - 'desc' => $lng['admin']['domain_hsts_preload']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/customer/domains/formfield.domains_edit.php b/lib/formfields/customer/domains/formfield.domains_edit.php index 523d9cc8..fadc4171 100644 --- a/lib/formfields/customer/domains/formfield.domains_edit.php +++ b/lib/formfields/customer/domains/formfield.domains_edit.php @@ -16,53 +16,53 @@ */ return array( 'domain_edit' => array( - 'title' => $lng['domains']['subdomain_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_edit'], 'image' => 'icons/domain_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['domains']['subdomain_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['domains']['subdomain_edit'], 'image' => 'icons/domain_edit.png', 'fields' => array( 'domain' => array( - 'label' => $lng['domains']['domainname'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'], 'type' => 'label', 'value' => $result['domain'] ), 'dns' => array( - 'label' => $lng['dns']['destinationip'], + 'label' => \Froxlor\I18N\Lang::getAll()['dns']['destinationip'], 'type' => 'label', 'value' => $domainip ), 'alias' => array( 'visible' => ($alias_check == '0' ? true : false), - 'label' => $lng['domains']['aliasdomain'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['aliasdomain'], 'type' => 'select', 'select_var' => $domains ), 'path' => array( - 'label' => $lng['panel']['path'], - 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), + '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['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] ), 'url' => array( 'visible' => (\Froxlor\Settings::Get('panel.pathedit') == 'Dropdown' ? true : false), - 'label' => $lng['panel']['urloverridespath'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['urloverridespath'], 'type' => 'text', 'value' => $urlvalue ), 'redirectcode' => array( 'visible' => (\Froxlor\Settings::Get('customredirect.enabled') == '1' ? true : false), - 'label' => $lng['domains']['redirectifpathisurl'], - 'desc' => $lng['domains']['redirectifpathisurlinfo'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurl'], + 'desc' => \Froxlor\I18N\Lang::getAll()['domains']['redirectifpathisurlinfo'], 'type' => 'select', 'select_var' => $redirectcode ), 'selectserveralias' => array( 'visible' => ((($result['parentdomainid'] == '0' && \Froxlor\User::getAll()['subdomains'] != '0') || $result['parentdomainid'] != '0') ? true : false), - 'label' => $lng['admin']['selectserveralias'], - 'desc' => $lng['admin']['selectserveralias_desc'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['selectserveralias_desc'], 'type' => 'select', 'select_var' => $serveraliasoptions ), @@ -72,7 +72,7 @@ return array( 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -82,30 +82,30 @@ return array( ), 'openbasedir_path' => array( 'visible' => ($result['openbasedir'] == '1') ? true : false, - 'label' => $lng['domain']['openbasedirpath'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['admin']['phpsettings']['title'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['title'], 'type' => 'select', 'select_var' => $phpconfigs ) ) ), 'section_bssl' => array( - 'title' => $lng['admin']['webserversettings_ssl'], + 'title' => \Froxlor\I18N\Lang::getAll()['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' => $lng['domains']['ssl_redirect']['title'], - 'desc' => $lng['domains']['ssl_redirect']['description'] . ($result['temporary_ssl_redirect'] > 1 ? $lng['domains']['ssl_redirect_temporarilydisabled'] : ''), + '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'] : ''), 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -115,12 +115,12 @@ return array( ), 'letsencrypt' => array( 'visible' => \Froxlor\Settings::Get('system.leenabled') == '1' ? true : false, - 'label' => $lng['customer']['letsencrypt']['title'], - 'desc' => $lng['customer']['letsencrypt']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['customer']['letsencrypt']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -129,20 +129,20 @@ return array( ) ), 'hsts_maxage' => array( - 'label' => $lng['admin']['domain_hsts_maxage']['title'], - 'desc' => $lng['admin']['domain_hsts_maxage']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_maxage']['description'], 'type' => 'int', 'int_min' => 0, 'int_max' => 94608000, // 3-years 'value' => $result['hsts'] ), 'hsts_sub' => array( - 'label' => $lng['admin']['domain_hsts_incsub']['title'], - 'desc' => $lng['admin']['domain_hsts_incsub']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_incsub']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -151,12 +151,12 @@ return array( ) ), 'hsts_preload' => array( - 'label' => $lng['admin']['domain_hsts_preload']['title'], - 'desc' => $lng['admin']['domain_hsts_preload']['description'], + 'label' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['admin']['domain_hsts_preload']['description'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php index cc242aa6..a93f5a7a 100644 --- a/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php +++ b/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php @@ -16,25 +16,25 @@ */ return array( 'emails_accountchangepasswd' => array( - 'title' => $lng['menue']['main']['changepassword'], + 'title' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword'], 'image' => 'icons/email_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['menue']['main']['changepassword'], + 'title' => \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword'], 'image' => 'icons/email_edit.png', 'fields' => array( 'email_full' => array( - 'label' => $lng['emails']['emailaddress'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'], 'type' => 'label', 'value' => $result['email_full'] ), 'email_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'autocomplete' => 'off' ), 'email_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() diff --git a/lib/formfields/customer/email/formfield.emails_accountchangequota.php b/lib/formfields/customer/email/formfield.emails_accountchangequota.php index 90821a66..07a5bfc2 100644 --- a/lib/formfields/customer/email/formfield.emails_accountchangequota.php +++ b/lib/formfields/customer/email/formfield.emails_accountchangequota.php @@ -16,20 +16,20 @@ */ return array( 'emails_accountchangequota' => array( - 'title' => $lng['emails']['quota_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['quota_edit'], 'image' => 'icons/email_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['emails']['quota_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['quota_edit'], 'image' => 'icons/email_edit.png', 'fields' => array( 'email_full' => array( - 'label' => $lng['emails']['emailaddress'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'], 'type' => 'label', 'value' => $result['email_full'] ), 'email_quota' => array( - 'label' => $lng['emails']['quota'] . ' (MiB)', + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['quota'] . ' (MiB)', 'type' => 'text', 'value' => $result['quota'] ) diff --git a/lib/formfields/customer/email/formfield.emails_add.php b/lib/formfields/customer/email/formfield.emails_add.php index 514306ef..5c6c43a5 100644 --- a/lib/formfields/customer/email/formfield.emails_add.php +++ b/lib/formfields/customer/email/formfield.emails_add.php @@ -16,15 +16,15 @@ */ return array( 'emails_add' => array( - 'title' => $lng['emails']['emails_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_add'], 'image' => 'icons/email_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['emails']['emails_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_add'], 'image' => 'icons/email_add.png', 'fields' => array( 'email_part' => array( - 'label' => $lng['emails']['emailaddress'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'], 'type' => 'textul', 'ul_field' => '', 'has_nextto' => true @@ -36,11 +36,11 @@ return array( 'select_var' => $domains ), 'iscatchall' => array( - 'label' => $lng['emails']['iscatchall'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['iscatchall'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/customer/email/formfield.emails_addaccount.php b/lib/formfields/customer/email/formfield.emails_addaccount.php index 111d0dd5..24bb98ba 100644 --- a/lib/formfields/customer/email/formfield.emails_addaccount.php +++ b/lib/formfields/customer/email/formfield.emails_addaccount.php @@ -16,39 +16,39 @@ */ return array( 'emails_addaccount' => array( - 'title' => $lng['emails']['account_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['account_add'], 'image' => 'icons/email_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['emails']['account_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['account_add'], 'image' => 'icons/email_add.png', 'fields' => array( 'email_full' => array( - 'label' => $lng['emails']['emailaddress'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'], 'type' => 'label', 'value' => $result['email_full'] ), 'email_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'autocomplete' => 'off' ), 'email_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['emails']['quota'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['quota'], 'desc' => "MiB", 'type' => 'text', 'value' => $quota ), 'alternative_email' => array( 'visible' => (\Froxlor\Settings::Get('panel.sendalternativemail') == '1' ? true : false), - 'label' => $lng['emails']['alternative_emailaddress'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['alternative_emailaddress'], 'type' => 'text' ) ) diff --git a/lib/formfields/customer/email/formfield.emails_addforwarder.php b/lib/formfields/customer/email/formfield.emails_addforwarder.php index 79cd4f4d..27b27c41 100644 --- a/lib/formfields/customer/email/formfield.emails_addforwarder.php +++ b/lib/formfields/customer/email/formfield.emails_addforwarder.php @@ -16,20 +16,20 @@ */ return array( 'emails_addforwarder' => array( - 'title' => $lng['emails']['forwarder_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['forwarder_add'], 'image' => 'icons/autoresponder_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['emails']['forwarder_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['forwarder_add'], 'image' => 'icons/autoresponder_add.png', 'fields' => array( 'email_full' => array( - 'label' => $lng['emails']['from'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['from'], 'type' => 'label', 'value' => $result['email_full'] ), 'destination' => array( - 'label' => $lng['emails']['to'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['to'], 'type' => 'text' ) ) diff --git a/lib/formfields/customer/email/formfield.emails_edit.php b/lib/formfields/customer/email/formfield.emails_edit.php index 6e687681..ac1a8b93 100644 --- a/lib/formfields/customer/email/formfield.emails_edit.php +++ b/lib/formfields/customer/email/formfield.emails_edit.php @@ -16,46 +16,46 @@ */ return array( 'emails_edit' => array( - 'title' => $lng['emails']['emails_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_edit'], 'image' => 'icons/email_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['emails']['emails_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['emails']['emails_edit'], 'image' => 'icons/email_edit.png', 'nobuttons' => true, 'fields' => array( 'email_full' => array( - 'label' => $lng['emails']['emailaddress'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['emailaddress'], 'type' => 'label', 'value' => $result['email_full'] ), 'account_yes' => array( 'visible' => ($result['popaccountid'] != 0 ? true : false), - 'label' => $lng['emails']['account'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['account'], 'type' => 'label', - 'value' => $lng['panel']['yes'] . ' [' . $lng['menue']['main']['changepassword'] . '] [' . $lng['emails']['account_delete'] . ']' + 'value' => \Froxlor\I18N\Lang::getAll()['panel']['yes'] . ' [' . \Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword'] . '] [' . \Froxlor\I18N\Lang::getAll()['emails']['account_delete'] . ']' ), 'account_no' => array( 'visible' => ($result['popaccountid'] == 0 ? true : false), - 'label' => $lng['emails']['account'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['account'], 'type' => 'label', - 'value' => $lng['panel']['no'] . ' [' . $lng['emails']['account_add'] . ']' + 'value' => \Froxlor\I18N\Lang::getAll()['panel']['no'] . ' [' . \Froxlor\I18N\Lang::getAll()['emails']['account_add'] . ']' ), 'mail_quota' => array( 'visible' => ($result['popaccountid'] != 0 && \Froxlor\Settings::Get('system.mail_quota_enabled')), - 'label' => $lng['customer']['email_quota'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['email_quota'], 'type' => 'label', - 'value' => $result['quota'] . ' MiB [' . $lng['emails']['quota_edit'] . ']' + 'value' => $result['quota'] . ' MiB [' . \Froxlor\I18N\Lang::getAll()['emails']['quota_edit'] . ']' ), 'mail_catchall' => array( - 'label' => $lng['emails']['catchall'], + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['catchall'], 'type' => 'label', - 'value' => ($result['iscatchall'] == 0 ? $lng['panel']['no'] : $lng['panel']['yes']) . ' [' . $lng['panel']['toggle'] . ']' + 'value' => ($result['iscatchall'] == 0 ? \Froxlor\I18N\Lang::getAll()['panel']['no'] : \Froxlor\I18N\Lang::getAll()['panel']['yes']) . ' [' . \Froxlor\I18N\Lang::getAll()['panel']['toggle'] . ']' ), 'mail_fwds' => array( - 'label' => $lng['emails']['forwarders'] . ' (' . $forwarders_count . ')', + 'label' => \Froxlor\I18N\Lang::getAll()['emails']['forwarders'] . ' (' . $forwarders_count . ')', 'type' => 'label', - 'value' => $forwarders . ' ' . $lng['emails']['forwarder_add'] . '' + 'value' => $forwarders . ' ' . \Froxlor\I18N\Lang::getAll()['emails']['forwarder_add'] . '' ) ) ) diff --git a/lib/formfields/customer/extras/formfield.backup.php b/lib/formfields/customer/extras/formfield.backup.php index 4a756613..c3bef801 100644 --- a/lib/formfields/customer/extras/formfield.backup.php +++ b/lib/formfields/customer/extras/formfield.backup.php @@ -16,31 +16,31 @@ */ return array( 'backup' => array( - 'title' => $lng['extras']['backup'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['backup'], 'image' => 'icons/backup_big.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['extras']['backup'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['backup'], 'image' => 'icons/backup_big.png', 'fields' => array( 'path' => array( - 'label' => $lng['panel']['backuppath']['title'], - 'desc' => $lng['panel']['backuppath']['description'] . '
    ' . (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['backuppath']['title'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['backuppath']['description'] . '
    ' . (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] ), 'path_protection_info' => array( - 'label' => $lng['extras']['path_protection_label'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['path_protection_label'], 'type' => 'label', - 'value' => $lng['extras']['path_protection_info'] + 'value' => \Froxlor\I18N\Lang::getAll()['extras']['path_protection_info'] ), 'backup_web' => array( - 'label' => $lng['extras']['backup_web'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['backup_web'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -49,11 +49,11 @@ return array( ) ), 'backup_mail' => array( - 'label' => $lng['extras']['backup_mail'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['backup_mail'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -62,11 +62,11 @@ return array( ) ), 'backup_dbs' => array( - 'label' => $lng['extras']['backup_dbs'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['backup_dbs'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/customer/extras/formfield.htaccess_add.php b/lib/formfields/customer/extras/formfield.htaccess_add.php index 87ee8b66..5ba34e6d 100644 --- a/lib/formfields/customer/extras/formfield.htaccess_add.php +++ b/lib/formfields/customer/extras/formfield.htaccess_add.php @@ -16,55 +16,55 @@ */ return array( 'htaccess_add' => array( - 'title' => $lng['extras']['pathoptions_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add'], 'image' => 'icons/htpasswd_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['extras']['pathoptions_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add'], 'image' => 'icons/htpasswd_add.png', 'fields' => array( 'path' => array( - 'label' => $lng['panel']['path'], - 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'], + 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] ), 'options_indexes' => array( - 'label' => $lng['extras']['directory_browsing'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['directory_browsing'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), 'value' => array() ), 'error404path' => array( - 'label' => $lng['extras']['errordocument404path'], - 'desc' => $lng['panel']['descriptionerrordocument'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument404path'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'], 'type' => 'text' ), 'error403path' => array( 'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'), - 'label' => $lng['extras']['errordocument403path'], - 'desc' => $lng['panel']['descriptionerrordocument'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument403path'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'], 'type' => 'text' ), 'error500path' => array( 'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'), - 'label' => $lng['extras']['errordocument500path'], - 'desc' => $lng['panel']['descriptionerrordocument'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument500path'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'], 'type' => 'text' ), 'options_cgi' => array( 'visible' => ($cperlenabled == 1), - 'label' => $lng['extras']['execute_perl'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['execute_perl'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/customer/extras/formfield.htaccess_edit.php b/lib/formfields/customer/extras/formfield.htaccess_edit.php index f73f7d93..d9b9d997 100644 --- a/lib/formfields/customer/extras/formfield.htaccess_edit.php +++ b/lib/formfields/customer/extras/formfield.htaccess_edit.php @@ -16,24 +16,24 @@ */ return array( 'htaccess_edit' => array( - 'title' => $lng['extras']['pathoptions_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_edit'], 'image' => 'icons/htpasswd_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['extras']['pathoptions_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['pathoptions_edit'], 'image' => 'icons/htpasswd_edit.png', 'fields' => array( 'path' => array( - 'label' => $lng['panel']['path'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'], 'type' => 'label', 'value' => $result['path'] ), 'options_indexes' => array( - 'label' => $lng['extras']['directory_browsing'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['directory_browsing'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -42,32 +42,32 @@ return array( ) ), 'error404path' => array( - 'label' => $lng['extras']['errordocument404path'], - 'desc' => $lng['panel']['descriptionerrordocument'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument404path'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'], 'type' => 'text', 'value' => $result['error404path'] ), 'error403path' => array( 'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'), - 'label' => $lng['extras']['errordocument403path'], - 'desc' => $lng['panel']['descriptionerrordocument'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument403path'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'], 'type' => 'text', 'value' => $result['error403path'] ), 'error500path' => array( 'visible' => (\Froxlor\Settings::Get('system.webserver') == 'apache2'), - 'label' => $lng['extras']['errordocument500path'], - 'desc' => $lng['panel']['descriptionerrordocument'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['errordocument500path'], + 'desc' => \Froxlor\I18N\Lang::getAll()['panel']['descriptionerrordocument'], 'type' => 'text', 'value' => $result['error500path'] ), 'options_cgi' => array( 'visible' => ($cperlenabled == 1), - 'label' => $lng['extras']['execute_perl'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['execute_perl'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/customer/extras/formfield.htpasswd_add.php b/lib/formfields/customer/extras/formfield.htpasswd_add.php index 87a6e5d8..2fa3aeb0 100644 --- a/lib/formfields/customer/extras/formfield.htpasswd_add.php +++ b/lib/formfields/customer/extras/formfield.htpasswd_add.php @@ -16,37 +16,37 @@ */ return array( 'htpasswd_add' => array( - 'title' => $lng['extras']['directoryprotection_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add'], 'image' => 'icons/htpasswd_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['extras']['directoryprotection_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add'], 'image' => 'icons/htpasswd_add.png', 'fields' => array( 'path' => array( - 'label' => $lng['panel']['path'], - 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'], + 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] ), 'username' => array( - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'text' ), 'directory_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'autocomplete' => 'off' ), 'directory_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() ), 'directory_authname' => array( - 'label' => $lng['extras']['htpasswdauthname'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['htpasswdauthname'], 'type' => 'text' ) ) diff --git a/lib/formfields/customer/extras/formfield.htpasswd_edit.php b/lib/formfields/customer/extras/formfield.htpasswd_edit.php index 607ef682..14c4f966 100644 --- a/lib/formfields/customer/extras/formfield.htpasswd_edit.php +++ b/lib/formfields/customer/extras/formfield.htpasswd_edit.php @@ -16,36 +16,36 @@ */ return array( 'htpasswd_edit' => array( - 'title' => $lng['extras']['directoryprotection_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_edit'], 'image' => 'icons/htpasswd_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['extras']['directoryprotection_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_edit'], 'image' => 'icons/htpasswd_edit.png', 'fields' => array( 'path' => array( - 'label' => $lng['panel']['path'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'], 'type' => 'label', 'value' => $result['path'] ), 'username' => array( - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'label', 'value' => $result['username'] ), 'directory_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'autocomplete' => 'off' ), 'directory_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() ), 'directory_authname' => array( - 'label' => $lng['extras']['htpasswdauthname'], + 'label' => \Froxlor\I18N\Lang::getAll()['extras']['htpasswdauthname'], 'type' => 'text', 'value' => $result['authname'] ) diff --git a/lib/formfields/customer/ftp/formfield.ftp_add.php b/lib/formfields/customer/ftp/formfield.ftp_add.php index ded4d0c6..d0a30557 100644 --- a/lib/formfields/customer/ftp/formfield.ftp_add.php +++ b/lib/formfields/customer/ftp/formfield.ftp_add.php @@ -15,52 +15,52 @@ */ return array( 'ftp_add' => array( - 'title' => $lng['ftp']['account_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_add'], 'image' => 'icons/user_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['ftp']['account_add'], + 'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_add'], 'image' => 'icons/user_add.png', 'fields' => array( 'ftp_username' => array( 'visible' => (\Froxlor\Settings::Get('customer.ftpatdomain') == '1' ? true : false), - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'text' ), 'ftp_domain' => array( 'visible' => (\Froxlor\Settings::Get('customer.ftpatdomain') == '1' ? true : false), - 'label' => $lng['domains']['domainname'], + 'label' => \Froxlor\I18N\Lang::getAll()['domains']['domainname'], 'type' => 'select', 'select_var' => (isset($domains) ? $domains : "") ), 'ftp_description' => array( - 'label' => $lng['panel']['ftpdesc'] = 'FTP description', + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['ftpdesc'] = 'FTP description', 'type' => 'text' ), 'path' => array( - 'label' => $lng['panel']['path'], - 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'], + 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] ), 'ftp_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'autocomplete' => 'off' ), 'ftp_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() ), 'sendinfomail' => array( - 'label' => $lng['customer']['sendinfomail'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['sendinfomail'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), @@ -68,7 +68,7 @@ return array( ), 'shell' => array( 'visible' => (\Froxlor\Settings::Get('system.allow_customer_shell') == '1' ? true : false), - 'label' => $lng['panel']['shell'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['shell'], 'type' => 'select', 'select_var' => (isset($shells) ? $shells : "") ) diff --git a/lib/formfields/customer/ftp/formfield.ftp_edit.php b/lib/formfields/customer/ftp/formfield.ftp_edit.php index 727bd7a7..61ddb9eb 100644 --- a/lib/formfields/customer/ftp/formfield.ftp_edit.php +++ b/lib/formfields/customer/ftp/formfield.ftp_edit.php @@ -15,45 +15,45 @@ */ return array( 'ftp_edit' => array( - 'title' => $lng['ftp']['account_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_edit'], 'image' => 'icons/user_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['ftp']['account_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['ftp']['account_edit'], 'image' => 'icons/user_edit.png', 'fields' => array( 'username' => array( - 'label' => $lng['login']['username'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['username'], 'type' => 'label', 'value' => $result['username'] ), 'ftp_description' => array( - 'label' => $lng['panel']['ftpdesc'] = 'FTP description', + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['ftpdesc'] = 'FTP description', 'type' => 'text', 'value' => $result['description'] ), 'path' => array( - 'label' => $lng['panel']['path'], - 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? $lng['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['path'], + 'desc' => (\Froxlor\Settings::Get('panel.pathedit') != 'Dropdown' ? \Froxlor\I18N\Lang::getAll()['panel']['pathDescription'] : null) . (isset($pathSelect['note']) ? '
    ' . $pathSelect['value'] : ''), 'type' => $pathSelect['type'], 'select_var' => $pathSelect['value'], 'value' => $pathSelect['value'] ), 'ftp_password' => array( - 'label' => $lng['login']['password'], - 'desc' => $lng['ftp']['editpassdescription'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], + 'desc' => \Froxlor\I18N\Lang::getAll()['ftp']['editpassdescription'], 'type' => 'password', 'autocomplete' => 'off' ), 'ftp_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['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' => $lng['panel']['shell'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['shell'], 'type' => 'select', 'select_var' => (isset($shells) ? $shells : "") ) diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php index 3782fcf8..35d24ee2 100644 --- a/lib/formfields/customer/mysql/formfield.mysql_add.php +++ b/lib/formfields/customer/mysql/formfield.mysql_add.php @@ -15,40 +15,40 @@ */ return array( 'mysql_add' => array( - 'title' => $lng['mysql']['database_create'], + 'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_create'], 'image' => 'icons/mysql_add.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['mysql']['database_create'], + 'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_create'], 'image' => 'icons/mysql_add.png', 'fields' => array( 'description' => array( - 'label' => $lng['mysql']['databasedescription'], + 'label' => \Froxlor\I18N\Lang::getAll()['mysql']['databasedescription'], 'type' => 'text' ), 'mysql_server' => array( 'visible' => (1 < $count_mysqlservers ? true : false), - 'label' => $lng['mysql']['mysql_server'], + 'label' => \Froxlor\I18N\Lang::getAll()['mysql']['mysql_server'], 'type' => 'select', 'select_var' => $mysql_servers ), 'mysql_password' => array( - 'label' => $lng['login']['password'], + 'label' => \Froxlor\I18N\Lang::getAll()['login']['password'], 'type' => 'password', 'autocomplete' => 'off' ), 'mysql_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() ), 'sendinfomail' => array( - 'label' => $lng['customer']['sendinfomail'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['sendinfomail'], 'type' => 'checkbox', 'values' => array( array( - 'label' => $lng['panel']['yes'], + 'label' => \Froxlor\I18N\Lang::getAll()['panel']['yes'], 'value' => '1' ) ), diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php index 4748fa84..904a5ec8 100644 --- a/lib/formfields/customer/mysql/formfield.mysql_edit.php +++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php @@ -15,36 +15,36 @@ */ return array( 'mysql_edit' => array( - 'title' => $lng['mysql']['database_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_edit'], 'image' => 'icons/mysql_edit.png', 'sections' => array( 'section_a' => array( - 'title' => $lng['mysql']['database_edit'], + 'title' => \Froxlor\I18N\Lang::getAll()['mysql']['database_edit'], 'image' => 'icons/mysql_edit.png', 'fields' => array( 'databasename' => array( - 'label' => $lng['mysql']['databasename'], + 'label' => \Froxlor\I18N\Lang::getAll()['mysql']['databasename'], 'type' => 'label', 'value' => $result['databasename'] ), 'description' => array( - 'label' => $lng['mysql']['databasedescription'], + 'label' => \Froxlor\I18N\Lang::getAll()['mysql']['databasedescription'], 'type' => 'text', 'value' => $result['description'] ), 'mysql_server' => array( 'visible' => (1 < $count_mysqlservers ? true : false), - 'label' => $lng['mysql']['mysql_server'], + 'label' => \Froxlor\I18N\Lang::getAll()['mysql']['mysql_server'], 'type' => 'label', 'value' => $sql_root['caption'] ), 'mysql_password' => array( - 'label' => $lng['changepassword']['new_password_ifnotempty'], + 'label' => \Froxlor\I18N\Lang::getAll()['changepassword']['new_password_ifnotempty'], 'type' => 'password', 'autocomplete' => 'off' ), 'mysql_password_suggestion' => array( - 'label' => $lng['customer']['generated_pwd'], + 'label' => \Froxlor\I18N\Lang::getAll()['customer']['generated_pwd'], 'type' => 'text', 'visible' => (\Froxlor\Settings::Get('panel.password_regex') == ''), 'value' => \Froxlor\System\Crypt::generatePassword() diff --git a/lib/functions/formfields/function.getFormFieldOutput.php b/lib/functions/formfields/function.getFormFieldOutput.php index 6b4abac2..455b5482 100644 --- a/lib/functions/formfields/function.getFormFieldOutput.php +++ b/lib/functions/formfields/function.getFormFieldOutput.php @@ -18,8 +18,6 @@ */ 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'])) { @@ -49,7 +47,7 @@ function getFormFieldOutput($fieldname, $fielddata) $websrv = Settings::Get('system.webserver'); if (! in_array($websrv, $fielddata['websrv_avail'])) { $do_show = false; - $fielddata['label'] .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail'])); + $fielddata['label'] .= sprintf(\Froxlor\I18N\Lang::getAll()['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail'])); } } @@ -59,7 +57,7 @@ function getFormFieldOutput($fieldname, $fielddata) if (isset($fielddata['visible']) && $do_show) { $do_show = $fielddata['visible']; if (! $do_show) { - $fielddata['label'] .= $lng['serversettings']['option_unavailable']; + $fielddata['label'] .= \Froxlor\I18N\Lang::getAll()['serversettings']['option_unavailable']; } } diff --git a/lib/functions/formfields/function.getFormGroupOutput.php b/lib/functions/formfields/function.getFormGroupOutput.php index e4444394..09c11cc8 100644 --- a/lib/functions/formfields/function.getFormGroupOutput.php +++ b/lib/functions/formfields/function.getFormGroupOutput.php @@ -18,14 +18,14 @@ */ function getFormGroupOutput($groupname, $groupdetails) { - global $lng, $theme; + global $theme; eval("\$group = \"" . \Froxlor\UI\Template::getTemplate("settings/settings_group") . "\";"); return $group; } function getFormOverviewGroupOutput($groupname, $groupdetails) { - global $lng, $filename, $s, $theme; + global $filename, $s, $theme; $group = ''; $title = $groupdetails['title']; @@ -52,7 +52,7 @@ function getFormOverviewGroupOutput($groupname, $groupdetails) $option .= ''; $activated = true; } else { - $option .= $lng['admin']['activated'] . ': '; + $option .= \Froxlor\I18N\Lang::getAll()['admin']['activated'] . ': '; $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($lng['serversettings']['option_unavailable_websrv'], implode(", ", $groupdetails['websrv_avail'])); + $title .= sprintf(\Froxlor\I18N\Lang::getAll()['serversettings']['option_unavailable_websrv'], implode(", ", $groupdetails['websrv_avail'])); // hack disabled flag into select-box $option = str_replace('

    - +

    diff --git a/templates/Sparkle/2fa/overview.tpl b/templates/Sparkle/2fa/overview.tpl index 9aa46c6d..cdf0a258 100644 --- a/templates/Sparkle/2fa/overview.tpl +++ b/templates/Sparkle/2fa/overview.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['login']['2fa']} + {\Froxlor\I18N\Lang::getAll()['login']['2fa']}

    @@ -11,29 +11,29 @@ $header
    -

    {$lng['2fa']['2fa_overview_desc']}

    +

    {\Froxlor\I18N\Lang::getAll()['2fa']['2fa_overview_desc']}


      + value="{\Froxlor\I18N\Lang::getAll()['2fa']['2fa_add']}" name="add" />
    -

    {$lng['2fa']['2fa_email_desc']}

    +

    {\Froxlor\I18N\Lang::getAll()['2fa']['2fa_email_desc']}


    + value="{\Froxlor\I18N\Lang::getAll()['2fa']['2fa_delete']}" name="delete" />
    -

    {$lng['2fa']['2fa_ga_desc']}

    +

    {\Froxlor\I18N\Lang::getAll()['2fa']['2fa_ga_desc']}


    QRCode

    + value="{\Froxlor\I18N\Lang::getAll()['2fa']['2fa_delete']}" name="delete" />
    diff --git a/templates/Sparkle/admin/admins/admins.tpl b/templates/Sparkle/admin/admins/admins.tpl index c28176bf..6b692eef 100644 --- a/templates/Sparkle/admin/admins/admins.tpl +++ b/templates/Sparkle/admin/admins/admins.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['admins']} ({$admincount}) + {\Froxlor\I18N\Lang::getAll()['admin']['admins']} ({$admincount})

    @@ -19,17 +19,17 @@ $header
    - {$lng['admin']['admin_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['admin_add']}
    - - - + + + - + @@ -50,7 +50,7 @@ $header
    - {$lng['admin']['admin_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['admin_add']}
    diff --git a/templates/Sparkle/admin/admins/admins_add.tpl b/templates/Sparkle/admin/admins/admins_add.tpl index cd03236c..ca312785 100644 --- a/templates/Sparkle/admin/admins/admins_add.tpl +++ b/templates/Sparkle/admin/admins/admins_add.tpl @@ -27,8 +27,8 @@ $header

    - *: {$lng['admin']['valuemandatory']}
    - **: {$lng['admin']['valuemandatorycompany']} + *: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}
    + **: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatorycompany']}

    diff --git a/templates/Sparkle/admin/admins/admins_admin.tpl b/templates/Sparkle/admin/admins/admins_admin.tpl index fe219c1e..5363d907 100644 --- a/templates/Sparkle/admin/admins/admins_admin.tpl +++ b/templates/Sparkle/admin/admins/admins_admin.tpl @@ -19,16 +19,16 @@ Webspace: -
    +
    -
    +
    -
    +
    @@ -43,16 +43,16 @@ Traffic: -
    +
    -
    +
    -
    +
    @@ -67,13 +67,13 @@
    diff --git a/templates/Sparkle/admin/admins/admins_edit.tpl b/templates/Sparkle/admin/admins/admins_edit.tpl index 053f160e..d8a33970 100644 --- a/templates/Sparkle/admin/admins/admins_edit.tpl +++ b/templates/Sparkle/admin/admins/admins_edit.tpl @@ -8,7 +8,7 @@ $header
    -
    {$lng['error']['youcanteditallfieldsofyourself']}
    +
    {\Froxlor\I18N\Lang::getAll()['error']['youcanteditallfieldsofyourself']}
     @@ -33,7 +33,7 @@ $header

    - *: {$lng['admin']['valuemandatory']} + *: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}

    diff --git a/templates/Sparkle/admin/configfiles/choose.tpl b/templates/Sparkle/admin/configfiles/choose.tpl index aba89934..d816d939 100644 --- a/templates/Sparkle/admin/configfiles/choose.tpl +++ b/templates/Sparkle/admin/configfiles/choose.tpl @@ -2,9 +2,9 @@ $header

    - {$lng['admin']['configfiles']['serverconfiguration']}  - {$lng['admin']['configfiles']['serverconfiguration']}   - [{$lng['admin']['configfiles']['wizard']}] + {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']}  + {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']}   + [{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['wizard']}]

    diff --git a/templates/Sparkle/admin/configfiles/configfiles.tpl b/templates/Sparkle/admin/configfiles/configfiles.tpl index d469aed3..d7fded32 100644 --- a/templates/Sparkle/admin/configfiles/configfiles.tpl +++ b/templates/Sparkle/admin/configfiles/configfiles.tpl @@ -5,19 +5,19 @@ $header   {$dist_display} »  {$services[$service]->title} »  - {$daemons[$daemon]->title} [{$lng['panel']['back']}] + {$daemons[$daemon]->title} [{\Froxlor\I18N\Lang::getAll()['panel']['back']}]
    -

    {$lng['admin']['configfiles']['legend']}

    -

    {$lng['admin']['configfiles']['commands']}

    -

    {$lng['admin']['configfiles']['files']}

    +

    {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['legend']}

    +

    {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['commands']}

    +

    {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['files']}

    FROXLOR_MYSQL_PASSWORD: - +

    diff --git a/templates/Sparkle/admin/configfiles/wizard.tpl b/templates/Sparkle/admin/configfiles/wizard.tpl index a20c129d..f2173918 100644 --- a/templates/Sparkle/admin/configfiles/wizard.tpl +++ b/templates/Sparkle/admin/configfiles/wizard.tpl @@ -2,16 +2,16 @@ $header

    - {$lng['admin']['configfiles']['serverconfiguration']}  - {$lng['admin']['configfiles']['serverconfiguration']}   - [{$lng['admin']['configfiles']['overview']}] + {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']}  + {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['serverconfiguration']}   + [{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['overview']}]

    -
    {$lng['admin']['warning']}
    -
    {$lng['panel']['settings_before_configuration']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['warning']}
    +
    {\Froxlor\I18N\Lang::getAll()['panel']['settings_before_configuration']}
    @@ -23,46 +23,46 @@ $header
    {$lng['customer']['name']} {$arrowcode['name']}{$lng['login']['username']} {$arrowcode['loginname']}{$lng['admin']['customers']}{\Froxlor\I18N\Lang::getAll()['customer']['name']} {$arrowcode['name']}{\Froxlor\I18N\Lang::getAll()['login']['username']} {$arrowcode['loginname']}{\Froxlor\I18N\Lang::getAll()['admin']['customers']}  {$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']} -  {$lng['usersettings']['custom_notes']['title']} +  {\Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title']}
    - + - + - - + + - + - + - + @@ -73,7 +73,7 @@ $header


    -

    {$lng['panel']['alternative_cmdline_config']}:

    +

    {\Froxlor\I18N\Lang::getAll()['panel']['alternative_cmdline_config']}:

    diff --git a/templates/Sparkle/admin/cronjobs/cronjobs.tpl b/templates/Sparkle/admin/cronjobs/cronjobs.tpl index d644b76b..5a6435ce 100644 --- a/templates/Sparkle/admin/cronjobs/cronjobs.tpl +++ b/templates/Sparkle/admin/cronjobs/cronjobs.tpl @@ -2,13 +2,13 @@ $header

      - {$lng['admin']['cron']['cronsettings']}

    + {\Froxlor\I18N\Lang::getAll()['admin']['cron']['cronsettings']}
    -
    {$lng['admin']['warning']}
    -
    {$lng['cron']['changewarning']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['warning']}
    +
    {\Froxlor\I18N\Lang::getAll()['cron']['changewarning']}
    @@ -16,11 +16,11 @@ $header
    {$lng['admin']['configfiles']['distribution']}:{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['distribution']}: {$dist_display}
    {$lng['admin']['configfiles']['service']}:{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['service']}: {$services[$service]->title}
    {$lng['admin']['configfiles']['daemon']}:{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['daemon']}:
    {$lng['panel']['done_configuring']}:

    {$lng['panel']['ihave_configured']}

    		{\Froxlor\I18N\Lang::getAll()['panel']['done_configuring']}:

    {\Froxlor\I18N\Lang::getAll()['panel']['ihave_configured']}

    		 {$lng['panel']['system_is_configured']}{\Froxlor\I18N\Lang::getAll()['panel']['system_is_configured']}
    - - - - - + + + + + diff --git a/templates/Sparkle/admin/cronjobs/cronjobs_cronjob.tpl b/templates/Sparkle/admin/cronjobs/cronjobs_cronjob.tpl index cba1fd52..df209472 100644 --- a/templates/Sparkle/admin/cronjobs/cronjobs_cronjob.tpl +++ b/templates/Sparkle/admin/cronjobs/cronjobs_cronjob.tpl @@ -5,7 +5,7 @@ diff --git a/templates/Sparkle/admin/customers/customers.tpl b/templates/Sparkle/admin/customers/customers.tpl index c18ceb88..1d9eba18 100644 --- a/templates/Sparkle/admin/customers/customers.tpl +++ b/templates/Sparkle/admin/customers/customers.tpl @@ -3,7 +3,7 @@ $header

    - {$lng['admin']['customers']} ({$customercount}) + {\Froxlor\I18N\Lang::getAll()['admin']['customers']} ({$customercount})

    @@ -20,7 +20,7 @@ $header
      - {$lng['admin']['customer_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['customer_add']}
    @@ -28,18 +28,18 @@ $header - + - + @@ -61,7 +61,7 @@ $header
      - {$lng['admin']['customer_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['customer_add']}
    diff --git a/templates/Sparkle/admin/customers/customers_add.tpl b/templates/Sparkle/admin/customers/customers_add.tpl index 472c6b54..11e88402 100644 --- a/templates/Sparkle/admin/customers/customers_add.tpl +++ b/templates/Sparkle/admin/customers/customers_add.tpl @@ -28,8 +28,8 @@ $header

    - *: {$lng['admin']['valuemandatory']}
    - **: {$lng['admin']['valuemandatorycompany']} + *: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}
    + **: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatorycompany']}

    diff --git a/templates/Sparkle/admin/customers/customers_customer.tpl b/templates/Sparkle/admin/customers/customers_customer.tpl index 6a939ca3..e10650c9 100644 --- a/templates/Sparkle/admin/customers/customers_customer.tpl +++ b/templates/Sparkle/admin/customers/customers_customer.tpl @@ -26,16 +26,16 @@ Webspace: -
    +
    -
    +
    -
    +
    @@ -50,16 +50,16 @@ Traffic: -
    +
    -
    +
    -
    +
    @@ -74,18 +74,18 @@
    diff --git a/templates/Sparkle/admin/customers/customers_edit.tpl b/templates/Sparkle/admin/customers/customers_edit.tpl index 5d4d1c34..e37ad39f 100644 --- a/templates/Sparkle/admin/customers/customers_edit.tpl +++ b/templates/Sparkle/admin/customers/customers_edit.tpl @@ -29,8 +29,8 @@ $header

    - *: {$lng['admin']['valuemandatory']}
    - **: {$lng['admin']['valuemandatorycompany']} + *: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}
    + **: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatorycompany']}

    diff --git a/templates/Sparkle/admin/domains/domains.tpl b/templates/Sparkle/admin/domains/domains.tpl index 35adb7be..334894f3 100644 --- a/templates/Sparkle/admin/domains/domains.tpl +++ b/templates/Sparkle/admin/domains/domains.tpl @@ -3,7 +3,7 @@

      - {$lng['admin']['domains']} ({$domainscount}) + {\Froxlor\I18N\Lang::getAll()['admin']['domains']} ({$domainscount})

    @@ -20,20 +20,20 @@
      - {$lng['admin']['domain_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['domain_add']}     - {$lng['domains']['domain_import']} + {\Froxlor\I18N\Lang::getAll()['domains']['domain_import']}
    {$lng['cron']['description']}{$lng['cron']['lastrun']}{$lng['cron']['interval']}{$lng['cron']['isactive']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['cron']['description']}{\Froxlor\I18N\Lang::getAll()['cron']['lastrun']}{\Froxlor\I18N\Lang::getAll()['cron']['interval']}{\Froxlor\I18N\Lang::getAll()['cron']['isactive']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$row['isactive']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}
    - {$lng['customer']['name']}, - {$lng['customer']['firstname']} {$arrowcode['c.name']} + {\Froxlor\I18N\Lang::getAll()['customer']['name']}, + {\Froxlor\I18N\Lang::getAll()['customer']['firstname']} {$arrowcode['c.name']} - {$lng['login']['username']} {$arrowcode['c.loginname']} + {\Froxlor\I18N\Lang::getAll()['login']['username']} {$arrowcode['c.loginname']} - {$lng['admin']['admin']} {$arrowcode['a.loginname']} + {\Froxlor\I18N\Lang::getAll()['admin']['admin']} {$arrowcode['a.loginname']} {$lng['admin']['lastlogin_succ']}{\Froxlor\I18N\Lang::getAll()['admin']['lastlogin_succ']} {$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}   - {$lng['panel']['unlock']} + {\Froxlor\I18N\Lang::getAll()['panel']['unlock']} -  {$lng['usersettings']['custom_notes']['title']} +  {\Froxlor\I18N\Lang::getAll()['usersettings']['custom_notes']['title']}
    - - - - + + + + @@ -54,9 +54,9 @@
    -
    {$lng['admin']['warning']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['warning']}
    - {$lng['admin']['domain_nocustomeraddingavailable']} + {\Froxlor\I18N\Lang::getAll()['admin']['domain_nocustomeraddingavailable']}
    @@ -64,7 +64,7 @@
      - {$lng['admin']['domain_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['domain_add']}
    diff --git a/templates/Sparkle/admin/domains/domains_add.tpl b/templates/Sparkle/admin/domains/domains_add.tpl index ebce2ce6..03e7a52b 100644 --- a/templates/Sparkle/admin/domains/domains_add.tpl +++ b/templates/Sparkle/admin/domains/domains_add.tpl @@ -25,7 +25,7 @@ $header

    - *: {$lng['admin']['valuemandatory']} + *: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}

    diff --git a/templates/Sparkle/admin/domains/domains_domain.tpl b/templates/Sparkle/admin/domains/domains_domain.tpl index 527d6746..695f2b48 100644 --- a/templates/Sparkle/admin/domains/domains_domain.tpl +++ b/templates/Sparkle/admin/domains/domains_domain.tpl @@ -6,13 +6,13 @@ @@ -21,28 +21,28 @@ diff --git a/templates/Sparkle/admin/domains/domains_edit.tpl b/templates/Sparkle/admin/domains/domains_edit.tpl index 7c8fba08..46cb4bdc 100644 --- a/templates/Sparkle/admin/domains/domains_edit.tpl +++ b/templates/Sparkle/admin/domains/domains_edit.tpl @@ -5,7 +5,7 @@ $header {$title}  {$title} -  ({$lng['dnseditor']['edit']}) +  ({\Froxlor\I18N\Lang::getAll()['dnseditor']['edit']}) @@ -13,7 +13,7 @@ $header
    - + @@ -22,12 +22,12 @@ $header
    -
    {$lng['admin']['delete_statistics']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['delete_statistics']}

    {$speciallogwarning}

    -   - +   +
    @@ -39,7 +39,7 @@ $header

    - *: {$lng['admin']['valuemandatory']} + *: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}

    diff --git a/templates/Sparkle/admin/domains/domains_import.tpl b/templates/Sparkle/admin/domains/domains_import.tpl index 6d24d003..d8366bc1 100644 --- a/templates/Sparkle/admin/domains/domains_import.tpl +++ b/templates/Sparkle/admin/domains/domains_import.tpl @@ -9,8 +9,8 @@ $header
    -
    {$lng['admin']['note']}
    -
    {$lng['domains']['import_description']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['note']}
    +
    {\Froxlor\I18N\Lang::getAll()['domains']['import_description']}
    @@ -31,7 +31,7 @@ $header

    - *: {$lng['admin']['valuemandatory']} + *: {\Froxlor\I18N\Lang::getAll()['admin']['valuemandatory']}

    diff --git a/templates/Sparkle/admin/index/change_language.tpl b/templates/Sparkle/admin/index/change_language.tpl index bed08d56..5f0a2296 100644 --- a/templates/Sparkle/admin/index/change_language.tpl +++ b/templates/Sparkle/admin/index/change_language.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['main']['changelanguage']} + {\Froxlor\I18N\Lang::getAll()['menue']['main']['changelanguage']}

    @@ -15,13 +15,13 @@ $header
    {$lng['domains']['domainname']} {$arrowcode['d.domain']}{$lng['admin']['ipsandports']['ip']}{$lng['admin']['customer']} {$arrowcode['c.loginname']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['domains']['domainname']} {$arrowcode['d.domain']}{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip']}{\Froxlor\I18N\Lang::getAll()['admin']['customer']} {$arrowcode['c.loginname']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$row['domain']} -  ({$lng['admin']['stdsubdomain']}) +  ({\Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain']}) -
    {$lng['domains']['registration_date']}: {$row['registration_date']} +
    {\Froxlor\I18N\Lang::getAll()['domains']['registration_date']}: {$row['registration_date']}     -
    ({$lng['domains']['termination_date_overview']} {$row['termination_date']})
     +
    ({\Froxlor\I18N\Lang::getAll()['domains']['termination_date_overview']} {$row['termination_date']})
         		{$row['ipandport']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']} - {$lng['panel']['viewlogs']} + {\Froxlor\I18N\Lang::getAll()['panel']['viewlogs']}   - {$lng['dnseditor']['edit']} + {\Froxlor\I18N\Lang::getAll()['dnseditor']['edit']} -  {$lng['panel']['letsencrypt']} +  {\Froxlor\I18N\Lang::getAll()['panel']['letsencrypt']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']} -  {$lng['domains']['hasaliasdomains']} +  {\Froxlor\I18N\Lang::getAll()['domains']['hasaliasdomains']}
    - + diff --git a/templates/Sparkle/admin/index/change_password.tpl b/templates/Sparkle/admin/index/change_password.tpl index 8b87e407..260c2902 100644 --- a/templates/Sparkle/admin/index/change_password.tpl +++ b/templates/Sparkle/admin/index/change_password.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['main']['changepassword']} + {\Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword']}

    @@ -15,21 +15,21 @@ $header
    - +
    - + - + - + diff --git a/templates/Sparkle/admin/index/change_theme.tpl b/templates/Sparkle/admin/index/change_theme.tpl index 7916516e..e3379ae3 100644 --- a/templates/Sparkle/admin/index/change_theme.tpl +++ b/templates/Sparkle/admin/index/change_theme.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['main']['changetheme']} + {\Froxlor\I18N\Lang::getAll()['menue']['main']['changetheme']}

    @@ -15,13 +15,13 @@ $header
    - +
    - + diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl index 80d5146a..161173df 100644 --- a/templates/Sparkle/admin/index/index.tpl +++ b/templates/Sparkle/admin/index/index.tpl @@ -2,7 +2,7 @@ $header

    - {$lng['panel']['dashboard']} + {\Froxlor\I18N\Lang::getAll()['panel']['dashboard']}

    @@ -10,11 +10,11 @@ $header

    - {$lng['admin']['customers']}
    + {\Froxlor\I18N\Lang::getAll()['admin']['customers']}
    - {$overview['number_customers']} {$lng['panel']['used']}
    + {$overview['number_customers']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['customers']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['customers']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -22,11 +22,11 @@ $header

    - {$lng['customer']['domains']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['domains']}
    - {$overview['number_domains']} {$lng['panel']['used']}
    + {$overview['number_domains']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['domains']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['domains']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -34,12 +34,12 @@ $header

    - {$lng['customer']['subdomains']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}
    - {$overview['subdomains_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['subdomains_used']} {$lng['panel']['assigned']}
    + {$overview['subdomains_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['subdomains_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['subdomains']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['subdomains']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -47,12 +47,12 @@ $header

    - {$lng['customer']['diskspace']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['diskspace']}
    - {$overview['diskspace_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['diskspace_used']} {$lng['panel']['assigned']}
    + {$overview['diskspace_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['diskspace_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['diskspace']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['diskspace']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -60,12 +60,12 @@ $header

    - {$lng['customer']['traffic']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['traffic']}
    - {$overview['traffic_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['traffic_used']} {$lng['panel']['assigned']}
    + {$overview['traffic_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['traffic_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['traffic']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['traffic']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -73,12 +73,12 @@ $header

    - {$lng['customer']['mysqls']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}
    - {$overview['mysqls_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['mysqls_used']} {$lng['panel']['assigned']}
    + {$overview['mysqls_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['mysqls_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['mysqls']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['mysqls']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -86,12 +86,12 @@ $header

    - {$lng['customer']['emails']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['emails']}
    - {$overview['emails_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['emails_used']} {$lng['panel']['assigned']}
    + {$overview['emails_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['emails_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['emails']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['emails']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -99,12 +99,12 @@ $header

    - {$lng['customer']['accounts']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['accounts']}
    - {$overview['email_accounts_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['email_accounts_used']} {$lng['panel']['assigned']}
    + {$overview['email_accounts_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['email_accounts_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['email_accounts']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['email_accounts']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -112,12 +112,12 @@ $header

    - {$lng['customer']['forwarders']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}
    - {$overview['email_forwarders_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['email_forwarders_used']} {$lng['panel']['assigned']}
    + {$overview['email_forwarders_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['email_forwarders_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['email_forwarders']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['email_forwarders']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -126,12 +126,12 @@ $header

    - {$lng['customer']['email_quota']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['email_quota']}
    - {$overview['email_quota_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['email_quota_used']} {$lng['panel']['assigned']}
    + {$overview['email_quota_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['email_quota_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['email_quota']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['email_quota']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -140,12 +140,12 @@ $header

    - {$lng['customer']['ftps']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['ftps']}
    - {$overview['ftps_used']} {$lng['panel']['used']}
    - {\Froxlor\User::getAll()['ftps_used']} {$lng['panel']['assigned']}
    + {$overview['ftps_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    + {\Froxlor\User::getAll()['ftps_used']} {\Froxlor\I18N\Lang::getAll()['panel']['assigned']}
    - {\Froxlor\User::getAll()['ftps']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['ftps']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -172,7 +172,7 @@ $header
    - + @@ -9,11 +9,11 @@ diff --git a/templates/Sparkle/admin/plans/plans.tpl b/templates/Sparkle/admin/plans/plans.tpl index ed9c4432..ab81e3d4 100644 --- a/templates/Sparkle/admin/plans/plans.tpl +++ b/templates/Sparkle/admin/plans/plans.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['plans']['plans']} + {\Froxlor\I18N\Lang::getAll()['admin']['plans']['plans']}

    @@ -18,17 +18,17 @@ $header
      - {$lng['admin']['plans']['add']} + {\Froxlor\I18N\Lang::getAll()['admin']['plans']['add']}
    - +
      - {$lng['panel']['newsfeed_disabled']}  + {\Froxlor\I18N\Lang::getAll()['panel']['newsfeed_disabled']}  @@ -192,36 +192,36 @@ $header - + - + - + - + - + - + - + - + @@ -242,18 +242,18 @@ $header
    {$lng['admin']['systemdetails']}{\Froxlor\I18N\Lang::getAll()['admin']['systemdetails']}
    {$lng['admin']['hostname']}:{\Froxlor\I18N\Lang::getAll()['admin']['hostname']}: {$system_hostname}
    {$lng['admin']['serversoftware']}:{\Froxlor\I18N\Lang::getAll()['admin']['serversoftware']}: {$_SERVER['SERVER_SOFTWARE']}
    {$lng['admin']['phpversion']}:{\Froxlor\I18N\Lang::getAll()['admin']['phpversion']}: $phpversion
    {$lng['admin']['mysqlserverversion']}:{\Froxlor\I18N\Lang::getAll()['admin']['mysqlserverversion']}: $mysqlserverversion
    {$lng['admin']['webserverinterface']}:{\Froxlor\I18N\Lang::getAll()['admin']['webserverinterface']}: $webserverinterface
    {$lng['admin']['memory']}:{\Froxlor\I18N\Lang::getAll()['admin']['memory']}: 
    $memory
    {$lng['admin']['sysload']}:{\Froxlor\I18N\Lang::getAll()['admin']['sysload']}: $load
    - + {$outstanding_tasks} {$cron_last_runs} - + - + diff --git a/templates/Sparkle/admin/index/send_error_report.tpl b/templates/Sparkle/admin/index/send_error_report.tpl index 6410b025..fe44da54 100644 --- a/templates/Sparkle/admin/index/send_error_report.tpl +++ b/templates/Sparkle/admin/index/send_error_report.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['error']['send_report_title']} + {\Froxlor\I18N\Lang::getAll()['error']['send_report_title']}

    @@ -17,7 +17,7 @@ $header     @@ -31,7 +31,7 @@ $header diff --git a/templates/Sparkle/admin/ipsandports/ipsandports.tpl b/templates/Sparkle/admin/ipsandports/ipsandports.tpl index 4112553f..b9e959ee 100644 --- a/templates/Sparkle/admin/ipsandports/ipsandports.tpl +++ b/templates/Sparkle/admin/ipsandports/ipsandports.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['ipsandports']['ipsandports']} + {\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ipsandports']}

    @@ -18,21 +18,21 @@ $header
      - {$lng['admin']['ipsandports']['add']} + {\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['add']}
    {$lng['admin']['froxlordetails']}{\Froxlor\I18N\Lang::getAll()['admin']['froxlordetails']}
    {$lng['admin']['installedversion']}:{\Froxlor\I18N\Lang::getAll()['admin']['installedversion']}: {$version}{$branding} (DB: {$dbversion})
    {$lng['admin']['latestversion']}:{\Froxlor\I18N\Lang::getAll()['admin']['latestversion']}: $lookfornewversion_lable
    -

    {$lng['error']['send_report_desc']}

    +

    {\Froxlor\I18N\Lang::getAll()['error']['send_report_desc']}
    - +
    - - + + - + @@ -53,7 +53,7 @@ $header
      - {$lng['admin']['ipsandports']['add']} + {\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['add']}
    diff --git a/templates/Sparkle/admin/ipsandports/ipsandports_ipandport.tpl b/templates/Sparkle/admin/ipsandports/ipsandports_ipandport.tpl index 720c486a..305a8d0c 100644 --- a/templates/Sparkle/admin/ipsandports/ipsandports_ipandport.tpl +++ b/templates/Sparkle/admin/ipsandports/ipsandports_ipandport.tpl @@ -1,18 +1,18 @@ - - - - - - + + + + + + diff --git a/templates/Sparkle/admin/logger/logger.tpl b/templates/Sparkle/admin/logger/logger.tpl index cb7c2135..66691379 100644 --- a/templates/Sparkle/admin/logger/logger.tpl +++ b/templates/Sparkle/admin/logger/logger.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['logger']['logger']} + {\Froxlor\I18N\Lang::getAll()['menue']['logger']['logger']}

    @@ -21,16 +21,16 @@ $header
    {$pagingcode}     - {$lng['logger']['truncate']} + {\Froxlor\I18N\Lang::getAll()['logger']['truncate']}
    {$lng['admin']['ipsandports']['ip']} {$arrowcode['ip']}{$lng['admin']['ipsandports']['port']} {$arrowcode['port']}{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['ip']} {$arrowcode['ip']}{\Froxlor\I18N\Lang::getAll()['admin']['ipsandports']['port']} {$arrowcode['port']} Listen NameVirtualHost vHost-Container Specialsettings ServerName SSL{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$row['ip']} {$row['port']}{$lng['panel']['yes']}{$lng['panel']['no']}{$lng['panel']['yes']}{$lng['panel']['no']}{$lng['panel']['yes']}{$lng['panel']['no']}{$lng['panel']['yes']}{$lng['panel']['no']}{$lng['panel']['yes']}{$lng['panel']['no']}{$lng['panel']['yes']}{$lng['panel']['no']}{\Froxlor\I18N\Lang::getAll()['panel']['yes']}{\Froxlor\I18N\Lang::getAll()['panel']['no']}{\Froxlor\I18N\Lang::getAll()['panel']['yes']}{\Froxlor\I18N\Lang::getAll()['panel']['no']}{\Froxlor\I18N\Lang::getAll()['panel']['yes']}{\Froxlor\I18N\Lang::getAll()['panel']['no']}{\Froxlor\I18N\Lang::getAll()['panel']['yes']}{\Froxlor\I18N\Lang::getAll()['panel']['no']}{\Froxlor\I18N\Lang::getAll()['panel']['yes']}{\Froxlor\I18N\Lang::getAll()['panel']['no']}{\Froxlor\I18N\Lang::getAll()['panel']['yes']}{\Froxlor\I18N\Lang::getAll()['panel']['no']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - - - - + + + + @@ -43,7 +43,7 @@ $header
    {$pagingcode}     - {$lng['logger']['truncate']} + {\Froxlor\I18N\Lang::getAll()['logger']['truncate']}
    diff --git a/templates/Sparkle/admin/message/message.tpl b/templates/Sparkle/admin/message/message.tpl index eaacf581..d94f4bf9 100644 --- a/templates/Sparkle/admin/message/message.tpl +++ b/templates/Sparkle/admin/message/message.tpl @@ -3,13 +3,13 @@ $header

      - {$lng['admin']['message']} + {\Froxlor\I18N\Lang::getAll()['admin']['message']}

    -
    {$lng['success']['success']}
    +
    {\Froxlor\I18N\Lang::getAll()['success']['success']}
    {$successmessage}
     @@ -23,21 +23,21 @@ $header
    {$lng['logger']['date']} {$arrowcode['date']}{$lng['logger']['type']} {$arrowcode['type']}{$lng['logger']['user']} {$arrowcode['user']}{$lng['logger']['action']}{\Froxlor\I18N\Lang::getAll()['logger']['date']} {$arrowcode['date']}{\Froxlor\I18N\Lang::getAll()['logger']['type']} {$arrowcode['type']}{\Froxlor\I18N\Lang::getAll()['logger']['user']} {$arrowcode['user']}{\Froxlor\I18N\Lang::getAll()['logger']['action']}
    - + - - + + - + diff --git a/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl b/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl index 693a89d7..a8726f39 100644 --- a/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl +++ b/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['phpsettings']['fpmdaemons']} + {\Froxlor\I18N\Lang::getAll()['menue']['phpsettings']['fpmdaemons']}

    @@ -11,18 +11,18 @@ $header
      - {$lng['admin']['phpsettings']['addnew']} + {\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}
    - +
    - - - - - - + + + + + + $tablecontent @@ -32,7 +32,7 @@ $header
      - {$lng['admin']['phpsettings']['addnew']} + {\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}
    diff --git a/templates/Sparkle/admin/phpconfig/fpmdaemons_overview.tpl b/templates/Sparkle/admin/phpconfig/fpmdaemons_overview.tpl index fe2d894a..20e1b5f9 100644 --- a/templates/Sparkle/admin/phpconfig/fpmdaemons_overview.tpl +++ b/templates/Sparkle/admin/phpconfig/fpmdaemons_overview.tpl @@ -6,11 +6,11 @@ diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl index 606ccabc..6f5d7713 100644 --- a/templates/Sparkle/admin/phpconfig/overview.tpl +++ b/templates/Sparkle/admin/phpconfig/overview.tpl @@ -3,7 +3,7 @@ $header

      {$lng['menue']['phpsettings']['maintitle']} + alt="" />  {\Froxlor\I18N\Lang::getAll()['menue']['phpsettings']['maintitle']}

    @@ -12,20 +12,20 @@ $header
      {$lng['admin']['phpsettings']['addnew']} + href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}
    {$lng['admin']['phpsettings']['description']}{$lng['admin']['phpsettings']['activephpconfigs']}{$lng['serversettings']['phpfpm_settings']['reload']}{$lng['serversettings']['phpfpm_settings']['configdir']}{$lng['serversettings']['phpfpm_settings']['pm']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description']}{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['activephpconfigs']}{\Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['reload']}{\Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['configdir']}{\Froxlor\I18N\Lang::getAll()['serversettings']['phpfpm_settings']['pm']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$row['pm']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - - + + - + - - - + + + $tablecontent @@ -34,7 +34,7 @@ $header
      - {$lng['admin']['phpsettings']['addnew']} + {\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['addnew']}
    diff --git a/templates/Sparkle/admin/phpconfig/overview_add.tpl b/templates/Sparkle/admin/phpconfig/overview_add.tpl index 9a1fa9c8..dc8d3349 100644 --- a/templates/Sparkle/admin/phpconfig/overview_add.tpl +++ b/templates/Sparkle/admin/phpconfig/overview_add.tpl @@ -25,7 +25,7 @@ $header

    - {$lng['admin']['templates']['template_replace_vars']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}

    @@ -34,63 +34,63 @@ $header
    {$lng['admin']['phpsettings']['description']}{$lng['admin']['phpsettings']['activedomains']}{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['description']}{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['activedomains']} {$lng['admin']['phpsettings']['fpmdesc']}{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['fpmdesc']} {$lng['admin']['phpsettings']['binary']}{$lng['admin']['phpsettings']['file_extensions']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['binary']}{\Froxlor\I18N\Lang::getAll()['admin']['phpsettings']['file_extensions']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - - + + - + - + - + - + - + - + - + - + - + - + - + - +
    {$lng['panel']['variable']}{$lng['panel']['description']}{\Froxlor\I18N\Lang::getAll()['panel']['variable']}{\Froxlor\I18N\Lang::getAll()['panel']['description']}
    - {$lng['admin']['phpconfig']['template_replace_vars']} + {\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['template_replace_vars']}
    {PEAR_DIR}{$lng['admin']['phpconfig']['pear_dir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['pear_dir']}
    {OPEN_BASEDIR_C}{$lng['admin']['phpconfig']['open_basedir_c']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_c']}
    {OPEN_BASEDIR}{$lng['admin']['phpconfig']['open_basedir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir']}
    {OPEN_BASEDIR_GLOBAL}{$lng['admin']['phpconfig']['open_basedir_global']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_global']}
    {TMP_DIR}{$lng['admin']['phpconfig']['tmp_dir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['tmp_dir']}
    {CUSTOMER_EMAIL}{$lng['admin']['phpconfig']['customer_email']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer_email']}
    {ADMIN_EMAIL}{$lng['admin']['phpconfig']['admin_email']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin_email']}
    {DOMAIN}{$lng['admin']['phpconfig']['domain']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['domain']}
    {CUSTOMER}{$lng['admin']['phpconfig']['customer']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer']}
    {ADMIN}{$lng['admin']['phpconfig']['admin']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin']}
    {DOCUMENT_ROOT}{$lng['admin']['phpconfig']['docroot']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['docroot']}
    {CUSTOMER_HOMEDIR}{$lng['admin']['phpconfig']['homedir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['homedir']}
    diff --git a/templates/Sparkle/admin/phpconfig/overview_edit.tpl b/templates/Sparkle/admin/phpconfig/overview_edit.tpl index 6f712b68..76235157 100644 --- a/templates/Sparkle/admin/phpconfig/overview_edit.tpl +++ b/templates/Sparkle/admin/phpconfig/overview_edit.tpl @@ -26,7 +26,7 @@ $header

    - {$lng['admin']['templates']['template_replace_vars']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}

    @@ -35,58 +35,58 @@ $header - - + + - + - + - + - + - + - + - + - + - + - + - + - +
    {$lng['panel']['variable']}{$lng['panel']['description']}{\Froxlor\I18N\Lang::getAll()['panel']['variable']}{\Froxlor\I18N\Lang::getAll()['panel']['description']}
    {PEAR_DIR}{$lng['admin']['phpconfig']['pear_dir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['pear_dir']}
    {OPEN_BASEDIR_C}{$lng['admin']['phpconfig']['open_basedir_c']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_c']}
    {OPEN_BASEDIR}{$lng['admin']['phpconfig']['open_basedir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir']}
    {OPEN_BASEDIR_GLOBAL}{$lng['admin']['phpconfig']['open_basedir_global']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['open_basedir_global']}
    {TMP_DIR}{$lng['admin']['phpconfig']['tmp_dir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['tmp_dir']}
    {CUSTOMER_EMAIL}{$lng['admin']['phpconfig']['customer_email']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer_email']}
    {ADMIN_EMAIL}{$lng['admin']['phpconfig']['admin_email']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin_email']}
    {DOMAIN}{$lng['admin']['phpconfig']['domain']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['domain']}
    {CUSTOMER}{$lng['admin']['phpconfig']['customer']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['customer']}
    {ADMIN}{$lng['admin']['phpconfig']['admin']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['admin']}
    {DOCUMENT_ROOT}{$lng['admin']['phpconfig']['docroot']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['docroot']}
    {CUSTOMER_HOMEDIR}{$lng['admin']['phpconfig']['homedir']}{\Froxlor\I18N\Lang::getAll()['admin']['phpconfig']['homedir']}
    diff --git a/templates/Sparkle/admin/phpconfig/overview_overview.tpl b/templates/Sparkle/admin/phpconfig/overview_overview.tpl index 18059d57..02a3c780 100644 --- a/templates/Sparkle/admin/phpconfig/overview_overview.tpl +++ b/templates/Sparkle/admin/phpconfig/overview_overview.tpl @@ -1,6 +1,6 @@
    {$row['description']}{$domains}+ {$subdomains_count} {$lng['customer']['subdomains']}{$domains}+ {$subdomains_count} {\Froxlor\I18N\Lang::getAll()['customer']['subdomains']} {$row['fpmdesc']} {$row['file_extensions']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - - - - - + + + + + @@ -49,7 +49,7 @@ $header
      - {$lng['admin']['plans']['add']} + {\Froxlor\I18N\Lang::getAll()['admin']['plans']['add']}
    diff --git a/templates/Sparkle/admin/plans/plans_plan.tpl b/templates/Sparkle/admin/plans/plans_plan.tpl index a49c703c..31d622b8 100644 --- a/templates/Sparkle/admin/plans/plans_plan.tpl +++ b/templates/Sparkle/admin/plans/plans_plan.tpl @@ -5,10 +5,10 @@ diff --git a/templates/Sparkle/admin/settings/apcuinfo/showinfo.tpl b/templates/Sparkle/admin/settings/apcuinfo/showinfo.tpl index fbfc0220..e0441b2b 100644 --- a/templates/Sparkle/admin/settings/apcuinfo/showinfo.tpl +++ b/templates/Sparkle/admin/settings/apcuinfo/showinfo.tpl @@ -3,118 +3,118 @@ $header

      - {$lng['admin']['apcuinfo']} + {\Froxlor\I18N\Lang::getAll()['admin']['apcuinfo']}

    {$lng['admin']['plans']['name']} {$arrowcode['p.name']}{$lng['admin']['plans']['description']} {$arrowcode['p.description']}{$lng['admin']['admin']} {$arrowcode['adminname']}{$lng['admin']['plans']['last_update']} {$arrowcode['p.ts']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['admin']['plans']['name']} {$arrowcode['p.name']}{\Froxlor\I18N\Lang::getAll()['admin']['plans']['description']} {$arrowcode['p.description']}{\Froxlor\I18N\Lang::getAll()['admin']['admin']} {$arrowcode['adminname']}{\Froxlor\I18N\Lang::getAll()['admin']['plans']['last_update']} {$arrowcode['p.ts']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$row['ts_format']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - + - + {$img_src1} - + - + - + {$img_src2} - + - + - + {$img_src3} - + - + {$runtimelines}
    {$lng['apcuinfo']['generaltitle']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['generaltitle']} - {$lng['apcuinfo']['clearcache']} + {\Froxlor\I18N\Lang::getAll()['apcuinfo']['clearcache']}  
    {$lng['apcuinfo']['version']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['version']} {$apcversion}
    {$lng['apcuinfo']['phpversion']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['phpversion']} {$phpversion}
    {$lng['apcuinfo']['sharedmem']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['sharedmem']} {$sharedmem}
    {$lng['apcuinfo']['start']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['start']} {$starttime}
    {$lng['apcuinfo']['uptime']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['uptime']} {$uptime_duration}
    {$lng['apcuinfo']['upload']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['upload']} {$cache['file_upload_progress']}
    {$lng['apcuinfo']['cachetitle']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['cachetitle']}
    {$lng['apcuinfo']['cvar']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['cvar']} {$number_vars} ({$size_vars})
    {$lng['apcuinfo']['hit']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hit']} {$cache['num_hits']}
    {$lng['apcuinfo']['miss']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['miss']} {$cache['num_misses']}
    {$lng['apcuinfo']['reqrate']}{$req_rate_user} {$lng['apcuinfo']['creqsec']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['reqrate']}{$req_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}
    {$lng['apcuinfo']['hitrate']}{$hit_rate_user} {$lng['apcuinfo']['creqsec']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hitrate']}{$hit_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}
    {$lng['apcuinfo']['missrate']}{$miss_rate_user} {$lng['apcuinfo']['creqsec']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['missrate']}{$miss_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}
    {$lng['apcuinfo']['insrate']}{$insert_rate_user} {$lng['apcuinfo']['creqsec']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['insrate']}{$insert_rate_user} {\Froxlor\I18N\Lang::getAll()['apcuinfo']['creqsec']}
    {$lng['apcuinfo']['cachefull']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['cachefull']} {$cache['num_expunges']}
    {$lng['apcuinfo']['memnote']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['memnote']}
    {$lng['apcuinfo']['free']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['free']} {$freemem}
    {$lng['apcuinfo']['used']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['used']} {$usedmem}
    {$lng['apcuinfo']['hitmiss']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hitmiss']}
    {$lng['apcuinfo']['hit']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['hit']} {$hits}
    {$lng['apcuinfo']['miss']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['miss']} {$misses}
    {$lng['apcuinfo']['detailmem']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['detailmem']}
    {$lng['apcuinfo']['fragment']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['fragment']} {$frag}
    {$lng['apcuinfo']['runtime']}{\Froxlor\I18N\Lang::getAll()['apcuinfo']['runtime']}
    diff --git a/templates/Sparkle/admin/settings/importexport/index.tpl b/templates/Sparkle/admin/settings/importexport/index.tpl index 41da2dfb..ce19e9f1 100644 --- a/templates/Sparkle/admin/settings/importexport/index.tpl +++ b/templates/Sparkle/admin/settings/importexport/index.tpl @@ -3,13 +3,13 @@ $header

      - {$lng['admin']['configfiles']['importexport']} + {\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['importexport']}

    - +


    diff --git a/templates/Sparkle/admin/settings/integritycheck.tpl b/templates/Sparkle/admin/settings/integritycheck.tpl index 335957d8..524937b2 100644 --- a/templates/Sparkle/admin/settings/integritycheck.tpl +++ b/templates/Sparkle/admin/settings/integritycheck.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['integritycheck']} + {\Froxlor\I18N\Lang::getAll()['admin']['integritycheck']}

    @@ -11,13 +11,13 @@ $header - - - + + + - + {$integritycheck} diff --git a/templates/Sparkle/admin/settings/opcacheinfo/showinfo.tpl b/templates/Sparkle/admin/settings/opcacheinfo/showinfo.tpl index 0a688fe5..1c215b49 100644 --- a/templates/Sparkle/admin/settings/opcacheinfo/showinfo.tpl +++ b/templates/Sparkle/admin/settings/opcacheinfo/showinfo.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['opcacheinfo']} + {\Froxlor\I18N\Lang::getAll()['admin']['opcacheinfo']}

    @@ -14,16 +14,16 @@ $header

    - {$lng['opcacheinfo']['memusage']}
    + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['memusage']}
    - {$lng['opcacheinfo']['used']}: {$usedmemstr}
    - {$lng['opcacheinfo']['free']}: {$freememstr} + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['used']}: {$usedmemstr}
    + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['free']}: {$freememstr}

    - {$lng['opcacheinfo']['wastedmem']}
    + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['wastedmem']}
    {$wastedmemstr} @@ -33,10 +33,10 @@ $header

    - {$lng['opcacheinfo']['strinterning']}
    + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['strinterning']}
    - {$lng['opcacheinfo']['used']}: {$usedstringstr}
    - {$lng['opcacheinfo']['free']}: {$freestringstr} + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['used']}: {$usedstringstr}
    + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['free']}: {$freestringstr}
    @@ -44,7 +44,7 @@ $header

    - {$lng['opcacheinfo']['usedkey']}
    + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedkey']}
    {$usedkeystr} @@ -54,7 +54,7 @@ $header

    - {$lng['opcacheinfo']['hitsc']} + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['hitsc']}
    @@ -62,133 +62,133 @@ $header
    {$lng['admin']['integrityid']}{$lng['admin']['integrityname']}{$lng['admin']['integrityresult']}{\Froxlor\I18N\Lang::getAll()['admin']['integrityid']}{\Froxlor\I18N\Lang::getAll()['admin']['integrityname']}{\Froxlor\I18N\Lang::getAll()['admin']['integrityresult']}
    {$lng['admin']['integrityfix']}{\Froxlor\I18N\Lang::getAll()['admin']['integrityfix']}
    - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + {$runtimelines} - + {$blacklistlines} diff --git a/templates/Sparkle/admin/settings/phpinfo.tpl b/templates/Sparkle/admin/settings/phpinfo.tpl index 45774c1f..8b58d45f 100644 --- a/templates/Sparkle/admin/settings/phpinfo.tpl +++ b/templates/Sparkle/admin/settings/phpinfo.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['phpinfo']} + {\Froxlor\I18N\Lang::getAll()['admin']['phpinfo']}

    diff --git a/templates/Sparkle/admin/settings/settings.tpl b/templates/Sparkle/admin/settings/settings.tpl index 12082722..16d6f67f 100644 --- a/templates/Sparkle/admin/settings/settings.tpl +++ b/templates/Sparkle/admin/settings/settings.tpl @@ -2,9 +2,9 @@

      - {$lng['admin']['serversettings']}   - [{$lng['admin']['configfiles']['compactoverview']}]   - [{$lng['admin']['configfiles']['importexport']}] + {\Froxlor\I18N\Lang::getAll()['admin']['serversettings']}   + [{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['compactoverview']}]   + [{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['importexport']}]

    @@ -14,7 +14,7 @@ diff --git a/templates/Sparkle/admin/settings/settings_group.tpl b/templates/Sparkle/admin/settings/settings_group.tpl index a832410f..dc56cf9e 100644 --- a/templates/Sparkle/admin/settings/settings_group.tpl +++ b/templates/Sparkle/admin/settings/settings_group.tpl @@ -3,6 +3,6 @@ {$groupdetails['title']} diff --git a/templates/Sparkle/admin/settings/settings_overview.tpl b/templates/Sparkle/admin/settings/settings_overview.tpl index 4a59c4c7..c24df56c 100644 --- a/templates/Sparkle/admin/settings/settings_overview.tpl +++ b/templates/Sparkle/admin/settings/settings_overview.tpl @@ -2,9 +2,9 @@

      - {$lng['admin']['serversettings']}   - [{$lng['admin']['configfiles']['overview']}]   - [{$lng['admin']['configfiles']['importexport']}] + {\Froxlor\I18N\Lang::getAll()['admin']['serversettings']}   + [{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['overview']}]   + [{\Froxlor\I18N\Lang::getAll()['admin']['configfiles']['importexport']}]

    @@ -13,7 +13,7 @@ @@ -23,7 +23,7 @@ diff --git a/templates/Sparkle/admin/settings/settings_overviewgroup.tpl b/templates/Sparkle/admin/settings/settings_overviewgroup.tpl index bfa4b801..5b0d7858 100644 --- a/templates/Sparkle/admin/settings/settings_overviewgroup.tpl +++ b/templates/Sparkle/admin/settings/settings_overviewgroup.tpl @@ -5,7 +5,7 @@ diff --git a/templates/Sparkle/admin/settings/testmail.tpl b/templates/Sparkle/admin/settings/testmail.tpl index 3b2f1243..c6bb7844 100644 --- a/templates/Sparkle/admin/settings/testmail.tpl +++ b/templates/Sparkle/admin/settings/testmail.tpl @@ -3,14 +3,14 @@ $header

      - {$lng['admin']['testmail']} + {\Froxlor\I18N\Lang::getAll()['admin']['testmail']}

    -
    {$lng['admin']['warning']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['warning']}
    {$mailerr_msg}
    @@ -19,7 +19,7 @@ $header
    {$lng['opcacheinfo']['generaltitle']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['generaltitle']} - {$lng['opcacheinfo']['resetcache']} + {\Froxlor\I18N\Lang::getAll()['opcacheinfo']['resetcache']}  
    {$lng['opcacheinfo']['version']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['version']} {$general['version']}
    {$lng['opcacheinfo']['phpversion']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['phpversion']} {$general['phpversion']}
    {$lng['opcacheinfo']['start']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['start']} {$general['start_time']}
    {$lng['opcacheinfo']['lastreset']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['lastreset']} {$general['last_restart_time']}
    {$lng['opcacheinfo']['oomrestarts']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['oomrestarts']} {$general['oom_restarts']}
    {$lng['opcacheinfo']['hashrestarts']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['hashrestarts']} {$general['hash_restarts']}
    {$lng['opcacheinfo']['manualrestarts']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['manualrestarts']} {$general['manual_restarts']}
    {$lng['opcacheinfo']['status']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['status']} {$general['status']}
    {$lng['opcacheinfo']['cachedscripts']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['cachedscripts']} {$general['cachedscripts']}
    {$lng['opcacheinfo']['hitsc']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['hitsc']} {$general['cachehits']}
    {$lng['opcacheinfo']['missc']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['missc']} {$general['cachemiss']}
    {$lng['opcacheinfo']['blmissc']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['blmissc']} {$general['blacklistmiss']}
    {$lng['opcacheinfo']['memusage']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['memusage']}
    {$lng['opcacheinfo']['totalmem']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['totalmem']} {$memory['total']}
    {$lng['opcacheinfo']['usedmem']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedmem']} {$memory['used']}
    {$lng['opcacheinfo']['freemem']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['freemem']} {$memory['free']}
    {$lng['opcacheinfo']['wastedmem']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['wastedmem']} {$memory['wasted']}
    {$lng['opcacheinfo']['strinterning']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['strinterning']}
    {$lng['opcacheinfo']['totalmem']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['totalmem']} {$stringbuffer['total']}
    {$lng['opcacheinfo']['usedmem']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedmem']} {$stringbuffer['used']}
    {$lng['opcacheinfo']['freemem']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['freemem']} {$stringbuffer['free']}
    {$lng['opcacheinfo']['strcount']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['strcount']} {$stringbuffer['strcount']}
    {$lng['opcacheinfo']['keystat']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['keystat']}
    {$lng['opcacheinfo']['maxkey']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['maxkey']} {$keystat['total']}
    {$lng['opcacheinfo']['usedkey']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['usedkey']} {$keystat['used']}
    {$lng['opcacheinfo']['wastedkey']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['wastedkey']} {$keystat['wasted']}
    {$lng['opcacheinfo']['runtimeconf']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['runtimeconf']}
    {$lng['opcacheinfo']['blacklist']}{\Froxlor\I18N\Lang::getAll()['opcacheinfo']['blacklist']}
    - +
    - +
    - +
    - +
    {$option} - {$lng['admin']['serversettings']} + {\Froxlor\I18N\Lang::getAll()['admin']['serversettings']}
    - + diff --git a/templates/Sparkle/admin/settings/updatecounters.tpl b/templates/Sparkle/admin/settings/updatecounters.tpl index 200689c1..a97fbb7f 100644 --- a/templates/Sparkle/admin/settings/updatecounters.tpl +++ b/templates/Sparkle/admin/settings/updatecounters.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['updatecounters']} + {\Froxlor\I18N\Lang::getAll()['admin']['updatecounters']}

    @@ -11,13 +11,13 @@ $header
    {$lng['serversettings']['mail_smtp_user']}{\Froxlor\I18N\Lang::getAll()['serversettings']['mail_smtp_user']} Host Port SMTP Auth
    - + {$customers} - + {$admins} diff --git a/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl b/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl index 87cd07ef..f9f2c4d1 100644 --- a/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl +++ b/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl @@ -3,20 +3,20 @@ {$admin['loginname']}{$admin['loginname']} diff --git a/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl b/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl index e318a109..acd66c38 100644 --- a/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl +++ b/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl @@ -3,16 +3,16 @@ {$customer['name']}, {$customer['firstname']} | {$customer['company']} ({$customer['loginname']}) diff --git a/templates/Sparkle/admin/templates/filetemplates_add.tpl b/templates/Sparkle/admin/templates/filetemplates_add.tpl index e419d3a8..4c3be11c 100644 --- a/templates/Sparkle/admin/templates/filetemplates_add.tpl +++ b/templates/Sparkle/admin/templates/filetemplates_add.tpl @@ -26,7 +26,7 @@ $header

    - {$lng['admin']['templates']['template_replace_vars']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}

    @@ -35,35 +35,35 @@ $header
    {$lng['admin']['customers']}{\Froxlor\I18N\Lang::getAll()['admin']['customers']}
    {$lng['admin']['admins']}{\Froxlor\I18N\Lang::getAll()['admin']['admins']}
    - {$lng['admin']['customers']}: class="green"class="red">{$admin['customers_used']} -> {$admin['customers_used_new']}
    - {$lng['customer']['domains']}: class="green"class="red">{$admin['domains_used']} -> {$admin['domains_used_new']}
    - {$lng['customer']['subdomains']}: class="green"class="red">{$admin['subdomains_used']} -> {$admin['subdomains_used_new']}
    - {$lng['customer']['diskspace']}: class="green"class="red">{$admin['diskspace_used']} -> {$admin['diskspace_used_new']}
    - {$lng['customer']['traffic']}: class="green"class="red">{$admin['traffic_used']} -> {$admin['traffic_used_new']}
    - {$lng['customer']['mysqls']}: class="green"class="red">{$admin['mysqls_used']} -> {$admin['mysqls_used_new']} + {\Froxlor\I18N\Lang::getAll()['admin']['customers']}: class="green"class="red">{$admin['customers_used']} -> {$admin['customers_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['domains']}: class="green"class="red">{$admin['domains_used']} -> {$admin['domains_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}: class="green"class="red">{$admin['subdomains_used']} -> {$admin['subdomains_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['diskspace']}: class="green"class="red">{$admin['diskspace_used']} -> {$admin['diskspace_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['traffic']}: class="green"class="red">{$admin['traffic_used']} -> {$admin['traffic_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}: class="green"class="red">{$admin['mysqls_used']} -> {$admin['mysqls_used_new']}     		- {$lng['customer']['emails']}: class="green"class="red">{$admin['emails_used']} -> {$admin['emails_used_new']}
    - {$lng['customer']['accounts']}: class="green"class="red">{$admin['email_accounts_used']} -> {$admin['email_accounts_used_new']}
    - {$lng['customer']['forwarders']}: class="green"class="red">{$admin['email_forwarders_used']} -> {$admin['email_forwarders_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['emails']}: class="green"class="red">{$admin['emails_used']} -> {$admin['emails_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['accounts']}: class="green"class="red">{$admin['email_accounts_used']} -> {$admin['email_accounts_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}: class="green"class="red">{$admin['email_forwarders_used']} -> {$admin['email_forwarders_used_new']}
    - {$lng['customer']['email_quota']}: class="green"class="red">{$admin['email_quota_used']} -> {$admin['email_quota_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['email_quota']}: class="green"class="red">{$admin['email_quota_used']} -> {$admin['email_quota_used_new']}
    - {$lng['customer']['ftps']}: class="green"class="red">{$admin['ftps_used']} -> {$admin['ftps_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['ftps']}: class="green"class="red">{$admin['ftps_used']} -> {$admin['ftps_used_new']}
    - {$lng['customer']['subdomains']}: class="green"class="red">{$customer['subdomains_used']} -> {$customer['subdomains_used_new']}
    - {$lng['customer']['mysqls']}: class="green"class="red">{$customer['mysqls_used']} -> {$customer['mysqls_used_new']}
    - {$lng['customer']['emails']}: class="green"class="red">{$customer['emails_used']} -> {$customer['emails_used_new']}
    - {$lng['customer']['accounts']}: class="green"class="red">{$customer['email_accounts_used']} -> {$customer['email_accounts_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}: class="green"class="red">{$customer['subdomains_used']} -> {$customer['subdomains_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}: class="green"class="red">{$customer['mysqls_used']} -> {$customer['mysqls_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['emails']}: class="green"class="red">{$customer['emails_used']} -> {$customer['emails_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['accounts']}: class="green"class="red">{$customer['email_accounts_used']} -> {$customer['email_accounts_used_new']}
    		 - {$lng['customer']['forwarders']}: class="green"class="red">{$customer['email_forwarders_used']} -> {$customer['email_forwarders_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}: class="green"class="red">{$customer['email_forwarders_used']} -> {$customer['email_forwarders_used_new']}
    - {$lng['customer']['email_quota']}: class="green"class="red">{$customer['email_quota_used']} -> {$customer['email_quota_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['email_quota']}: class="green"class="red">{$customer['email_quota_used']} -> {$customer['email_quota_used_new']}
    - {$lng['customer']['ftps']}: class="green"class="red">{$customer['ftps_used']} -> {$customer['ftps_used_new']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['ftps']}: class="green"class="red">{$customer['ftps_used']} -> {$customer['ftps_used_new']}
    - - + + - + - + - + - + - +
    {$lng['panel']['variable']}{$lng['panel']['description']}{\Froxlor\I18N\Lang::getAll()['panel']['variable']}{\Froxlor\I18N\Lang::getAll()['panel']['description']}
    - {$lng['admin']['templates']['index_html']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['index_html']}
    {SERVERNAME}{$lng['admin']['templates']['SERVERNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SERVERNAME']}
    {CUSTOMER}{$lng['admin']['templates']['CUSTOMER']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['CUSTOMER']}
    {ADMIN}{$lng['admin']['templates']['ADMIN']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['ADMIN']}
    {CUSTOMER_EMAIL}{$lng['admin']['templates']['CUSTOMER_EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['CUSTOMER_EMAIL']}
    {ADMIN_EMAIL}{$lng['admin']['templates']['ADMIN_EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['ADMIN_EMAIL']}
    diff --git a/templates/Sparkle/admin/templates/filetemplates_edit.tpl b/templates/Sparkle/admin/templates/filetemplates_edit.tpl index 4a8a20dd..f23a0afd 100644 --- a/templates/Sparkle/admin/templates/filetemplates_edit.tpl +++ b/templates/Sparkle/admin/templates/filetemplates_edit.tpl @@ -27,7 +27,7 @@ $header

    - {$lng['admin']['templates']['template_replace_vars']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}

    @@ -36,35 +36,35 @@ $header - - + + - + - + - + - + - +
    {$lng['panel']['variable']}{$lng['panel']['description']}{\Froxlor\I18N\Lang::getAll()['panel']['variable']}{\Froxlor\I18N\Lang::getAll()['panel']['description']}
    - {$lng['admin']['templates']['index_html']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['index_html']}
    {SERVERNAME}{$lng['admin']['templates']['SERVERNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SERVERNAME']}
    {CUSTOMER}{$lng['admin']['templates']['CUSTOMER']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['CUSTOMER']}
    {ADMIN}{$lng['admin']['templates']['ADMIN']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['ADMIN']}
    {CUSTOMER_EMAIL}{$lng['admin']['templates']['CUSTOMER_EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['CUSTOMER_EMAIL']}
    {ADMIN_EMAIL}{$lng['admin']['templates']['ADMIN_EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['ADMIN_EMAIL']}
    diff --git a/templates/Sparkle/admin/templates/templates.tpl b/templates/Sparkle/admin/templates/templates.tpl index 60e019d8..63e967d1 100644 --- a/templates/Sparkle/admin/templates/templates.tpl +++ b/templates/Sparkle/admin/templates/templates.tpl @@ -3,27 +3,27 @@ $header

      - {$lng['admin']['templates']['email']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['email']}

    - {$lng['admin']['templates']['templates']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['templates']}

      - {$lng['admin']['templates']['template_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add']}
    - - - + + + @@ -35,20 +35,20 @@ $header

    - {$lng['admin']['templates']['filetemplates']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['filetemplates']}

      - {$lng['admin']['templates']['template_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add']}
    {$lng['login']['language']}{$lng['admin']['templates']['action']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['login']['language']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['action']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - - + + diff --git a/templates/Sparkle/admin/templates/templates_add_1.tpl b/templates/Sparkle/admin/templates/templates_add_1.tpl index 95fcb58a..e835dfce 100644 --- a/templates/Sparkle/admin/templates/templates_add_1.tpl +++ b/templates/Sparkle/admin/templates/templates_add_1.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['admin']['templates']['template_add']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_add']}

    @@ -17,17 +17,17 @@ $header
    {$lng['admin']['templates']['action']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['action']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - + - + - - + +
    diff --git a/templates/Sparkle/admin/templates/templates_add_2.tpl b/templates/Sparkle/admin/templates/templates_add_2.tpl index 6f197624..7162ae97 100644 --- a/templates/Sparkle/admin/templates/templates_add_2.tpl +++ b/templates/Sparkle/admin/templates/templates_add_2.tpl @@ -26,7 +26,7 @@ $header

    - {$lng['admin']['templates']['template_replace_vars']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}

    @@ -35,150 +35,150 @@ $header - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/templates/Sparkle/admin/templates/templates_edit.tpl b/templates/Sparkle/admin/templates/templates_edit.tpl index d9a12501..4be6ae4b 100644 --- a/templates/Sparkle/admin/templates/templates_edit.tpl +++ b/templates/Sparkle/admin/templates/templates_edit.tpl @@ -28,7 +28,7 @@ $header

    - {$lng['admin']['templates']['template_replace_vars']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['template_replace_vars']}

    @@ -37,150 +37,150 @@ $header
    {$lng['panel']['variable']}{$lng['panel']['description']}{\Froxlor\I18N\Lang::getAll()['panel']['variable']}{\Froxlor\I18N\Lang::getAll()['panel']['description']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {FIRSTNAME}{$lng['admin']['templates']['FIRSTNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['FIRSTNAME']}
    {NAME}{$lng['admin']['templates']['NAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['NAME']}
    {COMPANY}{$lng['admin']['templates']['COMPANY']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['COMPANY']}
    {USERNAME}{$lng['admin']['templates']['USERNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USERNAME']}
    {PASSWORD}{$lng['admin']['templates']['PASSWORD']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['PASSWORD']}
    {EMAIL}{$lng['admin']['templates']['EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['EMAIL']}
    - {$lng['admin']['templates']['pop_success_alternative']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['pop_success_alternative']}
    {EMAIL}{$lng['admin']['templates']['EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['EMAIL']}
    {PASSWORD}{$lng['admin']['templates']['EMAIL_PASSWORD']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['EMAIL_PASSWORD']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {USERNAME}{$lng['admin']['templates']['USERNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USERNAME']}
    {LINK}{$lng['admin']['templates']['LINK']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['LINK']}
    {TRAFFIC}{$lng['admin']['templates']['TRAFFIC']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['TRAFFIC']}
    {TRAFFICUSED}{$lng['admin']['templates']['TRAFFICUSED']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['TRAFFICUSED']}
    {MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['MAX_PERCENT']}
    {USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USAGE_PERCENT']}
    {DISKAVAILABLE}{$lng['admin']['templates']['DISKAVAILABLE']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DISKAVAILABLE']}
    {DISKUSED}{$lng['admin']['templates']['DISKUSED']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DISKUSED']}
    {MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['MAX_PERCENT']}
    {USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USAGE_PERCENT']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {DB_NAME}{$lng['admin']['templates']['DB_NAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_NAME']}
    {DB_PASS}{$lng['admin']['templates']['DB_PASS']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_PASS']}
    {DB_DESC}{$lng['admin']['templates']['DB_DESC']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_DESC']}
    {DB_SRV}{$lng['admin']['templates']['DB_SRV']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_SRV']}
    {PMA_URI}{$lng['admin']['templates']['PMA_URI']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['PMA_URI']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {USR_NAME}{$lng['admin']['templates']['USR_NAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USR_NAME']}
    {USR_PASS}{$lng['admin']['templates']['USR_PASS']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USR_PASS']}
    {USR_PATH}{$lng['admin']['templates']['USR_PATH']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USR_PATH']}
    - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/templates/Sparkle/admin/templates/templates_filetemplate.tpl b/templates/Sparkle/admin/templates/templates_filetemplate.tpl index 974276df..800fc677 100644 --- a/templates/Sparkle/admin/templates/templates_filetemplate.tpl +++ b/templates/Sparkle/admin/templates/templates_filetemplate.tpl @@ -1,11 +1,11 @@ - + diff --git a/templates/Sparkle/admin/templates/templates_template.tpl b/templates/Sparkle/admin/templates/templates_template.tpl index 483a04b9..ed9afe6f 100644 --- a/templates/Sparkle/admin/templates/templates_template.tpl +++ b/templates/Sparkle/admin/templates/templates_template.tpl @@ -3,10 +3,10 @@ diff --git a/templates/Sparkle/admin/traffic/index.tpl b/templates/Sparkle/admin/traffic/index.tpl index f577f00a..204c674b 100644 --- a/templates/Sparkle/admin/traffic/index.tpl +++ b/templates/Sparkle/admin/traffic/index.tpl @@ -2,7 +2,7 @@ $header

    - {$lng['admin']['traffic']} {$lng['admin']['traffic']}   + {\Froxlor\I18N\Lang::getAll()['admin']['traffic']} {\Froxlor\I18N\Lang::getAll()['admin']['traffic']}  

    {$stats_tables} diff --git a/templates/Sparkle/admin/traffic/index_table.tpl b/templates/Sparkle/admin/traffic/index_table.tpl index 0ad975c4..92a46c19 100644 --- a/templates/Sparkle/admin/traffic/index_table.tpl +++ b/templates/Sparkle/admin/traffic/index_table.tpl @@ -1,21 +1,21 @@ -

    {$lng['traffic']['trafficoverview']} {$overview['type']} {$overview['year']}

    +

    {\Froxlor\I18N\Lang::getAll()['traffic']['trafficoverview']} {$overview['type']} {$overview['year']}

    {$lng['panel']['variable']}{$lng['panel']['description']}{\Froxlor\I18N\Lang::getAll()['panel']['variable']}{\Froxlor\I18N\Lang::getAll()['panel']['description']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {FIRSTNAME}{$lng['admin']['templates']['FIRSTNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['FIRSTNAME']}
    {NAME}{$lng['admin']['templates']['NAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['NAME']}
    {COMPANY}{$lng['admin']['templates']['COMPANY']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['COMPANY']}
    {USERNAME}{$lng['admin']['templates']['USERNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USERNAME']}
    {PASSWORD}{$lng['admin']['templates']['PASSWORD']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['PASSWORD']}
    {EMAIL}{$lng['admin']['templates']['EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['EMAIL']}
    - {$lng['admin']['templates']['pop_success_alternative']} + {\Froxlor\I18N\Lang::getAll()['admin']['templates']['pop_success_alternative']}
    {EMAIL}{$lng['admin']['templates']['EMAIL']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['EMAIL']}
    {PASSWORD}{$lng['admin']['templates']['EMAIL_PASSWORD']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['EMAIL_PASSWORD']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {USERNAME}{$lng['admin']['templates']['USERNAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USERNAME']}
    {LINK}{$lng['admin']['templates']['LINK']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['LINK']}
    {TRAFFIC}{$lng['admin']['templates']['TRAFFIC']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['TRAFFIC']}
    {TRAFFICUSED}{$lng['admin']['templates']['TRAFFICUSED']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['TRAFFICUSED']}
    {MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['MAX_PERCENT']}
    {USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USAGE_PERCENT']}
    {DISKAVAILABLE}{$lng['admin']['templates']['DISKAVAILABLE']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DISKAVAILABLE']}
    {DISKUSED}{$lng['admin']['templates']['DISKUSED']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DISKUSED']}
    {MAX_PERCENT}{$lng['admin']['templates']['MAX_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['MAX_PERCENT']}
    {USAGE_PERCENT}{$lng['admin']['templates']['USAGE_PERCENT']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USAGE_PERCENT']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {DB_NAME}{$lng['admin']['templates']['DB_NAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_NAME']}
    {DB_PASS}{$lng['admin']['templates']['DB_PASS']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_PASS']}
    {DB_DESC}{$lng['admin']['templates']['DB_DESC']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_DESC']}
    {DB_SRV}{$lng['admin']['templates']['DB_SRV']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['DB_SRV']}
    {PMA_URI}{$lng['admin']['templates']['PMA_URI']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['PMA_URI']}
    {SALUTATION}{$lng['admin']['templates']['SALUTATION']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['SALUTATION']}
    {USR_NAME}{$lng['admin']['templates']['USR_NAME']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USR_NAME']}
    {USR_PASS}{$lng['admin']['templates']['USR_PASS']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USR_PASS']}
    {USR_PATH}{$lng['admin']['templates']['USR_PATH']}{\Froxlor\I18N\Lang::getAll()['admin']['templates']['USR_PATH']}
    {$lng['admin']['templates'][$row['varname']]}{\Froxlor\I18N\Lang::getAll()['admin']['templates'][$row['varname']]} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    {$template} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - diff --git a/templates/Sparkle/admin/traffic/index_table_row.tpl b/templates/Sparkle/admin/traffic/index_table_row.tpl index 9ccddd97..e5c5907c 100644 --- a/templates/Sparkle/admin/traffic/index_table_row.tpl +++ b/templates/Sparkle/admin/traffic/index_table_row.tpl @@ -1,5 +1,5 @@ - + diff --git a/templates/Sparkle/admin/update/index.tpl b/templates/Sparkle/admin/update/index.tpl index cad982ad..e774ee12 100644 --- a/templates/Sparkle/admin/update/index.tpl +++ b/templates/Sparkle/admin/update/index.tpl @@ -1,6 +1,6 @@ $header
    -

    {$lng['update']['update']}

    +

    {\Froxlor\I18N\Lang::getAll()['update']['update']}

    @@ -9,7 +9,7 @@ $header - +

    diff --git a/templates/Sparkle/admin/update/noupdatesavail.tpl b/templates/Sparkle/admin/update/noupdatesavail.tpl index bb14a3a0..8a650d33 100644 --- a/templates/Sparkle/admin/update/noupdatesavail.tpl +++ b/templates/Sparkle/admin/update/noupdatesavail.tpl @@ -1,10 +1,10 @@ $header
    -
    {$lng['update']['update']}
    +
    {\Froxlor\I18N\Lang::getAll()['update']['update']}
    $success_message -

    {$lng['success']['clickheretocontinue']} +

    {\Froxlor\I18N\Lang::getAll()['success']['clickheretocontinue']}
    diff --git a/templates/Sparkle/admin/update/update_end.tpl b/templates/Sparkle/admin/update/update_end.tpl index 5fc66e6d..8bc3c735 100644 --- a/templates/Sparkle/admin/update/update_end.tpl +++ b/templates/Sparkle/admin/update/update_end.tpl @@ -1,6 +1,6 @@ $footer diff --git a/templates/Sparkle/admin/update/update_start.tpl b/templates/Sparkle/admin/update/update_start.tpl index 55e4e688..9b3899b4 100644 --- a/templates/Sparkle/admin/update/update_start.tpl +++ b/templates/Sparkle/admin/update/update_start.tpl @@ -1,6 +1,6 @@ $header
    -

    {$lng['update']['update']}

    +

    {\Froxlor\I18N\Lang::getAll()['update']['update']}

    diff --git a/templates/Sparkle/api_keys/keys_key.tpl b/templates/Sparkle/api_keys/keys_key.tpl index c2854a69..4ca9377f 100644 --- a/templates/Sparkle/api_keys/keys_key.tpl +++ b/templates/Sparkle/api_keys/keys_key.tpl @@ -1,4 +1,4 @@ -
    class="primary-entry" id="apikey-{$row['id']}" data-id="{$row['id']}" title="{$lng['apikeys']['clicktoview']}"> +class="primary-entry" id="apikey-{$row['id']}" data-id="{$row['id']}" title="{\Froxlor\I18N\Lang::getAll()['apikeys']['clicktoview']}"> @@ -18,7 +18,7 @@ - + - +
    {$overview['type']}{$lng['traffic']['months']['jan']} - {$lng['traffic']['months']['feb']} - {$lng['traffic']['months']['mar']} - {$lng['traffic']['months']['apr']} - {$lng['traffic']['months']['may']} - {$lng['traffic']['months']['jun']} - {$lng['traffic']['months']['jul']} - {$lng['traffic']['months']['aug']} - {$lng['traffic']['months']['sep']} - {$lng['traffic']['months']['oct']} - {$lng['traffic']['months']['nov']} - {$lng['traffic']['months']['dec']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['jan']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['feb']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['mar']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['apr']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['may']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['jun']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['jul']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['aug']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['sep']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['oct']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['nov']} + {\Froxlor\I18N\Lang::getAll()['traffic']['months']['dec']}
    {$virtual_host['name']} [{$lng['traffic']['details']}]{$virtual_host['name']} [{\Froxlor\I18N\Lang::getAll()['traffic']['details']}] {$virtual_host['jan']} {$virtual_host['feb']} {$virtual_host['mar']}
    {$adminCustomerLink} - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']} Secret
    {$lng['apikeys']['allowed_from']}
    {$lng['apikeys']['allowed_from_help']}    		{\Froxlor\I18N\Lang::getAll()['apikeys']['allowed_from']}
    {\Froxlor\I18N\Lang::getAll()['apikeys']['allowed_from_help']}
    {$lng['apikeys']['valid_until']}
    {$lng['apikeys']['valid_until_help']}    		{\Froxlor\I18N\Lang::getAll()['apikeys']['valid_until']}
    {\Froxlor\I18N\Lang::getAll()['apikeys']['valid_until_help']}
    diff --git a/templates/Sparkle/api_keys/keys_list.tpl b/templates/Sparkle/api_keys/keys_list.tpl index 43cdf15d..7b824e1f 100644 --- a/templates/Sparkle/api_keys/keys_list.tpl +++ b/templates/Sparkle/api_keys/keys_list.tpl @@ -3,13 +3,13 @@

      - {$lng['menue']['main']['apikeys']} + {\Froxlor\I18N\Lang::getAll()['menue']['main']['apikeys']}

    -
    {$lng['success']['success']}
    +
    {\Froxlor\I18N\Lang::getAll()['success']['success']}
    $success_message
    @@ -28,18 +28,18 @@
    - {$lng['apikeys']['key_add']} + {\Froxlor\I18N\Lang::getAll()['apikeys']['key_add']}
    - + - - - + + + @@ -60,7 +60,7 @@
    - {$lng['apikeys']['key_add']} + {\Froxlor\I18N\Lang::getAll()['apikeys']['key_add']}
    diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl index dbf8bd86..d02508e6 100644 --- a/templates/Sparkle/customer/domains/domainlist.tpl +++ b/templates/Sparkle/customer/domains/domainlist.tpl @@ -3,7 +3,7 @@

      - {$lng['domains']['domainsettings']} ({$domains_count}) + {\Froxlor\I18N\Lang::getAll()['domains']['domainsettings']} ({$domains_count})

    @@ -20,16 +20,16 @@
      - {$lng['domains']['subdomain_add']} + {\Froxlor\I18N\Lang::getAll()['domains']['subdomain_add']}
    {$lng['login']['username']}{\Froxlor\I18N\Lang::getAll()['login']['username']} API-key Secret{$lng['apikeys']['allowed_from']}{$lng['apikeys']['valid_until']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['apikeys']['allowed_from']}{\Froxlor\I18N\Lang::getAll()['apikeys']['valid_until']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - - - + + + @@ -50,7 +50,7 @@
      - {$lng['domains']['subdomain_add']} + {\Froxlor\I18N\Lang::getAll()['domains']['subdomain_add']}
    diff --git a/templates/Sparkle/customer/domains/domains.tpl b/templates/Sparkle/customer/domains/domains.tpl index 22e8f80e..eec87610 100644 --- a/templates/Sparkle/customer/domains/domains.tpl +++ b/templates/Sparkle/customer/domains/domains.tpl @@ -1,8 +1,8 @@ $header
    -
    {$lng['menue']['domains']['domains']}
    -
    {$lng['domains']['description']}
    +
    {\Froxlor\I18N\Lang::getAll()['menue']['domains']['domains']}
    +
    {\Froxlor\I18N\Lang::getAll()['domains']['description']}
    $footer diff --git a/templates/Sparkle/customer/domains/domains_delimiter.tpl b/templates/Sparkle/customer/domains/domains_delimiter.tpl index b12d080a..6510958f 100644 --- a/templates/Sparkle/customer/domains/domains_delimiter.tpl +++ b/templates/Sparkle/customer/domains/domains_delimiter.tpl @@ -1,5 +1,5 @@ - + diff --git a/templates/Sparkle/customer/domains/domains_domain.tpl b/templates/Sparkle/customer/domains/domains_domain.tpl index 64968b60..ab772c02 100644 --- a/templates/Sparkle/customer/domains/domains_domain.tpl +++ b/templates/Sparkle/customer/domains/domains_domain.tpl @@ -7,50 +7,50 @@ diff --git a/templates/Sparkle/customer/domains/domains_edit.tpl b/templates/Sparkle/customer/domains/domains_edit.tpl index 9650d630..fd2ae007 100644 --- a/templates/Sparkle/customer/domains/domains_edit.tpl +++ b/templates/Sparkle/customer/domains/domains_edit.tpl @@ -5,7 +5,7 @@ $header {$title}  {$title} -  ({$lng['dnseditor']['edit']}) +  ({\Froxlor\I18N\Lang::getAll()['dnseditor']['edit']}) diff --git a/templates/Sparkle/customer/email/email.tpl b/templates/Sparkle/customer/email/email.tpl index 925db389..e6c9ec01 100644 --- a/templates/Sparkle/customer/email/email.tpl +++ b/templates/Sparkle/customer/email/email.tpl @@ -1,8 +1,8 @@ $header
    -
    {$lng['menue']['email']['email']}
    -
    {$lng['emails']['description']}
    +
    {\Froxlor\I18N\Lang::getAll()['menue']['email']['email']}
    +
    {\Froxlor\I18N\Lang::getAll()['emails']['description']}
    $footer diff --git a/templates/Sparkle/customer/email/emails.tpl b/templates/Sparkle/customer/email/emails.tpl index e10c9c8a..57ccb59c 100644 --- a/templates/Sparkle/customer/email/emails.tpl +++ b/templates/Sparkle/customer/email/emails.tpl @@ -3,7 +3,7 @@

      - {$lng['menue']['email']['emails']} ({$emailscount}) + {\Froxlor\I18N\Lang::getAll()['menue']['email']['emails']} ({$emailscount})

    @@ -20,21 +20,21 @@
      - {$lng['emails']['emails_add']} + {\Froxlor\I18N\Lang::getAll()['emails']['emails_add']}
    {$lng['domains']['domainname']} {$arrowcode['d.domain']}{$lng['panel']['path']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['domains']['domainname']} {$arrowcode['d.domain']}{\Froxlor\I18N\Lang::getAll()['panel']['path']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$row['domain']} [{$lng['domains']['statstics']}]{$row['domain']} [{\Froxlor\I18N\Lang::getAll()['domains']['statstics']}]    
    {$row['domain']} -
    {$lng['domains']['registration_date']}: {$row['registration_date']} +
    {\Froxlor\I18N\Lang::getAll()['domains']['registration_date']}: {$row['registration_date']}     -
    ({$lng['domains']['termination_date_overview']} {$row['termination_date']})
     +
    ({\Froxlor\I18N\Lang::getAll()['domains']['termination_date_overview']} {$row['termination_date']})
         		{$row['documentroot']} - {$lng['domains']['aliasdomain']} {$row['aliasdomain']} + {\Froxlor\I18N\Lang::getAll()['domains']['aliasdomain']} {$row['aliasdomain']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['viewlogs']} + {\Froxlor\I18N\Lang::getAll()['panel']['viewlogs']} - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}   - {$lng['dnseditor']['edit']} + {\Froxlor\I18N\Lang::getAll()['dnseditor']['edit']}   - {$lng['panel']['ssleditor']} + {\Froxlor\I18N\Lang::getAll()['panel']['ssleditor']}   - {$lng['panel']['letsencrypt']} + {\Froxlor\I18N\Lang::getAll()['panel']['letsencrypt']} - ({$lng['domains']['isassigneddomain']})  + ({\Froxlor\I18N\Lang::getAll()['domains']['isassigneddomain']})  - {$lng['domains']['hasaliasdomains']} + {\Froxlor\I18N\Lang::getAll()['domains']['hasaliasdomains']}
    - - - - + + + + - + - + @@ -55,7 +55,7 @@
      - {$lng['emails']['emails_add']} + {\Froxlor\I18N\Lang::getAll()['emails']['emails_add']}
    diff --git a/templates/Sparkle/customer/email/emails_add.tpl b/templates/Sparkle/customer/email/emails_add.tpl index f713d2f8..efbc2970 100644 --- a/templates/Sparkle/customer/email/emails_add.tpl +++ b/templates/Sparkle/customer/email/emails_add.tpl @@ -11,8 +11,8 @@ $header
    -
    {$lng['admin']['warning']}
    -

    {$lng['emails']['noemaildomainaddedyet']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['warning']}
    +

    {\Froxlor\I18N\Lang::getAll()['emails']['noemaildomainaddedyet']}
    diff --git a/templates/Sparkle/customer/email/emails_edit.tpl b/templates/Sparkle/customer/email/emails_edit.tpl index 539c4749..5a98834f 100644 --- a/templates/Sparkle/customer/email/emails_edit.tpl +++ b/templates/Sparkle/customer/email/emails_edit.tpl @@ -17,7 +17,7 @@ $header {$email_edit_form}     - +
    {$lng['emails']['emailaddress']} {$arrowcode['m.email_full']}{$lng['emails']['forwarders']} {$arrowcode['m.destination']}{$lng['emails']['account']}{$lng['emails']['catchall']}{\Froxlor\I18N\Lang::getAll()['emails']['emailaddress']} {$arrowcode['m.email_full']}{\Froxlor\I18N\Lang::getAll()['emails']['forwarders']} {$arrowcode['m.destination']}{\Froxlor\I18N\Lang::getAll()['emails']['account']}{\Froxlor\I18N\Lang::getAll()['emails']['catchall']} {$lng['emails']['quota']}{\Froxlor\I18N\Lang::getAll()['emails']['quota']} {$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$lng['emails']['back_to_overview']}{\Froxlor\I18N\Lang::getAll()['emails']['back_to_overview']}
    diff --git a/templates/Sparkle/customer/email/emails_edit_forwarder.tpl b/templates/Sparkle/customer/email/emails_edit_forwarder.tpl index 88467962..251d3ea4 100644 --- a/templates/Sparkle/customer/email/emails_edit_forwarder.tpl +++ b/templates/Sparkle/customer/email/emails_edit_forwarder.tpl @@ -1,2 +1,2 @@ -$destination [{$lng['panel']['delete']}] +$destination [{\Froxlor\I18N\Lang::getAll()['panel']['delete']}]
    \ No newline at end of file diff --git a/templates/Sparkle/customer/email/emails_email.tpl b/templates/Sparkle/customer/email/emails_email.tpl index 18522ef0..9eb06df6 100644 --- a/templates/Sparkle/customer/email/emails_email.tpl +++ b/templates/Sparkle/customer/email/emails_email.tpl @@ -1,15 +1,15 @@ {$row['email_full']}  {$row['destination']} - {$lng['panel']['yes']} ({$row['mboxsize']}){$lng['panel']['no']} - {$lng['panel']['yes']}{$lng['panel']['no']} - {$lng['emails']['noquota']}{$row['quota']} MiB + {\Froxlor\I18N\Lang::getAll()['panel']['yes']} ({$row['mboxsize']}){\Froxlor\I18N\Lang::getAll()['panel']['no']} + {\Froxlor\I18N\Lang::getAll()['panel']['yes']}{\Froxlor\I18N\Lang::getAll()['panel']['no']} + {\Froxlor\I18N\Lang::getAll()['emails']['noquota']}{$row['quota']} MiB - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']} diff --git a/templates/Sparkle/customer/extras/backup.tpl b/templates/Sparkle/customer/extras/backup.tpl index 09faee56..cb66d353 100644 --- a/templates/Sparkle/customer/extras/backup.tpl +++ b/templates/Sparkle/customer/extras/backup.tpl @@ -10,8 +10,8 @@ $header
    -
    {$lng['admin']['warning']}
    -
    {$lng['error']['customerhasongoingbackupjob']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['warning']}
    +
    {\Froxlor\I18N\Lang::getAll()['error']['customerhasongoingbackupjob']}
     diff --git a/templates/Sparkle/customer/extras/backup_listexisting.tpl b/templates/Sparkle/customer/extras/backup_listexisting.tpl index 4afa8676..d730d9cc 100644 --- a/templates/Sparkle/customer/extras/backup_listexisting.tpl +++ b/templates/Sparkle/customer/extras/backup_listexisting.tpl @@ -1,9 +1,9 @@ - {$lng['panel']['path']} - {$lng['extras']['backup_web']} - {$lng['extras']['backup_mail']} - {$lng['extras']['backup_dbs']} + {\Froxlor\I18N\Lang::getAll()['panel']['path']} + {\Froxlor\I18N\Lang::getAll()['extras']['backup_web']} + {\Froxlor\I18N\Lang::getAll()['extras']['backup_mail']} + {\Froxlor\I18N\Lang::getAll()['extras']['backup_dbs']} @@ -19,7 +19,7 @@

    - +

    diff --git a/templates/Sparkle/customer/extras/extras.tpl b/templates/Sparkle/customer/extras/extras.tpl index ff8d0325..bd1cf0e6 100644 --- a/templates/Sparkle/customer/extras/extras.tpl +++ b/templates/Sparkle/customer/extras/extras.tpl @@ -1,8 +1,8 @@ $header
    -
    {$lng['menue']['extras']['extras']}
    -
    {$lng['extras']['description']}
    +
    {\Froxlor\I18N\Lang::getAll()['menue']['extras']['extras']}
    +
    {\Froxlor\I18N\Lang::getAll()['extras']['description']}
    $footer diff --git a/templates/Sparkle/customer/extras/htaccess.tpl b/templates/Sparkle/customer/extras/htaccess.tpl index eb05e8a8..bae4d585 100644 --- a/templates/Sparkle/customer/extras/htaccess.tpl +++ b/templates/Sparkle/customer/extras/htaccess.tpl @@ -3,7 +3,7 @@

      - {$lng['menue']['extras']['pathoptions']} + {\Froxlor\I18N\Lang::getAll()['menue']['extras']['pathoptions']}

    @@ -19,21 +19,21 @@
      - {$lng['extras']['pathoptions_add']} + {\Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add']}
    - - - - - + + + + + - + - + @@ -53,7 +53,7 @@
      - {$lng['extras']['pathoptions_add']} + {\Froxlor\I18N\Lang::getAll()['extras']['pathoptions_add']}
    diff --git a/templates/Sparkle/customer/extras/htaccess_htaccess.tpl b/templates/Sparkle/customer/extras/htaccess_htaccess.tpl index 3b544d9d..8156a331 100644 --- a/templates/Sparkle/customer/extras/htaccess_htaccess.tpl +++ b/templates/Sparkle/customer/extras/htaccess_htaccess.tpl @@ -9,10 +9,10 @@ diff --git a/templates/Sparkle/customer/extras/htpasswds.tpl b/templates/Sparkle/customer/extras/htpasswds.tpl index 10e4898b..982817a3 100644 --- a/templates/Sparkle/customer/extras/htpasswds.tpl +++ b/templates/Sparkle/customer/extras/htpasswds.tpl @@ -3,7 +3,7 @@

      - {$lng['menue']['extras']['directoryprotection']} + {\Froxlor\I18N\Lang::getAll()['menue']['extras']['directoryprotection']}

    @@ -19,15 +19,15 @@
      - {$lng['extras']['directoryprotection_add']} + {\Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add']}
    {$lng['panel']['path']} {$arrowcode['path']}{$lng['extras']['view_directory']} {$arrowcode['options_indexes']}{$lng['extras']['error404path']} {$arrowcode['error404path']}{$lng['extras']['error403path']} {$arrowcode['error403path']}{$lng['extras']['error500path']} {$arrowcode['error500path']}{\Froxlor\I18N\Lang::getAll()['panel']['path']} {$arrowcode['path']}{\Froxlor\I18N\Lang::getAll()['extras']['view_directory']} {$arrowcode['options_indexes']}{\Froxlor\I18N\Lang::getAll()['extras']['error404path']} {$arrowcode['error404path']}{\Froxlor\I18N\Lang::getAll()['extras']['error403path']} {$arrowcode['error403path']}{\Froxlor\I18N\Lang::getAll()['extras']['error500path']} {$arrowcode['error500path']} {$lng['extras']['execute_perl']} {$arrowcode['options_cgi']}{\Froxlor\I18N\Lang::getAll()['extras']['execute_perl']} {$arrowcode['options_cgi']} {$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - - - + + + @@ -49,7 +49,7 @@
      - {$lng['extras']['directoryprotection_add']} + {\Froxlor\I18N\Lang::getAll()['extras']['directoryprotection_add']}
    diff --git a/templates/Sparkle/customer/extras/htpasswds_htpasswd.tpl b/templates/Sparkle/customer/extras/htpasswds_htpasswd.tpl index a2faa0c7..104633eb 100644 --- a/templates/Sparkle/customer/extras/htpasswds_htpasswd.tpl +++ b/templates/Sparkle/customer/extras/htpasswds_htpasswd.tpl @@ -3,10 +3,10 @@ diff --git a/templates/Sparkle/customer/ftp/accounts.tpl b/templates/Sparkle/customer/ftp/accounts.tpl index c4c515b8..e027d84a 100644 --- a/templates/Sparkle/customer/ftp/accounts.tpl +++ b/templates/Sparkle/customer/ftp/accounts.tpl @@ -3,7 +3,7 @@

      - {$lng['menue']['ftp']['accounts']} ({$ftps_count}) + {\Froxlor\I18N\Lang::getAll()['menue']['ftp']['accounts']} ({$ftps_count})

    @@ -20,20 +20,20 @@
      - {$lng['ftp']['account_add']} + {\Froxlor\I18N\Lang::getAll()['ftp']['account_add']}
    {$lng['login']['username']} {$arrowcode['username']}{$lng['panel']['path']} {$arrowcode['path']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['login']['username']} {$arrowcode['username']}{\Froxlor\I18N\Lang::getAll()['panel']['path']} {$arrowcode['path']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$row['path']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - - - + + + - + - + @@ -54,7 +54,7 @@
      - {$lng['ftp']['account_add']} + {\Froxlor\I18N\Lang::getAll()['ftp']['account_add']}
    diff --git a/templates/Sparkle/customer/ftp/accounts_account.tpl b/templates/Sparkle/customer/ftp/accounts_account.tpl index cca5a11c..f9c7c3e6 100644 --- a/templates/Sparkle/customer/ftp/accounts_account.tpl +++ b/templates/Sparkle/customer/ftp/accounts_account.tpl @@ -7,10 +7,10 @@ diff --git a/templates/Sparkle/customer/ftp/ftp.tpl b/templates/Sparkle/customer/ftp/ftp.tpl index 0bfcefda..840b6261 100644 --- a/templates/Sparkle/customer/ftp/ftp.tpl +++ b/templates/Sparkle/customer/ftp/ftp.tpl @@ -1,8 +1,8 @@ $header
    -
    {$lng['menue']['ftp']['ftp']}
    -
    {$lng['ftp']['description']}
    +
    {\Froxlor\I18N\Lang::getAll()['menue']['ftp']['ftp']}
    +
    {\Froxlor\I18N\Lang::getAll()['ftp']['description']}
    $footer diff --git a/templates/Sparkle/customer/index/change_language.tpl b/templates/Sparkle/customer/index/change_language.tpl index 5da189f3..4b887a9e 100644 --- a/templates/Sparkle/customer/index/change_language.tpl +++ b/templates/Sparkle/customer/index/change_language.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['main']['changelanguage']} + {\Froxlor\I18N\Lang::getAll()['menue']['main']['changelanguage']}

    @@ -16,14 +16,14 @@ $header
    {$lng['login']['username']} {$arrowcode['username']}{$lng['panel']['ftpdesc']} {$arrowcode['description']}{$lng['panel']['path']} {$arrowcode['homedir']}{\Froxlor\I18N\Lang::getAll()['login']['username']} {$arrowcode['username']}{\Froxlor\I18N\Lang::getAll()['panel']['ftpdesc']} {$arrowcode['description']}{\Froxlor\I18N\Lang::getAll()['panel']['path']} {$arrowcode['homedir']} {$lng['panel']['shell']}{\Froxlor\I18N\Lang::getAll()['panel']['shell']} {$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - + diff --git a/templates/Sparkle/customer/index/change_password.tpl b/templates/Sparkle/customer/index/change_password.tpl index f878195d..71ee6bff 100644 --- a/templates/Sparkle/customer/index/change_password.tpl +++ b/templates/Sparkle/customer/index/change_password.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['main']['changepassword']} + {\Froxlor\I18N\Lang::getAll()['menue']['main']['changepassword']}

    @@ -15,35 +15,35 @@ $header
    - +
    - + - + - + diff --git a/templates/Sparkle/customer/index/change_theme.tpl b/templates/Sparkle/customer/index/change_theme.tpl index 3e40df6b..b64f9071 100644 --- a/templates/Sparkle/customer/index/change_theme.tpl +++ b/templates/Sparkle/customer/index/change_theme.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['main']['changetheme']} + {\Froxlor\I18N\Lang::getAll()['menue']['main']['changetheme']}

    @@ -15,13 +15,13 @@ $header
      - +
      - +
    - +
    - + diff --git a/templates/Sparkle/customer/index/index.tpl b/templates/Sparkle/customer/index/index.tpl index 1f3adb43..793a8885 100644 --- a/templates/Sparkle/customer/index/index.tpl +++ b/templates/Sparkle/customer/index/index.tpl @@ -2,7 +2,7 @@ $header

    - {$lng['panel']['dashboard']} + {\Froxlor\I18N\Lang::getAll()['panel']['dashboard']}

    @@ -11,11 +11,11 @@ $header

    - {$lng['customer']['subdomains']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['subdomains']}
    - {\Froxlor\User::getAll()['subdomains_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['subdomains_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['subdomains']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['subdomains']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -25,11 +25,11 @@ $header

    - {$lng['customer']['diskspace']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['diskspace']}
    - {\Froxlor\User::getAll()['diskspace_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['diskspace_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['diskspace']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['diskspace']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -39,11 +39,11 @@ $header

    - {$lng['customer']['traffic']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['traffic']}
    - {\Froxlor\User::getAll()['traffic_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['traffic_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['traffic']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['traffic']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -53,11 +53,11 @@ $header

    - {$lng['customer']['emails']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['emails']}
    - {\Froxlor\User::getAll()['emails_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['emails_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['emails']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['emails']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -67,13 +67,13 @@ $header

    - {$lng['customer']['accounts']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['accounts']}
    - {\Froxlor\User::getAll()['email_accounts_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['email_accounts_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['email_accounts']} {$lng['panel']['available']}
    + {\Froxlor\User::getAll()['email_accounts']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
     - {\Froxlor\User::getAll()['mailspace_used']} {$lng['customer']['mib']} + {\Froxlor\User::getAll()['mailspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}
    @@ -82,11 +82,11 @@ $header

    - {$lng['customer']['forwarders']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['forwarders']}
    - {\Froxlor\User::getAll()['email_forwarders_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['email_forwarders_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['email_forwarders']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['email_forwarders']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -96,11 +96,11 @@ $header

    - {$lng['customer']['email_quota']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['email_quota']}
    - {\Froxlor\User::getAll()['email_quota_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['email_quota_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['email_quota']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['email_quota']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -110,13 +110,13 @@ $header

    - {$lng['customer']['mysqls']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['mysqls']}
    - {\Froxlor\User::getAll()['mysqls_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['mysqls_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['mysqls']} {$lng['panel']['available']}
    + {\Froxlor\User::getAll()['mysqls']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
     - {\Froxlor\User::getAll()['dbspace_used']} {$lng['customer']['mib']} + {\Froxlor\User::getAll()['dbspace_used']} {\Froxlor\I18N\Lang::getAll()['customer']['mib']}
    @@ -125,11 +125,11 @@ $header

    - {$lng['customer']['ftps']}
    + {\Froxlor\I18N\Lang::getAll()['customer']['ftps']}
    - {\Froxlor\User::getAll()['ftps_used']} {$lng['panel']['used']}
    + {\Froxlor\User::getAll()['ftps_used']} {\Froxlor\I18N\Lang::getAll()['panel']['used']}
    - {\Froxlor\User::getAll()['ftps']} {$lng['panel']['available']} + {\Froxlor\User::getAll()['ftps']} {\Froxlor\I18N\Lang::getAll()['panel']['available']}
    @@ -157,26 +157,26 @@ $header
    - +
    - + - + - + - + - + @@ -185,43 +185,43 @@ $header
    {$lng['index']['accountdetails']}{\Froxlor\I18N\Lang::getAll()['index']['accountdetails']}
    {$lng['login']['username']}:{\Froxlor\I18N\Lang::getAll()['login']['username']}: {\Froxlor\User::getAll()['loginname']}
    {$lng['customer']['domains']}:{\Froxlor\I18N\Lang::getAll()['customer']['domains']}: $domains
    {$lng['admin']['stdsubdomain']}:{\Froxlor\I18N\Lang::getAll()['admin']['stdsubdomain']}: $stdsubdomain
    {$lng['customer']['services']}:{\Froxlor\I18N\Lang::getAll()['customer']['services']}: $services_enabled
    - + - + - + - + - + - + - + diff --git a/templates/Sparkle/customer/index/send_error_report.tpl b/templates/Sparkle/customer/index/send_error_report.tpl index 25fe09ff..1b2c8716 100644 --- a/templates/Sparkle/customer/index/send_error_report.tpl +++ b/templates/Sparkle/customer/index/send_error_report.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['error']['send_report_title']} + {\Froxlor\I18N\Lang::getAll()['error']['send_report_title']}

    @@ -17,7 +17,7 @@ $header @@ -31,7 +31,7 @@ $header diff --git a/templates/Sparkle/customer/logger/logger.tpl b/templates/Sparkle/customer/logger/logger.tpl index 4e4cd2c1..b6e55fe6 100644 --- a/templates/Sparkle/customer/logger/logger.tpl +++ b/templates/Sparkle/customer/logger/logger.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['menue']['logger']['logger']} + {\Froxlor\I18N\Lang::getAll()['menue']['logger']['logger']}

    @@ -25,9 +25,9 @@ $header
    {$lng['index']['customerdetails']}{\Froxlor\I18N\Lang::getAll()['index']['customerdetails']}
    {$lng['customer']['customernumber']}:{\Froxlor\I18N\Lang::getAll()['customer']['customernumber']}: {\Froxlor\User::getAll()['customernumber']}
    {$lng['customer']['company']}:{\Froxlor\I18N\Lang::getAll()['customer']['company']}: {\Froxlor\User::getAll()['company']}
    {$lng['customer']['name']}:{\Froxlor\I18N\Lang::getAll()['customer']['name']}: {\Froxlor\User::getAll()['firstname']} {\Froxlor\User::getAll()['name']}
    {$lng['customer']['street']}:{\Froxlor\I18N\Lang::getAll()['customer']['street']}: {\Froxlor\User::getAll()['street']}
    {$lng['customer']['zipcode']}/{$lng['customer']['city']}:{\Froxlor\I18N\Lang::getAll()['customer']['zipcode']}/{\Froxlor\I18N\Lang::getAll()['customer']['city']}: {\Froxlor\User::getAll()['zipcode']} {\Froxlor\User::getAll()['city']}
    {$lng['customer']['email']}:{\Froxlor\I18N\Lang::getAll()['customer']['email']}: {\Froxlor\User::getAll()['email']}
    -

    {$lng['error']['send_report_desc']}

    +

    {\Froxlor\I18N\Lang::getAll()['error']['send_report_desc']}
    - +
    - - - + + + diff --git a/templates/Sparkle/customer/mysql/mysql.tpl b/templates/Sparkle/customer/mysql/mysql.tpl index 2cbfdfcd..70d771f3 100644 --- a/templates/Sparkle/customer/mysql/mysql.tpl +++ b/templates/Sparkle/customer/mysql/mysql.tpl @@ -1,8 +1,8 @@ $header
    -
    {$lng['menue']['mysql']['mysql']}
    -
    {$lng['mysql']['description']}
    +
    {\Froxlor\I18N\Lang::getAll()['menue']['mysql']['mysql']}
    +
    {\Froxlor\I18N\Lang::getAll()['mysql']['description']}
    $footer diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl index c5b1773c..189c5f20 100644 --- a/templates/Sparkle/customer/mysql/mysqls.tpl +++ b/templates/Sparkle/customer/mysql/mysqls.tpl @@ -3,7 +3,7 @@

      - {$lng['menue']['mysql']['databases']} ({$mysqls_count}) + {\Froxlor\I18N\Lang::getAll()['menue']['mysql']['databases']} ({$mysqls_count})

    @@ -20,18 +20,18 @@
      - {$lng['mysql']['database_create']} + {\Froxlor\I18N\Lang::getAll()['mysql']['database_create']}
    {$lng['logger']['date']} {$arrowcode['date']}{$lng['logger']['type']} {$arrowcode['type']}{$lng['logger']['action']}{\Froxlor\I18N\Lang::getAll()['logger']['date']} {$arrowcode['date']}{\Froxlor\I18N\Lang::getAll()['logger']['type']} {$arrowcode['type']}{\Froxlor\I18N\Lang::getAll()['logger']['action']}
    - - - - - + + + + + @@ -52,7 +52,7 @@
      - {$lng['mysql']['database_create']} + {\Froxlor\I18N\Lang::getAll()['mysql']['database_create']}
    diff --git a/templates/Sparkle/customer/mysql/mysqls_database.tpl b/templates/Sparkle/customer/mysql/mysqls_database.tpl index 2299fecd..34bb65a9 100644 --- a/templates/Sparkle/customer/mysql/mysqls_database.tpl +++ b/templates/Sparkle/customer/mysql/mysqls_database.tpl @@ -5,10 +5,10 @@ diff --git a/templates/Sparkle/dns_editor/entry_bit.tpl b/templates/Sparkle/dns_editor/entry_bit.tpl index 1882b0ba..45c61cbe 100644 --- a/templates/Sparkle/dns_editor/entry_bit.tpl +++ b/templates/Sparkle/dns_editor/entry_bit.tpl @@ -5,6 +5,6 @@ diff --git a/templates/Sparkle/dns_editor/index.tpl b/templates/Sparkle/dns_editor/index.tpl index 732c3e90..a08f3fba 100644 --- a/templates/Sparkle/dns_editor/index.tpl +++ b/templates/Sparkle/dns_editor/index.tpl @@ -3,26 +3,26 @@ $header

      - DNS Editor ({$domain}, {$entriescount} {$lng['dnseditor']['records']}) + DNS Editor ({$domain}, {$entriescount} {\Froxlor\I18N\Lang::getAll()['dnseditor']['records']})

    -
    {$lng['admin']['warning']}
    -
    {$lng['dns']['howitworks']}
    +
    {\Froxlor\I18N\Lang::getAll()['admin']['warning']}
    +
    {\Froxlor\I18N\Lang::getAll()['dns']['howitworks']}
    -
    {$lng['error']['error']}
    +
    {\Froxlor\I18N\Lang::getAll()['error']['error']}
    {$errors}
    -
    {$lng['success']['success']}
    +
    {\Froxlor\I18N\Lang::getAll()['success']['success']}
    {$success_message}
     diff --git a/templates/Sparkle/footer.tpl b/templates/Sparkle/footer.tpl index 1beae3df..c3605d66 100644 --- a/templates/Sparkle/footer.tpl +++ b/templates/Sparkle/footer.tpl @@ -10,8 +10,8 @@ © 2009-{$current_year} by the Froxlor Team
    - -
    {$lng['panel']['translator']}: {$lng['translator']} + +
    {\Froxlor\I18N\Lang::getAll()['panel']['translator']}: {\Froxlor\I18N\Lang::getAll()['translator']}     diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl index 1ef7595c..3050980d 100644 --- a/templates/Sparkle/header.tpl +++ b/templates/Sparkle/header.tpl @@ -45,31 +45,31 @@ diff --git a/templates/Sparkle/logfiles_viewer/index.tpl b/templates/Sparkle/logfiles_viewer/index.tpl index 1fb819f7..27dde881 100644 --- a/templates/Sparkle/logfiles_viewer/index.tpl +++ b/templates/Sparkle/logfiles_viewer/index.tpl @@ -3,7 +3,7 @@ $header

      - {$lng['panel']['viewlogs']} ({$domain['domain']}) [{$lng['menue']['domains']['domains']}] + {\Froxlor\I18N\Lang::getAll()['panel']['viewlogs']} ({$domain['domain']}) [{\Froxlor\I18N\Lang::getAll()['menue']['domains']['domains']}]

    diff --git a/templates/Sparkle/login/fpwd.tpl b/templates/Sparkle/login/fpwd.tpl index 1764e47d..8d32d070 100644 --- a/templates/Sparkle/login/fpwd.tpl +++ b/templates/Sparkle/login/fpwd.tpl @@ -5,31 +5,31 @@ $header
    -
    {$lng['error']['error']}
    +
    {\Froxlor\I18N\Lang::getAll()['error']['error']}
    $message
    - Froxlor - {$lng['login']['presend']} + Froxlor - {\Froxlor\I18N\Lang::getAll()['login']['presend']}

    -   +  

    -   +  

    - +

    diff --git a/templates/Sparkle/login/login.tpl b/templates/Sparkle/login/login.tpl index e1cb034f..8095a14f 100644 --- a/templates/Sparkle/login/login.tpl +++ b/templates/Sparkle/login/login.tpl @@ -12,14 +12,14 @@ $header
    -
    {$lng['success']['success']}
    +
    {\Froxlor\I18N\Lang::getAll()['success']['success']}
    $successmessage
    -
    {$lng['error']['error']}
    +
    {\Froxlor\I18N\Lang::getAll()['error']['error']}
    $message
     @@ -31,27 +31,27 @@ $header
    Froxlor - Login

    -   +  

    -   +  

    -   +  

    - +

    diff --git a/templates/Sparkle/misc/form/table_section.tpl b/templates/Sparkle/misc/form/table_section.tpl index ef10f524..67ae8096 100644 --- a/templates/Sparkle/misc/form/table_section.tpl +++ b/templates/Sparkle/misc/form/table_section.tpl @@ -3,7 +3,7 @@ {$title} diff --git a/templates/Sparkle/misc/htmlsearchcode.tpl b/templates/Sparkle/misc/htmlsearchcode.tpl index da77d538..89e82f57 100644 --- a/templates/Sparkle/misc/htmlsearchcode.tpl +++ b/templates/Sparkle/misc/htmlsearchcode.tpl @@ -1,4 +1,4 @@ -{$lng['panel']['search']}:  +{\Froxlor\I18N\Lang::getAll()['panel']['search']}:    diff --git a/templates/Sparkle/misc/question_yesno.tpl b/templates/Sparkle/misc/question_yesno.tpl index d42be867..dc161ef2 100644 --- a/templates/Sparkle/misc/question_yesno.tpl +++ b/templates/Sparkle/misc/question_yesno.tpl @@ -2,15 +2,15 @@ $header
    -
    {$lng['question']['question']}
    +
    {\Froxlor\I18N\Lang::getAll()['question']['question']}
    $text
    {$hiddenparams} -   - +   +
    diff --git a/templates/Sparkle/misc/question_yesno_checkbox.tpl b/templates/Sparkle/misc/question_yesno_checkbox.tpl index c8d93dda..6dc92b64 100644 --- a/templates/Sparkle/misc/question_yesno_checkbox.tpl +++ b/templates/Sparkle/misc/question_yesno_checkbox.tpl @@ -2,7 +2,7 @@ $header
    -
    {$lng['question']['question']}
    +
    {\Froxlor\I18N\Lang::getAll()['question']['question']}
    $text
    $checkbox
    @@ -10,8 +10,8 @@ $header {$hiddenparams} -   - +   +
    diff --git a/templates/Sparkle/misc/success.tpl b/templates/Sparkle/misc/success.tpl index d5fd4d46..60257b78 100644 --- a/templates/Sparkle/misc/success.tpl +++ b/templates/Sparkle/misc/success.tpl @@ -1,11 +1,11 @@ $header
    -
    {$lng['success']['success']}
    +
    {\Froxlor\I18N\Lang::getAll()['success']['success']}
    $success_message -

    {$lng['success']['clickheretocontinue']} +

    {\Froxlor\I18N\Lang::getAll()['success']['clickheretocontinue']}
    diff --git a/templates/Sparkle/ssl_certificates/certs_cert.tpl b/templates/Sparkle/ssl_certificates/certs_cert.tpl index f0755efc..4cc98be9 100644 --- a/templates/Sparkle/ssl_certificates/certs_cert.tpl +++ b/templates/Sparkle/ssl_certificates/certs_cert.tpl @@ -21,14 +21,14 @@
    diff --git a/templates/Sparkle/ssl_certificates/certs_list.tpl b/templates/Sparkle/ssl_certificates/certs_list.tpl index b474940e..c0eab0fc 100644 --- a/templates/Sparkle/ssl_certificates/certs_list.tpl +++ b/templates/Sparkle/ssl_certificates/certs_list.tpl @@ -3,13 +3,13 @@

      - {$lng['domains']['ssl_certificates']} + {\Froxlor\I18N\Lang::getAll()['domains']['ssl_certificates']}

    -
    {$lng['success']['success']}
    +
    {\Froxlor\I18N\Lang::getAll()['success']['success']}
    $success_message
    @@ -29,12 +29,12 @@
    {$lng['mysql']['databasename']} {$arrowcode['databasename']}{$lng['mysql']['databasedescription']} {$arrowcode['description']}{$lng['mysql']['size']}{$lng['mysql']['mysql_server']}{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['mysql']['databasename']} {$arrowcode['databasename']}{\Froxlor\I18N\Lang::getAll()['mysql']['databasedescription']} {$arrowcode['description']}{\Froxlor\I18N\Lang::getAll()['mysql']['size']}{\Froxlor\I18N\Lang::getAll()['mysql']['mysql_server']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}
    {$sql_root['caption']} - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    {$entry['content']} {$entry['ttl']} - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - - + +
    - - + +
    - {$lng['panel']['edit']} + {\Froxlor\I18N\Lang::getAll()['panel']['edit']}   - {$lng['panel']['letsencrypt']} + {\Froxlor\I18N\Lang::getAll()['panel']['letsencrypt']} - {$lng['panel']['delete']} + {\Froxlor\I18N\Lang::getAll()['panel']['delete']}
    - + - +
    {$lng['domains']['domainname']} {$arrowcode['d.domain']}{\Froxlor\I18N\Lang::getAll()['domains']['domainname']} {$arrowcode['d.domain']} Certificate for Issuer Valid from Valid until{$lng['panel']['options']}{\Froxlor\I18N\Lang::getAll()['panel']['options']}