setting version to 0.9.29

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

.gitignore

@@ -1,4 +1,5 @@
 packages/*
+lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/*/
 temp/*
 templates/*
 install/update.log

COPYING

@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,4 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-

actions/admin/settings/100.panel.php

@@ -33,7 +33,7 @@ return array(
 					'save_method' => 'storeSettingField',
 					),
 				'panel_default_theme' => array(
-					'label' => $lng['serversettings']['default_theme'],
+					'label' => array('title' => $lng['panel']['theme'], 'description' => $lng['serversettings']['default_theme']),
 					'settinggroup' => 'panel',
 					'varname' => 'default_theme',
 					'type' => 'option',
@@ -42,6 +42,22 @@ return array(
 					'option_options_method' => 'getThemes',
 					'save_method' => 'storeSettingField',
 					),
+				'panel_allow_theme_change_customer' => array(
+					'label' => $lng['serversettings']['panel_allow_theme_change_customer'],
+					'settinggroup' => 'panel',
+					'varname' => 'allow_theme_change_customer',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					),
+				'panel_allow_theme_change_admin' => array(
+					'label' => $lng['serversettings']['panel_allow_theme_change_admin'],
+					'settinggroup' => 'panel',
+					'varname' => 'allow_theme_change_admin',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField'
+					),
 				'panel_natsorting' => array(
 					'label' => $lng['serversettings']['natsorting'],
 					'settinggroup' => 'panel',
@@ -194,6 +210,14 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
+				'panel_phpconfigs_hidestdsubdomain' => array(
+					'label' => $lng['serversettings']['panel_phpconfigs_hidestdsubdomain'],
+					'settinggroup' => 'panel',
+					'varname' => 'phpconfigs_hidestdsubdomain',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
 				),
 			),
 		),

actions/admin/settings/120.system.php

@@ -32,6 +32,14 @@ return array(
 					'save_method' => 'storeSettingField',
 					'plausibility_check_method' => 'checkPathConflicts'
 					),
+				'system_documentroot_use_default_value' => array(
+					'label' => $lng['serversettings']['documentroot_use_default_value'],
+					'settinggroup' => 'system',
+					'varname' => 'documentroot_use_default_value',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
 					'settinggroup' => 'system',

actions/admin/settings/130.webserver.php

@@ -94,6 +94,15 @@ return array(
 					'default' => '/var/customers/logs/',
 					'save_method' => 'storeSettingField',
 					),
+				'system_customersslpath' => array(
+					'label' => $lng['serversettings']['customerssl_directory'],
+					'settinggroup' => 'system',
+					'varname' => 'customer_ssl_path',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/etc/apache2/ssl/',
+					'save_method' => 'storeSettingField',
+					),
 				'system_phpappendopenbasedir' => array(
 					'label' => $lng['serversettings']['phpappendopenbasedir'],
 					'settinggroup' => 'system',
@@ -152,19 +161,11 @@ return array(
 					'settinggroup' => 'nginx',
 					'varname' => 'fastcgiparams',
 					'type' => 'string',
+					'string_type' => 'file',
 					'default' => '/etc/nginx/fastcgi_params',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('nginx')
 					),
-				'system_mod_log_sql' => array(
-					'label' => $lng['serversettings']['mod_log_sql'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_log_sql',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'websrv_avail' => array('apache2')
-					),
 				'defaultwebsrverrhandler_enabled' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'],
 					'settinggroup' => 'defaultwebsrverrhandler',
@@ -227,72 +228,8 @@ return array(
 					'option_options_method' => 'getRedirectCodes',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('apache2', 'lighttpd')
-					),
-				),
-			),
-		'ssl' => array(
-			'title' => $lng['admin']['sslsettings'],
-			'fields' => array(
-				'system_ssl_enabled' => array(
-					'label' => $lng['serversettings']['ssl']['use_ssl'],
-					'settinggroup' => 'system',
-					'varname' => 'use_ssl',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true
-					),
-				'system_ssl_cert_file' => array(
-					'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_cert_file',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '/etc/apache2/apache2.pem',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_key_file' => array(
-					'label' => $lng['serversettings']['ssl']['ssl_key_file'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_key_file',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '/etc/apache2/apache2.key',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_ca_file' => array(
-					'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_ca_file',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_cert_chainfile' => array(
-					'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
-					'settinggroup' => 'system',
-					'varname' => 'ssl_cert_chainfile',
-					'type' => 'string',
-					'string_type' => 'file',
-					'string_emptyallowed' => true,
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				'system_ssl_openssl_cnf' => array(
-					'label' => $lng['serversettings']['ssl']['openssl_cnf'],
-					'settinggroup' => 'system',
-					'varname' => 'openssl_cnf',
-					'type' => 'text',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
-				),
-			),
-		),
+					)
+				)
+			)
+		)
 	);
-
-?>

actions/admin/settings/131.ssl.php

@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ *
+ */
+
+return array(
+	'groups' => array(
+			'ssl' => array(
+					'title' => $lng['admin']['sslsettings'],
+					'fields' => array(
+							'system_ssl_enabled' => array(
+									'label' => $lng['serversettings']['ssl']['use_ssl'],
+									'settinggroup' => 'system',
+									'varname' => 'use_ssl',
+									'type' => 'bool',
+									'default' => false,
+									'save_method' => 'storeSettingField',
+									'overview_option' => true
+							),
+							'system_ssl_cert_file' => array(
+									'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_cert_file',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '/etc/apache2/apache2.pem',
+									'save_method' => 'storeSettingField',
+							),
+							'system_ssl_key_file' => array(
+									'label' => $lng['serversettings']['ssl']['ssl_key_file'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_key_file',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '/etc/apache2/apache2.key',
+									'save_method' => 'storeSettingField',
+							),
+							'system_ssl_ca_file' => array(
+									'label' => $lng['serversettings']['ssl']['ssl_ca_file'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_ca_file',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '',
+									'save_method' => 'storeSettingField',
+							),
+							'system_ssl_cert_chainfile' => array(
+									'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
+									'settinggroup' => 'system',
+									'varname' => 'ssl_cert_chainfile',
+									'type' => 'string',
+									'string_type' => 'file',
+									'string_emptyallowed' => true,
+									'default' => '',
+									'save_method' => 'storeSettingField',
+							)
+					)
+			)
+		)
+	);

actions/admin/settings/136.phpfpm.php

@@ -54,9 +54,16 @@ return array(
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField'
 					),
-				/*
-				 * @TODO implement if phpfpm knows custom php.ini files
-				 *
+				'system_phpfpm_defaultini' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'defaultini',
+					'type' => 'option',
+					'default' => '1',
+					'option_mode' => 'one',
+					'option_options_method' => 'getPhpConfigs',
+					'save_method' => 'storeSettingField',
+					),
 				'system_phpfpm_defaultini_ownvhost' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
 					'settinggroup' => 'phpfpm',
@@ -67,7 +74,6 @@ return array(
 					'option_options_method' => 'getPhpConfigs',
 					'save_method' => 'storeSettingField',
 					),
-				*/
 				'system_phpfpm_configdir' => array(
 					'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
 					'settinggroup' => 'phpfpm',

actions/admin/settings/150.mail.php

@@ -58,6 +58,7 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => 'Maildir',
+					'string_emptyallowed' => true,
 					'save_method' => 'storeSettingField',
 					),
 				'panel_sendalternativemail' => array(

actions/admin/settings/160.nameserver.php

@@ -68,6 +68,16 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
+				'system_axfrservers' => array(
+					'label' => $lng['serversettings']['axfrservers'],
+					'settinggroup' => 'system',
+					'varname' => 'axfrservers',
+					'type' => 'string',
+					'string_type' => 'validate_ip',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField',
+				),
 				'system_dns_createmailentry' => array(
 					'label' => $lng['serversettings']['mail_also_with_mxservers'],
 					'settinggroup' => 'system',

actions/admin/settings/180.dkim.php

@@ -17,6 +17,8 @@
  *
  */
 
+global $settings;
+
 return array(
 	'groups' => array(
 		'dkim' => array(
@@ -79,7 +81,10 @@ return array(
 					'save_method' => 'storeSettingFieldInsertBindTask',
 					),
 				'dkim_keylength' => array(
-					'label' => $lng['dkim']['dkim_keylength'],
+					'label' => array(
+						'title' => $lng['dkim']['dkim_keylength']['title'], 
+						'description' => sprintf($lng['dkim']['dkim_keylength']['description'],$settings['dkim']['dkim_prefix'])
+					),
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_keylength',
 					'type' => 'option',

actions/admin/settings/200.aps.php

@@ -59,7 +59,7 @@ return array(
 					'type' => 'option',
 					'default' => '',
 					'option_mode' => 'multiple',
-					'option_options' => array('gd' => 'GD Library', 'pcre' => 'PCRE', 'ioncube' => 'ionCube', 'ioncube loader' => 'ionCube Loader', 'curl' => 'curl', 'mcrypt' => 'mcrypt', 'imap' => 'imap', 'json' => 'json', 'ldap' => 'LDAP', 'hash' => 'hash', 'mbstring' => 'mbstring'),
+					'option_options' => array('gd' => 'GD Library', 'pcre' => 'PCRE', 'ioncube' => 'ionCube', 'ioncube loader' => 'ionCube Loader', 'curl' => 'curl', 'mcrypt' => 'mcrypt', 'imap' => 'imap', 'json' => 'json', 'ldap' => 'LDAP', 'hash' => 'hash', 'mbstring' => 'mbstring', 'Zend Optimizer' => 'Zend Guard'),
 					'save_method' => 'storeSettingApsPhpExtensions',
 					),
 				'aps_php-function' => array(

actions/admin/settings/210.security.php

@@ -38,9 +38,17 @@ return array(
 					'default' => true,
 					'save_method' => 'storeSettingField',
 					),
-				),
-			),
-		),
+				'system_passwordcryptfunc' => array(
+					'label' => $lng['serversettings']['passwordcryptfunc'],
+					'settinggroup' => 'system',
+					'varname' => 'passwordcryptfunc',
+					'type' => 'option',
+					'default' => 0,
+					'option_mode' => 'one',
+					'option_options' => array(0 => $lng['serversettings']['systemdefault'], 1 => 'MD5', 2 => 'BLOWFISH', 3 => 'SHA-256', 4 => 'SHA-512'),
+					'save_method' => 'storeSettingField',
+					)
+				)
+			)
+		)
 	);
-
-?>

admin_admins.php

@@ -47,26 +47,6 @@ if($page == 'admins'
 			'diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
 			'traffic' => $lng['customer']['traffic'],
 			'traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
-/*
-			'mysqls' => $lng['customer']['mysqls'],
-			'mysqls_used' => $lng['customer']['mysqls'] . ' (' . $lng['panel']['used'] . ')',
-			'ftps' => $lng['customer']['ftps'],
-			'ftps_used' => $lng['customer']['ftps'] . ' (' . $lng['panel']['used'] . ')',
-			'tickets' => $lng['customer']['tickets'],
-			'tickets_used' => $lng['customer']['tickets'] . ' (' . $lng['panel']['used'] . ')',
-			'subdomains' => $lng['customer']['subdomains'],
-			'subdomains_used' => $lng['customer']['subdomains'] . ' (' . $lng['panel']['used'] . ')',
-			'emails' => $lng['customer']['emails'],
-			'emails_used' => $lng['customer']['emails'] . ' (' . $lng['panel']['used'] . ')',
-			'email_accounts' => $lng['customer']['accounts'],
-			'email_accounts_used' => $lng['customer']['accounts'] . ' (' . $lng['panel']['used'] . ')',
-			'email_forwarders' => $lng['customer']['forwarders'],
-			'email_forwarders_used' => $lng['customer']['forwarders'] . ' (' . $lng['panel']['used'] . ')',
-			'email_quota' => $lng['customer']['email_quota'],
-			'email_quota_used' => $lng['customer']['email_quota'] . ' (' . $lng['panel']['used'] . ')',
-			'email_autoresponder' => $lng['customer']['autoresponder'],
-			'email_autoresponder_used' => $lng['customer']['autoresponder'] . ' (' . $lng['panel']['used'] . ')',
-*/
 			'deactivated' => $lng['admin']['deactivated']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_ADMINS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
@@ -545,113 +525,84 @@ if($page == 'admins'
 					$password = validate($_POST['admin_password'], 'new password');
 					$def_language = validate($_POST['def_language'], 'default language');
 					$deactivated = isset($_POST['deactivated']) ? 1 : 0;
-					$customers = intval_ressource($_POST['customers']);
 
-					if(isset($_POST['customers_ul']))
-					{
-						$customers = - 1;
+					$customers = intval_ressource($_POST['customers']);
+					if (isset($_POST['customers_ul'])) {
+						$customers = -1;
 					}
 
 					$domains = intval_ressource($_POST['domains']);
-
-					if(isset($_POST['domains_ul']))
-					{
-						$domains = - 1;
+					if (isset($_POST['domains_ul'])) {
+						$domains = -1;
 					}
 
 					$subdomains = intval_ressource($_POST['subdomains']);
-
-					if(isset($_POST['subdomains_ul']))
-					{
-						$subdomains = - 1;
+					if (isset($_POST['subdomains_ul'])) {
+						$subdomains = -1;
 					}
 
 					$emails = intval_ressource($_POST['emails']);
-
-					if(isset($_POST['emails_ul']))
-					{
-						$emails = - 1;
+					if (isset($_POST['emails_ul'])) {
+						$emails = -1;
 					}
 
 					$email_accounts = intval_ressource($_POST['email_accounts']);
-
-					if(isset($_POST['email_accounts_ul']))
-					{
-						$email_accounts = - 1;
+					if (isset($_POST['email_accounts_ul'])) {
+						$email_accounts = -1;
 					}
 
 					$email_forwarders = intval_ressource($_POST['email_forwarders']);
-
-					if(isset($_POST['email_forwarders_ul']))
-					{
-						$email_forwarders = - 1;
+					if (isset($_POST['email_forwarders_ul'])) {
+						$email_forwarders = -1;
 					}
 
-					if($settings['system']['mail_quota_enabled'] == '1')
-					{
+					if ($settings['system']['mail_quota_enabled'] == '1') {
 						$email_quota = validate($_POST['email_quota'], 'email_quota', '/^\d+$/', 'vmailquotawrong', array('0', ''));
-
-						if(isset($_POST['email_quota_ul']))
-						{
-							$email_quota = - 1;
+						if (isset($_POST['email_quota_ul'])) {
+							$email_quota = -1;
 						}
-					}
-					else
-					{
-						$email_quota = - 1;
+					} else {
+						$email_quota = -1;
 					}
 
-					if($settings['autoresponder']['autoresponder_active'] == '1')
-					{
+					if ($settings['autoresponder']['autoresponder_active'] == '1') {
 						$email_autoresponder = intval_ressource($_POST['email_autoresponder']);
-
-						if(isset($_POST['email_autoresponder_ul']))
-						{
-							$email_autoresponder = - 1;
+						if (isset($_POST['email_autoresponder_ul'])) {
+							$email_autoresponder = -1;
 						}
-					}
-					else
-					{
+					} else {
 						$email_autoresponder = 0;
 					}
 
 					$ftps = intval_ressource($_POST['ftps']);
-
-					if(isset($_POST['ftps_ul']))
-					{
-						$ftps = - 1;
+					if (isset($_POST['ftps_ul'])) {
+						$ftps = -1;
 					}
 					
-					if($settings['ticket']['enabled'] == 1)
-					{
+					if ($settings['ticket']['enabled'] == 1) {
 						$tickets = intval_ressource($_POST['tickets']);
-
-						if(isset($_POST['tickets_ul']))
-						{
-							$tickets = - 1;
+						if (isset($_POST['tickets_ul'])) {
+							$tickets = -1;
 						}
-					}
-					else
-					{
+					} else {
 						$tickets = 0;
 					}
 
 					$mysqls = intval_ressource($_POST['mysqls']);
-
-					if(isset($_POST['mysqls_ul']))
-					{
+					if (isset($_POST['mysqls_ul'])) {
 						$mysqls = - 1;
 					}
 
-					$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
-
-					if(isset($_POST['number_of_aps_packages_ul']))
-					{
-						$number_of_aps_packages = - 1;
+					if ($settings['aps']['aps_active'] == '1') {
+						$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
+						if (isset($_POST['number_of_aps_packages_ul'])) {
+							$number_of_aps_packages = -1;
+						}
+						$can_manage_aps_packages = isset($_POST['can_manage_aps_packages']) ? 1 : 0;
+					} else {
+						$number_of_aps_packages = 0;
 					}
 
-					$can_manage_aps_packages = isset($_POST['can_manage_aps_packages']) ? 1 : 0;
-
 					$customers_see_all = 0;
 					if(isset($_POST['customers_see_all']))
 						$customers_see_all = intval($_POST['customers_see_all']);
@@ -663,27 +614,23 @@ if($page == 'admins'
 					$caneditphpsettings = 0;
 					if(isset($_POST['caneditphpsettings']))
 						$caneditphpsettings = intval($_POST['caneditphpsettings']);
-					
+
 					$change_serversettings = 0;
 					if(isset($_POST['change_serversettings']))
 						$change_serversettings = isset($_POST['change_serversettings']) ? 1 : 0;
-					
-					$diskspace = intval($_POST['diskspace']);
 
 					$tickets_see_all = 0;
 					if (isset($_POST['tickets_see_all']))
 						$tickets_see_all = intval($_POST['tickets_see_all']);
 
-					if(isset($_POST['diskspace_ul']))
-					{
-						$diskspace = - 1;
+					$diskspace = intval($_POST['diskspace']);
+					if (isset($_POST['diskspace_ul'])) {
+						$diskspace = -1;
 					}
 
 					$traffic = doubleval_ressource($_POST['traffic']);
-
-					if(isset($_POST['traffic_ul']))
-					{
-						$traffic = - 1;
+					if (isset($_POST['traffic_ul'])) {
+						$traffic = -1;
 					}
 
 					$diskspace = $diskspace * 1024;
@@ -744,7 +691,84 @@ if($page == 'admins'
 						$tickets_see_all = '0';
 					}
 
-					$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `name`='" . $db->escape($name) . "', `email`='" . $db->escape($email) . "', `def_language`='" . $db->escape($def_language) . "', `change_serversettings` = '" . $db->escape($change_serversettings) . "', `customers` = '" . $db->escape($customers) . "', `customers_see_all` = '" . $db->escape($customers_see_all) . "', `domains` = '" . $db->escape($domains) . "', `domains_see_all` = '" . $db->escape($domains_see_all) . "', `caneditphpsettings` = '" . (int)$caneditphpsettings . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `email_quota`='" . $db->escape($email_quota) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `tickets_see_all`='".$db->escape($tickets_see_all) . "', `mysqls`='" . $db->escape($mysqls) . "', `ip`='" . (int)$ipaddress . "', `deactivated`='" . $db->escape($deactivated) . "', `can_manage_aps_packages`=" . (int)$can_manage_aps_packages . ", `aps_packages`=" . (int)$number_of_aps_packages . " WHERE `adminid`='" . $db->escape($id) . "'");
+					// check if a resource was set to something lower
+					// than actually used by the admin/reseller
+					$res_warning = "";
+					if ($customers != $result['customers'] && $customers < $result['customers_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'customers');
+					}
+					if ($domains != $result['domains'] && $domains < $result['domains_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'domains');
+					}
+					if ($diskspace != $result['diskspace'] && ($diskspace / 1024) != -1 && $diskspace < $result['diskspace_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'diskspace');
+					}
+					if ($traffic != $result['traffic'] && ($traffic / 1024 / 1024) != -1 && $traffic < $result['traffic_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'traffic');
+					}
+					if ($emails != $result['emails'] && $emails < $result['emails_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'emails');
+					}
+					if ($email_accounts != $result['email_accounts'] && $email_accounts < $result['email_accounts_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'email accounts');
+					}
+					if ($email_forwarders != $result['email_forwarders'] && $email_forwarders < $result['email_forwarders_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'email forwarders');
+					}
+					if ($email_quota != $result['email_quota'] && $email_quota < $result['email_quota_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'email quota');
+					}
+					if ($email_autoresponder != $result['email_autoresponder'] && $email_autoresponder < $result['email_autoresponder_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'email autoresponder');
+					}
+					if ($ftps != $result['ftps'] && $ftps < $result['ftps_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'ftps');
+					}
+					if ($tickets != $result['tickets'] && $tickets < $result['tickets_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'tickets');
+					}
+					if ($mysqls != $result['mysqls'] && $mysqls < $result['mysqls_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'mysqls');
+					}
+					if ($number_of_aps_packages != $result['aps_packages'] && $number_of_aps_packages < $result['aps_packages_used']) {
+						$res_warning .= sprintf($lng['error']['setlessthanalreadyused'], 'aps packages');
+					}
+
+					if ($res_warning != "") {
+						$link = '';
+						$error = $res_warning;
+						eval("echo \"" . getTemplate('misc/error', '1') . "\";");
+						exit;
+					}
+
+					$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET
+						`name`='" . $db->escape($name) . "',
+						`email`='" . $db->escape($email) . "',
+						`def_language`='" . $db->escape($def_language) . "',
+						`change_serversettings` = '" . $db->escape($change_serversettings) . "',
+						`customers` = '" . $db->escape($customers) . "',
+						`customers_see_all` = '" . $db->escape($customers_see_all) . "',
+						`domains` = '" . $db->escape($domains) . "',
+						`domains_see_all` = '" . $db->escape($domains_see_all) . "',
+						`caneditphpsettings` = '" . (int)$caneditphpsettings . "',
+						`password` = '" . $password . "',
+						`diskspace`='" . $db->escape($diskspace) . "',
+						`traffic`='" . $db->escape($traffic) . "',
+						`subdomains`='" . $db->escape($subdomains) . "',
+						`emails`='" . $db->escape($emails) . "',
+						`email_accounts` = '" . $db->escape($email_accounts) . "',
+						`email_forwarders`='" . $db->escape($email_forwarders) . "',
+						`email_quota`='" . $db->escape($email_quota) . "',
+						`email_autoresponder`='" . $db->escape($email_autoresponder) . "',
+						`ftps`='" . $db->escape($ftps) . "',
+						`tickets`='" . $db->escape($tickets) . "',
+						`tickets_see_all`='".$db->escape($tickets_see_all) . "',
+						`mysqls`='" . $db->escape($mysqls) . "',
+						`ip`='" . (int)$ipaddress . "',
+						`deactivated`='" . $db->escape($deactivated) . "',
+						`can_manage_aps_packages`=" . (int)$can_manage_aps_packages . ",
+						`aps_packages`=" . (int)$number_of_aps_packages . "
+						 WHERE `adminid`='" . $db->escape($id) . "'");
 					$log->logAction(ADM_ACTION, LOG_INFO, "edited admin '#" . $id . "'");
 					$redirect_props = Array(
 						'page' => $page,

admin_cronjobs.php

@@ -16,24 +16,17 @@
  */
 
 define('AREA', 'admin');
+require_once('./lib/init.php');
 
-require_once("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'cronjobs'
-  || $page == 'overview')
-{
-	if($action == '')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_cronjobs");
+if ($page == 'cronjobs' || $page == 'overview') {
+	if ($action == '') {
+		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed admin_cronjobs');
 
 		$fields = array(
 			'c.lastrun' => $lng['cron']['lastrun'],
@@ -56,88 +49,65 @@ if($page == 'cronjobs'
 		$i = 0;
 		$count = 0;
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
+		while ($row = $db->fetch_array($result)) {
+			if ($paging->checkDisplay($i)) {
 				$row = htmlentities_array($row);
-				
+
 				$row['lastrun'] = date('d.m.Y H:i', $row['lastrun']);
-				
-				if((int)$row['isactive'] == 1)
-				{
-					$row['isactive'] = $lng['panel']['yes'];
-				}
-				else
-				{
-					$row['isactive'] = $lng['panel']['no'];
-				}
-				
+				$row['isactive'] = ((int)$row['isactive'] == 1) ? $lng['panel']['yes'] : $lng['panel']['no'];
+
 				$description = $lng['crondesc'][$row['desc_lng_key']];
-				
-				eval("\$crons.=\"" . getTemplate("cronjobs/cronjobs_cronjob") . "\";");
+
+				eval("\$crons.=\"" . getTemplate('cronjobs/cronjobs_cronjob') . "\";");
 				$count++;
 			}
 
 			$i++;
 		}
 
-		eval("echo \"" . getTemplate("cronjobs/cronjobs") . "\";");
+		eval("echo \"" . getTemplate('cronjobs/cronjobs') . "\";");
 
-	}
-	elseif($action == 'new')
-	{
+	} elseif ($action == 'new') {
 		/*
 		 * @TODO later
 		 */
-	}
-	elseif($action == 'edit'
-	&& $id != 0)
-	{
+	} elseif ($action == 'edit' && $id != 0) {
 		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `id`='" . (int)$id . "'");
-		
-		if ($result['cronfile'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+		if ($result['cronfile'] != '') {
+			if (isset($_POST['send']) && $_POST['send'] == 'send') {
 				$isactive = isset($_POST['isactive']) ? 1 : 0;
 				$interval_value = validate($_POST['interval_value'], 'interval_value', '/^([0-9]+)$/Di', 'stringisempty');
 				$interval_interval = validate($_POST['interval_interval'], 'interval_interval');
-				
-				if($isactive != 1)
-				{
+
+				if ($isactive != 1) {
 					$isactive = 0;
 				}
-				
-				$interval = $interval_value.' '.strtoupper($interval_interval);
-				
+
+				$interval = $interval_value . ' ' . strtoupper($interval_interval);
+
 				$db->query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` 
 							SET `isactive` = '".(int)$isactive."',
 							`interval` = '".$interval."'
 							WHERE `id` = '" . (int)$id . "'");
 
 				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+			} else {
 				//$isactive = makeyesno('isactive', '1', '0', $result['isactive']);
 				// interval
 				$interval_nfo = explode(' ', $result['interval']);
 				$interval_value = $interval_nfo[0];
 
 				$interval_interval = '';
-				$interval_interval.= makeoption($lng['cronmgmt']['seconds'], 'SECOND', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
-				$interval_interval.= makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['seconds'], 'SECOND', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['minutes'], 'MINUTE', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['hours'], 'HOUR', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['days'], 'DAY', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['weeks'], 'WEEK', $interval_nfo[1]);
+				$interval_interval .= makeoption($lng['cronmgmt']['months'], 'MONTH', $interval_nfo[1]);
 				// end of interval
-				
+
 				$change_cronfile = false;
-				if (substr($result['module'], 0, strpos($result['module'], '/')) != 'froxlor')
-				{
+				if (substr($result['module'], 0, strpos($result['module'], '/')) != 'froxlor') {
 					$change_cronfile = true;
 				}
 
@@ -147,13 +117,11 @@ if($page == 'cronjobs'
 				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
 				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
 
-				eval("echo \"" . getTemplate("cronjobs/cronjob_edit") . "\";");
+				eval("echo \"" . getTemplate('cronjobs/cronjob_edit') . "\";");
 			}
 		}
 	}
-	elseif($action == 'delete'
-	&& $id != 0)
-	{
+	elseif ($action == 'delete' && $id != 0) {
 		/*
 		 * @TODO later
 		 */

admin_customers.php

@@ -133,11 +133,14 @@ if($page == 'customers'
 
 		if($destination_user != '')
 		{
+			if ($result['deactivated'] == '1') {
+				standard_error("usercurrentlydeactivated", $destination_user);
+			}
 			$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid`='" . (int)$userinfo['userid'] . "' AND `hash`='" . $db->escape($s) . "'");
 			$s = md5(uniqid(microtime(), 1));
 			$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$id . "', '" . $db->escape($result['ipaddress']) . "', '" . $db->escape($result['useragent']) . "', '" . time() . "', '" . $db->escape($result['language']) . "', '0')");
 			$log->logAction(ADM_ACTION, LOG_INFO, "switched user and is now '" . $destination_user . "'");
-			redirectTo('customer_index.php', Array('s' => $s));
+			redirectTo('customer_index.php', Array('s' => $s), true);
 		}
 		else
 		{
@@ -279,7 +282,7 @@ if($page == 'customers'
 
 				if($result['email_autoresponder'] != '-1')
 				{
-					$admin_update_query.= ", `email_autoresponder` = `email_autoresponder` - 0" . (int)$result['email_autoresponder'];
+					$admin_update_query.= ", `email_autoresponder_used` = `email_autoresponder_used` - 0" . (int)$result['email_autoresponder'];
 				}
 
 				if($result['subdomains'] != '-1')
@@ -299,7 +302,7 @@ if($page == 'customers'
 
 				if($result['aps_packages'] != '-1')
 				{
-					$admin_update_query.= ", `aps_packages` = `aps_packages` - 0" . (int)$result['aps_packages'];
+					$admin_update_query.= ", `aps_packages_used` = `aps_packages_used` - 0" . (int)$result['aps_packages'];
 				}
 
 				if(($result['diskspace'] / 1024) != '-1')
@@ -312,23 +315,17 @@ if($page == 'customers'
 				$log->logAction(ADM_ACTION, LOG_INFO, "deleted user '" . $result['loginname'] . "'");
 				inserttask('1');
 
-				# Using nameserver, insert a task which rebuilds the server config
-				if ($settings['system']['bind_enable'])
-				{
-					inserttask('4');
-				}
+				// Using nameserver, insert a task which rebuilds the server config
+				inserttask('4');
 
-				if(isset($_POST['delete_userfiles'])
-				  && (int)$_POST['delete_userfiles'] == 1)
-				{
+				if (isset($_POST['delete_userfiles'])
+						&& (int)$_POST['delete_userfiles'] == 1
+				) {
 					inserttask('6', $result['loginname']);
 				}
 
-				# Using filesystem - quota, insert a task which cleans the filesystem - quota
-				if ($settings['system']['diskquota_enabled'])
-				{
-					inserttask('10');
-				}
+				// Using filesystem - quota, insert a task which cleans the filesystem - quota
+				inserttask('10');
 
 				/*
 				 * move old tickets to archive
@@ -766,13 +763,10 @@ if($page == 'customers'
 					$log->logAction(ADM_ACTION, LOG_INFO, "added user '" . $loginname . "'");
 					inserttask('2', $loginname, $guid, $guid, $store_defaultindex);
 
-					# Using filesystem - quota, insert a task which cleans the filesystem - quota
-					if ($settings['system']['diskquota_enabled'])
-					{
-						inserttask('10');
-					}
-					// Add htpasswd for the webalizer stats
+					// Using filesystem - quota, insert a task which cleans the filesystem - quota
+					inserttask('10');
 
+					// Add htpasswd for the webalizer stats
 					if(CRYPT_STD_DES == 1)
 					{
 						$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
@@ -795,7 +789,7 @@ if($page == 'customers'
 					}
 
 					inserttask('1');
-					$cryptPassword = makeCryptPassword($db->escape($password),1);
+					$cryptPassword = makeCryptPassword($password);
 					$result = $db->query("INSERT INTO `" . TABLE_FTP_USERS . "` " . "(`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) " . "VALUES ('" . (int)$customerid . "', '" . $db->escape($loginname) . "', '" . $db->escape($cryptPassword) . "', '" . $db->escape($documentroot) . "', 'y', '" . (int)$guid . "', '" . (int)$guid . "')");
 					$result = $db->query("INSERT INTO `" . TABLE_FTP_GROUPS . "` " . "(`customerid`, `groupname`, `gid`, `members`) " . "VALUES ('" . (int)$customerid . "', '" . $db->escape($loginname) . "', '" . $db->escape($guid) . "', '" . $db->escape($loginname) . "')");
 					$result = $db->query("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $db->escape($loginname) . "', 'user', '0', '0', '0', '0', '0', '0')");
@@ -824,7 +818,6 @@ if($page == 'customers'
 							"`isemaildomain` = '0', " .
 							"`caneditdomain` = '0', " .
 							"`openbasedir` = '1', " .
-							"`safemode` = '1', " .
 							"`speciallogfile` = '0', " .
 							"`specialsettings` = '', " .
 							"`add_date` = '".date('Y-m-d')."'");
@@ -900,17 +893,6 @@ if($page == 'customers'
 				$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$number_of_aps_packages_ul = makecheckbox('number_of_aps_packages_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-				/*
-				$createstdsubdomain = makeyesno('createstdsubdomain', '1', '0', '1');
-				$email_imap = makeyesno('email_imap', '1', '0', '1');
-				$email_pop3 = makeyesno('email_pop3', '1', '0', '1');
-				$sendpassword = makeyesno('sendpassword', '1', '0', '1');
-				$phpenabled = makeyesno('phpenabled', '1', '0', '1');
-				$perlenabled = makeyesno('perlenabled', '1', '0', '0');
-				$store_defaultindex = makeyesno('store_defaultindex', '1', '0', '1');
-				*/
-				// why still makeyesno for this one?
-				$backup_allowed = makeyesno('backup_allowed', '1', '0', '0');
 
 				$gender_options = makeoption($lng['gender']['undef'], 0, true, true, true);
 				$gender_options .= makeoption($lng['gender']['male'], 1, null, true, true);
@@ -1175,7 +1157,7 @@ if($page == 'customers'
 							$_stdsubdomain = $result['loginname'] . '.' . $settings['system']['hostname'];
 						}
 
-						$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` " . "(`domain`, `customerid`, `adminid`, `parentdomainid`, `ipandport`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`, `add_date`) " . "VALUES ('" . $db->escape($_stdsubdomain) . "', '" . (int)$result['customerid'] . "', '" . (int)$userinfo['adminid'] . "', '-1', '" . $db->escape($settings['system']['defaultip']) . "', '" . $db->escape($result['documentroot']) . "', '', '0', '0', '1', '1', '0', '', '".date('Y-m-d')."')");
+						$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` " . "(`domain`, `customerid`, `adminid`, `parentdomainid`, `ipandport`, `documentroot`, `zonefile`, `isemaildomain`, `caneditdomain`, `openbasedir`, `speciallogfile`, `specialsettings`, `add_date`) " . "VALUES ('" . $db->escape($_stdsubdomain) . "', '" . (int)$result['customerid'] . "', '" . (int)$userinfo['adminid'] . "', '-1', '" . $db->escape($settings['system']['defaultip']) . "', '" . $db->escape($result['documentroot']) . "', '', '0', '0', '1', '0', '', '".date('Y-m-d')."')");
 						$domainid = $db->insert_id();
 						$db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `standardsubdomain`=\'' . (int)$domainid . '\' WHERE `customerid`=\'' . (int)$result['customerid'] . '\'');
 						$log->logAction(ADM_ACTION, LOG_NOTICE, "automatically added standardsubdomain for user '" . $result['loginname'] . "'");
@@ -1278,11 +1260,8 @@ if($page == 'customers'
 					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `name`='" . $db->escape($name) . "', `firstname`='" . $db->escape($firstname) . "', `gender`='" . $db->escape($gender) . "', `company`='" . $db->escape($company) . "', `street`='" . $db->escape($street) . "', `zipcode`='" . $db->escape($zipcode) . "', `city`='" . $db->escape($city) . "', `phone`='" . $db->escape($phone) . "', `fax`='" . $db->escape($fax) . "', `email`='" . $db->escape($email) . "', `customernumber`='" . $db->escape($customernumber) . "', `def_language`='" . $db->escape($def_language) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "', `backup_allowed`='" . $db->escape($backup_allowed) . "' WHERE `customerid`='" . (int)$id . "'");
 					$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` ";
 
-					# Using filesystem - quota, insert a task which cleans the filesystem - quota
-					if ($settings['system']['diskquota_enabled'])
-					{
-						inserttask('10');
-					}
+					// Using filesystem - quota, insert a task which cleans the filesystem - quota
+					inserttask('10');
 
 					if($mysqls != '-1'
 					   || $result['mysqls'] != '-1')
@@ -1567,15 +1546,6 @@ if($page == 'customers'
 					$result['aps_packages'] = '';
 				}
 
-				/*
-				$createstdsubdomain = makeyesno('createstdsubdomain', '1', '0', (($result['standardsubdomain'] != '0') ? '1' : '0'));
-				$phpenabled = makeyesno('phpenabled', '1', '0', $result['phpenabled']);
-				$perlenabled = makeyesno('perlenabled', '1', '0', $result['perlenabled']);
-				$deactivated = makeyesno('deactivated', '1', '0', $result['deactivated']);
-				$email_imap = makeyesno('email_imap', '1', '0', $result['imap']);
-				$email_pop3 = makeyesno('email_pop3', '1', '0', $result['pop3']);
-				*/
-				$backup_allowed = makeyesno('backup_allowed', '1', '0', $result['backup_allowed']);
 				$result = htmlentities_array($result);
 
 				$gender_options = makeoption($lng['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true);

admin_domains.php

@@ -196,9 +196,8 @@ if($page == 'domains'
 				inserttask('1');
 
 				// Using nameserver, insert a task which rebuilds the server config
-				if ($settings['system']['bind_enable'] = '1') {
-					inserttask('4');
-				}
+				inserttask('4');
+
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
 			elseif ($alias_check['count'] > 0) {
@@ -305,11 +304,13 @@ if($page == 'domains'
 					$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
 					validate($_POST['documentroot'], 'documentroot');
 
+					// If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings,
+					// set default path to subdomain or domain name
 					if(isset($_POST['documentroot'])
-					   && $_POST['documentroot'] != '')
+						&& ($_POST['documentroot'] != ''))
 					{
 						if(substr($_POST['documentroot'], 0, 1) != '/'
-						   && !preg_match('/^https?\:\/\//', $_POST['documentroot']))
+							&& !preg_match('/^https?\:\/\//', $_POST['documentroot']))
 						{
 							$documentroot.= '/' . $_POST['documentroot'];
 						}
@@ -318,6 +319,12 @@ if($page == 'domains'
 							$documentroot = $_POST['documentroot'];
 						}
 					}
+					elseif (isset($_POST['documentroot'])
+						&& ($_POST['documentroot'] == '') 
+						&& ($settings['system']['documentroot_use_default_value'] == 1))
+					{
+						$documentroot = makeCorrectDir($customer['documentroot'] . '/' . $domain);
+					}
 				}
 				else
 				{
@@ -335,9 +342,8 @@ if($page == 'domains'
 				   || $userinfo['change_serversettings'] == '1')
 				{
 					$openbasedir = isset($_POST['openbasedir']) ? intval($_POST['openbasedir']) : 0;
-					$safemode = isset($_POST['safemode']) ? intval($_POST['safemode']) : 0;
 
-					if((int)$settings['system']['mod_fcgid'] == 1)
+					if((int)$settings['system']['mod_fcgid'] == 1 || (int)$settings['phpfpm']['enabled'] == 1)
 					{
 						$phpsettingid = (int)$_POST['phpsettingid'];
 						$phpsettingid_check = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$phpsettingid);
@@ -349,12 +355,21 @@ if($page == 'domains'
 							standard_error('phpsettingidwrong');
 						}
 
-						$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-						$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
+						if( (int)$settings['system']['mod_fcgid'] == 1) {
+							$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
+							$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
+						} else {
+							$mod_fcgid_starter = '-1';
+							$mod_fcgid_maxrequests = '-1';
+						}
 					}
 					else
 					{
-						$phpsettingid = $settings['system']['mod_fcgid_defaultini'];
+						if ((int)$settings['phpfpm']['enabled'] == 1) {
+							$phpsettingid = $settings['phpfpm']['defaultini'];
+						} else {
+							$phpsettingid = $settings['system']['mod_fcgid_defaultini'];
+						}
 						$mod_fcgid_starter = '-1';
 						$mod_fcgid_maxrequests = '-1';
 					}
@@ -362,8 +377,11 @@ if($page == 'domains'
 				else
 				{
 					$openbasedir = '1';
-					$safemode = '1';
-					$phpsettingid = $settings['system']['mod_fcgid_defaultini'];
+					if ((int)$settings['phpfpm']['enabled'] == 1) {
+						$phpsettingid = $settings['phpfpm']['defaultini'];
+					} else {
+						$phpsettingid = $settings['system']['mod_fcgid_defaultini'];
+					}
 					$mod_fcgid_starter = '-1';
 					$mod_fcgid_maxrequests = '-1';
 				}
@@ -444,11 +462,6 @@ if($page == 'domains'
 					$openbasedir = '0';
 				}
 
-				if($safemode != '1')
-				{
-					$safemode = '0';
-				}
-
 				if($speciallogfile != '1')
 				{
 					$speciallogfile = '0';
@@ -549,7 +562,6 @@ if($page == 'domains'
 						'ssl_redirect' => $ssl_redirect,
 						'ssl_ipandport' => $ssl_ipandport,
 						'openbasedir' => $openbasedir,
-						'safemode' => $safemode,
 						'phpsettingid' => $phpsettingid,
 						'mod_fcgid_starter' => $mod_fcgid_starter,
 						'mod_fcgid_maxrequests' => $mod_fcgid_maxrequests,
@@ -579,16 +591,15 @@ if($page == 'domains'
 						$question_nr++;
 					}
 
-					$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`,`aliasdomain`, `zonefile`, `dkim`, `wwwserveralias`, `isbinddomain`, `isemaildomain`, `email_only`, `subcanemaildomain`, `caneditdomain`, `openbasedir`, `safemode`,`speciallogfile`, `specialsettings`, `ssl`, `ssl_redirect`, `ssl_ipandport`, `add_date`, `registration_date`, `phpsettingid`, `mod_fcgid_starter`, `mod_fcgid_maxrequests`, `ismainbutsubto`) VALUES ('" . $db->escape($domain) . "', '" . (int)$customerid . "', '" . (int)$adminid . "', '" . $db->escape($documentroot) . "', '" . $db->escape($ipandport) . "', " . (($aliasdomain != 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ", '" . $db->escape($zonefile) . "', '" . $db->escape($dkim) . "', '" . $db->escape($wwwserveralias) . "', '" . $db->escape($isbinddomain) . "', '" . $db->escape($isemaildomain) . "', '" . $db->escape($email_only) . "', '" . $db->escape($subcanemaildomain) . "', '" . $db->escape($caneditdomain) . "', '" . $db->escape($openbasedir) . "', '" . $db->escape($safemode) . "', '" . $db->escape($speciallogfile) . "', '" . $db->escape($specialsettings) . "', '" . $ssl . "', '" . $ssl_redirect . "' , '" . $ssl_ipandport . "', '" . $db->escape(time()) . "', '" . $db->escape($registration_date) . "', '" . (int)$phpsettingid . "', '" . (int)$mod_fcgid_starter . "', '" . (int)$mod_fcgid_maxrequests . "', '".(int)$issubof."')");
+					$db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` (`domain`, `customerid`, `adminid`, `documentroot`, `ipandport`,`aliasdomain`, `zonefile`, `dkim`, `wwwserveralias`, `isbinddomain`, `isemaildomain`, `email_only`, `subcanemaildomain`, `caneditdomain`, `openbasedir`, `speciallogfile`, `specialsettings`, `ssl`, `ssl_redirect`, `ssl_ipandport`, `add_date`, `registration_date`, `phpsettingid`, `mod_fcgid_starter`, `mod_fcgid_maxrequests`, `ismainbutsubto`) VALUES ('" . $db->escape($domain) . "', '" . (int)$customerid . "', '" . (int)$adminid . "', '" . $db->escape($documentroot) . "', '" . $db->escape($ipandport) . "', " . (($aliasdomain != 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ", '" . $db->escape($zonefile) . "', '" . $db->escape($dkim) . "', '" . $db->escape($wwwserveralias) . "', '" . $db->escape($isbinddomain) . "', '" . $db->escape($isemaildomain) . "', '" . $db->escape($email_only) . "', '" . $db->escape($subcanemaildomain) . "', '" . $db->escape($caneditdomain) . "', '" . $db->escape($openbasedir) . "', '" . $db->escape($speciallogfile) . "', '" . $db->escape($specialsettings) . "', '" . $ssl . "', '" . $ssl_redirect . "' , '" . $ssl_ipandport . "', '" . $db->escape(time()) . "', '" . $db->escape($registration_date) . "', '" . (int)$phpsettingid . "', '" . (int)$mod_fcgid_starter . "', '" . (int)$mod_fcgid_maxrequests . "', '".(int)$issubof."')");
 					$domainid = $db->insert_id();
 					$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `domains_used` = `domains_used` + 1 WHERE `adminid` = '" . (int)$adminid . "'");
 					$log->logAction(ADM_ACTION, LOG_INFO, "added domain '" . $domain . "'");
 					inserttask('1');
 
-					# Using nameserver, insert a task which rebuilds the server config
-					if ($settings['system']['bind_enable']) {
-						inserttask('4');
-					}
+					// Using nameserver, insert a task which rebuilds the server config
+					inserttask('4');
+
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
 			}
@@ -688,7 +699,11 @@ if($page == 'domains'
 
 				while($row = $db->fetch_array($configs))
 				{
-					$phpconfigs.= makeoption($row['description'], $row['id'], $settings['system']['mod_fcgid_defaultini'], true, true);
+					if ((int)$settings['phpfpm']['enabled'] == 1) {
+						$phpconfigs.= makeoption($row['description'], $row['id'], $settings['phpfpm']['defaultini'], true, true);
+					} else {
+						$phpconfigs.= makeoption($row['description'], $row['id'], $settings['system']['mod_fcgid_defaultini'], true, true);
+					}
 				}
 
 				$subcanemaildomain = makeoption($lng['admin']['subcanemaildomain']['never'], '0', '0', true, true) . makeoption($lng['admin']['subcanemaildomain']['choosableno'], '1', '0', true, true) . makeoption($lng['admin']['subcanemaildomain']['choosableyes'], '2', '0', true, true) . makeoption($lng['admin']['subcanemaildomain']['always'], '3', '0', true, true);
@@ -817,7 +832,7 @@ if($page == 'domains'
 					$zonefile = $result['zonefile'];
 					if ($settings['system']['bind_enable'] == '1') {
 						if (isset($_POST['isbinddomain'])) {
-							$isbinddomain = '1';
+							$isbinddomain = (int)$_POST['isbinddomain'];
 						}
 						$zonefile = validate($_POST['zonefile'], 'zonefile');
 					}
@@ -836,7 +851,16 @@ if($page == 'domains'
 
 					if($documentroot == '')
 					{
-						$documentroot = $customer['documentroot'];
+						// If path is empty and 'Use domain name as default value for DocumentRoot path' is enabled in settings,
+						// set default path to subdomain or domain name
+						if ($settings['system']['documentroot_use_default_value'] == 1)
+						{
+							$documentroot = makeCorrectDir($customer['documentroot'] . '/' . $result['domain']);
+						}
+						else
+						{
+							$documentroot = $customer['documentroot'];
+						}
 					}
 
 					if(!preg_match('/^https?\:\/\//', $documentroot)
@@ -858,9 +882,8 @@ if($page == 'domains'
 				   || $userinfo['change_serversettings'] == '1')
 				{
 					$openbasedir = isset($_POST['openbasedir']) ? intval($_POST['openbasedir']) : 0;
-					$safemode = isset($_POST['safemode']) ? intval($_POST['safemode']) : 0;
 
-					if((int)$settings['system']['mod_fcgid'] == 1)
+					if((int)$settings['system']['mod_fcgid'] == 1 || (int)$settings['phpfpm']['enabled'] == 1)
 					{
 						$phpsettingid = (int)$_POST['phpsettingid'];
 						$phpsettingid_check = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$phpsettingid);
@@ -872,8 +895,13 @@ if($page == 'domains'
 							standard_error('phpsettingidwrong');
 						}
 
-						$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
-						$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
+						if ((int)$settings['system']['mod_fcgid'] == 1) {
+							$mod_fcgid_starter = validate($_POST['mod_fcgid_starter'], 'mod_fcgid_starter', '/^[0-9]*$/', '', array('-1', ''));
+							$mod_fcgid_maxrequests = validate($_POST['mod_fcgid_maxrequests'], 'mod_fcgid_maxrequests', '/^[0-9]*$/', '', array('-1', ''));
+						} else {
+							$mod_fcgid_starter = $result['mod_fcgid_starter'];
+							$mod_fcgid_maxrequests = $result['mod_fcgid_maxrequests'];
+						}
 					}
 					else
 					{
@@ -885,7 +913,6 @@ if($page == 'domains'
 				else
 				{
 					$openbasedir = $result['openbasedir'];
-					$safemode = $result['safemode'];
 					$phpsettingid = $result['phpsettingid'];
 					$mod_fcgid_starter = $result['mod_fcgid_starter'];
 					$mod_fcgid_maxrequests = $result['mod_fcgid_maxrequests'];
@@ -949,11 +976,6 @@ if($page == 'domains'
 					$openbasedir = '0';
 				}
 
-				if($safemode != '1')
-				{
-					$safemode = '0';
-				}
-
 				if($isbinddomain != '1')
 				{
 					$isbinddomain = '0';
@@ -1031,7 +1053,6 @@ if($page == 'domains'
 					'ssl_redirect' => $ssl_redirect,
 					'ssl_ipandport' => $ssl_ipandport,
 					'openbasedir' => $openbasedir,
-					'safemode' => $safemode,
 					'phpsettingid' => $phpsettingid,
 					'mod_fcgid_starter' => $mod_fcgid_starter,
 					'mod_fcgid_maxrequests' => $mod_fcgid_maxrequests,
@@ -1067,7 +1088,6 @@ if($page == 'domains'
 				   || $ssl_ipandport != $result['ssl_ipandport']
 				   || $wwwserveralias != $result['wwwserveralias']
 				   || $openbasedir != $result['openbasedir']
-				   || $safemode != $result['safemode']
 				   || $phpsettingid != $result['phpsettingid']
 				   || $mod_fcgid_starter != $result['mod_fcgid_starter']
 				   || $mod_fcgid_maxrequests != $result['mod_fcgid_maxrequests']
@@ -1087,9 +1107,7 @@ if($page == 'domains'
 				   || $dkim != $result['dkim']
 				   || $ipandport != $result['ipandport'])
 				{
-					if ($settings['system']['bind_enable'] == '1') {
-						inserttask('4');
-					}
+					inserttask('4');
 				}
 
 				if($isemaildomain == '0'
@@ -1141,8 +1159,8 @@ if($page == 'domains'
 					$log->logAction(ADM_ACTION, LOG_INFO, "removed specialsettings on all subdomains of domain #" . $id);
 				}
 
-				$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `customerid` = '" . (int)$customerid . "', `adminid` = '" . (int)$adminid . "', `documentroot`='" . $db->escape($documentroot) . "', `ipandport`='" . $db->escape($ipandport) . "', `ssl`='" . (int)$ssl . "', `ssl_redirect`='" . (int)$ssl_redirect . "', `ssl_ipandport`='" . (int)$ssl_ipandport . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ", `isbinddomain`='" . $db->escape($isbinddomain) . "', `isemaildomain`='" . $db->escape($isemaildomain) . "', `email_only`='" . $db->escape($email_only) . "', `subcanemaildomain`='" . $db->escape($subcanemaildomain) . "', `dkim`='" . $db->escape($dkim) . "', `caneditdomain`='" . $db->escape($caneditdomain) . "', `zonefile`='" . $db->escape($zonefile) . "', `wwwserveralias`='" . $db->escape($wwwserveralias) . "', `openbasedir`='" . $db->escape($openbasedir) . "', `safemode`='" . $db->escape($safemode) . "', `speciallogfile`='" . $db->escape($speciallogfile) . "', `phpsettingid`='" . $db->escape($phpsettingid) . "', `mod_fcgid_starter`='" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests`='" . $db->escape($mod_fcgid_maxrequests) . "', `specialsettings`='" . $db->escape($specialsettings) . "', `registration_date`='" . $db->escape($registration_date) . "', `ismainbutsubto`='" . (int)$issubof . "' WHERE `id`='" . (int)$id . "'");
-				$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `customerid` = '" . (int)$customerid . "', `adminid` = '" . (int)$adminid . "', `ipandport`='" . $db->escape($ipandport) . "', `openbasedir`='" . $db->escape($openbasedir) . "', `safemode`='" . $db->escape($safemode) . "', `phpsettingid`='" . $db->escape($phpsettingid) . "', `mod_fcgid_starter`='" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests`='" . $db->escape($mod_fcgid_maxrequests) . "'" . $upd_specialsettings . $updatechildren . " WHERE `parentdomainid`='" . (int)$id . "'");
+				$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `customerid` = '" . (int)$customerid . "', `adminid` = '" . (int)$adminid . "', `documentroot`='" . $db->escape($documentroot) . "', `ipandport`='" . $db->escape($ipandport) . "', `ssl`='" . (int)$ssl . "', `ssl_redirect`='" . (int)$ssl_redirect . "', `ssl_ipandport`='" . (int)$ssl_ipandport . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ", `isbinddomain`='" . $db->escape($isbinddomain) . "', `isemaildomain`='" . $db->escape($isemaildomain) . "', `email_only`='" . $db->escape($email_only) . "', `subcanemaildomain`='" . $db->escape($subcanemaildomain) . "', `dkim`='" . $db->escape($dkim) . "', `caneditdomain`='" . $db->escape($caneditdomain) . "', `zonefile`='" . $db->escape($zonefile) . "', `wwwserveralias`='" . $db->escape($wwwserveralias) . "', `openbasedir`='" . $db->escape($openbasedir) . "', `speciallogfile`='" . $db->escape($speciallogfile) . "', `phpsettingid`='" . $db->escape($phpsettingid) . "', `mod_fcgid_starter`='" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests`='" . $db->escape($mod_fcgid_maxrequests) . "', `specialsettings`='" . $db->escape($specialsettings) . "', `registration_date`='" . $db->escape($registration_date) . "', `ismainbutsubto`='" . (int)$issubof . "' WHERE `id`='" . (int)$id . "'");
+				$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `customerid` = '" . (int)$customerid . "', `adminid` = '" . (int)$adminid . "', `ipandport`='" . $db->escape($ipandport) . "', `openbasedir`='" . $db->escape($openbasedir) . "', `speciallogfile`='" . $db->escape($speciallogfile) . "', `phpsettingid`='" . $db->escape($phpsettingid) . "', `mod_fcgid_starter`='" . $db->escape($mod_fcgid_starter) . "', `mod_fcgid_maxrequests`='" . $db->escape($mod_fcgid_maxrequests) . "'" . $upd_specialsettings . $updatechildren . " WHERE `parentdomainid`='" . (int)$id . "'");
 				$log->logAction(ADM_ACTION, LOG_INFO, "edited domain #" . $id);
 				$redirect_props = Array(
 					'page' => $page,
@@ -1266,6 +1284,8 @@ if($page == 'domains'
 				$title = $domain_edit_data['domain_edit']['title'];
 				$image = $domain_edit_data['domain_edit']['image'];
 
+				$speciallogwarning = sprintf($lng['admin']['speciallogwarning'], $lng['admin']['delete_statistics']);
+
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
 		}

admin_index.php

@@ -104,11 +104,13 @@ if($page == 'overview')
 					$_message = isset($latestversion[1]) ? $latestversion[1] : '';
 					$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
 
-					$lookfornewversion_lable = $_version;
+					// add the branding so debian guys are not gettings confused
+					// about their version-number
+					$lookfornewversion_lable = $_version.$branding;
 					$lookfornewversion_link = $_link;
 					$lookfornewversion_addinfo = $_message;
 
-					if (version_compare($version, $_version) == -1) {
+					if (version_compare2($version, $_version) == -1) {
 						$isnewerversion = 1;
 					} else {
 						$isnewerversion = 0;

admin_ipsandports.php

@@ -105,11 +105,9 @@ if($page == 'ipsandports'
 								$log->logAction(ADM_ACTION, LOG_WARNING, "deleted IP/port '" . $result['ip'] . ":" . $result['port'] . "'");
 								inserttask('1');
 
-								# Using nameserver, insert a task which rebuilds the server config
-								if ($settings['system']['bind_enable'])
-								{
-									inserttask('4');
-								}
+								// Using nameserver, insert a task which rebuilds the server config
+								inserttask('4');
+
 								redirectTo($filename, Array('page' => $page, 's' => $s));
 							}
 							else
@@ -251,11 +249,9 @@ if($page == 'ipsandports'
 				$log->logAction(ADM_ACTION, LOG_WARNING, "added IP/port '" . $ip . ":" . $port . "'");
 				inserttask('1');
 
-				# Using nameserver, insert a task which rebuilds the server config
-				if ($settings['system']['bind_enable'])
-				{
-					inserttask('4');
-				}
+				// Using nameserver, insert a task which rebuilds the server config
+				inserttask('4');
+
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
 		}
@@ -412,10 +408,8 @@ if($page == 'ipsandports'
 					inserttask('1');
 
 					// Using nameserver, insert a task which rebuilds the server config
-					if ($settings['system']['bind_enable'])
-					{
-						inserttask('4');
-					}
+					inserttask('4');
+
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
 			}

admin_logger.php

@@ -22,14 +22,12 @@ define('AREA', 'admin');
 /**
  * Include our init.php, which manages Sessions, Language etc.
  */
+require('./lib/init.php');
 
-require ("./lib/init.php");
-
-if($page == 'log'
-   && $userinfo['change_serversettings'] == '1')
-{
-	if($action == '')
-	{
+if ($page == 'log'
+   && $userinfo['change_serversettings'] == '1'
+) {
+	if ($action == '') {
 		$fields = array(
 			'date' => $lng['logger']['date'],
 			'type' => $lng['logger']['type'],
@@ -47,24 +45,21 @@ if($page == 'log'
 		$pagingcode = $paging->getHtmlPagingCode($filename . '?page=' . $page . '&s=' . $s);
 		$clog = array();
 
-		while($row = $db->fetch_array($result))
-		{
-			if(!isset($clog[$row['action']])
-			   || !is_array($clog[$row['action']]))
-			{
+		while ($row = $db->fetch_array($result)) {
+			if (!isset($clog[$row['action']])
+			   || !is_array($clog[$row['action']])
+			) {
 				$clog[$row['action']] = array();
 			}
 
 			$clog[$row['action']][$row['logid']] = $row;
 		}
 
-		if($paging->sortfield == 'date'
-		   && $paging->sortorder == 'desc')
-		{
+		if ($paging->sortfield == 'date'
+		   && $paging->sortorder == 'desc'
+		) {
 			krsort($clog);
-		}
-		else
-		{
+		} else {
 			ksort($clog);
 		}
 
@@ -72,20 +67,15 @@ if($page == 'log'
 		$count = 0;
 		$log_count = 0;
 		$log = '';
-		foreach($clog as $action => $logrows)
-		{
+		foreach ($clog as $action => $logrows) {
 			$_action = 0;
-			foreach($logrows as $row)
-			{
-				if($paging->checkDisplay($i))
-				{
+			foreach ($logrows as $row) {
+				if ($paging->checkDisplay($i)) {
 					$row = htmlentities_array($row);
 					$row['date'] = date("d.m.y H:i:s", $row['date']);
 
-					if($_action != $action)
-					{
-						switch($action)
-						{
+					if ($_action != $action) {
+						switch ($action) {
 							case USR_ACTION:
 								$_action = $lng['admin']['customer'];
 								break;
@@ -107,15 +97,14 @@ if($page == 'log'
 						}
 
 						$row['action'] = $_action;
-						eval("\$log.=\"" . getTemplate("logger/logger_action") . "\";");
+						eval("\$log.=\"" . getTemplate('logger/logger_action') . "\";");
 					}
 
 					$log_count++;
 					$type = $row['type'];
 					$_type = 'unknown';
 
-					switch($type)
-					{
+					switch ($type) {
 						case LOG_INFO:
 							$_type = 'Information';
 							break;
@@ -137,32 +126,27 @@ if($page == 'log'
 					}
 
 					$row['type'] = $_type;
-					eval("\$log.=\"" . getTemplate("logger/logger_log") . "\";");
+					eval("\$log.=\"" . getTemplate('logger/logger_log') . "\";");
 					$count++;
 					$_action = $action;
 				}
 			}
-
 			$i++;
 		}
 
-		eval("echo \"" . getTemplate("logger/logger") . "\";");
-	}
-	elseif($action == 'truncate')
-	{
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
+		eval("echo \"" . getTemplate('logger/logger') . "\";");
+	} elseif ($action == 'truncate') {
+		if (isset($_POST['send'])
+		   && $_POST['send'] == 'send'
+		) {
 			$yesterday = time() - (60 * 10);
 
 			/* (60*60*24); */
 
 			$db->query("DELETE FROM `" . TABLE_PANEL_LOG . "` WHERE `date` < '" . $yesterday . "'");
-			$log->logAction(ADM_ACTION, LOG_WARNING, "truncated the system-log (mysql)");
+			$log->logAction(ADM_ACTION, LOG_WARNING, 'truncated the system-log (mysql)');
 			redirectTo($filename, Array('page' => $page, 's' => $s));
-		}
-		else
-		{
+		} else {
 			ask_yesno('logger_reallytruncate', $filename, array('page' => $page, 'action' => $action), TABLE_PANEL_LOG);
 		}
 	}

admin_message.php

@@ -22,79 +22,60 @@ define('AREA', 'admin');
 /**
  * Include our init.php, which manages Sessions, Language etc.
  */
+require('./lib/init.php');
 
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'message')
-{
-	if($action == '')
-	{
-		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed panel_message");
+if ($page == 'message') {
+	if ($action == '') {
+		$log->logAction(ADM_ACTION, LOG_NOTICE, 'viewed panel_message');
 
-		if(isset($_POST['send'])
-		   && $_POST['send'] == 'send')
-		{
-			if($_POST['receipient'] == 0
-			   && $userinfo['customers_see_all'] == '1')
-			{
-				$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to admins");
+		if (isset($_POST['send'])
+		   && $_POST['send'] == 'send'
+		) {
+			if ($_POST['receipient'] == 0
+			   && $userinfo['customers_see_all'] == '1'
+			) {
+				$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to admins');
 				$result = $db->query('SELECT `name`, `email`  FROM `' . TABLE_PANEL_ADMINS . "`");
-			}
-			elseif($_POST['receipient'] == 1)
-			{
-				if($userinfo['customers_see_all'] == "1")
-				{
-					$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to ALL customers");
+			} elseif ($_POST['receipient'] == 1) {
+				if ($userinfo['customers_see_all'] == '1') {
+					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers');
 					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "`");
-				}
-				else
-				{
-					$log->logAction(ADM_ACTION, LOG_NOTICE, "sending messages to customers");
+				} else {
+					$log->logAction(ADM_ACTION, LOG_NOTICE, 'sending messages to customers');
 					$result = $db->query('SELECT `firstname`, `name`, `email`  FROM `' . TABLE_PANEL_CUSTOMERS . "` WHERE `adminid`='" . $userinfo['adminid'] . "'");
 				}
-			}
-			else
-			{
+			} else {
 				standard_error('noreceipientsgiven');
 			}
 
 			$subject = $_POST['subject'];
 			$message = wordwrap($_POST['message'], 70);
 
-			if(!empty($message))
-			{
+			if (!empty($message)) {
 				$mailcounter = 0;
 				$mail->Body = $message;
 				$mail->Subject = $subject;
 
-				while($row = $db->fetch_array($result))
-				{
+				while ($row = $db->fetch_array($result)) {
 					$mail->AddAddress($row['email'], (isset($row['firstname']) ? $row['firstname'] . ' ' : '') . $row['name']);
 					$mail->From = $userinfo['email'];
 					$mail->FromName = (isset($userinfo['firstname']) ? $userinfo['firstname'] . ' ' : '') . $userinfo['name'];
 
-					if(!$mail->Send())
-					{
-						if($mail->ErrorInfo != '')
-						{
+					if (!$mail->Send()) {
+						if ($mail->ErrorInfo != '') {
 							$mailerr_msg = $mail->ErrorInfo;
-						}
-						else
-						{
-							$mailerr_msg = $row["email"];
+						} else {
+							$mailerr_msg = $row['email'];
 						}
 
-						$log->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-						standard_error('errorsendingmail', $row["email"]);
+						$log->logAction(ADM_ACTION, LOG_ERR, 'Error sending mail: ' . $mailerr_msg);
+						standard_error('errorsendingmail', $row['email']);
 					}
 
 					$mailcounter++;
@@ -102,47 +83,34 @@ if($page == 'message')
 				}
 
 				redirectTo($filename, Array('page' => $page, 's' => $s, 'action' => 'showsuccess', 'sentitems' => $mailcounter));
-			}
-			else
-			{
+			} else {
 				standard_error('nomessagetosend');
 			}
 		}
 	}
 
-	if($action == 'showsuccess')
-	{
+	if ($action == 'showsuccess') {
 		$success = 1;
 		$sentitems = isset($_GET['sentitems']) ? (int)$_GET['sentitems'] : 0;
 
-		if($sentitems == 0)
-		{
+		if ($sentitems == 0) {
 			$successmessage = $lng['message']['noreceipients'];
-		}
-		else
-		{
+		} else {
 			$successmessage = str_replace('%s', $sentitems, $lng['message']['success']);
 		}
-
-		$action = '';
-	}
-	else
-	{
+	} else {
 		$success = 0;
 		$sentitems = 0;
 		$successmessage = '';
-		$action = '';
 	}
+	$action = '';
 
 	$receipients = '';
 
-	if($userinfo['customers_see_all'] == "1")
-	{
+	if ($userinfo['customers_see_all'] == '1') {
 		$receipients.= makeoption($lng['panel']['reseller'], 0);
 	}
 
-	$receipients.= makeoption($lng['panel']['customer'], 1);
-	eval("echo \"" . getTemplate("message/message") . "\";");
+	$receipients .= makeoption($lng['panel']['customer'], 1);
+	eval("echo \"" . getTemplate('message/message') . "\";");
 }
-
-?>

admin_phpsettings.php

@@ -25,47 +25,54 @@ define('AREA', 'admin');
 
 require ("./lib/init.php");
 
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif (isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
-	if($action == '')
-	{
+if ($page == 'overview') {
+
+	if ($action == '') {
+
 		$tablecontent = '';
 		$count = 0;
 		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
 
-		while($row = $db->fetch_array($result))
-		{
+		while ($row = $db->fetch_array($result)) {
+
 			$domainresult = false;
 
-			if((int)$userinfo['domains_see_all'] == 0)
-			{
-				$domainresult = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `adminid` = " . (int)$userinfo['userid'] . " AND `phpsettingid` = " . (int)$row['id']);
-			}
-			else
-			{
-				$domainresult = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `phpsettingid` = " . (int)$row['id']);
+			$query = "SELECT * FROM `".TABLE_PANEL_DOMAINS."`
+					WHERE `phpsettingid` = '".(int)$row['id']."'
+					AND `parentdomainid` = '0'";
+
+			if ((int)$userinfo['domains_see_all'] == 0) {
+				$query .= " AND `adminid` = '".(int)$userinfo['userid']."'";
 			}
 
-			$domains = '';
-
-			if($db->num_rows($domainresult) > 0)
-			{
-				while($row2 = $db->fetch_array($domainresult))
-				{
-					$domains.= $row2['domain'] . '<br/>';
+			if ((int)$settings['panel']['phpconfigs_hidestdsubdomain'] == 1) {
+				$query2 = "SELECT DISTINCT `standardsubdomain`
+						FROM `".TABLE_PANEL_CUSTOMERS."`
+						WHERE `standardsubdomain` > 0 ORDER BY `standardsubdomain` ASC;";
+				$ssdids_res = $db->query($query2);
+				$ssdids = array();
+				while ($ssd = $db->fetch_array($ssdids_res)) {
+					$ssdids[] = $ssd['standardsubdomain'];
+				}
+				if (count($ssdids) > 0) {
+					$query .= " AND `id` NOT IN (".implode(', ', $ssdids).")";
 				}
 			}
-			else
-			{
+
+			$domainresult = $db->query($query);
+
+			$domains = '';
+			if ($db->num_rows($domainresult) > 0) {
+				while ($row2 = $db->fetch_array($domainresult)) {
+					$domains.= $row2['domain'] . '<br/>';
+				}
+			} else {
 				$domains = $lng['admin']['phpsettings']['notused'];
 			}
 

admin_settings.php

@@ -82,13 +82,9 @@ if(($page == 'settings' || $page == 'overview')
 		) {
 			$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
 			inserttask('1');
-			inserttask('5');
+			// Using nameserver, insert a task which rebuilds the server config
+			inserttask('4');
 
-			# Using nameserver, insert a task which rebuilds the server config
-			if ($settings['system']['bind_enable'])
-			{
-				inserttask('4');
-			}
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
 	}
@@ -127,14 +123,10 @@ elseif($page == 'rebuildconfigs'
 	{
 		$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles");
 		inserttask('1');
-		inserttask('5');
 		inserttask('10');
+		// Using nameserver, insert a task which rebuilds the server config
+		inserttask('4');
 
-		# Using nameserver, insert a task which rebuilds the server config
-		if ($settings['system']['bind_enable'])
-		{
-			inserttask('4');
-		}
 		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 	}
 	else

admin_templates.php

@@ -48,17 +48,28 @@ elseif(isset($_GET['id']))
 $available_templates = array(
 	'createcustomer',
 	'pop_success',
-	'trafficmaxpercent',
-	'diskmaxpercent',
-	'new_ticket_by_customer',
-	'new_ticket_for_customer',
-	'new_ticket_by_staff',
-	'new_reply_ticket_by_customer',
-	'new_reply_ticket_by_staff',
 	'new_database_by_customer',
 	'new_ftpaccount_by_customer',
 	'password_reset'
 );
+
+// only show templates of features that are enabled #1191
+if ((int)$settings['system']['report_enable'] == 1) {
+	array_push($available_templates,
+		'trafficmaxpercent',
+		'diskmaxpercent'
+	);
+}
+if ((int)$settings['ticket']['enabled'] == 1) {
+	array_push($available_templates,
+		'new_ticket_by_customer',
+		'new_ticket_for_customer',
+		'new_ticket_by_staff',
+		'new_reply_ticket_by_customer',
+		'new_reply_ticket_by_staff'
+	);
+}
+
 $file_templates = array(
 	'index_html'
 );

admin_tickets.php

@@ -326,13 +326,20 @@ if($page == 'tickets'
 				$isclosed = 1;
 			}
 
-			if($mainticket->Get('by') == '1')
+			if ($mainticket->Get('by') == '1')
 			{
 				$by = $lng['ticket']['staff'];
 			}
 			else
 			{
-				$by = $lng['ticket']['customer'];
+				$cid = $mainticket->Get('customer');
+				$usr = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+						FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						WHERE `customerid` = "' . (int)$cid . '"'
+				);
+				$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
+				$by .= getCorrectFullUserDetails($usr).'</a>';
+				//$by = $lng['ticket']['customer'];
 			}
 
 			$subject = $mainticket->Get('subject');
@@ -354,7 +361,14 @@ if($page == 'tickets'
 				}
 				else
 				{
-					$by = $lng['ticket']['customer'];
+					$cid = $subticket->Get('customer');
+					$usr = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+						FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						WHERE `customerid` = "' . (int)$cid . '"'
+					);
+					$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
+					$by .= getCorrectFullUserDetails($usr).'</a>';
+					//$by = $lng['ticket']['customer'];
 				}
 
 				$subject = $subticket->Get('subject');
@@ -816,11 +830,18 @@ elseif($page == 'archive'
 		}
 		else
 		{
-			$by = $lng['ticket']['customer'];
+			$cid = $mainticket->Get('customer');
+			$usr = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+						FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						WHERE `customerid` = "' . (int)$cid . '"'
+			);
+			$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
+			$by .= getCorrectFullUserDetails($usr).'</a>';
+			//$by = $lng['ticket']['customer'];
 		}
 
-		$subject = htmlentities($mainticket->Get('subject'));
-		$message = htmlentities($mainticket->Get('message'));
+		$subject = $mainticket->Get('subject');
+		$message = $mainticket->Get('message');
 		eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
 		$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
                               WHERE `id`="' . (int)$mainticket->Get('category') . '"');
@@ -838,22 +859,28 @@ elseif($page == 'archive'
 			}
 			else
 			{
-				$by = $lng['ticket']['customer'];
+				$cid = $subticket->Get('customer');
+				$usr = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+						FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						WHERE `customerid` = "' . (int)$cid . '"'
+				);
+				$by = '<a href="'.$linker->getLink(array('section' => 'customers', 'page' => 'customers', 'action' => 'su', 'id' => $cid)).'" rel="external">';
+				$by .= getCorrectFullUserDetails($usr).'</a>';
+				//$by = $lng['ticket']['customer'];
 			}
 
-			$subject = htmlentities($subticket->Get('subject'));
-			$message = htmlentities($subticket->Get('message'));
+			$subject = $subticket->Get('subject');
+			$message = $subticket->Get('message');
 			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
 		}
 
 		$priorities = makeoption($lng['ticket']['high'], '1', htmlentities($mainticket->Get('priority')), true, true);
 		$priorities.= makeoption($lng['ticket']['normal'], '2', htmlentities($mainticket->Get('priority')), true, true);
 		$priorities.= makeoption($lng['ticket']['low'], '3', htmlentities($mainticket->Get('priority')), true, true);
-		$subject = htmlentities($mainticket->Get('subject'));
+		$subject = $mainticket->Get('subject');
 		$ticket_replies_count = $db->num_rows($andere) + 1;
 
 		// don't forget the main-ticket!
-
 		eval("echo \"" . getTemplate("tickets/tickets_view") . "\";");
 	}
 	elseif($action == 'delete'

admin_traffic.php

@@ -128,7 +128,7 @@ if($page == 'overview' || $page == 'customers')
 			
 			$traffic_list = $db->query("SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE year = " . (date("Y")-$years) . " AND `customerid` = '" . $customer_name['customerid'] . "' GROUP BY month ORDER BY month");
 			while($traffic_month = $db->fetch_array($traffic_list)) {
-				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.3f %s');
+				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s');
 				$totals[$months[(int)$traffic_month['month']]] += $traffic_month['traffic'];
 			}
 			eval("\$domain_list .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
@@ -138,7 +138,7 @@ if($page == 'overview' || $page == 'customers')
 			'name' => $lng['traffic']['months']['total'],
 		);
 		foreach($totals as $month => $bytes) {
-			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.3f %s'));
+			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.'.(int)$settings['panel']['decimal_places'].'f %s'));
 		}
 		$customerview = 0;
 		eval("\$total_list = sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");

admin_updates.php

@@ -16,10 +16,9 @@
  */
 
 define('AREA', 'admin');
-require ("./lib/init.php");
+require('./lib/init.php');
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
 
 	/**
@@ -29,13 +28,13 @@ if($page == 'overview')
 	 */
 	if (!isFroxlor()) {
 		if (!isset($settings['panel']['version'])
-		|| $settings['panel']['version'] == ''
+			|| $settings['panel']['version'] == ''
 		) {
 			$settings['panel']['version'] = '1.4.2.1';
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','version','".$settings['panel']['version']."')");
 		}
 		if (!isset($settings['system']['dbversion'])
-		|| $settings['system']['dbversion'] == ''
+			|| $settings['system']['dbversion'] == ''
 		) {
 			/**
 			 * for syscp-stable (1.4.2.1) this value has to be 0
@@ -43,11 +42,9 @@ if($page == 'overview')
 			 * and the svn-version has its value in the database
 			 * -> bug #54
 			 */
-			
 			$result = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'");
-			
-			if(isset($result['value']))
-			{
+
+			if (isset($result['value'])) {
 				$settings['system']['dbversion'] = (int)$result['value'];
 			} else {
 				$settings['system']['dbversion'] = 0;
@@ -55,40 +52,36 @@ if($page == 'overview')
 		}
 	}
 
-	if(hasUpdates($version))
-	{
+	if (hasUpdates($version)) {
 		$successful_update = false;
 		$message = '';
 
-		if(isset($_POST['send'])
-		&& $_POST['send'] == 'send')
-		{
-			if((isset($_POST['update_preconfig'])
+		if (isset($_POST['send'])
+			&& $_POST['send'] == 'send'
+		) {
+			if ((isset($_POST['update_preconfig'])
 				&& isset($_POST['update_changesagreed'])
 				&& intval($_POST['update_changesagreed']) != 0)
 				|| !isset($_POST['update_preconfig'])
 			) {
-				eval("echo \"" . getTemplate("update/update_start") . "\";");
+				eval("echo \"" . getTemplate('update/update_start') . "\";");
 	
 				include_once './install/updatesql.php';
 	
 				$redirect_url = 'admin_index.php?s=' . $s;
-				eval("echo \"" . getTemplate("update/update_end") . "\";");
+				eval("echo \"" . getTemplate('update/update_end') . "\";");
 	
 				updateCounters();
 				inserttask('1');
 				@chmod('./lib/userdata.inc.php', 0440);
 				
 				$successful_update = true;
-			}
-			else
-			{
-				$message = '<br /><strong style="color:#ff0000;">You have to agree that you have read the update notifications.</strong>';
+			} else {
+				$message = '<br /><strong style="color: red">You have to agree that you have read the update notifications.</strong>';
 			}
 		}
 
-		if(!$successful_update)
-		{
+		if (!$successful_update) {
 			$current_version = $settings['panel']['version'];
 			$new_version = $version;
 
@@ -96,29 +89,23 @@ if($page == 'overview')
 			$ui_text = str_replace('%curversion', $current_version, $ui_text);
 			$ui_text = str_replace('%newversion', $new_version, $ui_text);
 			$update_information = $ui_text;
-			
+
 			include_once './install/updates/preconfig.php';
 			$preconfig = getPreConfig($current_version);
-			if($preconfig != '')
-			{
-				$update_information .= '<br />'.$preconfig.$message;
+			if ($preconfig != '') {
+				$update_information .= '<br />' . $preconfig . $message;
 			}
-			
+
 			$update_information .= $lng['update']['update_information']['part_b'];
 
-			eval("echo \"" . getTemplate("update/index") . "\";");
+			eval("echo \"" . getTemplate('update/index') . "\";");
 		}
-	}
-	else
-	{
+	} else {
 		/*
 		 * @TODO version-webcheck check here
 		 */
-
 		$success_message = $lng['update']['noupdatesavail'];
 		$redirect_url = 'admin_index.php?s=' . $s;
-		eval("echo \"" . getTemplate("update/noupdatesavail") . "\";");
+		eval("echo \"" . getTemplate('update/noupdatesavail') . "\";");
 	}
 }
-
-?>

customer_aps.php

@@ -17,18 +17,18 @@
  *
  */
 
-// Required code
-
 define('AREA', 'customer');
-require ("./lib/init.php");
+require ('./lib/init.php');
+
 $Id = 0;
+if (isset($_GET['id'])) {
+    $Id = (int)$_GET['id'];
+}
+if (isset($_POST['id'])) {
+    $Id = (int)$_POST['id'];
+}
 
-if(isset($_GET['id']))$Id = (int)$_GET['id'];
-
-if(isset($_POST['id']))$Id = (int)$_POST['id'];
-eval("echo \"" . getTemplate("aps/header") . "\";");
+eval("echo \"" . getTemplate('aps/header') . "\";");
 $Aps = new ApsParser($userinfo, $settings, $db);
 $Aps->MainHandler($action);
-eval("echo \"" . getTemplate("aps/footer") . "\";");
-
-?>
+eval("echo \"" . getTemplate('aps/footer') . "\";");

customer_autoresponder.php

@@ -17,18 +17,14 @@
  *
  */
 
-// Required code
-
 define('AREA', 'customer');
-require ("./lib/init.php");
+require('./lib/init.php');
 
-// Create new autoresponder
-
-if($action == "add")
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+if ($action == 'add') {
+	// Create new autoresponder
+	if (isset($_POST['send'])
+	   && $_POST['send'] == 'send'
+	) {
 		$account = trim($_POST['account']);
 		$subject = trim($_POST['subject']);
 		$message = trim($_POST['message']);
@@ -42,39 +38,31 @@ if($action == "add")
 		$ts_from = -1;
 		$ts_until = -1;
 
-		if($date_from_off > -1)
-		{
+		if ($date_from_off > -1) {
 			$date_from = $_POST['date_from'];
 			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
 		}
-		if($date_until_off > -1)
-		{
+		if ($date_until_off > -1) {
 			$date_until = $_POST['date_until'];
 			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
 		}
 
-		if(empty($account)
+		if (empty($account)
 		   || empty($subject)
-		   || empty($message))
-		{
+		   || empty($message)
+		) {
 			standard_error('missingfields');
 		}
 
 		// Does account exist?
-
 		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
-		{
+		if ($db->num_rows($result) == 0) {
 			standard_error('accountnotexisting');
 		}
 
 		// Does autoresponder exist?
-
 		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 1)
-		{
+		if ($db->num_rows($result) == 1) {
 			standard_error('autoresponderalreadyexists');
 		}
 
@@ -92,19 +80,14 @@ if($action == "add")
 	}
 
 	// Get accounts
-
 	$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` NOT IN (SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`) ORDER BY email ASC");
-
-	if($db->num_rows($result) == 0)
-	{
+	if ($db->num_rows($result) == 0) {
 		standard_error('noemailaccount');
 	}
 
 	$accounts = '';
-
-	while($row = $db->fetch_array($result))
-	{
-		$accounts.= "<option value=\"" . $row['email'] . "\">" . $row['email'] . "</option>";
+	while ($row = $db->fetch_array($result)) {
+		$accounts .= '<option value="' . $row['email'] . '">' . $row['email'] . '</option>';
 	}
 
 	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
@@ -118,18 +101,12 @@ if($action == "add")
 	$title = $autoresponder_add_data['autoresponder_add']['title'];
 	$image = $autoresponder_add_data['autoresponder_add']['image'];
 
-	eval("echo \"" . getTemplate("autoresponder/autoresponder_add") . "\";");
-}
-
-// Edit autoresponder
-
-else
-
-if($action == "edit")
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+	eval("echo \"" . getTemplate('autoresponder/autoresponder_add') . "\";");
+} elseif ($action == 'edit') {
+	// Edit autoresponder
+	if (isset($_POST['send'])
+	   && $_POST['send'] == 'send'
+	) {
 		$account = trim($_POST['account']);
 		$subject = trim($_POST['subject']);
 		$message = trim($_POST['message']);
@@ -143,49 +120,36 @@ if($action == "edit")
 		$ts_from = -1;
 		$ts_until = -1;
 
-		if($date_from_off > -1)
-		{
+		if ($date_from_off > -1) {
 			$date_from = $_POST['date_from'];
 			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
 		}
-		if($date_until_off > -1)
-		{
+		if ($date_until_off > -1) {
 			$date_until = $_POST['date_until'];
 			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
 		}
 
-		if(empty($account)
+		if (empty($account)
 		   || empty($subject)
-		   || empty($message))
-		{
+		   || empty($message)
+		) {
 			standard_error('missingfields');
 		}
 
 		// Does account exist?
-
 		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
+		if ($db->num_rows($result) == 0)
 		{
 			standard_error('accountnotexisting');
 		}
 
 		// Does autoresponder exist?
-
 		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
-		{
+		if ($db->num_rows($result) == 0) {
 			standard_error('invalidautoresponder');
 		}
 
-		$ResponderActive = 0;
-
-		if(isset($_POST['active'])
-		   && $_POST['active'] == '1')
-		{
-			$ResponderActive = 1;
-		}
+		$ResponderActive = (isset($_POST['active']) && $_POST['active'] == '1') ? 1 : 0;
 
 		$db->query("UPDATE `" . TABLE_MAIL_AUTORESPONDER . "`
 			SET `message` = '" . $db->escape($message) . "',
@@ -202,11 +166,8 @@ if($action == "edit")
 	$email = trim(htmlspecialchars($_GET['email']));
 
 	// Get account data
-
 	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($email) . "' LIMIT 0,1");
-
-	if($db->num_rows($result) == 0)
-	{
+	if ($db->num_rows($result) == 0) {
 		standard_error('invalidautoresponder');
 	}
 
@@ -217,25 +178,19 @@ if($action == "edit")
 	$date_from = (int)$row['date_from'];
 	$date_until = (int)$row['date_until'];
 
-	if($date_from == -1)
-	{
+	if ($date_from == -1) {
 		$deactivated = '-1';
 		$date_from = '';
-	}
-	else
-	{
+	} else {
 		$deactivated = '0';
 		$date_from = date('d-m-Y', $date_from);
 	}
 	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
 
-	if($date_until == -1)
-	{
+	if ($date_until == -1) {
 		$deactivated = '-1';
 		$date_until = '';
-	}
-	else
-	{
+	} else {
 		$deactivated = '0';
 		$date_until = date('d-m-Y', $date_until);
 	}
@@ -249,26 +204,17 @@ if($action == "edit")
 	$title = $autoresponder_edit_data['autoresponder_edit']['title'];
 	$image = $autoresponder_edit_data['autoresponder_edit']['image'];
 
-	eval("echo \"" . getTemplate("autoresponder/autoresponder_edit") . "\";");
-}
-
-// Delete autoresponder
-
-else
-
-if($action == "delete")
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+	eval("echo \"" . getTemplate('autoresponder/autoresponder_edit') . "\";");
+} elseif ($action == 'delete') {
+	// Delete autoresponder
+	if (isset($_POST['send'])
+	   && $_POST['send'] == 'send'
+	) {
 		$account = trim($_POST['account']);
 
 		// Does autoresponder exist?
-
 		$result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1");
-
-		if($db->num_rows($result) == 0)
-		{
+		if ($db->num_rows($result) == 0) {
 			standard_error('invalidautoresponder');
 		}
 
@@ -282,37 +228,25 @@ if($action == "delete")
 
 	$email = trim(htmlspecialchars($_GET['email']));
 	ask_yesno('autoresponderdelete', $filename, array('action' => $action, 'account' => $email));
-}
-
-// List existing autoresponders
-
-else
-{
+} else {
+	// List existing autoresponders
 	$autoresponder = '';
 	$count = 0;
 	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' ORDER BY email ASC");
 
-	while($row = $db->fetch_array($result))
-	{
-		if($row['date_from'] == -1 && $row['date_until'] == -1)
-		{
+	while ($row = $db->fetch_array($result)) {
+		if ($row['date_from'] == -1 && $row['date_until'] == -1) {
 			$activated_date = $lng['panel']['not_activated'];
-		}
-		elseif($row['date_from'] == -1 && $row['date_until'] != -1)
-		{
+		} elseif($row['date_from'] == -1 && $row['date_until'] != -1) {
 			$activated_date = $lng['autoresponder']['date_until'].': '.date('d-m-Y', $row['date_until']);
-		}
-		elseif($row['date_from'] != -1 && $row['date_until'] == -1)
-		{
+		} elseif($row['date_from'] != -1 && $row['date_until'] == -1) {
 			$activated_date = $lng['autoresponder']['date_from'].': '.date('d-m-Y', $row['date_from']);
-		}
-		else
-		{
+		} else {
 			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
 		}
-		eval("\$autoresponder.=\"" . getTemplate("autoresponder/autoresponder_autoresponder") . "\";");
+		eval("\$autoresponder.=\"" . getTemplate('autoresponder/autoresponder_autoresponder') . "\";");
 		$count++;
 	}
 
-	eval("echo \"" . getTemplate("autoresponder/autoresponder") . "\";");
+	eval("echo \"" . getTemplate('autoresponder/autoresponder') . "\";");
 }

customer_domains.php

@@ -50,7 +50,7 @@ elseif($page == 'domains')
 			'd.aliasdomain' => $lng['domains']['aliasdomain']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_DOMAINS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`email_only`='0' AND `d`.`id` <> " . (int)$userinfo['standardsubdomain'] . " " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$result = $db->query("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_ipandport`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`email_only`='0' AND `d`.`id` <> " . (int)$userinfo['standardsubdomain'] . " " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
 		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
@@ -151,6 +151,15 @@ elseif($page == 'domains')
 						$row['documentroot'] = makeCorrectDir(substr($row['documentroot'], strlen($userinfo['documentroot'])));
 					}
 
+					// get ssl-ips if activated
+					// FIXME for multi-ip later
+					$show_ssledit = false;
+					if ($settings['system']['use_ssl'] == '1'
+							&& $row['ssl_ipandport'] != 0
+							&& $row['caneditdomain'] == '1'
+					) {
+						$show_ssledit = true;
+					}
 					$row = htmlentities_array($row);
 					eval("\$domains.=\"" . getTemplate("domains/domains_domain") . "\";");
 				}
@@ -197,11 +206,9 @@ elseif($page == 'domains')
 				$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used`=`subdomains_used`-1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 				inserttask('1');
 
-				# Using nameserver, insert a task which rebuilds the server config
-				if ($settings['system']['bind_enable'])
-				{
-					inserttask('4');
-				}
+				// Using nameserver, insert a task which rebuilds the server config
+				inserttask('4');
+
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
 			else
@@ -254,8 +261,17 @@ elseif($page == 'domains')
 				if(!preg_match('/^https?\:\/\//', $path)
 				   || !validateUrl($idna_convert->encode($path)))
 				{
-					$path = $userinfo['documentroot'] . '/' . $path;
-					$path = makeCorrectDir($path);
+					// If path is empty or '/' and 'Use domain name as default value for DocumentRoot path' is enabled in settings,
+					// set default path to subdomain or domain name
+					if((($path == '') || ($path == '/'))
+						&& $settings['system']['documentroot_use_default_value'] == 1)
+					{
+						$path = makeCorrectDir($userinfo['documentroot'] . '/' . $completedomain);
+					}
+					else
+					{
+						$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+					}
 					if (strstr($path, ":") !== FALSE)
 					{
 						standard_error('pathmaynotcontaincolon');
@@ -334,8 +350,7 @@ elseif($page == 'domains')
 								`parentdomainid` = '" . (int)$domain_check['id'] . "', 
 								`isemaildomain` = '" . ($domain_check['subcanemaildomain'] == '3' ? '1' : '0') . "', 
 								`openbasedir` = '" . $db->escape($domain_check['openbasedir']) . "', 
-								`openbasedir_path` = '" . $db->escape($openbasedir_path) . "', 
-								`safemode` = '" . $db->escape($domain_check['safemode']) . "', 
+								`openbasedir_path` = '" . $db->escape($openbasedir_path) . "',
 								`speciallogfile` = '" . $db->escape($domain_check['speciallogfile']) . "', 
 								`specialsettings` = '" . $db->escape($domain_check['specialsettings']) . "', 
 								`ssl_redirect` = '" . $ssl_redirect . "', 
@@ -353,10 +368,8 @@ elseif($page == 'domains')
 					inserttask('1');
 
 					// Using nameserver, insert a task which rebuilds the server config
-					if ($settings['system']['bind_enable'])
-					{
-						inserttask('4');
-					}
+					inserttask('4');
+
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
 			}
@@ -388,7 +401,13 @@ elseif($page == 'domains')
 					}
 				}
 
-				//$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
+				// check if we at least have one ssl-ip/port, #1179
+				$ssl_ipsandports = '';
+				$resultX = $db->query_first("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'");
+				if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) {
+					$ssl_ipsandports = 'notempty';
+				}
+
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, NULL, true) . makeoption($lng['domain']['homedir'], 1, NULL, true);
 				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
 
@@ -405,7 +424,7 @@ elseif($page == 'domains')
 	elseif($action == 'edit'
 	       && $id != 0)
 	{
-		$result = $db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir_path`, `d`.`ipandport`, `pd`.`subcanemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`id`='" . (int)$id . "' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
+		$result = $db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir`, `d`.`openbasedir_path`, `d`.`ipandport`, `pd`.`subcanemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`id`='" . (int)$id . "' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'");
 		$alias_check = $db->query_first('SELECT COUNT(`id`) AS count FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$result['id'] . '\'');
 		$alias_check = $alias_check['count'];
 		$_doredirect = false;
@@ -431,8 +450,17 @@ elseif($page == 'domains')
 				if(!preg_match('/^https?\:\/\//', $path)
 				   || !validateUrl($idna_convert->encode($path)))
 				{
-					$path = $userinfo['documentroot'] . '/' . $path;
-					$path = makeCorrectDir($path);
+					// If path is empty or '/' and 'Use domain name as default value for DocumentRoot path' is enabled in settings,
+					// set default path to subdomain or domain name
+					if((($path == '') || ($path == '/'))
+						&& $settings['system']['documentroot_use_default_value'] == 1)
+					{
+						$path = makeCorrectDir($userinfo['documentroot'] . '/' . $result['domain']);
+					}
+					else
+					{
+						$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
+					}
 					if (strstr($path, ":") !== FALSE)
 					{
 						standard_error('pathmaynotcontaincolon');
@@ -533,10 +561,8 @@ elseif($page == 'domains')
 						inserttask('1');
 
 						// Using nameserver, insert a task which rebuilds the server config
-						if ($settings['system']['bind_enable'])
-						{
-							inserttask('4');
-						}
+						inserttask('4');
+
 					}
 
 					redirectTo($filename, Array('page' => $page, 's' => $s));
@@ -585,11 +611,13 @@ elseif($page == 'domains')
 					}
 				}
 
-				/*
-				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
-				$iswildcarddomain = makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']);
-				$isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
-				*/
+				// check if we at least have one ssl-ip/port, #1179
+				$ssl_ipsandports = '';
+				$resultX = $db->query_first("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'");
+				if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) {
+					$ssl_ipsandports = 'notempty';
+				}
+
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, $result['openbasedir_path'], true) . makeoption($lng['domain']['homedir'], 1, $result['openbasedir_path'], true);
 
 				$result_ipandport = $db->query_first("SELECT `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id`='".(int)$result['ipandport']."'");
@@ -615,5 +643,127 @@ elseif($page == 'domains')
 		}
 	}
 }
+elseif ($page == 'domainssleditor') {
+
+	if ($action == ''
+			|| $action == 'view'
+	) {
+		if (isset($_POST['send'])
+				&& $_POST['send'] == 'send'
+		) {
+
+			$ssl_cert_file = isset($_POST['ssl_cert_file']) ? $_POST['ssl_cert_file'] : '';
+			$ssl_key_file = isset($_POST['ssl_key_file']) ? $_POST['ssl_key_file'] : '';
+			$ssl_ca_file = isset($_POST['ssl_ca_file']) ? $_POST['ssl_ca_file'] : '';
+			$ssl_cert_chainfile = isset($_POST['ssl_cert_chainfile']) ? $_POST['ssl_cert_chainfile'] : '';
+			$do_insert = isset($_POST['do_insert']) ? (($_POST['do_insert'] == 1) ? true : false) : false;
+
+			if ($ssl_cert_file != '' && $ssl_key_file == '') {
+				standard_error('sslcertificateismissingprivatekey');
+			}
+
+			$do_verify = true;
+
+			// no cert-file given -> forget everything
+			if ($ssl_cert_file == '') {
+				$ssl_key_file = '';
+				$ssl_ca_file = '';
+				$ssl_cert_chainfile = '';
+				$do_verify = false;
+			}
+
+			// verify certificate content
+			if ($do_verify) {
+				// array openssl_x509_parse ( mixed $x509cert [, bool $shortnames = true ] )
+				// openssl_x509_parse() returns information about the supplied x509cert, including fields such as 
+				// subject name, issuer name, purposes, valid from and valid to dates etc.
+				$cert_content = openssl_x509_parse($ssl_cert_file);
+
+				if (is_array($cert_content)
+						&& isset($cert_content['subject'])
+						&& isset($cert_content['subject']['CN'])
+				) {
+					// TODO self-signed certs might differ and don't need/want this
+					/*
+					$domain = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAINS."` WHERE `id`='".(int)$id."'");
+					if (strtolower($cert_content['subject']['CN']) != strtolower($idna_convert->decode($domain['domain']))) {
+						standard_error('sslcertificatewrongdomain');
+					}
+					*/
+
+					// bool openssl_x509_check_private_key ( mixed $cert , mixed $key )
+					// Checks whether the given key is the private key that corresponds to cert.
+					if (openssl_x509_check_private_key($ssl_cert_file, $ssl_key_file) === false) {
+						standard_error('sslcertificateinvalidcertkeypair');
+					}
+
+					// check optional stuff
+					if ($ssl_ca_file != '') {
+						$ca_content = openssl_x509_parse($ssl_ca_file);
+						if (!is_array($ca_content)) {
+							// invalid
+							standard_error('sslcertificateinvalidca');
+						}
+					}
+					if ($ssl_cert_chainfile != '') {
+						$chain_content = openssl_x509_parse($ssl_cert_chainfile);
+						if (!is_array($chain_content)) {
+							// invalid
+							standard_error('sslcertificateinvalidchain');
+						}
+					}
+				} else {
+					standard_error('sslcertificateinvalidcert');
+				}
+			}
+
+			// Add/Update database entry
+			$qrystart = "UPDATE ";
+			$qrywhere = "WHERE ";
+			if ($do_insert) {
+				$qrystart = "INSERT INTO ";
+				$qrywhere = ", ";
+			}
+			$db->query($qrystart." `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` SET
+					`ssl_cert_file` = '".$db->escape($ssl_cert_file)."',
+					`ssl_key_file` = '".$db->escape($ssl_key_file)."',
+					`ssl_ca_file` = '".$db->escape($ssl_ca_file)."',
+					`ssl_cert_chainfile` = '".$db->escape($ssl_cert_chainfile)."'
+					".$qrywhere." `domainid`='".(int)$id."';"
+			);
+
+			// insert task to re-generate webserver-configs (#1260)
+			inserttask('1');
+
+			// back to domain overview
+			redirectTo($filename, array('page' => 'domains', 's' => $s));
+		}
+
+		$result = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."`
+			WHERE `domainid`='".(int)$id."';"
+		);
+
+		$do_insert = false;
+		// if no entry can be found, behave like we have empty values
+		if (!is_array($result) || !isset($result['ssl_cert_file'])) {
+			$result = array(
+				'ssl_cert_file' => '',
+				'ssl_key_file' => '',
+				'ssl_ca_file' => '',
+				'ssl_cert_chainfile' => ''
+			);
+			$do_insert = true;
+		}
+
+		$result = htmlentities_array($result);
+
+		$ssleditor_data = include_once dirname(__FILE__).'/lib/formfields/customer/domains/formfield.domain_ssleditor.php';
+		$ssleditor_form = htmlform::genHTMLForm($ssleditor_data);
+
+		$title = $ssleditor_data['domain_ssleditor']['title'];
+		$image = $ssleditor_data['domain_ssleditor']['image'];
+
+		eval("echo \"" . getTemplate("domains/domain_ssleditor") . "\";");
+	}
+}
 
-?>

customer_email.php

@@ -458,7 +458,7 @@ elseif($page == 'accounts')
 							$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
 						}
 
-						$cryptPassword = makeCryptPassword($db->escape($password),1);
+						$cryptPassword = makeCryptPassword($password);
 
 						$email_user=substr($email_full,0,strrpos($email_full,"@"));
 						$email_domain=substr($email_full,strrpos($email_full,"@")+1);
@@ -512,7 +512,7 @@ elseif($page == 'accounts')
 							$mail->Subject = $mail_subject;
 							$mail->AltBody = $mail_body;
 							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
-							$mail->AddAddress($email_full, getCorrectUserSalutation($userinfo));
+							$mail->AddAddress($email_full);
 							$mail->Send();
 						} catch(phpmailerException $e) {
 							$mailerr_msg = $e->errorMessage();
@@ -607,7 +607,7 @@ elseif($page == 'accounts')
 				$password = validatePassword($password);
 				
 				$log->logAction(USR_ACTION, LOG_NOTICE, "changed email password for '" . $result['email_full'] . "'");
-				$cryptPassword = makeCryptPassword($db->escape($password),1);
+				$cryptPassword = makeCryptPassword($password);
 				$result = $db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET " . ($settings['system']['mailpwcleartext'] == '1' ? "`password` = '" . $db->escape($password) . "', " : '') . " `password_enc`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$result['popaccountid'] . "'");
 				redirectTo($filename, Array('page' => 'emails', 'action' => 'edit', 'id' => $id, 's' => $s));
 			}

customer_ftp.php

@@ -22,27 +22,20 @@ define('AREA', 'customer');
 /**
  * Include our init.php, which manages Sessions, Language etc.
  */
+require('./lib/init.php');
 
-require ("./lib/init.php");
-
-if(isset($_POST['id']))
-{
+$id = 0;
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp");
-	eval("echo \"" . getTemplate("ftp/ftp") . "\";");
-}
-elseif($page == 'accounts')
-{
-	if($action == '')
-	{
+	eval("echo \"" . getTemplate('ftp/ftp') . "\";");
+} elseif ($page == 'accounts') {
+	if ($action == '') {
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_ftp::accounts");
 		$fields = array(
 			'username' => $lng['login']['username'],
@@ -59,23 +52,18 @@ elseif($page == 'accounts')
 		$count = 0;
 		$accounts = '';
 
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
-				if(strpos($row['homedir'], $userinfo['documentroot']) === 0)
-				{
+		while ($row = $db->fetch_array($result)) {
+			if ($paging->checkDisplay($i)) {
+				if (strpos($row['homedir'], $userinfo['documentroot']) === 0) {
 					$row['documentroot'] = substr($row['homedir'], strlen($userinfo['documentroot']));
-				}
-				else
-				{
+				} else {
 					$row['documentroot'] = $row['homedir'];
 				}
 
 				$row['documentroot'] = makeCorrectDir($row['documentroot']);
 				
 				$row = htmlentities_array($row);
-				eval("\$accounts.=\"" . getTemplate("ftp/accounts_account") . "\";");
+				eval("\$accounts.=\"" . getTemplate('ftp/accounts_account') . "\";");
 				$count++;
 			}
 
@@ -83,19 +71,16 @@ elseif($page == 'accounts')
 		}
 
 		$ftps_count = $db->num_rows($result);
-		eval("echo \"" . getTemplate("ftp/accounts") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
+		eval("echo \"" . getTemplate('ftp/accounts') . "\";");
+	} elseif ($action == 'delete' && $id != 0) {
 		$result = $db->query_first("SELECT `id`, `username`, `homedir`, `up_count`, `up_bytes`, `down_count`, `down_bytes` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 
-		if(isset($result['username'])
-		   && $result['username'] != $userinfo['loginname'])
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+		if (isset($result['username'])
+		   && $result['username'] != $userinfo['loginname']
+		) {
+			if (isset($_POST['send'])
+			   && $_POST['send'] == 'send'
+			) {
 				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `up_count`=`up_count`+'" . (int)$result['up_count'] . "', `up_bytes`=`up_bytes`+'" . (int)$result['up_bytes'] . "', `down_count`=`down_count`+'" . (int)$result['down_count'] . "', `down_bytes`=`down_bytes`+'" . (int)$result['down_bytes'] . "' WHERE `username`='" . $db->escape($userinfo['loginname']) . "'");
 				$result = $db->query_first("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 				$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($result['username']) . "'");
@@ -103,96 +88,69 @@ elseif($page == 'accounts')
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
 				$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=REPLACE(`members`,'," . $db->escape($result['username']) . "','') WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 
-				if($userinfo['ftps_used'] == '1')
-				{
-					$resetaccnumber = " , `ftp_lastaccountnumber`='0'";
-				}
-				else
-				{
-					$resetaccnumber = '';
-				}
+				$resetaccnumber = ($userinfo['ftps_used'] == '1') ? " , `ftp_lastaccountnumber`='0'" : '';
 
 				// refs #293
-				if(isset($_POST['delete_userfiles'])
-				  && (int)$_POST['delete_userfiles'] == 1)
-				{
+				if (isset($_POST['delete_userfiles'])
+				  && (int)$_POST['delete_userfiles'] == 1
+				) {
 					inserttask('8', $userinfo['loginname'], $result['homedir']);
 				}
 
 				$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`-1 $resetaccnumber WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+			} else {
 				ask_yesno_withcheckbox('ftp_reallydelete', 'admin_customer_alsoremoveftphomedir', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['username']);
 			}
-		}
-		else
-		{
+		} else {
 			standard_error('ftp_cantdeletemainaccount');
 		}
-	}
-	elseif($action == 'add')
-	{
-		if($userinfo['ftps_used'] < $userinfo['ftps']
-		   || $userinfo['ftps'] == '-1')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+	} elseif ($action == 'add') {
+		if ($userinfo['ftps_used'] < $userinfo['ftps']
+		   || $userinfo['ftps'] == '-1'
+		) {
+			if (isset($_POST['send'])
+			   && $_POST['send'] == 'send'
+			) {
 				$path = validate($_POST['path'], 'path');
 				$password = validate($_POST['ftp_password'], 'password');
 				$password = validatePassword($password);
 
 				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
-				if($sendinfomail != 1)
-				{
+				if ($sendinfomail != 1) {
 					$sendinfomail = 0;
 				}
 
-				if($settings['customer']['ftpatdomain'] == '1')
-				{
+				if ($settings['customer']['ftpatdomain'] == '1') {
 					$ftpusername = validate($_POST['ftp_username'], 'username', '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+\$?$/');
-					if($ftpusername == '')
-					{
+					if ($ftpusername == '') {
 						standard_error(array('stringisempty', 'username'));
 					}
 					$ftpdomain = $idna_convert->encode(validate($_POST['ftp_domain'], 'domain'));
 					$ftpdomain_check = $db->query_first("SELECT `id`, `domain`, `customerid` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($ftpdomain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "'");
-					if($ftpdomain_check['domain'] != $ftpdomain)
-					{
+					if ($ftpdomain_check['domain'] != $ftpdomain) {
 						standard_error('maindomainnonexist', $domain);
 					}
 					$username = $ftpusername . "@" . $ftpdomain;
-				}
-				else
-				{
+				} else {
 					$username = $userinfo['loginname'] . $settings['customer']['ftpprefix'] . (intval($userinfo['ftp_lastaccountnumber']) + 1);
 				}
 				
 				$username_check = $db->query_first('SELECT * FROM `' . TABLE_FTP_USERS .'` WHERE `username` = \'' . $db->escape($username) . '\'');
 				
-				if(!empty($username_check) && $username_check['username'] = $username)
-				{
+				if (!empty($username_check) && $username_check['username'] = $username) {
 					standard_error('usernamealreadyexists', $username);
-				}
-				elseif($password == '')
-				{
+				} elseif ($password == '') {
 					standard_error(array('stringisempty', 'mypassword'));
-				}
-				elseif($path == '')
-				{
+				} elseif ($path == '') {
 					standard_error('patherror');
-				}
-				else
-				{
+				} else {
 					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
 
-					$cryptPassword = makeCryptPassword($db->escape($password),1);					
+					$cryptPassword = makeCryptPassword($password);
 					$db->query("INSERT INTO `" . TABLE_FTP_USERS . "` (`customerid`, `username`, `password`, `homedir`, `login_enabled`, `uid`, `gid`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($username) . "', '" . $db->escape($cryptPassword) . "', '" . $db->escape($path) . "', 'y', '" . (int)$userinfo['guid'] . "', '" . (int)$userinfo['guid'] . "')");
 					$result = $db->query("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $userinfo['loginname'] . "'");
-					while($row = $db->fetch_array($result))
-					{
+					while ($row = $db->fetch_array($result)) {
 						$db->query("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $db->escape($username) . "', 'user', '" . $db->escape($row['bytes_in_used']) . "', '0', '0', '0', '0', '0')");
 					}
 					$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=CONCAT_WS(',',`members`,'" . $db->escape($username) . "') WHERE `customerid`='" . $userinfo['customerid'] . "' AND `gid`='" . (int)$userinfo['guid'] . "'");
@@ -201,10 +159,10 @@ elseif($page == 'accounts')
 					$log->logAction(USR_ACTION, LOG_INFO, "added ftp-account '" . $username . " (" . $path . ")'");
 					inserttask(5);
 
-					if($sendinfomail == 1)
-					{
+					if ($sendinfomail == 1) {
 						$replace_arr = array(
-							'CUST_NAME' => getCorrectUserSalutation($userinfo),
+							'SALUTATION' => getCorrectUserSalutation($userinfo),
+							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
 							'USR_NAME' => $username,
 							'USR_PASS' => $password,
 							'USR_PATH' => makeCorrectDir(substr($path, strlen($userinfo['documentroot'])))
@@ -241,29 +199,23 @@ elseif($page == 'accounts')
 
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-			}
-			else
-			{
+			} else {
 				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], '/');
 
-				if($settings['customer']['ftpatdomain'] == '1')
-				{
+				if ($settings['customer']['ftpatdomain'] == '1') {
 					$domainlist = array();
 					$domains = '';
 
 					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 
-					while($row_domain = $db->fetch_array($result_domains))
-					{
+					while ($row_domain = $db->fetch_array($result_domains)) {
 						$domainlist[] =  $row_domain['domain'];
 					}
 
 					sort($domainlist);
 
-					if(isset($domainlist[0]) && $domainlist[0] != '')
-					{
-						foreach($domainlist as $dom)
-						{
+					if (isset($domainlist[0]) && $domainlist[0] != '') {
+						foreach ($domainlist as $dom) {
 							$domains .= makeoption($idna_convert->decode($dom), $dom);
 						}
 					}
@@ -277,61 +229,50 @@ elseif($page == 'accounts')
 				$title = $ftp_add_data['ftp_add']['title'];
 				$image = $ftp_add_data['ftp_add']['image'];
 
-				eval("echo \"" . getTemplate("ftp/accounts_add") . "\";");
+				eval("echo \"" . getTemplate('ftp/accounts_add') . "\";");
 			}
 		}
-	}
-	elseif($action == 'edit'
-	       && $id != 0)
-	{
+	} elseif ($action == 'edit' && $id != 0) {
 		$result = $db->query_first("SELECT `id`, `username`, `homedir`, `uid`, `gid` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 
-		if(isset($result['username'])
-		   && $result['username'] != '')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+		if (isset($result['username'])
+		   && $result['username'] != ''
+		) {
+			if (isset($_POST['send'])
+			   && $_POST['send'] == 'send'
+			) {
 				$path = validate($_POST['path'], 'path');
 				
 				$_setnewpass = false;
-				if(isset($_POST['ftp_password']) && $_POST['ftp_password'] != '')
-				{
+				if (isset($_POST['ftp_password']) && $_POST['ftp_password'] != '') {
 					$password = validate($_POST['ftp_password'], 'password');
 					$password = validatePassword($password);
 					$_setnewpass = true;
 				}
 
-				if($_setnewpass)
-				{
-					if($password == '')
-					{
+				if ($_setnewpass) {
+					if ($password == '') {
 						standard_error(array('stringisempty', 'mypassword'));
 						exit;
 					}
-					else
-					{
-						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
-						$cryptPassword = makeCryptPassword($db->escape($password),1);
-						$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+					$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
+					$cryptPassword = makeCryptPassword($password);
+					$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 						
-						// also update customers backup user password if password of main ftp user is changed
-						if(!preg_match('/' . $settings['customer']['ftpprefix'] . '/', $result['username'])){
-						    $db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $result['username'] . "_backup'");
-						}
+					// also update customers backup user password if password of main ftp user is changed
+					if(!preg_match('/' . $settings['customer']['ftpprefix'] . '/', $result['username'])){
+					    $db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $result['username'] . "_backup'");
 					}
 				}
 				
-				if($path != '')
-				{
+				if ($path != '') {
 					$path = makeCorrectDir($userinfo['documentroot'] . '/' . $path);
-					
-					if($path != $result['homedir'])
-					{
-						if(!file_exists($path))
-						{
-							mkDirWithCorrectOwnership($userinfo['documentroot'], $path, $result['uid'], $result['gid']);
-							inserttask(5); /* Let the cronjob do the rest */
+
+					if ($path != $result['homedir']) {
+						if (!file_exists($path)) {
+							// it's the task for "new ftp" but that will 
+							// create all directories and correct their permissions
+							inserttask(5);
 						}
 
 						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account homdir for '" . $result['username'] . "'");
@@ -340,30 +281,23 @@ elseif($page == 'accounts')
 				}
 
 				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
-				if(strpos($result['homedir'], $userinfo['documentroot']) === 0)
-				{
+			} else {
+				if (strpos($result['homedir'], $userinfo['documentroot']) === 0) {
 					$homedir = substr($result['homedir'], strlen($userinfo['documentroot']));
-				}
-				else
-				{
+				} else {
 					$homedir = $result['homedir'];
 				}
 				$homedir = makeCorrectDir($homedir);
 
 				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $homedir);
 
-				if($settings['customer']['ftpatdomain'] == '1')
-				{
+				if ($settings['customer']['ftpatdomain'] == '1') {
 					$domains = '';
 
 					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 
-					while($row_domain = $db->fetch_array($result_domains))
-					{
-						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
+					while ($row_domain = $db->fetch_array($result_domains)) {
+						$domains .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
 					}
 				}
 
@@ -373,10 +307,8 @@ elseif($page == 'accounts')
 				$title = $ftp_edit_data['ftp_edit']['title'];
 				$image = $ftp_edit_data['ftp_edit']['image'];
 
-				eval("echo \"" . getTemplate("ftp/accounts_edit") . "\";");
+				eval("echo \"" . getTemplate('ftp/accounts_edit') . "\";");
 			}
 		}
 	}
 }
-
-?>

customer_index.php

@@ -22,35 +22,27 @@ define('AREA', 'customer');
 /**
  * Include our init.php, which manages Sessions, Language etc.
  */
+require('./lib/init.php');
 
-require ("./lib/init.php");
+if ($action == 'logout') {
+	$log->logAction(USR_ACTION, LOG_NOTICE, 'logged out');
 
-if($action == 'logout')
-{
-	$log->logAction(USR_ACTION, LOG_NOTICE, "logged out");
-
-	if($settings['session']['allow_multiple_login'] == '1')
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0' AND `hash` = '" . $s . "'");
+        $query = "DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'";
+	if ($settings['session']['allow_multiple_login'] == '1') {
+		$query .= " AND `hash` = '" . $s . "'";
 	}
-	else
-	{
-		$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'");
-	}
-
+	$db->query($query);
 	redirectTo('index.php');
 	exit;
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_index");
 	$domains = '';
 	$result = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `id` <> '" . (int)$userinfo['standardsubdomain'] . "' ");
 	$domainArray = array();
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $db->fetch_array($result)) {
 		$domainArray[] = $idna_convert->decode($row['domain']);
 	}
 
@@ -77,22 +69,15 @@ if($page == 'overview')
 	$awaitingtickets = $opentickets['count'];
 	$awaitingtickets_text = '';
 
-	if($opentickets > 0)
-	{
+	if ($opentickets > 0) {
 		$awaitingtickets_text = strtr($lng['ticket']['awaitingticketreply'], array('%s' => '<a href="customer_tickets.php?page=tickets&amp;s=' . $s . '">' . $opentickets['count'] . '</a>'));
 	}
 
-	eval("echo \"" . getTemplate("index/index") . "\";");
-}
-elseif($page == 'change_password')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+	eval("echo \"" . getTemplate('index/index') . "\";");
+} elseif ($page == 'change_password') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$old_password = validate($_POST['old_password'], 'old password');
-
-		if(md5($old_password) != $userinfo['password'])
-		{
+		if (md5($old_password) != $userinfo['password']) {
 			standard_error('oldpasswordnotcorrect');
 			exit;
 		}
@@ -100,45 +85,33 @@ elseif($page == 'change_password')
 		$new_password = validatePassword($_POST['new_password'], 'new password');
 		$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm');
 
-		if($old_password == '')
-		{
+		if ($old_password == '') {
 			standard_error(array('stringisempty', 'oldpassword'));
-		}
-		elseif($new_password == '')
-		{
+		} elseif($new_password == '') {
 			standard_error(array('stringisempty', 'newpassword'));
-		}
-		elseif($new_password_confirm == '')
-		{
+		} elseif($new_password_confirm == '') {
 			standard_error(array('stringisempty', 'newpasswordconfirm'));
-		}
-		elseif($new_password != $new_password_confirm)
-		{
+		} elseif($new_password != $new_password_confirm) {
 			standard_error('newpasswordconfirmerror');
-		}
-		else
-		{
+		} else {
 			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($new_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `password`='" . md5($old_password) . "'");
 			$log->logAction(USR_ACTION, LOG_NOTICE, 'changed password');
 
-			if(isset($_POST['change_main_ftp'])
-			   && $_POST['change_main_ftp'] == 'true')
-			{
-				$cryptPassword = makeCryptPassword($db->escape($new_password),1);
+			if (isset($_POST['change_main_ftp'])
+			   && $_POST['change_main_ftp'] == 'true'
+			) {
+				$cryptPassword = makeCryptPassword($new_password);
 				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'");
 				$log->logAction(USR_ACTION, LOG_NOTICE, 'changed main ftp password');
 			}
 
-			if(isset($_POST['change_webalizer'])
-			   && $_POST['change_webalizer'] == 'true')
-			{
-				if(CRYPT_STD_DES == 1)
-				{
+			if (isset($_POST['change_webalizer'])
+			   && $_POST['change_webalizer'] == 'true'
+			) {
+				if (CRYPT_STD_DES == 1) {
 					$saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2);
 					$new_webalizer_password = crypt($new_password, $saltfordescrypt);
-				}
-				else
-				{
+				} else {
 					$new_webalizer_password = crypt($new_password);
 				}
 
@@ -147,72 +120,52 @@ elseif($page == 'change_password')
 
 			redirectTo($filename, Array('s' => $s));
 		}
+	} else {
+		eval("echo \"" . getTemplate('index/change_password') . "\";");
 	}
-	else
-	{
-		eval("echo \"" . getTemplate("index/change_password") . "\";");
-	}
-}
-elseif($page == 'change_language')
-{
-	if(isset($_POST['send'])
-	   && $_POST['send'] == 'send')
-	{
+} elseif ($page == 'change_language') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$def_language = validate($_POST['def_language'], 'default language');
-
-		if(isset($languages[$def_language]))
-		{
+		if (isset($languages[$def_language])) {
 			$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 			$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'");
 			$log->logAction(USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'");
 		}
 
 		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
-		$language_options = '';
-
+	} else {
 		$default_lang = $settings['panel']['standardlanguage'];
-		if($userinfo['def_language'] != '') { 
+		if ($userinfo['def_language'] != '') { 
 			$default_lang = $userinfo['def_language'];
 		}
 
-		while(list($language_file, $language_name) = each($languages))
-		{
-			$language_options.= makeoption($language_name, $language_file, $default_lang, true);
+		$language_options = '';
+		while (list($language_file, $language_name) = each($languages)) {
+			$language_options .= makeoption($language_name, $language_file, $default_lang, true);
 		}
 
-		eval("echo \"" . getTemplate("index/change_language") . "\";");
+		eval("echo \"" . getTemplate('index/change_language') . "\";");
 	}
-}
-elseif($page == 'change_theme')
-{
-	if(isset($_POST['send'])
-		&& $_POST['send'] == 'send'
-	) {
+} elseif ($page == 'change_theme') {
+	if (isset($_POST['send']) && $_POST['send'] == 'send') {
 		$theme = validate($_POST['theme'], 'theme');
  
 		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
 		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
 		redirectTo($filename, Array('s' => $s));
-	}
-	else
-	{
-		$theme_options = '';
-
+	} else {
 		$default_theme = $settings['panel']['default_theme'];
-		if($userinfo['theme'] != '') {
+		if ($userinfo['theme'] != '') {
 			$default_theme = $userinfo['theme'];
 		}
 
+		$theme_options = '';
 		$themes_avail = getThemes();
-		foreach($themes_avail as $t)
-		{
-			$theme_options.= makeoption($t, $t, $default_theme, true);
+		foreach ($themes_avail as $t) {
+			$theme_options .= makeoption($t, $t, $default_theme, true);
 		}
 
-		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+		eval("echo \"" . getTemplate('index/change_theme') . "\";");
 	}
 }

customer_mysql.php

@@ -22,30 +22,22 @@ define('AREA', 'customer');
 /**
  * Include our init.php, which manages Sessions, Language etc.
  */
-
 $need_db_sql_data = true;
 $need_root_db_sql_data = true;
-require ("./lib/init.php");
+require('./lib/init.php');
 
-if(isset($_POST['id']))
-{
+if (isset($_POST['id'])) {
 	$id = intval($_POST['id']);
-}
-elseif(isset($_GET['id']))
-{
+} elseif(isset($_GET['id'])) {
 	$id = intval($_GET['id']);
 }
 
-if($page == 'overview')
-{
+if ($page == 'overview') {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql");
 	$lng['mysql']['description'] = str_replace('<SQL_HOST>', $sql['host'], $lng['mysql']['description']);
-	eval("echo \"" . getTemplate("mysql/mysql") . "\";");
-}
-elseif($page == 'mysqls')
-{
-	if($action == '')
-	{
+	eval("echo \"" . getTemplate('mysql/mysql') . "\";");
+} elseif($page == 'mysqls') {
+	if ($action == '') {
 		$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_mysql::mysqls");
 		$fields = array(
 			'databasename' => $lng['mysql']['databasename'],
@@ -64,53 +56,44 @@ elseif($page == 'mysqls')
 
 		// Begin root-session
 		$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-		while($row = $db->fetch_array($result))
-		{
-			if($paging->checkDisplay($i))
-			{
+		while ($row = $db->fetch_array($result)) {
+			if ($paging->checkDisplay($i)) {
 				$row = htmlentities_array($row);
 				$mbdata = $db_root->query_first("SELECT SUM( data_length + index_length) / 1024 / 1024 'MB' FROM information_schema.TABLES WHERE table_schema = '" . $db_root->escape($row['databasename']) . "' GROUP BY table_schema ;");
 				$row['size'] = number_format($mbdata['MB'], 3, '.', '');
-				eval("\$mysqls.=\"" . getTemplate("mysql/mysqls_database") . "\";");
+				eval("\$mysqls.=\"" . getTemplate('mysql/mysqls_database') . "\";");
 				$count++;
 			}
-
 			$i++;
 		}
 		$db_root->close();
 		// End root-session
 
 		$mysqls_count = $db->num_rows($result);
-		eval("echo \"" . getTemplate("mysql/mysqls") . "\";");
-	}
-	elseif($action == 'delete'
-	       && $id != 0)
-	{
+		eval("echo \"" . getTemplate('mysql/mysqls') . "\";");
+	} elseif($action == 'delete' && $id != 0) {
 		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
 
-		if(isset($result['databasename'])
-		   && $result['databasename'] != '')
-		{
-			if(!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']]))
-			{
+		if (isset($result['databasename'])
+		   && $result['databasename'] != ''
+		) {
+			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+			if (isset($_POST['send'])
+			   && $_POST['send'] == 'send'
+			) {
 				// Begin root-session
-
 				$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted database '" . $result['databasename'] . "'");
-				if(mysql_get_server_info() < '5.0.2') { 
+				if (mysql_get_server_info() < '5.0.2') { 
 					// Revoke privileges (only required for MySQL 4.1.2 - 5.0.1)
 					$db_root->query('REVOKE ALL PRIVILEGES, GRANT OPTION FROM \'' . $db_root->escape($result['databasename']) .'\'',false,true);
 				}
 
 				$host_res = $db_root->query("SELECT `Host` FROM `mysql`.`user` WHERE `User`='" . $db_root->escape($result['databasename']) . "'");
-				while($host = $db_root->fetch_array($host_res)) 
-				{
+				while ($host = $db_root->fetch_array($host_res)) {
 					// as of MySQL 5.0.2 this also revokes privileges. (requires MySQL 4.1.2+)
 					$db_root->query('DROP USER \'' . $db_root->escape($result['databasename']). '\'@\'' . $db_root->escape($host['Host']) . '\'', false, true);
 				}
@@ -118,81 +101,70 @@ elseif($page == 'mysqls')
 				$db_root->query('DROP DATABASE IF EXISTS `' . $db_root->escape($result['databasename']) . '`');
 				$db_root->query('FLUSH PRIVILEGES');
 				$db_root->close();
-
 				// End root-session
 
 				$db->query('DELETE FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
 
-				if($userinfo['mysqls_used'] == '1')
-				{
-					$resetaccnumber = " , `mysql_lastaccountnumber`='0' ";
-				}
-				else
-				{
-					$resetaccnumber = '';
-				}
+				$resetaccnumber = ($userinfo['mysqls_used'] == '1') ? " , `mysql_lastaccountnumber`='0' " : '';
 
 				$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`-1 ' . $resetaccnumber . 'WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
 				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+			} else {
 				$dbnamedesc = $result['databasename'];
-				if(isset($result['description']) && $result['description'] != '') {
-					$dbnamedesc.= ' ('.$result['description'].')';
+				if (isset($result['description']) && $result['description'] != '') {
+					$dbnamedesc .= ' ('.$result['description'].')';
 				}
 				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
 			}
 		}
-	}
-	elseif($action == 'add')
-	{
-		if($userinfo['mysqls_used'] < $userinfo['mysqls']
-		   || $userinfo['mysqls'] == '-1')
-		{
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+	} elseif ($action == 'add') {
+		if ($userinfo['mysqls_used'] < $userinfo['mysqls']
+		   || $userinfo['mysqls'] == '-1'
+		) {
+			if (isset($_POST['send'])
+			   && $_POST['send'] == 'send'
+			) {
 				$password = validate($_POST['mysql_password'], 'password');
 				$password = validatePassword($password);
 
 				$sendinfomail = isset($_POST['sendinfomail']) ? 1 : 0;
-				if($sendinfomail != 1)
-				{
+				if ($sendinfomail != 1) {
 					$sendinfomail = 0;
 				}
 
-				if($password == '')
-				{
+				if ($password == '') {
 					standard_error(array('stringisempty', 'mypassword'));
-				}
-				else
-				{
-					$username = $userinfo['loginname'] . $settings['customer']['mysqlprefix'] . (intval($userinfo['mysql_lastaccountnumber']) + 1);
-
-					if(count($sql_root) > 1)
-					{
+				} else {
+					$dbserver = 0;
+					if (count($sql_root) > 1) {
 						$dbserver = validate($_POST['mysql_server'], html_entity_decode($lng['mysql']['mysql_server']), '', '', 0);
-
-						if(!isset($sql_root[$dbserver]) || !is_array($sql_root[$dbserver]))
-						{
+						if (!isset($sql_root[$dbserver]) || !is_array($sql_root[$dbserver])) {
 							$dbserver = 0;
 						}
 					}
-					else
-					{
-						$dbserver = 0;
-					}
 					
 					// validate description before actual adding the database, #1052
 					$databasedescription = validate(trim($_POST['description']), 'description');
 
 					// Begin root-session
 					$db_root = new db($sql_root[$dbserver]['host'], $sql_root[$dbserver]['user'], $sql_root[$dbserver]['password'], '');
+
+					if (strtoupper($settings['customer']['mysqlprefix']) == 'RANDOM') {
+						$result = $db_root->query('SELECT `User` FROM mysql.user');
+						while ($row = $db_root->fetch_array($result)) {
+							$allsqlusers[] = $row[User];
+						}
+						$username = $userinfo['loginname'] . '-' . substr(md5(uniqid(microtime(), 1)), 20, 3);
+						while (in_array($username , $allsqlusers)) {
+							$username = $userinfo['loginname'] . '-' . substr(md5(uniqid(microtime(), 1)), 20, 3);
+						}
+					} else {
+						$username = $userinfo['loginname'] . $settings['customer']['mysqlprefix'] . (intval($userinfo['mysql_lastaccountnumber']) + 1);
+					}
+
 					$db_root->query('CREATE DATABASE `' . $db_root->escape($username) . '`');
 					$log->logAction(USR_ACTION, LOG_INFO, "created database '" . $username . "'");
-					foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host)
-					{
+					foreach (array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host) {
 						$db_root->query('GRANT ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($username)) . '`.* TO `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` IDENTIFIED BY \'password\'');
 						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($username) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
 						$log->logAction(USR_ACTION, LOG_NOTICE, "grant all privileges for '" . $username . "'@'" . $mysql_access_host . "'");
@@ -200,22 +172,21 @@ elseif($page == 'mysqls')
 
 					$db_root->query('FLUSH PRIVILEGES');
 					$db_root->close();
-
 					// End root-session
-					// Statement modifyed for Database description -- PH 2004-11-29
+
+					// Statement modified for Database description -- PH 2004-11-29
 					$result = $db->query('INSERT INTO `' . TABLE_PANEL_DATABASES . '` (`customerid`, `databasename`, `description`, `dbserver`) VALUES ("' . (int)$userinfo['customerid'] . '", "' . $db->escape($username) . '", "' . $db->escape($databasedescription) . '", "' . $db->escape($dbserver) . '")');
 					$result = $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1, `mysql_lastaccountnumber`=`mysql_lastaccountnumber`+1 WHERE `customerid`="' . (int)$userinfo['customerid'] . '"');
 
-					if($sendinfomail == 1)
-					{
+					if ($sendinfomail == 1) {
 						$pma = $lng['admin']['notgiven'];
-						if($settings['panel']['phpmyadmin_url'] != '')
-						{
+						if ($settings['panel']['phpmyadmin_url'] != '') {
 							$pma = $settings['panel']['phpmyadmin_url'];
 						}
 
 						$replace_arr = array(
-							'CUST_NAME' => getCorrectUserSalutation($userinfo),
+							'SALUTATION' => getCorrectUserSalutation($userinfo),
+							'CUST_NAME' => getCorrectUserSalutation($userinfo), // < keep this for compatibility
 							'DB_NAME' => $username,
 							'DB_PASS' => $password,
 							'DB_DESC' => $databasedescription,
@@ -254,13 +225,10 @@ elseif($page == 'mysqls')
 
 					redirectTo($filename, Array('page' => $page, 's' => $s));
 				}
-			}
-			else
-			{
+			} else {
 				$mysql_servers = '';
 
-				foreach($sql_root as $mysql_server => $mysql_server_details)
-				{
+				foreach ($sql_root as $mysql_server => $mysql_server_details) {
 					$mysql_servers .= makeoption($mysql_server_details['caption'], $mysql_server);
 				}
 
@@ -272,44 +240,36 @@ elseif($page == 'mysqls')
 				$title = $mysql_add_data['mysql_add']['title'];
 				$image = $mysql_add_data['mysql_add']['image'];
 
-				eval("echo \"" . getTemplate("mysql/mysqls_add") . "\";");
+				eval("echo \"" . getTemplate('mysql/mysqls_add') . "\";");
 			}
 		}
-	}
-	elseif($action == 'edit'
-	       && $id != 0)
-	{
+	} elseif ($action == 'edit' && $id != 0) {
 		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . $userinfo['customerid'] . '" AND `id`="' . $id . '"');
 
-		if(isset($result['databasename'])
-		   && $result['databasename'] != '')
-		{
-			if(!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']]))
-			{
+		if (isset($result['databasename'])
+		   && $result['databasename'] != ''
+		) {
+			if (!isset($sql_root[$result['dbserver']]) || !is_array($sql_root[$result['dbserver']])) {
 				$result['dbserver'] = 0;
 			}
 
-			if(isset($_POST['send'])
-			   && $_POST['send'] == 'send')
-			{
+			if (isset($_POST['send'])
+			   && $_POST['send'] == 'send'
+			) {
 				// Only change Password if it is set, do nothing if it is empty! -- PH 2004-11-29
 				$password = validate($_POST['mysql_password'], 'password');
-
-				if($password != '')
-				{
+				if ($password != '') {
 					// validate password
 					$password = validatePassword($password);
 
 					// Begin root-session
 					$db_root = new db($sql_root[$result['dbserver']]['host'], $sql_root[$result['dbserver']]['user'], $sql_root[$result['dbserver']]['password'], '');
-					foreach(array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host)
-					{
+					foreach (array_map('trim', explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host) {
 						$db_root->query('SET PASSWORD FOR `' . $db_root->escape($result['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '` = PASSWORD(\'' . $db_root->escape($password) . '\')');
 					}
 
 					$db_root->query('FLUSH PRIVILEGES');
 					$db_root->close();
-
 					// End root-session
 				}
 
@@ -318,19 +278,15 @@ elseif($page == 'mysqls')
 				$databasedescription = validate($_POST['description'], 'description');
 				$result = $db->query('UPDATE `' . TABLE_PANEL_DATABASES . '` SET `description`="' . $db->escape($databasedescription) . '" WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
 				redirectTo($filename, Array('page' => $page, 's' => $s));
-			}
-			else
-			{
+			} else {
 				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
 				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
 
 				$title = $mysql_edit_data['mysql_edit']['title'];
 				$image = $mysql_edit_data['mysql_edit']['image'];
 
-				eval("echo \"" . getTemplate("mysql/mysqls_edit") . "\";");
+				eval("echo \"" . getTemplate('mysql/mysqls_edit') . "\";");
 			}
 		}
 	}
 }
-
-?>

customer_tickets.php

@@ -340,7 +340,13 @@ elseif($page == 'tickets')
 			}
 			else
 			{
-				$by = $lng['ticket']['customer'];
+				$cid = $mainticket->Get('customer');
+				$usr = $db->query_first('SELECT `customerid`, `firstname`, `name`, `company`, `loginname`
+						FROM `' . TABLE_PANEL_CUSTOMERS . '`
+						WHERE `customerid` = "' . (int)$cid . '"'
+				);
+				$by = getCorrectFullUserDetails($usr);
+				//$by = $lng['ticket']['customer'];
 			}
 
 			$subject = $mainticket->Get('subject');
@@ -362,7 +368,8 @@ elseif($page == 'tickets')
 				}
 				else
 				{
-					$by = $lng['ticket']['customer'];
+					$by = getCorrectFullUserDetails($usr);
+					//$by = $lng['ticket']['customer'];
 				}
 
 				$subject = $subticket->Get('subject');

customer_traffic.php

@@ -23,20 +23,19 @@ define('AREA', 'customer');
  * Include our init.php, which manages Sessions, Language etc.
  */
 $intrafficpage = 1;
-require ("./lib/init.php");
+require('./lib/init.php');
 $traffic = '';
 $month = null;
 $year = null;
 
-if(isset($_POST['month'])
-   && isset($_POST['year']))
-{
+if (isset($_POST['month'])
+	&& isset($_POST['year'])
+) {
 	$month = intval($_POST['month']);
 	$year = intval($_POST['year']);
-}
-elseif(isset($_GET['month'])
-       && isset($_GET['year']))
-{
+} elseif (isset($_GET['month'])
+	&& isset($_GET['year'])
+) {
 	$month = intval($_GET['month']);
 	$year = intval($_GET['year']);
 }
@@ -44,31 +43,24 @@ elseif(isset($_GET['month'])
 //BAM! $_GET???
 
 elseif (isset($_GET['page'])
-       && $_GET['page'] == "current")
-{
-	if(date('d') != '01')
-	{
+	&& $_GET['page'] == 'current'
+) {
+	if (date('d') != '01') {
 		$month = date('m');
 		$year = date('Y');
-	}
-	else
-	{
-		if(date('m') == '01')
-		{
+	} else {
+		if (date('m') == '01') {
 			$month = 12;
 			$year = date('Y') - 1;
-		}
-		else
-		{
+		} else {
 			$month = date('m') - 1;
 			$year = date('Y');
 		}
 	}
 }
 
-if(!is_null($month)
-   && !is_null($year))
-{
+if (!is_null($month)
+	&& !is_null($year)) {
 	$traf['byte'] = 0;
 	$result = $db->query("SELECT
                                 SUM(`http`) as 'http', SUM(`ftp_up`) AS 'ftp_up', SUM(`ftp_down`) as 'ftp_down', SUM(`mail`) as 'mail',
@@ -82,19 +74,17 @@ if(!is_null($month)
 	$traffic_complete['mail'] = 0;
 	$show = '';
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $db->fetch_array($result)) {
 		$http = $row['http'];
 		$ftp = $row['ftp_up'] + $row['ftp_down'];
 		$mail = $row['mail'];
 		$traf['byte'] = $http + $ftp + $mail;
-		$traffic_complete['http']+= $http;
-		$traffic_complete['ftp']+= $ftp;
-		$traffic_complete['mail']+= $mail;
-		$traf['day'] = $row['day'] . ".";
+		$traffic_complete['http'] += $http;
+		$traffic_complete['ftp'] += $ftp;
+		$traffic_complete['mail'] += $mail;
+		$traf['day'] = $row['day'] . '.';
 
-		if(extension_loaded('bcmath'))
-		{
+		if (extension_loaded('bcmath')) {
 			$traf['ftptext'] = bcdiv($row['ftp_up'], 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($row['ftp_down'], 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
 			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
 			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
@@ -102,9 +92,7 @@ if(!is_null($month)
 			$traf['http'] = bcdiv($http, 1024, $settings['panel']['decimal_places']);
 			$traf['mail'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']);
 			$traf['byte'] = bcdiv($traf['byte'], 1024, $settings['panel']['decimal_places']);
-		}
-		else
-		{
+		} else {
 			$traf['ftptext'] = round($row['ftp_up'] / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($row['ftp_down'] / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
 			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
 			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
@@ -114,28 +102,22 @@ if(!is_null($month)
 			$traf['byte'] = round($traf['byte'] / 1024, $settings['panel']['decimal_places']);
 		}
 
-		eval("\$traffic.=\"" . getTemplate("traffic/traffic_month") . "\";");
-		$show = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year'];
+		eval("\$traffic.=\"" . getTemplate('traffic/traffic_month') . "\";");
+		$show = $lng['traffic']['months'][intval($row['month'])] . ' ' . $row['year'];
 	}
 
-	if(extension_loaded('bcmath'))
-	{
+	if (extension_loaded('bcmath')) {
 		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024, $settings['panel']['decimal_places']);
 		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024, $settings['panel']['decimal_places']);
 		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024, $settings['panel']['decimal_places']);
-	}
-	else
-	{
+	} else {
 		$traffic_complete['http'] = round($traffic_complete['http'] / 1024, $settings['panel']['decimal_places']);
 		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / 1024, $settings['panel']['decimal_places']);
 		$traffic_complete['mail'] = round($traffic_complete['mail'] / 1024, $settings['panel']['decimal_places']);
 	}
 
-	eval("echo \"" . getTemplate("traffic/traffic_details") . "\";");
-}
-else
-{
-	
+	eval("echo \"" . getTemplate('traffic/traffic_details') . "\";");
+} else {
 	$result = $db->query("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
 	                     FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE `customerid` = '" . $userinfo['customerid'] . "'
 	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");
@@ -143,22 +125,20 @@ else
 	$traffic_complete['ftp'] = 0;
 	$traffic_complete['mail'] = 0;
 
-	while($row = $db->fetch_array($result))
-	{
+	while ($row = $db->fetch_array($result)) {
 		$http = $row['http'];
 		$ftp_up = $row['ftp_up'];
 		$ftp_down = $row['ftp_down'];
 		$mail = $row['mail'];
-		$traffic_complete['http']+= $http;
-		$traffic_complete['ftp']+= $ftp_up + $ftp_down;
-		$traffic_complete['mail']+= $mail;
+		$traffic_complete['http'] += $http;
+		$traffic_complete['ftp'] += $ftp_up + $ftp_down;
+		$traffic_complete['mail'] += $mail;
 		$traf['month'] = $row['month'];
 		$traf['year'] = $row['year'];
 		$traf['monthname'] = $lng['traffic']['months'][intval($row['month'])] . " " . $row['year'];
 		$traf['byte'] = $http + $ftp_up + $ftp_down + $mail;
 
-		if(extension_loaded('bcmath'))
-		{
+		if (extension_loaded('bcmath')) {
 			$traf['ftptext'] = bcdiv($ftp_up, 1024, $settings['panel']['decimal_places']) . " MB up/ " . bcdiv($ftp_down, 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
 			$traf['httptext'] = bcdiv($http, 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
 			$traf['mailtext'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
@@ -166,9 +146,7 @@ else
 			$traf['http'] = bcdiv($http, 1024, $settings['panel']['decimal_places']);
 			$traf['mail'] = bcdiv($mail, 1024, $settings['panel']['decimal_places']);
 			$traf['byte'] = bcdiv($traf['byte'], 1024 * 1024, $settings['panel']['decimal_places']);
-		}
-		else
-		{
+		} else {
 			$traf['ftptext'] = round($ftp_up / 1024, $settings['panel']['decimal_places']) . " MB up/ " . round($ftp_down / 1024, $settings['panel']['decimal_places']) . " MB down (FTP)";
 			$traf['httptext'] = round($http / 1024, $settings['panel']['decimal_places']) . " MB (HTTP)";
 			$traf['mailtext'] = round($mail / 1024, $settings['panel']['decimal_places']) . " MB (Mail)";
@@ -178,23 +156,18 @@ else
 			$traf['byte'] = round($traf['byte'] / (1024 * 1024), $settings['panel']['decimal_places']);
 		}
 
-		eval("\$traffic.=\"" . getTemplate("traffic/traffic_traffic") . "\";");
+		eval("\$traffic.=\"" . getTemplate('traffic/traffic_traffic') . "\";");
 	}
 
-	if(extension_loaded('bcmath'))
-	{
+	if (extension_loaded('bcmath')) {
 		$traffic_complete['http'] = bcdiv($traffic_complete['http'], 1024 * 1024, $settings['panel']['decimal_places']);
 		$traffic_complete['ftp'] = bcdiv($traffic_complete['ftp'], 1024 * 1024, $settings['panel']['decimal_places']);
 		$traffic_complete['mail'] = bcdiv($traffic_complete['mail'], 1024 * 1024, $settings['panel']['decimal_places']);
-	}
-	else
-	{
+	} else {
 		$traffic_complete['http'] = round($traffic_complete['http'] / (1024 * 1024), $settings['panel']['decimal_places']);
 		$traffic_complete['ftp'] = round($traffic_complete['ftp'] / (1024 * 1024), $settings['panel']['decimal_places']);
 		$traffic_complete['mail'] = round($traffic_complete['mail'] / (1024 * 1024), $settings['panel']['decimal_places']);
 	}
 
-	eval("echo \"" . getTemplate("traffic/traffic") . "\";");
+	eval("echo \"" . getTemplate('traffic/traffic') . "\";");
 }
-
-?>

index.php

@@ -22,106 +22,74 @@ define('AREA', 'login');
 /**
  * Include our init.php, which manages Sessions, Language etc.
  */
+require ('./lib/init.php');
 
-require ("./lib/init.php");
-
-if($action == '')
-{
+if ($action == '') {
 	$action = 'login';
 }
 
-if($action == 'login')
-{
-	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
-	{
+if ($action == 'login') {
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 		$loginname = validate($_POST['loginname'], 'loginname');
 		$password = validate($_POST['password'], 'password');
 
 		$row = $db->query_first("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
 
-		if($row['customer'] == $loginname)
-		{
+		if ($row['customer'] == $loginname) {
 			$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
 			$uid = 'customerid';
 			$adminsession = '0';
 			$is_admin = false;
-		}
-		else
-		{
-			if((int)$settings['login']['domain_login'] == 1)
-			{
+		} else {
+			$is_admin = true;
+			if ((int)$settings['login']['domain_login'] == 1) {
 				/**
 				 * check if the customer tries to login with a domain, #374
 				 */
 				$domainname = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/', '/^https?\:\/\//'), '', $loginname));
 				$row2 = $db->query_first("SELECT `customerid` FROM `".TABLE_PANEL_DOMAINS."` WHERE `domain` = '".$db->escape($domainname)."'");
 	
-				if(isset($row2['customerid']) && $row2['customerid'] > 0)
-				{
+				if (isset($row2['customerid']) && $row2['customerid'] > 0) {
 					$loginname = getCustomerDetail($row2['customerid'], 'loginname');
-					
-					if($loginname !== false)
-					{
+					if ($loginname !== false) {
 						$row3 = $db->query_first("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
-		
-						if($row3['customer'] == $loginname)
-						{
+						if ($row3['customer'] == $loginname) {
 							$table = "`" . TABLE_PANEL_CUSTOMERS . "`";
 							$uid = 'customerid';
 							$adminsession = '0';
 							$is_admin = false;
 						}
 					}
-					else
-					{
-						$is_admin = true;
-					}
 				}
-				else
-				{
-					$is_admin = true;
-				}
-			}
-			else
-			{
-				$is_admin = true;
 			}
 		}
 
-		if(hasUpdates($version) && $is_admin == false)
-		{
+		if (hasUpdates($version) && $is_admin == false) {
 			redirectTo('index.php');
 			exit;
 		}
 
-		if($is_admin)
-		{
-			if(hasUpdates($version))
-			{
+		if ($is_admin) {
+			if (hasUpdates($version)) {
 				$row = $db->query_first("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname`='" . $db->escape($loginname) . "' AND `change_serversettings` = '1'");
 				/*
 				 * not an admin who can see updates
 				 */
-				if(!isset($row['admin']))
-				{
+				if (!isset($row['admin'])) {
 					redirectTo('index.php');
 					exit;
 				}
-			}
-			else
-			{
+			} else {
 				$row = $db->query_first("SELECT `loginname` AS `admin` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `loginname`='" . $db->escape($loginname) . "'");
 			}
 
-			if($row['admin'] == $loginname)
-			{
+			if ($row['admin'] == $loginname) {
 				$table = "`" . TABLE_PANEL_ADMINS . "`";
 				$uid = 'adminid';
 				$adminsession = '1';
-			}
-			else
-			{
+			} else {
 				redirectTo('index.php', Array('showmessage' => '2'), true);
 				exit;
 			}
@@ -129,64 +97,48 @@ if($action == 'login')
 
 		$userinfo = $db->query_first("SELECT * FROM $table WHERE `loginname`='" . $db->escape($loginname) . "'");
 
-		if($userinfo['loginfail_count'] >= $settings['login']['maxloginattempts']
-		&& $userinfo['lastlogin_fail'] > (time() - $settings['login']['deactivatetime']))
-		{
+		if ($userinfo['loginfail_count'] >= $settings['login']['maxloginattempts']
+			&& $userinfo['lastlogin_fail'] > (time() - $settings['login']['deactivatetime'])
+		) {
 			redirectTo('index.php', Array('showmessage' => '3'), true);
 			exit;
-		}
-		elseif($userinfo['password'] == md5($password))
-		{
+		} elseif($userinfo['password'] == md5($password)) {
 			// login correct
 			// reset loginfail_counter, set lastlogin_succ
-
 			$db->query("UPDATE $table SET `lastlogin_succ`='" . time() . "', `loginfail_count`='0' WHERE `$uid`='" . (int)$userinfo[$uid] . "'");
 			$userinfo['userid'] = $userinfo[$uid];
 			$userinfo['adminsession'] = $adminsession;
-		}
-		else
-		{
+		} else {
 			// login incorrect
-
 			$db->query("UPDATE $table SET `lastlogin_fail`='" . time() . "', `loginfail_count`=`loginfail_count`+1 WHERE `$uid`='" . (int)$userinfo[$uid] . "'");
 			unset($userinfo);
 			redirectTo('index.php', Array('showmessage' => '2'), true);
 			exit;
 		}
 
-		if(isset($userinfo['userid'])
-		&& $userinfo['userid'] != '')
-		{
+		if (isset($userinfo['userid'])
+			&& $userinfo['userid'] != ''
+		) {
 			$s = md5(uniqid(microtime(), 1));
 
-			if(isset($_POST['language']))
-			{
+			if (isset($_POST['language'])) {
 				$language = validate($_POST['language'], 'language');
-
-				if($language == 'profile')
-				{
+				if ($language == 'profile') {
 					$language = $userinfo['def_language'];
-				}
-				elseif(!isset($languages[$language]))
-				{
+				} elseif(!isset($languages[$language])) {
 					$language = $settings['panel']['standardlanguage'];
 				}
-			}
-			else
-			{
+			} else {
 				$language = $settings['panel']['standardlanguage'];
 			}
 
-			if(isset($userinfo['theme']) && $userinfo['theme'] != '') {
+			if (isset($userinfo['theme']) && $userinfo['theme'] != '') {
 				$theme = $userinfo['theme'];
-			}
-			else
-			{
+			} else {
 				$theme = $settings['panel']['default_theme'];
 			}
 
-			if($settings['session']['allow_multiple_login'] != '1')
-			{
+			if ($settings['session']['allow_multiple_login'] != '1') {
 				$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['userid'] . "' AND `adminsession` = '" . $db->escape($userinfo['adminsession']) . "'");
 			}
 
@@ -195,56 +147,41 @@ if($action == 'login')
 			$columns = mysql_num_fields($fields);
 			$field_array = array();
 			for ($i = 0; $i < $columns; $i++) {
-    			$field_array[] = mysql_field_name($fields, $i);
+				$field_array[] = mysql_field_name($fields, $i);
 			}
 
-    		if (!in_array('theme', $field_array)) {
+			if (!in_array('theme', $field_array)) {
 				$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$userinfo['userid'] . "', '" . $db->escape($remote_addr) . "', '" . $db->escape($http_user_agent) . "', '" . time() . "', '" . $db->escape($language) . "', '" . $db->escape($userinfo['adminsession']) . "')");
-    		} else {
-    			$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`, `theme`) VALUES ('" . $db->escape($s) . "', '" . (int)$userinfo['userid'] . "', '" . $db->escape($remote_addr) . "', '" . $db->escape($http_user_agent) . "', '" . time() . "', '" . $db->escape($language) . "', '" . $db->escape($userinfo['adminsession']) . "', '" . $db->escape($theme) . "')");
-    		}
+    			} else {
+    				$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`, `theme`) VALUES ('" . $db->escape($s) . "', '" . (int)$userinfo['userid'] . "', '" . $db->escape($remote_addr) . "', '" . $db->escape($http_user_agent) . "', '" . time() . "', '" . $db->escape($language) . "', '" . $db->escape($userinfo['adminsession']) . "', '" . $db->escape($theme) . "')");
+    			}
 
-			if($userinfo['adminsession'] == '1')
-			{
-				if(hasUpdates($version))
-				{
+			if ($userinfo['adminsession'] == '1') {
+				if (hasUpdates($version)) {
 					redirectTo('admin_updates.php', Array('s' => $s), true);
-					exit;
-				}
-				else
-				{
+				} else {
 					redirectTo('admin_index.php', Array('s' => $s), true);
-					exit;
 				}
-			}
-			else
-			{
+			} else {
 				redirectTo('customer_index.php', Array('s' => $s), true);
-				exit;
 			}
-		}
-		else
-		{
+		} else {
 			redirectTo('index.php', Array('showmessage' => '2'), true);
-			exit;
 		}
-	}
-	else
-	{
+		exit;
+	} else {
 		$language_options = '';
-		$language_options.= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
+		$language_options .= makeoption($lng['login']['profile_lng'], 'profile', 'profile', true, true);
 
-		while(list($language_file, $language_name) = each($languages))
-		{
-			$language_options.= makeoption($language_name, $language_file, 'profile', true);
+		while (list($language_file, $language_name) = each($languages)) {
+			$language_options .= makeoption($language_name, $language_file, 'profile', true);
 		}
 
 		$smessage = isset($_GET['showmessage']) ? (int)$_GET['showmessage'] : 0;
 		$message = '';
 		$successmessage = '';
 
-		switch($smessage)
-		{
+		switch ($smessage) {
 			case 1:
 				$successmessage = $lng['pwdreminder']['success'];
 				break;
@@ -252,7 +189,7 @@ if($action == 'login')
 				$message = $lng['error']['login'];
 				break;
 			case 3:
-				$message = $lng['error']['login_blocked'];
+				$message = sprintf($lng['error']['login_blocked'],$settings['login']['deactivatetime']);
 				break;
 			case 4:
 				$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
@@ -264,23 +201,21 @@ if($action == 'login')
 		}
 
 		$update_in_progress = '';
-		if(hasUpdates($version))
-		{
+		if (hasUpdates($version)) {
 			$update_in_progress = $lng['update']['updateinprogress_onlyadmincanlogin'];
 		}
 
-		eval("echo \"" . getTemplate("login") . "\";");
+		eval("echo \"" . getTemplate('login') . "\";");
 	}
 }
 
-if($action == 'forgotpwd')
-{
+if ($action == 'forgotpwd') {
 	$adminchecked = false;
 	$message = '';
 
-	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
-	{
+	if (isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
 		$loginname = validate($_POST['loginname'], 'loginname');
 		$email = validateEmail($_POST['loginemail'], 'email');
 		$sql = "SELECT `adminid`, `customerid`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "`
@@ -288,64 +223,48 @@ if($action == 'forgotpwd')
 				AND `email`='" . $db->escape($email) . "'";
 		$result = $db->query($sql);
 
-		if($db->num_rows() == 0)
-		{
+		if ($db->num_rows() == 0) {
 			$sql = "SELECT `adminid`, `name`, `email`, `loginname`, `def_language` FROM `" . TABLE_PANEL_ADMINS . "`
 				WHERE `loginname`='" . $db->escape($loginname) . "'
 				AND `email`='" . $db->escape($email) . "'";
 			$result = $db->query($sql);
 				
-			if($db->num_rows() > 0)
-			{
+			if ($db->num_rows() > 0) {
 				$adminchecked = true;
-			}
-			else
-			{
+			} else {
 				$result = null;
 			}
 		}
 
-		if($result !== null)
-		{
+		if ($result !== null) {
 			$user = $db->fetch_array($result);
 			
 			/* Check whether user is banned */
-			if($user['deactivated'])
-			{
+			if ($user['deactivated']) {
 				$message = $lng['pwdreminder']['notallowed'];
 				redirectTo('index.php', Array('showmessage' => '5'), true);
 			}
 
-			if(($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
-			|| $adminchecked == false)
-			{
-				if($user !== false)
-				{
+			if (($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
+				|| $adminchecked == false
+			) {
+				if ($user !== false) {
 					if ($settings['panel']['password_min_length'] <= 6) {
 						$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
 					} else {
 						// make it two times larger than password_min_length
 						$rnd = '';
 						$minlength = $settings['panel']['password_min_length'];
-						while (strlen($rnd) < ($minlength * 2))
-						{
+						while (strlen($rnd) < ($minlength * 2)) {
 							$rnd .= md5(uniqid(microtime(), 1));
 						}
 						$password = substr($rnd, (int)($minlength / 2), $minlength);
 					}
 
-					if($adminchecked)
-					{
-						$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `password`='" . md5($password) . "'
-								WHERE `loginname`='" . $user['loginname'] . "'
-								AND `email`='" . $user['email'] . "'");
-					}
-					else
-					{
-						$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($password) . "'
-								WHERE `loginname`='" . $user['loginname'] . "'
-								AND `email`='" . $user['email'] . "'");
-					}
+					$passwordTable = $adminchecked ? TABLE_PANEL_ADMINS : TABLE_PANEL_CUSTOMERS;
+					$db->query("UPDATE `" . $passwordTable . "` SET `password`='" . md5($password) . "'
+							WHERE `loginname`='" . $user['loginname'] . "'
+							AND `email`='" . $user['email'] . "'");
 
 					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
 					$rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!");
@@ -389,9 +308,7 @@ if($action == 'forgotpwd')
 					$mail->ClearAddresses();
 					redirectTo('index.php', Array('showmessage' => '1'), true);
 					exit;
-				}
-				else
-				{
+				} else {
 					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
 					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!");
 					$message = $lng['login']['combination_not_found'];
@@ -399,28 +316,21 @@ if($action == 'forgotpwd')
 
 				unset($user);
 			}
-		}
-		else
-		{
+		} else {
 			$message = $lng['login']['usernotfound'];
 		}
 	}
 
-	if($adminchecked)
-	{
-		if($settings['panel']['allow_preset_admin'] != '1')
-		{
+	if ($adminchecked) {
+		if ($settings['panel']['allow_preset_admin'] != '1') {
 			$message = $lng['pwdreminder']['notallowed'];
 			unset ($adminchecked);
 		}
-	}
-	else
-	{
-		if($settings['panel']['allow_preset'] != '1')
-		{
+	} else {
+		if ($settings['panel']['allow_preset'] != '1') {
 			$message = $lng['pwdreminder']['notallowed'];
 		}
 	}
 
-	eval("echo \"" . getTemplate("fpwd") . "\";");
+	eval("echo \"" . getTemplate('fpwd') . "\";");
 }

install/froxlor.sql

@@ -233,7 +233,6 @@ CREATE TABLE `panel_domains` (
   `parentdomainid` int(11) unsigned NOT NULL default '0',
   `openbasedir` tinyint(1) NOT NULL default '0',
   `openbasedir_path` tinyint(1) NOT NULL default '0',
-  `safemode` tinyint(1) NOT NULL default '0',
   `speciallogfile` tinyint(1) NOT NULL default '0',
   `ssl` tinyint(4) NOT NULL default '0',
   `ssl_redirect` tinyint(4) NOT NULL default '0',
@@ -414,6 +413,8 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('phpfpm', 'vhost_httpgroup', 'froxlorlocal'),
 	('phpfpm', 'idle_timeout', '30'),
 	('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/'),
+	('phpfpm', 'defaultini', '1'),
+	('phpfpm', 'vhost_defaultini', '1'),
 	('nginx', 'fastcgiparams', '/etc/nginx/fastcgi_params'),
 	('system', 'lastaccountnumber', '0'),
 	('system', 'lastguid', '9999'),
@@ -425,7 +426,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'vmail_uid', '2000'),
 	('system', 'vmail_gid', '2000'),
 	('system', 'vmail_homedir', '/var/customers/mail/'),
-	('system', 'vmail_maildir', 'Maildir'),
+	('system', 'vmail_maildirname', 'Maildir'),
 	('system', 'bind_enable', '1'),
 	('system', 'bindconf_directory', '/etc/bind/'),
 	('system', 'bindreload_command', '/etc/init.d/bind9 reload'),
@@ -439,7 +440,6 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'last_tasks_run', '000000'),
 	('system', 'nameservers', ''),
 	('system', 'mxservers', ''),
-	('system', 'mod_log_sql', '0'),
 	('system', 'mod_fcgid', '0'),
 	('system', 'apacheconf_vhost', '/etc/apache/vhosts.conf'),
 	('system', 'apacheconf_diroptions', '/etc/apache/diroptions.conf'),
@@ -511,6 +511,10 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('system', 'perl_server', 'unix:/var/run/nginx/cgiwrap-dispatch.sock'),
 	('system', 'phpreload_command', ''),
 	('system', 'apache24', '0'),
+	('system', 'documentroot_use_default_value', '0'),
+	('system', 'passwordcryptfunc', '1'),
+	('system', 'axfrservers', ''),
+	('system', 'customer_ssl_path', '/etc/apache2/ssl/'),
 	('panel', 'decimal_places', '4'),
 	('panel', 'adminmail', 'admin@SERVERNAME'),
 	('panel', 'phpmyadmin_url', ''),
@@ -535,7 +539,10 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
 	('panel', 'password_regex', ''),
 	('panel', 'use_webfonts', '0'),
 	('panel', 'webfont', 'Numans'),
-	('panel', 'version', '0.9.28-rc1');
+	('panel', 'phpconfigs_hidestdsubdomain', '0'),
+	('panel', 'allow_theme_change_admin', '1'),
+	('panel', 'allow_theme_change_customer', '1'),
+	('panel', 'version', '0.9.29');
 
 
 
@@ -743,7 +750,7 @@ CREATE TABLE `panel_phpconfigs` (
 
 
 INSERT INTO `panel_phpconfigs` (`id`, `description`, `binary`, `file_extensions`, `mod_fcgid_starter`, `mod_fcgid_maxrequests`, `phpsettings`) VALUES
-	(1, 'Default Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_call_time_pass_reference = Off\r\nallow_url_fopen = Off\r\nasp_tags = Off\r\ndisable_classes =\r\ndisable_functions = curl_exec,curl_multi_exec,exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\ncgi.force_redirect = 1\r\ngpc_order = "GPC"\r\nhtml_errors = Off\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmagic_quotes_gpc = Off\r\nmagic_quotes_runtime = Off\r\nmagic_quotes_sybase = Off\r\nmax_execution_time = 30\r\nmax_input_time = 60\r\nmemory_limit = 16M\r\n{OPEN_BASEDIR_C}open_basedir = "{OPEN_BASEDIR}"\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nregister_globals = Off\r\nreport_memleaks = On\r\nsafe_mode = {SAFE_MODE}\r\nsafe_mode_allowed_env_vars = PHP_\r\nsafe_mode_gid = Off\r\nsafe_mode_include_dir = "{PEAR_DIR}"\r\nsafe_mode_protected_env_vars = LD_LIBRARY_PATH\r\nsendmail_path = "/usr/sbin/sendmail -t -f {CUSTOMER_EMAIL}"\r\nsession.auto_start = 0\r\nsession.bug_compat_42 = 0\r\nsession.bug_compat_warn = 1\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.entropy_file = /dev/urandom\r\nsession.entropy_length = 16\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 1\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.use_cookies = 1\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nsuhosin.mail.protect = 1\r\nsuhosin.simulation = Off\r\ntrack_errors = Off\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\n');
+	(1, 'Default Config', '/usr/bin/php-cgi', 'php', '-1', '-1', 'allow_call_time_pass_reference = Off\r\nallow_url_fopen = Off\r\nasp_tags = Off\r\ndisable_classes =\r\ndisable_functions = curl_exec,curl_multi_exec,exec,parse_ini_file,passthru,popen,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate,shell_exec,show_source,system\r\ndisplay_errors = Off\r\ndisplay_startup_errors = Off\r\nenable_dl = Off\r\nerror_reporting = E_ALL & ~E_NOTICE\r\nexpose_php = Off\r\nfile_uploads = On\r\ncgi.force_redirect = 1\r\ngpc_order = "GPC"\r\nhtml_errors = Off\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\ninclude_path = ".:{PEAR_DIR}"\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nmagic_quotes_gpc = Off\r\nmagic_quotes_runtime = Off\r\nmagic_quotes_sybase = Off\r\nmax_execution_time = 30\r\nmax_input_time = 60\r\nmemory_limit = 16M\r\n{OPEN_BASEDIR_C}open_basedir = "{OPEN_BASEDIR}"\r\noutput_buffering = 4096\r\npost_max_size = 16M\r\nprecision = 14\r\nregister_argc_argv = Off\r\nregister_globals = Off\r\nreport_memleaks = On\r\nsendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"\r\nsession.auto_start = 0\r\nsession.bug_compat_42 = 0\r\nsession.bug_compat_warn = 1\r\nsession.cache_expire = 180\r\nsession.cache_limiter = nocache\r\nsession.cookie_domain =\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.entropy_file = /dev/urandom\r\nsession.entropy_length = 16\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.gc_probability = 1\r\nsession.name = PHPSESSID\r\nsession.referer_check =\r\nsession.save_handler = files\r\nsession.save_path = "{TMP_DIR}"\r\nsession.serialize_handler = php\r\nsession.use_cookies = 1\r\nsession.use_trans_sid = 0\r\nshort_open_tag = On\r\nsuhosin.mail.protect = 1\r\nsuhosin.simulation = Off\r\ntrack_errors = Off\r\nupload_max_filesize = 32M\r\nupload_tmp_dir = "{TMP_DIR}"\r\nvariables_order = "GPCS"\r\n');
 
 
 
@@ -913,3 +920,13 @@ CREATE TABLE IF NOT EXISTS `domain_docrootsettings` (
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;
 
+DROP TABLE IF EXISTS `domain_ssl_settings`;
+CREATE TABLE IF NOT EXISTS `domain_ssl_settings` (
+  `id` int(5) NOT NULL auto_increment,
+  `domainid` int(11) NOT NULL,
+  `ssl_cert_file` text NOT NULL,
+  `ssl_key_file` text NOT NULL,
+  `ssl_ca_file` text NOT NULL,
+  `ssl_cert_chainfile` text NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -21,7 +21,7 @@ if(isFroxlorVersion('0.9-r0'))
 	showUpdateStep("Performing database updates");
 	/*
 	 * add missing database-updates if necessary (old: update/update_database.php)
-	 */
+	*/
 	if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 1)
 	{
 		$db->query("ALTER TABLE `panel_databases` ADD `dbserver` INT( 11 ) UNSIGNED NOT NULL default '0';");
@@ -29,9 +29,9 @@ if(isFroxlorVersion('0.9-r0'))
 	if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 2)
 	{
 		$db->query("ALTER TABLE `panel_ipsandports` CHANGE `ssl_cert` `ssl_cert_file` VARCHAR( 255 ) NOT NULL,
-						ADD `ssl_key_file` VARCHAR( 255 ) NOT NULL,
-						ADD `ssl_ca_file` VARCHAR( 255 ) NOT NULL,
-						ADD `default_vhostconf_domain` TEXT NOT NULL;");
+				ADD `ssl_key_file` VARCHAR( 255 ) NOT NULL,
+				ADD `ssl_ca_file` VARCHAR( 255 ) NOT NULL,
+				ADD `default_vhostconf_domain` TEXT NOT NULL;");
 
 		$db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ssl_key_file', `value` = '';");
 		$db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ssl_ca_file', `value` = '';");
@@ -40,7 +40,7 @@ if(isFroxlorVersion('0.9-r0'))
 
 	/*
 	 * remove billing tables in database
-	 */
+	*/
 	define('TABLE_BILLING_INVOICES', 'billing_invoices');
 	define('TABLE_BILLING_INVOICES_ADMINS', 'billing_invoices_admins');
 	define('TABLE_BILLING_INVOICE_CHANGES', 'billing_invoice_changes');
@@ -67,116 +67,116 @@ if(isFroxlorVersion('0.9-r0'))
 
 	/*
 	 * update panel_domains, panel_customers, panel_admins
-	 */
+	*/
 	$db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "`
-		  DROP `firstname`,
-		  DROP `title`,
-		  DROP `company`,
-		  DROP `street`,
-		  DROP `zipcode`,
-		  DROP `city`,
-		  DROP `country`,
-		  DROP `phone`,
-		  DROP `fax`,
-		  DROP `taxid`,
-		  DROP `contract_date`,
-		  DROP `contract_number`,
-		  DROP `contract_details`,
-		  DROP `included_domains_qty`,
-		  DROP `included_domains_tld`,
-		  DROP `additional_traffic_fee`,
-		  DROP `additional_traffic_unit`,
-		  DROP `additional_diskspace_fee`,
-		  DROP `additional_diskspace_unit`,
-		  DROP `taxclass`,
-		  DROP `setup_fee`,
-		  DROP `interval_fee`,
-		  DROP `interval_length`,
-		  DROP `interval_type`,
-		  DROP `interval_payment`,
-		  DROP `calc_tax`,
-		  DROP `term_of_payment`,
-		  DROP `payment_every`,
-		  DROP `payment_method`,
-		  DROP `bankaccount_holder`,
-		  DROP `bankaccount_number`,
-		  DROP `bankaccount_blz`,
-		  DROP `bankaccount_bank`,
-		  DROP `service_active`,
-		  DROP `servicestart_date`,
-		  DROP `serviceend_date`,
-		  DROP `lastinvoiced_date`,
-		  DROP `lastinvoiced_date_traffic`,
-		  DROP `lastinvoiced_date_diskspace`,
-		  DROP `customer_categories_once`,
-		  DROP `customer_categories_period`,
-		  DROP `invoice_fee`,
-		  DROP `invoice_fee_hosting`,
-		  DROP `invoice_fee_hosting_customers`,
-		  DROP `invoice_fee_domains`,
-		  DROP `invoice_fee_traffic`,
-		  DROP `invoice_fee_diskspace`,
-		  DROP `invoice_fee_other`,
-		  DROP `edit_billingdata`;");
+			DROP `firstname`,
+			DROP `title`,
+			DROP `company`,
+			DROP `street`,
+			DROP `zipcode`,
+			DROP `city`,
+			DROP `country`,
+			DROP `phone`,
+			DROP `fax`,
+			DROP `taxid`,
+			DROP `contract_date`,
+			DROP `contract_number`,
+			DROP `contract_details`,
+			DROP `included_domains_qty`,
+			DROP `included_domains_tld`,
+			DROP `additional_traffic_fee`,
+			DROP `additional_traffic_unit`,
+			DROP `additional_diskspace_fee`,
+			DROP `additional_diskspace_unit`,
+			DROP `taxclass`,
+			DROP `setup_fee`,
+			DROP `interval_fee`,
+			DROP `interval_length`,
+			DROP `interval_type`,
+			DROP `interval_payment`,
+			DROP `calc_tax`,
+			DROP `term_of_payment`,
+			DROP `payment_every`,
+			DROP `payment_method`,
+			DROP `bankaccount_holder`,
+			DROP `bankaccount_number`,
+			DROP `bankaccount_blz`,
+			DROP `bankaccount_bank`,
+			DROP `service_active`,
+			DROP `servicestart_date`,
+			DROP `serviceend_date`,
+			DROP `lastinvoiced_date`,
+			DROP `lastinvoiced_date_traffic`,
+			DROP `lastinvoiced_date_diskspace`,
+			DROP `customer_categories_once`,
+			DROP `customer_categories_period`,
+			DROP `invoice_fee`,
+			DROP `invoice_fee_hosting`,
+			DROP `invoice_fee_hosting_customers`,
+			DROP `invoice_fee_domains`,
+			DROP `invoice_fee_traffic`,
+			DROP `invoice_fee_diskspace`,
+			DROP `invoice_fee_other`,
+			DROP `edit_billingdata`;");
 
 	$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "`
-		  DROP `taxid`,
-		  DROP `title`,
-		  DROP `country`,
-		  DROP `additional_service_description`,
-		  DROP `contract_date`,
-		  DROP `contract_number`,
-		  DROP `contract_details`,
-		  DROP `included_domains_qty`,
-		  DROP `included_domains_tld`,
-		  DROP `additional_traffic_fee`,
-		  DROP `additional_traffic_unit`,
-		  DROP `additional_diskspace_fee`,
-		  DROP `additional_diskspace_unit`,
-		  DROP `taxclass`,
-		  DROP `setup_fee`,
-		  DROP `interval_fee`,
-		  DROP `interval_length`,
-		  DROP `interval_type`,
-		  DROP `interval_payment`,
-		  DROP `calc_tax`,
-		  DROP `term_of_payment`,
-		  DROP `payment_every`,
-		  DROP `payment_method`,
-		  DROP `bankaccount_holder`,
-		  DROP `bankaccount_number`,
-		  DROP `bankaccount_blz`,
-		  DROP `bankaccount_bank`,
-		  DROP `service_active`,
-		  DROP `servicestart_date`,
-		  DROP `serviceend_date`,
-		  DROP `lastinvoiced_date`,
-		  DROP `lastinvoiced_date_traffic`,
-		  DROP `lastinvoiced_date_diskspace`,
-		  DROP `invoice_fee`,
-		  DROP `invoice_fee_hosting`,
-		  DROP `invoice_fee_domains`,
-		  DROP `invoice_fee_traffic`,
-		  DROP `invoice_fee_diskspace`,
-		  DROP `invoice_fee_other`;");
+			DROP `taxid`,
+			DROP `title`,
+			DROP `country`,
+			DROP `additional_service_description`,
+			DROP `contract_date`,
+			DROP `contract_number`,
+			DROP `contract_details`,
+			DROP `included_domains_qty`,
+			DROP `included_domains_tld`,
+			DROP `additional_traffic_fee`,
+			DROP `additional_traffic_unit`,
+			DROP `additional_diskspace_fee`,
+			DROP `additional_diskspace_unit`,
+			DROP `taxclass`,
+			DROP `setup_fee`,
+			DROP `interval_fee`,
+			DROP `interval_length`,
+			DROP `interval_type`,
+			DROP `interval_payment`,
+			DROP `calc_tax`,
+			DROP `term_of_payment`,
+			DROP `payment_every`,
+			DROP `payment_method`,
+			DROP `bankaccount_holder`,
+			DROP `bankaccount_number`,
+			DROP `bankaccount_blz`,
+			DROP `bankaccount_bank`,
+			DROP `service_active`,
+			DROP `servicestart_date`,
+			DROP `serviceend_date`,
+			DROP `lastinvoiced_date`,
+			DROP `lastinvoiced_date_traffic`,
+			DROP `lastinvoiced_date_diskspace`,
+			DROP `invoice_fee`,
+			DROP `invoice_fee_hosting`,
+			DROP `invoice_fee_domains`,
+			DROP `invoice_fee_traffic`,
+			DROP `invoice_fee_diskspace`,
+			DROP `invoice_fee_other`;");
 	$db->query("ALTER TABLE `panel_domains`
-		  DROP `taxclass`,
-		  DROP `setup_fee`,
-		  DROP `interval_fee`,
-		  DROP `interval_length`,
-		  DROP `interval_type`,
-		  DROP `interval_payment`,
-		  DROP `service_active`,
-		  DROP `servicestart_date`,
-		  DROP `serviceend_date`,
-		  DROP `lastinvoiced_date`;");
+			DROP `taxclass`,
+			DROP `setup_fee`,
+			DROP `interval_fee`,
+			DROP `interval_length`,
+			DROP `interval_type`,
+			DROP `interval_payment`,
+			DROP `service_active`,
+			DROP `servicestart_date`,
+			DROP `serviceend_date`,
+			DROP `lastinvoiced_date`;");
 
 	$db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "`
-		WHERE `settinggroup` = 'billing';");
+			WHERE `settinggroup` = 'billing';");
 
 	$db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "`
-		  MODIFY `traffic` BIGINT(30),
-		  MODIFY `traffic_used` BIGINT(30)");
+			MODIFY `traffic` BIGINT(30),
+			MODIFY `traffic_used` BIGINT(30)");
 
 	lastStepStatus(0);
 
@@ -192,7 +192,7 @@ if(isFroxlorVersion('0.9-r1'))
 	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'spf_entry', '@	IN	TXT	\"v=spf1 a mx -all\"');");
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'froxlor_graphic' WHERE `varname` = 'syscp_graphic'");
 	if(isset($settings['admin']['syscp_graphic'])
-	&& $settings['admin']['syscp_graphic'] != ''
+			&& $settings['admin']['syscp_graphic'] != ''
 	){
 		$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
 	}
@@ -226,15 +226,15 @@ if(isFroxlorVersion('0.9-r3'))
 	showUpdateStep("Creating new table 'cronjobs_run'");
 
 	$db->query("CREATE TABLE IF NOT EXISTS `cronjobs_run` (
-				`id` bigint(20) NOT NULL auto_increment,
-				`module` varchar(250) NOT NULL,
-				`cronfile` varchar(250) NOT NULL,
-				`lastrun` int(15) NOT NULL DEFAULT '0',
-				`interval` varchar(100) NOT NULL DEFAULT '5 MINUTE',
-				`isactive` tinyint(1) DEFAULT '1',
-				`desc_lng_key` varchar(100) NOT NULL DEFAULT 'cron_unknown_desc',
-				PRIMARY KEY  (`id`)
-				) ENGINE=MyISAM;");
+			`id` bigint(20) NOT NULL auto_increment,
+			`module` varchar(250) NOT NULL,
+			`cronfile` varchar(250) NOT NULL,
+			`lastrun` int(15) NOT NULL DEFAULT '0',
+			`interval` varchar(100) NOT NULL DEFAULT '5 MINUTE',
+			`isactive` tinyint(1) DEFAULT '1',
+			`desc_lng_key` varchar(100) NOT NULL DEFAULT 'cron_unknown_desc',
+			PRIMARY KEY  (`id`)
+	) ENGINE=MyISAM;");
 
 	lastStepStatus(0);
 	showUpdateStep("Inserting new values into table");
@@ -305,8 +305,8 @@ if(isFroxlorVersion('0.9.1'))
 	$result = $db->query_first("SELECT MAX(`guid`) as `latestguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
 
 	if (isset($result['latestguid'])
-	&& (int)$result['latestguid'] > 0
-	&& $result['latestguid'] != $settings['system']['lastguid']
+			&& (int)$result['latestguid'] > 0
+			&& $result['latestguid'] != $settings['system']['lastguid']
 	) {
 		checkLastGuid();
 		lastStepStatus(1, 'fixed');
@@ -409,9 +409,9 @@ if(isFroxlorVersion('0.9.4'))
 	 * some users might still have the setting in their database
 	 * because we already had this back in older versions.
 	 * To not confuse Froxlor, we just update old settings.
-	 */
+	*/
 	if(isset($settings['system']['awstats_path'])
-	&& $settings['system']['awstats_path'] != ''
+			&& $settings['system']['awstats_path'] != ''
 	) {
 		showUpdateStep("Updating awstats path setting");
 		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/bin/' WHERE `settinggroup` = 'system' AND `varname` = 'awstats_path';");
@@ -425,7 +425,7 @@ if(isFroxlorVersion('0.9.4'))
 	}
 
 	if(isset($settings['system']['awstats_domain_file'])
-	&& $settings['system']['awstats_domain_file'] != ''
+			&& $settings['system']['awstats_domain_file'] != ''
 	) {
 		showUpdateStep("Updating awstats configuration path setting");
 		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'awstats_conf' WHERE `varname` = 'awstats_domain_file';");
@@ -543,28 +543,28 @@ if(isFroxlorVersion('0.9.6-svn2'))
 		$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '1');");
 
 		if(isset($_POST['update_deferr_500'])
-		&& trim($_POST['update_deferr_500']) != ''
+				&& trim($_POST['update_deferr_500']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_500'])."');");
 			$err500 = true;
 		}
 
 		if(isset($_POST['update_deferr_401'])
-		&& trim($_POST['update_deferr_401']) != ''
+				&& trim($_POST['update_deferr_401']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '".$db->escape($_POST['update_deferr_401'])."');");
 			$err401 = true;
 		}
 
 		if(isset($_POST['update_deferr_403'])
-		&& trim($_POST['update_deferr_403']) != ''
+				&& trim($_POST['update_deferr_403']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '".$db->escape($_POST['update_deferr_403'])."');");
 			$err403 = true;
 		}
 
 		if(isset($_POST['update_deferr_404'])
-		&& trim($_POST['update_deferr_404']) != ''
+				&& trim($_POST['update_deferr_404']) != ''
 		) {
 			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '".$db->escape($_POST['update_deferr_404'])."');");
 			$err404 = true;
@@ -672,17 +672,17 @@ if(isFroxlorVersion('0.9.6'))
 
 	showUpdateStep("Adding new tables to database");
 	$db->query("CREATE TABLE IF NOT EXISTS `redirect_codes` (
-  `id` int(5) NOT NULL auto_increment,
-  `code` varchar(3) NOT NULL,
-  `enabled` tinyint(1) DEFAULT '1',
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;");
+			`id` int(5) NOT NULL auto_increment,
+			`code` varchar(3) NOT NULL,
+			`enabled` tinyint(1) DEFAULT '1',
+			PRIMARY KEY  (`id`)
+	) ENGINE=MyISAM;");
 
 	$db->query("CREATE TABLE IF NOT EXISTS `domain_redirect_codes` (
-  `rid` int(5) NOT NULL,
-  `did` int(11) unsigned NOT NULL,
-  UNIQUE KEY `rc` (`rid`, `did`)
-) ENGINE=MyISAM;");
+			`rid` int(5) NOT NULL,
+			`did` int(11) unsigned NOT NULL,
+			UNIQUE KEY `rc` (`rid`, `did`)
+	) ENGINE=MyISAM;");
 	lastStepStatus(0);
 
 	showUpdateStep("Filling new tables with default data");
@@ -1202,8 +1202,8 @@ if(isFroxlorVersion('0.9.14-svn6'))
 
 /*
  * revert database changes we did for multiserver-support
- * before branching - sorry guys :/
- */
+* before branching - sorry guys :/
+*/
 if(isFroxlorVersion('0.9.14-svn9'))
 {
 	showUpdateStep("Reverting multiserver-patches (svn)", false);
@@ -1396,17 +1396,17 @@ if(isFroxlorVersion('0.9.17-svn1'))
 
 	showUpdateStep("Adding new tables to database");
 	$db->query("CREATE TABLE IF NOT EXISTS `ipsandports_docrootsettings` (
-  `id` int(5) NOT NULL auto_increment,
-  `fid` int(11) NOT NULL,
-  `docrootsettings` text NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;");
+			`id` int(5) NOT NULL auto_increment,
+			`fid` int(11) NOT NULL,
+			`docrootsettings` text NOT NULL,
+			PRIMARY KEY  (`id`)
+	) ENGINE=MyISAM;");
 	$db->query("CREATE TABLE IF NOT EXISTS `domain_docrootsettings` (
-  `id` int(5) NOT NULL auto_increment,
-  `fid` int(11) NOT NULL,
-  `docrootsettings` text NOT NULL,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM;");
+			`id` int(5) NOT NULL auto_increment,
+			`fid` int(11) NOT NULL,
+			`docrootsettings` text NOT NULL,
+			PRIMARY KEY  (`id`)
+	) ENGINE=MyISAM;");
 	lastStepStatus(0);
 
 	updateToVersion('0.9.17-svn2');
@@ -1553,7 +1553,7 @@ if(isFroxlorVersion('0.9.20.1'))
 	// The customer-table may miss the columns, if installed a fresh 0.9.20 or 0.9.20.1 - add them
 	$result = $db->query("DESCRIBE `" . TABLE_PANEL_CUSTOMERS . "`");
 	$columnfound = 0;
-        while($row = $db->fetch_array($result))
+	while($row = $db->fetch_array($result))
 	{
 		if($row['Field'] == 'backup_allowed')
 		{
@@ -1832,8 +1832,8 @@ if(isFroxlorVersion('0.9.27')) {
 	if ($db->num_rows($handle) < 1) {
 		$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/');");
 	}
-    
- 	updateToVersion('0.9.28-svn1');
+
+	updateToVersion('0.9.28-svn1');
 }
 
 if(isFroxlorVersion('0.9.28-svn1')) {
@@ -1844,9 +1844,9 @@ if(isFroxlorVersion('0.9.28-svn1')) {
 	$db->query("ALTER TABLE  `panel_languages` ADD  `iso` CHAR( 3 ) NOT NULL DEFAULT  'foo' AFTER  `language`");
 
 	$handle = $db->query("SELECT `language` FROM `panel_languages` WHERE `iso`='foo'");
-    
+
 	$langauges = $db->fetch_array($handle);
-	foreach($languages as $language){    
+	foreach($languages as $language){
 		switch ($language) {
 			case "Deutsch":
 				$db->query("UPDATE `panel_languages` SET `iso`='de' WHERE `language` = 'Deutsch'");
@@ -1910,10 +1910,10 @@ if(isFroxlorVersion('0.9.28-svn1')) {
 if(isFroxlorVersion('0.9.28-svn2')) {
 	showUpdateStep("Updating from 0.9.28-svn2 to 0.9.28-svn3");
 	lastStepStatus(0);
-	
+
 	// change lenght of passwd column
 	$db->query("ALTER TABLE `" . TABLE_FTP_USERS . "` MODIFY `password` varchar(128) NOT NULL default ''");
-	
+
 	// Add default setting for vmail_maildirname if not already in place
 	$handle = $db->query("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'system' AND `varname` = 'vmail_maildirname';");
 	if ($db->num_rows($handle) < 1) {
@@ -1958,14 +1958,14 @@ if(isFroxlorVersion('0.9.28-svn3'))
 
 	showUpdateStep('Altering Froxlor database and tables to use UTF-8. This may take a while..', true);
 
-	$db->query('ALTER DATABASE ' . $db->getDbName() . ' CHARACTER SET utf8 COLLATE utf8_general_ci');
+	$db->query('ALTER DATABASE `' . $db->getDbName() . '` CHARACTER SET utf8 COLLATE utf8_general_ci');
 
 	$handle = $db->query('SHOW TABLES');
 	while ($row = $db->fetch_array($handle))
 	{
 		foreach ($row as $table)
 		{
-			$db->query('ALTER TABLE ' . $table . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;');
+			$db->query('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci;');
 		}
 	}
 
@@ -2011,7 +2011,7 @@ if(isFroxlorVersion('0.9.28-svn5')) {
 	showUpdateStep("Inserting settings for nginx fastcgi-params file", true);
 	$fastcgiparams = '/etc/nginx/fastcgi_params';
 	if (isset($_POST['nginx_fastcgi_params']) && $_POST['nginx_fastcgi_params'] != '') {
-		$fastcgiparams = makeCorrectDir($_POST['nginx_fastcgi_params']);
+		$fastcgiparams = makeCorrectFile($_POST['nginx_fastcgi_params']);
 	}
 	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('nginx', 'fastcgiparams', '".$db->escape($fastcgiparams)."')");
 	lastStepStatus(0);
@@ -2024,3 +2024,134 @@ if (isFroxlorVersion('0.9.28-svn6')) {
 	lastStepStatus(0);
 	updateToVersion('0.9.28-rc1');
 }
+
+if (isFroxlorVersion('0.9.28-rc1')) {
+	showUpdateStep("Updating from 0.9.28-rc1 to 0.9.28-rc2", true);
+	lastStepStatus(0);
+
+	$update_system_documentroot_use_default_value = isset($_POST['update_system_documentroot_use_default_value']) ? (int)$_POST['update_system_documentroot_use_default_value'] : '0';
+	showUpdateStep("Adding new settings for using domain name as default value for DocumentRoot path", true);
+	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'documentroot_use_default_value', '".$update_system_documentroot_use_default_value."');");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.28-rc2');
+}
+
+if (isFroxlorVersion('0.9.28-rc2')) {
+	showUpdateStep("Updating from 0.9.28-rc2 to 0.9.28 final", true);
+	$db->query("DELETE FROM `panel_settings` WHERE `settinggroup`='system' AND `varname`='mod_log_sql'");
+	$db->query("DELETE FROM `panel_settings` WHERE `settinggroup`='system' AND `varname`='openssl_cnf'");
+	$db->query("ALTER TABLE `panel_domains` DROP `safemode`");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.28');
+}
+
+if (isFroxlorVersion('0.9.28')) {
+	showUpdateStep("Updating from 0.9.28 final to 0.9.28.1");
+	lastStepStatus(0);
+	updateToVersion('0.9.28.1');
+}
+
+if (isFroxlorVersion('0.9.28.1')) {
+	showUpdateStep("Updating from 0.9.28.1 to 0.9.29-dev1", true);
+	lastStepStatus(0);
+
+	$hide_stdsubdomains = isset($_POST['hide_stdsubdomains']) ? (int)$_POST['hide_stdsubdomains'] : '0';
+	showUpdateStep('Setting value for "hide standard subdomains"', true);
+	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'phpconfigs_hidestdsubdomain', '".$hide_stdsubdomains."');");
+	lastStepStatus(0);
+
+	// don't advertise security questions - just set a default silently
+	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'passwordcryptfunc', '1');");
+
+	$fastcgiparams = $settings['nginx']['fastcgiparams'];
+	// check the faulty value explicitly
+	if ($fastcgiparams == '/etc/nginx/fastcgi_params/') {
+		$fastcgiparams = makeCorrectFile(substr(fastcgiparams,0,-1));
+		$db->query("UPDATE TABLE `panel_settings` SET `value`='".$db->escape($fastcgiparams)."' WHERE `varname`='fastcgiparams';");
+	}
+	updateToVersion('0.9.29-dev1');
+}
+
+if (isFroxlorVersion('0.9.29-dev1')) {
+	showUpdateStep("Updating from 0.9.29-dev1 to 0.9.29-dev2", true);
+	lastStepStatus(0);
+
+	$allow_themechange_c = isset($_POST['allow_themechange_c']) ? (int)$_POST['allow_themechange_c'] : '1';
+	$allow_themechange_a = isset($_POST['allow_themechange_a']) ? (int)$_POST['allow_themechange_a'] : '1';
+	showUpdateStep("Inserting new setting to allow/disallow theme changes (default: on)", true);
+	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_theme_change_admin', '".$allow_themechange_a."');");
+	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_theme_change_customer', '".$allow_themechange_c."');");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.29-dev2');
+}
+
+if (isFroxlorVersion('0.9.29-dev2')) {
+	showUpdateStep("Updating from 0.9.29-dev2 to 0.9.29-dev3", true);
+	lastStepStatus(0);
+
+	$system_afxrservers = isset($_POST['system_afxrservers']) ? trim($_POST['system_afxrservers']) : '';
+	if ($system_afxrservers != '') {
+		$axfrservers = explode(',', $system_afxrservers);
+		$newaxfrserver = array();
+		foreach ($axfrservers as $index => $axfrserver) {
+			if (validate_ip($axfrserver, true) !== false) {
+				$newaxfrserver[] = $axfrserver;
+			}
+		}
+		$system_afxrservers = implode(", ", $newaxfrserver);
+	}
+	showUpdateStep("Inserting new setting for AFXR server", true);
+	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'axfrservers', '".$db->escape($system_afxrservers)."');");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.29-dev3');
+}
+
+if (isFroxlorVersion('0.9.29-dev3')) {
+	showUpdateStep("Updating from 0.9.29-dev3 to 0.9.29-dev4", true);
+	lastStepStatus(0);
+
+	showUpdateStep("Adding new tables to database", true);
+	$db->query("CREATE TABLE IF NOT EXISTS `domain_ssl_settings` (
+	`id` int(5) NOT NULL auto_increment,
+	`domainid` int(11) NOT NULL,
+	`ssl_cert_file` text NOT NULL,
+	`ssl_key_file` text NOT NULL,
+	`ssl_ca_file` text NOT NULL,
+	`ssl_cert_chainfile` text NOT NULL,
+	PRIMARY KEY  (`id`)
+	) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;");
+	lastStepStatus(0);
+
+	$system_customersslpath = isset($_POST['system_customersslpath']) ? makeCorrectDir($_POST['system_customersslpath']) : '/etc/apache2/ssl/';
+	$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'customer_ssl_path', '".$db->escape($system_customersslpath)."');");
+	updateToVersion('0.9.29-dev4');
+}
+
+if (isFroxlorVersion('0.9.29-dev4')) {
+	showUpdateStep("Updating from 0.9.29-dev4 to 0.9.29-rc1", true);
+	lastStepStatus(0);
+
+	// check for wrong vmail_maildirname database-field-name (bug #1242)
+	showUpdateStep("correcting Maildir setting database-field-name (if needed).", true);
+	$db->query("UPDATE `panel_settings` SET `varname` = 'vmail_maildirname' WHERE `settinggroup` = 'system' AND `varname` = 'vmail_maildir'");
+	lastStepStatus(0);
+
+	showUpdateStep("setting default php-configuration for php-fpm", true);
+	$dval = (isset($settings['system']['mod_fcgid_defaultini']) ? $settings['system']['mod_fcgid_defaultini'] : '1');
+	$db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'phpfpm', `varname` = 'defaultini', `value` = '".(int)$dval."'");
+	$dval = (isset($settings['system']['mod_fcgid_ownvhost']) ? $settings['system']['mod_fcgid_ownvhost'] : '1');
+	$db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'phpfpm', `varname` = 'vhost_defaultini', `value` = '".(int)$dval."'");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.29-rc1');
+}
+
+if (isFroxlorVersion('0.9.29-rc1')) {
+	showUpdateStep("Updating from 0.9.29-rc1 to 0.9.29 final", true);
+	lastStepStatus(0);
+	updateToVersion('0.9.29');
+}

install/updates/preconfig.php

@@ -49,14 +49,6 @@ function versionInUpdate($current_version, $version_to_check)
 	if (!isFroxlor()) {
 		return true;
 	}
-	$pos_a = strpos($current_version, '-svn');
-	$pos_b = strpos($version_to_check, '-svn');
-	// if we compare svn-versions, we have to add -svn0 to the version
-	// to compare it correctly	
-	if($pos_a === false && $pos_b !== false)
-	{
-		$current_version.= '-svn9999';
-	}
-	
-	return version_compare($current_version, $version_to_check, '<');
+
+	return (version_compare2($current_version, $version_to_check) == -1 ? true : false);
 }

install/updates/preconfig/0.9/preconfig_0.9.inc.php

@@ -158,7 +158,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 		$question.= makeyesno('update_defdns_mailentry', '1', '0', '0');
 		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 	}
-	
+
 	if(versionInUpdate($current_version, '0.9.10-svn1'))
 	{
 		$has_nouser = false;
@@ -171,13 +171,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 			$has_nouser = true;
 			$guessed_user = 'www-data';
 			if(function_exists('posix_getuid')
-				&& function_exists('posix_getpwuid')
+					&& function_exists('posix_getpwuid')
 			) {
 				$_httpuser = posix_getpwuid(posix_getuid());
 				$guessed_user = $_httpuser['name'];
 			}
 		}
-		
+
 		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'httpgroup'");
 		if(!isset($result) || !isset($result['value']))
 		{
@@ -185,7 +185,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 			$has_nogroup = true;
 			$guessed_group = 'www-data';
 			if(function_exists('posix_getgid')
-				&& function_exists('posix_getgrgid')
+					&& function_exists('posix_getgrgid')
 			) {
 				$_httpgroup = posix_getgrgid(posix_getgid());
 				$guessed_group = $_httpgroup['name'];
@@ -198,8 +198,8 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 			if($has_nouser)
 			{
 				$question = '<strong>Please enter the webservers username:</strong>&nbsp;<input type="text" class="text" name="update_httpuser" value="'.$guessed_user.'" />';
-			} 
-			elseif($has_nogroup) 
+			}
+			elseif($has_nogroup)
 			{
 				$question2 = '<strong>Please enter the webservers groupname:</strong>&nbsp;<input type="text" class="text" name="update_httpgroup" value="'.$guessed_group.'" />';
 				if($has_nouser) {
@@ -238,7 +238,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 		$question.= '<input type="text" class="text" name="update_perlpath" value="/usr/bin/perl" />';
 		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 	}
-	
+
 	if(versionInUpdate($current_version, '0.9.12-svn1'))
 	{
 		if($settings['system']['mod_fcgid'] == 1)
@@ -345,13 +345,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 	}
 
 	if(versionInUpdate($current_version, '0.9.14-svn10'))
-	{       
+	{
 		$has_preconfig = true;
-		$description = '<strong>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!</strong>'; 
+		$description = '<strong>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!</strong>';
 		$question = '';
 		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 	}
-	
+
 	if(versionInUpdate($current_version, '0.9.16-svn1'))
 	{
 		$has_preconfig = true;
@@ -419,7 +419,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 	if(versionInUpdate($current_version, '0.9.18-svn2'))
 	{
 		$has_preconfig = true;
-		$description = 'As you can (obviously) see, Froxlor now comes with a new theme. You also have the possibility to switch back to "Classic" if you want to.'; 
+		$description = 'As you can (obviously) see, Froxlor now comes with a new theme. You also have the possibility to switch back to "Classic" if you want to.';
 		$question = '<strong>Select default panel theme:</strong>&nbsp;';
 		$question.= '<select name="update_default_theme">';
 		$themes = getThemes();
@@ -453,12 +453,12 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 	}
 
 	if (versionInUpdate($current_version, '0.9.28-svn6')) {
-	
+
 		if ($settings['system']['webserver'] == 'apache2') {
 			$has_preconfig = true;
 			$description = 'Froxlor now supports the new Apache 2.4. Please be aware that you need to load additional apache-modules in ordner to use it.<br />';
 			$description.= '<pre>LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
+					LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
 			$question = '<strong>Do you want to enable the Apache-2.4 modification?:</strong>&nbsp;';
 			$question.= makeyesno('update_system_apache24', '1', '0', '0');
 			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
@@ -467,8 +467,78 @@ LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
 			$description = 'The path to nginx\'s fastcgi_params file is now customizable.<br /><br />';
 			$question = '<strong>Please enter full path to you nginx/fastcgi_params file (including filename):</strong>&nbsp;';
 			$question.= '<input type="text" class="text" name="nginx_fastcgi_params" value="/etc/nginx/fastcgi_params" />';
-			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");			
+			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 		}
 	}
 
+	if (versionInUpdate($current_version, '0.9.28-rc2')) {
+
+		$has_preconfig = true;
+
+		$description  = 'This version adds an option to append the domain-name to the document-root for domains and subdomains.<br />';
+		$description .= 'You can enable or disable this feature anytime from settings -> system settings.<br />';
+
+		$question = '<strong>Do you want to automatically append the domain-name to the documentroot of newly created domains?:</strong>&nbsp;';
+		$question.= makeyesno('update_system_documentroot_use_default_value', '1', '0', '0');
+
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
+
+	if (versionInUpdate($current_version, '0.9.28')) {
+
+		$has_preconfig = true;
+		// just an information about the new sendmail parameter (#1134)
+		$description  = 'Froxlor changed the default parameter-set of sendmail (php.ini)<br />';
+		$description .= 'sendmail_path = "/usr/sbin/sendmail -t <strong>-i</strong> -f {CUSTOMER_EMAIL}"<br /><br />';
+		$description .= 'If you don\'t have any problems with sending mails, you don\'t need to change this';
+		if ($settings['system']['mod_fcgid'] == '1'
+				|| $settings['phpfpm']['enabled'] == '1'
+		) {
+			// information about removal of php's safe_mode
+			$description .= '<br /><br />The php safe_mode flag has been removed as current versions of PHP<br />';
+			$description .= 'do not support it anymore.<br /><br />';
+			$description .= 'Please check your php-configurations and remove safe_mode-directives to avoid php notices/warnings.';
+		}
+		$question = '';
+
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
+
+	if (versionInUpdate($current_version, '0.9.29-dev1')) {
+		// we only need to ask if fcgid|php-fpm is enabled
+		if ($settings['system']['mod_fcgid'] == '1'
+				|| $settings['phpfpm']['enabled'] == '1'
+		) {
+			$has_preconfig = true;
+			$description  = 'Standard-subdomains can now be hidden from the php-configuration overview.<br />';
+			$question = '<strong>Do you want to hide the standard-subdomains (this can be changed in the settings any time)?:</strong>&nbsp;';
+			$question.= makeyesno('hide_stdsubdomains', '1', '0', '0');
+			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+		}
+	}
+
+	if (versionInUpdate($current_version, '0.9.29-dev2')) {
+		$has_preconfig = true;
+		$description  = 'You can now decide whether admins/customers are able to change the theme<br />';
+		$question = '<strong>If you want to disallow theme-changing, select "no" from the dropdowns:</strong>&nbsp;';
+		$question.= "Admins: ". makeyesno('allow_themechange_a', '1', '0', '1').'&nbsp;&nbsp;';
+		$question.= "Customers: ".makeyesno('allow_themechange_c', '1', '0', '1');
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
+
+	if (versionInUpdate($current_version, '0.9.29-dev3')) {
+		$has_preconfig = true;
+		$description  = 'There is now a possibility to specify AFXR servers for your bind zone-configuration<br />';
+		$question = '<strong>Enter a comma-separated list of AFXR servers or leave empty (default):</strong>&nbsp;';
+		$question.= '<input type="text" class="text" name="system_afxrservers" value="" />';
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
+
+	if (versionInUpdate($current_version, '0.9.29-dev4')) {
+		$has_preconfig = true;
+		$description  = 'As customers can now specify ssl-certificate data for their domains, you need to specify where the generated files are stored<br />';
+		$question = '<strong>Specify the directory for customer ssl-certificates:</strong>&nbsp;';
+		$question.= '<input type="text" class="text" name="system_customersslpath" value="/etc/apache2/ssl/" />';
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
 }

lib/classes/idna/class.idna_convert.php

@@ -23,6 +23,8 @@
 
 // }}}
 
+// Source for updates: http://phlymail.com/en/downloads/idna-convert.html
+
 /**
  * Encode/decode Internationalized Domain Names.
  *
@@ -47,8 +49,8 @@
  * ACE input and output is always expected to be ASCII.
  *
  * @author  Matthias Sommerfeld <mso@phlylabs.de>
- * @copyright 2004-2010 phlyLabs Berlin, http://phlylabs.de
- * @version 0.7.0 2010-11-20
+ * @copyright 2004-2011 phlyLabs Berlin, http://phlylabs.de
+ * @version 0.8.0 2011-03-11
  */
 class idna_convert
 {
@@ -76,11 +78,14 @@ class idna_convert
     protected $_scount = 11172; // _lcount * _tcount * _vcount
     protected $_error = false;
 
+    protected static $_mb_string_overload = null;
+
     // See {@link set_paramter()} for details of how to change the following
     // settings from within your script / application
     protected $_api_encoding = 'utf8';   // Default input charset is UTF-8
     protected $_allow_overlong = false;  // Overlong UTF-8 encodings are forbidden
     protected $_strict_mode = false;     // Behave strict or not
+    protected $_idn_version = 2003;      // Can be either 2003 (old, default) or 2008
 
     /**
      * the constructor
@@ -93,7 +98,15 @@ class idna_convert
     {
         $this->slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
         // If parameters are given, pass these to the respective method
-        if (is_array($options)) return $this->set_parameter($options);
+        if (is_array($options)) {
+            $this->set_parameter($options);
+        }
+
+        // populate mbstring overloading cache if not set
+        if (self::$_mb_string_overload === null) {
+            self::$_mb_string_overload = (extension_loaded('mbstring')
+                && (ini_get('mbstring.func_overload') & 0x02) === 0x02);
+        }
     }
 
     /**
@@ -136,11 +149,18 @@ class idna_convert
             case 'strict':
                 $this->_strict_mode = ($v) ? true : false;
                 break;
-            case 'encode_german_sz':
-                if (!$v) {
-                    $this->NP['replacemaps'][0xDF] = array(0x73, 0x73);
+            case 'idn_version':
+                if (in_array($v, array('2003', '2008'))) {
+                    $this->_idn_version = $v;
                 } else {
-                    unset($this->NP['replacemaps'][0xDF]);
+                    $this->_error('Set Parameter: Unknown parameter '.$v.' for option '.$k);
+                }
+                break;
+            case 'encode_german_sz': // Deprecated
+                if (!$v) {
+                    self::$NP['replacemaps'][0xDF] = array(0x73, 0x73);
+                } else {
+                    unset(self::$NP['replacemaps'][0xDF]);
                 }
                 break;
             default:
@@ -398,13 +418,13 @@ class idna_convert
         }
         // Find last occurence of the delimiter
         $delim_pos = strrpos($encoded, '-');
-        if ($delim_pos > strlen($this->_punycode_prefix)) {
-            for ($k = strlen($this->_punycode_prefix); $k < $delim_pos; ++$k) {
+        if ($delim_pos > self::byteLength($this->_punycode_prefix)) {
+            for ($k = self::byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
                 $decoded[] = ord($encoded{$k});
             }
         }
         $deco_len = count($decoded);
-        $enco_len = strlen($encoded);
+        $enco_len = self::byteLength($encoded);
 
         // Wandering through the strings; init
         $is_first = true;
@@ -442,7 +462,7 @@ class idna_convert
     protected function _encode($decoded)
     {
         // We cannot encode a domain name containing the Punycode prefix
-        $extract = strlen($this->_punycode_prefix);
+        $extract = self::byteLength($this->_punycode_prefix);
         $check_pref = $this->_utf8_to_ucs4($this->_punycode_prefix);
         $check_deco = array_slice($decoded, 0, $extract);
 
@@ -589,24 +609,28 @@ class idna_convert
         // While mapping required chars we apply the cannonical ordering
         foreach ($input as $v) {
             // Map to nothing == skip that code point
-            if (in_array($v, $this->NP['map_nothing'])) continue;
+            if (in_array($v, self::$NP['map_nothing'])) continue;
             // Try to find prohibited input
-            if (in_array($v, $this->NP['prohibit']) || in_array($v, $this->NP['general_prohibited'])) {
+            if (in_array($v, self::$NP['prohibit']) || in_array($v, self::$NP['general_prohibited'])) {
                 $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
                 return false;
             }
-            foreach ($this->NP['prohibit_ranges'] as $range) {
+            foreach (self::$NP['prohibit_ranges'] as $range) {
                 if ($range[0] <= $v && $v <= $range[1]) {
                     $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v));
                     return false;
                 }
             }
-            // Hangul syllable decomposition
+
             if (0xAC00 <= $v && $v <= 0xD7AF) {
-                foreach ($this->_hangul_decompose($v) as $out) $output[] = (int) $out;
-            // There's a decomposition mapping for that code point
-            } elseif (isset($this->NP['replacemaps'][$v])) {
-                foreach ($this->_apply_cannonical_ordering($this->NP['replacemaps'][$v]) as $out) {
+                // Hangul syllable decomposition
+                foreach ($this->_hangul_decompose($v) as $out) {
+                    $output[] = (int) $out;
+                }
+            } elseif (($this->_idn_version == '2003') && isset(self::$NP['replacemaps'][$v])) {
+                // There's a decomposition mapping for that code point
+                // Decompositions only in version 2003 (original) of IDNA
+                foreach ($this->_apply_cannonical_ordering(self::$NP['replacemaps'][$v]) as $out) {
                     $output[] = (int) $out;
                 }
             } else {
@@ -715,11 +739,11 @@ class idna_convert
      */
     protected function _get_combining_class($char)
     {
-        return isset($this->NP['norm_combcls'][$char]) ? $this->NP['norm_combcls'][$char] : 0;
+        return isset(self::$NP['norm_combcls'][$char]) ? self::$NP['norm_combcls'][$char] : 0;
     }
 
     /**
-     * Apllies the cannonical ordering of a decomposed UCS4 sequence
+     * Applies the cannonical ordering of a decomposed UCS4 sequence
      * @param    array      Decomposed UCS4 sequence
      * @return   array      Ordered USC4 sequence
      */
@@ -758,7 +782,7 @@ class idna_convert
     protected function _combine($input)
     {
         $inp_len = count($input);
-        foreach ($this->NP['replacemaps'] as $np_src => $np_target) {
+        foreach (self::$NP['replacemaps'] as $np_src => $np_target) {
             if ($np_target[0] != $input[0]) continue;
             if (count($np_target) != $inp_len) continue;
             $hit = false;
@@ -797,12 +821,7 @@ class idna_convert
     {
         $output = array();
         $out_len = 0;
-        // Patch by Daniel Hahler; work around prolbem with mbstring.func_overload
-        if (function_exists('mb_strlen')) {
-            $inp_len = mb_strlen($input, '8bit');
-        } else {
-            $inp_len = strlen($input);
-        }
+        $inp_len = self::byteLength($input);
         $mode = 'next';
         $test = 'none';
         for ($k = 0; $k < $inp_len; ++$k) {
@@ -923,7 +942,7 @@ class idna_convert
     protected function _ucs4_string_to_ucs4($input)
     {
         $output = array();
-        $inp_len = strlen($input);
+        $inp_len = self::byteLength($input);
         // Input length must be dividable by 4
         if ($inp_len % 4) {
             $this->_error('Input UCS4 string is broken');
@@ -942,6 +961,56 @@ class idna_convert
         return $output;
     }
 
+    /**
+     * Gets the length of a string in bytes even if mbstring function
+     * overloading is turned on
+     *
+     * @param string $string the string for which to get the length.
+     * @return integer the length of the string in bytes.
+     */
+    protected static function byteLength($string)
+    {
+        if (self::$_mb_string_overload) {
+            return mb_strlen($string, '8bit');
+        }
+        return strlen((binary) $string);
+    }
+
+    /**
+     * Attempts to return a concrete IDNA instance.
+     *
+     * @param array $params Set of paramaters
+     * @return idna_convert
+     * @access public
+     */
+    public function getInstance($params = array())
+    {
+        return new idna_convert($params);
+    }
+
+    /**
+     * Attempts to return a concrete IDNA instance for either php4 or php5,
+     * only creating a new instance if no IDNA instance with the same
+     * parameters currently exists.
+     *
+     * @param array $params Set of paramaters
+     *
+     * @return object idna_convert
+     * @access public
+     */
+    public function singleton($params = array())
+    {
+        static $instances;
+        if (!isset($instances)) {
+            $instances = array();
+        }
+        $signature = serialize($params);
+        if (!isset($instances[$signature])) {
+            $instances[$signature] = idna_convert::getInstance($params);
+        }
+        return $instances[$signature];
+    }
+
     /**
      * Holds all relevant mapping tables
      * See RFC3454 for details
@@ -949,7 +1018,7 @@ class idna_convert
      * @private array
      * @since 0.5.2
      */
-    protected $NP = array
+    protected static $NP = array
             ('map_nothing' => array(0xAD, 0x34F, 0x1806, 0x180B, 0x180C, 0x180D, 0x200B, 0x200C
                     ,0x200D, 0x2060, 0xFE00, 0xFE01, 0xFE02, 0xFE03, 0xFE04, 0xFE05, 0xFE06, 0xFE07
                     ,0xFE08, 0xFE09, 0xFE0A, 0xFE0B, 0xFE0C, 0xFE0D, 0xFE0E, 0xFE0F, 0xFEFF
@@ -984,7 +1053,7 @@ class idna_convert
                     ,0xD0 => array(0xF0), 0xD1 => array(0xF1), 0xD2 => array(0xF2), 0xD3 => array(0xF3)
                     ,0xD4 => array(0xF4), 0xD5 => array(0xF5), 0xD6 => array(0xF6), 0xD8 => array(0xF8)
                     ,0xD9 => array(0xF9), 0xDA => array(0xFA), 0xDB => array(0xFB), 0xDC => array(0xFC)
-                    ,0xDD => array(0xFD), 0xDE => array(0xFE) /* Here was German "ß" -> "ss", is now configurable */
+                    ,0xDD => array(0xFD), 0xDE => array(0xFE), 0xDF => array(0x73, 0x73)
                     ,0x100 => array(0x101), 0x102 => array(0x103), 0x104 => array(0x105)
                     ,0x106 => array(0x107), 0x108 => array(0x109), 0x10A => array(0x10B)
                     ,0x10C => array(0x10D), 0x10E => array(0x10F), 0x110 => array(0x111)

lib/classes/phpinterface/class.phpinterface_fcgid.php

@@ -175,7 +175,7 @@ class phpinterface_fcgid
 
 		$admin = $this->_getAdminData($this->_domain['adminid']);
 		$php_ini_variables = array(
-			'SAFE_MODE' => ($this->_domain['safemode'] == '0' ? 'Off' : 'On'),
+			'SAFE_MODE' => 'Off', // keep this for compatibility, just in case
 			'PEAR_DIR' => $this->_settings['system']['mod_fcgid_peardir'],
 			'OPEN_BASEDIR' => $openbasedir,
 			'OPEN_BASEDIR_C' => $openbasedirc,

lib/classes/phpinterface/class.phpinterface_fpm.php

@@ -39,6 +39,62 @@ class phpinterface_fpm
 	 */
 	private $_domain = array();
 
+	/**
+	 * Admin-Date cache array
+	 * @var array
+	 */
+	private $_admin_cache = array();
+
+	/**
+	 * defines what can be used for pool-config from php.ini
+	 * @var array
+	 */
+	private $_ini = array(
+		'php_value' => array(
+			'error_reporting',
+			'max_execution_time',
+			'include_path',
+			'upload_max_filesize',
+			'log_errors_max_len'
+		),
+		'php_flag' => array(
+			'short_open_tag',
+			'asp_tags',
+			'display_errors',
+			'display_startup_errors',
+			'log_errors',
+			'track_errors',
+			'html_errors',
+			'magic_quotes_gpc',
+			'magic_quotes_runtime',
+			'magic_quotes_sybase'
+		),
+		'php_admin_value' => array(
+			'precision',
+			'output_buffering',
+			'disable_functions',
+			'max_input_time',
+			'memory_limit',
+			'post_max_size',
+			'variables_order',
+			'gpc_order',
+			'date.timezone'
+		),
+		'php_admin_flag' => array(
+			'allow_call_time_pass_reference',
+			'allow_url_fopen',
+			'cgi.force_redirect',
+			'enable_dl',
+			'expose_php',
+			'ignore_repeated_errors',
+			'ignore_repeated_source',
+			'report_memleaks',
+			'register_argc_argv',
+			'file_uploads',
+			'allow_url_fopen'
+		)
+	);
+
 	/**
 	 * main constructor
 	 */
@@ -168,11 +224,42 @@ class phpinterface_fpm
 			$fpm_config.= 'php_admin_value[session.save_path] = ' . makeCorrectDir($this->_settings['phpfpm']['tmpdir'] . '/' . $this->_domain['loginname'] . '/') . "\n";
 			$fpm_config.= 'php_admin_value[upload_tmp_dir] = ' . makeCorrectDir($this->_settings['phpfpm']['tmpdir'] . '/' . $this->_domain['loginname'] . '/') . "\n";
 
+			$admin = $this->_getAdminData($this->_domain['adminid']);
+			$php_ini_variables = array(
+					'SAFE_MODE' => 'Off', // keep this for compatibility, just in case
+					'PEAR_DIR' => $this->_settings['system']['mod_fcgid_peardir'],
+					'TMP_DIR' => $this->getTempDir(),
+					'CUSTOMER_EMAIL' => $this->_domain['email'],
+					'ADMIN_EMAIL' => $admin['email'],
+					'DOMAIN' => $this->_domain['domain'],
+					'CUSTOMER' => $this->_domain['loginname'],
+					'ADMIN' => $admin['loginname']
+			);
+
+			$phpini = replace_variables($phpconfig['phpsettings'], $php_ini_variables);
+			$phpini_array = explode("\n", $phpini);
+
+			$fpm_config.= "\n\n";
+			foreach ($phpini_array as $inisection) {
+				$is = explode("=", $inisection);
+				foreach ($this->_ini as $sec => $possibles) {
+					if (in_array(trim($is[0]), $possibles)) {
+						$fpm_config.= $sec.'['.trim($is[0]).'] = ' . trim($is[1]) . "\n";
+					}
+				}
+			}
+
 			fwrite($fh, $fpm_config, strlen($fpm_config));
 			fclose($fh);
 		}
 	}
 
+	/**
+	 * this is done via createConfig as php-fpm defines
+	 * the ini-values/flags in its pool-config
+	 *
+	 * @param string $phpconfig
+	 */
 	public function createIniFile($phpconfig)
 	{
 		return;
@@ -240,7 +327,7 @@ class phpinterface_fpm
 		return $tmpdir;
 	}
 
-  /**
+	/**
  	 * fastcgi-fakedirectory directory
  	 *
  	 * @param boolean $createifnotexists create the directory if it does not exist
@@ -249,10 +336,10 @@ class phpinterface_fpm
  	 */
  	public function getAliasConfigDir($createifnotexists = true)
  	{
-    // ensure default...
-    if (!isset($this->_settings['phpfpm']['aliasconfigdir'])) {
-      $this->_settings['phpfpm']['aliasconfigdir'] = '/var/www/php-fpm';
-    }
+	    // ensure default...
+	    if (!isset($this->_settings['phpfpm']['aliasconfigdir'])) {
+	      $this->_settings['phpfpm']['aliasconfigdir'] = '/var/www/php-fpm';
+	    }
 
  		$configdir = makeCorrectDir($this->_settings['phpfpm']['aliasconfigdir'] . '/' . $this->_domain['loginname'] . '/' . $this->_domain['domain'] . '/');
  		if(!is_dir($configdir) && $createifnotexists)
@@ -263,4 +350,24 @@ class phpinterface_fpm
 
  		return $configdir;
  	}
+
+	/**
+	 * return the admin-data of a specific admin
+	 *
+	 * @param int $adminid id of the admin-user
+	 *
+	 * @return array
+	 */
+	private function _getAdminData($adminid) {
+		$adminid = intval($adminid);
+
+		if (!isset($this->_admin_cache[$adminid])) {
+			$this->_admin_cache[$adminid] = $this->_db->query_first(
+				"SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "`
+				WHERE `adminid` = " . (int)$adminid
+			);
+		}
+
+		return $this->_admin_cache[$adminid];
+	}
 }

lib/classes/webserver/class.ConfigIO.php

@@ -0,0 +1,283 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Cron
+ *
+ * @since      0.9.29
+ *
+ */
+
+class ConfigIO {
+
+	/**
+	 * internal settings array
+	 *
+	 * @var array
+	 */
+	private $_settings = null;
+
+	/**
+	 * constructor gets the froxlor settings
+	 * as array
+	 */
+	public function __construct(array $settings = null) {
+		$this->_settings = $settings;
+	}
+
+	/**
+	 * clean up former created configs, including (if enabled)
+	 * awstats, fcgid, php-fpm and of course automatically created
+	 * webserver vhost and diroption files
+	 *
+	 * @return null
+	 */
+	public function cleanUp() {
+		// awstats files
+		$this->_cleanAwstatsFiles();
+
+		// fcgid files
+		$this->_cleanFcgidFiles();
+
+		// php-fpm files
+		$this->_cleanFpmFiles();
+
+		// clean webserver-configs
+		$this->_cleanWebserverConfigs();
+
+		// old htpasswd files
+		$this->_cleanHtpasswdFiles();
+
+		// customer-specified ssl-certificates
+		$this->_cleanCustomerSslCerts();
+	}
+
+	/**
+	 * remove customer-specified auto-generated ssl-certificates
+	 * (they are being regenerated)
+	 *
+	 * @return null
+	 */
+	private function _cleanCustomerSslCerts() {
+
+		// get correct directory
+		$configdir = $this->_getFile('system', 'customer_ssl_path');
+		if ($configdir !== false) {
+
+			$configdir = makeCorrectDir($configdir);
+
+			if (@is_dir($configdir)) {
+				// now get rid of old stuff
+				//(but append /* so we don't delete the directory)
+				$configdir.='/*';
+				safe_exec('rm -rf '. makeCorrectFile($configdir));
+			}
+		}
+	}
+
+	/**
+	 * remove webserver related configuration files before regeneration
+	 *
+	 * @return null
+	 */
+	private function _cleanWebserverConfigs() {
+
+		// get directories
+		$configdirs = array();
+		$configdirs[] = makeCorrectDir($this->_getFile('system', 'apacheconf_vhost'));
+		$configdirs[] = makeCorrectDir($this->_getFile('system', 'apacheconf_diroptions'));
+
+		// file pattern
+		$pattern = "/^([0-9]){2}_(froxlor|syscp)_(.+)\.conf$/";
+
+		// check ALL the folders
+		foreach ($configdirs as $config_dir) {
+
+			// check directory
+			if (@is_dir($config_dir)) {
+
+				// create directory iterator
+				$its = new RecursiveIteratorIterator(
+						new RecursiveDirectoryIterator($config_dir)
+				);
+
+				// iterate through all subdirs,
+				// look for vhost/diroption files
+				// and delete them
+				foreach ($its as $fullFileName => $it ) {
+					if ($it->isFile() && preg_match($pattern, $it->getFilename())) {
+						// remove file
+						safe_exec('rm -f '. escapeshellarg(makeCorrectFile($its->getPathname())));
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * remove htpasswd files before regeneration
+	 *
+	 * @return null
+	 */
+	private function _cleanHtpasswdFiles() {
+
+		// get correct directory
+		$configdir = $this->_getFile('system', 'apacheconf_htpasswddir');
+
+		if ($configdir !== false) {
+			$configdir = makeCorrectDir($configdir);
+
+			if (@is_dir($configdir)) {
+				// now get rid of old stuff
+				//(but append /* so we don't delete the directory)
+				$configdir.='/*';
+				safe_exec('rm -rf '. makeCorrectFile($configdir));
+			}
+		}
+	}
+
+	/**
+	 * remove awstats related configuration files before regeneration
+	 *
+	 * @return null
+	 */
+	private function _cleanAwstatsFiles() {
+
+		if ($this->_settings['system']['awstats_enabled'] == '0') {
+			return;
+		}
+
+		//dhr: cleanout froxlor-generated awstats configs prior to re-creation
+		$awstatsclean['header'] = "## GENERATED BY FROXLOR\n";
+		$awstatsclean['headerold'] = "## GENERATED BY SYSCP\n";
+		$awstatsclean['path'] = $this->_getFile('system', 'awstats_conf');
+
+		/**
+		 * dont do anyting if the directory not exists
+		 * (e.g. awstats not installed yet or whatever)
+		 * fixes #45
+		*/
+		if ($awstatsclean['path'] !== false && is_dir($awstatsclean['path'])) {
+			$awstatsclean['dir'] = dir($awstatsclean['path']);
+			while ($awstatsclean['entry'] = $awstatsclean['dir']->read()) {
+				$awstatsclean['fullentry'] = makeCorrectFile($awstatsclean['path'].'/'.$awstatsclean['entry']);
+				/**
+				 * dont do anything if the file does not exist
+				*/
+				if (@file_exists($awstatsclean['fullentry'])) {
+					$awstatsclean['fh'] = fopen($awstatsclean['fullentry'], 'r');
+					$awstatsclean['headerRead'] = fgets($awstatsclean['fh'], strlen($awstatsclean['header'])+1);
+					fclose($awstatsclean['fh']);
+
+					if ($awstatsclean['headerRead'] == $awstatsclean['header']
+							|| $awstatsclean['headerRead'] == $awstatsclean['headerold']
+					) {
+						$awstats_conf_file = makeCorrectFile($awstatsclean['fullentry']);
+						@unlink($awstats_conf_file);
+					}
+				}
+			}
+		}
+		unset($awstatsclean);
+		//end dhr
+	}
+
+	/**
+	 * remove fcgid related configuration files before regeneration
+	 *
+	 * @return null
+	 */
+	private function _cleanFcgidFiles() {
+
+		if ($this->_settings['system']['mod_fcgid'] == '0') {
+			return;
+		}
+
+		// get correct directory
+		$configdir = $this->_getFile('system', 'mod_fcgid_configdir');
+		if ($configdir !== false) {
+
+			$configdir = makeCorrectDir($configdir);
+
+			if (@is_dir($configdir)) {
+				// create directory iterator
+				$its = new RecursiveIteratorIterator(
+						new RecursiveDirectoryIterator($configdir)
+				);
+
+				// iterate through all subdirs,
+				// look for php-fcgi-starter files
+				// and take immutable-flag away from them
+				// so we can delete them :)
+				foreach ($its as $fullFileName => $it ) {
+					if ($it->isFile() && $it->getFilename() == 'php-fcgi-starter') {
+						// set chattr -i
+						removeImmutable($its->getPathname());
+					}
+				}
+
+				// now get rid of old stuff
+				//(but append /* so we don't delete the directory)
+				$configdir.='/*';
+				safe_exec('rm -rf '. makeCorrectFile($configdir));
+			}
+		}
+	}
+
+	/**
+	 * remove php-fpm related configuration files before regeneration
+	 *
+	 * @return null
+	 */
+	private function _cleanFpmFiles() {
+
+		if ($this->_settings['phpfpm']['enabled'] == '0') {
+			return;
+		}
+
+		// get correct directory
+		$configdir = $this->_getFile('phpfpm', 'configdir');
+		if ($configdir !== false) {
+
+			$configdir = makeCorrectDir($configdir);
+
+			if (@is_dir($configdir)) {
+				// now get rid of old stuff
+				//(but append /* so we don't delete the directory)
+				$configdir.='/*';
+				safe_exec('rm -rf '. makeCorrectFile($configdir));
+			}
+		}
+	}
+
+	/**
+	 * returns a file/direcotry from the settings array and checks whether it exists
+	 *
+	 * @param string $group         settings-group
+	 * @param string $varname       var-name
+	 * @param boolean $check_exists check if the file exists
+	 *
+	 * @return string|boolean complete path including filename if any or false on error
+	 */
+	private function _getFile($group, $varname, $check_exists = true) {
+
+		// read from settings
+		$file = $this->_settings[$group][$varname];
+
+		// check whether it exists
+		if ($check_exists && @file_exists($file) == false) {
+			return false;
+		}
+		return $file;
+	}
+}

lib/classes/webserver/class.DomainSSL.php

@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Cron
+ *
+ * @since      0.9.29
+ *
+ */
+
+class DomainSSL {
+
+	/**
+	 * internal settings array
+	 *
+	 * @var array
+	 */
+	private $_settings = null;
+
+	/**
+	 * internal database object
+	 *
+	 * @var db
+	 */
+	private $_db = null;
+
+	/**
+	 * constructor gets the froxlor settings as array
+	 * and the initialized database object
+	 */
+	public function __construct(array $settings = null, $db = null) {
+		$this->_settings = $settings;
+		$this->_db = $db;
+	}
+
+	/**
+	 * read domain-related (or if empty, parentdomain-related) ssl-certificates from the database
+	 * and (if not empty) set the corresponding array-indices (ssl_cert_file, ssl_key_file,
+	 * ssl_ca_file and ssl_cert_chainfile). Hence the parameter as reference.
+	 *
+	 * @param array $domain domain-array as reference so we can set the corresponding array-indices
+	 *
+	 * @return null
+	 */
+	public function setDomainSSLFilesArray(array &$domain = null) {
+		// check if the domain itself has a certificate defined
+		$dom_certs = $this->_db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` ='".$domain['id']."'");
+		if (!is_array($dom_certs)
+				|| !isset($dom_certs['ssl_cert_file'])
+				|| $dom_certs['ssl_cert_file'] == ''
+		) {
+			// maybe its parent?
+			if ($domain['parentdomainid'] != 0) {
+				$dom_certs = $this->_db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` ='".$domain['parentdomainid']."'");
+			}
+		}
+
+		// check if it's an array and if the most important field is set
+		if (is_array($dom_certs)
+				&& isset($dom_certs['ssl_cert_file'])
+				&& $dom_certs['ssl_cert_file'] != ''
+		) {
+			// get destination path
+			$sslcertpath = makeCorrectDir($this->_settings['system']['customer_ssl_path']);
+			// create path if it does not exist
+			if (!file_exists($sslcertpath)) {
+				safe_exec('mkdir -p '.escapeshellarg($sslcertpath));
+			}
+			// make correct files for the certificates
+			$ssl_files = array(
+					'ssl_cert_file' => makeCorrectFile($sslcertpath.'/'.$domain['domain'].'.crt'),
+					'ssl_key_file' => makeCorrectFile($sslcertpath.'/'.$domain['domain'].'.key')
+			);
+			// initialize optional files
+			$ssl_files['ssl_ca_file'] = '';
+			$ssl_files['ssl_cert_chainfile'] = '';
+			// set them if they are != empty
+			if ($dom_certs['ssl_ca_file'] != '') {
+				$ssl_files['ssl_ca_file'] = makeCorrectFile($sslcertpath.'/'.$domain['domain'].'_CA.pem');
+			}
+			if ($dom_certs['ssl_cert_chainfile'] != '') {
+				$ssl_files['ssl_cert_chainfile'] = makeCorrectFile($sslcertpath.'/'.$domain['domain'].'_chain.pem');
+			}
+			// create them on the filesystem
+			foreach ($ssl_files as $type => $filename) {
+				if ($filename != '') {
+					touch($filename);
+					$_fh = fopen($filename, 'w');
+					fwrite($_fh, $dom_certs[$type]);
+					fclose($_fh);
+					chmod($filename, 0600);
+				}
+			}
+			// override corresponding array values
+			$domain['ssl_cert_file'] = $ssl_files['ssl_cert_file'];
+			$domain['ssl_key_file'] = $ssl_files['ssl_key_file'];
+			$domain['ssl_ca_file'] = $ssl_files['ssl_ca_file'];
+			$domain['ssl_cert_chainfile'] = $ssl_files['ssl_cert_chainfile'];
+		}
+
+		return;
+	}
+}

lib/configfiles/freebsd.inc.php

@@ -39,6 +39,40 @@ return Array(
 			'http' => Array(
 				'label' => $lng['admin']['configfiles']['http'],
 				'daemons' => Array(
+
+					// Begin: Nginx Config
+					'nginx' => array(
+					'label' => 'Nginx Webserver',
+					'commands_1' => array(
+							'cd /usr/ports/www/nginx',
+							'make config',
+							'set [x] IPv6 protocol (default)',
+							'set [x] Enable HTTP module (default)',
+							'set [x] Enable http_cache module (default)',
+							'set [x] Enable http_gzip_static module',
+							'set [x] Enable http_rewrite module (default)',
+							'set [x] Enable http_ssl module (default)',
+							'set [x] Enable http_stub_status module (default)',
+							'make install clean; rehash',
+						),
+						'commands_2' => array(
+							$configcommand['vhost'],
+							$configcommand['diroptions'],
+							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p '. $settings['system']['deactivateddocroot'] : null,
+							'mkdir -p '. $settings['system']['documentroot_prefix'],
+							'mkdir -p '. $settings['system']['mod_fcgid_tmpdir'],
+							'mkdir -p '. $settings['system']['logfiles_directory'],
+							'echo "nginx_enable=\"YES\"" >> /etc/rc.conf'
+						),
+						'files' => array(
+							'usr_local_etc_nginx_nginx.conf' => '/usr/local/etc/nginx/nginx.conf',
+						),
+						'restart' => array(
+							'/usr/local/etc/rc.d/nginx restart'
+						)
+					),
+					// End: Nginx Config
+
 					'apache2' => Array(
 						'label' => 'Apache2 Webserver',
 						'commands' => Array(
@@ -69,6 +103,42 @@ return Array(
 			'dns' => Array(
 				'label' => $lng['admin']['configfiles']['dns'],
 				'daemons' => Array(
+
+					// Begin: Bind 9.x Config
+					'bind9' => array(
+					'label' => 'Bind9 Nameserver',
+					'commands_1' => array(
+							'cd /usr/ports/dns/bind99',
+							'make config',
+							'set [x] International Domain Names',
+							'set [x] IPv6 protocol (default)',
+							'set [x] 64-bit file support',
+							'set [x] Replace base BIND with this version',
+							'set [x] Enable RPZ NSDNAME policy records',
+							'set [x] Enable RPZ NSIP trigger rules',
+							'set [x] dig/host/nslookup will do DNSSEC validation',
+							'set [x] Build with OpenSSL (Required for DNSSEC) (default)',
+							'set [x] Threading support (default)',
+							'make install clean; rehash',
+						),
+						'commands_2' => array(
+							'echo "named_enable=\"YES\"" >> /etc/rc.conf',
+							PHP_EOL,
+							(strpos($settings['system']['bindconf_directory'], '/etc/namedb') === false) ? '(TIP: Be sure the path below is "/etc/namedb", if not you have configured the bind-directory in a false way in PANEL->SETTINGS->NAMESERVER SETTINGS!)' : null,
+							'echo "include \"'. $settings['system']['bindconf_directory'] .'froxlor_bind.conf\";" >> '. $settings['system']['bindconf_directory'] .'named.conf',
+							'echo "include \"'. $settings['system']['bindconf_directory'] .'default-zone\";" >> '. $settings['system']['bindconf_directory'] .'named.conf',
+						),
+						'files' => array(
+							'etc_namedb_named.conf' => $settings['system']['bindconf_directory'] .'named.conf',
+							'etc_namedb_master_default.zone' => $settings['system']['bindconf_directory'] .'master/default.zone',
+							'etc_namedb_default-zone' => $settings['system']['bindconf_directory'] .'default-zone',
+						),
+						'restart' => array(
+							'/etc/rc.d/named restart'
+						)
+					),
+					// End: Bind 9.x Config
+
 					'powerdns' => Array(
 						'label' => 'PowerDNS',
 						'commands_1' => Array(
@@ -128,6 +198,9 @@ return Array(
 							'usr_local_etc_postfix_mysql-virtual_sender_permissions.cf' => '/usr/local/etc/postfix/mysql-virtual_sender_permissions.cf'
 						),
 						'restart' => Array(
+							'newaliases',
+							'mkdir /var/spool/postfix/etc',
+							'cp /etc/resolv.conf /var/spool/postfix/etc',
 							'sh /usr/local/etc/rc.d/postfix restart'
 						)
 					),
@@ -203,7 +276,39 @@ return Array(
 						'restart' => Array(
 							'sh /usr/local/etc/rc.d/dovecot restart'
 						)
+					),
+
+					// Begin: Dovecot 2.x Config
+					'dovecot2' => array(
+						'label' => 'Dovecot 2.x',
+						'commands_1' => array(
+							'cd /usr/ports/mail/dovecot2',
+							'make config',
+							'set [x] kqueue(2) support (default)',
+							'set [x] MySQL database',
+							'set [x] SSL protocol (default)',
+							'make install clean; rehash',
+						),
+						'commands_2' => array(
+							'echo "dovecot_enable=\"YES\"" >> /etc/rc.conf',
+							PHP_EOL,
+							'pw adduser '. $vmail_username .' -g '. $vmail_groupname .' -u '. $settings['system']['vmail_gid'] .' -d /nonexistent -s /usr/sbin/nologin -c "User for virtual mailtransport used by Postfix and Dovecot"',
+							PHP_EOL,
+							'chmod 0640 /usr/local/etc/dovecot-sql.conf'
+						),
+						'files' => array(
+							'usr_local_etc_dovecot_dovecot.conf' => '/usr/local/etc/dovecot/dovecot.conf',
+							'usr_local_etc_dovecot_dovecot-sql.conf' => '/usr/local/etc/dovecot/dovecot-sql.conf'
+						),
+						'commands_3' => array(
+							'echo "dovecot unix - n n - - pipe'. PHP_EOL .'flags=DRhu user='. $vmail_username .':'. $vmail_groupname .' argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient} -a ${recipient}" >> /usr/local/etc/postfix/master.cf',
+						),
+						'restart' => array(
+							'/usr/local/etc/rc.d/dovecot restart'
+						)
 					)
+					// End: Dovecot 2.x Config
+
 				)
 			),
 			'ftp' => Array(
@@ -257,7 +362,8 @@ return Array(
 							'sed -i.bak \'s/^LogSeparator/# LogSeparator/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
 							'sed -i.bak \'s/^SiteDomain/# SiteDomain/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
 							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirIcons=\"\/awstatsicons\"/DirIcons=\"\/awstats-icon\"/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'sed -i.bak \'s/^DirIcons=\"\/awstatsicons\"/DirIcons=\"\/awstats-icon\"/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself'
 						)
 					),
 					'libnss' => Array(

lib/configfiles/gentoo.inc.php

@@ -185,7 +185,7 @@ return Array(
 							'echo "mail-mta/postfix dovecot-sasl -sasl" >> /etc/portage/package.use',
               				'emerge -av postfix',
 							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R '.$vmail_user['name'].':'.$vmail_group['name'].' ' . $settings['system']['vmail_homedir'],
+							'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . $settings['system']['vmail_homedir'],
 							'chmod 0750 ' . $settings['system']['vmail_homedir'],
 							'mv /etc/postfix/main.cf /etc/postfix/main.cf.gentoo',
 							'touch /etc/postfix/{main,master}.cf',
@@ -301,29 +301,7 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
 						)
 					),
 					'dovecot' => Array(
-						'label' => 'Dovecot 1',
-						'commands_1' => Array(
-							'echo "net-mail/dovecot mysql" >> /etc/portage/package.use',
-							'emerge -av dovecot',
-							'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo',
-							'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo',
-							'touch /etc/dovecot/dovecot.conf',
-							'touch /etc/dovecot/dovecot-sql.conf',
-						),
-						'files' => Array(
-							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-							'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
-						),
-						'commands_2' => Array(
-							'chmod 0640 /etc/dovecot/dovecot-sql.conf',
-							'rc-update add dovecot default'
-						),
-						'restart' => Array(
-							'/etc/init.d/dovecot restart'
-						)
-					),
-					'dovecot2' => Array(
-						'label' => 'Dovecot 2',
+						'label' => 'Dovecot',
 						'commands_1' => Array(
 							'echo "net-mail/dovecot mysql" >> /etc/portage/package.use',
 							'emerge -av dovecot',
@@ -352,13 +330,14 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
 					'proftpd' => Array(
 						'label' => 'ProFTPd',
 						'commands_1' => Array(
-							'emerge -av proftpd'
+							'echo "net-ftp/proftpd mysql" >> /etc/portage/package.use',
+							'emerge -av proftpd',
+							'touch /etc/proftpd/proftpd.conf'
 						),
 						'files' => Array(
 							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
 						),
 						'commands_2' => Array(
-							'touch /etc/proftpd/proftpd.conf',
 							'chown root:0 /etc/proftpd/proftpd.conf',
 							'chmod 0600 /etc/proftpd/proftpd.conf',
 							'rc-update add proftpd default'
@@ -414,8 +393,10 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
 						'label' => 'Awstats',
 						'commands' => Array(
 							'emerge awstats',
-							'awstats_configure.pl',
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
+							'rm /etc/cron.d/awstats'
 						),
 					),
 					'libnss' => Array(

lib/configfiles/lucid.inc.php

@@ -376,7 +376,9 @@ return Array(
 							'apt-get install awstats',
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl '.makeCorrectDir($settings['system']['awstats_path']),
 							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
+							'rm /etc/cron.d/awstats'
 						),
 					),
 					'libnss' => Array(

lib/configfiles/precise.inc.php

@@ -378,7 +378,9 @@ return Array(
 							'apt-get install awstats',
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl '.makeCorrectDir($settings['system']['awstats_path']),
 							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
+							'rm /etc/cron.d/awstats'
 						),
 					),
 					'libnss' => Array(

lib/configfiles/sle10.inc.php

@@ -175,9 +175,9 @@ return Array(
 					'awstats' => Array(
 						'label' => 'Awstats',
 						'commands' => Array(
-							'awstats_configure.pl',
-							makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself'
 						)
 					)
 				)

lib/configfiles/squeeze.inc.php

@@ -375,7 +375,9 @@ return Array(
 							'apt-get install awstats',
 							'cp /usr/share/awstats/tools/awstats_buildstaticpages.pl '.makeCorrectDir($settings['system']['awstats_path']),
 							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
+							'rm /etc/cron.d/awstats'
 						),
 					),
 					'libnss' => Array(

lib/configfiles/suse11.inc.php

@@ -255,14 +255,8 @@ return Array(
 						'label' => 'Awstats',
 						'commands' => Array(
 							'cp /usr/share/doc/packages/awstats/awstats.model.conf /etc/awstats/',
-							/**makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),*/
 							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-			                                'cp awstats.model.conf awstats.yourdomain.xx.conf #e.g one.example.com or example.com',
-                                                        'edit awstats.yourdomain.xx.conf',
-                                                        'change SiteDomain="yourdomain.xx #e.g SiteDomain="example.com" ',
-                                                        'change HostAliases="yourdomain.xx www.yourdomain.de 127.0.0.1 localhost" ',
-                                                        'Set DirIcons="/awstatsicons" ',
-                                                        'run awstats in your favorite browser by http://yourdomain.xx/cgi-bin/awstats.pl'
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself'
 						)
 					)
 				)

lib/configfiles/wheezy.inc.php

@@ -2,7 +2,6 @@
 
 /**
  * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
  * Copyright (c) 2010 the Froxlor Team (see authors).
  *
  * For the full copyright and license information, please view the COPYING
@@ -10,7 +9,6 @@
  * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
  *
  * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Configfiles
@@ -35,8 +33,8 @@ if ($vmail_group === false) {
 }
 
 return Array(
-	'ubuntu_hardy' => Array(
-		'label' => 'Ubuntu 8.04 (Hardy)',
+	'debian_wheezy' => Array(
+		'label' => 'Debian 7.0 (Wheezy)',
 		'services' => Array(
 			'http' => Array(
 				'label' => $lng['admin']['configfiles']['http'],
@@ -59,7 +57,7 @@ return Array(
 							null,
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
-						)
+						),
 					),
 					'lighttpd' => Array(
 						'label' => 'Lighttpd Webserver',
@@ -117,7 +115,8 @@ return Array(
 					'bind' => Array(
 						'label' => 'Bind9',
 						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'apt-get install bind9',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf.local',
 							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
 							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
 							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
@@ -130,7 +129,7 @@ return Array(
 						'label' => 'PowerDNS',
 						'files' => Array(
 							'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf',
-							'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf',
+							'etc_powerdns_bindbackend.conf' => '/etc/powerdns/bindbackend.conf',
 						),
 						'restart' => Array(
 							'/etc/init.d/pdns restart'
@@ -144,7 +143,7 @@ return Array(
 					'postfix_courier' => Array(
 						'label' => 'Postfix/Courier',
 						'commands' => Array(
-							($vmail_group === false) ? 'groupadd -g ' . $settings['system']['vmail_gid'] . ' ' . $vmail_groupname : '',
+							($vmail_group === false) ? 'groupadd -g ' . $settings['system']['vmail_gid'] . ' '.$vmail_groupname : '',
 							($vmail_user === false) ? 'useradd -u ' . $settings['system']['vmail_uid'] . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '',
 							'mkdir -p ' . $settings['system']['vmail_homedir'],
 							'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . $settings['system']['vmail_homedir'],
@@ -175,7 +174,8 @@ return Array(
 							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
 							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf',
-							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
+							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf',
+							'etc_aliases' => '/etc/aliases'
 						),
 						'restart' => Array(
 							'newaliases',
@@ -185,20 +185,20 @@ return Array(
 					'dkim' => Array(
 						'label' => 'DomainKey filter',
 						'commands_1' => Array(
-							'apt-get install dkim-filter',
+							'apt-get install opendkim',
 							'mkdir -p /etc/postfix/dkim'
 						),
 						'files' => Array(
-							'dkim-filter.conf' => '/etc/dkim-filter.conf'
+							'opendkim.conf' => '/etc/opendkim.conf'
 						),
 						'commands_2' => Array(
 							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
-							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
+							'echo "milter_protocol = 6" >> /etc/postfix/main.cf',
 							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
 							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
 						),
 						'restart' => Array(
-							'/etc/init.d/dkim-filter restart',
+							'/etc/init.d/opendkim restart',
 							'/etc/init.d/postfix restart'
 						)
 					),
@@ -208,7 +208,7 @@ return Array(
 							($vmail_group === false) ? 'groupadd -g ' . $settings['system']['vmail_gid'] . ' ' . $vmail_groupname : '',
 							($vmail_user === false) ? 'useradd -u ' . $settings['system']['vmail_uid'] . ' -g ' . $vmail_groupname . ' ' . $vmail_username : '',
 							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R '.$vmail_username.':'.$vmail_groupname.' ' . $settings['system']['vmail_homedir'],
+							'chown -R ' . $vmail_username . ':' . $vmail_groupname . ' ' . $settings['system']['vmail_homedir'],
 							'apt-get install postfix postfix-mysql',
 							'mkdir -p /var/spool/postfix/etc/pam.d',
 							'mkdir -p /var/spool/postfix/var/run/mysqld',
@@ -235,11 +235,12 @@ return Array(
 							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
 							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
 							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf'
+							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf',
+							'etc_aliases' => '/etc/aliases'
 						),
 						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
+							'newaliases',
+							'/etc/init.d/postfix restart'
 						)
 					),
 					'postfix_mxaccess' => Array(
@@ -262,7 +263,7 @@ return Array(
 							'# choose "no configuration at this time" and "splitted configuration files" in the dialog'
 						),
 						'files' => Array(
-							'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul',
+							'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt',
 							'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config',
 							'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options',
 							'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config',
@@ -283,6 +284,9 @@ return Array(
 				'daemons' => Array(
 					'courier' => Array(
 						'label' => 'Courier',
+						'commands' => Array(
+							'apt-get install courier-pop courier-imap courier-authlib-mysql'
+						),
 						'files' => Array(
 							'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc',
 							'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc'
@@ -295,14 +299,17 @@ return Array(
 					'dovecot' => Array(
 						'label' => 'Dovecot',
 						'commands_1' => Array(
-							'apt-get install dovecot-imapd dovecot-pop3d dovecot-postfix',
+							'apt-get install dovecot-imapd dovecot-pop3d dovecot-mysql'
 						),
 						'files' => Array(
+							'etc_dovecot_conf.d_10-auth.conf' => '/etc/dovecot/conf.d/10-auth.conf',
+							'etc_dovecot_conf.d_10-mail.conf' => '/etc/dovecot/conf.d/10-mail.conf',
+							'etc_dovecot_conf.d_10-master.conf' => '/etc/dovecot/conf.d/10-master.conf',
+							'etc_dovecot_conf.d_15-lda.conf' => '/etc/dovecot/conf.d/15-lda.conf',
+							'etc_dovecot_conf.d_20-imap.conf' => '/etc/dovecot/conf.d/20-imap.conf',
+							'etc_dovecot_conf.d_20-pop3.conf' => '/etc/dovecot/conf.d/20-pop3.conf',
 							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-							'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
-						),
-						'commands_2' => Array(
-							'chmod 0640 /etc/dovecot/dovecot-sql.conf'
+							'etc_dovecot_dovecot-sql.conf.ext' => '/etc/dovecot/dovecot-sql.conf.ext'
 						),
 						'restart' => Array(
 							'/etc/init.d/dovecot restart'
@@ -319,6 +326,7 @@ return Array(
 							'apt-get install proftpd-basic proftpd-mod-mysql'
 						),
 						'files' => Array(
+							'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf',
 							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
 							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
 						),
@@ -368,30 +376,62 @@ return Array(
 						'label' => 'Awstats',
 						'commands' => Array(
 							'apt-get install awstats',
-							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl '.makeCorrectDir($settings['system']['awstats_path']),
+							'cp /usr/share/awstats/tools/awstats_buildstaticpages.pl '.makeCorrectDir($settings['system']['awstats_path']),
 							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
+							'rm /etc/cron.d/awstats'
 						),
 					),
 					'libnss' => Array(
 						'label' => 'libnss (system login with mysql)',
 						'commands' => Array(
-							'apt-get install libnss-mysql nscd',
-							'chmod 600 /etc/nss-mysql.conf /etc/nss-mysql-root.conf'
+							'apt-get install libnss-mysql-bg nscd',
+							'chmod 600 /etc/libnss-mysql.cfg /etc/libnss-mysql-root.cfg'
 						),
 						'files' => Array(
-							'etc_nss-mysql.conf' => '/etc/nss-mysql.conf',
-							'etc_nss-mysql-root.conf' => '/etc/nss-mysql-root.conf',
+							'etc_libnss-mysql.cfg' => '/etc/libnss-mysql.cfg',
+							'etc_libnss-mysql-root.cfg' => '/etc/libnss-mysql-root.cfg',
 							'etc_nsswitch.conf' => '/etc/nsswitch.conf',
 						),
 						'restart' => Array(
 							'/etc/init.d/nscd restart'
 						)
+					),
+					'fcgid' => array(
+						'label' => 'FCGID',
+						'commands' => array(
+							'apt-get install apache2-suexec libapache2-mod-fcgid php5-cgi',
+							'a2enmod suexec fcgid',
+							($settings['system']['mod_fcgid_ownvhost'] == '1') ? 'groupadd -f '.$settings['system']['mod_fcgid_httpgroup'] : null,
+							($settings['system']['mod_fcgid_ownvhost'] == '1') ? 'useradd -s /bin/false -g '.$settings['system']['mod_fcgid_httpgroup'].' '.$settings['system']['mod_fcgid_httpuser'] : null,
+							($settings['system']['mod_fcgid_ownvhost'] == '1') ? 'chown -R '.$settings['system']['mod_fcgid_httpuser'].':'.$settings['system']['mod_fcgid_httpgroup'].' '.$pathtophpfiles : null,
+							($settings['system']['mod_fcgid_ownvhost'] == '1') ? 'mkdir -p '.makeCorrectDir($settings['system']['mod_fcgid_configdir']) : null,
+							($settings['system']['mod_fcgid_ownvhost'] == '1') ? 'mkdir -p '.makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : null,
+							($settings['system']['mod_fcgid_ownvhost'] == '1') ? 'a2dismod php5' : null
+						),
+						'restart' => Array(
+							'/etc/init.d/apache2 restart'
+						)
+					),
+					'php-fpm' => array(
+						'label' => 'PHP-FPM',
+						'commands' => array(
+							'# add "non-free" after all occurances of "main" in /etc/apt/sources.list',
+							'# this is needed for libapache2-mod-fastcgi to install',
+							'apt-get install apache2-suexec libapache2-mod-fastcgi php5-fpm',
+							'# change fpm-configuration directory to "/etc/php5/fpm/pool.d/" in froxlor',
+							'sed -i.bak \'s/^;include=\/etc\/php5\/fpm/*.conf/include=include=\/etc\/php5\/fpm\/pool.d\/*.conf/\' /etc/php5/fpm/php-fpm.conf',
+							'rm /etc/php5/fpm/pool.d/www.conf',
+							'a2enmod suexec fastcgi actions',
+							($settings['phpfpm']['enabled_ownvhost'] == '1') ? 'groupadd -f '.$settings['phpfpm']['vhost_httpgroup'] : null,
+							($settings['phpfpm']['enabled_ownvhost'] == '1') ? 'useradd -s /bin/false -g '.$settings['phpfpm']['vhost_httpgroup'].' '.$settings['phpfpm']['vhost_httpuser'] : null,
+							($settings['phpfpm']['enabled_ownvhost'] == '1') ? 'chown -R '.$settings['phpfpm']['vhost_httpuser'].':'.$settings['phpfpm']['vhost_httpgroup'].' '.$pathtophpfiles : null,
+							($settings['phpfpm']['enabled_ownvhost'] == '1') ? 'a2dismod php5' : null
+						)
 					)
 				)
 			)
 		)
 	)
 );
-
-?>

lib/configfiles_index.inc.php

@@ -45,5 +45,5 @@ else
 
 $cfgPath = 'lib/configfiles/';
 $configfiles = Array();
-$configfiles = array_merge(include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'precise.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php');
+$configfiles = array_merge(include $cfgPath . 'wheezy.inc.php', include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'precise.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse11.inc.php', include $cfgPath . 'sle10.inc.php', include $cfgPath . 'freebsd.inc.php');
 

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

@@ -251,9 +251,10 @@ return array(
 					),
 					'backup_allowed' => array(
 						'label' => $lng['backup_allowed'].'?',
-						'type' => 'yesno',
-						'value' => 0,
-						'yesno_var' => $backup_allowed,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
 						'visible' => ($settings['system']['backup_enabled'] == '1' ? true : false)
 					),
 					'number_of_aps_packages' => array(

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

@@ -260,9 +260,11 @@ return array(
 					),
 					'backup_allowed' => array(
 						'label' => $lng['backup_allowed'].'?',
-						'type' => 'yesno',
-						'value' => 0,
-						'yesno_var' => $backup_allowed,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array($result['backup_allowed']),
 						'visible' => ($settings['system']['backup_enabled'] == '1' ? true : false)
 					),
 					'number_of_aps_packages' => array(

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

@@ -54,7 +54,8 @@ return array(
 						'select_var' => $subtodomains
 					),
 					'caneditdomain' => array(
-						'label' => $lng['admin']['domain_edit'],
+						'label' => $lng['admin']['domain_editable']['title'],
+						'desc' => $lng['admin']['domain_editable']['desc'],
 						'type' => 'checkbox',
 						'values' => array(
 										array ('label' => $lng['panel']['yes'], 'value' => '1')
@@ -130,7 +131,8 @@ return array(
 						'value' => array('1')
 					),
 					'speciallogfile' => array(
-						'label' => 'Speciallogfile',
+						'label' => $lng['admin']['speciallogfile']['title'],
+						'desc' => $lng['admin']['speciallogfile']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 										array ('label' => $lng['panel']['yes'], 'value' => '1')
@@ -161,16 +163,8 @@ return array(
 									),
 						'value' => array('1')
 					),
-					'safemode' => array(
-						'label' => 'Safemode',
-						'type' => 'checkbox',
-						'values' => array(
-										array ('label' => $lng['panel']['yes'], 'value' => '1')
-									),
-						'value' => array('1')
-					),
 					'phpsettingid' => array(
-						'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false),
+						'visible' => (((int)$settings['system']['mod_fcgid'] == 1 || (int)$settings['phpfpm']['enabled'] == 1) ? true : false),
 						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'select',
 						'select_var' => $phpconfigs

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

@@ -63,7 +63,8 @@ return array(
 						'value' => $subdomains.' '.$lng['customer']['subdomains'].', '.$alias_check.' '.$lng['domains']['aliasdomains'].', '.$emails.' '.$lng['customer']['emails'].', '.$email_accounts.' '.$lng['customer']['accounts'].', '.$email_forwarders.' '.$lng['customer']['forwarders']
 					),
 					'caneditdomain' => array(
-						'label' => $lng['admin']['domain_edit'],
+						'label' => $lng['admin']['domain_editable']['title'],
+						'desc' => $lng['admin']['domain_editable']['desc'],
 						'type' => 'checkbox',
 						'values' => array(
 										array ('label' => $lng['panel']['yes'], 'value' => '1')
@@ -141,7 +142,8 @@ return array(
 						'value' => array($result['wwwserveralias'])
 					),
 					'speciallogfile' => array(
-						'label' => 'Speciallogfile',
+						'label' => $lng['admin']['speciallogfile']['title'],
+						'desc' => $lng['admin']['speciallogfile']['description'],
 						'type' => 'checkbox',
 						'values' => array(
 										array ('label' => $lng['panel']['yes'], 'value' => '1')
@@ -183,16 +185,8 @@ return array(
 									),
 						'value' => array($result['openbasedir'])
 					),
-					'safemode' => array(
-						'label' => 'Safemode',
-						'type' => 'checkbox',
-						'values' => array(
-										array ('label' => $lng['panel']['yes'], 'value' => '1')
-									),
-						'value' => array($result['safemode'])
-					),
 					'phpsettingid' => array(
-						'visible' => ((int)$settings['system']['mod_fcgid'] == 1 ? true : false),
+						'visible' => (((int)$settings['system']['mod_fcgid'] == 1 || (int)$settings['phpfpm']['enabled'] == 1) ? true : false),
 						'label' => $lng['admin']['phpsettings']['title'],
 						'type' => 'select',
 						'select_var' => $phpconfigs

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

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ *
+ */
+
+return array(
+	'domain_ssleditor' => array(
+		'title' => $lng['panel']['ssleditor'],
+		'image' => 'icons/ssl.png',
+		'sections' => array(
+			'section_a' => array(
+				'title' => 'SSL certificates',
+				'image' => 'icons/ssl.png',
+				'fields' => array(
+					'ssl_cert_file' => array(
+						'style' => 'vertical-align:top;',
+						'label' => $lng['admin']['ipsandports']['ssl_cert_file_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
+						'type' => 'textarea',
+						'cols' => 60,
+						'rows' => 12,
+						'value' => $result['ssl_cert_file']
+					),
+					'ssl_key_file' => array(
+						'style' => 'vertical-align:top;',
+						'label' => $lng['admin']['ipsandports']['ssl_key_file_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
+						'type' => 'textarea',
+						'cols' => 60,
+						'rows' => 12,
+						'value' => $result['ssl_key_file']
+					),
+					'ssl_ca_file' => array(
+						'style' => 'vertical-align:top;',
+						'label' => $lng['admin']['ipsandports']['ssl_ca_file_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
+						'type' => 'textarea',
+						'cols' => 60,
+						'rows' => 12,
+						'value' => $result['ssl_ca_file']
+					),
+					'ssl_cert_chainfile' => array(
+						'style' => 'vertical-align:top;',
+						'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile_content'],
+						'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
+						'type' => 'textarea',
+						'cols' => 60,
+						'rows' => 12,
+						'value' => $result['ssl_cert_chainfile']
+					)
+				)
+			)
+		)
+	)
+);

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

@@ -43,7 +43,7 @@ return array(
 					),
 					'path' => array(
 						'label' => $lng['panel']['path'],
-						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
+						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? $pathSelect['note'].'<br />'.$pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
@@ -61,13 +61,13 @@ return array(
 						'select_var' => isset($redirectcode) ? $redirectcode : null
 					),
 					'ssl_redirect' => array(
-						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
+						'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
 						'label' => 'SSL Redirect',
 						'type' => 'checkbox',
 						'values' => array(
 										array ('label' => $lng['panel']['yes'], 'value' => '1')
 									),
-						'value' => array($result['ssl_redirect'])
+						'value' => array()
 					),
 					'openbasedir_path' => array(
 						'label' => $lng['domain']['openbasedirpath'],

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

@@ -42,7 +42,7 @@ return array(
 					),
 					'path' => array(
 						'label' => $lng['panel']['path'],
-						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescription'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
+						'desc' => ($settings['panel']['pathedit'] != 'Dropdown' ? $lng['panel']['pathDescriptionSubdomain'] : null).(isset($pathSelect['note']) ? '<br />'.$pathSelect['value'] : ''),
 						'type' => $pathSelect['type'],
 						'select_var' => $pathSelect['value'],
 						'value' => $pathSelect['value']
@@ -79,7 +79,7 @@ return array(
 						'value' => array($result['isemaildomain'])
 					),
 					'ssl_redirect' => array(
-						'visible' => ($settings['system']['use_ssl'] == '1' ? true : false),
+						'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
 						'label' => 'SSL Redirect',
 						'type' => 'checkbox',
 						'values' => array(
@@ -88,6 +88,7 @@ return array(
 						'value' => array($result['ssl_redirect'])
 					),
 					'openbasedir_path' => array(
+						'visible' => ($result['openbasedir'] == '1') ? true : false,
 						'label' => $lng['domain']['openbasedirpath'],
 						'type' => 'select',
 						'select_var' => $openbasedir

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

@@ -25,7 +25,7 @@ return array(
 				'fields' => array(
 					'path' => array(
 						'label' => $lng['extras']['backup_create'],
-						'desc' => $lng['extras']['backup_info'].'<br />'.($settings['system']['backup_bigfile'] == 1 ? $lng['extras']['backup_info_big'] : $lng['extras']['backup_info_sep']).'<br />'.($settings['system']['backup_count'] == 1 ? $lng['extras']['backup_count_info'] : ''),
+						'desc' => sprintf($lng['extras']['backup_info'], $userinfo['loginname']).'<br />'.($settings['system']['backup_bigfile'] == 1 ? $lng['extras']['backup_info_big'] : $lng['extras']['backup_info_sep']).'<br />'.($settings['system']['backup_count'] == 1 ? $lng['extras']['backup_count_info'] : ''),
 						'type' => 'yesno',
 						'yesno_var' => $backup_enabled
 					)

lib/functions/filedir/function.makeCorrectDir.php

@@ -25,18 +25,16 @@
  * @author Florian Lippert <flo@syscp.org>
  */
 
-function makeCorrectDir($dir)
-{
-	if(substr($dir, -1, 1) != '/')
-	{
+function makeCorrectDir($dir) {
+
+	$dir = trim($dir);
+
+	if (substr($dir, -1, 1) != '/') {
 		$dir.= '/';
 	}
-
-	if(substr($dir, 0, 1) != '/')
-	{
+	if (substr($dir, 0, 1) != '/') {
 		$dir = '/' . $dir;
 	}
-
 	$dir = makeSecurePath($dir);
 	return $dir;
 }

lib/functions/filedir/function.makeCorrectFile.php

@@ -35,7 +35,10 @@ function makeCorrectFile($filename)
 		$error = 'Given filename for function '.__FUNCTION__.' is empty.'."\n";
 		$error.= 'This is very dangerous and should not happen.'."\n";
 		$error.= 'Please inform the Froxlor team about this issue so they can fix it.';
-		die($error);
+		echo $error;
+		// so we can see WHERE this happened
+		debug_print_backtrace();
+		die();
 	}
 
 	if(substr($filename, 0, 1) != '/')

lib/functions/filedir/function.makeSecurePath.php

@@ -24,9 +24,8 @@
  * @return string The corrected path
  * @author Florian Lippert <flo@syscp.org>
  */
+function makeSecurePath($path) {
 
-function makeSecurePath($path)
-{
 	$search = Array(
 		'#/+#',
 		'#\.+#',
@@ -38,6 +37,9 @@ function makeSecurePath($path)
 		''
 	);
 	$path = preg_replace($search, $replace, $path);
+	// don't just replace a space with an escaped space
+	// it might be escaped already
+	$path = str_replace("\ ", " ", $path);
 	$path = str_replace(" ", "\ ", $path);
 	return $path;
 }

lib/functions/formfields/string/function.validateFormFieldString.php

@@ -48,68 +48,75 @@ function validateFormFieldString($fieldname, $fielddata, $newfieldvalue)
  		 */
 		$newfieldvalue = str_replace("\t", " ", $newfieldvalue);
 
-		if(isset($fielddata['string_type']) && $fielddata['string_type'] == 'mail')
-		{
+		if (isset($fielddata['string_type']) && $fielddata['string_type'] == 'mail') {
 			$returnvalue = (filter_var($newfieldvalue, FILTER_VALIDATE_EMAIL) == $newfieldvalue);
 		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'url')
-		{
+		elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'url') {
 			$returnvalue = validateUrl($newfieldvalue);
 		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'dir')
-		{
-			// add trailing slash to validate path if needed
-			// refs #331
-			if(substr($newfieldvalue, -1) != '/') {
-				$newfieldvalue.= '/';
+		elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'dir') {
+			// check for empty value (it might be allowed)
+			if (trim($newfieldvalue) == '') {
+				$newfieldvalue = '';
+				$returnvalue = 'stringmustntbeempty';
+			} else {
+				// add trailing slash to validate path if needed
+				// refs #331
+				if (substr($newfieldvalue, -1) != '/') {
+					$newfieldvalue.= '/';
+				}
+				$returnvalue = ($newfieldvalue == makeCorrectDir($newfieldvalue));
 			}
-			$returnvalue = ($newfieldvalue == makeCorrectDir($newfieldvalue));
 		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'file')
-		{
-			$returnvalue = ($newfieldvalue == makeCorrectFile($newfieldvalue));
+		elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'file') {
+			// check for empty value (it might be allowed)
+			if (trim($newfieldvalue) == '') {
+				$newfieldvalue = '';
+				$returnvalue = 'stringmustntbeempty';
+			} else {
+				$returnvalue = ($newfieldvalue == makeCorrectFile($newfieldvalue));
+			}
 		}
-		elseif(isset($fielddata['string_type']) && $fielddata['string_type'] == 'filedir')
-		{
-			$returnvalue = (($newfieldvalue == makeCorrectDir($newfieldvalue)) || ($newfieldvalue == makeCorrectFile($newfieldvalue)));
+		elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'filedir') {
+			// check for empty value (it might be allowed)
+			if (trim($newfieldvalue) == '') {
+				$newfieldvalue = '';
+				$returnvalue = 'stringmustntbeempty';
+			} else {
+				$returnvalue = (($newfieldvalue == makeCorrectDir($newfieldvalue)) || ($newfieldvalue == makeCorrectFile($newfieldvalue)));
+			}
 		}
-		elseif(preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue))
-		{
+		elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'validate_ip') {
+			$newfieldvalue = validate_ip($newfieldvalue, true);
+			if ($newfieldvalue === false) {
+				$newfieldvalue = '';
+			}
+			$returnvalue = false;
+		}
+		elseif (preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue)) {
 			$returnvalue = true;
 		}
 
-		if(isset($fielddata['string_regexp']) && $fielddata['string_regexp'] != '')
-		{
-			if(preg_match($fielddata['string_regexp'], $newfieldvalue))
-			{
+		if (isset($fielddata['string_regexp']) && $fielddata['string_regexp'] != '') {
+			if (preg_match($fielddata['string_regexp'], $newfieldvalue)) {
 				$returnvalue = true;
-			}
-			else
-			{
+			} else {
 				$returnvalue = false;
 			}
 		}
 
-		if(isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === true && $newfieldvalue === '')
-		{
+		if (isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === true && $newfieldvalue === '') {
 			$returnvalue = true;
-		}
-		elseif(isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === false && $newfieldvalue === '')
-		{
+		} elseif (isset($fielddata['string_emptyallowed']) && $fielddata['string_emptyallowed'] === false && $newfieldvalue === '') {
 			$returnvalue = 'stringmustntbeempty';
 		}
 	}
 	
-	if($returnvalue === true)
-	{
+	if ($returnvalue === true) {
 		return true;
-	}
-	elseif($returnvalue === false)
-	{
+	} elseif ($returnvalue === false) {
 		return 'stringformaterror';
-	}
-	else
-	{
+	} else {
 		return $returnvalue;
 	}
 }

lib/functions/froxlor/function.createAWStatsConf.php

@@ -37,16 +37,14 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot
 	$header2 = "## Do not remove the line above! This tells Froxlor to update this configuration\n## If you wish to manually change this configuration file, remove the first line to make sure Froxlor won't rebuild this file\n## Generated for domain {SITE_DOMAIN} on " . date('l dS \of F Y h:i:s A') . "\n";
 
 	$awstats_dir = makeCorrectDir($customerDocroot.'/awstats/'.$siteDomain.'/');
-	if(!is_dir($awstats_dir))
-	{
+	if (!is_dir($awstats_dir)) {
 		safe_exec('mkdir -p '.escapeshellarg($awstats_dir));
 	}
 	// chown created folder, #258
 	makeChownWithNewStats($awstats_params);
 	
 	// weird but could happen...
-	if(!is_dir($settings['system']['awstats_conf']))
-	{
+	if (!is_dir($settings['system']['awstats_conf'])) {
 		safe_exec('mkdir -p '.escapeshellarg($settings['system']['awstats_conf']));
 	}
 
@@ -68,36 +66,23 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot
 	);
 
 	// File names
-
 	$domain_file = makeCorrectFile($settings['system']['awstats_conf'].'/awstats.' . $siteDomain . '.conf');
 	$model_file = dirname(dirname(dirname(dirname(__FILE__))));
-	$model_file.= '/templates/misc/awstatsmodel/';
-	
-	if($settings['system']['mod_log_sql'] == '1')
-	{
-		$model_file.= 'awstats.froxlor.model_log_sql.conf';
-	} else {
-		$model_file.= 'awstats.froxlor.model.conf';
-	}
+	$model_file.= '/templates/misc/awstatsmodel/awstats.froxlor.model.conf';
 
 	$model_file = makeCorrectFile($model_file);
 	
 	// Test if the file exists
-
-	if(file_exists($domain_file))
-	{
+	if (file_exists($domain_file)) {
 		// Check for the generated header - if this is a manual modification we won't update
-
 		$awstats_domain_conf = fopen($domain_file, 'r');
 
-		if(fgets($awstats_domain_conf, strlen($header)) != $header)
-		{
+		if (fgets($awstats_domain_conf, strlen($header)) != $header) {
 			fclose($awstats_domain_conf);
 			return;
 		}
 
 		// Close the file
-
 		fclose($awstats_domain_conf);
 	}
 
@@ -105,17 +90,14 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot
 	$awstats_model_conf = fopen($model_file, 'r');
 
 	// Write the header
-
 	fwrite($awstats_domain_conf, $header);
 	fwrite($awstats_domain_conf, preg_replace($regex, $replace, $header2));
 
 	// Write the configuration file
-
-	while(($line = fgets($awstats_model_conf, 4096)) !== false)
-	{
-		if(!preg_match('/^#/', $line)
-		   && trim($line) != '')
-		{
+	while (($line = fgets($awstats_model_conf, 4096)) !== false) {
+		if (!preg_match('/^#/', $line)
+		   && trim($line) != ''
+		) {
 			fwrite($awstats_domain_conf, preg_replace($regex, $replace, $line));
 		}
 	}

lib/functions/froxlor/function.inserttask.php

@@ -37,6 +37,14 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '', $param4 = '
 	   || $type == '5'
 	   || $type == '10')
 	{
+		// 4 = bind -> if bind disabled -> no task
+		if ($type == '4' && $settings['system']['bind_enable'] == '0') {
+			return;
+		}
+		// 10 = quota -> if quota disabled -> no task
+		if ($type == '10' && $settings['system']['diskquota_enabled'] == '0') {
+			return;
+		} 
 		$db->query('DELETE FROM `' . TABLE_PANEL_TASKS . '` WHERE `type`="' . $type . '"');
 		$db->query('INSERT INTO `' . TABLE_PANEL_TASKS . '` (`type`) VALUES ("' . $type . '")');
 	}

lib/functions/froxlor/function.version_compare2.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Kaufmann <d00p@froxlor.org>
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ *
+ */
+
+/**
+ * compare of froxlor versions
+ *
+ * @param string $a
+ * @param string $b
+ *
+ * @return integer 0 if equal, 1 if a>b and -1 if b>a
+ */
+function version_compare2($a, $b) {
+
+	// split version into pieces and remove trailing .0
+	$a = explode(".", rtrim($a, ".0"));
+	$b = explode(".", rtrim($b, ".0"));
+
+	_parseVersionArray($a);
+	_parseVersionArray($b);
+
+	while (count($a) != count($b)) {
+		if (count($a) < count($b)) {
+			$a[] = '0';
+		}
+		elseif (count($b) < count($a)) {
+			$b[] = '0';
+		}
+	}
+
+	foreach ($a as $depth => $aVal) {
+		// iterate over each piece of A
+		if (isset($b[$depth])) {
+			// if B matches A to this depth, compare the values
+			if ($aVal > $b[$depth]) {
+				return 1; // A > B
+			}
+			else if ($aVal < $b[$depth]) {
+				return -1; // B > A
+			}
+			// an equal result is inconclusive at this point
+		} else {
+			// if B does not match A to this depth, then A comes after B in sort order
+			return 1; // so A > B
+		}
+	}
+	// at this point, we know that to the depth that A and B extend to, they are equivalent.
+	// either the loop ended because A is shorter than B, or both are equal.
+	return (count($a) < count($b)) ? -1 : 0;
+}
+
+function _parseVersionArray(&$arr = null) {
+	// -svn or -dev or -rc ?
+	if (stripos($arr[count($arr)-1], '-') !== false) {
+		$x = explode("-", $arr[count($arr)-1]);
+		$arr[count($arr)-1] = $x[0];
+		if (stripos($x[1], 'rc') !== false) {
+			$arr[] = '-1';
+			$arr[] = '2'; // rc > dev > svn
+			// number of rc
+			$arr[] = substr($x[1], 2);
+		}
+		else if (stripos($x[1], 'dev') !== false) {
+			$arr[] = '-1';
+			$arr[] = '1'; // svn < dev < rc
+			// number of dev
+			$arr[] = substr($x[1], 3);
+		}
+		// -svn version are deprecated
+		else if (stripos($x[1], 'svn') !== false) {
+			$arr[] = '-1';
+			$arr[] = '0'; // svn < dev < rc
+			// number of svn
+			$arr[] = substr($x[1], 3);
+		}
+	}
+}

lib/functions/output/function.standard_error.php

@@ -38,7 +38,8 @@ function standard_error($errors = '', $replacer = '')
 			$errors
 		);
 	}
-	
+
+	$link = '';
 	if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], $_SERVER['HTTP_HOST']) !== false) {
 		$link = '<a href="'.$_SERVER['HTTP_REFERER'].'">'.$lng['panel']['back'].'</a>';
 	}

lib/functions/system/function.makeCryptPassword.php

@@ -18,7 +18,6 @@
 /**
  * Make crypted password from clear text password
  * @param string Password to be crypted
- * @param int Type of algorithm
  * @return string encrypted password
  *
  * @author Michal Wojcik <m.wojcik@sonet3.pl>
@@ -30,29 +29,31 @@
  * 4 - SHA-512 $6$
  */
 
-function makeCryptPassword ($password, $type = 0)
-{
-        switch($type)
-        {
-                case 0:
-			$cryptPassword = crypt($password);
-                        break;
-                case 1:
-			$cryptPassword = crypt($password, '$1$' . generatePassword().  generatePassword());
-                        break;
-                case 2:
-			$cryptPassword = crypt($password, '$2a$' . generatePassword().  generatePassword());
-                        break;
-                case 3:
-			$cryptPassword = crypt($password, '$5$' . generatePassword().  generatePassword());
-                        break;
-                case 4:
-			$cryptPassword = crypt($password, '$6$' . generatePassword().  generatePassword());
-                        break;
-                default:
-			$cryptPassword = crypt($password);
-                        break;
-        }
+function makeCryptPassword ($password) {
 
-	return ($cryptPassword);
+	global $settings;
+
+	$type = isset($settings['system']['passwordcryptfunc']) ? (int)$settings['system']['passwordcryptfunc'] : 1;
+
+	switch ($type) {
+		case 0:
+			$cryptPassword = crypt($password);
+			break;
+		case 1:
+			$cryptPassword = crypt($password, '$1$' . generatePassword().  generatePassword());
+			break;
+		case 2:
+			$cryptPassword = crypt($password, '$2a$' . generatePassword().  generatePassword());
+			break;
+		case 3:
+			$cryptPassword = crypt($password, '$5$' . generatePassword().  generatePassword());
+			break;
+		case 4:
+			$cryptPassword = crypt($password, '$6$' . generatePassword().  generatePassword());
+			break;
+		default:
+			$cryptPassword = crypt($password);
+			break;
+	}
+	return $cryptPassword;
 }

lib/functions/validate/function.appendOpenbasedirPath.php

@@ -25,9 +25,23 @@
  * 
  * @return string
  */
-function appendOpenBasedirPath($path = '', $first = false)
-{
+function appendOpenBasedirPath($path = '', $first = false) {
+
 	$path = makeCorrectDir($path);
+
+	// check for php-version that requires the trailing
+	// slash to be removed as it does not allow the usage
+	// of the subfolders within the given folder, fixes #797
+	if ((PHP_MINOR_VERSION == 2 && PHP_VERSION_ID >= 50216)
+		|| PHP_VERSION_ID >= 50304
+	) {
+		// check trailing slash
+		if (substr($path, -1, 1) == '/') {
+			// remove it
+			$path = substr($path, 0, -1);
+		}
+	}
+
 	if($path != ''
 		&& $path != '/'
 		&& !preg_match("#^/dev#i", $path)                                                       
@@ -36,8 +50,9 @@ function appendOpenBasedirPath($path = '', $first = false)
 		&& !preg_match("#^/sys#i", $path)
 		&& !preg_match("#:#", $path)
 	) {
-		if($first)
+		if ($first) {
 			return $path;
+		}
 
 		return ':' . $path;
 	}

lib/functions/validate/function.validateDomain.php

@@ -42,7 +42,7 @@ function validateDomain($domainname)
 	// a dash (-) in it. As the PHP_VERSION constant
 	// gives also patch-brandings, e.g. '5.3.2-pl0-gentoo'
 	// we just always use our regex
-	$pattern = '/^http:\/\/([a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?\.)+[a-z]{2,6}$/i';
+	$pattern = '/^http:\/\/([a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?\.)+[a-z0-9\-]{2,8}$/i';
 	if(preg_match($pattern, $domainname_tmp))
 	{	
 		return $domainname;

lib/functions/validate/function.validateUrl.php

@@ -23,56 +23,52 @@
  * @param string URL to be tested
  * @return bool
  * @author Christian Hoffmann
+ * @author Froxlor team <team@froxlor.org> (2010-)
  *
  */
+function validateUrl($url) {
 
-function validateUrl($url)
-{
 	global $idna_convert, $theme;
 
-	if(strtolower(substr($url, 0, 7)) != "http://"
-	&& strtolower(substr($url, 0, 8)) != "https://")
-	{
+	if (strtolower(substr($url, 0, 7)) != "http://"
+			&& strtolower(substr($url, 0, 8)) != "https://"
+	) {
 		$url = 'http://' . $url;
 	}
-	
+
 	// needs converting
 	$url = $idna_convert->encode($url);
 
 	$pattern = "/^https?:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,4}(\:[0-9]+)?\/?(.+)?$/i";
-	if(preg_match($pattern, $url))
-	{
+	if (preg_match($pattern, $url)) {
 		return true;
 	}
 
 	// not an fqdn
-	if(strtolower(substr($url, 0, 7)) == "http://"
-		|| strtolower(substr($url, 0, 8)) == "https://")
-	{
-		if(strtolower(substr($url, 0, 7)) == "http://")
-		{
+	if (strtolower(substr($url, 0, 7)) == "http://"
+			|| strtolower(substr($url, 0, 8)) == "https://"
+	) {
+		if (strtolower(substr($url, 0, 7)) == "http://") {
 			$ip = strtolower(substr($url, 7));
 		}
 
-		if(strtolower(substr($url, 0, 8)) == "https://")
-		{
+		if (strtolower(substr($url, 0, 8)) == "https://") {
 			$ip = strtolower(substr($url, 8));
 		}
 
 		$ip = substr($ip, 0, strpos($ip, '/'));
-
-		if(validate_ip($ip, true) !== false)
-		{
-			return true;
+		// possible : in IP (when a port is given), #1173
+		// but only if there actually IS ONE
+		if (strpos($ip, ':') !== false) {
+			$ip = substr($ip, 0, strpos($ip, ':'));
 		}
-		else
-		{
+
+		if (validate_ip($ip, true) !== false) {
+			return true;
+		} else {
 			return false;
 		}
-	}
-	else
-	{
+	} else {
 		return false;
 	}
 }
-

lib/functions/validate/function.validate_ip.php

@@ -22,25 +22,19 @@
  *
  * @return mixed 	ip address on success, standard_error on failure
  */
+function validate_ip($ip, $return_bool = false, $lng = 'invalidip') {
 
-function validate_ip($ip, $return_bool = false, $lng = 'invalidip')
-{
-	if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === FALSE
-	   && filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === FALSE
-	   && filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) === FALSE)
-	{
-		if($return_bool)
-		{
+	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) === false
+			&& filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) === false
+			&& filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) === false
+	) {
+		if ($return_bool) {
 			return false;
-		}
-		else
-		{
+		} else {
 			standard_error($lng, $ip);
 			exit;
 		}
-	}
-	else
-	{
+	} else {
 		return $ip;
 	}
 }

lib/init.php

@@ -67,6 +67,8 @@ unset($value);
 unset($key);
 $filename = basename($_SERVER['PHP_SELF']);
 
+$pathtophpfiles = dirname(dirname(__FILE__));
+
 if(!file_exists('lib/userdata.inc.php'))
 {
 	$config_hint = file_get_contents('templates/Froxlor/misc/configurehint.tpl');
@@ -78,6 +80,8 @@ if(!is_readable('lib/userdata.inc.php'))
 	die('You have to make the file "lib/userdata.inc.php" readable for the http-process!');
 }
 
+define('FROXLOR_INSTALL_DIR', dirname(dirname(__FILE__)));
+
 /**
  * Includes the Usersettings eg. MySQL-Username/Passwort etc.
  */
@@ -307,21 +311,23 @@ if (isset($userinfo['language']) && isset($languages[$userinfo['language']])) {
 		) {
 			$language = $_GET['language'];
 		} else {
-			$accept_langs = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
-			for($i = 0; $i<count($accept_langs); $i++) {
-			    // this only works for most common languages. some (uncommon) languages have a 3 letter iso-code.
-			    // to be able to use these also, we would have to depend on the intl extension for php (using Locale::lookup or similar)
-			    // as long as froxlor does not support any of these languages, we can leave it like that.
-				if (isset($iso[substr($accept_langs[$i],0,2)])) {
-					$language=$iso[substr($accept_langs[$i],0,2)];
-					break;
+			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+				$accept_langs = explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
+				for($i = 0; $i<count($accept_langs); $i++) {
+				    // this only works for most common languages. some (uncommon) languages have a 3 letter iso-code.
+				    // to be able to use these also, we would have to depend on the intl extension for php (using Locale::lookup or similar)
+				    // as long as froxlor does not support any of these languages, we can leave it like that.
+					if (isset($iso[substr($accept_langs[$i],0,2)])) {
+						$language=$iso[substr($accept_langs[$i],0,2)];
+						break;
+					}
 				}
-			}
-			unset($iso);
+				unset($iso);
 
-			// if HTTP_ACCEPT_LANGUAGES has no valid langs, use default (very unlikely)
-			if (!strlen($language)>0) {
-				$language = $settings['panel']['standardlanguage'];
+				// if HTTP_ACCEPT_LANGUAGES has no valid langs, use default (very unlikely)
+				if (!strlen($language)>0) {
+					$language = $settings['panel']['standardlanguage'];
+				}
 			}
 		}
 	} else {
@@ -346,6 +352,9 @@ if($language != 'English')
 	}
 }
 
+// last but not least include language error_references file
+include_once makeSecurePath('lng/error_references.php');
+
 // Initialize our new link - class
 
 $linker = new linker('index.php', $s);
@@ -358,11 +367,16 @@ $theme = isset($settings['panel']['default_theme']) ? $settings['panel']['defaul
 /**
  * overwrite with customer/admin theme if defined
  */
-if(isset($userinfo['theme']) && $userinfo['theme'] != $theme)
-{
+if (isset($userinfo['theme']) && $userinfo['theme'] != $theme) {
 	$theme = $userinfo['theme'];
 }
 
+// check for existence of the theme
+if (!file_exists('templates/'.$theme.'/index.tpl')) {
+	// Fallback
+	$theme = 'Froxlor';
+}
+
 /*
  * check for custom header-graphic
  */

lib/navigation/00.froxlor.main.php

@@ -37,6 +37,7 @@ return array (
 				array (
 					'url' => 'customer_index.php?page=change_theme',
 					'label' => $lng['menue']['main']['changetheme'],
+					'show_element' => (getSetting('panel', 'allow_theme_change_customer') == true)
 				),
 				array (
 					'url' => 'customer_index.php?action=logout',
@@ -166,6 +167,7 @@ return array (
 				array (
 					'url' => 'admin_index.php?page=change_theme',
 					'label' => $lng['menue']['main']['changetheme'],
+					'show_element' => (getSetting('panel', 'allow_theme_change_admin') == true)
 				),
 				array (
 					'url' => 'admin_index.php?action=logout',
@@ -243,13 +245,9 @@ return array (
 					'url' => 'admin_phpsettings.php?page=overview',
 					'label' => $lng['menue']['phpsettings']['maintitle'],
 					'show_element' => ( 
-						getSetting('system', 'mod_fcgid') == true 
-						/* 
-						 * @TODO activate if phpfpm knows custom php.ini files
-						 * 
-						 * || getSetting('phpfpm', 'enabled') == true
-						 */
-						),
+						getSetting('system', 'mod_fcgid') == true ||
+						getSetting('phpfpm', 'enabled') == true
+					),
 				),
 			),
 		),

lib/tables.inc.php

@@ -54,6 +54,7 @@ define('TABLE_PANEL_REDIRECTCODES', 'redirect_codes');
 define('TABLE_PANEL_DOMAINREDIRECTS', 'domain_redirect_codes');
 define('TABLE_PANEL_IPDOCROOTSETTINGS', 'ipsandports_docrootsettings');
 define('TABLE_PANEL_DOMDOCROOTSETTINGS', 'domain_docrootsettings');
+define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings');
 
 // APS constants
 
@@ -73,6 +74,6 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.28-rc1';
+$version = '0.9.29';
 $dbversion = '2';
 $branding = '';

lng/catalan.lng.php

@@ -166,10 +166,6 @@ $lng['extras']['view_directory'] = 'mostra el contingut del directori';
 $lng['extras']['pathoptions_add'] = 'afegir opcions de la ruta (PATH)';
 $lng['extras']['directory_browsing'] = 'navegar pel contingut del directori';
 $lng['extras']['pathoptions_edit'] = 'editar opcions de la ruta (PATH)';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'Ruta a ErrorDocument 404';
 $lng['extras']['errordocument403path'] = 'Ruta a ErrorDocument 403';
 $lng['extras']['errordocument500path'] = 'Ruta a ErrorDocument 500';
@@ -190,7 +186,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'No pots esborrar tots els subdomini
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Ja tens un compte comodí';
 $lng['error']['ftp_cantdeletemainaccount'] = 'No pots esborrar el compte principal FTP';
 $lng['error']['login'] = 'El nom d\'usuari o la Clau són incorrectes. Sisplau torna-ho a intentar!';
-$lng['error']['login_blocked'] = 'Aquest compte ha estat susp&egrave;s a causa de massa intents fraudulents d\'identificaci&oacute;. <br />Si us plau, torna a provar-ho en ' . $settings['login']['deactivatetime'] . ' segons.';
+$lng['error']['login_blocked'] = 'Aquest compte ha estat susp&egrave;s a causa de massa intents fraudulents d\'identificaci&oacute;. <br />Si us plau, torna a provar-ho en %s segons.';
 $lng['error']['notallreqfieldsorerrors'] = 'No has omplert tots els camps o algun camp &eacute;s incorrecte.';
 $lng['error']['oldpasswordnotcorrect'] = 'La clau antiga no &eacute;s la correcta.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'No pots ocupar m&eacute;s espai del que tens assignat!';
@@ -198,15 +194,7 @@ $lng['error']['mustbeurl'] = 'No has escrit una URL correcte';
 $lng['error']['invalidpath'] = 'No has escrit una URL v&agrave;lida (potser hi ha algun problema en el llistat de directoris)';
 $lng['error']['stringisempty'] = 'Camp de text buit';
 $lng['error']['stringiswrong'] = 'Contingut erroni en el camp de text';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'La nova clau no coincideix amb la confirmaci&oacute;';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domini\'';
 $lng['error']['mydocumentroot'] = '\'Arrel dels documents\'';
 $lng['error']['loginnameexists'] = 'Ja existeix l\'usuari %s';
@@ -233,7 +221,6 @@ $lng['error']['destinationnonexist'] = 'Si us plau crea la redirecci&oacute; a \
 $lng['error']['destinationalreadyexistasmail'] = 'La redirecci&oacute; a %s ja existeix com un compte de correu.';
 $lng['error']['destinationalreadyexist'] = 'Ja hi ha una redirecci&oacute; a %s .';
 $lng['error']['destinationiswrong'] = 'La redirecci&oacute; %s cont&eacute; car&agrave;cters inv&agrave;lids o &eacute;s incompleta.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -259,9 +246,9 @@ $lng['question']['admin_configs_reallyrebuild'] = 'Segur que vols regenerar les
  * Mails
  */
 
-$lng['mails']['pop_success']['mailbody'] = 'Hola,\n\nel teu compte d\'email $destination\ns\'ha creat satisfactoriament.\n\nAix<69> &eacute;s un missatge creat autom&agrave;ticament, si us plau uno responguis. Gr&agrave;cies.';
+$lng['mails']['pop_success']['mailbody'] = 'Hola,\n\nel teu compte d\'email {EMAIL}\ns\'ha creat satisfactoriament.\n\nAix<69> &eacute;s un missatge creat autom&agrave;ticament, si us plau uno responguis. Gr&agrave;cies.';
 $lng['mails']['pop_success']['subject'] = 'Compte de correu creat satisfactoriament';
-$lng['mails']['createcustomer']['mailbody'] = 'Hola {FIRSTNAME} {NAME},\n\n aqu&iacute; te la seva informaci&oacute;:\n\nNom d\'usuari: $loginname\nClau: $password\n\n Gr&agrave;cies per tot, disfruta del teu compte';
+$lng['mails']['createcustomer']['mailbody'] = 'Hola {FIRSTNAME} {NAME},\n\n aqu&iacute; te la seva informaci&oacute;:\n\nNom d\'usuari: {USERNAME}\nClau: {PASSWORD}\n\n Gr&agrave;cies per tot, disfruta del teu compte';
 $lng['mails']['createcustomer']['subject'] = 'Informaci&oacute; del compte';
 
 /**
@@ -388,8 +375,3 @@ $lng['question']['admin_ip_reallydelete'] = 'Segur que vols esborrar la IP %s?';
 $lng['admin']['ipsandports']['ipsandports'] = 'IPs i Ports';
 $lng['admin']['ipsandports']['add'] = 'Afegir IP/Port';
 $lng['admin']['ipsandports']['edit'] = 'Editar IP/Port';
-$lng['admin']['ipsandports']['ipandport'] = 'IP/Port';
-$lng['admin']['ipsandports']['ip'] = 'IP';
-$lng['admin']['ipsandports']['port'] = 'Port';
-
-?>

lng/czech.lng.php

@@ -24,16 +24,16 @@
 $lng['translator'] = '';
 $lng['panel']['edit'] = 'upravit';
 $lng['panel']['delete'] = 'smazat';
-$lng['panel']['create'] = 'vytvoøit';
+$lng['panel']['create'] = 'vytvořit';
 $lng['panel']['save'] = 'uložit';
 $lng['panel']['yes'] = 'ano';
 $lng['panel']['no'] = 'ne';
-$lng['panel']['emptyfornochanges'] = 'prázdné - žádné zmì ny';
+$lng['panel']['emptyfornochanges'] = 'prázdné - žádné změny';
 $lng['panel']['emptyfordefault'] = 'prázdné - pro výchozí';
 $lng['panel']['path'] = 'Cesta';
-$lng['panel']['toggle'] = 'Pøepnout';
+$lng['panel']['toggle'] = 'Přepnout';
 $lng['panel']['next'] = 'další';
-$lng['panel']['dirsmissing'] = 'Nemohu nejít/èíst adresáø!';
+$lng['panel']['dirsmissing'] = 'Nemohu najít/číst adresář!';
 
 /**
  * Login
@@ -42,7 +42,7 @@ $lng['panel']['dirsmissing'] = 'Nemohu nejít/èíst adresáø!';
 $lng['login']['username'] = 'Uživatel';
 $lng['login']['password'] = 'Heslo';
 $lng['login']['language'] = 'Jazyk';
-$lng['login']['login'] = 'Pøihlásit';
+$lng['login']['login'] = 'Přihlásit';
 $lng['login']['logout'] = 'Odhlásit';
 $lng['login']['profile_lng'] = 'Jazyk profilu';
 
@@ -50,24 +50,24 @@ $lng['login']['profile_lng'] = 'Jazyk profilu';
  * Customer
  */
 
-$lng['customer']['documentroot'] = 'Domácí adresáø';
+$lng['customer']['documentroot'] = 'Domácí adresář';
 $lng['customer']['name'] = 'Jméno';
-$lng['customer']['firstname'] = 'Køestní jméno';
-$lng['customer']['company'] = 'Spoleènost';
+$lng['customer']['firstname'] = 'Křestní jméno';
+$lng['customer']['company'] = 'Společnost';
 $lng['customer']['street'] = 'Ulice';
-$lng['customer']['zipcode'] = 'PSÈ';
-$lng['customer']['city'] = 'Mì sto';
+$lng['customer']['zipcode'] = 'PSČ';
+$lng['customer']['city'] = 'Město';
 $lng['customer']['phone'] = 'Telefon';
 $lng['customer']['fax'] = 'Fax';
-$lng['customer']['email'] = 'Email';
+$lng['customer']['email'] = 'E-mail';
 $lng['customer']['customernumber'] = 'Zákazníkovo ID';
 $lng['customer']['diskspace'] = 'Webový prostor (MB)';
-$lng['customer']['traffic'] = 'Pøenosy (GB)';
+$lng['customer']['traffic'] = 'Přenosy (GB)';
 $lng['customer']['mysqls'] = 'MySQL-Databáze';
-$lng['customer']['emails'] = 'E-mailové-adresy';
-$lng['customer']['accounts'] = 'E-mailvé-Úèty';
-$lng['customer']['forwarders'] = 'E-mailové-Pøeposílaèe';
-$lng['customer']['ftps'] = 'FTP-Úèty';
+$lng['customer']['emails'] = 'E-mailové adresy';
+$lng['customer']['accounts'] = 'E-mailové účty';
+$lng['customer']['forwarders'] = 'E-mailové přeposílače';
+$lng['customer']['ftps'] = 'FTP účty';
 $lng['customer']['subdomains'] = 'Sub-Domény';
 $lng['customer']['domains'] = 'Doména';
 $lng['customer']['unlimited'] = 'neomezeno';
@@ -77,8 +77,8 @@ $lng['customer']['unlimited'] = 'neomezeno';
  */
 
 $lng['menue']['main']['main'] = 'Hlavní';
-$lng['menue']['main']['changepassword'] = 'Zmì nit heslo';
-$lng['menue']['main']['changelanguage'] = 'Zmì nit jazyl';
+$lng['menue']['main']['changepassword'] = 'Změnit heslo';
+$lng['menue']['main']['changelanguage'] = 'Změnit jazyk';
 $lng['menue']['email']['email'] = 'E-mail';
 $lng['menue']['email']['emails'] = 'Adresy';
 $lng['menue']['email']['webmail'] = 'WebMail';
@@ -88,10 +88,10 @@ $lng['menue']['mysql']['phpmyadmin'] = 'phpMyAdmin';
 $lng['menue']['domains']['domains'] = 'Domény';
 $lng['menue']['domains']['settings'] = 'Nastavení';
 $lng['menue']['ftp']['ftp'] = 'FTP';
-$lng['menue']['ftp']['accounts'] = 'Úèty';
+$lng['menue']['ftp']['accounts'] = 'Účty';
 $lng['menue']['ftp']['webftp'] = 'WebFTP';
 $lng['menue']['extras']['extras'] = 'Extra';
-$lng['menue']['extras']['directoryprotection'] = 'Ochrana adresáøe';
+$lng['menue']['extras']['directoryprotection'] = 'Ochrana adresáře';
 $lng['menue']['extras']['pathoptions'] = 'nastavení cesty';
 
 /**
@@ -99,7 +99,7 @@ $lng['menue']['extras']['pathoptions'] = 'nastavení cesty';
  */
 
 $lng['index']['customerdetails'] = 'Detaily zákazníka';
-$lng['index']['accountdetails'] = 'Detaily Úètu';
+$lng['index']['accountdetails'] = 'Detaily účtu';
 
 /**
  * Change Password
@@ -108,19 +108,19 @@ $lng['index']['accountdetails'] = 'Detaily Úètu';
 $lng['changepassword']['old_password'] = 'Staré heslo';
 $lng['changepassword']['new_password'] = 'Nové heslo';
 $lng['changepassword']['new_password_confirm'] = 'Nové heslo (potvrzení)';
-$lng['changepassword']['new_password_ifnotempty'] = 'Nové heslo (prázdné = beze zmì n)';
-$lng['changepassword']['also_change_ftp'] = ' také zmì nit heslo k hlavnímu FTP Úètu';
+$lng['changepassword']['new_password_ifnotempty'] = 'Nové heslo (prázdné = beze změn)';
+$lng['changepassword']['also_change_ftp'] = ' také změnit heslo k hlavnímu FTP účtu';
 
 /**
  * Domains
  */
 
-$lng['domains']['description'] = 'Zde mùžete vytvoøit (sub-)domény a mì nit jejich cesty.<br />Systém potøebuje nì jaký èas, než se po Úpravì  nové nastavení projeví.';
+$lng['domains']['description'] = 'Zde můžete vytvořit (sub-)domény a měnit jejich cesty.<br />Systém potřebuje nějaký čas, než se po úpravě nové nastavení projeví.';
 $lng['domains']['domainsettings'] = 'Nastavení domény';
 $lng['domains']['domainname'] = 'Jméno domény';
-$lng['domains']['subdomain_add'] = 'Vytvoøit subdoménu';
+$lng['domains']['subdomain_add'] = 'Vytvořit subdoménu';
 $lng['domains']['subdomain_edit'] = 'Upravit (sub)doménu';
-$lng['domains']['wildcarddomain'] = 'Vytvoøit jako wildcard doménu?';
+$lng['domains']['wildcarddomain'] = 'Vytvořit jako wildcard doménu?';
 $lng['domains']['aliasdomain'] = 'Alias pro doménu';
 $lng['domains']['noaliasdomain'] = 'žádný alias pro doménu';
 
@@ -128,26 +128,26 @@ $lng['domains']['noaliasdomain'] = 'žádný alias pro doménu';
  * E-mails
  */
 
-$lng['emails']['description'] = 'Zde mùžete také vytvoøit a mì nit e-mailové adresy.<br />Úèet je jako Vaše poštovní schránka pøed Vaším domem. Pokud Vám nì kdo pošle e-mail, pøijde na tento Úèet.<br /><br />Pro stažení e-mailù použijte následující nastavení ve svém poštovním klientu: (Data <i>kurzívou</i> musí být zmì nì na podle toho, co jste zadali!)<br />Host: <b><i>Jméno domény</i></b><br />Uživatelské jméno: <b><i>Jméno Úètu / e-mailové adresy</i></b><br />Heslo: <b><i>heslo které jste zadali</i></b>';
-$lng['emails']['emailaddress'] = 'E-mail-adresa';
-$lng['emails']['emails_add'] = 'Vytvoøit e-mailovou-adresu';
-$lng['emails']['emails_edit'] = 'Editovat e-mailovou-addresu';
+$lng['emails']['description'] = 'Zde můžete také vytvořit a měnit e-mailové adresy.<br />Účet je jako Vaše poštovní schránka před Vaším domem. Pokud Vám někdo pošle e-mail, přijde na tento účet.<br /><br />Pro stažení e-mailů použijte následující nastavení ve svém poštovním klientu: (Data <i>kurzívou</i> musí být změněna podle toho, co jste zadali!)<br />Host: <b><i>Jméno domény</i></b><br />Uživatelské jméno: <b><i>Jméno účtu / e-mailové adresy</i></b><br />Heslo: <b><i>heslo které jste zadali</i></b>';
+$lng['emails']['emailaddress'] = 'E-mailová adresa';
+$lng['emails']['emails_add'] = 'Vytvořit e-mailovou adresu';
+$lng['emails']['emails_edit'] = 'Editovat e-mailovou addresu';
 $lng['emails']['catchall'] = 'Catchall';
-$lng['emails']['iscatchall'] = 'Definovat jako catchall-adresu?';
-$lng['emails']['account'] = 'Úèet';
-$lng['emails']['account_add'] = 'Vytvoøit Úèet';
-$lng['emails']['account_delete'] = 'Smazat Úèet';
+$lng['emails']['iscatchall'] = 'Definovat jako catchall adresu?';
+$lng['emails']['account'] = 'Účet';
+$lng['emails']['account_add'] = 'Vytvořit účet';
+$lng['emails']['account_delete'] = 'Smazat účet';
 $lng['emails']['from'] = 'Zdroj';
 $lng['emails']['to'] = 'Cíl';
-$lng['emails']['forwarders'] = 'Pøeposílatelé';
-$lng['emails']['forwarder_add'] = 'Vytvoøit pøeposílatele';
+$lng['emails']['forwarders'] = 'Přeposílatelé';
+$lng['emails']['forwarder_add'] = 'Vytvořit přeposílatele';
 
 /**
  * FTP
  */
 
-$lng['ftp']['description'] = 'Zde mùžete vytváøet a mì nit FTP Úèty.<br />Zmì ny jsou provedeny okamžitì  a Úèty mohou být okamžitì  použity.';
-$lng['ftp']['account_add'] = 'Vytvoøit Úèet';
+$lng['ftp']['description'] = 'Zde můžete vytvářet a měnit FTP účty.<br />Změny jsou provedeny okamžitě a účty mohou být okamžitě použity.';
+$lng['ftp']['account_add'] = 'Vytvořit účet';
 
 /**
  * MySQL
@@ -155,22 +155,18 @@ $lng['ftp']['account_add'] = 'Vytvoøit Úèet';
 
 $lng['mysql']['databasename'] = 'jméno uživatele/databáze';
 $lng['mysql']['databasedescription'] = 'popis databáze';
-$lng['mysql']['database_create'] = 'Vytvoøit databázi';
+$lng['mysql']['database_create'] = 'Vytvořit databázi';
 
 /**
  * Extras
  */
 
-$lng['extras']['description'] = 'Zde mùžete vkládat extra vì ci, napøíklad ochranu adresáøù.<br />Systém potøebuje nì jaký èas, než se zmì ny projeví.';
-$lng['extras']['directoryprotection_add'] = 'Pøidat ochranu adresáøe';
-$lng['extras']['view_directory'] = 'zobrazit obsah adresáøe';
-$lng['extras']['pathoptions_add'] = 'pøidat nastavení cesty';
-$lng['extras']['directory_browsing'] = 'prohlížení obsahu adresáøe';
+$lng['extras']['description'] = 'Zde můžete vkládat extra věci, například ochranu adresářů.<br />Systém potřebuje nějaký čas, než se změny projeví.';
+$lng['extras']['directoryprotection_add'] = 'Přidat ochranu adresáře';
+$lng['extras']['view_directory'] = 'zobrazit obsah adresáře';
+$lng['extras']['pathoptions_add'] = 'přidat nastavení cesty';
+$lng['extras']['directory_browsing'] = 'prohlížení obsahu adresáře';
 $lng['extras']['pathoptions_edit'] = 'upravit nastavení cesty';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'URL k Chybové stránce 404';
 $lng['extras']['errordocument403path'] = 'URL k Chybové stránce 403';
 $lng['extras']['errordocument500path'] = 'URL k Chybové stránce 500';
@@ -181,349 +177,329 @@ $lng['extras']['errordocument401path'] = 'URL k Chybové stránce 401';
  */
 
 $lng['error']['error'] = 'Chyba';
-$lng['error']['directorymustexist'] = 'Adresáø %s musí existovat. Prosím vytvoøte jej s pomocí Vašeho FTP klienta.';
+$lng['error']['directorymustexist'] = 'Adresář %s musí existovat. Prosím vytvořte jej s pomocí Vašeho FTP klienta.';
 $lng['error']['filemustexist'] = 'Soubor %s musí existovat.';
 $lng['error']['allresourcesused'] = 'Už jste použili všechny své zdroje.';
-$lng['error']['domains_cantdeletemaindomain'] = 'Nemùžete smazat doménu, která se používá jako e-mailová doména.';
-$lng['error']['domains_canteditdomain'] = 'Nemùžete upravovat tuto doménu. Byla zakázána adminem.';
-$lng['error']['domains_cantdeletedomainwithemail'] = 'Nemùžete smazat doménu, která se používá jako e-mailová doména. Nejdøíve smažte všechny emailové adresy.';
-$lng['error']['firstdeleteallsubdomains'] = 'Musíte smazat všechny subdomény než budete moci vytvoøit "wildcard" doménu.';
-$lng['error']['youhavealreadyacatchallforthisdomain'] = 'Už jste definovali "catchall" pro tuto doménu.';
-$lng['error']['ftp_cantdeletemainaccount'] = 'Nemùžete smazat svùj hlavní FTP Úèet';
+$lng['error']['domains_cantdeletemaindomain'] = 'Nemůžete smazat doménu, která se používá jako e-mailová doména.';
+$lng['error']['domains_canteditdomain'] = 'Nemůžete upravovat tuto doménu. Byla zakázána adminem.';
+$lng['error']['domains_cantdeletedomainwithemail'] = 'Nemůžete smazat doménu, která se používá jako e-mailová doména. Nejdříve smažte všechny e-mailové adresy.';
+$lng['error']['firstdeleteallsubdomains'] = 'Musíte smazat všechny subdomény než budete moci vytvořit „wildcard“ doménu.';
+$lng['error']['youhavealreadyacatchallforthisdomain'] = 'Už jste definovali „catchall“ pro tuto doménu.';
+$lng['error']['ftp_cantdeletemainaccount'] = 'Nemůžete smazat svůj hlavní FTP účet';
 $lng['error']['login'] = 'Uživatelské jméno nebo heslo, které jste zadali, je špatné. Prosím zkuste to znovu!';
-$lng['error']['login_blocked'] = 'Tento Úèet byl zablokován z dùvodu pøíliš velkého množství chyb pøi pøihlášení. <br />Prosím zkuste to znovu za ' . $settings['login']['deactivatetime'] . ' sekund.';
-$lng['error']['notallreqfieldsorerrors'] = 'Nevyplnili jste všechna políèka nebo jsou nì které vyplnì na špatnì .';
+$lng['error']['login_blocked'] = 'Tento účet byl zablokován z důvodu příliš velkého množství chyb při přihlášení. <br />Prosím, zkuste to znovu za %s sekund.';
+$lng['error']['notallreqfieldsorerrors'] = 'Nevyplnili jste všechna políčka nebo jsou některé vyplněna špatně.';
 $lng['error']['oldpasswordnotcorrect'] = 'Staré heslo není správné.';
-$lng['error']['youcantallocatemorethanyouhave'] = 'Nemùžete alokovat více zdrojù než sami vlastníte';
-$lng['error']['mustbeurl'] = 'Vložili jste nesprávnou nebo nekompletní url (napø. http://somedomain.com/error404.htm)';
-$lng['error']['invalidpath'] = 'Nevybrali jste správnou url (možná problém s "dirlistingem"?)';
-$lng['error']['stringisempty'] = 'Chybì jící vstup v poli';
+$lng['error']['youcantallocatemorethanyouhave'] = 'Nemůžete alokovat více zdrojů než sami vlastníte';
+$lng['error']['mustbeurl'] = 'Vložili jste nesprávnou nebo nekompletní url (např. http://somedomain.com/error404.htm)';
+$lng['error']['invalidpath'] = 'Nevybrali jste správnou url (možná problém s „dirlistingem“?)';
+$lng['error']['stringisempty'] = 'Chybějící vstup v poli';
 $lng['error']['stringiswrong'] = 'špatný vstup v poli';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'Nové heslo se neshoduje s tím pro potvrzení';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domain\'';
-$lng['error']['mydocumentroot'] = '\'Documentroot\'';
-$lng['error']['loginnameexists'] = 'Pøihlašovací jméno %s již existuje';
-$lng['error']['emailiswrong'] = 'Emailová adresa %s obsahuje nepovolené znaky nebo je nekompletní';
-$lng['error']['loginnameiswrong'] = 'Pøihlašovací jméno %s obsahuje nepovolené znaky';
+$lng['error']['loginnameexists'] = 'Přihlašovací jméno %s již existuje';
+$lng['error']['emailiswrong'] = 'E-mailová adresa %s obsahuje nepovolené znaky nebo je nekompletní';
+$lng['error']['loginnameiswrong'] = 'Přihlašovací jméno %s obsahuje nepovolené znaky';
 $lng['error']['userpathcombinationdupe'] = 'Kombinace Uživatelského jména a cesty již existuje';
-$lng['error']['patherror'] = 'Obecná chyba! Cesta nemùže být prázdná';
+$lng['error']['patherror'] = 'Obecná chyba! Cesta nemůže být prázdná';
 $lng['error']['errordocpathdupe'] = 'Možnost pro cestu %s již existuje';
-$lng['error']['adduserfirst'] = 'Vytvoøte prosím nejdøíve zákazníka';
-$lng['error']['domainalreadyexists'] = 'Doména %s je již pøiøazena k zákazníkovi';
+$lng['error']['adduserfirst'] = 'Vytvořte prosím nejdříve zákazníka';
+$lng['error']['domainalreadyexists'] = 'Doména %s je již přiřazena k zákazníkovi';
 $lng['error']['nolanguageselect'] = 'Nebyl vybrán žádný jazyk.';
 $lng['error']['nosubjectcreate'] = 'Musíte definovat téma pro tuto e-mailovou šablonu.';
 $lng['error']['nomailbodycreate'] = 'Musíte definovat text e-mailu pro tuto e-mailovou šablonu.';
 $lng['error']['templatenotfound'] = 'šablona nebyla nalezena.';
-$lng['error']['alltemplatesdefined'] = 'Nemùžete definovat více šablon, všechny jazyky jsou již podporovány.';
+$lng['error']['alltemplatesdefined'] = 'Nemůžete definovat více šablon, všechny jazyky jsou již podporovány.';
 $lng['error']['wwwnotallowed'] = 'www není povoleno pro subdomény.';
 $lng['error']['subdomainiswrong'] = 'Subdoména %s obsahuje neplatné znaky.';
 $lng['error']['domaincantbeempty'] = 'Jméno domény nesmí být prázdné.';
 $lng['error']['domainexistalready'] = 'Doména %s již existuje.';
-$lng['error']['domainisaliasorothercustomer'] = 'Vybraný alias pro doménu je buï sama aliasem domény nebo patøí jinému zákazníkovi.';
+$lng['error']['domainisaliasorothercustomer'] = 'Vybraný alias pro doménu je buď sama aliasem domény nebo patří jinému zákazníkovi.';
 $lng['error']['emailexistalready'] = 'E-mailová adresa %s již existuje.';
 $lng['error']['maindomainnonexist'] = 'Hlavní doména %s neexistuje.';
-$lng['error']['destinationnonexist'] = 'Prosím vytvoøte pøeposílatele v poli \'Cíl\'.';
-$lng['error']['destinationalreadyexistasmail'] = 'Pøeposílaè na %s již existuje jako aktivní emailová adresa.';
-$lng['error']['destinationalreadyexist'] = 'Už jste nastavili pøeposílaè na %s .';
-$lng['error']['destinationiswrong'] = 'Pøeposílaè %s obsahuje nesprávné znaky nebo není kompletní.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
+$lng['error']['destinationnonexist'] = 'Prosím vytvořte přeposílatele v poli \'Cíl\'.';
+$lng['error']['destinationalreadyexistasmail'] = 'Přeposílač na %s již existuje jako aktivní e-mailová adresa.';
+$lng['error']['destinationalreadyexist'] = 'Už jste nastavili přeposílač na %s.';
+$lng['error']['destinationiswrong'] = 'Přeposílač %s obsahuje nesprávné znaky nebo není kompletní.';
 
 /**
  * Questions
  */
 
-$lng['question']['question'] = 'Bezpeènostní otázka';
-$lng['question']['admin_customer_reallydelete'] = 'Chcete opravdu smazat uživatele %s? Akci nelze vzít zpì t!';
+$lng['question']['question'] = 'Bezpečnostní otázka';
+$lng['question']['admin_customer_reallydelete'] = 'Chcete opravdu smazat uživatele %s? Akci nelze vzít zpět!';
 $lng['question']['admin_domain_reallydelete'] = 'Chcete opravdu smazat doménu %s?';
-$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Chcete opravdu deaktivovat tato Bezpeènostní nastavení (OpenBasedir)?';
-$lng['question']['admin_admin_reallydelete'] = 'Chcete opravdu smazat administrátory %s? Každý zákazník a doména bude nastavena k Vašemu Úètu.';
+$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Chcete opravdu deaktivovat tato Bezpečnostní nastavení (OpenBasedir)?';
+$lng['question']['admin_admin_reallydelete'] = 'Chcete opravdu smazat administrátory %s? Každý zákazník a doména bude nastavena k Vašemu účtu.';
 $lng['question']['admin_template_reallydelete'] = 'Chcete opravdu smazat šablonu \'%s\'?';
 $lng['question']['domains_reallydelete'] = 'Chcete opravdu smazat doménu %s?';
 $lng['question']['email_reallydelete'] = 'Opravdu chcete smazat e-mailovou adresu %s?';
-$lng['question']['email_reallydelete_account'] = 'Chcete opravdu smazat e-mailový Úèet %s?';
-$lng['question']['email_reallydelete_forwarder'] = 'Chcete opravdu smazat pøeposílaè %s?';
-$lng['question']['extras_reallydelete'] = 'Chcete opravdu odstranit ochranu adresáøe %s?';
+$lng['question']['email_reallydelete_account'] = 'Chcete opravdu smazat e-mailový účet %s?';
+$lng['question']['email_reallydelete_forwarder'] = 'Chcete opravdu smazat přeposílač %s?';
+$lng['question']['extras_reallydelete'] = 'Chcete opravdu odstranit ochranu adresáře %s?';
 $lng['question']['extras_reallydelete_pathoptions'] = 'Opravdu chcete smazat nastavení cesty pro %s?';
-$lng['question']['ftp_reallydelete'] = 'Opravdu chcete smazat FTP Úèet %s?';
-$lng['question']['mysql_reallydelete'] = 'Opravdu chcete smazat databázi %s? Tato akce nemùže být vzata zpì t!';
-$lng['question']['admin_configs_reallyrebuild'] = 'Opravdu chcete rebuildovat apache a nabindovat konfiguraèní soubory?';
+$lng['question']['ftp_reallydelete'] = 'Opravdu chcete smazat FTP účet %s?';
+$lng['question']['mysql_reallydelete'] = 'Opravdu chcete smazat databázi %s? Tato akce nemůže být vzata zpět!';
+$lng['question']['admin_configs_reallyrebuild'] = 'Opravdu chcete rebuildovat apache a nabindovat konfigurační soubory?';
 
 /**
  * Mails
  */
 
-$lng['mails']['pop_success']['mailbody'] = 'Dobrý den,\n\nVáš e-mailový Úèet {EMAIL}\nbyl v poøádku nastaven.\n\nToto je automaticky vytvoøený\ne-mail, prosím neodpovídejte na nì j!\n\nPøejeme hezký den, Administrator';
-$lng['mails']['pop_success']['subject'] = 'Poštovní Úèet byl Úspì šnì  nastaven';
-$lng['mails']['createcustomer']['mailbody'] = 'Dobrý den, {FIRSTNAME} {NAME},\n\nzde jsou informace o Vašem Úètu:\n\nUživatel: {USERNAME}\nHeslo: {PASSWORD}\n\nDì kujeme,\nváš správce';
-$lng['mails']['createcustomer']['subject'] = 'Informace o Úètu';
+$lng['mails']['pop_success']['mailbody'] = 'Dobrý den,\n\nVáš e-mailový účet {EMAIL}\nbyl v pořádku nastaven.\n\nToto je automaticky vytvořený\ne-mail, prosím neodpovídejte na něj!\n\nPřejeme hezký den, Administrator';
+$lng['mails']['pop_success']['subject'] = 'Poštovní účet byl úspěšně nastaven';
+$lng['mails']['createcustomer']['mailbody'] = 'Dobrý den, {FIRSTNAME} {NAME},\n\nzde jsou informace o Vašem účtu:\n\nUživatel: {USERNAME}\nHeslo: {PASSWORD}\n\nDěkujeme,\nváš správce';
+$lng['mails']['createcustomer']['subject'] = 'Informace o účtu';
 
 /**
  * Admin
  */
 
-$lng['admin']['overview'] = 'Pøehled';
+$lng['admin']['overview'] = 'Přehled';
 $lng['admin']['ressourcedetails'] = 'Použité zdroje';
 $lng['admin']['systemdetails'] = 'Detaily systému';
 $lng['admin']['froxlordetails'] = 'Froxlor Detaily';
 $lng['admin']['installedversion'] = 'Nainstalovaná verze';
 $lng['admin']['latestversion'] = 'Poslední verze';
-$lng['admin']['lookfornewversion']['clickhere'] = 'hledat pøes webservice';
-$lng['admin']['lookfornewversion']['error'] = 'Chyba pøi ètení';
+$lng['admin']['lookfornewversion']['clickhere'] = 'hledat přes webservice';
+$lng['admin']['lookfornewversion']['error'] = 'Chyba při čtení';
 $lng['admin']['resources'] = 'Zdroje';
 $lng['admin']['customer'] = 'Zákazník';
 $lng['admin']['customers'] = 'Zákazníci';
-$lng['admin']['customer_add'] = 'Vytvoøit zákazníka';
+$lng['admin']['customer_add'] = 'Vytvořit zákazníka';
 $lng['admin']['customer_edit'] = 'Upravit zákazníka';
 $lng['admin']['domains'] = 'Domény';
-$lng['admin']['domain_add'] = 'Vytvoøit doménu';
+$lng['admin']['domain_add'] = 'Vytvořit doménu';
 $lng['admin']['domain_edit'] = 'Upravit doménu';
-$lng['admin']['subdomainforemail'] = 'Subdomény jako emailové domény';
+$lng['admin']['subdomainforemail'] = 'Subdomény jako e-mailové domény';
 $lng['admin']['admin'] = 'Administrátor';
-$lng['admin']['admins'] = 'Administrátoøi';
-$lng['admin']['admin_add'] = 'Vytvoøit administrátora';
+$lng['admin']['admins'] = 'Administrátoři';
+$lng['admin']['admin_add'] = 'Vytvořit administrátora';
 $lng['admin']['admin_edit'] = 'Upravit administrátora';
-$lng['admin']['customers_see_all'] = 'Mùže vidì t všechy zákazníky?';
-$lng['admin']['domains_see_all'] = 'Mùže vidì t všechny domény?';
-$lng['admin']['change_serversettings'] = 'Mùže mì nit nastavení serveru?';
+$lng['admin']['customers_see_all'] = 'Může vidět všechy zákazníky?';
+$lng['admin']['domains_see_all'] = 'Může vidět všechny domény?';
+$lng['admin']['change_serversettings'] = 'Může měnit nastavení serveru?';
 $lng['admin']['server'] = 'Server';
 $lng['admin']['serversettings'] = 'Nastavení';
-$lng['admin']['rebuildconf'] = 'Pøebudovat konfiguraèní soubory';
+$lng['admin']['rebuildconf'] = 'Přebudovat konfigurační soubory';
 $lng['admin']['stdsubdomain'] = 'Standardní subdoména';
-$lng['admin']['stdsubdomain_add'] = 'Vytvoøit standardní subdoménu';
+$lng['admin']['stdsubdomain_add'] = 'Vytvořit standardní subdoménu';
 $lng['admin']['phpenabled'] = 'PHP zapnuto';
 $lng['admin']['deactivated'] = 'Deaktivováno';
 $lng['admin']['deactivated_user'] = 'Deaktivovat uživatele';
 $lng['admin']['sendpassword'] = 'Zaslat heslo';
 $lng['admin']['ownvhostsettings'] = 'Vlastní vHost-nastavení';
 $lng['admin']['configfiles']['serverconfiguration'] = 'Konfigurace';
-$lng['admin']['configfiles']['files'] = '<b>Konfiguraèní soubory:</b> Prosím zmì �te následující soubory nabo je vytvoøte s<br /> následujícím obsahem, pokud neexistují.<br /><b>Poznámka:</b> MySQL heslo nebylo nahrazeno z bezpeènostních dùvodù.<br />Prosím nahraïte "MYSQL_PASSWORD" svým vlastním. Pokud jste zapomnì li své mysql heslo<br />najdete jej v "lib/userdata.inc.php".';
-$lng['admin']['configfiles']['commands'] = '<b>Pøíkazy:</b> Prosím spus?te následující pøíkazy v pøíkazovém øádku.';
-$lng['admin']['configfiles']['restart'] = '<b>Restart:</b> Prosím spus?te nísledující pøíkazy v pøíkazovém øádku, aby jste nahráli novou konfiguraci.';
+$lng['admin']['configfiles']['files'] = '<b>Konfigurační soubory:</b> Prosím změňte následující soubory nabo je vytvořte s<br /> následujícím obsahem, pokud neexistují.<br /><b>Poznámka:</b> MySQL heslo nebylo nahrazeno z bezpečnostních důvodů.<br />Prosím nahraďte „MYSQL_PASSWORD“ svým vlastním. Pokud jste zapomněli své mysql heslo<br />najdete jej v „lib/userdata.inc.php“.';
+$lng['admin']['configfiles']['commands'] = '<b>Příkazy:</b> Prosím spusťte následující příkazy v příkazovém řádku.';
+$lng['admin']['configfiles']['restart'] = '<b>Restart:</b> Prosím spusťte nísledující příkazy v příkazovém řádku, aby jste nahráli novou konfiguraci.';
 $lng['admin']['templates']['templates'] = 'šablony';
-$lng['admin']['templates']['template_add'] = 'Pøidat šablonu';
+$lng['admin']['templates']['template_add'] = 'Přidat šablonu';
 $lng['admin']['templates']['template_edit'] = 'Upravit šablonu';
 $lng['admin']['templates']['action'] = 'Akce';
-$lng['admin']['templates']['email'] = 'E-Mail';
-$lng['admin']['templates']['subject'] = 'Pøedmì t';
-$lng['admin']['templates']['mailbody'] = 'Tì lo mailu';
+$lng['admin']['templates']['email'] = 'E-mail';
+$lng['admin']['templates']['subject'] = 'Předmět';
+$lng['admin']['templates']['mailbody'] = 'Tělo e-mailu';
 $lng['admin']['templates']['createcustomer'] = 'Uvítací mail pro nové zákazníky';
-$lng['admin']['templates']['pop_success'] = 'Uvítací mail pro nové emailové Úèty';
-$lng['admin']['templates']['template_replace_vars'] = 'Promì nné k nahrazení v šablonì :';
-$lng['admin']['templates']['FIRSTNAME'] = 'Nahrazeno køestním jménem zákazníka.';
+$lng['admin']['templates']['pop_success'] = 'Uvítací mail pro nové e-mailové účty';
+$lng['admin']['templates']['template_replace_vars'] = 'Proměnné k nahrazení v šabloně:';
+$lng['admin']['templates']['FIRSTNAME'] = 'Nahrazeno křestním jménem zákazníka.';
 $lng['admin']['templates']['NAME'] = 'Nahrazeno jménem zákazníka.';
 $lng['admin']['templates']['USERNAME'] = 'Nahrazeno uživatelským jménem zákazníka.';
 $lng['admin']['templates']['PASSWORD'] = 'Nahrazeno zákazníkovým heslem.';
-$lng['admin']['templates']['EMAIL'] = 'Nahrazeno adresou POP3/IMAP Úètu.';
+$lng['admin']['templates']['EMAIL'] = 'Nahrazeno adresou POP3/IMAP účtu.';
 
 /**
  * Serversettings
  */
 
-$lng['serversettings']['session_timeout']['title'] = 'Session Timeout';
-$lng['serversettings']['session_timeout']['description'] = 'Jak dlouho musý být uživatel neaktivní, než session vyprší (sekundy)?';
-$lng['serversettings']['accountprefix']['title'] = 'Zákazníkova pøedpona';
-$lng['serversettings']['accountprefix']['description'] = 'Jké pøedpony by mì ly mít Úèty zákazníkù?';
-$lng['serversettings']['mysqlprefix']['title'] = 'SQL pøedpona';
-$lng['serversettings']['mysqlprefix']['description'] = 'Jaké pøedpony by mì ly mít Úèty mysql?';
-$lng['serversettings']['ftpprefix']['title'] = 'FTP pøedpona';
-$lng['serversettings']['ftpprefix']['description'] = 'Jakou pøedponu by mì ly mít ftp Úèty?';
-$lng['serversettings']['documentroot_prefix']['title'] = 'Domácí adresáø';
-$lng['serversettings']['documentroot_prefix']['description'] = 'Kde by mì ly být uloženy všechny domácí adresáøe?';
-$lng['serversettings']['logfiles_directory']['title'] = 'Adresáø pro log soubory';
-$lng['serversettings']['logfiles_directory']['description'] = 'Kde by mì ly být všechny log soubory uloženy?';
-$lng['serversettings']['ipaddress']['title'] = 'IP-Adresa';
+$lng['serversettings']['session_timeout']['description'] = 'Jak dlouho musí být uživatel neaktivní, než session vyprší (sekundy)?';
+$lng['serversettings']['accountprefix']['title'] = 'Zákazníkova předpona';
+$lng['serversettings']['accountprefix']['description'] = 'Jaké předpony by měly mít účty zákazníků?';
+$lng['serversettings']['mysqlprefix']['title'] = 'SQL předpona';
+$lng['serversettings']['mysqlprefix']['description'] = 'Jaké předpony by měly mít účty mysql?';
+$lng['serversettings']['ftpprefix']['title'] = 'FTP předpona';
+$lng['serversettings']['ftpprefix']['description'] = 'Jakou předponu by měly mít ftp účty?';
+$lng['serversettings']['documentroot_prefix']['title'] = 'Domácí adresář';
+$lng['serversettings']['documentroot_prefix']['description'] = 'Kde by měly být uloženy všechny domácí adresáře?';
+$lng['serversettings']['logfiles_directory']['title'] = 'Adresář pro log soubory';
+$lng['serversettings']['logfiles_directory']['description'] = 'Kde by měly být všechny log soubory uloženy?';
+$lng['serversettings']['ipaddress']['title'] = 'IP adresa';
 $lng['serversettings']['ipaddress']['description'] = 'Jaká je IP adresa tohoto serveru?';
 $lng['serversettings']['hostname']['title'] = 'Jméno hosta';
 $lng['serversettings']['hostname']['description'] = 'Jaké je jméno hosta tohoto serveru?';
-$lng['serversettings']['apachereload_command']['title'] = 'Pøíkaz pro reload apache';
-$lng['serversettings']['apachereload_command']['description'] = 'Jaký je pøíkaz, kterým apache znovunahraje své konfiguraèní soubory?';
-$lng['serversettings']['bindconf_directory']['title'] = 'Bindujte konfiguraèní adresáø';
-$lng['serversettings']['bindconf_directory']['description'] = 'Kde by mì ly být uloženy "bind configfiles"?';
-$lng['serversettings']['bindreload_command']['title'] = 'Bind reload pøíkaz';
-$lng['serversettings']['bindreload_command']['description'] = 'Jaký je pøíkaz pro znovunahrání "bind configfiles"?';
-$lng['serversettings']['binddefaultzone']['title'] = 'Bind výchozí z�na';
-$lng['serversettings']['binddefaultzone']['description'] = 'Jaký je název výchozí z�ny?';
-$lng['serversettings']['vmail_uid']['title'] = 'UID-mailù';
-$lng['serversettings']['vmail_uid']['description'] = 'Jaké UserID by mì ly e-maily mít?';
-$lng['serversettings']['vmail_gid']['title'] = 'GID-mailù';
-$lng['serversettings']['vmail_gid']['description'] = 'Jaké GroupID by mì ly maily mít?';
-$lng['serversettings']['vmail_homedir']['title'] = 'Mails-Home adresáø';
-$lng['serversettings']['vmail_homedir']['description'] = 'Kam by se mì ly všechny maily ukládat?';
+$lng['serversettings']['apachereload_command']['title'] = 'Příkaz pro reload apache';
+$lng['serversettings']['apachereload_command']['description'] = 'Jaký je příkaz, kterým apache znovunahraje své konfigurační soubory?';
+$lng['serversettings']['bindconf_directory']['title'] = 'Bindujte konfigurační adresář';
+$lng['serversettings']['bindconf_directory']['description'] = 'Kde by měly být uloženy „bind configfiles“?';
+$lng['serversettings']['bindreload_command']['title'] = 'Bind reload příkaz';
+$lng['serversettings']['bindreload_command']['description'] = 'Jaký je příkaz pro znovunahrání „bind configfiles“?';
+$lng['serversettings']['binddefaultzone']['title'] = 'Bind výchozí zóna';
+$lng['serversettings']['binddefaultzone']['description'] = 'Jaký je název výchozí zóny?';
+$lng['serversettings']['vmail_uid']['title'] = 'UID e-mailů';
+$lng['serversettings']['vmail_uid']['description'] = 'Jaké UserID by měly e-maily mít?';
+$lng['serversettings']['vmail_gid']['title'] = 'GID e-mailů';
+$lng['serversettings']['vmail_gid']['description'] = 'Jaké GroupID by měly e-maily mít?';
+$lng['serversettings']['vmail_homedir']['title'] = 'Mails-Home adresář';
+$lng['serversettings']['vmail_homedir']['description'] = 'Kam by se měly všechny e-maily ukládat?';
 $lng['serversettings']['adminmail']['title'] = 'Odesílatel';
-$lng['serversettings']['adminmail']['description'] = 'Jaká je odesílatelova adresa pro emaily odeslané z Panelu?';
+$lng['serversettings']['adminmail']['description'] = 'Jaká je odesílatelova adresa pro e-maily odeslané z Panelu?';
 $lng['serversettings']['phpmyadmin_url']['title'] = 'phpMyAdminova URL';
-$lng['serversettings']['phpmyadmin_url']['description'] = 'Jaká je URL adresa phpMyAdmin? (musí zaèínat http(s)://)';
+$lng['serversettings']['phpmyadmin_url']['description'] = 'Jaká je URL adresa phpMyAdmin? (musí začínat http(s)://)';
 $lng['serversettings']['webmail_url']['title'] = 'WebMailová URL';
-$lng['serversettings']['webmail_url']['description'] = 'Jaká je URL adresa k WebMailu? (musí zaèínat with http(s)://)';
+$lng['serversettings']['webmail_url']['description'] = 'Jaká je URL adresa k WebMailu? (musí začínat with http(s)://)';
 $lng['serversettings']['webftp_url']['title'] = 'WebFTP URL';
-$lng['serversettings']['webftp_url']['description'] = 'Jaká je URL k WebFTP? (musí zaèínat with http(s)://)';
+$lng['serversettings']['webftp_url']['description'] = 'Jaká je URL k WebFTP? (musí začínat with http(s)://)';
 $lng['serversettings']['language']['description'] = 'Jaký je výchozí jazyk Vašeho serveru?';
-$lng['serversettings']['maxloginattempts']['title'] = 'Maximální poèet pokusù o pøihlášení';
-$lng['serversettings']['maxloginattempts']['description'] = 'Maximální poèet pokusù o pøihlášení k Úètu, než se Úèet zablokuje.';
+$lng['serversettings']['maxloginattempts']['title'] = 'Maximální počet pokusů o přihlášení';
+$lng['serversettings']['maxloginattempts']['description'] = 'Maximální počet pokusů o přihlášení k účtu, než se účet zablokuje.';
 $lng['serversettings']['deactivatetime']['title'] = 'Deaktivovaný po dobu';
-$lng['serversettings']['deactivatetime']['description'] = 'èas (sek.) po který bude Úèet deaktivován pro pøíliš mnoho pokusù o pøihlášení.';
+$lng['serversettings']['deactivatetime']['description'] = 'čas (sek.) po který bude účet deaktivován pro příliš mnoho pokusů o přihlášení.';
 $lng['serversettings']['pathedit']['title'] = 'Typ vstupu cesty';
-$lng['serversettings']['pathedit']['description'] = 'Mì la by být cesta vybírána pomocí vyskakovacího menu nebo vstupním polem?';
+$lng['serversettings']['pathedit']['description'] = 'Měla by být cesta vybírána pomocí vyskakovacího menu nebo vstupním polem?';
 $lng['serversettings']['nameservers']['title'] = 'Nameservery';
-$lng['serversettings']['nameservers']['description'] = 'Støedníkem oddì lený seznam obsahující hostname všech nameserverù. První bude primární.';
+$lng['serversettings']['nameservers']['description'] = 'Středníkem oddělený seznam obsahující hostname všech nameserverů. První bude primární.';
 $lng['serversettings']['mxservers']['title'] = 'MX servery';
-$lng['serversettings']['mxservers']['description'] = 'Støedníkem oddì lený seznam obsahující páry èísel a hostname oddì lených mezerou (napø. \'10 mx.example.com\') obsahující mx servery.';
+$lng['serversettings']['mxservers']['description'] = 'Středníkem oddělený seznam obsahující páry čísel a hostname oddělených mezerou (např. \'10 mx.example.com\') obsahující mx servery.';
 
 /**
  * CHANGED BETWEEN 1.2.12 and 1.2.13
  */
 
-$lng['mysql']['description'] = 'Zde mùžete vytváøet a mì nit své MySQL-Databáze.<br />Zmì ny jsou provedeny okamžitì  a databáze mùže být okamžitì  používána.<br />V menu vlevo mùžete najít nástroj phpMyAdmin se kterým mùžete jednoduše upravovat svou databázi.<br /><br />Pro použití databáze ve svých php skriptech použijte následující nastavení: (Data <i>kurzívou</i> musí být zmì nì na na Vámi vložené hodnoty!)<br />Host: <b><SQL_HOST></b><br />Uživatelské jméno: <b><i>Databasename</i></b><br />Heslo: <b><i>heslo které jste zvolili</i></b><br />Databáze: <b><i>Databasename</i></b>';
+$lng['mysql']['description'] = 'Zde můžete vytvářet a měnit své MySQL-Databáze.<br />Změny jsou provedeny okamžitě a databáze může být okamžitě používána.<br />V menu vlevo můžete najít nástroj phpMyAdmin se kterým můžete jednoduše upravovat svou databázi.<br /><br />Pro použití databáze ve svých php skriptech použijte následující nastavení: (Data <i>kurzívou</i> musí být změněna na Vámi vložené hodnoty!)<br />Host: <b><SQL_HOST></b><br />Uživatelské jméno: <b><i>Databasename</i></b><br />Heslo: <b><i>heslo které jste zvolili</i></b><br />Databáze: <b><i>Databasename</i></b>';
 
 /**
  * ADDED BETWEEN 1.2.12 and 1.2.13
  */
 
-$lng['serversettings']['paging']['title'] = 'Záznamù na stránku';
-$lng['serversettings']['paging']['description'] = 'Kolik záznamù by mì lo být zobrazeno na stránce? (0 = zrušit stránkování)';
-$lng['error']['ipstillhasdomains'] = 'IP/Port kombinace, kterou chcete smazat má stále pøiøazené domény, prosím pøeøaïte je k jiné IP/Port kombinaci než smažete tuto IP/Port kombinaci.';
-$lng['error']['cantdeletedefaultip'] = 'Nemùžete smazat IP/Port kombinaci výchozího pøeprodejce, prosím vytvoøte jinou IP/Port kombinaci výchozí pro pøeprodejce než smažete tuto IP/Port kombinaci.';
-$lng['error']['cantdeletesystemip'] = 'Nemùžete smazat poslední systémovou IP, buï vytvoøte novou IP/Port kombinaci pro systémovou IP nebo zmì �te IP systému.';
+$lng['serversettings']['paging']['title'] = 'Záznamů na stránku';
+$lng['serversettings']['paging']['description'] = 'Kolik záznamů by mělo být zobrazeno na stránce? (0 = zrušit stránkování)';
+$lng['error']['ipstillhasdomains'] = 'IP/Port kombinace, kterou chcete smazat má stále přiřazené domény, prosím přeřaďte je k jiné IP/Port kombinaci než smažete tuto IP/Port kombinaci.';
+$lng['error']['cantdeletedefaultip'] = 'Nemůžete smazat IP/Port kombinaci výchozího přeprodejce, prosím vytvořte jinou IP/Port kombinaci výchozí pro přeprodejce než smažete tuto IP/Port kombinaci.';
+$lng['error']['cantdeletesystemip'] = 'Nemůžete smazat poslední systémovou IP, buď vytvořte novou IP/Port kombinaci pro systémovou IP nebo změňte IP systému.';
 $lng['error']['myipaddress'] = '\'IP\'';
 $lng['error']['myport'] = '\'Port\'';
-$lng['error']['myipdefault'] = 'Musíte vybrat IP/Port kombinaci která by se mì la stát výchozí.';
+$lng['error']['myipdefault'] = 'Musíte vybrat IP/Port kombinaci která by se měla stát výchozí.';
 $lng['error']['myipnotdouble'] = 'Tato kombinace IP/Portu již existuje.';
-$lng['question']['admin_ip_reallydelete'] = 'Chcete opravdu smayat IP adresu %s?';
+$lng['question']['admin_ip_reallydelete'] = 'Chcete opravdu smazat IP adresu %s?';
 $lng['admin']['ipsandports']['ipsandports'] = 'IP a Porty';
-$lng['admin']['ipsandports']['add'] = 'Pøidat IP/Port';
+$lng['admin']['ipsandports']['add'] = 'Přidat IP/Port';
 $lng['admin']['ipsandports']['edit'] = 'Upravit IP/Port';
-$lng['admin']['ipsandports']['ipandport'] = 'IP/Port';
-$lng['admin']['ipsandports']['ip'] = 'IP';
-$lng['admin']['ipsandports']['port'] = 'Port';
 
 // ADDED IN 1.2.13-rc3
 
-$lng['error']['cantchangesystemip'] = 'Nemùžete zmì nit poslední systémovou IP, buï vytvoøte novou IP/Port kombinaci pro systémovou IP nebo zmì �te IP systému.';
-$lng['question']['admin_domain_reallydocrootoutofcustomerroot'] = 'Jste si jisti, že chcete aby root dokumentù pro tuto doménu nebyl v "customerroot" zákazníka?';
+$lng['error']['cantchangesystemip'] = 'Nemůžete změnit poslední systémovou IP, buď vytvořte novou IP/Port kombinaci pro systémovou IP nebo změňte IP systému.';
+$lng['question']['admin_domain_reallydocrootoutofcustomerroot'] = 'Jste si jisti, že chcete aby root dokumentů pro tuto doménu nebyl v „customerroot“ zákazníka?';
 
 // ADDED IN 1.2.14-rc1
 
 $lng['admin']['memorylimitdisabled'] = 'Zakázáno';
-$lng['domain']['openbasedirpath'] = 'OpenBasedir-cesta';
-$lng['domain']['docroot'] = 'Cesta z políèka nahoøe';
-$lng['domain']['homedir'] = 'Domovní adresáø';
+$lng['domain']['openbasedirpath'] = 'OpenBasedir cesta';
+$lng['domain']['docroot'] = 'Cesta z políčka nahoře';
+$lng['domain']['homedir'] = 'Domovní adresář';
 $lng['admin']['valuemandatory'] = 'Tato hodnota je povinná';
-$lng['admin']['valuemandatorycompany'] = 'Buï "jméno" a "køestní jméno" nebo "spoleènost" musí být vyplnì na';
-$lng['menue']['main']['username'] = 'Pøihlášen(a) jako: ';
-$lng['panel']['urloverridespath'] = 'URL (pøepíše cestu)';
+$lng['admin']['valuemandatorycompany'] = 'Buď „jméno“ a „křestní jméno“ nebo „společnost“ musí být vyplněna';
+$lng['menue']['main']['username'] = 'Přihlášen(a) jako: ';
+$lng['panel']['urloverridespath'] = 'URL (přepíše cestu)';
 $lng['panel']['pathorurl'] = 'Cesta nebo URL';
-$lng['error']['sessiontimeoutiswrong'] = 'Pouze èíselné "Session Timeout" je povoleno.';
-$lng['error']['maxloginattemptsiswrong'] = 'ouze èíselné "Maximální poèet pokusù o pøihlášení" je povoleno.';
-$lng['error']['deactivatetimiswrong'] = 'ouze èíselné "èas deaktivace" je povoleno.';
-$lng['error']['accountprefixiswrong'] = '"Pøedpona uživatele" je špatnì .';
-$lng['error']['mysqlprefixiswrong'] = '"SQL pøedpona" je špatnì .';
-$lng['error']['ftpprefixiswrong'] = '"FTP pøedpona" je špatnì .';
-$lng['error']['ipiswrong'] = '"IP-Adresa" je špatnì . Pouze validní IP adresa je povolena.';
-$lng['error']['vmailuidiswrong'] = '"Mails-uid" je špatnì . Je povoleno pouze èíselné UID.';
-$lng['error']['vmailgidiswrong'] = '"Mails-gid" je špatnì . Je povoleno pouze èíselné GID.';
-$lng['error']['adminmailiswrong'] = '"Sender-address" je špatnì . Je povolena pouze validní emailová adresa.';
-$lng['error']['pagingiswrong'] = '"Entries per Page"-value je špatnì . Jsou povolena pouze èísla.';
-$lng['error']['phpmyadminiswrong'] = 'phpMyAdmin-url naní správná url.';
+$lng['error']['sessiontimeoutiswrong'] = 'Pouze číselné „Session Timeout“ je povoleno.';
+$lng['error']['maxloginattemptsiswrong'] = 'Pouze číselné „Maximální počet pokusů o přihlášení“ je povoleno.';
+$lng['error']['deactivatetimiswrong'] = 'Pouze číselné „čas deaktivace“ je povoleno.';
+$lng['error']['accountprefixiswrong'] = '„Předpona uživatele“ je špatně.';
+$lng['error']['mysqlprefixiswrong'] = '„SQL předpona“ je špatně.';
+$lng['error']['ftpprefixiswrong'] = '„FTP předpona“ je špatně.';
+$lng['error']['ipiswrong'] = '„IP adresa“ je špatně. Pouze validní IP adresa je povolena.';
+$lng['error']['vmailuidiswrong'] = '„Mail uid“ je špatně. Je povoleno pouze číselné UID.';
+$lng['error']['vmailgidiswrong'] = '„Mail gid“ je špatně. Je povoleno pouze číselné GID.';
+$lng['error']['adminmailiswrong'] = '„Sender-address“ je špatně. Je povolena pouze validní e-mailová adresa.';
+$lng['error']['pagingiswrong'] = '„Entries per Page“-value je špatně. Jsou povolena pouze čísla.';
+$lng['error']['phpmyadminiswrong'] = 'phpMyAdmin url není správná url.';
 $lng['error']['webmailiswrong'] = 'WebMail-odkaz není správný odkaz.';
 $lng['error']['webftpiswrong'] = 'WebFTP-odkaz není správný odkaz.';
 $lng['domains']['hasaliasdomains'] = 'Má aliasové domény';
 $lng['serversettings']['defaultip']['title'] = 'Výchozí IP/Port';
 $lng['serversettings']['defaultip']['description'] = 'Jaká je výchozí IP/Port kombinace?';
 $lng['domains']['statstics'] = 'Statistika použití';
-$lng['panel']['ascending'] = 'sestupnì ';
-$lng['panel']['decending'] = 'vzestupnì ';
+$lng['panel']['ascending'] = 'sestupně';
+$lng['panel']['decending'] = 'vzestupně';
 $lng['panel']['search'] = 'Vyhledávání';
 $lng['panel']['used'] = 'použito';
 
 // ADDED IN 1.2.14-rc3
 
-$lng['panel']['translator'] = 'Pøekladatel';
+$lng['panel']['translator'] = 'Překladatel';
 
 // ADDED IN 1.2.14-rc4
 
-$lng['error']['stringformaterror'] = 'Hodnota pole "%s" není v oèekávaném formátu.';
+$lng['error']['stringformaterror'] = 'Hodnota pole „%s“ není v očekávaném formátu.';
 
 // ADDED IN 1.2.15-rc1
 
 $lng['admin']['serversoftware'] = 'Software serveru';
 $lng['admin']['phpversion'] = 'PHP-Verze';
-$lng['admin']['phpmemorylimit'] = 'PHP-Limit-Pamì ti';
+$lng['admin']['phpmemorylimit'] = 'PHP-Limit-Paměti';
 $lng['admin']['mysqlserverversion'] = 'MySQL verze serveru';
 $lng['admin']['mysqlclientversion'] = 'MySQL verze klienta';
 $lng['admin']['webserverinterface'] = 'Webserver rozhraní';
-$lng['domains']['isassigneddomain'] = 'Je pøiøazená doména';
-$lng['serversettings']['phpappendopenbasedir']['title'] = 'Cesty k pøidání k OpenBasedir';
-$lng['serversettings']['phpappendopenbasedir']['description'] = 'Tyto cesty (oddì leny pomocí "colons") budou vloženy  do OpenBasedir-statementu v každém vhost-containeru.';
+$lng['domains']['isassigneddomain'] = 'Je přiřazená doména';
+$lng['serversettings']['phpappendopenbasedir']['title'] = 'Cesty k přidání k OpenBasedir';
+$lng['serversettings']['phpappendopenbasedir']['description'] = 'Tyto cesty (odděleny pomocí „colons“) budou vloženy do OpenBasedir statementu v každém vhost-containeru.';
 
 // CHANGED IN 1.2.15-rc1
 
-$lng['error']['loginnameissystemaccount'] = 'Nemùžete vytvoøit Úèty, které jsou podobné systémovým Úètùm (napøíklad zaèínají "%s"). Prosím vložte jiné jméno Úètu.';
-$lng['error']['youcantdeleteyourself'] = 'Z bezpeènostních dùvodù se nemùžete smazat.';
-$lng['error']['youcanteditallfieldsofyourself'] = 'Poznámka: Z bezpeènostních dùvodù nemùžete upravovat všechna pole svého Úètu.';
+$lng['error']['loginnameissystemaccount'] = 'Nemůžete vytvořit účty, které jsou podobné systémovým účtům (například začínají „%s“). Prosím vložte jiné jméno účtu.';
+$lng['error']['youcantdeleteyourself'] = 'Z bezpečnostních důvodů se nemůžete smazat.';
+$lng['error']['youcanteditallfieldsofyourself'] = 'Poznámka: Z bezpečnostních důvodů nemůžete upravovat všechna pole svého účtu.';
 
 // ADDED IN 1.2.16-svn1
 
-$lng['serversettings']['natsorting']['title'] = 'Použít "lidské" tøídì ní v seznamech';
-$lng['serversettings']['natsorting']['description'] = 'øadit seznamy jako web1 -> web2 -> web11 místo web1 -> web11 -> web2.';
+$lng['serversettings']['natsorting']['title'] = 'Použít „lidské“ třídění v seznamech';
+$lng['serversettings']['natsorting']['description'] = 'řadit seznamy jako web1 -> web2 -> web11 místo web1 -> web11 -> web2.';
 
 // ADDED IN 1.2.16-svn2
 
 $lng['serversettings']['deactivateddocroot']['title'] = 'Docroot pro deaktivované uživatele';
-$lng['serversettings']['deactivateddocroot']['description'] = 'Když bude uživatel deaktivován, tato cesta bude použita jako jeho docroot. Ponechte prázdné, pokud nechcete vytváøet.';
+$lng['serversettings']['deactivateddocroot']['description'] = 'Když bude uživatel deaktivován, tato cesta bude použita jako jeho docroot. Ponechte prázdné, pokud nechcete vytvářet.';
 
 // ADDED IN 1.2.16-svn4
 
-$lng['panel']['reset'] = 'zrušit zmì ny';
-$lng['admin']['accountsettings'] = 'Nastavení Úètu';
+$lng['panel']['reset'] = 'zrušit změny';
+$lng['admin']['accountsettings'] = 'Nastavení účtu';
 $lng['admin']['panelsettings'] = 'Nastavení panelu';
 $lng['admin']['systemsettings'] = 'Nastavení systému';
 $lng['admin']['webserversettings'] = 'Nastavení webserveru';
 $lng['admin']['mailserversettings'] = 'Nastavení mailserveru';
 $lng['admin']['nameserversettings'] = 'Nastavení nameserveru';
-$lng['admin']['updatecounters'] = 'Pøepoèítat využití zdrojù';
-$lng['question']['admin_counters_reallyupdate'] = 'Opravdu chcete pøepoèítat využití zdrojù?';
-$lng['panel']['pathDescription'] = 'Pokud adresáø neexistuje, bude vytvoøen automaticky.';
+$lng['admin']['updatecounters'] = 'Přepočítat využití zdrojů';
+$lng['question']['admin_counters_reallyupdate'] = 'Opravdu chcete přepočítat využití zdrojů?';
+$lng['panel']['pathDescription'] = 'Pokud adresář neexistuje, bude vytvořen automaticky.';
 
 // ADDED IN 1.2.16-svn6
 
-$lng['mails']['trafficninetypercent']['mailbody'] = 'Vážený uživateli {NAME},\n\nPoužil jste {TRAFFICUSED} MB z Vámi dostupných {TRAFFIC} MB pøenosù.\nTo je více jak 90%.\n\nPøejeme hezký den, váš správce';
-$lng['mails']['trafficninetypercent']['subject'] = 'Dosahujíc vašeho limitu pøenosù';
-$lng['admin']['templates']['trafficninetypercent'] = 'Upozor�ovací mail pro zákazníky, pokud vyèerpají 90% z pøenosù';
-$lng['admin']['templates']['TRAFFIC'] = 'Nahrazeno pøenosy, které byly pøidì leny uživateli.';
-$lng['admin']['templates']['TRAFFICUSED'] = 'Nahrazeno pøenosy, které byly vyèerpány zákazníkem.';
+$lng['mails']['trafficninetypercent']['mailbody'] = 'Vážený uživateli {NAME},\n\nPoužil jste {TRAFFICUSED} MB z Vámi dostupných {TRAFFIC} MB přenosů.\nTo je více jak 90%.\n\nPřejeme hezký den, váš správce';
+$lng['mails']['trafficninetypercent']['subject'] = 'Dosahujíc vašeho limitu přenosů';
+$lng['admin']['templates']['trafficninetypercent'] = 'Upozorňovací mail pro zákazníky, pokud vyčerpají 90% z přenosů';
+$lng['admin']['templates']['TRAFFIC'] = 'Nahrazeno přenosy, které byly přiděleny uživateli.';
+$lng['admin']['templates']['TRAFFICUSED'] = 'Nahrazeno přenosy, které byly vyčerpány zákazníkem.';
 
 // ADDED IN 1.2.16-svn7
 
 $lng['admin']['subcanemaildomain']['never'] = 'Nikdy';
-$lng['admin']['subcanemaildomain']['choosableno'] = 'Výbì r, výchozí ne';
-$lng['admin']['subcanemaildomain']['choosableyes'] = 'Výbì r, výchozí ano';
+$lng['admin']['subcanemaildomain']['choosableno'] = 'Výběr, výchozí ne';
+$lng['admin']['subcanemaildomain']['choosableyes'] = 'Výběr, výchozí ano';
 $lng['admin']['subcanemaildomain']['always'] = 'Vždy';
-$lng['changepassword']['also_change_webalizer'] = ' také zmì �te heslo pro webalizer statistics';
+$lng['changepassword']['also_change_webalizer'] = ' také změňte heslo pro webalizer statistics';
 
 // ADDED IN 1.2.16-svn8
 
-$lng['serversettings']['mailpwcleartext']['title'] = 'Také uložte hesla mailových Úètù nešifrovaná v databázi';
-$lng['serversettings']['mailpwcleartext']['description'] = 'Pokud je toto nastaveno na "ano", všechna hesla budou ukládána bez šifrování (èístý text, èitelná pro kohokoliv s pøístupem k databázi) v tabulce mail_users. Toto aktivujte jen pokud to opravdu potøebujete!';
+$lng['serversettings']['mailpwcleartext']['title'] = 'Také uložte hesla e-mailových účtů nešifrovaná v databázi';
+$lng['serversettings']['mailpwcleartext']['description'] = 'Pokud je toto nastaveno na „ano“, všechna hesla budou ukládána bez šifrování (čístý text, čitelná pro kohokoliv s přístupem k databázi) v tabulce mail_users. Toto aktivujte jen pokud to opravdu potřebujete!';
 $lng['serversettings']['mailpwcleartext']['removelink'] = 'Kliknutím zde vymažete všechna nezašifrovaná hesla z tabulky.';
-$lng['question']['admin_cleartextmailpws_reallywipe'] = 'Opravdu chcete vymazat všechna nezašifrovaná hesla pro e-mailové Úèty z tabulky mail_users? Tento krok nelze vrátit zpì t!';
-$lng['admin']['configfiles']['overview'] = 'Pøehled';
-$lng['admin']['configfiles']['wizard'] = 'Prùvodce';
+$lng['question']['admin_cleartextmailpws_reallywipe'] = 'Opravdu chcete vymazat všechna nezašifrovaná hesla pro e-mailové účty z tabulky mail_users? Tento krok nelze vrátit zpět!';
+$lng['admin']['configfiles']['overview'] = 'Přehled';
+$lng['admin']['configfiles']['wizard'] = 'Průvodce';
 $lng['admin']['configfiles']['distribution'] = 'Distribuce';
 $lng['admin']['configfiles']['service'] = 'Služba';
-$lng['admin']['configfiles']['daemon'] = 'Daemon';
-$lng['admin']['configfiles']['http'] = 'Webserver (HTTP)';
-$lng['admin']['configfiles']['dns'] = 'Nameserver (DNS)';
-$lng['admin']['configfiles']['mail'] = 'Mailserver (IMAP/POP3)';
-$lng['admin']['configfiles']['smtp'] = 'Mailserver (SMTP)';
-$lng['admin']['configfiles']['ftp'] = 'FTP-Server';
 $lng['admin']['configfiles']['etc'] = 'Ostatní (System)';
 $lng['admin']['configfiles']['choosedistribution'] = '-- Vyberte distribuci --';
 $lng['admin']['configfiles']['chooseservice'] = '-- Vyberte službu --';
@@ -531,49 +507,47 @@ $lng['admin']['configfiles']['choosedaemon'] = '-- Vyberte daemona --';
 
 // ADDED IN 1.2.16-svn10
 
-$lng['serversettings']['ftpdomain']['title'] = 'FTP Úèty na doménì ';
-$lng['serversettings']['ftpdomain']['description'] = 'Zákazníci mohou vytváøet FTP Úèty user@customerdomain?';
+$lng['serversettings']['ftpdomain']['title'] = 'FTP účty na doméně';
+$lng['serversettings']['ftpdomain']['description'] = 'Zákazníci mohou vytvářet FTP účty user@customerdomain?';
 $lng['panel']['back'] = 'Back';
 
 // ADDED IN 1.2.16-svn12
 
-$lng['serversettings']['mod_log_sql']['title'] = 'Doèasnì  ukládat logy do databáze';
-$lng['serversettings']['mod_log_sql']['description'] = 'Použít <a target="blank" href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> pro doèasné uložení webrequestù<br /><b>Toto vyžaduje speciální <a target="blank" href="http://files.syscp.org/docs/mod_log_sql/" title="mod_log_sql - documentation">konfiguraci apache</a>!</b>';
-$lng['serversettings']['mod_fcgid']['title'] = 'Includuj PHP pøes mod_fcgid/suexec';
-$lng['serversettings']['mod_fcgid']['description'] = 'Použij mod_fcgid/suexec/libnss_mysql pro bì h PHP s odpovídajícím Úøivatelským Úètem.<br/><b>toto vyžaduje speciální konfiguraci apache!</b>';
+$lng['serversettings']['mod_fcgid']['title'] = 'Zpracuj PHP přes mod_fcgid/suexec';
+$lng['serversettings']['mod_fcgid']['description'] = 'Použij mod_fcgid/suexec/libnss_mysql pro běh PHP s odpovídajícím uživatelským účtem.<br/><b>toto vyžaduje speciální konfiguraci apache!</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Použij alternativní e-mailovou adresu';
-$lng['serversettings']['sendalternativemail']['description'] = 'Pošli email s heslem na jinou adresu pøi vytváøení emailového Úètu';
+$lng['serversettings']['sendalternativemail']['description'] = 'Pošli e-mail s heslem na jinou adresu při vytváření e-mailového účtu';
 $lng['emails']['alternative_emailaddress'] = 'Alternativní e-mailová adresa';
-$lng['mails']['pop_success_alternative']['mailbody'] = 'Vážený uživateli,\n\nVáš emailový Úèet {EMAIL}\nbyl Úspì šnì  nastaven.\nVaše heslo je {PASSWORD}.\n\nTento e-mail byl automaticky vygenerován,\nprosím neodpovídejte na nì j!\n\nPøejeme Vám hezký den, váš správce';
-$lng['mails']['pop_success_alternative']['subject'] = 'E-mailový Úèet byl Úspì šnì  vytvoøen';
-$lng['admin']['templates']['pop_success_alternative'] = 'Uvítací e-mail pro nové Úèty byl odeslán na alternativní adresu';
-$lng['admin']['templates']['EMAIL_PASSWORD'] = 'Nahrazeno heslem Úètu POP3/IMAP.';
+$lng['mails']['pop_success_alternative']['mailbody'] = 'Vážený uživateli,\n\nVáš e-mailový účet {EMAIL}\nbyl úspěšně nastaven.\nVaše heslo je {PASSWORD}.\n\nTento e-mail byl automaticky vygenerován,\nprosím neodpovídejte na něj!\n\nPřejeme Vám hezký den, váš správce';
+$lng['mails']['pop_success_alternative']['subject'] = 'E-mailový účet byl úspěšně vytvořen';
+$lng['admin']['templates']['pop_success_alternative'] = 'Uvítací e-mail pro nové účty byl odeslán na alternativní adresu';
+$lng['admin']['templates']['EMAIL_PASSWORD'] = 'Nahrazeno heslem účtu POP3/IMAP.';
 
 // ADDED IN 1.2.16-svn13
 
-$lng['error']['documentrootexists'] = 'Adresáø "%s" již existuje pro tohoto zákazníka. Prosím odstra�te jej, než budete znovu zákazníka vkládat.';
+$lng['error']['documentrootexists'] = 'Adresář „%s“ již existuje pro tohoto zákazníka. Prosím odstraňte jej, než budete znovu zákazníka vkládat.';
 
 // ADDED IN 1.2.16-svn14
 
-$lng['serversettings']['apacheconf_vhost']['title'] = 'Apache vhost konfiguraèní soubor/dirname';
-$lng['serversettings']['apacheconf_vhost']['description'] = 'Kde by mì la být uložena konfigurace vhosta? Mùžete zde buï specifikovat soubor (všichni vhosti v jednom souboru) nebo adresáø (každý vhost má vlastní soubor).';
-$lng['serversettings']['apacheconf_diroptions']['title'] = 'Apache diroptions konfiguraèní soubor/dirname';
-$lng['serversettings']['apacheconf_diroptions']['description'] = 'Kde by mì la být uložena konfigurace diroptions?  Mùžete zde buï specifikovat soubor (všichni diroptions v jednom souboru) nebo adresáø (každý diroption má vlastní soubor).';
+$lng['serversettings']['apacheconf_vhost']['title'] = 'Apache vhost konfigurační soubor/dirname';
+$lng['serversettings']['apacheconf_vhost']['description'] = 'Kde by měla být uložena konfigurace vhosta? Můžete zde buď specifikovat soubor (všichni vhosti v jednom souboru) nebo adresář (každý vhost má vlastní soubor).';
+$lng['serversettings']['apacheconf_diroptions']['title'] = 'Apache diroptions konfigurační soubor/dirname';
+$lng['serversettings']['apacheconf_diroptions']['description'] = 'Kde by měla být uložena konfigurace diroptions? Můžete zde buď specifikovat soubor (všichni diroptions v jednom souboru) nebo adresář (každý diroption má vlastní soubor).';
 $lng['serversettings']['apacheconf_htpasswddir']['title'] = 'Apache htpasswd dirname';
-$lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Kde by mì ly být uloženy htpasswd soubory pro ochranu adresáøù?';
+$lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Kde by měly být uloženy htpasswd soubory pro ochranu adresářů?';
 
 // ADDED IN 1.2.16-svn15
 
-$lng['error']['formtokencompromised'] = 'The request seems to be compromised. Z bezpeènostních dùvodù jste byli odhlášeni.';
+$lng['error']['formtokencompromised'] = 'The request seems to be compromised. Z bezpečnostních důvodů jste byli odhlášeni.';
 $lng['serversettings']['mysql_access_host']['title'] = 'MySQL-Access-Hosts';
-$lng['serversettings']['mysql_access_host']['description'] = 'Støedníkem oddì lený seznam hostù, ze kterých bude dovoleno uživatelùm se pøipojit k MySQL-Serveru.';
+$lng['serversettings']['mysql_access_host']['description'] = 'Středníkem oddělený seznam hostů, ze kterých bude dovoleno uživatelům se připojit k MySQL-Serveru.';
 
 // ADDED IN 1.2.18-svn1
 
-$lng['admin']['ipsandports']['create_listen_statement'] = 'Vytvoøit Listen statement';
-$lng['admin']['ipsandports']['create_namevirtualhost_statement'] = 'Vytvoøit NameVirtualHost statement';
-$lng['admin']['ipsandports']['create_vhostcontainer'] = 'Vytvoøit vHost-Container';
-$lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'] = 'Vytvoøit ServerName statement v vHost-Container';
+$lng['admin']['ipsandports']['create_listen_statement'] = 'Vytvořit Listen statement';
+$lng['admin']['ipsandports']['create_namevirtualhost_statement'] = 'Vytvořit NameVirtualHost statement';
+$lng['admin']['ipsandports']['create_vhostcontainer'] = 'Vytvořit vHost-Container';
+$lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'] = 'Vytvořit ServerName statement v vHost-Container';
 
 // ADDED IN 1.2.18-svn2
 
@@ -591,107 +565,101 @@ $lng['ticket']['noreply_email'] = 'tikety@froxlor';
 $lng['admin']['ticketsystem'] = 'Support-tikety';
 $lng['menue']['ticket']['ticket'] = 'Support tikety';
 $lng['menue']['ticket']['categories'] = 'Kategorie podpory';
-$lng['menue']['ticket']['archive'] = 'Archiv-tiketù';
+$lng['menue']['ticket']['archive'] = 'Archiv-tiketů';
 $lng['ticket']['description'] = 'Nastavit popis zde!';
-$lng['ticket']['ticket_new'] = 'Otevøít nový tiket';
-$lng['ticket']['ticket_reply'] = 'zodpovì dì t tiket';
-$lng['ticket']['ticket_reopen'] = 'Znovuotevøít tiket';
-$lng['ticket']['ticket_newcateory'] = 'Vytvoøit novou kategorii';
+$lng['ticket']['ticket_new'] = 'Otevřít nový tiket';
+$lng['ticket']['ticket_reply'] = 'zodpovědět tiket';
+$lng['ticket']['ticket_reopen'] = 'Znovuotevřít tiket';
+$lng['ticket']['ticket_newcateory'] = 'Vytvořit novou kategorii';
 $lng['ticket']['ticket_editcateory'] = 'Upravit kategorii';
 $lng['ticket']['ticket_view'] = 'Zobrazit ticketcourse';
 $lng['ticket']['ticketcount'] = 'Tikety';
-$lng['ticket']['ticket_answers'] = 'Odpovì di';
+$lng['ticket']['ticket_answers'] = 'Odpovědi';
 $lng['ticket']['lastchange'] = 'Poslední akce';
-$lng['ticket']['subject'] = 'Pøedmì t';
-$lng['ticket']['status'] = 'Status';
+$lng['ticket']['subject'] = 'Předmět';
+$lng['ticket']['status'] = 'Stav';
 $lng['ticket']['lastreplier'] = 'Poslední odpovídající';
 $lng['ticket']['priority'] = 'Priorita';
 $lng['ticket']['low'] = 'Nízká';
 $lng['ticket']['normal'] = 'Normální';
 $lng['ticket']['high'] = 'Vysoká';
-$lng['ticket']['lastchange'] = 'Poslední zmì na';
+$lng['ticket']['lastchange'] = 'Poslední změna';
 $lng['ticket']['lastchange_from'] = 'Od data (dd.mm.yyyy)';
 $lng['ticket']['lastchange_to'] = 'Do data (dd.mm.yyyy)';
 $lng['ticket']['category'] = 'Kategorie';
 $lng['ticket']['no_cat'] = 'žádná';
 $lng['ticket']['message'] = 'Zpráva';
 $lng['ticket']['show'] = 'Zobraz';
-$lng['ticket']['answer'] = 'Odpovì ï';
-$lng['ticket']['close'] = 'Zavøít';
-$lng['ticket']['reopen'] = 'Znovuotevøít';
+$lng['ticket']['answer'] = 'Odpověď';
+$lng['ticket']['close'] = 'Zavřít';
+$lng['ticket']['reopen'] = 'Znovuotevřít';
 $lng['ticket']['archive'] = 'Archiv';
 $lng['ticket']['ticket_delete'] = 'Smazat tiket';
 $lng['ticket']['lastarchived'] = 'Nedávno archivované tikety';
 $lng['ticket']['archivedtime'] = 'Archivováno';
-$lng['ticket']['open'] = 'Otevøít';
-$lng['ticket']['wait_reply'] = 'èeká na odpovì ï';
-$lng['ticket']['replied'] = 'Odpovì zeno';
-$lng['ticket']['closed'] = 'Zavøený';
+$lng['ticket']['open'] = 'Otevřít';
+$lng['ticket']['wait_reply'] = 'čeká na odpověď';
+$lng['ticket']['replied'] = 'Odpovězeno';
+$lng['ticket']['closed'] = 'Zavřený';
 $lng['ticket']['staff'] = 'Personál';
 $lng['ticket']['customer'] = 'Zákazník';
 $lng['ticket']['old_tickets'] = 'Tiket zprávy';
 $lng['ticket']['search'] = 'Prohledat archiv';
-$lng['ticket']['nocustomer'] = 'žádný výbì r';
+$lng['ticket']['nocustomer'] = 'žádný výběr';
 $lng['ticket']['archivesearch'] = 'Výsledky prohledávání archivu';
 $lng['ticket']['noresults'] = 'Nenalezeny žádné tikety';
-$lng['ticket']['notmorethanxopentickets'] = 'Kvùli ochranì  proti SPAMu nemùžete mít otevøeno víc jak %s tiketù';
-$lng['ticket']['supportstatus'] = 'Status-podpory';
-$lng['ticket']['supportavailable'] = '<span class="ticket_low">Naše podpora jsou k dispozici a pøipraveni pomoci.</span>';
-$lng['ticket']['supportnotavailable'] = '<span class="ticket_high">Naše podpora není momentálnì  dostupná</span>';
-$lng['admin']['templates']['ticket'] = 'Upozor�ovací e-maily pro tikety podpory';
-$lng['admin']['templates']['SUBJECT'] = 'Nahrazeno pøedmì tem tiketu podpory';
-$lng['admin']['templates']['new_ticket_for_customer'] = 'Zákaznické upozornì ní, že byl tiket odeslán';
-$lng['admin']['templates']['new_ticket_by_customer'] = 'Administrátorské upozornì ní, že byl tiket otevøen zákazníkem';
-$lng['admin']['templates']['new_reply_ticket_by_customer'] = 'Administrátorské upozornì ní, že pøišla odpovì ï na tiket od zákazníka';
-$lng['admin']['templates']['new_ticket_by_staff'] = 'Zákaznické upozornì ní, že byl tiket otevøen personálem';
-$lng['admin']['templates']['new_reply_ticket_by_staff'] = 'Zákaznické upozornì ní na odpovì ï na tiket od personálu';
-$lng['mails']['new_ticket_for_customer']['mailbody'] = 'Vážený uživateli {FIRSTNAME} {NAME},\n\nVáš tiket podpory s pøedmì tem "{SUBJECT}" byl odeslán.\n\nAž pøijde odpovì ï na Váš tiket, budete upozornì ni.\n\nDì kujeme,\n váš správce';
+$lng['ticket']['notmorethanxopentickets'] = 'Kvůli ochraně proti SPAMu nemůžete mít otevřeno víc jak %s tiketů';
+$lng['ticket']['supportstatus'] = 'Stav podpory';
+$lng['ticket']['supportavailable'] = '<span class="ticket_low">Naše podpora jsou k dispozici a připraveni pomoci.</span>';
+$lng['ticket']['supportnotavailable'] = '<span class="ticket_high">Naše podpora není momentálně dostupná</span>';
+$lng['admin']['templates']['ticket'] = 'Upozorňovací e-maily pro tikety podpory';
+$lng['admin']['templates']['SUBJECT'] = 'Nahrazeno předmětem tiketu podpory';
+$lng['admin']['templates']['new_ticket_for_customer'] = 'Zákaznické upozornění, že byl tiket odeslán';
+$lng['admin']['templates']['new_ticket_by_customer'] = 'Administrátorské upozornění, že byl tiket otevřen zákazníkem';
+$lng['admin']['templates']['new_reply_ticket_by_customer'] = 'Administrátorské upozornění, že přišla odpověď na tiket od zákazníka';
+$lng['admin']['templates']['new_ticket_by_staff'] = 'Zákaznické upozornění, že byl tiket otevřen personálem';
+$lng['admin']['templates']['new_reply_ticket_by_staff'] = 'Zákaznické upozornění na odpověď na tiket od personálu';
+$lng['mails']['new_ticket_for_customer']['mailbody'] = 'Vážený uživateli {FIRSTNAME} {NAME},\n\nVáš tiket podpory s předmětem „{SUBJECT}“ byl odeslán.\n\nAž přijde odpověď na Váš tiket, budete upozorněni.\n\nDěkujeme,\n váš správce';
 $lng['mails']['new_ticket_for_customer']['subject'] = 'Váš tiket na podporu byl odeslán';
-$lng['mails']['new_ticket_by_customer']['mailbody'] = 'Milý administrátore,\n\nbyl odeslán nový tiket s pøedmì tem "{SUBJECT}".\n\nProsím pøihlašte se pro otevøení tiketu.\n\nDì kujeme,\n váš správce';
+$lng['mails']['new_ticket_by_customer']['mailbody'] = 'Milý administrátore,\n\nbyl odeslán nový tiket s předmětem „{SUBJECT}“.\n\nProsím přihlašte se pro otevření tiketu.\n\nDěkujeme,\n váš správce';
 $lng['mails']['new_ticket_by_customer']['subject'] = 'Nový tiket podpory byl odeslán';
-$lng['mails']['new_reply_ticket_by_customer']['mailbody'] = 'Milý administrátore,\n\ntiket podpory "{SUBJECT}" byl zodpovì zen zákazníkem.\n\nProsím pøihlašte se pro otevøení tiketu.\n\nDì kujeme,\n váš správce';
-$lng['mails']['new_reply_ticket_by_customer']['subject'] = 'Nová odpovì ï na tiket podpory';
-$lng['mails']['new_ticket_by_staff']['mailbody'] = 'Vážený uživateli {FIRSTNAME} {NAME},\n\nbyl pro Vás otevøen tiket podpory s pøedmì tem "{SUBJECT}".\n\nProsím pøihlašte se pro otevøení tiketu.\n\nDì kujeme,\n váš správce';
+$lng['mails']['new_reply_ticket_by_customer']['mailbody'] = 'Milý administrátore,\n\ntiket podpory „{SUBJECT}“ byl zodpovězen zákazníkem.\n\nProsím přihlašte se pro otevření tiketu.\n\nDěkujeme,\n váš správce';
+$lng['mails']['new_reply_ticket_by_customer']['subject'] = 'Nová odpověď na tiket podpory';
+$lng['mails']['new_ticket_by_staff']['mailbody'] = 'Vážený uživateli {FIRSTNAME} {NAME},\n\nbyl pro Vás otevřen tiket podpory s předmětem „{SUBJECT}“.\n\nProsím přihlašte se pro otevření tiketu.\n\nDěkujeme,\n váš správce';
 $lng['mails']['new_ticket_by_staff']['subject'] = 'Nový tiket podpory byl odeslán';
-$lng['mails']['new_reply_ticket_by_staff']['mailbody'] = 'Vážený uživateli {FIRSTNAME} {NAME},\n\ntiket podpory s pøedmì tem "{SUBJECT}" byl zodpovì zen naším personálem.\n\nPro pøeètení tiketu se prosím pøihlašte.\n\nDì kujem,\n váš správce';
-$lng['mails']['new_reply_ticket_by_staff']['subject'] = 'Nová odpovì ï na tiket podpory';
-$lng['question']['ticket_reallyclose'] = 'Opravdu chcete zavøít tiket "%s"?';
-$lng['question']['ticket_reallydelete'] = 'Opravdu chcete smazat tiket "%s"?';
-$lng['question']['ticket_reallydeletecat'] = 'Opravdu chcete smazat kategorii "%s"?';
-$lng['question']['ticket_reallyarchive'] = 'Opravdu chcete pøesunout tiket "%s" do archivu?';
-$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
-$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
-$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
+$lng['mails']['new_reply_ticket_by_staff']['mailbody'] = 'Vážený uživateli {FIRSTNAME} {NAME},\n\ntiket podpory s předmětem „{SUBJECT}“ byl zodpovězen naším personálem.\n\nPro přečtení tiketu se prosím přihlašte.\n\nDěkujem,\n váš správce';
+$lng['mails']['new_reply_ticket_by_staff']['subject'] = 'Nová odpověď na tiket podpory';
+$lng['question']['ticket_reallyclose'] = 'Opravdu chcete zavřít tiket „%s“?';
+$lng['question']['ticket_reallydelete'] = 'Opravdu chcete smazat tiket „%s“?';
+$lng['question']['ticket_reallydeletecat'] = 'Opravdu chcete smazat kategorii „%s“?';
+$lng['question']['ticket_reallyarchive'] = 'Opravdu chcete přesunout tiket „%s“ do archivu?';
 $lng['error']['nomoreticketsavailable'] = 'Použili jste všechny dostupné tikety. Prosím kontaktujte svého administrátora.';
-$lng['error']['nocustomerforticket'] = 'Nemohu vytváøet tikety bez zákazníkù';
+$lng['error']['nocustomerforticket'] = 'Nemohu vytvářet tikety bez zákazníků';
 $lng['error']['categoryhastickets'] = 'Kategorie stále obsahuje tikety.<br />Prosím smažte tikety aby jste mohli smazat kategorii';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Tikety-podpory nastavení';
-$lng['admin']['archivelastrun'] = 'Poslední archivace tiketù';
-$lng['serversettings']['ticket']['noreply_email']['title'] = 'Bez odpovì dní e-mailová adresa';
-$lng['serversettings']['ticket']['noreply_email']['description'] = 'Odesílatelova adresa pro tikety podpory, vì tšinou nì co jako no-reply@domain.tld';
-$lng['serversettings']['ticket']['worktime_begin']['title'] = 'Zaèátek práce podpory (hh:mm)';
+$lng['admin']['archivelastrun'] = 'Poslední archivace tiketů';
+$lng['serversettings']['ticket']['noreply_email']['title'] = 'Bez odpovědní e-mailová adresa';
+$lng['serversettings']['ticket']['noreply_email']['description'] = 'Odesílatelova adresa pro tikety podpory, většinou něco jako no-reply@domain.tld';
+$lng['serversettings']['ticket']['worktime_begin']['title'] = 'Začátek práce podpory (hh:mm)';
 $lng['serversettings']['ticket']['worktime_begin']['description'] = 'Start-time pokud je podpora k dispozici';
 $lng['serversettings']['ticket']['worktime_end']['title'] = 'Konec práce podpory (hh:mm)';
 $lng['serversettings']['ticket']['worktime_end']['description'] = 'End-time pokud je podpora k dispozici';
 $lng['serversettings']['ticket']['worktime_sat'] = 'Je podpora k dispozici o sobotách?';
-$lng['serversettings']['ticket']['worktime_sun'] = 'Je podpora k dispozici o nedì lích?';
-$lng['serversettings']['ticket']['worktime_all']['title'] = 'Podpora bez èasového omezení';
-$lng['serversettings']['ticket']['worktime_all']['description'] = 'Pokud "Ano" možnosti zaèátku a konce práce podpory bude pøepsána';
-$lng['serversettings']['ticket']['archiving_days'] = 'Po kolika dnech by mì ly být uzavøené tikety archivovány?';
+$lng['serversettings']['ticket']['worktime_sun'] = 'Je podpora k dispozici o nedělích?';
+$lng['serversettings']['ticket']['worktime_all']['title'] = 'Podpora bez časového omezení';
+$lng['serversettings']['ticket']['worktime_all']['description'] = 'Pokud „Ano“ možnosti začátku a konce práce podpory bude přepsána';
+$lng['serversettings']['ticket']['archiving_days'] = 'Po kolika dnech by měly být uzavřené tikety archivovány?';
 $lng['customer']['tickets'] = 'Tikety podpory';
 
 // ADDED IN 1.2.18-svn4
 
-$lng['admin']['domain_nocustomeraddingavailable'] = 'Momentálnì  není možné pøidat doménu. Nejdøíve musíte pøidat aspo� jednoho zákazníka.';
-$lng['serversettings']['ticket']['enable'] = 'Zapnout systém tiketù';
-$lng['serversettings']['ticket']['concurrentlyopen'] = 'Kolik tiketù by mì lo být k dispozici najednou?';
-$lng['error']['norepymailiswrong'] = '"Bezodpovì dní adresa" je špatnì . Je povolena pouze validní e-mailová adresa.';
-$lng['error']['tadminmailiswrong'] = '"Ticketadmin-adresa" je špatnì . Je povolena pouze validní e-mailová adresa.';
-$lng['ticket']['awaitingticketreply'] = 'Máte %s nezodpovì zených tiketù podpory';
+$lng['admin']['domain_nocustomeraddingavailable'] = 'Momentálně není možné přidat doménu. Nejdříve musíte přidat aspoň jednoho zákazníka.';
+$lng['serversettings']['ticket']['enable'] = 'Zapnout systém tiketů';
+$lng['serversettings']['ticket']['concurrentlyopen'] = 'Kolik tiketů by mělo být k dispozici najednou?';
+$lng['error']['norepymailiswrong'] = '„Bezodpovědní adresa“ je špatně. Je povolena pouze validní e-mailová adresa.';
+$lng['error']['tadminmailiswrong'] = '„Ticketadmin-adresa“ je špatně. Je povolena pouze validní e-mailová adresa.';
+$lng['ticket']['awaitingticketreply'] = 'Máte %s nezodpovězených tiketů podpory';
 
 // ADDED IN 1.2.18-svn5
 
-$lng['serversettings']['ticket']['noreply_name'] = 'Jméno odesílatele tiketù v emailu';
-
-?>
+$lng['serversettings']['ticket']['noreply_name'] = 'Jméno odesílatele tiketů v e-mailu';

lng/danish.lng.php

@@ -105,8 +105,6 @@ $lng['index']['accountdetails'] = 'Konto Detaljer';
  * Change Password
  */
 
-$lng['changepassword']['old_password'] = 'Old password';
-$lng['changepassword']['new_password'] = 'New password';
 $lng['changepassword']['new_password_confirm'] = 'Nyt kodeord (bekræft)';
 $lng['changepassword']['new_password_ifnotempty'] = 'Nyt kodeord (tom = ingen ændringer)';
 $lng['changepassword']['also_change_ftp'] = ' skift også kodeordet for hoved-ftp kontoen';
@@ -167,10 +165,6 @@ $lng['extras']['view_directory'] = 'vis mappe indhold';
 $lng['extras']['pathoptions_add'] = 'tilføj regler for sti';
 $lng['extras']['directory_browsing'] = 'vis mappe indhold?';
 $lng['extras']['pathoptions_edit'] = 'ændre regler for sti';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'URL til ErrorDocument 404';
 $lng['extras']['errordocument403path'] = 'URL til ErrorDocument 403';
 $lng['extras']['errordocument500path'] = 'URL til ErrorDocument 500';
@@ -191,7 +185,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Du skal først slette alle sub-dom
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Du har allerede valgt en Fang-Alt adresse for dette domæne.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'Du kan ikke slette din primære FTP konto.';
 $lng['error']['login'] = 'Den indtastede bruger/kode er ikke korrekt. Forsøg venligst igen.';
-$lng['error']['login_blocked'] = 'Denne konto er blevet midlertidigt lukket grundet for mange fejlagtige logind forsøg.<br />Forsøg venligst igen om ' . $settings['login']['deactivatetime'] . ' sekunder.';
+$lng['error']['login_blocked'] = 'Denne konto er blevet midlertidigt lukket grundet for mange fejlagtige logind forsøg.<br />Forsøg venligst igen om %s sekunder.';
 $lng['error']['notallreqfieldsorerrors'] = 'Alle krævede felter er ikke udfyldt, eller der er fejl i en eller flere af udfyldningerne.';
 $lng['error']['oldpasswordnotcorrect'] = 'Det gamle kodeord er ikke indtastet korrekt.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'Du kan ikke tildele flere ressourcer end du er blevet bevilliget.';
@@ -199,15 +193,7 @@ $lng['error']['mustbeurl'] = 'Din indtastning er ikke en gyldig URL (f.eks. http
 $lng['error']['invalidpath'] = 'Du har valgt en ikke gyldig url (måske et problem med mappe list?)';
 $lng['error']['stringisempty'] = 'Manglende intasting i feltet';
 $lng['error']['stringiswrong'] = 'Forkert indtastning i feltet';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'Det nye kodeord og kontrol indtastning stemmer ikke overens';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domæne\'';
 $lng['error']['mydocumentroot'] = '\'Mapperod\'';
 $lng['error']['loginnameexists'] = 'Brugernavnet %s eksisterer allerede';
@@ -234,7 +220,6 @@ $lng['error']['destinationnonexist'] = 'Opret venligst videresenderen i feltet.'
 $lng['error']['destinationalreadyexistasmail'] = 'Videresenderen til %s eksisterer allerede som en aktiv eMail-adresse.';
 $lng['error']['destinationalreadyexist'] = 'Der er allerede angivet en videresender til %s .';
 $lng['error']['destinationiswrong'] = 'Videresenderen %s indeholder ugyldige tegn eller er ikke komplet.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -448,5 +433,3 @@ $lng['admin']['phpmemorylimit'] = 'PHP Hukommelses Græse';
 $lng['admin']['mysqlserverversion'] = 'MySQL Server Version';
 $lng['admin']['mysqlclientversion'] = 'MySQL Klient Version';
 $lng['admin']['webserverinterface'] = 'Webserver Brugerflade';
-
-?>

lng/dutch.lng.php

@@ -50,7 +50,6 @@ $lng['login']['profile_lng'] = 'Profiel taal';
  * Customer
  */
 
-$lng['customer']['documentroot'] = 'Home directory';
 $lng['customer']['name'] = 'Naam';
 $lng['customer']['firstname'] = 'Voornaam';
 $lng['customer']['company'] = 'Bedrijfsnaam';
@@ -63,11 +62,7 @@ $lng['customer']['email'] = 'Email';
 $lng['customer']['customernumber'] = 'Klant ID';
 $lng['customer']['diskspace'] = 'Webruimte (MB)';
 $lng['customer']['traffic'] = 'Verkeer (GB)';
-$lng['customer']['mysqls'] = 'MySQL-Databases';
 $lng['customer']['emails'] = 'E-mail-Adressen';
-$lng['customer']['accounts'] = 'E-mail-Accounts';
-$lng['customer']['forwarders'] = 'E-mail-Forwarders';
-$lng['customer']['ftps'] = 'FTP-Accounts';
 $lng['customer']['subdomains'] = 'Sub-Domein(en)';
 $lng['customer']['domains'] = 'Domein(en)';
 $lng['customer']['unlimited'] = 'onbeperkt';
@@ -79,18 +74,9 @@ $lng['customer']['unlimited'] = 'onbeperkt';
 $lng['menue']['main']['main'] = 'Main';
 $lng['menue']['main']['changepassword'] = 'Wijzig wachtwoord';
 $lng['menue']['main']['changelanguage'] = 'Wijzig taal';
-$lng['menue']['email']['email'] = 'E-mail';
 $lng['menue']['email']['emails'] = 'Adressen';
-$lng['menue']['email']['webmail'] = 'WebMail';
-$lng['menue']['mysql']['mysql'] = 'MySQL';
-$lng['menue']['mysql']['databases'] = 'Databases';
-$lng['menue']['mysql']['phpmyadmin'] = 'phpMyAdmin';
 $lng['menue']['domains']['domains'] = 'Domeinen';
 $lng['menue']['domains']['settings'] = 'Instellingen';
-$lng['menue']['ftp']['ftp'] = 'FTP';
-$lng['menue']['ftp']['accounts'] = 'Accounts';
-$lng['menue']['ftp']['webftp'] = 'WebFTP';
-$lng['menue']['extras']['extras'] = 'Extras';
 $lng['menue']['extras']['directoryprotection'] = 'Map beveiliging';
 $lng['menue']['extras']['pathoptions'] = 'pad opties';
 
@@ -134,12 +120,10 @@ $lng['emails']['emails_add'] = 'Maak nieuw e-mail adres';
 $lng['emails']['emails_edit'] = 'Bewerk e-mail-adres';
 $lng['emails']['catchall'] = 'Catchall';
 $lng['emails']['iscatchall'] = 'Definieer als catchall-adres?';
-$lng['emails']['account'] = 'Account';
 $lng['emails']['account_add'] = 'Maak nieuw account';
 $lng['emails']['account_delete'] = 'Verwijder account';
 $lng['emails']['from'] = 'Van';
 $lng['emails']['to'] = 'Aan';
-$lng['emails']['forwarders'] = 'Forwarders';
 $lng['emails']['forwarder_add'] = 'Maak forwarder';
 
 /**
@@ -167,10 +151,6 @@ $lng['extras']['view_directory'] = 'map inhoud laten zien';
 $lng['extras']['pathoptions_add'] = 'Pad opties toevoegen';
 $lng['extras']['directory_browsing'] = 'map inhoud browsen';
 $lng['extras']['pathoptions_edit'] = 'Pad opties bewerken';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'URL naar Foutdocument 404';
 $lng['extras']['errordocument403path'] = 'URL naar Foutdocument 403';
 $lng['extras']['errordocument500path'] = 'URL naar Foutdocument 500';
@@ -191,7 +171,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'U moet eerst alle subdomeinen verwi
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'U heeft al een catchall voor dit domein aangemaakt.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'U kunt uw hoofd FTP account niet verwijderen';
 $lng['error']['login'] = 'De door u ingegeven gebruikersnaam en wacthwoord zijn verkeerd. Probeer opnieuw!';
-$lng['error']['login_blocked'] = 'Dit account is inactief vanwege teveel login fouten. <br />Probeer het nog eens over ' . $settings['login']['deactivatetime'] . ' seconden.';
+$lng['error']['login_blocked'] = 'Dit account is inactief vanwege teveel login fouten. <br />Probeer het nog eens over %s seconden.';
 $lng['error']['notallreqfieldsorerrors'] = 'U heeft niet alle velden goed, of helemaal niet ingevuld.';
 $lng['error']['oldpasswordnotcorrect'] = 'Het oude wachtwoord is niet correct.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'U kunt niet meer resources gebruiken dan dat u bezit.';
@@ -199,17 +179,7 @@ $lng['error']['mustbeurl'] = 'U heeft geen goed of compleet URL ingegeven (bijv.
 $lng['error']['invalidpath'] = 'U heeft geen goed URL ingegeven (misschien een probleem met dirlisting?)';
 $lng['error']['stringisempty'] = 'Geen waarde in invoerveld';
 $lng['error']['stringiswrong'] = 'Verkeerde waarde in invoerveld';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'Het nieuwe wacthwoord en de bevestiging zijn niet gelijk';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
-$lng['error']['mydomain'] = '\'Domain\'';
-$lng['error']['mydocumentroot'] = '\'Documentroot\'';
 $lng['error']['loginnameexists'] = 'Loginnaam %s bestaat al';
 $lng['error']['emailiswrong'] = 'E-mail Adres %s bevat illegale karakters of is niet compleet';
 $lng['error']['loginnameiswrong'] = 'Loginnaame %s bevat illegale karakters';
@@ -234,7 +204,6 @@ $lng['error']['destinationnonexist'] = 'Maak uw forwarder in het veld \'Destinat
 $lng['error']['destinationalreadyexistasmail'] = 'De forwarder naar %s bestaat reeds als actief e-mail adres.';
 $lng['error']['destinationalreadyexist'] = 'U heeft al een forwarder die verwijst naar %s .';
 $lng['error']['destinationiswrong'] = 'De forwarder naar %s bevat illegale karakter(s) of is niet compleet.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -272,12 +241,10 @@ $lng['mails']['createcustomer']['subject'] = 'Account informatie';
 $lng['admin']['overview'] = 'Overzicht';
 $lng['admin']['ressourcedetails'] = 'Gebruikte resources';
 $lng['admin']['systemdetails'] = 'Systeem Details';
-$lng['admin']['froxlordetails'] = 'Froxlor Details';
 $lng['admin']['installedversion'] = 'Geinstalleerde Versie';
 $lng['admin']['latestversion'] = 'Laatste Versie';
 $lng['admin']['lookfornewversion']['clickhere'] = 'zoeken via webservice';
 $lng['admin']['lookfornewversion']['error'] = 'Fout tijdens lezen';
-$lng['admin']['resources'] = 'Resources';
 $lng['admin']['customer'] = 'Klant';
 $lng['admin']['customers'] = 'Klanten';
 $lng['admin']['customer_add'] = 'Maak klant';
@@ -448,12 +415,10 @@ $lng['error']['stringformaterror'] = 'De waarde voor het veld "%s" is niet in he
 
 // ADDED IN 1.2.15-rc1
 
-$lng['admin']['serversoftware'] = 'Serversoftware';
 $lng['admin']['phpversion'] = 'PHP-Versie';
 $lng['admin']['phpmemorylimit'] = 'PHP-Geheugen-Limiet';
 $lng['admin']['mysqlserverversion'] = 'MySQL Server Versie';
 $lng['admin']['mysqlclientversion'] = 'MySQL Client Versie';
-$lng['admin']['webserverinterface'] = 'Webserver Interface';
 $lng['domains']['isassigneddomain'] = 'Is toegewezen domein';
 $lng['serversettings']['phpappendopenbasedir']['title'] = 'Pad wat toegevoegd word aan OpenBasedir';
 $lng['serversettings']['phpappendopenbasedir']['description'] = 'Deze paden (gescheiden door dubbele punten) zullen worden toegevoegd aan het OpenBasedir-statement in iedere vhost-container.';
@@ -513,12 +478,6 @@ $lng['admin']['configfiles']['overview'] = 'Overzicht';
 $lng['admin']['configfiles']['wizard'] = 'Wizard';
 $lng['admin']['configfiles']['distribution'] = 'Distributie';
 $lng['admin']['configfiles']['service'] = 'Dienst';
-$lng['admin']['configfiles']['daemon'] = 'Daemon';
-$lng['admin']['configfiles']['http'] = 'Webserver (HTTP)';
-$lng['admin']['configfiles']['dns'] = 'Nameserver (DNS)';
-$lng['admin']['configfiles']['mail'] = 'Mailserver (IMAP/POP3)';
-$lng['admin']['configfiles']['smtp'] = 'Mailserver (SMTP)';
-$lng['admin']['configfiles']['ftp'] = 'FTP-Server';
 $lng['admin']['configfiles']['etc'] = 'Overigen (Systeem)';
 $lng['admin']['configfiles']['choosedistribution'] = '-- Kies een distributie --';
 $lng['admin']['configfiles']['chooseservice'] = '-- Kies een dienst --';
@@ -532,8 +491,6 @@ $lng['panel']['back'] = 'Back';
 
 // ADDED IN 1.2.16-svn12
 
-$lng['serversettings']['mod_log_sql']['title'] = 'Logs tijdelijk opslaan in de database';
-$lng['serversettings']['mod_log_sql']['description'] = 'Gebruike <a target="blank" href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> om toegangslogs tijdelijk in de database op te slaan<br /><b>Dit vereist een speciale <a target="blank" href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - documentation">configuratie van Apache</a>!</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'PHP insluiten via mod_fcgid/suexec';
 $lng['serversettings']['mod_fcgid']['description'] = 'Gebruik mod_fcgid/suexec/libnss_mysql om PHP uit te voeren onder het gebruikersaccount.<br/><b>Dit vereist een aangepaste configuratie van de webserver. Alle volgende optie\'s zijn alleen geldig wanneer deze module actief is.</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Gebruik alternatief emailadres';
@@ -654,13 +611,9 @@ $lng['question']['ticket_reallyclose'] = 'Weet u zeker dat u ticket "%s" wilt sl
 $lng['question']['ticket_reallydelete'] = 'Weet u zeker dat u ticket "%s" wilt verwijderen?';
 $lng['question']['ticket_reallydeletecat'] = 'Weet u zeker dat u de categorie "%s" wilt verwijderen?';
 $lng['question']['ticket_reallyarchive'] = 'Weet u zeker dat u ticket "%s" wilt archiveren?';
-$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
-$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
-$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
 $lng['error']['nomoreticketsavailable'] = 'U hebt al uw beschikbare tickets verbruikt. Neem contact op met uw beheerder.';
 $lng['error']['nocustomerforticket'] = 'U kunt geen tickets aanmaken zonder gebruikers';
 $lng['error']['categoryhastickets'] = 'Deze categorie bevat nog tickets.<br />Verwijder de tickets eerst alvorens de categorie te verwijderen';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Instellingen voor ondersteuningstickets';
 $lng['admin']['archivelastrun'] = 'Laatste archivering tickets';
 $lng['serversettings']['ticket']['noreply_email']['title'] = 'Emailadres voor geen-antwoord';
@@ -798,9 +751,6 @@ $lng['dkim']['dkim_dkimkeys']['description'] = '<em>Bestandsnaam</em> van het DK
 $lng['dkim']['dkimrestart_command']['title'] = 'Herstart-commando voor Milter';
 $lng['dkim']['dkimrestart_command']['description'] = 'Geef het commando om de milter-plugin te herstarten';
 
-// ADDED IN 1.2.19-svn9
-
-$lng['admin']['caneditphpsettings'] = 'Can change php-related domain settings?';
 
 // ADDED IN 1.2.19-svn12
 
@@ -862,8 +812,6 @@ $lng['pwdreminder']['notallowed'] = 'Het opnieuw instellen van wachtwoorden is u
 
 // ADDED IN 1.2.19-svn20
 
-$lng['serversettings']['awstats_path']['title'] = 'Pad naar AWstats cgi-bin-map';
-$lng['serversettings']['awstats_path']['description'] = 'bijvoorbeeld /usr/share/webapps/awstats/6.1/webroot/cgi-bin/';
 $lng['serversettings']['awstats_updateall_command']['title'] = 'Pad naar "awstats_updateall.pl"';
 $lng['serversettings']['awstats_updateall_command']['description'] = 'bijvoorbeeld /usr/bin/awstats_updateall.pl';
 
@@ -916,7 +864,7 @@ $lng['customer']['mail_quota'] = 'Mailquotum';
 $lng['panel']['megabyte'] = 'MegaByte';
 $lng['panel']['not_supported'] = 'Wordt niet ondersteund in: ';
 $lng['emails']['quota_edit'] = 'E-mailquotum aanpassen';
-$lng['error']['allocatetoomuchquota'] = 'U probeerde %s MB ' . $lng['emails']['quota'] . ' toe te kennen, maar u heeft niet voldoende over.';
+$lng['error']['allocatetoomuchquota'] = 'U probeerde %s MB Quotum toe te kennen, maar u heeft niet voldoende over.';
 
 // Autoresponder module
 
@@ -967,7 +915,6 @@ $lng['error']['phpsettingidwrong'] = 'Een configuratie voor PHP met dit ID besta
 $lng['error']['descriptioninvalid'] = 'De omschrijving is te kort, te lang of bevat ongeldige karakters.';
 $lng['error']['info'] = 'Informatie';
 $lng['admin']['phpconfig']['template_replace_vars'] = 'Variabelen die worden vervangen in de instellingen';
-$lng['admin']['phpconfig']['safe_mode'] = 'Wordt vervangen door de safe_mode-instellingen voor het domein.';
 $lng['admin']['phpconfig']['pear_dir'] = 'Wordt vervangen door de globale pear-map.';
 $lng['admin']['phpconfig']['open_basedir_c'] = 'Voegt een ; (puntkomma) toe om open_basedir in- of uit te schakelen';
 $lng['admin']['phpconfig']['open_basedir'] = 'Wordt vervangen door de open_basedir-instellingen voor het domein.';
@@ -1200,13 +1147,9 @@ $lng['serversettings']['mod_fcgid']['maxrequests']['title'] = 'Maximaal aantal v
 $lng['serversettings']['mod_fcgid']['maxrequests']['description'] = 'Toegestane aantal verzoeken per domein';
 
 // fix bug #1124
-$lng['admin']['webserver'] = 'Webserver';
 $lng['error']['admin_domain_emailsystemhostname'] = 'De naam van de server kan niet gebruikt worden als domein voor e-mail.';
 $lng['aps']['license_link'] = 'Koppeling naar licentie';
 
-// ADDED IN 1.4.2.1-1
-
-$lng['mysql']['mysql_server'] = 'MySQL-Server';
 
 // ADDED IN 1.4.2.1-2
 
@@ -1221,7 +1164,6 @@ $lng['serversettings']['ssl']['ssl_ca_file'] = 'Pad naar SSL CA certificaat';
 
 $lng['error']['usernamealreadyexists'] = 'De gebruikersnaam %s is reeds in gebruik.';
 
-$lng['error']['plausibilitychecknotunderstood'] = 'Answer of plausibility check not understood.';
 $lng['error']['errorwhensaving'] = 'Fout tijdens opslaan veld %s';
 
 $lng['success']['success'] = 'Informatie';
@@ -1295,7 +1237,7 @@ $lng['dkim']['dkim_algorithm']['title'] = 'Toegestane hash-algoritmen';
 $lng['dkim']['dkim_algorithm']['description'] = 'Toegestane hash-algoritmen, kies "Alle" voor alle algoritmen of 1 of meerdere van onderstaande';
 $lng['dkim']['dkim_servicetype'] = 'Type services';
 $lng['dkim']['dkim_keylength']['title'] = 'Lengte sleutel';
-$lng['dkim']['dkim_keylength']['description'] = 'Let op: Indien u deze waarde wijzigt, dient u allen geheime en publieke sleutels in "'.$settings['dkim']['dkim_prefix'].'" te verwijderen';
+$lng['dkim']['dkim_keylength']['description'] = 'Let op: Indien u deze waarde wijzigt, dient u allen geheime en publieke sleutels in "%s" te verwijderen';
 $lng['dkim']['dkim_notes']['title'] = 'Notities voor DKIM';
 $lng['dkim']['dkim_notes']['description'] = 'Notities die van belang kunnen zijn voor mensen, bijvoorbeeld een URL als http://www.dnswatch.info. Geen enkel programma zal deze informatie verwerken. Deze informatie dient schaars te zijn gezien de beperkte ruimte in DNS. Dit is bedoeld voor beheerders, niet voor eindgebruikers.';
 $lng['dkim']['dkim_add_adsp']['title'] = 'DKIM ADSP toevoegen';
@@ -1357,12 +1299,12 @@ $lng['ticket']['orderdesc'] = 'Hier kunt u uw eigen logische volgorde instellen
 // ADDED IN FROXLOR 0.9.6-svn3
 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Standaard foutdocumenten voor alle klanten activeren';
 $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Bestand/URL voor foutcode 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">Wordt niet ondersteund in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Bestand/URL voor foutcode 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">Wordt niet ondersteund in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Bestand/URL voor foutcode 404';
 $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Bestand/URL voor foutcode 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">Wordt niet ondersteund in: lighttpd</div>';
 
 // ADDED IN FROXLOR 0.9.6-svn4
 $lng['serversettings']['ticket']['default_priority'] = 'Standaardprioriteit voor support-tickets';

lng/english.lng.php

@@ -191,7 +191,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'You have to delete all subdomains f
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'You have already defined a catchall for this domain.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'You cannot delete your main FTP account';
 $lng['error']['login'] = 'The username or password you typed in is wrong. Please try it again!';
-$lng['error']['login_blocked'] = 'This account has been suspended because of too many login errors. <br />Please try again in ' . $settings['login']['deactivatetime'] . ' seconds.';
+$lng['error']['login_blocked'] = 'This account has been suspended because of too many login errors. <br />Please try again in %s seconds.';
 $lng['error']['notallreqfieldsorerrors'] = 'You have not filled in all or filled in some fields incorrectly.';
 $lng['error']['oldpasswordnotcorrect'] = 'The old password is not correct.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'You cannot allocate more resources than you own for yourself.';
@@ -199,15 +199,7 @@ $lng['error']['mustbeurl'] = 'You have not typed a valid or complete url (e.g. h
 $lng['error']['invalidpath'] = 'You have not chosen a valid URL (maybe problems with the dirlisting?)';
 $lng['error']['stringisempty'] = 'Missing Input in Field';
 $lng['error']['stringiswrong'] = 'Wrong Input in Field';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'New password and confirmation does not match';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domain\'';
 $lng['error']['mydocumentroot'] = '\'Documentroot\'';
 $lng['error']['loginnameexists'] = 'Login-Name %s already exists';
@@ -234,7 +226,6 @@ $lng['error']['destinationnonexist'] = 'Please create your forwarder in the fiel
 $lng['error']['destinationalreadyexistasmail'] = 'The forwarder to %s already exists as active e-mail-address.';
 $lng['error']['destinationalreadyexist'] = 'You have already defined a forwarder to %s .';
 $lng['error']['destinationiswrong'] = 'The forwarder %s contains invalid character(s) or is incomplete.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 $lng['error']['ticketnotaccessible'] = 'You cannot access this ticket.';
 
 /**
@@ -339,7 +330,7 @@ $lng['serversettings']['session_timeout']['description'] = 'How long does a user
 $lng['serversettings']['accountprefix']['title'] = 'Customer prefix';
 $lng['serversettings']['accountprefix']['description'] = 'Which prefix should customer accounts have?';
 $lng['serversettings']['mysqlprefix']['title'] = 'SQL Prefix';
-$lng['serversettings']['mysqlprefix']['description'] = 'Which prefix should MySQL accounts have?';
+$lng['serversettings']['mysqlprefix']['description'] = 'Which prefix should MySQL accounts have?</br>Use "RANDOM" as vlaue to get a 3-digit random prefix';
 $lng['serversettings']['ftpprefix']['title'] = 'FTP Prefix';
 $lng['serversettings']['ftpprefix']['description'] = 'Which prefix should ftp accounts have?';
 $lng['serversettings']['documentroot_prefix']['title'] = 'Home directory';
@@ -501,7 +492,8 @@ $lng['admin']['nameserversettings'] = 'Nameserver settings';
 $lng['admin']['updatecounters'] = 'Recalculate resource usage';
 $lng['question']['admin_counters_reallyupdate'] = 'Do you really want to recalculate resource usage?';
 $lng['panel']['pathDescription'] = 'If the directory doesn\'t exist, it will be created automatically.';
-$lng['panel']['pathDescriptionEx'] = '<br /><br />If you want a redirect to another domain than this entry has to start with http:// or https://';
+$lng['panel']['pathDescriptionEx'] = '<br /><br />If you want a redirect to another domain than this entry has to start with http:// or https://.';
+$lng['panel']['pathDescriptionSubdomain'] = $lng['panel']['pathDescription'].$lng['panel']['pathDescriptionEx']."<br /><br />If the URL ends with / it is considered a folder, if not, it is treated as file.";
 
 // ADDED IN 1.2.16-svn6
 
@@ -545,8 +537,6 @@ $lng['panel']['back'] = 'Back';
 
 // ADDED IN 1.2.16-svn12
 
-$lng['serversettings']['mod_log_sql']['title'] = 'Temporary save logs in the database';
-$lng['serversettings']['mod_log_sql']['description'] = 'Use <a target="blank" href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> to save webrequests temporarily<br /><b>This needs a special <a target="blank" href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - documentation">apache-configuration</a>!</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'Enable FCGID';
 $lng['serversettings']['mod_fcgid']['description'] = 'Use this to run PHP with the corresponding useraccount.<br /><br /><b>This needs a special webserver configuration for Apache, see <a target="blank" href="http://redmine.froxlor.org/projects/froxlor/wiki/FCGID_-_handbook">FCGI - handbook</a></b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Use alternative email-address';
@@ -667,13 +657,9 @@ $lng['question']['ticket_reallyclose'] = 'Do you really want to close the ticket
 $lng['question']['ticket_reallydelete'] = 'Do you really want to delete the ticket "%s"?';
 $lng['question']['ticket_reallydeletecat'] = 'Do you really want to delete the category "%s"?';
 $lng['question']['ticket_reallyarchive'] = 'Do you really want to move the ticket "%s" to the archive?';
-$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
-$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
-$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
 $lng['error']['nomoreticketsavailable'] = 'You have used all your available tickets. Please contact your administrator.';
 $lng['error']['nocustomerforticket'] = 'Cannot create tickets without customers';
 $lng['error']['categoryhastickets'] = 'The category still has tickets in it.<br />Please delete the tickets to delete the category';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Support-Ticket settings';
 $lng['admin']['archivelastrun'] = 'Last ticket archiving';
 $lng['serversettings']['ticket']['noreply_email']['title'] = 'No-reply e-mail address';
@@ -821,7 +807,7 @@ $lng['admin']['allips'] = 'All IP\'s';
 $lng['panel']['nosslipsavailable'] = 'There are currently no ssl ip/port combinations for this server';
 $lng['ticket']['by'] = 'by';
 $lng['dkim']['use_dkim']['title'] = 'Activate DKIM support?';
-$lng['dkim']['use_dkim']['description'] = 'Would you like to use the Domain Keys (DKIM) system?';
+$lng['dkim']['use_dkim']['description'] = 'Would you like to use the Domain Keys (DKIM) system?<br/><em style="color:red;font-weight:bold;">Note: DKIM is only supported using dkim-filter, not opendkim (yet)</em>';
 $lng['error']['invalidmysqlhost'] = 'Invalid MySQL host address: %s';
 $lng['error']['cannotuseawstatsandwebalizeratonetime'] = 'You cannot enable Webalizer and AWstats at the same time, please chose one of them';
 $lng['serversettings']['webalizer_enabled'] = 'Enable webalizer statistics';
@@ -922,7 +908,7 @@ $lng['customer']['mail_quota'] = 'Mailquota';
 $lng['panel']['megabyte'] = 'MegaByte';
 $lng['panel']['not_supported'] = 'Not supported in: ';
 $lng['emails']['quota_edit'] = 'Change E-Mail Quota';
-$lng['error']['allocatetoomuchquota'] = 'You tried to allocate %s MB ' . $lng['emails']['quota'] . ', but you do not have enough left.';
+$lng['error']['allocatetoomuchquota'] = 'You tried to allocate %s MB Quota, but you do not have enough left.';
 
 // Autoresponder module
 
@@ -973,7 +959,6 @@ $lng['error']['phpsettingidwrong'] = 'A PHP Configuration with this id doesn\'t
 $lng['error']['descriptioninvalid'] = 'The description is too short, too long or contains illegal characters.';
 $lng['error']['info'] = 'Info';
 $lng['admin']['phpconfig']['template_replace_vars'] = 'Variables that will be replaced in the configs';
-$lng['admin']['phpconfig']['safe_mode'] = 'Will be replaced with the safe_mode setting of the domain.';
 $lng['admin']['phpconfig']['pear_dir'] = 'Will be replaced with the global setting for the pear directory.';
 $lng['admin']['phpconfig']['open_basedir_c'] = 'Will insert a ; (semicolon) to comment-out/disable open_basedir when set';
 $lng['admin']['phpconfig']['open_basedir'] = 'Will be replaced with the open_basedir setting of the domain.';
@@ -1299,7 +1284,7 @@ $lng['dkim']['dkim_algorithm']['title'] = 'Allowed Hash Algorithms';
 $lng['dkim']['dkim_algorithm']['description'] = 'Define allowed hash algorithms, chose "All" for all algorithms or one or more from the other available algorithms';
 $lng['dkim']['dkim_servicetype'] = 'Service Types';
 $lng['dkim']['dkim_keylength']['title'] = 'Key-length';
-$lng['dkim']['dkim_keylength']['description'] = 'Attention: If you change this values, you need to delete all the private/public keys in "'.$settings['dkim']['dkim_prefix'].'"';
+$lng['dkim']['dkim_keylength']['description'] = 'Attention: If you change this values, you need to delete all the private/public keys in "%s"';
 $lng['dkim']['dkim_notes']['title'] = 'DKIM Notes';
 $lng['dkim']['dkim_notes']['description'] = 'Notes that might be of interest to a human, e.g. a URL like http://www.dnswatch.info. No interpretation is made by any program. This tag should be used sparingly due to space limitations in DNS. This is intended for use by administrators, not end users.';
 $lng['dkim']['dkim_add_adsp']['title'] = 'Add DKIM ADSP entry';
@@ -1362,12 +1347,12 @@ $lng['ticket']['orderdesc'] = 'Here you can define your own logical order for th
 // ADDED IN FROXLOR 0.9.6-svn3
 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Enable default errordocuments for all customers';
 $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'File/URL for error 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">Not supported in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'File/URL for error 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">Not supported in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL for error 404';
 $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL for error 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">Not supported in: lighttpd</div>';
 
 // ADDED IN FROXLOR 0.9.6-svn4
 $lng['serversettings']['ticket']['default_priority'] = 'Default support-ticket priority';
@@ -1606,7 +1591,7 @@ $lng['error']['admin_domain_emailsystemhostname'] = 'Sorry, the system - hostnam
 $lng['backup'] = 'Backup';
 $lng['backup_allowed'] = 'Backup allowed';
 $lng['extras']['backup_create'] = 'Create Backup?';
-$lng['extras']['backup_info'] = 'Backup will be saved once daily to a FTP directory. The FTP username is "<Froxloruser>_backup". The FTP password is the same as for your main FTP account.';
+$lng['extras']['backup_info'] = 'Backup will be saved once daily to a FTP directory. The FTP username is "%s_backup". The FTP password is the same as for your main FTP account.';
 $lng['extras']['backup_info_sep'] = 'It contains compressed archives of your web-directory and databases.';
 $lng['extras']['backup_info_big'] = 'It contains a compressed archive of your web-directory and databases.';
 $lng['extras']['backup_count_info'] = '<br /><br />Please note that the backup will charge your webspace!';
@@ -1914,7 +1899,7 @@ $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Time
 // ADDED IN 0.9.27-svn2
 $lng['panel']['cancel'] = 'Cancel';
 $lng['admin']['delete_statistics'] = 'Delete Statistics';
-$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are 100% sure you wish to change this type "'.$lng['admin']['delete_statistics'].'" in the field below and click the "'.$lng['panel']['delete'].'" button.<br /><br />';
+$lng['admin']['speciallogwarning'] = 'WARNING: By changing this setting you will lose all your old statistics for this domain. If you are sure you wish to change this type "%s" in the field below and click the "delete" button.<br /><br />';
 
 // ADDED IN 0.9.28-svn2
 $lng['serversettings']['vmail_maildirname']['title'] = 'Maildir name';
@@ -1928,7 +1913,8 @@ $lng['serversettings']['catchall_enabled']['title']  = 'Use Catchall';
 $lng['serversettings']['catchall_enabled']['description']  = 'Do you want to provide your customers the catchall-feature?';
 
 // ADDED IN 0.9.28.svn6
-$lng['serversettings']['apache_24'] = 'Use modifications for Apache 2.4';
+$lng['serversettings']['apache_24']['title'] = 'Use modifications for Apache 2.4';
+$lng['serversettings']['apache_24']['description'] = '<strong style="color:red;">ATTENTION:</strong> use only if you acutally have apache version 2.4 or higher installed<br />otherwise your webserver will not be able to start';
 $lng['admin']['tickets_see_all'] = 'Can see all ticket-categories?';
 $lng['serversettings']['nginx_fastcgiparams']['title'] = 'Path to fastcgi_params file';
 $lng['serversettings']['nginx_fastcgiparams']['description'] = 'Specify the path to nginx\'s fastcgi_params file including filename';
@@ -1936,3 +1922,41 @@ $lng['serversettings']['enablewebfonts']['title'] = 'Enable usage of a google we
 $lng['serversettings']['enablewebfonts']['description'] = 'If enabled, the defined webfont is being used for the font-display';
 $lng['serversettings']['definewebfont']['title'] = 'Define a <a href="http://www.google.com/webfonts" rel="external">google-webfont</a> for the panel';
 $lng['serversettings']['definewebfont']['description'] = 'If enabled, this wefont will be used for the font-display.<br />Note: replace spaces with the "+" sign, e.g. "Open+Sans"';
+
+// Added in Froxlor 0.9.28-rc2
+$lng['serversettings']['documentroot_use_default_value']['title'] = 'Use domain name as default value for DocumentRoot path';
+$lng['serversettings']['documentroot_use_default_value']['description'] = 'If enabled and DocumentRoot path is empty, default value will be the (sub)domain name.<br /><br />Examples: <br />/var/customers/customer_name/example.com/<br />/var/customers/customer_name/subdomain.example.com/';
+
+$lng['error']['usercurrentlydeactivated'] = 'The user %s is currently deactivated';
+$lng['admin']['speciallogfile']['title'] = 'Separate logfile';
+$lng['admin']['speciallogfile']['description'] = 'Enable this to get a separate access-log file for this domain';
+$lng['error']['setlessthanalreadyused'] = 'You cannot set less resources of \'%s\' than this user already used';
+$lng['error']['stringmustntbeempty'] = 'The value for the field %s must not be empty';
+$lng['admin']['domain_editable']['title'] = 'Allow editing of domain';
+$lng['admin']['domain_editable']['desc'] = 'If set to yes, the customer is allowed to change several domain-settings.<br />If set to no, nothing can be changed by the customer.';
+
+// Added in Froxlor 0.9.29-dev
+$lng['serversettings']['panel_phpconfigs_hidestdsubdomain']['title'] = 'Hide standard-subdomains in PHP-configuration overview';
+$lng['serversettings']['panel_phpconfigs_hidestdsubdomain']['description'] = 'If activated the standard-subdomains for customers will not be displayed in the php-configurations overview<br /><br />Note: This is only visible if you have enabled FCGID or PHP-FPM';
+$lng['serversettings']['passwordcryptfunc']['title'] = 'Chose which password-crypt method is to be used';
+$lng['serversettings']['systemdefault'] = 'System default';
+$lng['serversettings']['panel_allow_theme_change_admin'] = 'Allow admins to change the theme';
+$lng['serversettings']['panel_allow_theme_change_customer'] = 'Allow customers to change the theme';
+$lng['serversettings']['axfrservers']['title'] = 'AXFR servers';
+$lng['serversettings']['axfrservers']['description'] = 'A comma separated list of IP addresses allowed to transfer (AXFR) dns zones.';
+$lng['panel']['ssleditor'] = 'SSL settings for this domain';
+$lng['admin']['ipsandports']['ssl_paste_description'] = 'Paste your complete certificate content in the textbox';
+$lng['admin']['ipsandports']['ssl_cert_file_content'] = 'Content of the ssl certificate';
+$lng['admin']['ipsandports']['ssl_key_file_content'] = 'Content of the ssl (private-) key file';
+$lng['admin']['ipsandports']['ssl_ca_file_content'] = 'Content of the ssl CA file (optional)';
+$lng['admin']['ipsandports']['ssl_cert_chainfile_content'] = 'Content of the certificate chainfile (optional)';
+$lng['error']['sslcertificateismissingprivatekey'] = 'You need to specify a private key for your certificate';
+$lng['error']['sslcertificatewrongdomain'] = 'The given certificate does not belong to this domain';
+$lng['error']['sslcertificateinvalidcert'] = 'The given certificate-content does not seem to be a valid certificate';
+$lng['error']['sslcertificateinvalidcertkeypair'] = 'The given private-key does not belong to the given certificate';
+$lng['error']['sslcertificateinvalidca'] = 'The given CA certificate data does not seem to be a valid certificate';
+$lng['error']['sslcertificateinvalidchain'] = 'The given certificate chain data does not seem to be a valid certificate';
+$lng['serversettings']['customerssl_directory']['title'] = 'Webserver customer-ssl certificates-directory';
+$lng['serversettings']['customerssl_directory']['description'] = 'Where should customer-specified ssl-certificates be created?<br /><br /><div style="color:red">NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.</div>';
+$lng['admin']['note'] = 'Please note';
+$lng['admin']['phpfpm.ininote'] = 'Not all values you may want to define can be used in the php-fpm pool configuration';

lng/error_references.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010- the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Patrick Brückner <kontakt@patrick-brueckner.de>
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Language
+ *
+ */
+
+/**
+ * Error References Mapping (do not need to be translated)
+ */
+
+$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
+$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
+$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
+$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
+$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
+$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
+$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
+$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
+$lng['error']['domainname'] = $lng['domains']['domainname'];
+$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
+$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
+$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
+$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];

lng/french.lng.php

@@ -178,10 +178,6 @@ $lng['extras']['view_directory'] = 'Aperçu du dossier';
 $lng['extras']['pathoptions_add'] = 'Ajouter des options sur le dossier';
 $lng['extras']['directory_browsing'] = 'Afficher le contenu des dossiers';
 $lng['extras']['pathoptions_edit'] = 'Modifier les options de dossier';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'Emplacement du document "Erreur 404"';
 $lng['extras']['errordocument403path'] = 'Emplacement du document "Erreur 403"';
 $lng['extras']['errordocument500path'] = 'Emplacement du document "Erreur 500"';
@@ -202,7 +198,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Il faut d\'abord supprimer tous les
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Vous avez déjà défini une adresse "catchall" pour ce domaine.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'Vous ne pouvez pas supprimer votre accès principal.';
 $lng['error']['login'] = 'Identifiant / mot de passe invalide.';
-$lng['error']['login_blocked'] = 'Cet identifiant a été bloqué à cause de nombreuses tentatives de connexions invalides.<br />Veuillez réessayer dans ' . $settings['login']['deactivatetime'] . ' secondes.';
+$lng['error']['login_blocked'] = 'Cet identifiant a été bloqué à cause de nombreuses tentatives de connexions invalides.<br />Veuillez réessayer dans %s secondes.';
 $lng['error']['notallreqfieldsorerrors'] = 'Vous n\'avez pas rempli toutes les cases obligatoires ou vous les avez remplis avec des informations invalides.';
 $lng['error']['oldpasswordnotcorrect'] = 'L\'ancien mot de passe n\'est pas correct.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'Vous ne pouvez pas distribuer plus de ressources qu\'il n\'en reste.';
@@ -210,17 +206,8 @@ $lng['error']['mustbeurl'] = 'Vous n\'avez pas entré une adresse URL valide.';
 $lng['error']['invalidpath'] = 'Vous n\'avez pas choisi une adresse URL valide (probablement à cause de problèmes avec le listing de dossiers ?)';
 $lng['error']['stringisempty'] = 'Entrée manquante';
 $lng['error']['stringiswrong'] = 'Entrée invalide';
-$lng['error']['myloginname'] = '"' . $lng['login']['username'] . '"';
-$lng['error']['mypassword'] = '"' . $lng['login']['password'] . '"';
-$lng['error']['oldpassword'] = '"' . $lng['changepassword']['old_password'] . '"';
-$lng['error']['newpassword'] = '"' . $lng['changepassword']['new_password'] . '"';
-$lng['error']['newpasswordconfirm'] = '"' . $lng['changepassword']['new_password_confirm'] . '"';
 $lng['error']['newpasswordconfirmerror'] = 'Le nouveau mot de passe et sa confirmation ne sont pas identiques pas.';
-$lng['error']['myname'] = '"' . $lng['customer']['name'] . '"';
-$lng['error']['myfirstname'] = '"' . $lng['customer']['firstname'] . '"';
-$lng['error']['emailadd'] = '"' . $lng['customer']['email'] . '"';
 $lng['error']['mydomain'] = '"domaine"';
-$lng['error']['mydocumentroot'] = '"Documentroot"';
 $lng['error']['loginnameexists'] = 'L\'identifiant "%s" existe déjà.';
 $lng['error']['emailiswrong'] = 'L\'adresse "%s" contient des signes invalides ou est incomplète.';
 $lng['error']['loginnameiswrong'] = 'L\'identifiant "%s" contient des signes invalides.';
@@ -245,7 +232,6 @@ $lng['error']['destinationnonexist'] = 'Veuillez écrire votre adresse de renvoi
 $lng['error']['destinationalreadyexistasmail'] = 'Le renvoi vers l\'adresse "%s" existe déjà comme adresse active.';
 $lng['error']['destinationalreadyexist'] = 'Il existe déjà une réexpédition vers l\'adresse "%s".';
 $lng['error']['destinationiswrong'] = 'L\'adresse "%s" contient des signes invalides ou est incomplète.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 $lng['error']['loginnameissystemaccount'] = 'Vous ne pouvez pas créer un compte identique au compte système, veuillez réessayer avec un autre nom.';
 
 /**
@@ -404,17 +390,12 @@ $lng['serversettings']['paging']['description'] = 'Nombre de résultats par page
 $lng['error']['ipstillhasdomains'] = 'La combinaison IP / port est encore utilisée, veuillez réassigner le ou les domaines existant(s) avec cette adresse IP / port concerné(s) à une autre combinaison IP / port avant de supprimer celle-ci.';
 $lng['error']['cantdeletedefaultip'] = 'Vous ne pouvez pas supprimer cette combinaison IP / Port, veuillez d\'abord attribuer une autre combinaison IP / Port par défaut à ce revendeur avant de supprimer celle-ci.';
 $lng['error']['cantdeletesystemip'] = 'Vous ne pouvez pas créer, modifier ou supprimer l\'IP du système.';
-$lng['error']['myipaddress'] = '"IP"';
-$lng['error']['myport'] = '"Port"';
 $lng['error']['myipdefault'] = 'Choissez une combinaison IP / port par défaut.';
 $lng['error']['myipnotdouble'] = 'Cette combinaison existe déjà';
 $lng['question']['admin_ip_reallydelete'] = 'Etes-vous sûr de vouloir supprimer l\'adresse IP "%s" ?';
 $lng['admin']['ipsandports']['ipsandports'] = 'IPs et ports';
 $lng['admin']['ipsandports']['add'] = 'Ajouter une IP / port';
 $lng['admin']['ipsandports']['edit'] = 'Modifier une IP / port';
-$lng['admin']['ipsandports']['ipandport'] = 'IP / Port';
-$lng['admin']['ipsandports']['ip'] = 'IP';
-$lng['admin']['ipsandports']['port'] = 'Port';
 
 // ADDED IN 1.2.13-rc3
 
@@ -549,8 +530,6 @@ $lng['panel']['back'] = 'Retour';
 
 // ADDED IN 1.2.16-svn12
 
-$lng['serversettings']['mod_log_sql']['title'] = 'Sauvegarder temporairement les logs dans la base de données';
-$lng['serversettings']['mod_log_sql']['description'] = 'Utiliser <a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> pour sauvegarder temporairement les requètes Web.<br /><b>Cela à besoin d\'une configuration spécifique <a href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - documentation">d\'Apache</a> !</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'Utiliser PHP par mod_fcgid / suexec';
 $lng['serversettings']['mod_fcgid']['description'] = 'Utiliser mod_fcgid / suexec / libnss_mysql pour lancer PHP avec le compte correspondant à l\'utilisateur ?<br/><b>Cela à besoin d\'une configuration spécifique d\'Apache !</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Utiliser une adresse e-mail alternative';
@@ -671,13 +650,9 @@ $lng['question']['ticket_reallyclose'] = 'Etes-vous sûr de vouloir clôturer le
 $lng['question']['ticket_reallydelete'] = 'Etes-vous sûr de vouloir supprimer le billet "%s" ?';
 $lng['question']['ticket_reallydeletecat'] = 'Etes-vous sûr de vouloir supprimer la catégorie "%s" ?';
 $lng['question']['ticket_reallyarchive'] = 'Etes-vous sûr de vouloir archiver le billet "%s" ?';
-$lng['error']['mysubject'] = '"' . $lng['ticket']['subject'] . '"';
-$lng['error']['mymessage'] = '"' . $lng['ticket']['message'] . '"';
-$lng['error']['mycategory'] = '"' . $lng['ticket']['category'] . '"';
 $lng['error']['nomoreticketsavailable'] = 'Vous n\'avez plus de billets de disponibles. Veuillez contacter votre administrateur.';
 $lng['error']['nocustomerforticket'] = 'Ne peut créer de billet sans client';
 $lng['error']['categoryhastickets'] = 'La catégorie possède des billets.<br />Veuillez d\'abord supprimer tous les billets de cette catégorie.';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Paramètres des billets de support';
 $lng['admin']['archivelastrun'] = 'Derniers billets archivés';
 $lng['serversettings']['ticket']['noreply_email']['title'] = 'Adresse e-mail de non réponse';
@@ -915,5 +890,3 @@ $lng['domains']['registration_date'] = 'Ajouter à l\'enregistrement';
 $lng['serversettings']['allow_password_reset']['description'] = 'Les clients peuvent réinitialiser leurs mots de passe et il sera envoyé à leurs propres adresses e-mails';
 $lng['serversettings']['allow_password_reset_admin']['title'] = 'Permettre la réinitialisation des mots de passe par les administrateurs';
 $lng['serversettings']['allow_password_reset_admin']['description'] = 'Les administrateurs / revendeurs peuvent réinitialiser leurs mots de passe et il sera envoyé à leurs propres adresses e-mails';
-
-?>

lng/german.lng.php

@@ -128,7 +128,7 @@ $lng['domains']['noaliasdomain'] = 'Keine Aliasdomain';
  * eMails
  */
 
-$lng['emails']['description'] = 'Hier können Sie Ihre E-Mail Adressen einrichten.<br />Ein Konto ist wie Ihr Briefkasten vor der Haustüre. Wenn jemand eine E-Mail an Sie schreibt, dann wird diese in dieses Konto gelegt.<br /><br />Die Zugangsdaten von Ihrem Mailprogramm sind wie folgt: (Die Angaben in <i>kursiver</i> Schrift sind durch die jeweiligen Einträge zu ersetzen!)<br />Hostname: <b><i>Domainname</i></b><br />Benutzername: <b><i>Kontoname / E-Mail-Adresse</i></b><br />Passwort: <b><i>das gewählte Passwort</i></b>';
+$lng['emails']['description'] = 'Hier können Sie Ihre E-Mail Adressen einrichten.<br />Ein Konto ist wie Ihr Briefkasten vor der Haustür. Wenn jemand eine E-Mail an Sie schreibt, dann wird diese in dieses Konto gelegt.<br /><br />Die Zugangsdaten von Ihrem Mailprogramm sind wie folgt: (Die Angaben in <i>kursiver</i> Schrift sind durch die jeweiligen Einträge zu ersetzen!)<br />Hostname: <b><i>Domainname</i></b><br />Benutzername: <b><i>Kontoname / E-Mail-Adresse</i></b><br />Passwort: <b><i>das gewählte Passwort</i></b>';
 $lng['emails']['emailaddress'] = 'E-Mail-Adresse';
 $lng['emails']['emails_add'] = 'E-Mail-Adresse anlegen';
 $lng['emails']['emails_edit'] = 'E-Mail-Adresse ändern';
@@ -161,7 +161,7 @@ $lng['mysql']['database_create'] = 'Datenbank anlegen';
  * Extras
  */
 
-$lng['extras']['description'] = 'Hier können Sie zusätzliche Extras einrichten, wie zum Beispiel Verzeichnisschutz.<br />Die Änderungen sind erst nach einer bestimmten Zeit wirksam.';
+$lng['extras']['description'] = 'Hier können Sie zusätzliche Extras einrichten, wie zum Beispiel einen Verzeichnisschutz.<br />Die Änderungen sind erst nach einer kurzen Zeit wirksam.';
 $lng['extras']['directoryprotection_add'] = 'Verzeichnisschutz anlegen';
 $lng['extras']['view_directory'] = 'Verzeichnis anzeigen';
 $lng['extras']['pathoptions_add'] = 'Pfadoptionen hinzufügen';
@@ -181,8 +181,8 @@ $lng['extras']['errordocument401path'] = 'Fehlerdokument 401';
  */
 
 $lng['error']['error'] = 'Fehlermeldung';
-$lng['error']['directorymustexist'] = 'Das Verzeichnis %s muss existieren. Legen Sie es bitte mit Ihrem FTP-Programm an.';
-$lng['error']['filemustexist'] = 'Die Datei %s muss existieren.';
+$lng['error']['directorymustexist'] = 'Das Verzeichnis "%s" muss existieren. Legen Sie es bitte mit Ihrem FTP-Programm an.';
+$lng['error']['filemustexist'] = 'Die Datei "%s" muss existieren.';
 $lng['error']['allresourcesused'] = 'Sie haben bereits alle Ihnen zur Verfügung stehenden Ressourcen verbraucht.';
 $lng['error']['domains_cantdeletemaindomain'] = 'Sie können keine Domain, die als E-Mail-Domain verwendet wird, löschen. ';
 $lng['error']['domains_canteditdomain'] = 'Sie können diese Domain nicht bearbeiten. Dies wurde durch den Admin verweigert';
@@ -191,7 +191,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Sie müssen erst alle Subdomains l
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Sie haben bereits eine Adresse als Catchall für diese Domain definiert.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'Sie können Ihren Hauptaccount nicht löschen.';
 $lng['error']['login'] = 'Der angegebene Benutzername/Passwort ist falsch.';
-$lng['error']['login_blocked'] = 'Dieser Account wurde aufgrund zu vieler Fehlversuche vorrübergehend geschlossen. <br />Bitte versuchen Sie es in ' . $settings['login']['deactivatetime'] . ' Sekunden erneut.';
+$lng['error']['login_blocked'] = 'Dieser Account wurde aufgrund zu vieler Fehlversuche vorrübergehend geschlossen. <br />Bitte versuchen Sie es in "%s" Sekunden erneut.';
 $lng['error']['notallreqfieldsorerrors'] = 'Sie haben nicht alle Felder oder ein Feld mit fehlerhaften Angaben ausgefüllt.';
 $lng['error']['oldpasswordnotcorrect'] = 'Das alte Passwort ist nicht korrekt.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'Sie können nicht mehr Ressourcen verteilen als Sie noch frei haben.';
@@ -199,42 +199,33 @@ $lng['error']['mustbeurl'] = 'Sie müssen eine vollständige URL angeben (z.B. h
 $lng['error']['invalidpath'] = 'Sie haben keine gültige URL ausgewählt (Evtl. Probleme beim Verzeichnislisting?)';
 $lng['error']['stringisempty'] = 'Fehlende Eingabe im Feld';
 $lng['error']['stringiswrong'] = 'Falsche Eingabe im Feld';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'Das neue Passwort und die Bestätigung sind nicht identisch.';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domain\'';
 $lng['error']['mydocumentroot'] = '\'Documentroot\'';
-$lng['error']['loginnameexists'] = 'Der Login-Name %s existiert bereits.';
-$lng['error']['emailiswrong'] = 'Die E-Mail-Adresse %s enthält ungültige Zeichen oder ist nicht vollständig.';
-$lng['error']['loginnameiswrong'] = 'Der Login-Name %s enthält ungültige Zeichen.';
+$lng['error']['loginnameexists'] = 'Der Login-Name "%s" existiert bereits.';
+$lng['error']['emailiswrong'] = 'Die E-Mail-Adresse "%s" enthält ungültige Zeichen oder ist nicht vollständig.';
+$lng['error']['loginnameiswrong'] = 'Der Login-Name "%s" enthält ungültige Zeichen.';
 $lng['error']['userpathcombinationdupe'] = 'Kombination aus Benutzername und Pfad existiert bereits.';
 $lng['error']['patherror'] = 'Allgemeiner Fehler! Pfad darf nicht leer sein.';
-$lng['error']['errordocpathdupe'] = 'Option für Pfad %s existiert bereits.';
+$lng['error']['errordocpathdupe'] = 'Option für Pfad "%s" existiert bereits.';
 $lng['error']['adduserfirst'] = 'Sie müssen zuerst einen Kunden anlegen.';
-$lng['error']['domainalreadyexists'] = 'Die Domain %s wurde bereits einem Kunden zugeordnet.';
-$lng['error']['nolanguageselect'] = 'Keine Sprache ausgewählt.';
+$lng['error']['domainalreadyexists'] = 'Die Domain "%s" wurde bereits einem Kunden zugeordnet.';
+$lng['error']['nolanguageselect'] = 'Es wurde keine Sprache ausgewählt.';
 $lng['error']['nosubjectcreate'] = 'Sie müssen einen Betreff angeben.';
 $lng['error']['nomailbodycreate'] = 'Sie müssen einen E-Mail-Text eingeben.';
 $lng['error']['templatenotfound'] = 'Vorlage wurde nicht gefunden.';
-$lng['error']['alltemplatesdefined'] = 'Sie können keine weiteren Vorlagen anlegen, da bereits alle Sprachen mit Vorlagen versorgt sind.';
-$lng['error']['wwwnotallowed'] = 'Ihre Subdomain darf nicht www heißen.';
-$lng['error']['subdomainiswrong'] = 'Die Subdomain %s enthält ungültige Zeichen.';
+$lng['error']['alltemplatesdefined'] = 'Sie können keine weiteren Vorlagen anlegen, da bereits für alle Sprachen eine Vorlage existiert.';
+$lng['error']['wwwnotallowed'] = 'Ihre Subdomain darf nicht \'www\' heißen.';
+$lng['error']['subdomainiswrong'] = 'Die Subdomain "%s" enthält ungültige Zeichen.';
 $lng['error']['domaincantbeempty'] = 'Der Domain-Name darf nicht leer sein.';
-$lng['error']['domainexistalready'] = 'Die Domain %s existiert bereits.';
+$lng['error']['domainexistalready'] = 'Die Domain "%s" existiert bereits.';
 $lng['error']['domainisaliasorothercustomer'] = 'Die ausgewählte Aliasdomain ist entweder selber eine Aliasdomain, hat nicht die gleiche IP/Port Kombination oder gehört zu einem anderen Kunden.';
-$lng['error']['emailexistalready'] = 'Die E-Mail-Adresse %s existiert bereits.';
-$lng['error']['maindomainnonexist'] = 'Die Haupt-Domain %s existiert nicht.';
+$lng['error']['emailexistalready'] = 'Die E-Mail-Adresse "%s" existiert bereits.';
+$lng['error']['maindomainnonexist'] = 'Die Haupt-Domain "%s" existiert nicht.';
 $lng['error']['destinationnonexist'] = 'Bitte geben Sie Ihre Weiterleitungsadresse im Feld \'Nach\' ein.';
-$lng['error']['destinationalreadyexistasmail'] = 'Die Weiterleitung zu %s exisitiert bereits als aktive E-Mail-Adresse.';
-$lng['error']['destinationalreadyexist'] = 'Es gibt bereits eine Weiterleitung nach %s .';
-$lng['error']['destinationiswrong'] = 'Die Weiterleitungsadresse-Adresse %s enthält ungültige Zeichen oder ist nicht vollständig.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
+$lng['error']['destinationalreadyexistasmail'] = 'Die Weiterleitung zu "%s" exisitiert bereits als aktive E-Mail-Adresse.';
+$lng['error']['destinationalreadyexist'] = 'Es existiert bereits eine Weiterleitung nach "%s" .';
+$lng['error']['destinationiswrong'] = 'Die Weiterleitungsadresse-Adresse "%s" enthält ungültige Zeichen oder ist nicht vollständig.';
 $lng['error']['ticketnotaccessible'] = 'Sie können sich das Ticket nicht ansehen.';
 
 /**
@@ -242,19 +233,19 @@ $lng['error']['ticketnotaccessible'] = 'Sie können sich das Ticket nicht ansehe
  */
 
 $lng['question']['question'] = 'Sicherheitsabfrage';
-$lng['question']['admin_customer_reallydelete'] = 'Wollen Sie den Kunden %s wirklich löschen?<br />ACHTUNG! Alle Daten gehen unwiderruflich verloren! Nach dem Vorgang müssen Sie die Daten aus dem Dateisystem noch manuell entfernen.';
-$lng['question']['admin_domain_reallydelete'] = 'Wollen Sie die Domain %s wirklich löschen?';
-$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Wollen Sie diese wichtige Sicherheitseinstellung OpenBasedir wirklich deaktivieren?';
-$lng['question']['admin_admin_reallydelete'] = 'Wollen Sie den Admin %s wirklich löschen?<br />Alle Kunden und Domains werden Ihrem Account zugeteilt.';
-$lng['question']['admin_template_reallydelete'] = 'Wollen Sie die Vorlage \'%s\' wirklich löschen?';
-$lng['question']['domains_reallydelete'] = 'Wollen Sie die Domain %s wirklich löschen?';
-$lng['question']['email_reallydelete'] = 'Wollen Sie die E-Mail-Adresse %s wirklich löschen?';
-$lng['question']['email_reallydelete_account'] = 'Wollen Sie das Konto von %s wirklich löschen?';
-$lng['question']['email_reallydelete_forwarder'] = 'Wollen Sie die Weiterleitung %s wirklich löschen?';
-$lng['question']['extras_reallydelete'] = 'Wollen Sie den Verzeichnisschutz für %s wirklich löschen?';
-$lng['question']['extras_reallydelete_pathoptions'] = 'Wollen Sie die Optionen für den Pfad %s wirklich löschen?';
-$lng['question']['ftp_reallydelete'] = 'Wollen Sie das FTP-Benutzerkonto %s wirklich löschen?';
-$lng['question']['mysql_reallydelete'] = 'Wollen Sie die Datenbank %s wirklich löschen?<br />ACHTUNG! Alle Daten gehen unwiderruflich verloren!';
+$lng['question']['admin_customer_reallydelete'] = 'Wollen Sie den Kunden "%s" wirklich löschen?<br />ACHTUNG! Alle Daten gehen unwiderruflich verloren! Nach dem Vorgang müssen Sie die Daten aus dem Dateisystem noch manuell entfernen.';
+$lng['question']['admin_domain_reallydelete'] = 'Wollen Sie die Domain "%s" wirklich löschen?';
+$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Wollen Sie die wichtige Sicherheitseinstellung \'OpenBasedir\' wirklich deaktivieren?';
+$lng['question']['admin_admin_reallydelete'] = 'Wollen Sie den Admin "%s" wirklich löschen?<br />Alle Kunden und Domains dieses Admins werden Ihnen zugeteilt.';
+$lng['question']['admin_template_reallydelete'] = 'Wollen Sie die Vorlage "%s" wirklich löschen?';
+$lng['question']['domains_reallydelete'] = 'Wollen Sie die Domain "%s" wirklich löschen?';
+$lng['question']['email_reallydelete'] = 'Wollen Sie die E-Mail-Adresse "%s" wirklich löschen?';
+$lng['question']['email_reallydelete_account'] = 'Wollen Sie das Konto von "%s" wirklich löschen?';
+$lng['question']['email_reallydelete_forwarder'] = 'Wollen Sie die Weiterleitung "%s" wirklich löschen?';
+$lng['question']['extras_reallydelete'] = 'Wollen Sie den Verzeichnisschutz für "%s" wirklich löschen?';
+$lng['question']['extras_reallydelete_pathoptions'] = 'Wollen Sie die Optionen für den Pfad "%s" wirklich löschen?';
+$lng['question']['ftp_reallydelete'] = 'Wollen Sie das FTP-Benutzerkonto "%s" wirklich löschen?';
+$lng['question']['mysql_reallydelete'] = 'Wollen Sie die Datenbank "%s" wirklich löschen?<br />ACHTUNG! Alle Daten gehen unwiderruflich verloren!';
 $lng['question']['admin_configs_reallyrebuild'] = 'Wollen Sie wirklich alle Konfigurationsdateien neu erstellen lassen?';
 $lng['question']['admin_customer_alsoremovefiles'] = 'Auch Kunden-Daten löschen?';
 $lng['question']['admin_customer_alsoremovemail'] = 'E-Mail Daten auf dem Dateisystem löschen?';
@@ -279,7 +270,7 @@ $lng['admin']['systemdetails'] = 'Systemdetails';
 $lng['admin']['froxlordetails'] = 'Froxlor-Details';
 $lng['admin']['installedversion'] = 'Installierte Version';
 $lng['admin']['latestversion'] = 'Neueste Version';
-$lng['admin']['lookfornewversion']['clickhere'] = 'per Webservice abfragen';
+$lng['admin']['lookfornewversion']['clickhere'] = 'per Webservice abfragen - Hier klicken';
 $lng['admin']['lookfornewversion']['error'] = 'Fehler beim Auslesen';
 $lng['admin']['resources'] = 'Ressourcen';
 $lng['admin']['customer'] = 'Kunde';
@@ -320,7 +311,7 @@ $lng['admin']['templates']['subject'] = 'Betreff';
 $lng['admin']['templates']['mailbody'] = 'Mailtext';
 $lng['admin']['templates']['createcustomer'] = 'Willkommensmail für neue Kunden';
 $lng['admin']['templates']['pop_success'] = 'Willkommensmail für neue E-Mail Konten';
-$lng['admin']['wwwserveralias'] = 'www. ServerAlias hinzufügen';
+$lng['admin']['wwwserveralias'] = '\'www.\' ServerAlias hinzufügen';
 $lng['admin']['templates']['template_replace_vars'] = 'Variablen, die in den Vorlagen ersetzt werden:';
 $lng['admin']['templates']['SALUTATION'] = 'Wird mit einer korrekten Anrede des Kunden ersetzt';
 $lng['admin']['templates']['FIRSTNAME'] = 'Wird mit dem Vornamen des Kunden ersetzt.';
@@ -334,12 +325,12 @@ $lng['admin']['templates']['EMAIL'] = 'Wird mit der Adresse des neuen POP3/IMAP
  * Serversettings
  */
 
-$lng['serversettings']['session_timeout']['title'] = 'Session Timeout';
+$lng['serversettings']['session_timeout']['title'] = 'Session-Timeout';
 $lng['serversettings']['session_timeout']['description'] = 'Wie lange muss ein Benutzer inaktiv sein, damit die Session ungültig wird? (Sekunden)';
 $lng['serversettings']['accountprefix']['title'] = 'Kundenprefix';
 $lng['serversettings']['accountprefix']['description'] = 'Welchen Prefix sollen die Kundenaccounts haben?';
 $lng['serversettings']['mysqlprefix']['title'] = 'SQL-Prefix';
-$lng['serversettings']['mysqlprefix']['description'] = 'Welchen Prefix sollen die MySQL-Benutzerkonten haben?';
+$lng['serversettings']['mysqlprefix']['description'] = 'Welchen Prefix sollen die MySQL-Benutzerkonten haben?</br>Mit "RANDOM" als Wert wird ein 3-Stelliger Zufallswert als Prefix genutzt';
 $lng['serversettings']['ftpprefix']['title'] = 'FTP-Prefix';
 $lng['serversettings']['ftpprefix']['description'] = 'Welchen Prefix sollen die FTP-Benutzerkonten haben?';
 $lng['serversettings']['documentroot_prefix']['title'] = 'Heimatverzeichnis';
@@ -405,7 +396,7 @@ $lng['error']['myipaddress'] = '\'IP\'';
 $lng['error']['myport'] = '\'Port\'';
 $lng['error']['myipdefault'] = 'Sie müssen eine IP/Port Kombination auswählen, die den Standard defninieren soll.';
 $lng['error']['myipnotdouble'] = 'Diese Kombination aus IP und Post existiert bereits.';
-$lng['question']['admin_ip_reallydelete'] = 'Wollen Sie wirklich die IP %s löschen?';
+$lng['question']['admin_ip_reallydelete'] = 'Wollen Sie wirklich die IP "%s" löschen?';
 $lng['admin']['ipsandports']['ipsandports'] = 'IPs und Ports';
 $lng['admin']['ipsandports']['add'] = 'IP/Port hinzufügen';
 $lng['admin']['ipsandports']['edit'] = 'IP/Port bearbeiten';
@@ -426,7 +417,7 @@ $lng['domain']['docroot'] = 'Oben eingegebener Pfad';
 $lng['domain']['homedir'] = 'Heimverzeichnis';
 $lng['admin']['valuemandatory'] = 'Dieses Feld muss ausgefüllt werden';
 $lng['admin']['valuemandatorycompany'] = 'Entweder "Name" und "Vorname" oder "Firma" muss ausgefüllt werden';
-$lng['menue']['main']['username'] = 'Angemeldet als: ';
+$lng['menue']['main']['username'] = 'Angemeldet als ';
 $lng['panel']['urloverridespath'] = 'URL (überschreibt Pfad)';
 $lng['panel']['pathorurl'] = 'Pfad oder URL';
 $lng['error']['sessiontimeoutiswrong'] = '"Session-Timeout" muss ein numerischer Wert sein.';
@@ -462,12 +453,12 @@ $lng['error']['stringformaterror'] = 'Der Wert des Feldes "%s" ist nicht im erwa
 
 // ADDED IN 1.2.15-rc1
 
-$lng['admin']['serversoftware'] = 'Serversoftware';
+$lng['admin']['serversoftware'] = 'Webserver';
 $lng['admin']['phpversion'] = 'PHP-Version';
 $lng['admin']['phpmemorylimit'] = 'PHP-Memory-Limit';
 $lng['admin']['mysqlserverversion'] = 'MySQL Server Version';
 $lng['admin']['mysqlclientversion'] = 'MySQL Client Version';
-$lng['admin']['webserverinterface'] = 'Webserver Interface';
+$lng['admin']['webserverinterface'] = 'Webserver-Interface';
 $lng['domains']['isassigneddomain'] = 'Ist zugewiesene Domain';
 $lng['serversettings']['phpappendopenbasedir']['title'] = 'An OpenBasedir anzuhängende Pfade';
 $lng['serversettings']['phpappendopenbasedir']['description'] = 'Diese (durch Doppelpunkte getrennten) Pfade werden dem OpenBasedir-Statement in jedem vHost-Container angehängt.';
@@ -500,7 +491,8 @@ $lng['admin']['nameserversettings'] = 'Nameservereinstellungen';
 $lng['admin']['updatecounters'] = 'Ressourcenverbrauch';
 $lng['question']['admin_counters_reallyupdate'] = 'Wollen Sie den Ressourcenverbrauch neu berechnen?';
 $lng['panel']['pathDescription'] = 'Wenn das Verzeichnis nicht existiert, wird es automatisch erstellt.';
-$lng['panel']['pathDescriptionEx'] = '<br /><br />Sollte eine Weiterleitung auf eine andere Domain gewünscht sein, muss der Eintrag mit http:// oder https:// beginnen';
+$lng['panel']['pathDescriptionEx'] = '<br /><br />Sollte eine Weiterleitung auf eine andere Domain gewünscht sein, muss der Eintrag mit http:// oder https:// beginnen.';
+$lng['panel']['pathDescriptionSubdomain'] = $lng['panel']['pathDescription'].$lng['panel']['pathDescriptionEx']."<br /><br />Endet die URL mit einem / geht Froxlor von einem Ordner aus, wenn nicht, wird es wie eine Datei behandelt.";
 
 // ADDED IN 1.2.16-svn6
 
@@ -539,13 +531,11 @@ $lng['admin']['configfiles']['choosedaemon'] = '-- Daemon wählen --';
 // ADDED IN 1.2.16-svn10
 
 $lng['serversettings']['ftpdomain']['title'] = 'FTP-Benutzerkonten @domain';
-$lng['serversettings']['ftpdomain']['description'] = 'Können Kunden FTP-Benutzerkonten user@customerdomain anlegen?';
+$lng['serversettings']['ftpdomain']['description'] = 'Können Kunden FTP-Benutzerkonten user@domain anlegen?';
 $lng['panel']['back'] = 'Zurück';
 
 // ADDED IN 1.2.16-svn12
 
-$lng['serversettings']['mod_log_sql']['title'] = 'Logs in Datenbank zwischenspeichern';
-$lng['serversettings']['mod_log_sql']['description'] = '<a target="blank" href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> benutzen um die Webzugriffe temporär zu speichern<br /><b>Dies benötigt eine spezielle Apache-Konfiguration</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'PHP über mod_fcgid/suexec einbinden';
 $lng['serversettings']['mod_fcgid']['description'] = 'PHP unter dem jeweiligen Useraccount laufen lassen.<br /><br /><b>Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe <a target="blank" href="http://redmine.froxlor.org/projects/froxlor/wiki/FCGID_-_Handbuch">FCGID-Handbuch</a>.</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Alternative E-Mail-Adresse benutzen';
@@ -575,10 +565,6 @@ $lng['error']['formtokencompromised'] = 'Das Formular scheint manipuliert worden
 $lng['serversettings']['mysql_access_host']['title'] = 'MySQL-Access-Hosts';
 $lng['serversettings']['mysql_access_host']['description'] = 'Eine durch Komma getrennte Liste mit den Hostnamen aller Hostnames/IP-Adressen, von denen sich die Benutzer einloggen dürfen.';
 
-// CHANGED IN 1.2.18
-
-$lng['serversettings']['mod_log_sql']['description'] = '<a target="blank" href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> benutzen um die Webzugriffe temporär zu speichern<br /><b>Dies benötigt eine spezielle <a target="blank" href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - Dokumentation">Apache-Konfiguration</a></b>';
-
 // ADDED IN 1.2.18-svn1
 
 $lng['admin']['ipsandports']['create_listen_statement'] = 'Erstelle Listen-Eintrag';
@@ -600,15 +586,15 @@ $lng['serversettings']['webalizer_quiet']['description'] = 'Ausgabefreudigkeit d
 $lng['ticket']['admin_email'] = 'root@localhost';
 $lng['ticket']['noreply_email'] = 'tickets@froxlor';
 $lng['admin']['ticketsystem'] = 'Support-Tickets';
-$lng['menue']['ticket']['ticket'] = 'Support Tickets';
-$lng['menue']['ticket']['categories'] = 'Support Kategorien';
+$lng['menue']['ticket']['ticket'] = 'Support-Tickets';
+$lng['menue']['ticket']['categories'] = 'Support-Kategorien';
 $lng['menue']['ticket']['archive'] = 'Ticket-Archiv';
 $lng['ticket']['description'] = 'Hier können Sie Hilfe-Anfragen an Ihren zuständigen Administrator senden.<br />Benachrichtigungen werden per E-Mail verschickt.';
 $lng['ticket']['ticket_new'] = 'Neues Support-Ticket erstellen';
 $lng['ticket']['ticket_reply'] = 'Auf Support-Ticket antworten';
 $lng['ticket']['ticket_reopen'] = 'Ticket wiedereröffnen';
-$lng['ticket']['ticket_newcateory'] = 'Neue Kategorie erstellen';
-$lng['ticket']['ticket_editcateory'] = 'Kategorie bearbeiten';
+$lng['ticket']['ticket_newcateory'] = 'Neue Support-Kategorie erstellen';
+$lng['ticket']['ticket_editcateory'] = 'Support-Kategorie bearbeiten';
 $lng['ticket']['ticket_view'] = 'Ticketverlauf ansehen';
 $lng['ticket']['ticketcount'] = 'Anzahl Tickets';
 $lng['ticket']['ticket_answers'] = 'Antworten';
@@ -645,7 +631,7 @@ $lng['ticket']['search'] = 'Archiv durchsuchen';
 $lng['ticket']['nocustomer'] = 'Keine Angabe';
 $lng['ticket']['archivesearch'] = 'Archiv Suchergebnis';
 $lng['ticket']['noresults'] = 'Keine Tickets gefunden';
-$lng['ticket']['notmorethanxopentickets'] = 'Zum Schutz gegen Spam können Sie nicht mehr als %s offene Tickets haben';
+$lng['ticket']['notmorethanxopentickets'] = 'Zum Schutz gegen Spam können Sie nicht mehr als "%s" offene Tickets haben';
 $lng['ticket']['supportstatus'] = 'Support-Status';
 $lng['ticket']['supportavailable'] = '<span class="ticket_low">Der Support ist besetzt und steht zu Ihrer Verfügung.</span>';
 $lng['ticket']['supportnotavailable'] = '<span class="ticket_high">Der Support ist zur Zeit nicht besetzt.</span>';
@@ -670,13 +656,9 @@ $lng['question']['ticket_reallyclose'] = 'Wollen Sie das Ticket "%s" wirklich sc
 $lng['question']['ticket_reallydelete'] = 'Wollen Sie das Ticket "%s" wirklich löschen?';
 $lng['question']['ticket_reallydeletecat'] = 'Wollen Sie die Kategorie "%s" wirklich löschen?';
 $lng['question']['ticket_reallyarchive'] = 'Wollen Sie das Ticket "%s" wirklich in das Archiv verschieben?';
-$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
-$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
-$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
 $lng['error']['nomoreticketsavailable'] = 'Sie haben Ihr Ticketkontingent aufgebraucht. Bitte kontaktieren Sie ihren Administrator.';
 $lng['error']['nocustomerforticket'] = 'Keine Kunden vorhanden um ein Ticket zu erstellen.';
 $lng['error']['categoryhastickets'] = 'In dieser Kategorie befinden sich noch Tickets.<br />Bitte löschen Sie diese um die Kategorie zu löschen';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Support-Ticket Einstellungen';
 $lng['admin']['archivelastrun'] = 'Letzte Ticket-Archivierung';
 $lng['serversettings']['ticket']['noreply_email']['title'] = 'Keine-Antwort E-Mail Adresse';
@@ -699,11 +681,11 @@ $lng['serversettings']['ticket']['enable'] = 'Ticketsystem aktivieren';
 $lng['serversettings']['ticket']['concurrentlyopen'] = 'Wieviele Tickets kann ein Kunde gleichzeitig öffnen?';
 $lng['error']['norepymailiswrong'] = 'Die "Keine-Antwort-Adresse" ist fehlerhaft. Es ist nur eine gültige E-Mail-Adresse erlaubt';
 $lng['error']['tadminmailiswrong'] = 'Die "Ticket-Admin-Adresse" ist fehlerhaft. Es ist nur eine gültige E-Mail-Adresse erlaubt';
-$lng['ticket']['awaitingticketreply'] = 'Sie haben %s unbeantwortete(s) Support-Ticket(s)';
+$lng['ticket']['awaitingticketreply'] = 'Sie haben "%s" unbeantwortete(s) Support-Ticket(s)';
 
 // ADDED IN 1.2.18-svn5
 
-$lng['serversettings']['ticket']['noreply_name'] = 'Ticket E-Mail Absendername';
+$lng['serversettings']['ticket']['noreply_name'] = 'E-Mail-Absendername für Tickets';
 
 // ADDED IN 1.2.19-svn
 
@@ -747,11 +729,11 @@ $lng['traffic']['summail'] = 'Summe Mail-Traffic in';
 
 // ADDED IN 1.2.19-svn4.5
 
-$lng['serversettings']['no_robots']['title'] = 'Erlaube die Indizierung Ihres Froxlor durch Suchmaschinen';
+$lng['serversettings']['no_robots']['title'] = 'Erlaube die Indizierung Ihrer Froxlor-Installation durch Suchmaschinen';
 
 // ADDED IN 1.2.19-svn6
 
-$lng['admin']['loggersettings'] = 'Log Einstellungen';
+$lng['admin']['loggersettings'] = 'Log-Einstellungen';
 $lng['serversettings']['logger']['enable'] = 'Logging ja/nein';
 $lng['serversettings']['logger']['severity'] = 'Logging Level';
 $lng['admin']['logger']['normal'] = 'Normal';
@@ -759,8 +741,8 @@ $lng['admin']['logger']['paranoid'] = 'Paranoid';
 $lng['serversettings']['logger']['types']['title'] = 'Log-Art(en)';
 $lng['serversettings']['logger']['types']['description'] = 'Wählen Sie hier die gewünschten Logtypen. Für Mehrfachauswahl, halten Sie während der Auswahl STRG gedrückt<br />Mögliche Logtypen sind: syslog, file, mysql';
 $lng['serversettings']['logger']['logfile'] = 'Log-Datei Pfad inklusive Dateinamen';
-$lng['error']['logerror'] = 'Log-Fehler: %s';
-$lng['serversettings']['logger']['logcron'] = 'Log Cronjobs (einen Durchgang)';
+$lng['error']['logerror'] = 'Log-Fehler: "%s"';
+$lng['serversettings']['logger']['logcron'] = 'Logge Cronjobs (einen Durchgang)';
 $lng['question']['logger_reallytruncate'] = 'Wollen Sie die Tabelle "%s" wirklich leeren?';
 $lng['admin']['loggersystem'] = 'System-Logging';
 $lng['menue']['logger']['logger'] = 'System-Logging';
@@ -793,13 +775,13 @@ $lng['admin']['text'] = 'Nachricht';
 $lng['menu']['message'] = 'Nachrichten';
 $lng['error']['errorsendingmail'] = 'Das Versenden der Nachricht an "%s" schlug fehl.';
 $lng['error']['cannotreaddir'] = 'Der Ordner "%s" kann nicht gelesen werden';
-$lng['message']['success'] = 'Nachricht erfolgreich an %s Empfänger gesendet';
+$lng['message']['success'] = 'Nachricht erfolgreich an "%s" Empfänger gesendet';
 $lng['message']['noreceipients'] = 'Es wurde keine E-Mail versendet da sich keine Empfänger in der Datenbank befinden';
 $lng['admin']['sslsettings'] = 'SSL Einstellungen';
 $lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet';
 $lng['serversettings']['default_vhostconf']['title'] = 'Standard Vhost-Einstellungen';
 $lng['serversettings']['default_vhostconf']['description'] = 'Der Inhalt dieses Feldes wird direkt in jeden Domain-vHost-Container übernommen. Achtung: Der Code wird nicht auf Fehler geprüft. Etwaige Fehler werden also auch übernommen. Der Webserver könnte nicht mehr starten!';
-$lng['error']['invalidip'] = 'Ungültige IP Adresse: %s';
+$lng['error']['invalidip'] = 'Ungültige IP Adresse: "%s"';
 $lng['serversettings']['decimal_places'] = 'Nachkommastellen bei der Ausgabe von Traffic/Webspace';
 
 // ADDED IN 1.2.19-svn8
@@ -824,8 +806,8 @@ $lng['admin']['allips'] = 'Alle IP\'s';
 $lng['panel']['nosslipsavailable'] = 'Für diesen Server wurden noch keine SSL IP/Port Kombinationen eingetragen';
 $lng['ticket']['by'] = 'von';
 $lng['dkim']['use_dkim']['title'] = 'DKIM Support aktivieren?';
-$lng['dkim']['use_dkim']['description'] = 'Wollen Sie das Domain Keys (DKIM) System benutzen?';
-$lng['error']['invalidmysqlhost'] = 'Ungültige MySQL Host Adresse: %s';
+$lng['dkim']['use_dkim']['description'] = 'Wollen Sie das Domain Keys (DKIM) System benutzen?<br/><em style="color:red;font-weight:bold;">Hinweis: Der Zeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim</em>';
+$lng['error']['invalidmysqlhost'] = 'Ungültige MySQL Host Adresse: "%s"';
 $lng['error']['cannotuseawstatsandwebalizeratonetime'] = 'Webalizer und AWstats können nicht zur gleichen Zeit aktiviert werden, bitte wählen Sie eines aus';
 $lng['serversettings']['webalizer_enabled'] = 'Nutze Webalizer Statistiken';
 $lng['serversettings']['awstats_enabled'] = 'Nutze AWStats Statistiken';
@@ -833,9 +815,9 @@ $lng['admin']['awstatssettings'] = 'AWstats Einstellungen';
 
 // ADDED IN 1.2.19-svn16
 
-$lng['admin']['domain_dns_settings'] = 'Domain DNS Einstellungen';
-$lng['dns']['destinationip'] = 'Domain IP';
-$lng['dns']['standardip'] = 'Server Standard IP';
+$lng['admin']['domain_dns_settings'] = 'Domain DNS-Einstellungen';
+$lng['dns']['destinationip'] = 'Domain-IP';
+$lng['dns']['standardip'] = 'Server-Standard-IP';
 $lng['dns']['a_record'] = 'A-Eintrag (IPv6 optional)';
 $lng['dns']['cname_record'] = 'CNAME-Eintrag';
 $lng['dns']['mxrecords'] = 'MX Einträge definieren';
@@ -855,7 +837,7 @@ $lng['admin']['or'] = 'oder';
 
 $lng['serversettings']['unix_names']['title'] = 'Benutze UNIX kompatible Benutzernamen';
 $lng['serversettings']['unix_names']['description'] = 'Erlaubt die Nutzung von <strong>-</strong> und <strong>_</strong> in Benutzernamen wenn <strong>Nein</strong>';
-$lng['error']['cannotwritetologfile'] = 'Logdatei %s konnte nicht für Schreiboperationen geöffnet werden.';
+$lng['error']['cannotwritetologfile'] = 'Logdatei "%s" konnte nicht für Schreiboperationen geöffnet werden.';
 $lng['admin']['sysload'] = 'System-Auslastung';
 $lng['admin']['noloadavailable'] = 'nicht verfügbar';
 $lng['admin']['nouptimeavailable'] = 'nicht verfügbar';
@@ -868,7 +850,7 @@ $lng['login']['email'] = 'E-Mail Adresse';
 $lng['login']['remind'] = 'Passwort zurücksetzen';
 $lng['login']['usernotfound'] = 'Fehler: Unbekannter Benutzer!';
 $lng['pwdreminder']['subject'] = 'Froxlor - Passwort zurückgesetzt';
-$lng['pwdreminder']['body'] = 'Hallo %s,\n\nIhr Froxlor Passwort wurde zurückgesetzt!\nDas neue Passwort lautet: %p\n\nVielen Dank,\nIhr Administrator';
+$lng['pwdreminder']['body'] = 'Hallo "%s",\n\nIhr Froxlor Passwort wurde zurückgesetzt!\nDas neue Passwort lautet: %p\n\nVielen Dank,\nIhr Administrator';
 $lng['pwdreminder']['success'] = 'Passwort erfolgreich zurückgesetzt.<br />Sie sollten nun eine E-Mail mit dem neuen Passwort erhalten.';
 
 // ADDED IN 1.2.19-svn18
@@ -926,7 +908,7 @@ $lng['customer']['mail_quota'] = 'E-Mail Kontingent';
 $lng['panel']['megabyte'] = 'MegaByte';
 $lng['emails']['quota_edit'] = 'E-Mail Kontingent ändern';
 $lng['panel']['not_supported'] = 'Nicht unterstüzt in: ';
-$lng['error']['allocatetoomuchquota'] = 'Sie versuchen %s MB ' . $lng['emails']['quota'] . ' zu zuweisen, haben aber nicht genug übrig.';
+$lng['error']['allocatetoomuchquota'] = 'Sie versuchen "%s" MB Kontingent zu zuweisen, haben aber nicht genug übrig.';
 
 // Autoresponder module
 
@@ -956,29 +938,28 @@ $lng['admin']['froxlor_graphic']['description'] = 'Welche Grafik soll im Kopfber
 
 //improved froxlor
 
-$lng['menue']['phpsettings']['maintitle'] = 'PHP Konfigurationen';
-$lng['admin']['phpsettings']['title'] = 'PHP Konfiguration';
+$lng['menue']['phpsettings']['maintitle'] = 'PHP-Konfigurationen';
+$lng['admin']['phpsettings']['title'] = 'PHP-Konfiguration';
 $lng['admin']['phpsettings']['description'] = 'Kurzbeschreibung';
 $lng['admin']['phpsettings']['actions'] = 'Aktionen';
 $lng['admin']['phpsettings']['activedomains'] = 'In Verwendung für Domain(s)';
 $lng['admin']['phpsettings']['notused'] = 'Konfiguration wird nicht verwendet';
 $lng['admin']['misc'] = 'Sonstiges';
-$lng['admin']['phpsettings']['editsettings'] = 'PHP Konfiguration bearbeiten';
-$lng['admin']['phpsettings']['addsettings'] = 'PHP Konfiguration erstellen';
-$lng['admin']['phpsettings']['viewsettings'] = 'PHP Konfiguration ansehen';
-$lng['admin']['phpsettings']['phpinisettings'] = 'php.ini Einstellungen';
-$lng['error']['nopermissionsorinvalidid'] = 'Entweder fehlen Ihnen die nötigen Rechte diese Einstellung zu ändern oder es wurde eine ungültige Id übergeben';
+$lng['admin']['phpsettings']['editsettings'] = 'PHP-Konfiguration bearbeiten';
+$lng['admin']['phpsettings']['addsettings'] = 'PHP-Konfiguration erstellen';
+$lng['admin']['phpsettings']['viewsettings'] = 'PHP-Konfiguration ansehen';
+$lng['admin']['phpsettings']['phpinisettings'] = 'php.ini-Einstellungen';
+$lng['error']['nopermissionsorinvalidid'] = 'Entweder fehlen Ihnen die nötigen Rechte diese Einstellung zu ändern oder es wurde eine ungültige ID übergeben';
 $lng['panel']['view'] = 'ansehen';
-$lng['question']['phpsetting_reallydelete'] = 'Wollen Sie diese PHP Einstellungen wirklich löschen? Alle Domains die diese Einstellungen bis jetzt verwendet haben, werden dann auf die Standard Einstellungen umgestellt.';
+$lng['question']['phpsetting_reallydelete'] = 'Wollen Sie diese PHP-Einstellungen wirklich löschen? Alle Domains die diese Einstellungen bis jetzt verwendet haben, werden dann auf die Standardeinstellungen umgestellt.';
 $lng['admin']['phpsettings']['addnew'] = 'Neue Konfiguration erstellen';
-$lng['error']['phpsettingidwrong'] = 'Eine PHP Konfiguration mit dieser Id existiert nicht';
+$lng['error']['phpsettingidwrong'] = 'Eine PHP-Konfiguration mit dieser ID existiert nicht';
 $lng['error']['descriptioninvalid'] = 'Der Beschreibungstext ist zu kurz, zu lang oder enthält ungültige Zeichen';
 $lng['error']['info'] = 'Info';
 $lng['admin']['phpconfig']['template_replace_vars'] = 'Variablen, die in den Konfigurationen ersetzt werden';
-$lng['admin']['phpconfig']['safe_mode'] = 'Wird mit der safe_mode Einstellung der Domain ersetzt.';
 $lng['admin']['phpconfig']['pear_dir'] = 'Wird mit dem globalen Wert für das Include Verzeichnis ersetzt.';
 $lng['admin']['phpconfig']['open_basedir_c'] = 'Wird mit einem ; (Semikolon) ersetzt, um open_basedir auszukommentieren/deaktivieren, wenn eingestellt.';
-$lng['admin']['phpconfig']['open_basedir'] = 'Wird mit der open_basedir Einstellung der Domain ersetzt.';
+$lng['admin']['phpconfig']['open_basedir'] = 'Wird mit der open_basedir-Einstellung der Domain ersetzt.';
 $lng['admin']['phpconfig']['tmp_dir'] = 'Wird mit der Einstellung für das temporäre Verzeichnis der Domain ersetzt.';
 $lng['admin']['phpconfig']['open_basedir_global'] = 'Wird mit der globalen Einstellung des Pfades ersetzt, der dem open_basedir hinzugefügt wird.';
 $lng['admin']['phpconfig']['customer_email'] = 'Wird mit der E-Mail Adresse des Kunden ersetzt, dem die Domain gehört.';
@@ -988,13 +969,13 @@ $lng['admin']['phpconfig']['customer'] = 'Wird mit dem Loginnamen des Kunden ers
 $lng['admin']['phpconfig']['admin'] = 'Wird mit dem Loginnamen des Admins ersetzt, dem die Domain gehört.';
 $lng['login']['backtologin'] = 'Zurück zum Login';
 $lng['serversettings']['mod_fcgid']['starter']['title'] = 'Prozesse je Domain';
-$lng['serversettings']['mod_fcgid']['starter']['description'] = 'Wieviele PHP Prozesse pro Domain sollen gestartet/erlaubt werden. Der Wert 0 wird empfohlen, da PHP dann selbst die Anzahl effizient verwaltet.';
+$lng['serversettings']['mod_fcgid']['starter']['description'] = 'Wieviele PHP-Prozesse pro Domain sollen gestartet/erlaubt werden. Der Wert 0 wird empfohlen, da PHP die Anzahl dann selbst effizient verwaltet.';
 $lng['serversettings']['mod_fcgid']['wrapper']['title'] = 'Wrappereinbindung in Vhosts';
 $lng['serversettings']['mod_fcgid']['wrapper']['description'] = 'Wie sollen die Wrapper in den Vhosts eingebunden werden';
 $lng['serversettings']['mod_fcgid']['tmpdir']['description'] = 'Wo sollen die temporären Verzeichnisse erstellt werden';
 $lng['admin']['know_what_youre_doing'] = 'Ändern Sie diese Einstellungen nur, wenn Sie wissen was Sie tun!';
 $lng['serversettings']['mod_fcgid']['peardir']['title'] = 'Globale PEAR Verzeichnisse';
-$lng['serversettings']['mod_fcgid']['peardir']['description'] = 'Welche globalen PEAR Verzeichnisse sollen in den php.ini Einstellungen ersetzt werden? Einzelne Verzeichnisse sind mit einem Doppelpunkt zu trennen.';
+$lng['serversettings']['mod_fcgid']['peardir']['description'] = 'Welche globalen PEAR Verzeichnisse sollen in den php.ini-Einstellungen ersetzt werden? Einzelne Verzeichnisse sind mit einem Doppelpunkt zu trennen.';
 
 //improved Froxlor 2
 
@@ -1012,12 +993,12 @@ $lng['serversettings']['index_file_extension']['title'] = 'Dateiendung für inde
 $lng['error']['index_file_extension'] = 'Die Dateiendung für die index Datei muss zwischen 1 und 6 Zeichen lang sein und darf nur aus den Zeichen a-z, A-Z und 0-9 bestehen';
 $lng['admin']['security_settings'] = 'Sicherheitseinstellungen';
 $lng['admin']['expert_settings'] = 'Experteneinstellungen!';
-$lng['admin']['mod_fcgid_starter']['title'] = 'PHP Prozesse für diese Domain (leer für Standardwert)';
+$lng['admin']['mod_fcgid_starter']['title'] = 'PHP-Prozesse für diese Domain (leer für Standardwert)';
 
 //added with aps installer
 
-$lng['admin']['aps'] = 'APS Installer';
-$lng['customer']['aps'] = 'APS Installer';
+$lng['admin']['aps'] = 'APS-Installer';
+$lng['customer']['aps'] = 'APS-Installer';
 $lng['aps']['scan'] = 'Neue Pakete einlesen';
 $lng['aps']['upload'] = 'Neue Pakete hochladen';
 $lng['aps']['managepackages'] = 'Pakete verwalten';
@@ -1025,7 +1006,7 @@ $lng['aps']['manageinstances'] = 'Instanzen verwalten';
 $lng['aps']['overview'] = 'Paketübersicht';
 $lng['aps']['status'] = 'Meine Pakete';
 $lng['aps']['search'] = 'Paket suchen';
-$lng['aps']['upload_description'] = 'Bitte wählen Sie die APS ZIP-Dateien aus, um diese im System zu installieren.';
+$lng['aps']['upload_description'] = 'Bitte wählen Sie die APS-ZIP-Dateien aus, um diese im System zu installieren.';
 $lng['aps']['search_description'] = 'Name, Beschreibung, Schlagwort, Version';
 $lng['aps']['detail'] = 'Weitere Informationen';
 $lng['aps']['install'] = 'Paket installieren';
@@ -1057,7 +1038,7 @@ $lng['aps']['filetoobig'] = 'Die Datei ist zu groß.';
 $lng['aps']['filenotcomplete'] = 'Die Datei wurde nicht vollständig hochgeladen.';
 $lng['aps']['phperror'] = 'Es trat ein PHP interner Fehler auf. Der Upload Fehlercode lautet #';
 $lng['aps']['moveproblem'] = 'Die hochgeladene Datei konnte nicht aus dem temporären Ordner verschoben werden. Prüfen Sie ob alle Rechte korrekt gesetzt sind. Dies gilt insbesondere fü die Ordner {$path}temp/ und {$path}packages/.';
-$lng['aps']['uploaderrors'] = '<strong>Fehler für die Datei <em>%s</em></strong><br/><ul>%s</ul>';
+$lng['aps']['uploaderrors'] = '<strong>Fehler für die Datei <em>"%s"</em></strong><br/><ul>"%s"</ul>';
 $lng['aps']['nospecialchars'] = 'Sonderzeichen sind im Suchausdruck nicht erlaubt!';
 $lng['aps']['noitemsfound'] = 'Es wurden keine Pakete gefunden!';
 $lng['aps']['nopackagesinstalled'] = 'Sie haben noch kein Paket installiert welches angezeigt werden könnte.';
@@ -1079,7 +1060,7 @@ $lng['aps']['mainsite'] = 'Hauptseite';
 $lng['aps']['uninstall'] = 'Paket deinstallieren';
 $lng['aps']['reconfigure'] = 'Einstellungen ändern';
 $lng['aps']['erroronnewinstance'] = '<strong>Dieses Paket kann nicht installiert werden.</strong><br/><br/>Bitte gehen Sie zurück zur Paketübersicht und starten Sie eine neue Installation.';
-$lng['aps']['successonnewinstance'] = '<strong><em>%s</em> wird nun installiert.</strong><br/><br/>Gehen Sie zurück zu "Meine Pakete" und warten Sie bis die Installation abgeschlossen ist. Dies kann einige Minuten in Anspruch nehmen.';
+$lng['aps']['successonnewinstance'] = '<strong><em>"%s"</em> wird nun installiert.</strong><br/><br/>Gehen Sie zurück zu "Meine Pakete" und warten Sie bis die Installation abgeschlossen ist. Dies kann einige Minuten in Anspruch nehmen.';
 $lng['aps']['php_misc_handler'] = 'PHP - Sonstiges - Es werden keine anderen Dateiendungen als .php zum Parsen unterstützt.';
 $lng['aps']['php_misc_directoryhandler'] = 'PHP - Sonstiges - Je Verzeichnis deaktivierte PHP Handler werden nicht unterstützt.';
 $lng['aps']['asp_net'] = 'ASP.NET - Paket wird nicht unterstützt.';
@@ -1090,25 +1071,25 @@ $lng['aps']['php_configuration'] = 'PHP - Konfiguration - Aktuelle "%s" Einstell
 $lng['aps']['php_configuration_post_max_size'] = 'PHP - Konfiguration - "post_max_size" Wert zu klein.';
 $lng['aps']['php_configuration_memory_limit'] = 'PHP - Konfiguration - "memory_limit" Wert zu klein.';
 $lng['aps']['php_configuration_max_execution_time'] = 'PHP - Konfiguration - "max_execution_time" Wert zu klein.';
-$lng['aps']['php_general_old'] = 'PHP - Generell - PHP Version zu alt.';
-$lng['aps']['php_general_new'] = 'PHP - Generell - PHP Version zu neu.';
+$lng['aps']['php_general_old'] = 'PHP - Generell - PHP-Version zu alt.';
+$lng['aps']['php_general_new'] = 'PHP - Generell - PHP-Version zu neu.';
 $lng['aps']['db_mysql_support'] = 'Datenbank - Das Paket benötigt eine andere Datenbank Engine als MySQL.';
 $lng['aps']['db_mysql_version'] = 'Datenbank - MySQL Server zu alt.';
 $lng['aps']['webserver_module'] = 'Webserver - Modul "%s" fehlt.';
-$lng['aps']['webserver_fcgid'] = 'Webserver - Von diesem Paket werden einige Webserver Module benötigt. Da Sie Froxlor in einer FastCGI/mod_fcgid Umgebung verwenden existiert die Funktion "apache_get_modules" nicht. Es kann also nicht ermittelt werden ob das Paket unterstützt wird.';
-$lng['aps']['webserver_htaccess'] = 'Webserver - Dieses Paket benötigt dass .htaccess Dateien vom Webserver geparst werden. Das Paket kann nicht installiert werden, da nicht ermittelt werden kann ob diese Funktion aktiviert ist.';
+$lng['aps']['webserver_fcgid'] = 'Webserver - Von diesem Paket werden einige Webserver Module benötigt. Da Sie Froxlor in einer FastCGI/mod_fcgid Umgebung verwenden, existiert die Funktion "apache_get_modules" nicht. Es kann also nicht ermittelt werden, ob das Paket unterstützt wird.';
+$lng['aps']['webserver_htaccess'] = 'Webserver - Dieses Paket benötigt, dass ".htaccess"-Dateien vom Webserver geparst werden. Das Paket kann nicht installiert werden, da nicht ermittelt werden kann, ob diese Funktion aktiviert ist.';
 $lng['aps']['misc_configscript'] = 'Sonstiges - Die Sprache des Konfigurationsskriptes wird nicht unterstützt.';
 $lng['aps']['misc_charset'] = 'Sonstiges - In der aktuellen Version wird eine Validierung gegen einen gewissen Zeichensatz im Installationsassitenten nicht unterstützt.';
 $lng['aps']['misc_version_already_installed'] = 'Die gleiche Paketversion ist bereits installiert.';
-$lng['aps']['misc_only_newer_versions'] = 'Aus Sicherheitsgründen können nur Pakete installiert werden die neuer sind als die, die bereits im System installiert sind.';
-$lng['aps']['erroronscan'] = '<strong>Fehler für <em>%s</em></strong><ul>%s</ul>';
-$lng['aps']['invalidzipfile'] = '<strong>Fehler für <em>%s</em></strong><br/><ul><li>Dies ist keine gültige APS ZIP-Datei!</li></ul>';
-$lng['aps']['successpackageupdate'] = '<strong><em>%s</em> erfolgreich als Paketupdate installiert</strong>';
-$lng['aps']['successpackageinstall'] = '<strong><em>%s</em> erfolgreich als neues Paket installiert</strong>';
-$lng['aps']['class_zip_missing'] = 'SimpleXML Klasse, exec Funktion oder ZIP Funktionen nicht vorhanden bzw. aktiviert! Für genauere Informationen zu diesem Problem schauen Sie bitte in das Handbuch zu diesem Modul.';
-$lng['aps']['dir_permissions'] = 'Der PHP bzw. Webserver Prozess muss Schreibrechte für {$path}temp/ und {$path}packages/ haben.';
-$lng['aps']['initerror'] = '<strong>Es gibt ein paar Probleme mit diesem Modul:</strong><ul>%s</ul>Beheben Sie diese Probleme oder das Modul kann nicht genutzt werden!';
-$lng['aps']['iderror'] = 'Es wurde eine falsche Id übergeben!';
+$lng['aps']['misc_only_newer_versions'] = 'Aus Sicherheitsgründen können nur Pakete installiert werden, die neuer sind als die bereits im System installierten Pakete sind.';
+$lng['aps']['erroronscan'] = '<strong>Fehler für <em>"%s"</em></strong><ul>"%s"</ul>';
+$lng['aps']['invalidzipfile'] = '<strong>Fehler für <em>"%s"</em></strong><br/><ul><li>Dies ist keine gültige APS-ZIP-Datei!</li></ul>';
+$lng['aps']['successpackageupdate'] = '<strong><em>"%s"</em> erfolgreich als Paketupdate installiert</strong>';
+$lng['aps']['successpackageinstall'] = '<strong><em>"%s"</em> erfolgreich als neues Paket installiert</strong>';
+$lng['aps']['class_zip_missing'] = 'SimpleXML-Klasse, exec-Funktion oder ZIP-Funktionen nicht vorhanden bzw. aktiviert! Für genauere Informationen zu diesem Problem schauen Sie bitte in das Handbuch zu diesem Modul.';
+$lng['aps']['dir_permissions'] = 'Der PHP- bzw. Webserver-Prozess muss Schreibrechte für {$path}temp/ und {$path}packages/ haben.';
+$lng['aps']['initerror'] = '<strong>Es gibt ein paar Probleme mit diesem Modul:</strong><ul>"%s"</ul>Beheben Sie diese Probleme, andernfalls kann das Modul nicht genutzt werden!';
+$lng['aps']['iderror'] = 'Es wurde eine falsche ID übergeben!';
 $lng['aps']['nopacketsforinstallation'] = 'Es wurden keine Pakete zur Installation gefunden.';
 $lng['aps']['nopackagestoinstall'] = 'Es existieren keine Pakete die angezeigt oder installiert werden könnten.';
 $lng['aps']['nodomains'] = 'Wählen Sie eine Domain aus der Liste. Sollte keine Domain vorhanden sein können Sie keine Pakete installieren!';
@@ -1116,7 +1097,7 @@ $lng['aps']['wrongpath'] = 'Entweder enthält dieser Pfad ungültige Zeichen ode
 $lng['aps']['dbpassword'] = 'Geben Sie ein Passwort mit einer minimalen Länge von 8 Zeichen ein.';
 $lng['aps']['error_text'] = 'Geben Sie einen Text ohne Sonderzeichen ein.';
 $lng['aps']['error_email'] = 'Geben Sie eine gültige E-Mail Adresse ein.';
-$lng['aps']['error_domain'] = 'Geben Sie eine gültige URL wie http://www.example.com/ ein.';
+$lng['aps']['error_domain'] = 'Geben Sie eine gültige URL wie "http://www.example.com/" ein.';
 $lng['aps']['error_integer'] = 'Geben Sie eine Zahl (Integer-Format) ein. Beispiel: <em>5</em> oder <em>7</em>.';
 $lng['aps']['error_float'] = 'Geben Sie eine Zahl (Float-Format) ein. Beispiel: <em>5,2432</em> oder <em>7,5346</em>.';
 $lng['aps']['error_password'] = 'Geben Sie ein Passwort ein.';
@@ -1129,8 +1110,8 @@ $lng['aps']['waitfortask'] = 'Es stehen momentan keine Aktionen zur Verfügung.
 $lng['aps']['removetaskexisting'] = '<strong>Es gibt bereits einen Task zur Deinstallation.</strong><br/><br/>Bitte gehen Sie zurück zu "Meine Pakete" und warten Sie bis die Deinstallation abgeschlossen ist.';
 $lng['aps']['packagewillberemoved'] = '<strong>Das Paket wird nun deinstalliert.</strong><br/><br/>Gehen Sie zurück zu "Meine Pakete" und warten Sie bis die Deinstallation abgeschlossen ist.';
 $lng['question']['reallywanttoremove'] = '<strong>Wollen Sie dieses Paket wirklich deinstallieren?</strong><br/><br/>Alle Datenbankinhalte und Dateien werden unwiderruflich gelöscht. Wenn Sie die enthaltenen Daten weiterhin benötigen, stellen Sie sicher dass Sie diese vorher sichern!<br/><br/>';
-$lng['aps']['searchoneresult'] = '%s Paket gefunden';
-$lng['aps']['searchmultiresult'] = '%s Pakete gefunden';
+$lng['aps']['searchoneresult'] = '"%s" Paket gefunden';
+$lng['aps']['searchmultiresult'] = '"%s" Pakete gefunden';
 $lng['question']['reallywanttostop'] = 'Wollen Sie die Installation dieses Paketes wirklich abbrechen?<br/><br/>';
 $lng['aps']['packagenameandversion'] = 'Paketname & Version';
 $lng['aps']['package_locked'] = 'Gesperrt';
@@ -1142,8 +1123,8 @@ $lng['aps']['allpackages'] = 'Alle Pakete';
 $lng['question']['reallyremovepackages'] = '<strong>Wollen Sie diese Pakete wirklich löschen?</strong><br/><br/>Pakete mit Abhängigkeiten können erst gelöscht werden wenn die entsprechenden Instanzen dafür deinstalliert wurden!<br/><br/>';
 $lng['aps']['nopackagesinsystem'] = 'Es wurden noch keine Pakete im System installiert, die verwaltet werden könnten.';
 $lng['aps']['packagenameandstatus'] = 'Paketname & Status';
-$lng['aps']['activate_aps']['title'] = 'APS Installer aktivieren';
-$lng['aps']['activate_aps']['description'] = 'Hier können Sie den APS Installer global aktivieren bzw. deaktivieren.';
+$lng['aps']['activate_aps']['title'] = 'APS-Installer aktivieren';
+$lng['aps']['activate_aps']['description'] = 'Hier können Sie den APS-Installer global aktivieren bzw. deaktivieren.';
 $lng['aps']['packages_per_page']['title'] = 'Pakete pro Seite';
 $lng['aps']['packages_per_page']['description'] = 'Wieviele Pakete sollen Kunden pro Seite angezeigt bekommen?';
 $lng['aps']['upload_fields']['title'] = 'Uploadfelder pro Seite';
@@ -1152,35 +1133,35 @@ $lng['aps']['exceptions']['title'] = 'Ausnahmen für Paketvalidierung';
 $lng['aps']['exceptions']['description'] = 'Manche Pakete benötigen spezielle Konfigurationsparameter oder Module. Der Installer selbst kann nicht immer eindeutig feststellen ob diese Optionen/Erweiterungen aktiviert sind. Aus diesem Grund kann man hier nun Ausnahmen festlegen damit Pakete dann trotzdem installiert werden können. Wählen Sie nur die Optionen aus, die auch wirklich so mit der Realität übereinstimmen. Für genauere Informationen zu diesem Problem schauen Sie bitte in das Handbuch zu diesem Modul.';
 $lng['aps']['settings_php_extensions'] = 'PHP-Erweiterungen';
 $lng['aps']['settings_php_configuration'] = 'PHP-Konfiguration';
-$lng['aps']['settings_webserver_modules'] = 'Webserver Module';
-$lng['aps']['settings_webserver_misc'] = 'Webserver Sonstiges';
+$lng['aps']['settings_webserver_modules'] = 'Webserver-Module';
+$lng['aps']['settings_webserver_misc'] = 'Webserver - Sonstiges';
 $lng['aps']['specialoptions'] = 'Sonderoptionen';
 $lng['aps']['removeunused'] = 'Ungenutzte Pakete entfernen';
-$lng['aps']['enablenewest'] = 'Von jedem Paket neueste Version freigeben, alte sperren';
+$lng['aps']['enablenewest'] = 'Von jedem Paket neueste Version freigeben, alte Version sperren';
 $lng['aps']['installations'] = 'Installationen';
 $lng['aps']['statistics'] = 'Statistiken';
-$lng['aps']['numerofpackagesinstalled'] = '%s Pakete vorhanden<br/>';
-$lng['aps']['numerofpackagesenabled'] = '%s Pakete freigegeben<br/>';
-$lng['aps']['numerofpackageslocked'] = '%s Pakete gesperrt<br/>';
-$lng['aps']['numerofinstances'] = '%s Instanzen installiert<br/>';
+$lng['aps']['numerofpackagesinstalled'] = '"%s" Pakete vorhanden<br/>';
+$lng['aps']['numerofpackagesenabled'] = '"%s" Pakete freigegeben<br/>';
+$lng['aps']['numerofpackageslocked'] = '"%s" Pakete gesperrt<br/>';
+$lng['aps']['numerofinstances'] = '"%s" Instanzen installiert<br/>';
 $lng['question']['reallydoaction'] = '<strong>Wollen Sie die gewählten Aktionen wirklich durchführen?</strong><br/><br/>Daten, die durch diese Vorgänge möglicherweise gelöscht werden, können anschließend nicht wieder hergestellt werden.<br/><br/>';
-$lng['aps']['initerror_customer'] = 'Es gibt momentan ein Problem mit dieser Froxlor Erweiterung. Wenden Sie sich an Ihren Administrator für weitere Informationen.';
-$lng['aps']['numerofinstances'] = '%s Installationen insgesamt<br/>';
-$lng['aps']['numerofinstancessuccess'] = '%s erfolgreiche Installationen<br/>';
-$lng['aps']['numerofinstanceserror'] = '%s fehlgeschlagene Installationen<br/>';
-$lng['aps']['numerofinstancesaction'] = '%s geplante Installationen/Deinstallationen';
+$lng['aps']['initerror_customer'] = 'Es gibt momentan ein Problem mit dieser Froxlor-Erweiterung. Wenden Sie sich bitte für weitere Informationen an Ihren Administrator.';
+$lng['aps']['numerofinstances'] = '"%s" Installationen insgesamt<br/>';
+$lng['aps']['numerofinstancessuccess'] = '"%s" erfolgreiche Installationen<br/>';
+$lng['aps']['numerofinstanceserror'] = '"%s" fehlgeschlagene Installationen<br/>';
+$lng['aps']['numerofinstancesaction'] = '"%s" geplante Installationen/Deinstallationen';
 $lng['aps']['downloadallpackages'] = 'Alle Pakete vom Distributionsserver herunterladen';
 $lng['aps']['updateallpackages'] = 'Alle Pakete über Distributionsserver aktualisieren';
 $lng['aps']['downloadtaskexists'] = 'Es gibt bereits einen Task zum Download aller Pakete. Bitte warten Sie bis dieser abgeschlossen ist.';
 $lng['aps']['downloadtaskinserted'] = 'Es wurde ein Task zum Download aller Pakete erstellt. Dieser Vorgang kann einige Minuten in Anspruch nehmen.';
 $lng['aps']['updatetaskexists'] = 'Es gibt bereits einen Task zur Aktualisierung aller Pakete. Bitte warten Sie bis dieser abgeschlossen ist.';
 $lng['aps']['updatetaskinserted'] = 'Es wurde ein Task zur Aktualisierung aller Pakete erstellt. Dieser Vorgang kann einige Minuten in Anspruch nehmen.';
-$lng['aps']['canmanagepackages'] = 'Darf APS Pakete verwalten';
-$lng['aps']['numberofapspackages'] = 'Anzahl an APS Installationen';
-$lng['aps']['allpackagesused'] = '<strong>Fehler</strong><br/><br/>Sie haben bereits die Anzahl an installierbaren APS Anwendungen erreicht bzw. überschritten.';
+$lng['aps']['canmanagepackages'] = 'Darf APS-Pakete verwalten';
+$lng['aps']['numberofapspackages'] = 'Anzahl an APS-Installationen';
+$lng['aps']['allpackagesused'] = '<strong>Fehler</strong><br/><br/>Sie haben bereits die Anzahl an installierbaren APS-Anwendungen erreicht bzw. überschritten.';
 $lng['aps']['noinstancesexisting'] = 'Es gibt momentan noch keine Instanzen, die verwaltet werden könnten. Es muss mindestens eine Anwendung von einem Kunden installiert worden sein.';
 $lng['aps']['lightywarning'] = 'Warnung';
-$lng['aps']['lightywarningdescription'] = 'Sie verwenden den lighttpd Webserver zusammen mit Froxlor. Da das APS Modul hauptsächlich für den Apache Webserver geschrieben wurde, kann es unter Umständen vorkommen, dass gewisse Features mit lighttpd nicht funktionieren. Bitte beachten Sie dies bei der Verwendung des APS Moduls. Sollten Sie Fehler bei der Verwendung oder Probleme bei der Nutzung haben, so leiten Sie diese bitte an die Entwickler weiter, damit diese Probleme in der nächsten Version behoben werden können.';
+$lng['aps']['lightywarningdescription'] = 'Sie verwenden den lighttpd-Webserver zusammen mit Froxlor. Da das APS-Modul hauptsächlich für den Apache-Webserver geschrieben wurde, kann es unter Umständen vorkommen, dass gewisse Features mit lighttpd nicht funktionieren. Bitte beachten Sie dies bei der Verwendung des APS-Moduls. Sollten Sie Fehler bei der Verwendung oder Probleme bei der Nutzung haben, so leiten Sie diese bitte an die Entwickler weiter, damit diese Probleme in der nächsten Version behoben werden können.';
 $lng['error']['customerdoesntexist'] = 'Der ausgewählte Kunde existiert nicht.';
 $lng['error']['admindoesntexist'] = 'Der ausgewählte Admin existiert nicht.';
 
@@ -1198,13 +1179,13 @@ $lng['error']['ipportdoesntexist'] = 'Die gewählte IP/Port-Kombination existier
 
 // ADDED IN 1.2.19-svn38
 
-$lng['admin']['phpserversettings'] = 'PHP Einstellungen';
-$lng['admin']['phpsettings']['binary'] = 'PHP Binary';
+$lng['admin']['phpserversettings'] = 'PHP-Einstellungen';
+$lng['admin']['phpsettings']['binary'] = 'PHP-Binary';
 $lng['admin']['phpsettings']['file_extensions'] = 'Dateiendungen';
 $lng['admin']['phpsettings']['file_extensions_note'] = '(ohne Punkt, durch Leerzeichen getrennt)';
-$lng['admin']['mod_fcgid_maxrequests']['title'] = 'Maxmale PHP Requests für diese Domain (leer für Standardwert)';
+$lng['admin']['mod_fcgid_maxrequests']['title'] = 'Maxmale PHP-Requests für diese Domain (leer für Standardwert)';
 $lng['serversettings']['mod_fcgid']['maxrequests']['title'] = 'Maximale Requests pro Domain';
-$lng['serversettings']['mod_fcgid']['maxrequests']['description'] = 'Wieviele PHP Requests pro Domain sollen erlaubt werden?';
+$lng['serversettings']['mod_fcgid']['maxrequests']['description'] = 'Wieviele PHP-Requests pro Domain sollen erlaubt werden?';
 
 // fix bug #1124
 $lng['admin']['webserver'] = 'Webserver';
@@ -1213,9 +1194,9 @@ $lng['aps']['license_link'] = 'Link zur Lizenz';
 
 // ADDED IN FROXLOR 0.9
 
-$lng['admin']['spfsettings'] = 'Domain SPF Einstellungen';
+$lng['admin']['spfsettings'] = 'Domain-SPF-Einstellungen';
 $lng['spf']['use_spf'] = 'Aktiviere SPF für Domains?';
-$lng['spf']['spf_entry'] = 'SPF Eintrag für alle Domains';
+$lng['spf']['spf_entry'] = 'SPF-Eintrag für alle Domains';
 $lng['panel']['dirsmissing'] = 'Das angegebene Verzeichnis konnte nicht gefunden werden.';
 $lng['panel']['toomanydirs'] = 'Zu viele Unterverzeichnisse. Weiche auf manuelle Verzeichniseingabe aus.';
 $lng['panel']['abort'] = 'Abbrechen';
@@ -1229,7 +1210,7 @@ $lng['panel']['off'] = 'aus';
 $lng['update']['updateinprogress_onlyadmincanlogin'] = 'Eine neuere Version von Froxlor wurde installiert, aber noch nicht eingerichtet.<br />Nur der Administrator kann sich anmelden und die Aktualisierung abschließen.';
 $lng['update']['update'] = 'Froxlor Aktualisierung';
 $lng['update']['proceed'] = 'Ausführen';
-$lng['update']['update_information']['part_a'] = 'Die Froxlor Dateien wurden aktualisiert. Neue Version ist <strong>%newversion</strong>. Die bisher installierte Version ist <strong>%curversion</strong>';
+$lng['update']['update_information']['part_a'] = 'Die Froxlor-Dateien wurden aktualisiert. Neue Version ist <strong>%newversion</strong>. Die bisher installierte Version ist <strong>%curversion</strong>';
 $lng['update']['update_information']['part_b'] = '<br /><br />Ein Kunden-Login ist vor Abschluss des Aktualisierungsvorganges nicht möglich.<br /><strong>Aktualisierung ausführen?</strong>';
 $lng['update']['noupdatesavail'] = '<strong>Ihre Froxlor-Version ist aktuell.</strong>';
 $lng['admin']['specialsettingsforsubdomains'] = 'Übernehme Einstellungen für alle Subdomains (*.beispiel.de)';
@@ -1263,7 +1244,7 @@ $lng['error']['hiddenfieldvaluechanged'] = 'Der Wert des verborgenen Feldes "%s"
 
 $lng['serversettings']['panel_password_min_length']['title'] = 'Mindestlänge von Passwörtern';
 $lng['serversettings']['panel_password_min_length']['description'] = 'Hier können Sie die Mindestlänge für Passwörter festlegen. \'0\' bedeutet: Keine Mindestlänge';
-$lng['error']['notrequiredpasswordlength'] = 'Das Passwort ist zu kurz. Bitte geben Sie mindestens %s Zeichen an.';
+$lng['error']['notrequiredpasswordlength'] = 'Das Passwort ist zu kurz. Bitte geben Sie mindestens "%s" Zeichen an.';
 $lng['serversettings']['system_store_index_file_subs']['title'] = 'Erstelle Index-Datei auch in neuen Unterordnern';
 $lng['serversettings']['system_store_index_file_subs']['description'] = 'Wenn aktiviert, wird für jede Subdomain mit neuem Unterordner die Standard-Index Datei angelegt.';
 
@@ -1271,22 +1252,22 @@ $lng['serversettings']['system_store_index_file_subs']['description'] = 'Wenn ak
 
 $lng['serversettings']['adminmail_return']['title'] = 'Antwort-Adresse';
 $lng['serversettings']['adminmail_return']['description'] = 'Standard-Antwort-Adresse für E-Mails aus dem Panel.';
-$lng['serversettings']['adminmail_defname'] = 'Panel Absender Name';
+$lng['serversettings']['adminmail_defname'] = 'Panel-Absender-Name';
 
 // ADDED IN FROXLOR 0.9.3-svn3
-$lng['dkim']['dkim_algorithm']['title'] = 'Gültige Hash Algorithmen';
+$lng['dkim']['dkim_algorithm']['title'] = 'Gültige Hash-Algorithmen';
 $lng['dkim']['dkim_algorithm']['description'] = 'Wählen sie einen Algorithmus, "All" für alle Algorithmen oder Einen oder Mehrere von den verfügbaren Algorithmen';
 $lng['dkim']['dkim_servicetype'] = 'Service Typen';
 $lng['dkim']['dkim_keylength']['title'] = 'Schlüssel-Länge';
-$lng['dkim']['dkim_keylength']['description'] = 'Achtung: Bei Änderung dieser Einstellung müssen alle private/public Schlüssel in "'.$settings['dkim']['dkim_prefix'].'" gelöscht werden.';
+$lng['dkim']['dkim_keylength']['description'] = 'Achtung: Bei Änderung dieser Einstellung müssen alle private/public Schlüssel in "%s" gelöscht werden.';
 $lng['dkim']['dkim_notes']['title'] = 'DKIM Notiz';
-$lng['dkim']['dkim_notes']['description'] = 'Eine Notiz, welche für Menschen interessant sein könnte, Z.B. eine URL wie http://www.dnswatch.info. Es gibt keine programmgesteuerte Interpretation für dieses Feld. Gehen sie sparsam mit der Anzahl der Zeichen um, da es Einschränkungen seitens des DNS Dienstes gibt. Dieses Feld ist für Administratoren gedacht, nicht für Benutzer.';
-$lng['dkim']['dkim_add_adsp']['title'] = 'DKIM ADSP Eintrag hinzufügen';
+$lng['dkim']['dkim_notes']['description'] = 'Eine Notiz, welche für Menschen interessant sein könnte, Z.B. eine URL wie http://www.dnswatch.info. Es gibt keine programmgesteuerte Interpretation für dieses Feld. Gehen sie sparsam mit der Anzahl der Zeichen um, da es Einschränkungen seitens des DNS-Dienstes gibt. Dieses Feld ist für Administratoren gedacht, nicht für Benutzer.';
+$lng['dkim']['dkim_add_adsp']['title'] = 'DKIM-ADSP Eintrag hinzufügen';
 $lng['dkim']['dkim_add_adsp']['description'] = 'Wenn unsicher oder unbekannt, belassen sie es auf "aktiviert"';
-$lng['dkim']['dkim_add_adsppolicy']['title'] = 'ADSP Richtlinie';
-$lng['dkim']['dkim_add_adsppolicy']['description'] = 'Mehr Informationen zu dieser Einstellung (englisch) <a target="blank" href="http://redmine.froxlor.org/projects/froxlor/wiki/En-dkim-adsp-policies">DKIM ADSP Policies</a>';
+$lng['dkim']['dkim_add_adsppolicy']['title'] = 'ADSP-Richtlinie';
+$lng['dkim']['dkim_add_adsppolicy']['description'] = 'Mehr Informationen zu dieser Einstellung (englisch) <a target="blank" href="http://redmine.froxlor.org/projects/froxlor/wiki/En-dkim-adsp-policies">DKIM-ADSP-Policies</a>';
 
-$lng['admin']['cron']['cronsettings'] = 'Cronjob Einstellungen';
+$lng['admin']['cron']['cronsettings'] = 'Cronjob-Einstellungen';
 $lng['cron']['cronname'] = 'Cronjob-Name';
 $lng['cron']['lastrun'] = 'zuletzt gestartet';
 $lng['cron']['interval'] = 'Intervall';
@@ -1298,7 +1279,7 @@ $lng['crondesc']['cron_tasks'] = 'Erstellen von Konfigurationsdateien';
 $lng['crondesc']['cron_legacy'] = 'Legacy (alter) Cronjob';
 $lng['crondesc']['cron_apsinstaller'] = 'APS-Installer';
 $lng['crondesc']['cron_autoresponder'] = 'E-Mail Autoresponder';
-$lng['crondesc']['cron_apsupdater'] = 'Aktualisieren der APS Pakete';
+$lng['crondesc']['cron_apsupdater'] = 'Aktualisieren der APS-Pakete';
 $lng['crondesc']['cron_traffic'] = 'Traffic-Berechnung';
 $lng['crondesc']['cron_ticketsreset'] = 'Zurücksetzen der Ticket-Zähler';
 $lng['crondesc']['cron_ticketarchive'] = 'Archivieren alter Tickets';
@@ -1309,18 +1290,18 @@ $lng['cronmgmt']['days'] = 'Tage';
 $lng['cronmgmt']['weeks'] = 'Wochen';
 $lng['cronmgmt']['months'] = 'Monate';
 $lng['admin']['cronjob_edit'] = 'Cronjob bearbeiten';
-$lng['cronjob']['cronjobsettings'] = 'Cronjob Einstellungen';
+$lng['cronjob']['cronjobsettings'] = 'Cronjob-instellungen';
 $lng['cronjob']['cronjobintervalv'] = 'Laufzeit-Intervall Wert';
 $lng['cronjob']['cronjobinterval'] = 'Laufzeit-Intervall';
 $lng['panel']['options'] = 'Optionen';
 $lng['admin']['warning'] = 'ACHTUNG - Wichtiger Hinweis!';
-$lng['cron']['changewarning'] = 'Änderungen an diesen Werten können einen negativen Effekt auf das Verhalten von Froxlor und seinen automatisierten Aufgaben haben.<br /><br />Ändern Sie hier etwas bitte nur, wenn Sie sich dessen Folgen im Klaren sind.';
+$lng['cron']['changewarning'] = 'Änderungen an diesen Werten können einen negativen Effekt auf das Verhalten von Froxlor und seinen automatisierten Aufgaben haben.<br /><br />Ändern Sie hier bitte nur etwas, wenn Sie sich über die Folgen im Klaren sind.';
 
 $lng['serversettings']['stdsubdomainhost']['title'] = 'Kunden Standard-Subdomain';
 $lng['serversettings']['stdsubdomainhost']['description'] = 'Welcher Hostname soll für das Erstellen der Kunden-Standard-Subdomain verwendet werden? Falls leer wird der System-Hostname verwendet.';
 
 // ADDED IN FROXLOR 0.9.4-svn1
-$lng['ftp']['account_edit'] = 'FTP Konto bearbeiten';
+$lng['ftp']['account_edit'] = 'FTP-Konto bearbeiten';
 $lng['ftp']['editpassdescription'] = 'Neues Passwort setzen oder leer für keine Änderung.';
 $lng['customer']['sendinfomail'] = 'Daten per E-Mail an mich senden';
 $lng['customer']['mysql_add']['infomail_subject'] = '[Froxlor] Neue Datenbank erstellt';
@@ -1332,17 +1313,17 @@ $lng['error']['overviewsettingoptionisnotavalidfield'] = 'Hoppla, ein Feld, dass
 $lng['admin']['configfiles']['compactoverview'] = 'Kompakt-Übersicht';
 
 $lng['mysql']['mysql_server'] = 'MySQL-Server';
-$lng['admin']['ipsandports']['webserverdefaultconfig'] = 'Webserver Standard Konfiguration';
-$lng['admin']['ipsandports']['webserverdomainconfig'] = 'Webserver Domain Konfiguration';
-$lng['admin']['ipsandports']['webserverssldomainconfig'] = 'Webserver SSL Konfiguration';
-$lng['admin']['ipsandports']['ssl_key_file'] = 'Pfad zu der SSL Schlüsseldatei';
-$lng['admin']['ipsandports']['ssl_ca_file'] = 'Pfad zu dem SSL CA Zertifikat';
+$lng['admin']['ipsandports']['webserverdefaultconfig'] = 'Webserver-Standard-Konfiguration';
+$lng['admin']['ipsandports']['webserverdomainconfig'] = 'Webserver-Domain-Konfiguration';
+$lng['admin']['ipsandports']['webserverssldomainconfig'] = 'Webserver-SSL-Konfiguration';
+$lng['admin']['ipsandports']['ssl_key_file'] = 'Pfad zu der SSL-Schlüsseldatei';
+$lng['admin']['ipsandports']['ssl_ca_file'] = 'Pfad zu dem SSL-CA-Zertifikat';
 $lng['admin']['ipsandports']['default_vhostconf_domain'] = 'Standard vHost - Einstellungen für jeden Domain - Kontainer';
-$lng['serversettings']['ssl']['ssl_key_file'] = 'Pfad zu der SSL Schlüsseldatei';
-$lng['serversettings']['ssl']['ssl_ca_file'] = 'Pfad zu dem SSL CA Zertifikat';
-$lng['error']['usernamealreadyexists'] = 'Der Benutzername %s existiert bereits.';
+$lng['serversettings']['ssl']['ssl_key_file'] = 'Pfad zu der SSL-Schlüsseldatei';
+$lng['serversettings']['ssl']['ssl_ca_file'] = 'Pfad zu dem SSL-CA-Zertifikat';
+$lng['error']['usernamealreadyexists'] = 'Der Benutzername "%s" existiert bereits.';
 $lng['error']['plausibilitychecknotunderstood'] = 'Die Antwort des Plausibilitätschecks wurde nicht verstanden';
-$lng['error']['errorwhensaving'] = 'Bei dem Speichern des Feldes %s trat ein Fehler auf';
+$lng['error']['errorwhensaving'] = 'Bei dem Speichern des Feldes "%s" trat ein Fehler auf';
 $lng['success']['success'] = 'Information';
 $lng['success']['clickheretocontinue'] = 'Hier klicken um fortzufahren';
 $lng['success']['settingssaved'] = 'Die Einstellungen wurden erfolgreich gespeichert.';
@@ -1357,45 +1338,45 @@ $lng['ticket']['orderdesc'] = 'Hier kann eine logische Sortierung für die Ticke
 // ADDED IN FROXLOR 0.9.6-svn3
 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Verwende Standard-Fehlerdokumente für alle Kunden';
 $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Datei/URL für Fehler 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">Nicht unterstüzt in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Datei/URL für Fehler 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">Nicht unterstüzt in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Datei/URL für Fehler 404';
 $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Datei/URL für Fehler 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">Nicht unterstüzt in: lighttpd</div>';
 
 // ADDED IN FROXLOR 0.9.6-svn4
 $lng['serversettings']['ticket']['default_priority'] = 'Voreingestellte Support-Ticket Priorität';
 
 // ADDED IN FROXLOR 0.9.6-svn5
-$lng['serversettings']['mod_fcgid']['defaultini'] = 'Voreingestellte PHP Konfiguration für neue Domains';
+$lng['serversettings']['mod_fcgid']['defaultini'] = 'Voreingestellte PHP-Konfiguration für neue Domains';
 
 // ADDED IN FROXLOR 0.9.6-svn5
-$lng['admin']['ftpserver'] = 'FTP Server';
-$lng['admin']['ftpserversettings'] = 'FTP Server Einstellungen';
+$lng['admin']['ftpserver'] = 'FTP-Server';
+$lng['admin']['ftpserversettings'] = 'FTP-Server-Einstellungen';
 $lng['serversettings']['ftpserver']['desc'] = 'Wenn pureftpd ausgewählt ist, werden die .ftpquota Dateien für das Quota erstellt und täglich aktualisiert.';
 
 // CHANGED IN FROXLOR 0.9.6-svn5
-$lng['serversettings']['ftpprefix']['description'] = 'Welchen Prefix sollen die FTP-Benutzerkonten haben?<br/><b>Wenn du das änderst, musst du auch das Quota SQL Query in der FTP Server Config ändern, solltest du FTP-Quotas benutzen!</b>';
+$lng['serversettings']['ftpprefix']['description'] = 'Welchen Prefix sollen die FTP-Benutzerkonten haben?<br/><b>Wenn du das änderst, musst du auch das Quota-SQL-Query in der FTP-Server-Config ändern, solltest du FTP-Quotas benutzen!</b>';
 
 // ADDED IN FROXLOR 0.9.7-svn1
 $lng['customer']['ftp_add']['infomail_subject'] = '[Froxlor] Neuer FTP-Benutzer erstellt';
 $lng['customer']['ftp_add']['infomail_body']['main'] = "Hallo {CUST_NAME},\n\ndu hast gerade einen neuen FTP-Benutzer angelegt. Hier die angegebenen Informationen:\n\nBenutzername: {USR_NAME}\nPasswort: {USR_PASS}\nPfad: {USR_PATH}\n\nVielen Dank, Ihr Administrator";
 $lng['domains']['redirectifpathisurl'] = 'Redirect code (Standard: leer)';
-$lng['domains']['redirectifpathisurlinfo'] = 'Der Redirect code kann gewählt werden, wenn der eingegebene Pfad eine URL ist';
+$lng['domains']['redirectifpathisurlinfo'] = 'Der Redirect-Code kann gewählt werden, wenn der eingegebene Pfad eine URL ist';
 $lng['serversettings']['customredirect_enabled']['title'] = 'Erlaube Kunden-Redirect';
 $lng['serversettings']['customredirect_enabled']['description'] = 'Erlaubt es Kunden den HTTP-Status Code für einen Redirect zu wählen';
-$lng['serversettings']['customredirect_default']['title'] = 'Standard Redirect';
+$lng['serversettings']['customredirect_default']['title'] = 'Standard-Redirect';
 $lng['serversettings']['customredirect_default']['description'] = 'Dieser Redirect wird immer genutzt, sofern der Kunde keinen anderen auswählt.';
 
 // ADDED IN FROXLOR 0.9.7-svn2
 $lng['error']['pathmaynotcontaincolon'] = 'Der eingegebene Pfad sollte keinen Doppelpunkt (":") enthalten. Bitte geben Sie einen korrekten Wert für den Pfad ein.';
-$lng['tasks']['aps_task_install'] = 'Installation eines oder mehrerer APS Pakete';
-$lng['tasks']['aps_task_remove'] = 'Deinstallation eines oder mehrerer APS Pakete';
-$lng['tasks']['aps_task_reconfigure'] = 'Rekonfiguration eines oder mehrerer APS Pakete';
-$lng['tasks']['aps_task_upgrade'] = 'Upgrade eines oder mehrerer APS Pakete';
-$lng['tasks']['aps_task_sysupdate'] = 'Aktualisiere alle APS Pakete';
-$lng['tasks']['aps_task_sysdownload'] = 'Herunterladen neuer APS Pakete';
+$lng['tasks']['aps_task_install'] = 'Installation eines oder mehrerer APS-Pakete';
+$lng['tasks']['aps_task_remove'] = 'Deinstallation eines oder mehrerer APS-Pakete';
+$lng['tasks']['aps_task_reconfigure'] = 'Rekonfiguration eines oder mehrerer APS-Pakete';
+$lng['tasks']['aps_task_upgrade'] = 'Upgrade eines oder mehrerer APS-Pakete';
+$lng['tasks']['aps_task_sysupdate'] = 'Aktualisiere alle APS-Pakete';
+$lng['tasks']['aps_task_sysdownload'] = 'Herunterladen neuer APS-Pakete';
 
 // ADDED IN FROXLOR 0.9.9-svn1
 $lng['serversettings']['mail_also_with_mxservers'] = 'Erstelle mail-, imap-, pop3- and smtp-"A Record" auch wenn MX-Server angegeben sind';
@@ -1425,14 +1406,14 @@ $lng['serversettings']['perl_path']['description'] = 'Standard ist /usr/bin/perl
 
 // ADDED IN FROXLOR 0.9.12-svn1
 $lng['admin']['fcgid_settings'] = 'FCGID';
-$lng['serversettings']['mod_fcgid_ownvhost']['title'] = 'Verwende FCGID im Froxlor Vhost';
+$lng['serversettings']['mod_fcgid_ownvhost']['title'] = 'Verwende FCGID im Froxlor-Vhost';
 $lng['serversettings']['mod_fcgid_ownvhost']['description'] = 'Wenn verwendet, wird Froxlor selbst unter einem lokalem Benutzer ausgeführt';
 $lng['admin']['mod_fcgid_user'] = 'Lokaler Benutzer für FCGID (Froxlor Vhost)';
 $lng['admin']['mod_fcgid_group'] = 'Lokale Gruppe für FCGID (Froxlor Vhost)';
 
 // ADDED IN FROXLOR 0.9.12-svn2
 $lng['admin']['perl_settings'] = 'Perl/CGI';
-$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Aktiviere SuExec Workaround';
+$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Aktiviere SuExec-Workaround';
 $lng['serversettings']['perl']['suexecworkaround']['description'] = 'Aktivieren Sie den Workaround nur, wenn die Kunden-Heimatverzeichnisse sich nicht unterhalb des suexec-Pfades liegen.<br />Wenn aktiviert erstellt Froxlor eine Verknüpfung des vom Kunden für Perl aktiviertem Pfad + /cgi-bin/ im angegebenen suexec-Pfad.<br />Bitte beachten Sie, dass Perl dann nur im Unterordner /cgi-bin/ des Kunden-Ordners funktioniert und nicht direkt in diesem Ordner (wie es ohne den Workaround wäre!)';
 $lng['serversettings']['perl']['suexeccgipath']['title'] = 'Pfad für Verknüpfungen zu Kunden-Perl-Verzeichnis';
 $lng['serversettings']['perl']['suexeccgipath']['description'] = 'Diese Einstellung wird nur benötigt, wenn der SuExec-Workaround aktiviert ist.<br />ACHTUNG: Stellen Sie sicher, dass sich der angegebene Pfad innerhalb des Suexec-Pfades befindet ansonsten ist der Workaround nutzlos';
@@ -1456,9 +1437,9 @@ $lng['admin']['templates']['DB_DESC'] = 'Datenbankbeschreibung';
 $lng['admin']['templates']['DB_SRV'] = 'Datenbankserver';
 $lng['admin']['templates']['PMA_URI'] = 'URL zu phpMyAdmin (wenn angegeben)';
 $lng['admin']['notgiven'] = '[nicht angegeben]';
-$lng['admin']['templates']['USR_NAME'] = 'FTP Benutzername';
-$lng['admin']['templates']['USR_PASS'] = 'FTP Passwort';
-$lng['admin']['templates']['USR_PATH'] = 'FTP Heimatverzeichnis (relativ zum Kunden-Heimatverzeichnis)';
+$lng['admin']['templates']['USR_NAME'] = 'FTP-Benutzername';
+$lng['admin']['templates']['USR_PASS'] = 'FTP-Passwort';
+$lng['admin']['templates']['USR_PATH'] = 'FTP-Heimatverzeichnis (relativ zum Kunden-Heimatverzeichnis)';
 
 // ADDED IN FROXLOR 0.9.12-svn4
 $lng['serversettings']['awstats_awstatspath'] = 'Pfad zu AWStats \'awstats.pl\'';
@@ -1468,20 +1449,20 @@ $lng['extras']['htpasswdauthname'] = 'Authentifizierungs-Grund (AuthName)';
 $lng['extras']['directoryprotection_edit'] = 'Verzeichnisschutz bearbeiten';
 $lng['admin']['templates']['forgotpwd'] = 'Benachrichtigungs-Mails bei Zurücksetzen des Passworts';
 $lng['admin']['templates']['password_reset'] = 'Kunden-Benachrichtigung nach Zurücksetzen des Passworts';
-$lng['admin']['store_defaultindex'] = 'Erstelle standard Index-Datei in Kunden-Ordner';
+$lng['admin']['store_defaultindex'] = 'Erstelle Standard-Index-Datei im Kunden-Ordner';
 
 // ADDED IN FROXLOR 0.9.13-svn1
 $lng['customer']['autoresponder'] = 'Abwesenheitsnachrichten';
 
 // ADDED IN FROXLOR 0.9.14-svn1
-$lng['serversettings']['mod_fcgid']['defaultini_ownvhost'] = 'Voreingestellte PHP Konfiguration für den Froxlor-Vhost';
+$lng['serversettings']['mod_fcgid']['defaultini_ownvhost'] = 'Voreingestellte PHP-Konfiguration für den Froxlor-Vhost';
 
 // ADDED IN FROXLOR 0.9.14-svn3
-$lng['serversettings']['awstats_icons']['title'] = 'Pfad zum AWstats icons Ordner';
+$lng['serversettings']['awstats_icons']['title'] = 'Pfad zum AWstats-Icon-Ordner';
 $lng['serversettings']['awstats_icons']['description'] = 'z.B. /usr/share/awstats/htdocs/icon/';
 
 // ADDED IN FROXLOR 0.9.14-svn4
-$lng['admin']['ipsandports']['ssl_cert_chainfile'] = 'Pfad zu dem SSL CertificateChainFile';
+$lng['admin']['ipsandports']['ssl_cert_chainfile'] = 'Pfad zu dem SSL-CertificateChainFile';
 
 // ADDED IN FROXLOR 0.9.14-svn5
 $lng['admin']['ipsandports']['docroot']['title'] = 'Benutzerdefinierter Docroot (leer = zeige auf Froxlor)';
@@ -1492,22 +1473,22 @@ $lng['serversettings']['login_domain_login'] = 'Erlaube Anmeldung mit Domains';
 
 // ADDED IN FROXLOR 0.9.14
 $lng['panel']['unlock'] = 'entsperren';
-$lng['question']['customer_reallyunlock'] = 'Wollen Sie den Kunden %s wirklich entsperren?';
+$lng['question']['customer_reallyunlock'] = 'Wollen Sie den Kunden "%s" wirklich entsperren?';
 
 // ADDED IN FROXLOR 0.9.15-svn1
-$lng['serversettings']['perl_server']['title'] = 'Perl Server Ort';
+$lng['serversettings']['perl_server']['title'] = 'Perl-Server-Ort';
 $lng['serversettings']['perl_server']['description'] = 'Der Standardwert ist diesem Guide entnommen: <a target="blank" href="http://wiki.nginx.org/SimpleCGI">http://wiki.nginx.org/SimpleCGI</a>';
-$lng['serversettings']['nginx_php_backend']['title'] = 'Nginx PHP Backend';
+$lng['serversettings']['nginx_php_backend']['title'] = 'Nginx-PHP-Backend';
 $lng['serversettings']['nginx_php_backend']['description'] = 'Dies ist das Backend, auf dem PHP auf Anfragen von Nginx hört. Kann ein UNIX Socket oder eine IP:Port Kombination sein<br />*NICHT relevant bei php-fpm';
-$lng['serversettings']['phpreload_command']['title'] = 'PHP Reload Befehl';
-$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird benötigt, um das PHP Backend bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)<br />*NICHT relevant bei php-fpm';
+$lng['serversettings']['phpreload_command']['title'] = 'PHP-Reload-Befehl';
+$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird benötigt, um das PHP-Backend bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)<br />*NICHT relevant bei php-fpm';
 
 // ADDED IN FROXLOR 0.9.16
-$lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld %s)';
-$lng['error']['intvaluetoohigh'] = 'Die angegebene Zahl ist zu groß (Feld %s)';
+$lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld "%s")';
+$lng['error']['intvaluetoohigh'] = 'Die angegebene Zahl ist zu groß (Feld "%s")';
 $lng['admin']['phpfpm_settings'] = 'PHP-FPM';
 $lng['serversettings']['phpfpm'] = 'Aktiviere php-fpm';
-$lng['serversettings']['phpfpm_settings']['configdir'] = 'Pfad zu php-fpm Konfigurationen';
+$lng['serversettings']['phpfpm_settings']['configdir'] = 'Pfad zu php-fpm-Konfigurationen';
 $lng['serversettings']['phpfpm_settings']['reload'] = 'Kommando zum Neustarten von php-fpm';
 $lng['serversettings']['phpfpm_settings']['pm'] = 'Prozess Manager Control (PM)';
 $lng['serversettings']['phpfpm_settings']['max_children']['title'] = 'Anzahl der Kind-Prozesse';
@@ -1522,9 +1503,9 @@ $lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests p
 $lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'Für keine Begrenzung \'0\' angeben. Equivalent zu PHP_FCGI_MAX_REQUESTS.';
 $lng['error']['phpfpmstillenabled'] = 'PHP-FPM ist derzeit aktiviert. Bitte deaktiviere es, um FCGID zu aktivieren';
 $lng['error']['fcgidstillenabled'] = 'FCGID ist derzeit aktiviert. Bitte deaktiviere es, um PHP-FPM zu aktivieren';
-$lng['phpfpm']['vhost_httpuser'] = 'Lokaler Benutzer für PHP-FPM (Froxlor Vhost)';
-$lng['phpfpm']['vhost_httpgroup'] = 'Lokale Gruppe für PHP-FPM (Froxlor Vhost)';
-$lng['phpfpm']['ownvhost']['title'] = 'Verwende PHP-FPM im Froxlor Vhost';
+$lng['phpfpm']['vhost_httpuser'] = 'Lokaler Benutzer für PHP-FPM (Froxlor-Vhost)';
+$lng['phpfpm']['vhost_httpgroup'] = 'Lokale Gruppe für PHP-FPM (Froxlor-Vhost)';
+$lng['phpfpm']['ownvhost']['title'] = 'Verwende PHP-FPM im Froxlor-Vhost';
 $lng['phpfpm']['ownvhost']['description'] = 'Wenn verwendet, wird Froxlor selbst unter einem lokalem Benutzer ausgeführt';
 
 // ADDED IN FROXLOR 0.9.17
@@ -1548,10 +1529,10 @@ $lng['mysql']['database_edit'] = 'Datenbank bearbeiten';
 
 // ADDED IN FROXLOR 0.9.18
 $lng['error']['domains_cantdeletedomainwithaliases'] = 'Sie können keine Domain löschen, die noch von Alias-Domains verwendet wird. Löschen Sie zuerst alle Alias-Domains dieser Domain.';
-$lng['serversettings']['default_theme'] = 'Standard Theme';
+$lng['serversettings']['default_theme'] = 'Standard-Theme';
 $lng['menue']['main']['changetheme'] = 'Theme wechseln';
 $lng['panel']['theme'] = 'Theme';
-$lng['success']['rebuildingconfigs'] = 'Task für das Neuerstellen der Konfigurationen wurde erfolgreich eingetragen';
+$lng['success']['rebuildingconfigs'] = 'Task für Neuerstellung der Konfigurationen wurde erfolgreich eingetragen';
 $lng['panel']['variable'] = 'Variable';
 $lng['panel']['description'] = 'Beschreibung';
 $lng['emails']['back_to_overview'] = 'Zurück zur Übersicht';
@@ -1581,11 +1562,11 @@ $lng['traffic']['months']['dec'] = 'Dez';
 $lng['traffic']['months']['total'] = 'Gesamt';
 $lng['traffic']['details'] = 'Details';
 $lng['menue']['traffic']['table'] = 'Übersicht';
-$lng['error']['admin_domain_emailsystemhostname'] = 'Der System - Hostname kann leider nicht als Kundendomain verwendet werden.';
+$lng['error']['admin_domain_emailsystemhostname'] = 'Der System - Hostname kann nicht als Kundendomain verwendet werden.';
 $lng['backup'] = 'Backup';
 $lng['backup_allowed'] = 'Backup erlaubt';
 $lng['extras']['backup_create'] = 'Backup erstellen?';
-$lng['extras']['backup_info'] = 'Das Backup wird täglich in einem FTP Verzeichnis abgelegt. Der FTP Username ist "<Froxloruser>_backup". Das FTP Passwort ist das gleiche wie bei ihrem Haupt FTP Account.';
+$lng['extras']['backup_info'] = 'Das Backup wird täglich in einem FTP Verzeichnis abgelegt. Der FTP Username ist "%s_backup". Das FTP Passwort ist das gleiche wie bei ihrem Haupt FTP Account.';
 $lng['extras']['backup_info_sep'] = 'Es sind komprimierte Archive von Ihrem Webverzeichnis und Ihren Datenbanken enthalten.';
 $lng['extras']['backup_info_big'] = 'Es ist ein komprimiertes Archiv von Ihrem Webverzeichnis und Ihren Datenbanken enthalten.';
 $lng['extras']['backup_count_info'] = '<br /><br />Beachten Sie bitte, dass das Backup den verfügbaren Speicherplatz belastet!';
@@ -1616,12 +1597,12 @@ $lng['serversettings']['diskquota_quotatool_path']['description'] = 'Pfad zu quo
 $lng['serversettings']['diskquota_customer_partition']['description'] = 'Partition, auf welcher die Kundendaten liegen';
 $lng['tasks']['diskspace_set_quota'] = 'Quota auf dem Dateisystem setzen';
 $lng['error']['session_timeout'] = 'Wert zu niedrig';
-$lng['error']['session_timeout_desc'] = 'Der Wert der Session Timeout sollte nicht unter einer Minute liegen.';
+$lng['error']['session_timeout_desc'] = 'Der Wert der Session-Timeout sollte nicht unter einer Minute liegen.';
 
 // ADDED IN FROXLOR 0.9.24-svn1
 $lng['logrotate'] = 'Logrotate';
 $lng['logrotate_enabled'] = 'Logrotate aktivieren?';
-$lng['logrotate_binary'] = 'Pfad zum logrotate binary?';
+$lng['logrotate_binary'] = 'Pfad zum logrotate-binary?';
 $lng['logrotate_interval'] = 'Intervall?';
 $lng['logrotate_keep'] = 'Wie viele Logdateien sollen aufbewahrt werden?';
 $lng['admin']['assignedmax'] = 'Zugewiesen / Max.';
@@ -1636,28 +1617,67 @@ $lng['traffic']['ftp'] = 'FTP (MB)';
 $lng['traffic']['mail'] = 'Mail (MB)';
 
 // ADDED IN 0.9.27-svn1
-$lng['serversettings']['mod_fcgid']['idle_timeout']['title'] = 'Idle Timeout';
-$lng['serversettings']['mod_fcgid']['idle_timeout']['description'] = 'Timeout einstellung für Mod FastCGI.';
-$lng['serversettings']['phpfpm_settings']['idle_timeout']['title'] = 'Idle Timeout';
-$lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Timeout einstellung für PHP5 FPM FastCGI.';
+$lng['serversettings']['mod_fcgid']['idle_timeout']['title'] = 'Idle-Timeout';
+$lng['serversettings']['mod_fcgid']['idle_timeout']['description'] = 'Timeout-Einstellung für mod_FastCGI.';
+$lng['serversettings']['phpfpm_settings']['idle_timeout']['title'] = 'Idle-Timeout';
+$lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Timeout-Einstellung für PHP5-FPM FastCGI.';
 
 // ADDED IN 0.9.27-svn2
 $lng['panel']['cancel'] = 'abbrechen';
 $lng['admin']['delete_statistics'] = 'Statistiken Löschen';
-$lng['admin']['speciallogwarning'] = 'ACHTUNG: Durch diese Einstellungen werden Sie alle bisherige Statistiken dieser Domain verlieren. Wenn Sie dabei wirklich sicher sind, geben Sie bitte folgenden Text in das nachfolgende Textfeld ein: "'.$lng['admin']['delete_statistics'].'" und bestätigen Sie mit "'.$lng['panel']['delete'].'".<br /><br />';
+$lng['admin']['speciallogwarning'] = 'ACHTUNG: Durch diese Einstellungen werden Sie alle bisherige Statistiken dieser Domain verlieren. Wenn Sie dabei wirklich sicher sind, geben Sie bitte folgenden Text in das nachfolgende Textfeld ein: "%s" und bestätigen Sie mit "Löschen".<br /><br />';
 
 // ADDED IN 0.9.28-svn5
 $lng['error']['operationnotpermitted'] = 'Diese Aktion ist nicht erlaubt!';
-$lng['error']['featureisdisabled'] = 'Die Funktion %s wurde deaktiviert. Kontaktieren Sie bitte Ihren Dienstleister.';
+$lng['error']['featureisdisabled'] = 'Die Funktion "%s" wurde deaktiviert. Kontaktieren Sie bitte Ihren Dienstleister.';
 $lng['serversettings']['catchall_enabled']['title']  = 'Catchall verwenden';
 $lng['serversettings']['catchall_enabled']['description']  = 'Möchten Sie Ihren Kunden die Funktion Catchall zur Verfügung stellen?';
 
 // ADDED IN 0.9.28.svn6
-$lng['serversettings']['apache_24'] = 'Anpassungen f&uuml;r Apache 2.4 verwenden';
+$lng['serversettings']['apache_24']['title'] = 'Anpassungen f&uuml;r Apache 2.4 verwenden';
+$lng['serversettings']['apache_24']['description'] = '<strong style="color:red;">ACHTUNG:</strong> Bitte nur verwenden, wenn wirklich Apache mit Version 2.4 oder höher installiert ist,<br />ansonsten wird der Webserver nicht starten.';
 $lng['admin']['tickets_see_all'] = 'Kann alle Ticket-Kategorien sehen?';
 $lng['serversettings']['nginx_fastcgiparams']['title'] = 'Pfad zur fastcgi_params Datei';
-$lng['serversettings']['nginx_fastcgiparams']['description'] = 'Geben Sie den Pfad zu nginx\'s fastcgi_params Datei an. Inlkusive Dateiname!';
+$lng['serversettings']['nginx_fastcgiparams']['description'] = 'Geben Sie den Pfad zu nginx\'s fastcgi_params Datei an. Inklusive Dateiname!';
 $lng['serversettings']['enablewebfonts']['title'] = 'Verwende Google Webfonts im Panel';
 $lng['serversettings']['enablewebfonts']['description'] = 'Wenn aktiviert, wird die angegebene Google-Schriftart eingebunden und verwendet';
 $lng['serversettings']['definewebfont']['title'] = '<a href="http://www.google.com/webfonts" rel="external">Google Webfont</a> festlegen';
 $lng['serversettings']['definewebfont']['description'] = 'Wenn aktiviert, wird diese Schriftart im Panel verwendet.<br />Hinweis: Leerzeichen bitte mit einem "+" ersetzen, z.B. "Open+Sans"';
+
+// Added in Froxlor 0.9.28-rc2
+$lng['serversettings']['documentroot_use_default_value']['title'] = 'Verwende Domain-Namen im Documentroot';
+$lng['serversettings']['documentroot_use_default_value']['description'] = 'Wenn aktiviert wird dem standard Documentroot zusätzlich der Domain-Name angehängt.<br /><br />Beispiel:<br />/var/customers/customer_name/example.com/<br />/var/customers/customer_name/subdomain.example.com/';
+
+$lng['error']['usercurrentlydeactivated'] = 'Der Benutzer "%s" ist derzeit deaktiviert';
+$lng['admin']['speciallogfile']['title'] = 'Eigene Log-Datei';
+$lng['admin']['speciallogfile']['description'] = 'Aktiviere diese Option, um für diese Domain eine eigene Access-Log Datei zu erhalten';
+$lng['error']['setlessthanalreadyused'] = 'Es können nicht weniger Resourcen von "%s" gesetzt werden, als der Benutzer bereits vergeben hat';
+$lng['error']['stringmustntbeempty'] = 'Der Wert für das Feld "%s" darf nicht leer sein';
+$lng['admin']['domain_editable']['title'] = 'Erlaube Bearbeiten der Domain';
+$lng['admin']['domain_editable']['desc'] = 'Wenn ja, darf der Kunde verschiedene Einstellungen anpassen.<br />Wenn nein, darf nichts durch den Kunden geändert werden.';
+
+// Added in Froxlor 0.9.29-dev
+$lng['serversettings']['panel_phpconfigs_hidestdsubdomain']['title'] = 'Verstecke Standard-Subdomains in PHP-Konfigurations-Übersicht';
+$lng['serversettings']['panel_phpconfigs_hidestdsubdomain']['description'] = 'Wenn aktiviert, werden die Standard-Subdomains der Kunden nicht mehr in der PHP-Konfigurations-Übersicht angezeigt.<br /><br />Hinweis: Nur relevant, wenn FCGID oder PHP-FPM aktiviert ist.';
+$lng['serversettings']['passwordcryptfunc']['title'] = 'Wähle zu verwendende Passwort-Verschlüsselungsmethode';
+$lng['serversettings']['systemdefault'] = 'Systemstandard';
+$lng['serversettings']['panel_allow_theme_change_admin'] = 'Erlaube Admins das Theme zu wechseln';
+$lng['serversettings']['panel_allow_theme_change_customer'] = 'Erlaube Kunden das Theme zu wechseln';
+$lng['serversettings']['axfrservers']['title'] = 'AXFR Server';
+$lng['serversettings']['axfrservers']['description'] = 'Eine durch Kommas getrennte Liste von IP Adressen, die DNS-Zonen transferieren dürfen (AXFR).';
+$lng['panel']['ssleditor'] = 'SSL-Einstellungen für diese Domain';
+$lng['admin']['ipsandports']['ssl_paste_description'] = 'Bitte den Inhalt der Zertifikatsdatei in das Textfeld kopieren';
+$lng['admin']['ipsandports']['ssl_cert_file_content'] = 'Inhalt des SSL-Zertifikats';
+$lng['admin']['ipsandports']['ssl_key_file_content'] = 'Inhalt der Key-Datei (private key)';
+$lng['admin']['ipsandports']['ssl_ca_file_content'] = 'Inhalt der SSL-CA-Datei (optional)';
+$lng['admin']['ipsandports']['ssl_cert_chainfile_content'] = 'Inhalt des Zertifikats-Chainfile (optional)';
+$lng['error']['sslcertificateismissingprivatekey'] = 'Für das Zertifikat muss eine Key-Datei (private key) angegeben werden';
+$lng['error']['sslcertificatewrongdomain'] = 'Das angegebene Zertifikat gilt nicht für die gewählte Domain';
+$lng['error']['sslcertificateinvalidcert'] = 'Der angegebene Zertifikatsinhalt scheint kein gültiges Zertifikat zu sein';
+$lng['error']['sslcertificateinvalidcertkeypair'] = 'Der angegebene Key (private-key) gehört nicht zum angegebenen Zertifikat';
+$lng['error']['sslcertificateinvalidca'] = 'Die angegebenen CA-Zertifikatsdaten scheinen kein gültiges Zertifikat zu sein';
+$lng['error']['sslcertificateinvalidchain'] = 'Die angegebenen Zertifikats-Chain-Daten scheinen kein gültiges Zertifikat zu sein';
+$lng['serversettings']['customerssl_directory']['title'] = 'Webserver-Kunden-SSL-Zertifikats-Verzeichnis';
+$lng['serversettings']['customerssl_directory']['description'] = 'Wo sollen kundenspezifizierte SSL-Zertifikate erstellt werden?<br /><br /><div style="color:red">ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten dort keinerlei Daten manuell abgelegt werden.</div>';
+$lng['admin']['note'] = 'Bitte beachten';
+$lng['admin']['phpfpm.ininote'] = 'Nicht alle gewünschten Werte können in der php-fpm pool Konfiguration verwendet werden';

lng/hungarian.lng.php

@@ -166,10 +166,6 @@ $lng['extras']['view_directory'] = 'A könyvtár tartalmának megmutatása';
 $lng['extras']['pathoptions_add'] = 'Útvonal opciók hozzáadása';
 $lng['extras']['directory_browsing'] = 'A könyvtár tartalmána böngészése';
 $lng['extras']['pathoptions_edit'] = 'Útvonal opciók szerkesztése';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'A 404-es hibaüzenet URL-je';
 $lng['extras']['errordocument403path'] = 'A 403-as hibaüzenet URL-je';
 $lng['extras']['errordocument500path'] = 'A 500-as hibaüzenet URL-je';
@@ -198,15 +194,7 @@ $lng['error']['mustbeurl'] = 'Nem teljes vagy nem érvényes URL-t (pl.: http://
 $lng['error']['invalidpath'] = 'Nem választott ki érvényes URL-t  (lehet, hogy probléma van a könyvtárlistázással?).';
 $lng['error']['stringisempty'] = 'A mezőben nincs adat.';
 $lng['error']['stringiswrong'] = 'A mezőben helytelen adat van.';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'Az új jelszó és annak megerősítése nem egyezik meg.';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domain\'';
 $lng['error']['mydocumentroot'] = '\'Dokumentum útvonal\'';
 $lng['error']['loginnameexists'] = 'A(z) %s felhasználónév már létezik';
@@ -233,7 +221,6 @@ $lng['error']['destinationnonexist'] = 'Kérem, levél-továbbítóját a  \'Cé
 $lng['error']['destinationalreadyexistasmail'] = 'A(z) %s továbbító már létezik mint aktív e-mail cím.';
 $lng['error']['destinationalreadyexist'] = 'Ön már létrehozott egy továbbítót ehhez: %s .';
 $lng['error']['destinationiswrong'] = 'A(z) %s továbbító érvénytelen karakter(eke)t tartalmaz vagy nem teljes.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -390,17 +377,12 @@ $lng['serversettings']['paging']['description'] = 'Hány bejegyzés jelenjen meg
 $lng['error']['ipstillhasdomains'] = 'A törölni kívánt IP/Port kombinációhoz domainek vannak rendelve. Rendelje hozzá ezeket egy másik IP/Port kombinációhoz, mielőtt a jelenlegi IP/Port kombinációt törli.';
 $lng['error']['cantdeletedefaultip'] = 'Nem törölheti az alapértelmezett viszonteladói  IP/Port kombinációt. Hozzon létre új  alapértelmezett IP/Port kombinációt a viszonteladóknak, mielőtt ezt az  IP/Port kombinációt törli.';
 $lng['error']['cantdeletesystemip'] = 'Nem törölheti a rendszer utolsó IP címét. Hozzon létre egy új IP/Port kombinációt a rendszer IP címére, vagy változatassa meg a rendszer IP címét.';
-$lng['error']['myipaddress'] = '\'IP\'';
-$lng['error']['myport'] = '\'Port\'';
 $lng['error']['myipdefault'] = 'Választania kell egy IP/Port kombinációt alapértelmezésnek.';
 $lng['error']['myipnotdouble'] = 'Ez az  IP/Port kombináció már létezik.';
 $lng['question']['admin_ip_reallydelete'] = 'Valóban törölni akarja a(z) %s IP címet?';
 $lng['admin']['ipsandports']['ipsandports'] = 'IP címek és Portok';
 $lng['admin']['ipsandports']['add'] = 'IP/Port hozzáadása';
 $lng['admin']['ipsandports']['edit'] = 'IP/Port szerkesztése';
-$lng['admin']['ipsandports']['ipandport'] = 'IP/Port';
-$lng['admin']['ipsandports']['ip'] = 'IP';
-$lng['admin']['ipsandports']['port'] = 'Port';
 
 // ADDED IN 1.2.13-rc3
 
@@ -464,5 +446,3 @@ $lng['serversettings']['phpappendopenbasedir']['description'] = 'Ezek az útvona
 // CHANGED IN 1.2.15-rc1
 
 $lng['error']['loginnameissystemaccount'] = 'Nem hozhat létre olyan fiókot, amely hasonlít a rendszerfiókokhoz (mint pl. a "%s" kezdetűek). Kérem, adjon meg másik fióknevet!';
-
-?>

lng/italian.lng.php

@@ -22,7 +22,7 @@
  * Global
  */
 
-$lng['translator'] = 'Luca Longinotti  Luca Piona  Emilien';
+$lng['translator'] = 'Luca Longinotti, Luca Piona, Emilien';
 $lng['panel']['edit'] = 'Modifica';
 $lng['panel']['delete'] = 'Cancella';
 $lng['panel']['create'] = 'Crea';
@@ -169,10 +169,6 @@ $lng['extras']['view_directory'] = 'Mostra protezione cartella';
 $lng['extras']['pathoptions_add'] = 'Aggiungi opzioni cartella';
 $lng['extras']['directory_browsing'] = 'Visualizza file e cartelle';
 $lng['extras']['pathoptions_edit'] = 'Modifica opzioni cartella';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'URL to ErrorDocument 404';
 $lng['extras']['errordocument403path'] = 'URL to ErrorDocument 403';
 $lng['extras']['errordocument500path'] = 'URL to ErrorDocument 500';
@@ -193,7 +189,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Prima di creare un dominio wildcard
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Hai già definito un catchall per questo dominio.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'Non puoi cancellare il tuo account FTP principale.';
 $lng['error']['login'] = 'Il nome utente o la password da te immessi sono incorretti. Per favore riprova!';
-$lng['error']['login_blocked'] = 'Questo account è stato sospeso per i troppi tentativi di login falliti. <br />Riprovi tra ' . $settings['login']['deactivatetime'] . ' secondi.';
+$lng['error']['login_blocked'] = 'Questo account è stato sospeso per i troppi tentativi di login falliti. <br />Riprovi tra %s secondi.';
 $lng['error']['notallreqfieldsorerrors'] = 'Alcuni campi sono stati lasciati vuoti o sono stati riempiti incorrettamente.';
 $lng['error']['oldpasswordnotcorrect'] = 'La vecchia password non è corretta.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'Non puoi assegnare più risorse di quante ne possieda tu stesso.';
@@ -201,15 +197,7 @@ $lng['error']['mustbeurl'] = 'Non hai inserito un\'indirizzo valido o completo (
 $lng['error']['invalidpath'] = 'Non hai scelto un\'indirizzo valido.';
 $lng['error']['stringisempty'] = 'Manca il dato nel campo.';
 $lng['error']['stringiswrong'] = 'Dato incorretto.';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'La nuova password non corrisponde a quella vecchia.';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Dominio\'';
 $lng['error']['mydocumentroot'] = '\'Documentroot\'';
 $lng['error']['loginnameexists'] = 'Il login %s esiste già.';
@@ -236,7 +224,6 @@ $lng['error']['destinationnonexist'] = 'Per favore crea il tuo reindirizzamento
 $lng['error']['destinationalreadyexistasmail'] = 'Il reindirizzamento a %s esiste già come indirizzo Email attivo.';
 $lng['error']['destinationalreadyexist'] = 'Hai già definito un reindirizzamento per %s .';
 $lng['error']['destinationiswrong'] = 'Il reindirizzamento %s contiene caratteri invalidi o è incompleto.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -460,9 +447,7 @@ $lng['error']['stringformaterror'] = 'Il valore per il campo "%s" non è nel for
 // ADDED IN 1.2.15-rc1
 // Translated by marone42@googlemail.com on 03/15/2007 (see https://trac.froxlor.org/ticket/126#comment:21)
 
-$lng['admin']['serversoftware'] = 'Serversoftware';
 $lng['admin']['phpversion'] = 'Versione PHP';
-$lng['admin']['phpmemorylimit'] = 'PHP-Memory-Limit';
 $lng['admin']['mysqlserverversion'] = 'Versione MySQL Server';
 $lng['admin']['mysqlclientversion'] = 'Version MySQL Client';
 $lng['admin']['webserverinterface'] = 'Interfaccia Webserver';
@@ -522,15 +507,9 @@ $lng['serversettings']['mailpwcleartext']['description'] = 'Se impostato a Si, t
 $lng['serversettings']['mailpwcleartext']['removelink'] = 'Clicca qui per cancellare tutte le password in chiaro dalla tabella.';
 $lng['question']['admin_cleartextmailpws_reallywipe'] = 'Sei sicuro di voler cancellare tutte le password in chiaro degli account email dalla tabella mail_users? Attenzione non si può tornare indietro!';
 $lng['admin']['configfiles']['overview'] = 'Panoramica';
-$lng['admin']['configfiles']['wizard'] = 'Wizard';
 $lng['admin']['configfiles']['distribution'] = 'Distribuzione';
 $lng['admin']['configfiles']['service'] = 'Servizio';
 $lng['admin']['configfiles']['daemon'] = 'Demone';
-$lng['admin']['configfiles']['http'] = 'Webserver (HTTP)';
-$lng['admin']['configfiles']['dns'] = 'Nameserver (DNS)';
-$lng['admin']['configfiles']['mail'] = 'Mailserver (IMAP/POP3)';
-$lng['admin']['configfiles']['smtp'] = 'Mailserver (SMTP)';
-$lng['admin']['configfiles']['ftp'] = 'FTP-Server';
 $lng['admin']['configfiles']['etc'] = 'Altro (Sistema)';
 $lng['admin']['configfiles']['choosedistribution'] = '-- Scegli una distribuzione --';
 $lng['admin']['configfiles']['chooseservice'] = '-- Scegli un servizio --';
@@ -544,8 +523,6 @@ $lng['panel']['back'] = 'Indietro';
 
 // ADDED IN 1.2.16-svn12
 
-$lng['serversettings']['mod_log_sql']['title'] = 'Salva i log temporaneamente nel database';
-$lng['serversettings']['mod_log_sql']['description'] = 'Usa <a target="blank" href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> per salvare temporaneamente le richieste web<br /><b>Questo richiede una <a target="blank" href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - documentation">configurazione di apache</a> particolare!</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'Includi PHP via mod_fcgid/suexec';
 $lng['serversettings']['mod_fcgid']['description'] = 'Usa mod_fcgid/suexec/libnss_mysql per avviare PHP con il corrispondente account-utente.<br/><b>Questo richiede una speciale configurazione del Webserver. Tutte le opzioni seguenti sono validi solo se il modulo è abilitato.</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Usa un\'indirizzo email alternativo';
@@ -572,7 +549,6 @@ $lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Dove vuoi che
 // ADDED IN 1.2.16-svn15
 
 $lng['error']['formtokencompromised'] = 'La richiesta sembra essere compromessa. Per motivi di sicurezza sei stato disconnesso.';
-$lng['serversettings']['mysql_access_host']['title'] = 'MySQL-Access-Hosts';
 $lng['serversettings']['mysql_access_host']['description'] = 'Lista degli host (separati da una virgola) a cui gli utenti possono collegarsi al server MySQL.';
 
 // ADDED IN 1.2.18-svn1
@@ -588,7 +564,6 @@ $lng['admin']['webalizersettings'] = 'Impostazioni Webalizer';
 $lng['admin']['webalizer']['normal'] = 'Normale';
 $lng['admin']['webalizer']['quiet'] = 'Modesto';
 $lng['admin']['webalizer']['veryquiet'] = 'Niente';
-$lng['serversettings']['webalizer_quiet']['title'] = 'Webalizer output';
 $lng['serversettings']['webalizer_quiet']['description'] = 'Verbosità del programma webalizer';
 
 // ADDED IN 1.2.18-svn3
@@ -666,13 +641,9 @@ $lng['question']['ticket_reallyclose'] = 'Vuoi veramente chiudere il ticket"%s"?
 $lng['question']['ticket_reallydelete'] = 'Vuoi veramente cancellare il ticket"%s"?';
 $lng['question']['ticket_reallydeletecat'] = 'Vuoi veramente eliminare la categoria "%s"?';
 $lng['question']['ticket_reallyarchive'] = 'Vuoi veramente spostare il ticket "%s" in archivio?';
-$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
-$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
-$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
 $lng['error']['nomoreticketsavailable'] = 'Sono stati usati tutti i ticket disponibili. Si prega di contattare l\'amministratore.';
 $lng['error']['nocustomerforticket'] = 'Impossibile creare ticket senza clienti';
 $lng['error']['categoryhastickets'] = 'La categoria contiene ancora ticket.<br />Si prega di cancellare i ticket per eliminare la categoria';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Impostazioni Gestione Ticket';
 $lng['admin']['archivelastrun'] = 'Ultimo ticket archiviato';
 $lng['serversettings']['ticket']['noreply_email']['title'] = 'Non rispondere a questo indirizzo email';
@@ -831,14 +802,8 @@ $lng['admin']['awstatssettings'] = 'Impostazioni Awstats';
 
 $lng['admin']['domain_dns_settings'] = 'Impostazioni dominio dns';
 $lng['dns']['destinationip'] = 'Dominio IP';
-$lng['dns']['standardip'] = 'Server standard IP';
 $lng['dns']['a_record'] = 'A-Record (IPv6 optionale)';
-$lng['dns']['cname_record'] = 'CNAME-Record';
 $lng['dns']['mxrecords'] = 'Definisci MX records';
-$lng['dns']['standardmx'] = 'Server standard MX record';
-$lng['dns']['mxconfig'] = 'Custom MX records';
-$lng['dns']['priority10'] = 'Priority 10';
-$lng['dns']['priority20'] = 'Priority 20';
 $lng['dns']['txtrecords'] = 'Definisci TXT records';
 $lng['dns']['txtexample'] = 'Esempio (SPF-entry):<br />v=spf1 ip4:xxx.xxx.xx.0/23 -all';
 $lng['serversettings']['selfdns']['title'] = 'Impostazioni dominio dns del cliente';
@@ -921,7 +886,7 @@ $lng['customer']['mail_quota'] = 'Limite Mail';
 $lng['panel']['megabyte'] = 'MegaByte';
 $lng['panel']['not_supported'] = 'Non supportato in: ';
 $lng['emails']['quota_edit'] = 'Cambia limite E-Mail';
-$lng['error']['allocatetoomuchquota'] = 'Si è tentato di allocare %s MB ' . $lng['emails']['quota'] . ', ma non c\'è abbastanza spazio disponibile.';
+$lng['error']['allocatetoomuchquota'] = 'Si è tentato di allocare %s MB Limite, ma non c\'è abbastanza spazio disponibile.';
 
 // Autoresponder module
 
@@ -972,7 +937,6 @@ $lng['error']['phpsettingidwrong'] = 'Una configurazione PHP con questo ID non e
 $lng['error']['descriptioninvalid'] = 'La descrizione è troppo corta, La descrizione è troppo corta o troppo lunga o contiene caratteri non validi.';
 $lng['error']['info'] = 'Info';
 $lng['admin']['phpconfig']['template_replace_vars'] = 'Variabili che saranno sostituite nei file di configurazione';
-$lng['admin']['phpconfig']['safe_mode'] = 'Verrà sostituito con l\'impostazione safe_mode del dominio.';
 $lng['admin']['phpconfig']['pear_dir'] = 'Verrà sostituito con le impostazioni globali per la cartella pear.';
 $lng['admin']['phpconfig']['open_basedir_c'] = 'Inserirà un ; (punto e virgola) per commentare/disabilitare open_basedir se impostato';
 $lng['admin']['phpconfig']['open_basedir'] = 'Verrà sostituito con l\'impostazione open_basedir del dominio.';
@@ -1300,7 +1264,7 @@ $lng['dkim']['dkim_algorithm']['title'] = 'Ammessi Algoritmi Hash';
 $lng['dkim']['dkim_algorithm']['description'] = 'Definire gli algoritmi di hash permessi, scegliere "Tutti" per permettere tutti gli algoritmi oppure uno o più tra gli altri algoritmi disponibili';
 $lng['dkim']['dkim_servicetype'] = 'Tipi di Servizio';
 $lng['dkim']['dkim_keylength']['title'] = 'Lunghezza Chiave';
-$lng['dkim']['dkim_keylength']['description'] = 'Attenzione: Se si modifica questo valore è necessario eliminare tutte le chiavi private/pubbliche in "'.$settings['dkim']['dkim_prefix'].'"';
+$lng['dkim']['dkim_keylength']['description'] = 'Attenzione: Se si modifica questo valore è necessario eliminare tutte le chiavi private/pubbliche in "%s"';
 $lng['dkim']['dkim_notes']['title'] = 'Note DKIM';
 $lng['dkim']['dkim_notes']['description'] = 'Nota potrebbe essere di interesse, es. un URL come http://www.dnswatch.info. Nessuna interpretazione è fatta da nessun programma. Questo tag deve essere usato con parsimonia per ragioni di spazio nel DNS. Questo è destinato ad essere utilizzato dagli amministratori e non dagli utenti finali.';
 $lng['dkim']['dkim_add_adsp']['title'] = 'Aggiungi un valore DKIM ADSP';
@@ -1363,12 +1327,12 @@ $lng['ticket']['orderdesc'] = 'Qui è possibile definire il tuo ordine logico pe
 // ADDED IN FROXLOR 0.9.6-svn3
 $lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Abilita errordocuments in automatico per tutti i clienti';
 $lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'File/URL per l\'errore 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">Non supportato in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'File/URL per l\'errore 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">Non supportato in: lighttpd</div>';
 $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL per l\'errore 404';
 $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL per l\'errore 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">Non supportato in: lighttpd</div>';
 
 // ADDED IN FROXLOR 0.9.6-svn4
 $lng['serversettings']['ticket']['default_priority'] = 'Priorità predefinita per il supporto ticket';
@@ -1602,10 +1566,9 @@ $lng['traffic']['months']['total'] = 'Totale';
 $lng['traffic']['details'] = 'Dettagli';
 $lng['menue']['traffic']['table'] = 'Traffico';
 $lng['error']['admin_domain_emailsystemhostname'] = 'Spiacente, l\'hostname di sistema non può essere usato come dominio di un cliente';
-$lng['backup'] = 'Backup';
 $lng['backup_allowed'] = 'Backup permesso';
 $lng['extras']['backup_create'] = 'Creare il Backup?';
-$lng['extras']['backup_info'] = 'Il Backup sarà eseguito una volta al giorno nella cartella "' . $settings['system']['backup_dir'] . '".';
+$lng['extras']['backup_info'] = 'Il Backup sarà eseguito una volta al giorno nella cartella ...';
 $lng['extras']['backup_info_sep'] = 'Contiene gli archivi compressi dei file HTML Files e dei Database.';
 $lng['extras']['backup_info_big'] = 'Contiene un archivio compresso dei file HTML Files e dei Database.';
 $lng['extras']['backup_count_info'] = '<br /><br />Si tenga in considerazione che il backup utilizza lo spazio web!';
@@ -1615,7 +1578,4 @@ $lng['serversettings']['backupdir']['description'] = 'Qual\'è il nome della car
 $lng['serversettings']['mysqldump_path']['description'] = 'Percorso del comando mysqldump?';
 $lng['serversettings']['backup_bigfile'] = 'Salvare il backup in un unico grande file al posto di salvare separatamente i file html e i database?';
 $lng['serversettings']['backup_ftp_enabled'] = 'Attiva o l\'upload FTP?';
-$lng['serversettings']['backup_ftp_server'] = 'Server FTP:';
 $lng['serversettings']['backup_ftp_user'] = 'Utente FTP:';
-$lng['serversettings']['backup_ftp_pass'] = 'Password FTP:';
-$lng['crondesc']['cron_backup'] = 'Backup cronjob';

lng/portugues.lng.php

@@ -170,10 +170,6 @@ $lng['extras']['view_directory'] = 'Mostrar conteúdo do diretório';
 $lng['extras']['pathoptions_add'] = 'Adicionar opções de caminho';
 $lng['extras']['directory_browsing'] = 'Pesquizar conteúdo de diretório';
 $lng['extras']['pathoptions_edit'] = 'Esitar opções de caminhos';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'URL para página de erro 404';
 $lng['extras']['errordocument403path'] = 'URL para página de erro 403';
 $lng['extras']['errordocument500path'] = 'URL para página de erro 500';
@@ -194,7 +190,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Voce deve deletar todos subdominios
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Voce já definiu uma conta pega tudo para este dominio.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'Voce não pode deletar a conta principal de FTP';
 $lng['error']['login'] = 'O usuário ou senha digitados, não estão corretos. Por favor tente novamente!';
-$lng['error']['login_blocked'] = 'Esta conta está suspensa por exceder as tentativas de login permitidas. <br />Por favor tente novamente em ' . $settings['login']['deactivatetime'] . ' segundos.';
+$lng['error']['login_blocked'] = 'Esta conta está suspensa por exceder as tentativas de login permitidas. <br />Por favor tente novamente em %s segundos.';
 $lng['error']['notallreqfieldsorerrors'] = 'Voce não preencheu todos os campos ou preencheu algum campo incorretamente.';
 $lng['error']['oldpasswordnotcorrect'] = 'A senha antiga não confere.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'Voce não pode alocar mais recursos do que voce mesmo possui.';
@@ -202,15 +198,7 @@ $lng['error']['mustbeurl'] = 'Voce não digitou uma URL válida (ex. http://seud
 $lng['error']['invalidpath'] = 'Optou por um URL não válido (eventuais problemas na lista do directório)';
 $lng['error']['stringisempty'] = 'Faltando informação no campo';
 $lng['error']['stringiswrong'] = 'Erro na informação do campo';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'A nova senha e a confirmação não conferem';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Dominio\'';
 $lng['error']['mydocumentroot'] = '\'Documento principal\'';
 $lng['error']['loginnameexists'] = 'Login %s já existe';
@@ -237,7 +225,6 @@ $lng['error']['destinationnonexist'] = 'Por favor crie seu redirecionamento no c
 $lng['error']['destinationalreadyexistasmail'] = 'O redirecionamento %s já existe como uma conta de e-mail.';
 $lng['error']['destinationalreadyexist'] = 'Voce já definiu um redirecionamento para %s .';
 $lng['error']['destinationiswrong'] = 'O redirecionamento %s contem caracteres inválidos ou incompletos.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -492,7 +479,6 @@ $lng['admin']['configfiles']['choosedaemon'] = 'Escolha um daemon';
 $lng['serversettings']['ftpdomain']['title'] = 'Contas FTP @domínio';
 $lng['serversettings']['ftpdomain']['description'] = 'Clientes podem criar contas de FTP user@domíniodocliente?';
 $lng['panel']['back'] = 'Volta';
-$lng['serversettings']['mod_log_sql']['title'] = 'Temporariamente salva os logs no banco de dados';
 $lng['serversettings']['mod_fcgid']['title'] = 'Incluir PHP via mod_fcgid/suexec';
 $lng['serversettings']['mod_fcgid']['description'] = 'Use mod_fcgid/suexec/libnss_mysql to run PHP with the corresponding useraccount.<br/><b>This needs a special Apache configuration. All following options are only valid if the module is enabled.</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Utilize endereço de e-mail alternativo';
@@ -591,13 +577,9 @@ $lng['question']['ticket_reallyclose'] = 'Você deseja fechar o ticket"%s"?';
 $lng['question']['ticket_reallydelete'] = 'Você deseja apagar o ticket"%s"?';
 $lng['question']['ticket_reallydeletecat'] = 'Você deseja deletar a categoria "%s"?';
 $lng['question']['ticket_reallyarchive'] = 'Você deseja mover o ticket "%s" para o arquivo?';
-$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
-$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
-$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
 $lng['error']['nomoreticketsavailable'] = 'Você já utilizou todos seus tickets disponíveis. Por favor contacte seu administrador';
 $lng['error']['nocustomerforticket'] = 'Não pode criar Tickets sem Clientes';
 $lng['error']['categoryhastickets'] = 'A categoria ainda tem tikets na mesma. <br /> Por favor elimine os bilhetes para eliminar a categoria';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Configurações de Ticket de Suporte';
 $lng['admin']['archivelastrun'] = 'Último arquivamento de ticket';
 $lng['serversettings']['ticket']['noreply_email']['title'] = 'Não responder endereço de email';
@@ -832,7 +814,6 @@ $lng['error']['phpsettingidwrong'] = 'Não existe uma configuração de PHP para
 $lng['error']['descriptioninvalid'] = 'A descrição é muito curta, muito longa ou contem carácters ilegais';
 $lng['error']['info'] = 'Iinformações';
 $lng['admin']['phpconfig']['template_replace_vars'] = 'As variáveis que serão substituídas nas Configurações';
-$lng['admin']['phpconfig']['safe_mode'] = 'Vai ser substituído pelas configurações seguras deste domínios.';
 $lng['admin']['phpconfig']['pear_dir'] = 'Serão substituídos com a definição global para o diretório pear.';
 $lng['admin']['phpconfig']['open_basedir'] = 'Serão substituídos com a definição do domínio open_basedir.';
 $lng['admin']['phpconfig']['tmp_dir'] = 'Substituído com o diretório temporário do domínio.';
@@ -1045,5 +1026,3 @@ $lng['admin']['phpsettings']['file_extensions_note'] = '(Sem pontos, separados p
 $lng['admin']['mod_fcgid_maxrequests']['title'] = 'Máximo de requisições php para este domínio (vazio para valor default)';
 $lng['serversettings']['mod_fcgid']['maxrequests']['title'] = 'Máximo de solicitações por Domínio';
 $lng['serversettings']['mod_fcgid']['maxrequests']['description'] = 'Quantas solicitações serão aceitas por domínio?';
-
-?>

lng/russian.lng.php

@@ -438,19 +438,6 @@ $lng['extras']['directory_browsing'] = 'Показать содержимое к
 // Verzeichnisinhalt anzeigen
 
 $lng['extras']['pathoptions_edit'] = 'Изменить настройки пути';
-$lng['extras']['error404path'] = '404';
-
-// 404
-
-$lng['extras']['error403path'] = '403';
-
-// 403
-
-$lng['extras']['error500path'] = '500';
-
-// 500
-
-$lng['extras']['error401path'] = '401';
 
 // 401
 
@@ -518,7 +505,7 @@ $lng['error']['login'] = 'Указанные имя пользователя и
 
 // Der angegebene Benutzername/Passwort ist falsch.
 
-$lng['error']['login_blocked'] = 'Из-за многочисленных ошибочных попыток логина аккаунт временно закрыт. <br />Пожалуйста попробуйте через ' . $settings['login']['deactivatetime'] . ' секунд ещё раз.';
+$lng['error']['login_blocked'] = 'Из-за многочисленных ошибочных попыток логина аккаунт временно закрыт. <br />Пожалуйста попробуйте через %s секунд ещё раз.';
 
 // Dieser Account wurde aufgrund zu vieler Fehlversuche vorruebergehend geschlossen. <br />Bitte versuchen Sie es in '.$settings['login']['deactivatetime'].' Sekunden erneut.
 
@@ -550,18 +537,10 @@ $lng['error']['stringiswrong'] = 'Неправильные данные в по
 
 // Falsche Eingabe im Feld
 
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'Новый пароль и повторённый новый пароль отличаются.';
 
 // Das neue Passwort und die Bestaetigung sind nicht identisch.
 
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Домен\'';
 
 // \'Domain\'
@@ -666,7 +645,6 @@ $lng['error']['destinationiswrong'] = 'Адрес для пересылки %s
 
 // Die Weiterleitungsadresse-Adresse %s beinhaltet ungueltige Zeichen oder ist nicht vollstaendig.
 
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -1398,7 +1376,3 @@ $lng['admin']['mysqlclientversion'] = 'Версия клиента MySQL';
 $lng['admin']['webserverinterface'] = 'Интерфейс вебсервера';
 
 // Webserver Interface
-
-
-
-?>

lng/slovak.lng.php

@@ -165,10 +165,6 @@ $lng['extras']['view_directory'] = 'Zobrazi» obsah adresára';
 $lng['extras']['pathoptions_add'] = 'Prida» moŸnosti cesty';
 $lng['extras']['directory_browsing'] = 'Prezeranie obsahu adresáru';
 $lng['extras']['pathoptions_edit'] = 'Upravi» moŸnosti cesty';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'URL pre Chybový Dokument 404';
 $lng['extras']['errordocument403path'] = 'URL pre Chybový Dokument 403';
 $lng['extras']['errordocument500path'] = 'URL pre Chybový Dokument 500';
@@ -189,7 +185,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Pred vytvorením wildcard domény n
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Pre túto doménu ste uŸ doménový kô¹ nadefinovali.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'NemôŸete vymaza» Vá¹ hlavný FTP úèet';
 $lng['error']['login'] = 'UŸívateµské meno alebo heslo, ktoré ste zadali je nesprávne. Prosím, skúste znovu!';
-$lng['error']['login_blocked'] = 'Tento úèet bol suspendovaný z dôvodu veµkého mnoŸsta chybových prihlasení. <br />Prosím, skúste znovu za ' . $settings['login']['deactivatetime'] . ' sekúnd.';
+$lng['error']['login_blocked'] = 'Tento úèet bol suspendovaný z dôvodu veµkého mnoŸsta chybových prihlasení. <br />Prosím, skúste znovu za %s sekúnd.';
 $lng['error']['notallreqfieldsorerrors'] = 'Nevyplnili ste v¹etky polia, alebo sú niektoré nesprávne.';
 $lng['error']['oldpasswordnotcorrect'] = 'Stará heslo nie je správne.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'NemôŸete vymedzi» viac prostiedkov ako sú povolené pre Vás.';
@@ -197,15 +193,7 @@ $lng['error']['mustbeurl'] = 'Nezadali ste správu alebo kompletnú URL (napr. h
 $lng['error']['invalidpath'] = 'Nevybrali ste správu URL (moŸno je problém so zoznamom adresárov)';
 $lng['error']['stringisempty'] = 'Chýbajúce vstupné pole';
 $lng['error']['stringiswrong'] = 'Nesprávne vstupné pole';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'Nové a potvrdzujúce heslo sa nezhodujú';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domain\'';
 $lng['error']['mydocumentroot'] = '\'Documentroot\'';
 $lng['error']['loginnameexists'] = 'Prihlasovacie meno %s uŸ existuje';
@@ -232,7 +220,6 @@ $lng['error']['destinationnonexist'] = 'Prosím, vytvorte Va¹e presmerovanie v
 $lng['error']['destinationalreadyexistasmail'] = 'Presmerovanie na %s uŸ existuje s aktívnou E-mail adresou.';
 $lng['error']['destinationalreadyexist'] = 'UŸ ste definovali presmerovanie na %s .';
 $lng['error']['destinationiswrong'] = 'Presmerovanie %s obsahuje neplatný(é) znak(y) alebo je nekompletné.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -394,10 +381,6 @@ $lng['question']['admin_ip_reallydelete'] = 'Naozaj chcete zmaza» IP adresu %s?
 $lng['admin']['ipsandports']['ipsandports'] = 'IP a Port(y)';
 $lng['admin']['ipsandports']['add'] = 'Prida» IP/Port';
 $lng['admin']['ipsandports']['edit'] = 'Upravi»t IP/Port';
-$lng['admin']['ipsandports']['ipandport'] = 'IP/Port';
-$lng['admin']['ipsandports']['ip'] = 'IP';
-$lng['admin']['ipsandports']['port'] = 'Port';
-
 // ADDED IN 1.2.13-rc3
 
 $lng['error']['cantchangesystemip'] = 'NemôŸete zmeni» poslednú IP systému, ani vytvori» ïaµ¹iu novú IP/Port kombináciu pre IP systém alebo zmeni» systémovú IP.';
@@ -460,5 +443,3 @@ $lng['serversettings']['phpappendopenbasedir']['description'] = 'Tieto cesty (od
 // CHANGED IN 1.2.15-rc1
 
 $lng['error']['loginnameissystemaccount'] = 'NemôŸete vytvori» úèet, ktorý je podobný systémovému úètu (napríklad zaènite s &quot;%s&quot;). Prosím, zadajte iný názov úètu.';
-
-?>

lng/spanish.lng.php

@@ -167,10 +167,6 @@ $lng['extras']['directoryprotection_add'] = 'Crear Protección de Directorio';
 $lng['extras']['view_directory'] = 'Mostrar directorio';
 $lng['extras']['pathoptions_add'] = 'agregue las opciones del camino';
 $lng['extras']['directory_browsing'] = 'Mostrar contenido del Directorio';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = 'URL para errorDocumento 404';
 $lng['extras']['errordocument403path'] = 'URL para errorDocumento 403';
 $lng['extras']['errordocument500path'] = 'URL para errorDocumento 500';
@@ -191,7 +187,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Usted debe primero borar todos los
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Usted acaba de definer una Direccion como Catchall para este dominio.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'Usted no puede suprimir su cuenta principal del ftp';
 $lng['error']['login'] = 'El Nombre de Usuario/Clave esta Errado. Por favor intento otra vez!';
-$lng['error']['login_blocked'] = 'Esta cuenta fue cerrada transitoriamente debido a demasiados intentos falsos. <br />Por favor intente otra vez en ' . $settings['login']['deactivatetime'] . ' segundos.';
+$lng['error']['login_blocked'] = 'Esta cuenta fue cerrada transitoriamente debido a demasiados intentos falsos. <br />Por favor intente otra vez en %s segundos.';
 $lng['error']['notallreqfieldsorerrors'] = 'Usted no ha llenado todos los espacios asignados o ha colocado un dato Erroneo.';
 $lng['error']['oldpasswordnotcorrect'] = 'La Clave Vieja no es correcta.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'Usted no puede afectar un aparato más recursos que los que usted posee.';
@@ -199,15 +195,7 @@ $lng['error']['mustbeurl'] = 'Usted tiene que dar una completa direccion URL(por
 $lng['error']['invalidpath'] = 'No ha seleccionado una URL válida (¿probablemente problemas con el listado de registros?)';
 $lng['error']['stringisempty'] = 'Falta un dato';
 $lng['error']['stringiswrong'] = 'Dato falso';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'La Clave Nueva a la Confirmacion de Clave no Coinciden';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'dominio\'';
 $lng['error']['mydocumentroot'] = '\'Documentroot\'';
 $lng['error']['loginnameexists'] = 'Conexión-Nombre %s existe ya';
@@ -234,7 +222,6 @@ $lng['error']['destinationnonexist'] = 'Crear por favor su email-expedición en
 $lng['error']['destinationalreadyexistasmail'] = 'La direccion Secundaria %s ya existe como Direccion e-mail activa.';
 $lng['error']['destinationalreadyexist'] = 'Ya existe una Direccion Secundaria para %s .';
 $lng['error']['destinationiswrong'] = 'La Direccion Secundaria %s contiene simbolos invalidos o esta incompleta.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -443,5 +430,3 @@ $lng['panel']['search'] = 'Buscar';
 $lng['panel']['used'] = 'usado';
 $lng['panel']['translator'] = 'Traductor';
 $lng['error']['stringformaterror'] = 'El valor para la fila "%s" no esta dentro de los formatos esperados.';
-
-?>

lng/swedish.lng.php

@@ -167,14 +167,6 @@ $lng['extras']['view_directory'] = 'Visa kataloginnehåll';
 $lng['extras']['pathoptions_add'] = '[Skapa ny regel för sökvägar]';
 $lng['extras']['directory_browsing'] = 'Visning av katalogstruktur';
 $lng['extras']['pathoptions_edit'] = 'Ändra sökvägsinställningar';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
-$lng['extras']['errordocument404path'] = 'URL to ErrorDocument 404';
-$lng['extras']['errordocument403path'] = 'URL to ErrorDocument 403';
-$lng['extras']['errordocument500path'] = 'URL to ErrorDocument 500';
-$lng['extras']['errordocument401path'] = 'URL to ErrorDocument 401';
 
 /**
  * Errors
@@ -191,7 +183,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Du måste radera alla sub-domäner
 $lng['error']['youhavealreadyacatchallforthisdomain'] = 'Du har redan skapat en maildump för denna domän.';
 $lng['error']['ftp_cantdeletemainaccount'] = 'Det går inte att radera huvud FTP kontot för domänen';
 $lng['error']['login'] = 'Användarnamnet eller lösenordet var felaktigt, försök igen!';
-$lng['error']['login_blocked'] = 'Kontot har blivit avstängt på grund av för många felaktiga inloggningsförsök. <br />Försök igen om ' . $settings['login']['deactivatetime'] . ' sekunder.';
+$lng['error']['login_blocked'] = 'Kontot har blivit avstängt på grund av för många felaktiga inloggningsförsök. <br />Försök igen om %s sekunder.';
 $lng['error']['notallreqfieldsorerrors'] = 'Du har inte fyllt i alla fält eller så har du skrivit in något som inte accepteras.';
 $lng['error']['oldpasswordnotcorrect'] = 'Det gamla lösenordet är fel.';
 $lng['error']['youcantallocatemorethanyouhave'] = 'Du kan inte skapa fler resurser än du äger själv (You cannot allocate more resources than you own for yourself).';
@@ -199,15 +191,7 @@ $lng['error']['mustbeurl'] = 'Du har inte skrivit in en korrekt url (e.g. http:/
 $lng['error']['invalidpath'] = 'Du har inte valt en korrekt url (Kanske har du lagt till en katalogsäkerhet så att katalogerna inte kan visas?)';
 $lng['error']['stringisempty'] = 'Du måste skriva in något i fältet';
 $lng['error']['stringiswrong'] = 'Fel inatningsfält';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = 'New password and confirmation does not match';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'Domain\'';
 $lng['error']['mydocumentroot'] = '\'Documentroot\'';
 $lng['error']['loginnameexists'] = 'Login-Name %s är upptaget';
@@ -234,7 +218,6 @@ $lng['error']['destinationnonexist'] = 'Skapa en forwarder i fältet \'Destinati
 $lng['error']['destinationalreadyexistasmail'] = 'Denna forwarder %s, finns redan som aktiv E-postadress.';
 $lng['error']['destinationalreadyexist'] = 'Du har redan skapat en forwarder till %s .';
 $lng['error']['destinationiswrong'] = 'Denna forwarder: %s innehåller ogiltiga tecken eller så är den inte komplett adress.';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -401,9 +384,6 @@ $lng['question']['admin_ip_reallydelete'] = 'Är du säker på att du vill rader
 $lng['admin']['ipsandports']['ipsandports'] = 'IPs and Ports';
 $lng['admin']['ipsandports']['add'] = '[Lägg till IP/Port]';
 $lng['admin']['ipsandports']['edit'] = 'Ändra IP/Port';
-$lng['admin']['ipsandports']['ipandport'] = 'IP/Port';
-$lng['admin']['ipsandports']['ip'] = 'IP';
-$lng['admin']['ipsandports']['port'] = 'Port';
 
 // ADDED IN 1.2.13-rc3
 
@@ -517,18 +497,8 @@ $lng['serversettings']['mailpwcleartext']['removelink'] = 'Klicka här för att
 $lng['question']['admin_cleartextmailpws_reallywipe'] = 'Är du säker på att du vill radera alla okrupterade lösenord från tabellen mail_users? Du kan INTE ändra dig efteråt!';
 $lng['admin']['configfiles']['overview'] = 'Översikt';
 $lng['admin']['configfiles']['wizard'] = 'Guide';
-$lng['admin']['configfiles']['distribution'] = 'Distribution';
-$lng['admin']['configfiles']['service'] = 'Service';
-$lng['admin']['configfiles']['daemon'] = 'Daemon';
-$lng['admin']['configfiles']['http'] = 'Webserver (HTTP)';
-$lng['admin']['configfiles']['dns'] = 'Namnserver (DNS)';
 $lng['admin']['configfiles']['mail'] = 'E-postserver (POP3/IMAP)';
 $lng['admin']['configfiles']['smtp'] = 'E-postserver (SMTP)';
-$lng['admin']['configfiles']['ftp'] = 'FTP-Server';
-$lng['admin']['configfiles']['etc'] = 'Others (System)';
-$lng['admin']['configfiles']['choosedistribution'] = '-- Choose a distribution --';
-$lng['admin']['configfiles']['chooseservice'] = '-- Choose a service --';
-$lng['admin']['configfiles']['choosedaemon'] = '-- Choose a daemon --';
 $lng['admin']['trafficlastrun'] = 'Senaste trafikberäkningen gjordes';
 
 // ADDED IN 1.2.16-svn10
@@ -539,8 +509,6 @@ $lng['panel']['back'] = 'Tillbaka';
 
 // ADDED IN 1.2.16-svn12
 
-$lng['serversettings']['mod_log_sql']['title'] = 'Tillfälligt spara loggfiler i databasen';
-$lng['serversettings']['mod_log_sql']['description'] = 'Använd <a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> för att spara webfrågor tillfälligt<br /><b>Detta behöver en special <a href="http://files.syscp.org/docs/mod_log_sql/" title="mod_log_sql - documentation">apache-configuration</a>!</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'Inkludera PHP via mod_fcgid/suexec';
 $lng['serversettings']['mod_fcgid']['description'] = 'Använd mod_fcgid/suexec/libnss_mysql för att köra PHP med tillhörande användarkonto.<br/><b>Denna inställning behöver en speciell apache-konfiguration!</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Använd en alternativ E-postadress';
@@ -567,7 +535,6 @@ $lng['serversettings']['apacheconf_htpasswddir']['description'] = 'Var skall htp
 // ADDED IN 1.2.16-svn15
 
 $lng['error']['formtokencompromised'] = 'Den säkra anslutningen till Froxlor har avslutats och du har av säkerhetsskäl automatiskt loggats ur.';
-$lng['serversettings']['mysql_access_host']['title'] = 'MySQL-Access-Hosts';
 $lng['serversettings']['mysql_access_host']['description'] = 'En kommaseparerad lista med datornamn som tillåts att kontakta MySQL servern.';
 
 // ADDED IN 1.2.18-svn1
@@ -583,8 +550,6 @@ $lng['admin']['webalizersettings'] = 'Webalizer inställningar';
 $lng['admin']['webalizer']['normal'] = 'Normal';
 $lng['admin']['webalizer']['quiet'] = 'Tyst';
 $lng['admin']['webalizer']['veryquiet'] = 'Väldigt tyst';
-$lng['serversettings']['webalizer_quiet']['title'] = 'Webalizer output';
-$lng['serversettings']['webalizer_quiet']['description'] = 'Verbosity of the webalizer-program';
 
 // ADDED IN 1.2.18-svn3
 
@@ -664,13 +629,9 @@ $lng['question']['ticket_reallyclose'] = 'Är du säker på att du vill stänga
 $lng['question']['ticket_reallydelete'] = 'Är du säker på att du vill radera supportärendet "%s"?';
 $lng['question']['ticket_reallydeletecat'] = 'Är du säker på att du vill radera kategorin "%s"?';
 $lng['question']['ticket_reallyarchive'] = 'Är du säker på att du vill flytta supportärendet "%s" till arkivet?';
-$lng['error']['mysubject'] = '\'' . $lng['ticket']['subject'] . '\'';
-$lng['error']['mymessage'] = '\'' . $lng['ticket']['message'] . '\'';
-$lng['error']['mycategory'] = '\'' . $lng['ticket']['category'] . '\'';
 $lng['error']['nomoreticketsavailable'] = 'Du har redan använt alla supportärenden som du fått tilldelade. Kontakta administratören om du behöver fler.';
 $lng['error']['nocustomerforticket'] = 'Det går inte att skapa ett supportärende utan kunder';
 $lng['error']['categoryhastickets'] = 'Denna kategori har fortfarande supportärenden.<br />Du måste radera dessa ärenden innan du kan radera denna kategori';
-$lng['error']['notmorethanxopentickets'] = $lng['ticket']['notmorethanxopentickets'];
 $lng['admin']['ticketsettings'] = 'Supportärende inställningar';
 $lng['admin']['archivelastrun'] = 'Sista supportärende som arkiverats';
 $lng['serversettings']['ticket']['noreply_email']['title'] = 'Svara-Inte E-post adress';
@@ -738,5 +699,3 @@ $lng['traffic']['distribution'] = '<font color="#019522">FTP</font> | <font colo
 $lng['traffic']['sumhttp'] = 'Summa HTTP-Trafik i';
 $lng['traffic']['sumftp'] = 'Summa FTP-Trafik i';
 $lng['traffic']['summail'] = 'Summa E-posttrafik i';
-
-?>

lng/zh-cn.lng.php

@@ -14,6 +14,7 @@
  * @author     Wang Changyi <wangchangyi@hotmail.com>
  * @author     Patrick Brueckner <patrick_brueckner@yahoo.de>
  * @author     Yuan Yang <melodieyy@web.de>
+ * @author     Jason Zhang <service@hiwins.com>
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Language
  *
@@ -23,7 +24,7 @@
  * Global
  */
 
-$lng['translator'] = 'Jackie Zhang, Wang Changyi, Yuan Yang';
+$lng['translator'] = 'Jackie Zhang, Wang Changyi, Yuan Yang, Jason Zhang';
 $lng['panel']['edit'] = '编辑';
 $lng['panel']['delete'] = '删除';
 $lng['panel']['create'] = '创建';
@@ -33,6 +34,7 @@ $lng['panel']['no'] = '否';
 $lng['panel']['emptyfornochanges'] = '无改变清空';
 $lng['panel']['emptyfordefault'] = '默认值清空';
 $lng['panel']['path'] = '路径';
+$lng['panel']['options'] = '选项';
 $lng['panel']['toggle'] = '触发器';
 $lng['panel']['next'] = '下一个';
 $lng['panel']['dirsmissing'] = '目录不可添加或者不可读';
@@ -44,7 +46,7 @@ $lng['panel']['dirsmissing'] = '目录不可添加或者不可读';
 $lng['login']['username'] = '用户名';
 $lng['login']['password'] = '密码';
 $lng['login']['language'] = '语言';
-$lng['login']['login'] = '登陆';
+$lng['login']['login'] = '登录';
 $lng['login']['logout'] = '登出';
 $lng['login']['profile_lng'] = '用户标准语言';
 
@@ -66,12 +68,12 @@ $lng['customer']['customernumber'] = '顾客号';
 $lng['customer']['diskspace'] = '磁盘空间(MB)';
 $lng['customer']['traffic'] = '流量(GB)';
 $lng['customer']['mysqls'] = 'MySQL数据库';
-$lng['customer']['emails'] = '电子邮件地址';
+$lng['customer']['emails'] = '电子邮件账户';
 $lng['customer']['accounts'] = '电子邮件帐户';
 $lng['customer']['forwarders'] = '电子邮件转发';
-$lng['customer']['ftps'] = 'FTP文件格式';
-$lng['customer']['subdomains'] = '子域';
-$lng['customer']['domains'] = '域';
+$lng['customer']['ftps'] = 'FTP账户';
+$lng['customer']['subdomains'] = '子域名';
+$lng['customer']['domains'] = '域名';
 $lng['customer']['unlimited'] = '无限的';
 
 /**
@@ -80,21 +82,21 @@ $lng['customer']['unlimited'] = '无限的';
 
 $lng['menue']['main']['main'] = '主要的';
 $lng['menue']['main']['changepassword'] = '更改密码';
-$lng['menue']['main']['changelanguage'] = '语言转换';
+$lng['menue']['main']['changelanguage'] = '切换语言';
 $lng['menue']['email']['email'] = '电子邮件';
 $lng['menue']['email']['emails'] = '地址';
 $lng['menue']['email']['webmail'] = '网络邮件';
 $lng['menue']['mysql']['mysql'] = 'MySQL';
 $lng['menue']['mysql']['databases'] = '数据库';
 $lng['menue']['mysql']['phpmyadmin'] = 'phpMyAdmin';
-$lng['menue']['domains']['domains'] = '域';
+$lng['menue']['domains']['domains'] = '域名';
 $lng['menue']['domains']['settings'] = '设置';
 $lng['menue']['ftp']['ftp'] = 'FTP';
 $lng['menue']['ftp']['accounts'] = '账户';
 $lng['menue']['ftp']['webftp'] = '网络FTP地址';
-$lng['menue']['extras']['extras'] = '专用';
+$lng['menue']['extras']['extras'] = '附加功能';
 $lng['menue']['extras']['directoryprotection'] = '目录保护';
-$lng['menue']['extras']['pathoptions'] = '路径选择';
+$lng['menue']['extras']['pathoptions'] = '路径选项';
 
 /**
  * Index
@@ -110,18 +112,19 @@ $lng['index']['accountdetails'] = '账户数据';
 $lng['changepassword']['old_password'] = '旧密码';
 $lng['changepassword']['new_password'] = '新密码';
 $lng['changepassword']['new_password_confirm'] = '新密码(确认)';
-$lng['changepassword']['new_password_ifnotempty'] = $lng['changepassword']['new_password'] . '(' . $lng['panel']['emptyfornochanges'] . ')';
 $lng['changepassword']['also_change_ftp'] = '改变主FTP入口的密码';
+$lng['changepassword']['new_password_ifnotempty'] = '新密码 （不变请留空）';
+$lng['changepassword']['also_change_ftp'] = '同时改变主FTP密码';
 
 /**
  * Domains
  */
 
-$lng['domains']['description'] = '这里您可以设置域以及更改路径<br/>在每次更改后系统需要一些时间重新读取设置';
-$lng['domains']['domainsettings'] = '域设置';
+$lng['domains']['description'] = '这里您可以设置（子）域名并修改路径<br/>在每次更改后系统需要一些时间应用设置';
+$lng['domains']['domainsettings'] = '域名设置';
 $lng['domains']['domainname'] = '域名';
-$lng['domains']['subdomain_add'] = '添加子域';
-$lng['domains']['subdomain_edit'] = '编辑子域';
+$lng['domains']['subdomain_add'] = '添加子域名';
+$lng['domains']['subdomain_edit'] = '编辑子域名';
 $lng['domains']['wildcarddomain'] = '做为原始域登记';
 $lng['domains']['aliasdomain'] = '域别名';
 $lng['domains']['noaliasdomain'] = '无域别名';
@@ -170,10 +173,6 @@ $lng['extras']['view_directory'] = '显示记录';
 $lng['extras']['pathoptions_add'] = '配置路径';
 $lng['extras']['directory_browsing'] = '显示记录内容';
 $lng['extras']['pathoptions_edit'] = '路径设置处理';
-$lng['extras']['error404path'] = '404';
-$lng['extras']['error403path'] = '403';
-$lng['extras']['error500path'] = '500';
-$lng['extras']['error401path'] = '401';
 $lng['extras']['errordocument404path'] = '错误文件404路径';
 $lng['extras']['errordocument403path'] = '错误文件403路径';
 $lng['extras']['errordocument500path'] = '错误文件500路径';
@@ -194,7 +193,7 @@ $lng['error']['firstdeleteallsubdomains'] = '在您创建一个新的原始域
 $lng['error']['youhavealreadyacatchallforthisdomain'] = '您已经为这项域名设置了一个电邮户口';
 $lng['error']['ftp_cantdeletemainaccount'] = '您不能删除您的主账户';
 $lng['error']['login'] = '被输入的用户名/密码错误';
-$lng['error']['login_blocked'] = '由于多次错误的尝试这个账户将被关闭！<br/>请您在' . $settings['login']['deactivatetime'] . '秒后重新尝试。';
+$lng['error']['login_blocked'] = '由于多次错误的尝试这个账户将被关闭！<br/>请您在%s秒后重新尝试。';
 $lng['error']['notallreqfieldsorerrors'] = '您没有填写所有的文本栏或者有一个文本栏被错误填写';
 $lng['error']['oldpasswordnotcorrect'] = '旧密码不正确';
 $lng['error']['youcantallocatemorethanyouhave'] = '您不能分配比您现有的更多的资源。';
@@ -202,15 +201,7 @@ $lng['error']['mustbeurl'] = '您没有输入有效或者完整的url(例如http
 $lng['error']['invalidpath'] = '您没有选择有效的URL地址（可能是目录列表的问题）';
 $lng['error']['stringisempty'] = '缺少区域内的输入';
 $lng['error']['stringiswrong'] = '区域内输入错误';
-$lng['error']['myloginname'] = '\'' . $lng['login']['username'] . '\'';
-$lng['error']['mypassword'] = '\'' . $lng['login']['password'] . '\'';
-$lng['error']['oldpassword'] = '\'' . $lng['changepassword']['old_password'] . '\'';
-$lng['error']['newpassword'] = '\'' . $lng['changepassword']['new_password'] . '\'';
-$lng['error']['newpasswordconfirm'] = '\'' . $lng['changepassword']['new_password_confirm'] . '\'';
 $lng['error']['newpasswordconfirmerror'] = '新密码和新密码确定不匹配';
-$lng['error']['myname'] = '\'' . $lng['customer']['name'] . '\'';
-$lng['error']['myfirstname'] = '\'' . $lng['customer']['firstname'] . '\'';
-$lng['error']['emailadd'] = '\'' . $lng['customer']['email'] . '\'';
 $lng['error']['mydomain'] = '\'域名\'';
 $lng['error']['mydocumentroot'] = '\'文件来源\'';
 $lng['error']['loginnameexists'] = '登陆名%s已经存在';
@@ -237,7 +228,6 @@ $lng['error']['destinationnonexist'] = '请在区域内建立你的代运人\'
 $lng['error']['destinationalreadyexistasmail'] = '到%s的代运人已经作为一个电子邮件地址存在';
 $lng['error']['destinationalreadyexist'] = '你已经定义了到%s的代运人';
 $lng['error']['destinationiswrong'] = '代运人%s包含了无效的字符或者不完整';
-$lng['error']['domainname'] = $lng['domains']['domainname'];
 
 /**
  * Questions
@@ -452,5 +442,52 @@ $lng['admin']['phpmemorylimit'] = 'php内存限制';
 $lng['admin']['mysqlserverversion'] = 'mysql服务器版本';
 $lng['admin']['mysqlclientversion'] = 'mysql客户端版本';
 $lng['admin']['webserverinterface'] = '网页服务器接口';
+$lng['domains']['isassigneddomain'] = '已指派域名';
 
-?>
+// ADDED IN 1.2.16-svn7
+
+$lng['admin']['subcanemaildomain']['never'] = '从不';
+$lng['admin']['subcanemaildomain']['choosableno'] = '可选，默认为否';
+$lng['admin']['subcanemaildomain']['choosableyes'] = '可选，默认为是';
+$lng['admin']['subcanemaildomain']['always'] = '总是';
+$lng['changepassword']['also_change_webalizer'] = '同时修改统计页面密码';
+
+// ADDED IN 1.2.19-svn4
+
+$lng['menue']['traffic']['traffic'] = '流量';
+$lng['menue']['traffic']['current'] = '当前月';
+$lng['traffic']['month'] = "月";
+$lng['traffic']['day'] = "日";
+$lng['traffic']['months'][1] = "1月";
+$lng['traffic']['months'][2] = "2月";
+$lng['traffic']['months'][3] = "3月";
+$lng['traffic']['months'][4] = "4月";
+$lng['traffic']['months'][5] = "5月";
+$lng['traffic']['months'][6] = "6月";
+$lng['traffic']['months'][7] = "7月";
+$lng['traffic']['months'][8] = "8月";
+$lng['traffic']['months'][9] = "9月";
+$lng['traffic']['months'][10] = "10月";
+$lng['traffic']['months'][11] = "11月";
+$lng['traffic']['months'][12] = "12月";
+$lng['traffic']['mb'] = "流量 (MB)";
+$lng['traffic']['distribution'] = '<font color="#019522">FTP</font> | <font color="#0000FF">HTTP</font> | <font color="#800000">Mail</font>';
+$lng['traffic']['sumhttp'] = 'HTTP流量合计 - ';
+$lng['traffic']['sumftp'] = 'FTP流量合计 - ';
+$lng['traffic']['summail'] = '邮件流量合计 - ';
+
+// ADDED IN FROXLOR 0.9.24-svn1
+$lng['logrotate'] = '转储';
+$lng['logrotate_enabled'] = '开启转储？';
+$lng['logrotate_binary'] = '转储（Logrotate）二进制路径：';
+$lng['logrotate_interval'] = '间隔?';
+$lng['logrotate_keep'] = '保留多少日志文件？';
+$lng['admin']['assignedmax'] = '已指派 / 上限';
+$lng['admin']['usedmax'] = '已用 / 上限';
+$lng['admin']['used'] = '已用';
+$lng['mysql']['size'] = '数据库大小 (MB)';
+
+// ADDED IN FROXLOR 0.9.18
+$lng['serversettings']['default_theme'] = '默认主题';
+$lng['menue']['main']['changetheme'] = '修改主题';
+$lng['panel']['theme'] = '主题';

scripts/jobs/cron_autoresponder.php

@@ -60,7 +60,9 @@ if($db->num_rows($result) > 0)
 		$ts_now = time();
 		$ts_start = (int)$row['date_from'];
 		$ts_end = (int)$row['date_until'];
-		
+
+		$row['email'] = strtolower($row['email']);
+
 		// not yet
 		if($ts_start != -1 && $ts_start > $ts_now) continue;
 		// already ended
@@ -134,24 +136,24 @@ if($db->num_rows($result) > 0)
 					if(!strlen($from)
 					   && preg_match("/^From:(.+)<(.*)>$/", $line, $match)
 					) {
-						$from = $match[2];
+						$from = strtolower($match[2]);
 					}
 					elseif(!strlen($from)
 					       && preg_match("/^From:\s+(.*@.*)$/", $line, $match)
 					) {
-						$from = $match[1];
+						$from = strtolower($match[1]);
 					}
 
 					//fetching to field
 					if((!strlen($to) || $to != $row['email'])
 						&& preg_match("/^To:(.+)<(.*)>$/", $line, $match)
 					) {
-						$to = $match[2];
+						$to = strtolower($match[2]);
 					}
 					elseif((!strlen($to) || $to != $row['email'])
 						&& preg_match("/^To:\s+(.*@.*)$/", $line, $match)
 					) {
-						$to = $match[1];
+						$to = strtolower($match[1]);
 					}
 					/*
 					 * if we still don't have a To:-address
@@ -162,30 +164,31 @@ if($db->num_rows($result) > 0)
 					elseif((!strlen($to) || $to != $row['email'])
 						&& preg_match("/^Cc:(.+)<(.*)>$/", $line, $match)
 					) {
-						$to = $match[2];
+						$to = strtolower($match[2]);
 					}
 					elseif((!strlen($to) || $to != $row['email'])
 						&& preg_match("/^Cc:\s+(.*@.*)$/", $line, $match)
 					) {
-						$to = $match[1];
+						$to = strtolower($match[1]);
 					}
 
 					//fetching sender field
 					if(!strlen($sender)
 					   && preg_match("/^Sender:(.+)<(.*)>$/", $line, $match)
 					) {
-						$sender = $match[2];
+						$sender = strtolower($match[2]);
 					}
 					elseif(!strlen($sender)
 					       && preg_match("/Sender:\s+(.*@.*)$/", $line, $match)
 					) {
-						$sender = $match[1];
+						$sender = strtolower($match[1]);
 					}
 
 					//check for amavis/spamassassin spam headers
 					if(preg_match("/^X-Spam-Status: (Yes|No)(.*)$/", $line, $match))
 					{
-						if($match[1] == 'Yes')$spam = true;
+						if($match[1] == 'Yes')
+							$spam = true;
 					}
 					
 					//check for precedence header

scripts/jobs/cron_backup.php

@@ -51,7 +51,7 @@ if($settings['system']['backup_enabled'] == '1'){
 	    $dbs_result = $db->query("SELECT databasename FROM `" . TABLE_PANEL_DATABASES . "` WHERE `customerid` = '" . $db->escape($row['customerid']) . "';");
 	    while($dbs_row = $db->fetch_array($dbs_result)){
 		// create customers sql backup
-		safe_exec(escapeshellarg($settings['system']['backup_mysqldump_path']) . ' --opt --force --allow-keywords -u ' . escapeshellarg($sql_root[0]['user']) . ' -p' . escapeshellarg($sql_root[0]['password']) . ' -h ' . $sql_root[0]['host'] . ' ' . escapeshellarg($dbs_row['databasename']) . ' -r ' . escapeshellarg($settings['system']['backup_dir']) . escapeshellarg($row['loginname']) . '/' . escapeshellarg($dbs_row['databasename']) . '.sql'  );
+		safe_exec(escapeshellcmd($settings['system']['backup_mysqldump_path']) . ' --opt --force --allow-keywords -u ' . escapeshellarg($sql_root[0]['user']) . ' -p' . escapeshellarg($sql_root[0]['password']) . ' -h ' . $sql_root[0]['host'] . ' -B ' . escapeshellarg($dbs_row['databasename']) . ' -r ' . escapeshellarg($settings['system']['backup_dir']) . escapeshellarg($row['loginname']) . '/' . escapeshellarg($dbs_row['databasename']) . '.sql'  );
 		// compress sql backup
 		safe_exec('tar -C ' . escapeshellarg($settings['system']['backup_dir']) . escapeshellarg($row['loginname']) . ' -c -z -f ' . escapeshellarg($settings['system']['backup_dir']) . $row['loginname'] . '/' . escapeshellarg($dbs_row['databasename']) . '.tar.gz ' . escapeshellarg($dbs_row['databasename']) . '.sql');
 		// remove uncompresed sql files

scripts/jobs/cron_tasks.inc.dns.10.bind.php

@@ -19,11 +19,11 @@
 
 /*
  * This script creates the php.ini's used by mod_suPHP+php-cgi
- */
+*/
 
 if(@php_sapi_name() != 'cli'
-   && @php_sapi_name() != 'cgi'
-   && @php_sapi_name() != 'cgi-fcgi')
+		&& @php_sapi_name() != 'cgi'
+		&& @php_sapi_name() != 'cgi-fcgi')
 {
 	die('This script only works in the shell.');
 }
@@ -36,46 +36,46 @@ class bind
 	public $settings = array();
 	public $nameservers = array();
 	public $mxservers = array();
+	public $axfrservers = array();
+
+	public function __construct($db, $logger, $debugHandler, $settings) {
 
-	public function __construct($db, $logger, $debugHandler, $settings)
-	{
 		$this->db = $db;
 		$this->logger = $logger;
 		$this->debugHandler = $debugHandler;
 		$this->settings = $settings;
 
-		if($this->settings['system']['nameservers'] != '')
-		{
+		if ($this->settings['system']['nameservers'] != '') {
 			$nameservers = explode(',', $this->settings['system']['nameservers']);
-			foreach($nameservers as $nameserver)
-			{
+			foreach ($nameservers as $nameserver) {
 				$nameserver_ip = gethostbyname(trim($nameserver));
-
-				if(substr($nameserver, -1, 1) != '.')
-				{
+				if (substr($nameserver, -1, 1) != '.') {
 					$nameserver.= '.';
 				}
-
 				$this->nameservers[] = array(
-					'hostname' => trim($nameserver),
-					'ip' => trim($nameserver_ip)
+						'hostname' => trim($nameserver),
+						'ip' => trim($nameserver_ip)
 				);
 			}
 		}
 
-		if($this->settings['system']['mxservers'] != '')
-		{
+		if ($this->settings['system']['mxservers'] != '') {
 			$mxservers = explode(',', $this->settings['system']['mxservers']);
-			foreach($mxservers as $mxserver)
-			{
-				if(substr($mxserver, -1, 1) != '.')
-				{
+			foreach ($mxservers as $mxserver) {
+				if (substr($mxserver, -1, 1) != '.') {
 					$mxserver.= '.';
 				}
-
 				$this->mxservers[] = $mxserver;
 			}
 		}
+
+		// AXFR server #100
+		if ($this->settings['system']['axfrservers'] != '') {
+			$axfrservers = explode(',', $this->settings['system']['axfrservers']);
+			foreach ($axfrservers as $axfrserver) {
+				$this->axfrservers[] = trim($axfrserver);
+			}
+		}
 	}
 
 	public function writeConfigs()
@@ -117,14 +117,26 @@ class bind
 			$bindconf_file.= '	file "' . makeCorrectFile($this->settings['system']['bindconf_directory'] . '/' . $domain['zonefile']) . '";' . "\n";
 			$bindconf_file.= '	allow-query { any; };' . "\n";
 
-			if(count($this->nameservers) > 0)
-			{
+			if (count($this->nameservers) > 0
+					|| count($this->axfrservers) > 0
+			) {
+				// open allow-transfer
 				$bindconf_file.= '	allow-transfer {' . "\n";
-				for ($i = 0;$i < count($this->nameservers);$i++)
-				{
-					$bindconf_file.= '		' . $this->nameservers[$i]['ip'] . ';' . "\n";
+				// put nameservers in allow-transfer
+				if (count($this->nameservers) > 0) {
+					foreach ($this->nameservers as $ns) {
+						$bindconf_file.= '		' . $ns['ip'] . ';' . "\n";
+					}
 				}
-
+				// AXFR server #100
+				if (count($this->axfrservers) > 0) {
+					foreach ($this->axfrservers as $axfrserver) {
+						if (validate_ip($axfrserver, true) !== false) {
+							$bindconf_file.= '		' . $axfrserver . ';' . "\n";
+						}
+					}
+				}
+				// close allow-transfer
 				$bindconf_file.= '	};' . "\n";
 			}
 
@@ -143,7 +155,7 @@ class bind
 		$domains_dir = makeCorrectDir($this->settings['system']['bindconf_directory'] . '/domains/');
 
 		if(file_exists($domains_dir)
-		   && is_dir($domains_dir))
+				&& is_dir($domains_dir))
 		{
 			$domain_file_dirhandle = opendir($domains_dir);
 
@@ -152,10 +164,10 @@ class bind
 				$full_filename = makeCorrectFile($domains_dir . '/' . $domain_filename);
 
 				if($domain_filename != '.'
-				   && $domain_filename != '..'
-				   && !in_array($domain_filename, $known_filenames)
-				   && is_file($full_filename)
-				   && file_exists($full_filename))
+						&& $domain_filename != '..'
+						&& !in_array($domain_filename, $known_filenames)
+						&& is_file($full_filename)
+						&& file_exists($full_filename))
 				{
 					fwrite($this->debugHandler, '  cron_tasks: Task4 - unlinking ' . $domain_filename . "\n");
 					$this->logger->logAction(CRON_ACTION, LOG_WARNING, 'Deleting ' . $domain_filename);
@@ -225,7 +237,7 @@ class bind
 			{
 				$zonefile.= '@	IN	MX	' . trim($mxserver) . "\n";
 			}
-			
+
 			if($this->settings['system']['dns_createmailentry'] == '1')
 			{
 				$zonefile.= 'mail	IN	' . $ip_a_record . "\n";
@@ -240,9 +252,9 @@ class bind
 
 		/*
 		 * @TODO domain-based spf-settings
-		 */
+		*/
 		if($this->settings['spf']['use_spf'] == '1'
-		   /*&& $domain['spf'] == '1' */)
+				/*&& $domain['spf'] == '1' */)
 		{
 			$zonefile.= $this->settings['spf']['spf_entry'] . "\n";
 		}
@@ -286,38 +298,38 @@ class bind
 
 		while($subdomain = $this->db->fetch_array($subdomains))
 		{
-                        if(filter_var($subdomain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
-                        {
-                                $zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . '  IN      A       ' . $subdomain['ip'] . "\n";
-                                
-                                /* Check whether to add a www.-prefix */
-                                if($domain['wwwserveralias'] == '1')
-								{
-									$zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . '  IN      A       ' . $subdomain['ip'] . "\n";
-								}
-                        }
-                        elseif(filter_var($domain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
-                        {
-                                $zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . '  IN      AAAA    ' . $subdomain['ip'] . "\n";
-                                
-								/* Check whether to add a www.-prefix */
-                                if($domain['wwwserveralias'] == '1')
-								{
-									$zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . '  IN      AAAA       ' . $subdomain['ip'] . "\n";
-								}
-                        }
+			if(filter_var($subdomain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
+			{
+				$zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . '  IN      A       ' . $subdomain['ip'] . "\n";
+
+				/* Check whether to add a www.-prefix */
+				if($domain['wwwserveralias'] == '1')
+				{
+					$zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . '  IN      A       ' . $subdomain['ip'] . "\n";
+				}
+			}
+			elseif(filter_var($domain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+			{
+				$zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . '  IN      AAAA    ' . $subdomain['ip'] . "\n";
+
+				/* Check whether to add a www.-prefix */
+				if($domain['wwwserveralias'] == '1')
+				{
+					$zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . '  IN      AAAA       ' . $subdomain['ip'] . "\n";
+				}
+			}
 		}
 
 		return $zonefile;
 	}
-	
+
 	private function generateDkim($domain)
 	{
 		$zone_dkim = '';
 
 		if($this->settings['dkim']['use_dkim'] == '1'
-		   && $domain['dkim'] == '1'
-		   && $domain['dkim_pubkey'] != '')
+				&& $domain['dkim'] == '1'
+				&& $domain['dkim_pubkey'] != '')
 		{
 			// start
 			$dkim_txt = 'v=DKIM1;';
@@ -336,12 +348,12 @@ class bind
 					$alg.=$a.':';
 				}
 			}
-			if($alg != '') 
+			if($alg != '')
 			{
 				$alg = substr($alg, 0, -1);
 				$dkim_txt.= 'h='.$alg.';';
 			}
-			
+
 			// notes
 			if(trim($this->settings['dkim']['dkim_notes'] != ''))
 			{
@@ -350,16 +362,16 @@ class bind
 
 			// key
 			$dkim_txt.= 'k=rsa;p='.trim(preg_replace('/-----BEGIN PUBLIC KEY-----(.+)-----END PUBLIC KEY-----/s', '$1', str_replace("\n", '', $domain['dkim_pubkey']))).';';
-			
+
 			// service-type
 			if($this->settings['dkim']['dkim_servicetype'] == '1')
 			{
 				$dkim_txt.=	's=email;';
 			}
-			
+
 			// end-part
 			$dkim_txt.='t=s';
-			
+
 			// split if necessary
 			$txt_record_split='';
 			$lbr=50;
@@ -370,7 +382,7 @@ class bind
 
 			// dkim-entry
 			$zone_dkim .= 'dkim_' . $domain['dkim_id'] . '._domainkey IN TXT ' . $txt_record_split;
-			
+
 			// adsp-entry
 			if($this->settings['dkim']['dkim_add_adsp'] == "1")
 			{
@@ -413,7 +425,7 @@ class bind
 				$pubkey_filename = makeCorrectFile($this->settings['dkim']['dkim_prefix'] . '/dkim_' . $domain['dkim_id'] . '.public');
 
 				if($domain['dkim_privkey'] == ''
-				   || $domain['dkim_pubkey'] == '')
+						|| $domain['dkim_pubkey'] == '')
 				{
 					$max_dkim_id = $this->db->query_first("SELECT MAX(`dkim_id`) as `max_dkim_id` FROM `" . TABLE_PANEL_DOMAINS . "`");
 					$domain['dkim_id'] = (int)$max_dkim_id['max_dkim_id'] + 1;
@@ -429,7 +441,7 @@ class bind
 				}
 
 				if(!file_exists($privkey_filename)
-				   && $domain['dkim_privkey'] != '')
+						&& $domain['dkim_privkey'] != '')
 				{
 					$privkey_file_handler = fopen($privkey_filename, "w");
 					fwrite($privkey_file_handler, $domain['dkim_privkey']);
@@ -438,7 +450,7 @@ class bind
 				}
 
 				if(!file_exists($pubkey_filename)
-				   && $domain['dkim_pubkey'] != '')
+						&& $domain['dkim_pubkey'] != '')
 				{
 					$pubkey_file_handler = fopen($pubkey_filename, "w");
 					fwrite($pubkey_file_handler, $domain['dkim_pubkey']);