sh*t - forget the 'table' part in the alter-query

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

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

@@ -156,15 +156,6 @@ return array(
 					'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 +218,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/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',

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_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);
@@ -824,7 +818,6 @@ if($page == 'customers'
 							"`isemaildomain` = '0', " .
 							"`caneditdomain` = '0', " .
 							"`openbasedir` = '1', " .
-							"`safemode` = '1', " .
 							"`speciallogfile` = '0', " .
 							"`specialsettings` = '', " .
 							"`add_date` = '".date('Y-m-d')."'");
@@ -1175,7 +1168,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 +1271,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')

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,7 +342,6 @@ 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)
 					{
@@ -362,7 +368,6 @@ if($page == 'domains'
 				else
 				{
 					$openbasedir = '1';
-					$safemode = '1';
 					$phpsettingid = $settings['system']['mod_fcgid_defaultini'];
 					$mod_fcgid_starter = '-1';
 					$mod_fcgid_maxrequests = '-1';
@@ -444,11 +449,6 @@ if($page == 'domains'
 					$openbasedir = '0';
 				}
 
-				if($safemode != '1')
-				{
-					$safemode = '0';
-				}
-
 				if($speciallogfile != '1')
 				{
 					$speciallogfile = '0';
@@ -549,7 +549,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 +578,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));
 				}
 			}
@@ -836,7 +834,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,7 +865,6 @@ 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)
 					{
@@ -885,7 +891,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 +954,6 @@ if($page == 'domains'
 					$openbasedir = '0';
 				}
 
-				if($safemode != '1')
-				{
-					$safemode = '0';
-				}
-
 				if($isbinddomain != '1')
 				{
 					$isbinddomain = '0';
@@ -1031,7 +1031,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 +1066,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 +1085,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 +1137,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) . "', `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 +1262,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,7 +104,9 @@ 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;
 

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_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_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") . "\");");

customer_domains.php

@@ -197,11 +197,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 +252,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 +341,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 +359,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 +392,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']);
 
@@ -431,8 +441,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 +552,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 +602,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']."'");

customer_email.php

@@ -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();

customer_mysql.php

@@ -168,7 +168,6 @@ elseif($page == 'mysqls')
 				}
 				else
 				{
-					$username = $userinfo['loginname'] . $settings['customer']['mysqlprefix'] . (intval($userinfo['mysql_lastaccountnumber']) + 1);
 
 					if(count($sql_root) > 1)
 					{
@@ -189,6 +188,20 @@ elseif($page == 'mysqls')
 
 					// 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)

index.php

@@ -252,7 +252,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';

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',
@@ -439,7 +438,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 +509,7 @@ 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'),
 	('panel', 'decimal_places', '4'),
 	('panel', 'adminmail', 'admin@SERVERNAME'),
 	('panel', 'phpmyadmin_url', ''),
@@ -535,7 +534,7 @@ 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', 'version', '0.9.28');
 
 
 
@@ -743,7 +742,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');
 
 
 

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

@@ -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;');
 		}
 	}
 
@@ -2024,3 +2024,25 @@ 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');
+}

install/updates/preconfig.php

@@ -49,14 +49,92 @@ 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);
+}
+
+/**
+ * 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"));
+
+	// -svn or -dev or -rc ?
+	if (stripos($a[count($a)-1], '-') !== false) {
+		$x = explode("-", $a[count($a)-1]);
+		$a[count($a)-1] = $x[0];
+		if (stripos($x[1], 'rc') !== false) {
+			$a[] = '2'; // rc > dev > svn
+			// number of rc
+			$a[] = substr($x[1], 2);
+		}
+		else if (stripos($x[1], 'dev') !== false) {
+			$a[] = '1'; // svn < dev < rc
+			// number of dev
+			$a[] = substr($x[1], 3);
+		}
+		// -svn version are deprecated
+		else if (stripos($x[1], 'svn') !== false) {
+			$a[] = '0'; // svn < dev < rc
+			// number of svn
+			$a[] = substr($x[1], 3);
+		}
+		else {
+			// unknown version string
+			return 0;
+		}
+	}
+	// same with $b
+	if (stripos($b[count($b)-1], '-') !== false) {
+		$x = explode("-", $b[count($b)-1]);
+		$b[count($b)-1] = $x[0];
+		if (stripos($x[1], 'rc') !== false) {
+			$b[] = '2'; // rc > dev > svn
+			// number of rc
+			$b[] = substr($x[1], 2);
+		}
+		else if (stripos($x[1], 'dev') !== false) {
+			$b[] = '1'; // svn < dev < rc
+			// number of dev
+			$b[] = substr($x[1], 3);
+		}
+		// -svn version are deprecated
+		else if (stripos($x[1], 'svn') !== false) {
+			$b[] = '0'; // svn < dev < rc
+			// number of svn
+			$b[] = substr($x[1], 3);
+		}
+		else {
+			// unknown version string
+			return 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;
 }

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

@@ -453,7 +453,7 @@ 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 />';
@@ -471,4 +471,36 @@ LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
 		}
 	}
 
+	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 ($this->_settings['system']['mod_fcgid'] == '1'
+				|| $this->_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") . "\";");
+	}
 }

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/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

@@ -301,7 +301,7 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
 						)
 					),
 					'dovecot' => Array(
-						'label' => 'Dovecot 1',
+						'label' => 'Dovecot 1 *deprecated*',
 						'commands_1' => Array(
 							'echo "net-mail/dovecot mysql" >> /etc/portage/package.use',
 							'emerge -av dovecot',
@@ -352,13 +352,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 +415,9 @@ 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'),
+							'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
+							'rm /etc/cron.d/awstats'
 						),
 					),
 					'libnss' => Array(

lib/configfiles/hardy.inc.php

@@ -36,7 +36,7 @@ if ($vmail_group === false) {
 
 return Array(
 	'ubuntu_hardy' => Array(
-		'label' => 'Ubuntu 8.04 (Hardy)',
+		'label' => 'Ubuntu 8.04 (Hardy) *deprecated*',
 		'services' => Array(
 			'http' => Array(
 				'label' => $lng['admin']['configfiles']['http'],
@@ -370,7 +370,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/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/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,14 +163,6 @@ 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),
 						'label' => $lng['admin']['phpsettings']['title'],

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,14 +185,6 @@ 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),
 						'label' => $lng['admin']['phpsettings']['title'],

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

@@ -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

@@ -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(

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.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,68 @@ 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 (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/validate/function.validateUrl.php

@@ -23,56 +23,49 @@
  * @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, '/'));
+		// possible : in IP (when a port is given), #1173
+		$ip = substr($ip, 0, strpos($ip, ':'));
 
-		if(validate_ip($ip, true) !== false)
-		{
+		if (validate_ip($ip, true) !== false) {
 			return true;
-		}
-		else
-		{
+		} 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

@@ -307,21 +307,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 +348,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);

lib/tables.inc.php

@@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.28-rc1';
+$version = '0.9.28';
 $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

@@ -167,10 +167,6 @@ $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';
@@ -191,7 +187,7 @@ $lng['error']['firstdeleteallsubdomains'] = 'Musíte smazat všechny subdomény
 $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']['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';
@@ -199,17 +195,8 @@ $lng['error']['mustbeurl'] = 'Vložili jste nesprávnou nebo nekompletní url (n
 $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';
@@ -234,7 +221,6 @@ $lng['error']['destinationnonexist'] = 'Prosím vytvoøte pøeposílatele v poli
 $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'];
 
 /**
  * Questions
@@ -327,7 +313,6 @@ $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ù?';
@@ -400,9 +385,6 @@ $lng['question']['admin_ip_reallydelete'] = 'Chcete opravdu smayat IP adresu %s?
 $lng['admin']['ipsandports']['ipsandports'] = 'IP a Porty';
 $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
 
@@ -518,12 +500,6 @@ $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 --';
@@ -537,8 +513,6 @@ $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']['sendalternativemail']['title'] = 'Použij alternativní e-mailovou adresu';
@@ -659,13 +633,9 @@ $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['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']['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';
@@ -693,5 +663,3 @@ $lng['ticket']['awaitingticketreply'] = 'Máte %s nezodpovì zených tiketù pod
 // ADDED IN 1.2.18-svn5
 
 $lng['serversettings']['ticket']['noreply_name'] = 'Jméno odesílatele tiketù v emailu';
-
-?>

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
 
@@ -916,7 +866,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 +917,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 +1149,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 +1166,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 +1239,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 +1301,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';
@@ -545,8 +536,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 +656,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';
@@ -922,7 +907,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 +958,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 +1283,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 +1346,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';
@@ -1914,7 +1898,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';
@@ -1936,3 +1920,15 @@ $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.';

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

@@ -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,15 +199,7 @@ $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.';
@@ -234,7 +226,6 @@ $lng['error']['destinationnonexist'] = 'Bitte geben Sie Ihre Weiterleitungsadres
 $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']['ticketnotaccessible'] = 'Sie können sich das Ticket nicht ansehen.';
 
 /**
@@ -339,7 +330,7 @@ $lng['serversettings']['session_timeout']['description'] = 'Wie lange muss ein B
 $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';
@@ -544,8 +535,6 @@ $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 +564,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';
@@ -670,13 +655,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';
@@ -926,7 +907,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
 
@@ -975,7 +956,6 @@ $lng['error']['phpsettingidwrong'] = 'Eine PHP Konfiguration mit dieser Id exist
 $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.';
@@ -1278,7 +1258,7 @@ $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';
@@ -1357,12 +1337,12 @@ $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';
@@ -1644,7 +1624,7 @@ $lng['serversettings']['phpfpm_settings']['idle_timeout']['description'] = 'Time
 // 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!';
@@ -1661,3 +1641,15 @@ $lng['serversettings']['enablewebfonts']['title'] = 'Verwende Google Webfonts im
 $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.';

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

@@ -110,7 +110,6 @@ $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入口的密码';
 
 /**
@@ -170,10 +169,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 +189,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 +197,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 +224,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 +438,3 @@ $lng['admin']['phpmemorylimit'] = 'php内存限制';
 $lng['admin']['mysqlserverversion'] = 'mysql服务器版本';
 $lng['admin']['mysqlclientversion'] = 'mysql客户端版本';
 $lng['admin']['webserverinterface'] = '网页服务器接口';
-
-?>

scripts/jobs/cron_tasks.inc.http.10.apache.php

@@ -283,7 +283,6 @@ class apache
 						'mod_fcgid_maxrequests' => -1,
 						'guid' => $this->settings['phpfpm']['vhost_httpuser'],
 						'openbasedir' => 0,
-						'safemode' => '0',
 						'email' => $this->settings['panel']['adminmail'],
 						'loginname' => 'froxlor.panel',
 						'documentroot' => $mypath,
@@ -425,15 +424,6 @@ class apache
 
 				$php_options_text.= '  php_admin_value open_basedir "' . $_phpappendopenbasedir . '"'."\n";
 			}
-
-			if($domain['safemode'] == '0')
-			{
-				$php_options_text.= '  php_admin_flag safe_mode Off ' . "\n";
-			}
-			else
-			{
-				$php_options_text.= '  php_admin_flag safe_mode On ' . "\n";
-			}
 		}
 		else
 		{
@@ -537,45 +527,31 @@ class apache
 	{
 		$stats_text = '';
 
-		if($domain['speciallogfile'] == '1'
-		   && $this->settings['system']['mod_log_sql'] != '1')
-		{
-			if($domain['parentdomainid'] == '0')
-			{
-				if($this->settings['system']['awstats_enabled'] == '1')
-				{
+		if($domain['speciallogfile'] == '1') {
+
+			if ($domain['parentdomainid'] == '0') {
+
+				if ($this->settings['system']['awstats_enabled'] == '1') {
 					$stats_text.= '  Alias /awstats "' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']) . '"' . "\n";
 					$stats_text.= '  Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n";
-				}
-				else
-				{
+				} else {
 					$stats_text.= '  Alias /webalizer "' . makeCorrectFile($domain['customerroot'] . '/webalizer/' . $domain['domain']) . '"' . "\n";
 				}
-			}
-			else
-			{
-				if($this->settings['system']['awstats_enabled'] == '1')
-				{
+			} else {
+
+				if ($this->settings['system']['awstats_enabled'] == '1') {
 					$stats_text.= '  Alias /awstats "' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['parentdomain']) . '"' . "\n";
 					$stats_text.= '  Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n";
-				}
-				else
-				{
+				} else {
 					$stats_text.= '  Alias /webalizer "' . makeCorrectFile($domain['customerroot'] . '/webalizer/' . $domain['parentdomain']) . '"' . "\n";
 				}
 			}
-		}
-		else
-		{
-			if($domain['customerroot'] != $domain['documentroot'])
-			{
-				if($this->settings['system']['awstats_enabled'] == '1')
-				{
+		} else {
+			if ($domain['customerroot'] != $domain['documentroot']) {
+				if ($this->settings['system']['awstats_enabled'] == '1') {
 					$stats_text.= '  Alias /awstats "' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']) . '"' . "\n";
 					$stats_text.= '  Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n";
-				}
-				else
-				{
+				} else {
 					$stats_text.= '  Alias /webalizer "' . makeCorrectFile($domain['customerroot'] . '/webalizer') . '"' . "\n";
 				}
 			}
@@ -583,8 +559,7 @@ class apache
 			// because the stats are in /awstats/[domain], not just /awstats/
 			// also, the awstats-icons are someplace else too!
 			// -> webalizer does not need this!
-			elseif($this->settings['system']['awstats_enabled'] == '1')
-			{
+			elseif ($this->settings['system']['awstats_enabled'] == '1') {
 				$stats_text.= '  Alias /awstats "' . makeCorrectFile($domain['documentroot'] . '/awstats/' . $domain['domain']) . '"' . "\n";
 				$stats_text.= '  Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n";
 			}
@@ -596,99 +571,65 @@ class apache
 	/*
 	*	Lets set the logfiles
 	*/
+	protected function getLogfiles($domain) {
 
-	protected function getLogfiles($domain)
-	{
 		$logfiles_text = '';
 
-		if($domain['speciallogfile'] == '1'
-		   && $this->settings['system']['mod_log_sql'] != '1')
-		{
-			if($domain['parentdomainid'] == '0')
-			{
+		if ($domain['speciallogfile'] == '1') {
+			if ($domain['parentdomainid'] == '0') {
 				$speciallogfile = '-' . $domain['domain'];
-			}
-			else
-			{
+			} else {
 				$speciallogfile = '-' . $domain['parentdomain'];
 			}
-		}
-		else
-		{
+		} else {
 			$speciallogfile = '';
 		}
 
-		if($this->settings['system']['mod_log_sql'] == '1')
-		{
-			// We are using mod_log_sql (http://www.outoforder.cc/projects/apache/mod_log_sql/)
-			// TODO: See how we are able emulate the error_log
+		// The normal access/error - logging is enabled
+		$error_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-error.log');
+		// Create the logfile if it does not exist (fixes #46)
+		touch($error_log);
+		chown($error_log, $this->settings['system']['httpuser']);
+		chgrp($error_log, $this->settings['system']['httpgroup']);
 
-			$logfiles_text.= '  LogSQLTransferLogTable access_log' . "\n";
-		}
-		else
-		{
-			// The normal access/error - logging is enabled
-			$error_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-error.log');
-			// Create the logfile if it does not exist (fixes #46)
-			touch($error_log);
-			chown($error_log, $this->settings['system']['httpuser']);
-			chgrp($error_log, $this->settings['system']['httpgroup']);
+		$access_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log');
+		// Create the logfile if it does not exist (fixes #46)
+		touch($access_log);
+		chown($access_log, $this->settings['system']['httpuser']);
+		chgrp($access_log, $this->settings['system']['httpgroup']);
 
-			$access_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log');
-			// Create the logfile if it does not exist (fixes #46)
-			touch($access_log);
-			chown($access_log, $this->settings['system']['httpuser']);
-			chgrp($access_log, $this->settings['system']['httpgroup']);
+		$logfiles_text.= '  ErrorLog "' . $error_log . "\"\n";
+		$logfiles_text.= '  CustomLog "' . $access_log .'" combined' . "\n";
 
-			$logfiles_text.= '  ErrorLog "' . $error_log . "\"\n";
-			$logfiles_text.= '  CustomLog "' . $access_log .'" combined' . "\n";
-
-		}
-
-		if($this->settings['system']['awstats_enabled'] == '1')
-		{
-			if((int)$domain['parentdomainid'] == 0)
-			{
+		if ($this->settings['system']['awstats_enabled'] == '1') {
+			if ((int)$domain['parentdomainid'] == 0) {
 				// prepare the aliases and subdomains for stats config files
-
 				$server_alias = '';
 				$alias_domains = $this->db->query('SELECT `domain`, `iswildcarddomain`, `wwwserveralias` FROM `' . TABLE_PANEL_DOMAINS . '`
 												WHERE `aliasdomain`=\'' . $domain['id'] . '\'
 												OR `parentdomainid` =\''. $domain['id']. '\'');
 
-				while(($alias_domain = $this->db->fetch_array($alias_domains)) !== false)
-				{
+				while (($alias_domain = $this->db->fetch_array($alias_domains)) !== false) {
+
 					$server_alias.= ' ' . $alias_domain['domain'] . ' ';
 
-					if($alias_domain['iswildcarddomain'] == '1')
-					{
+					if ($alias_domain['iswildcarddomain'] == '1') {
 						$server_alias.= '*.' . $alias_domain['domain'];
-					}
-					else
-					{
-						if($alias_domain['wwwserveralias'] == '1')
-						{
+					} else {
+						if ($alias_domain['wwwserveralias'] == '1') {
 							$server_alias.= 'www.' . $alias_domain['domain'];
-						}
-						else
-						{
+						} else {
 							$server_alias.= '';
 						}
 					}
 				}
 
-				if($domain['iswildcarddomain'] == '1')
-				{
+				if ($domain['iswildcarddomain'] == '1') {
 					$alias = '*.' . $domain['domain'];
-				}
-				else
-				{
-					if($domain['wwwserveralias'] == '1')
-					{
+				} else {
+					if ($domain['wwwserveralias'] == '1') {
 						$alias = 'www.' . $domain['domain'];
-					}
-					else
-					{
+					} else {
 						$alias = '';
 					}
 				}
@@ -871,21 +812,18 @@ class apache
 				$vhost_content.= $this->getStats($domain);
 			}
 			$vhost_content.= $this->getLogfiles($domain);
-		}
 
-		if($domain['specialsettings'] != '')
-		{
-			$vhost_content.= $domain['specialsettings'] . "\n";
-		}
+			if ($domain['specialsettings'] != '') {
+				$vhost_content.= $domain['specialsettings'] . "\n";
+			}
 
-		if($ipandport['default_vhostconf_domain'] != '')
-		{
-			$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
-		}
+			if ($ipandport['default_vhostconf_domain'] != '') {
+				$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
+			}
 
-		if($this->settings['system']['default_vhostconf'] != '')
-		{
-			$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
+			if ($this->settings['system']['default_vhostconf'] != '') {
+				$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
+			}
 		}
 
 		$vhost_content.= '</VirtualHost>' . "\n";

scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php

@@ -134,7 +134,6 @@ class apache_fcgid extends apache
 				'mod_fcgid_maxrequests' => -1,
 				'guid' => $user,
 				'openbasedir' => 0,
-				'safemode' => '0',
 				'email' => $this->settings['panel']['adminmail'],
 				'loginname' => 'froxlor.panel',
 				'documentroot' => $mypath

scripts/jobs/cron_tasks.inc.http.20.lighttpd.php

@@ -164,7 +164,6 @@ class lighttpd
 						'mod_fcgid_maxrequests' => -1,
 						'guid' => $this->settings['phpfpm']['vhost_httpuser'],
 						'openbasedir' => 0,
-						'safemode' => '0',
 						'email' => $this->settings['panel']['adminmail'],
 						'loginname' => 'froxlor.panel',
 						'documentroot' => $mypath
@@ -468,27 +467,36 @@ class lighttpd
 			mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true, true);
 
 			$only_webroot = false;
-			if($ssl_vhost === false && $domain['ssl_redirect'] == '1')
-			{
+			if ($ssl_vhost === false
+				&& $domain['ssl_redirect'] == '1'
+			) {
 				$only_webroot = true;
 			}
 			$vhost_content.= $this->getWebroot($domain, $ssl_vhost);
-			if(!$only_webroot)
-			{
+			if (!$only_webroot) {
 				if ($this->_deactivated == false) {
 					$vhost_content.= $this->create_htaccess($domain);
 					$vhost_content.= $this->create_pathOptions($domain);
 					$vhost_content.= $this->composePhpOptions($domain);
 					$vhost_content.= $this->getStats($domain);
 					$vhost_content.= $this->getSslSettings($domain, $ssl_vhost);
+
+					if ($domain['specialsettings'] != "") {
+						$vhost_content.= $domain['specialsettings'] . "\n";
+					}
+
+					if ($ipandport['default_vhostconf_domain'] != '') {
+						$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
+					}
+
+					if ($this->settings['system']['default_vhostconf'] != '') {
+						$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
+					}
 				}
 				$vhost_content.= $this->getLogFiles($domain);
 			}
 		}
 
-		if ($domain['specialsettings'] != "") {
-			$vhost_content.= $domain['specialsettings'] . "\n";
-		}
 		$vhost_content.= '}' . "\n";
 
 		return $vhost_content;
@@ -526,91 +534,63 @@ class lighttpd
 		return $ssl_settings;
 	}
 
-	protected function getLogFiles($domain)
-	{
+	protected function getLogFiles($domain) {
+
 		$logfiles_text = '';
 		
-		if($domain['speciallogfile'] == '1'
-		   && $this->settings['system']['mod_log_sql'] != '1')
-		{
-			if($domain['parentdomainid'] == '0')
-			{
+		if($domain['speciallogfile'] == '1') {
+
+			if ($domain['parentdomainid'] == '0') {
 				$speciallogfile = '-' . $domain['domain'];
-			}
-			else
-			{
+			} else {
 				$speciallogfile = '-' . $domain['parentdomain'];
 			}
-		}
-		else
-		{
+		} else {
 			$speciallogfile = '';
 		}
 
-		if($this->settings['system']['mod_log_sql'] == 1)
-		{
-			// We are using mod_log_sql (http://www.outoforder.cc/projects/apache/mod_log_sql/)
-			// TODO: See how we are able emulate the error_log
-		}
-		else
-		{
-			// The normal access/error - logging is enabled
-			// error log cannot be set conditionally see
-			// https://redmine.lighttpd.net/issues/665
+		// The normal access/error - logging is enabled
+		// error log cannot be set conditionally see
+		// https://redmine.lighttpd.net/issues/665
 
-			$access_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log');
-			// Create the logfile if it does not exist (fixes #46)
-			touch($access_log);
-			chown($access_log, $this->settings['system']['httpuser']);
-			chgrp($access_log, $this->settings['system']['httpgroup']);
+		$access_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log');
+		// Create the logfile if it does not exist (fixes #46)
+		touch($access_log);
+		chown($access_log, $this->settings['system']['httpuser']);
+		chgrp($access_log, $this->settings['system']['httpgroup']);
 
-			$logfiles_text.= '  accesslog.filename	= "' . $access_log . '"' . "\n";
-		}
+		$logfiles_text.= '  accesslog.filename	= "' . $access_log . '"' . "\n";
 		
-		if($this->settings['system']['awstats_enabled'] == '1')
-		{
-			if((int)$domain['parentdomainid'] == 0) 
-			{
+		if ($this->settings['system']['awstats_enabled'] == '1') {
+
+			if ((int)$domain['parentdomainid'] == 0) {
 				// prepare the aliases and subdomains for stats config files
-	
 				$server_alias = '';
 				$alias_domains = $this->db->query('SELECT `domain`, `iswildcarddomain`, `wwwserveralias` FROM `' . TABLE_PANEL_DOMAINS . '` 
 												WHERE `aliasdomain`=\'' . $domain['id'] . '\'
 												OR `parentdomainid` =\''. $domain['id']. '\'');
 	
-				while(($alias_domain = $this->db->fetch_array($alias_domains)) !== false)
-				{
+				while (($alias_domain = $this->db->fetch_array($alias_domains)) !== false) {
+
 					$server_alias.= ' ' . $alias_domain['domain'] . ' ';
 	
-					if($alias_domain['iswildcarddomain'] == '1')
-					{
+					if ($alias_domain['iswildcarddomain'] == '1') {
 						$server_alias.= '*.' . $domain['domain'];
-					}
-					else
-					{
-						if($alias_domain['wwwserveralias'] == '1')
-						{
+					} else {
+						if ($alias_domain['wwwserveralias'] == '1') {
 							$server_alias.= 'www.' . $alias_domain['domain'];
-						}
-						else
-						{
+						} else {
 							$server_alias.= '';
 						}
 					}
 				}
 	
-				if($domain['iswildcarddomain'] == '1')
-				{
+				if ($domain['iswildcarddomain'] == '1') {
 					$alias = '*.' . $domain['domain'];
-				}
-				else
-				{
-					if($domain['wwwserveralias'] == '1')
-					{
+				} else {
+					if ($domain['wwwserveralias'] == '1') {
 						$alias = 'www.' . $domain['domain'];
-					}
-					else
-					{
+					} else {
 						$alias = '';
 					}
 				}
@@ -867,49 +847,33 @@ class lighttpd
 	*	Lets set the text part for the stats software
 	*/
 
-	protected function getStats($domain)
-	{
+	protected function getStats($domain) {
+
 		$stats_text = '';
 
-		if($domain['speciallogfile'] == '1'
-		   && $this->settings['system']['mod_log_sql'] != '1')
-		{
-			if($domain['parentdomainid'] == '0')
-			{
-				if($this->settings['system']['awstats_enabled'] == '1')
-				{
+		if ($domain['speciallogfile'] == '1') {
+
+			if ($domain['parentdomainid'] == '0') {
+				if ($this->settings['system']['awstats_enabled'] == '1') {
 					$stats_text.= '  alias.url = ( "/awstats/" => "'.makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']).'" )' . "\n";
 					$stats_text.= '  alias.url += ( "/awstats-icon" => "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '" )' . "\n";
-				}
-				else
-				{
+				} else {
 					$stats_text.= '  alias.url = ( "/webalizer/" => "'.makeCorrectFile($domain['customerroot'] . '/webalizer/' . $domain['domain']).'/" )' . "\n";					
 				}
-			}
-			else
-			{
-				if($this->settings['system']['awstats_enabled'] == '1')
-				{
+			} else {
+				if ($this->settings['system']['awstats_enabled'] == '1') {
 					$stats_text.= '  alias.url = ( "/awstats/" => "'.makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['parentdomain']).'" )' . "\n";
 					$stats_text.= '  alias.url += ( "/awstats-icon" => "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '" )' . "\n";
-				}
-				else
-				{
+				} else {
 					$stats_text.= '  alias.url = ( "/webalizer/" => "'.makeCorrectFile($domain['customerroot'] . '/webalizer/' . $domain['parentdomain']).'/" )' . "\n";
 				}
 			}
-		}
-		else
-		{
-			if($domain['customerroot'] != $domain['documentroot'])
-			{
-				if($this->settings['system']['awstats_enabled'] == '1')
-				{
+		} else {
+			if ($domain['customerroot'] != $domain['documentroot']) {
+				if ($this->settings['system']['awstats_enabled'] == '1') {
 					$stats_text.= '  alias.url = ( "/awstats/" => "'.makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']).'" )' . "\n";
 					$stats_text.= '  alias.url += ( "/awstats-icon" => "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '" )' . "\n";
-				} 
-				else
-				{
+				} else {
 					$stats_text.= '  alias.url = ( "/webalizer/" => "'.makeCorrectFile($domain['customerroot'] . '/webalizer/').'" )' . "\n";
 				}
 			}
@@ -917,8 +881,7 @@ class lighttpd
 			// because the stats are in /awstats/[domain], not just /awstats/
 			// also, the awstats-icons are someplace else too!
 			// -> webalizer does not need this!
-			elseif($this->settings['system']['awstats_enabled'] == '1')
-			{
+			elseif ($this->settings['system']['awstats_enabled'] == '1') {
 				$stats_text.= '  alias.url = ( "/awstats/" => "'.makeCorrectFile($domain['documentroot'] . '/awstats/' . $domain['domain']).'" )' . "\n";
 				$stats_text.= '  alias.url += ( "/awstats-icon" => "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '" )' . "\n";
 			}

scripts/jobs/cron_tasks.inc.http.25.lighttpd_fcgid.php

@@ -135,7 +135,6 @@ class lighttpd_fcgid extends lighttpd
 				'mod_fcgid_maxrequests' => -1,
 				'guid' => $user,
 				'openbasedir' => 0,
-				'safemode' => '0',
 				'email' => $this->settings['panel']['adminmail'],
 				'loginname' => 'froxlor.panel',
 				'documentroot' => $mypath

scripts/jobs/cron_tasks.inc.http.30.nginx.php

@@ -184,9 +184,22 @@ class nginx
 			$this->nginx_data[$vhost_filename].= "\t".'access_log      /var/log/nginx/access.log;' . "\n";
 
 			$mypath = '';
-			if($row_ipsandports['vhostcontainer'] == '1')
-			{
-				$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__))));
+			if ($row_ipsandports['vhostcontainer'] == '1') {
+
+				// no custom docroot set?
+				if ($row_ipsandports['docroot'] == '') {
+					// check whether the hostname should directly point to
+					// the froxlor-installation or not
+					if ($this->settings['system']['froxlordirectlyviahostname']) {
+						$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__))));
+					} else {
+						$mypath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__)))));
+					}
+				} else {
+					// user-defined docroot, #417
+					$mypath = makeCorrectDir($row_ipsandports['docroot']);
+				}
+
 				$this->nginx_data[$vhost_filename].= "\t".'root     '.$mypath.';'."\n";
 				$this->nginx_data[$vhost_filename].= "\t".'location / {'."\n";
 				$this->nginx_data[$vhost_filename].= "\t\t".'index    index.php index.html index.htm;'."\n";
@@ -252,7 +265,6 @@ class nginx
 					'mod_fcgid_maxrequests' => -1,
 					'guid' => $this->settings['phpfpm']['vhost_httpuser'],
 					'openbasedir' => 0,
-					'safemode' => '0',
 					'email' => $this->settings['panel']['adminmail'],
 					'loginname' => 'froxlor.panel',
 					'documentroot' => $mypath,
@@ -399,9 +411,12 @@ class nginx
 		}
 
 		$vhost_content = '';
-		$vhost_content.= 'server { ' . "\n";
-		$vhost_content.= "\t" . 'listen ' . $ipport . ';' . "\n";
 
+		// open vhost-container
+		$vhost_content.= 'server { ' . "\n";
+		// listening statement (required)
+		$vhost_content.= "\t" . 'listen ' . $ipport . ';' . "\n";
+		// get all server-names
 		$vhost_content.= $this->getServerNames($domain);
 
 		// respect ssl_redirect settings, #542
@@ -412,12 +427,10 @@ class nginx
 			$domain['documentroot'] = 'https://' . $domain['domain'] . '/';
 		}
 
-		if(preg_match('/^https?\:\/\//', $domain['documentroot']))
-		{
+		// if the documentroot is an URL we just redirect
+		if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
 			$vhost_content.= "\t".'rewrite ^(.*) '.$this->idnaConvert->encode($domain['documentroot']).'$1 permanent;'."\n";
-		}
-		else
-		{
+		} else {
 			mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true);
 
 			$vhost_content.= $this->getLogFiles($domain);
@@ -442,6 +455,15 @@ class nginx
 				if ($domain['specialsettings'] != "") {
 					$vhost_content.= $domain['specialsettings'] . "\n";
 				}
+
+				if ($ipandport['default_vhostconf_domain'] != '') {
+					$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
+				}
+
+				if ($this->settings['system']['default_vhostconf'] != '') {
+					$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
+				}
+
 			}
 		}
 		$vhost_content.= '}' . "\n\n";
@@ -713,27 +735,18 @@ class nginx
 		return $stats_text;
 	}
 
-	/**
-	 * @TODO mod_log_sql
-	 */
-	protected function getLogFiles($domain)
-	{
+	protected function getLogFiles($domain) {
+
 		$logfiles_text = '';
 
-		if($domain['speciallogfile'] == '1'
-		&& $this->settings['system']['mod_log_sql'] != '1')
-		{
-			if($domain['parentdomainid'] == '0')
-			{
+		if ($domain['speciallogfile'] == '1') {
+
+			if ($domain['parentdomainid'] == '0') {
 				$speciallogfile = '-' . $domain['domain'];
-			}
-			else
-			{
+			} else {
 				$speciallogfile = '-' . $domain['parentdomain'];
 			}
-		}
-		else
-		{
+		} else {
 			$speciallogfile = '';
 		}
 
@@ -753,50 +766,34 @@ class nginx
 		$logfiles_text.= "\t".'access_log    ' . $access_log . ' combined;' . "\n";
 		$logfiles_text.= "\t".'error_log    ' . $error_log . ' error;' . "\n";
 
-		if($this->settings['system']['awstats_enabled'] == '1')
-		{
-			if((int)$domain['parentdomainid'] == 0)
-			{
+		if ($this->settings['system']['awstats_enabled'] == '1') {
+			if ((int)$domain['parentdomainid'] == 0) {
 				// prepare the aliases and subdomains for stats config files
-
 				$server_alias = '';
 				$alias_domains = $this->db->query('SELECT `domain`, `iswildcarddomain`, `wwwserveralias` FROM `' . TABLE_PANEL_DOMAINS . '`
 												WHERE `aliasdomain`=\'' . $domain['id'] . '\'
 												OR `parentdomainid` =\''. $domain['id']. '\'');
 
-				while(($alias_domain = $this->db->fetch_array($alias_domains)) !== false)
-				{
+				while (($alias_domain = $this->db->fetch_array($alias_domains)) !== false) {
 					$server_alias.= ' ' . $alias_domain['domain'] . ' ';
 
-					if($alias_domain['iswildcarddomain'] == '1')
-					{
+					if ($alias_domain['iswildcarddomain'] == '1') {
 						$server_alias.= '*.' . $domain['domain'];
-					}
-					else
-					{
-						if($alias_domain['wwwserveralias'] == '1')
-						{
+					} else {
+						if ($alias_domain['wwwserveralias'] == '1') {
 							$server_alias.= 'www.' . $alias_domain['domain'];
-						}
-						else
-						{
+						} else {
 							$server_alias.= '';
 						}
 					}
 				}
 
-				if($domain['iswildcarddomain'] == '1')
-				{
+				if ($domain['iswildcarddomain'] == '1') {
 					$alias = '*.' . $domain['domain'];
-				}
-				else
-				{
-					if($domain['wwwserveralias'] == '1')
-					{
+				} else {
+					if ($domain['wwwserveralias'] == '1') {
 						$alias = 'www.' . $domain['domain'];
-					}
-					else
-					{
+					} else {
 						$alias = '';
 					}
 				}

scripts/jobs/cron_tasks.inc.http.35.nginx_phpfpm.php

@@ -82,7 +82,6 @@ class nginx_phpfpm extends nginx
 				'mod_fcgid_maxrequests' => -1,
 				'guid' => $user,
 				'openbasedir' => 0,
-				'safemode' => '0',
 				'email' => $this->settings['panel']['adminmail'],
 				'loginname' => 'froxlor.panel',
 				'documentroot' => $mypath

scripts/jobs/cron_tasks.php

@@ -118,7 +118,7 @@ while($row = $db->fetch_array($result_tasks))
 				// now get rid of old stuff
 				//(but append /* so we don't delete the directory)
 				$configdir.='/*';
-				safe_exec('rm -rf '. escapeshellarg(makeCorrectFile($configdir)));
+				safe_exec('rm -rf '. makeCorrectFile($configdir));
 			}
 		}
 
@@ -132,7 +132,7 @@ while($row = $db->fetch_array($result_tasks))
 				// now get rid of old stuff
 				//(but append /* so we don't delete the directory)
 				$configdir.='/*';
-				safe_exec('rm -rf '. escapeshellarg(makeCorrectFile($configdir)));
+				safe_exec('rm -rf '. makeCorrectFile($configdir));
 			}
 		}
 
@@ -466,43 +466,34 @@ while($row = $db->fetch_array($result_tasks))
 	/**
 	 * TYPE=10 Set the filesystem - quota
 	 */
-	elseif ($row['type'] == '10')
-	{
-		if ($settings['system']['diskquota_enabled'])
-		{
-			fwrite($debugHandler, '  cron_tasks: Task10 started - setting filesystem quota' . "\n");
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, 'Task10 started - setting filesystem quota');
+	elseif ($row['type'] == '10' && (int)$settings['system']['diskquota_enabled'] != 0) {
 
-			$usedquota = getFilesystemQuota();
+		fwrite($debugHandler, '  cron_tasks: Task10 started - setting filesystem quota' . "\n");
+		$cronlog->logAction(CRON_ACTION, LOG_INFO, 'Task10 started - setting filesystem quota');
 
-			# Select all customers Froxlor knows about
-			$result = $db->query("SELECT `guid`, `loginname`, `diskspace` FROM `" . TABLE_PANEL_CUSTOMERS . "`;");
-			while($row = $db->fetch_array($result))
-			{
-				# We do not want to set a quota for root by accident
-				if ($row['guid'] != 0)
-				{
-					# The user has no quota in Froxlor, but on the filesystem
-					if (($row['diskspace'] == 0 || $row['diskspace'] == -1024) && $usedquota[$row['guid']]['block']['hard'] != 0)
-					{
-						$cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Disabling quota for " . $row['loginname']);
-						safe_exec($settings['system']['diskquota_quotatool_path'] . " -u " . $row['guid'] . " -bl 0 -q 0 " . escapeshellarg($settings['system']['diskquota_customer_partition']));
-					}
+		$usedquota = getFilesystemQuota();
 
-					# The user quota in Froxlor is different than on the filesystem
-					elseif($row['diskspace'] != $usedquota[$row['guid']]['block']['hard'] && $row['diskspace'] != -1024)
-					{
-						$cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Setting quota for " . $row['loginname'] . " from " . $usedquota[$row['guid']]['block']['hard'] . " to " . $row['diskspace']);
-						safe_exec($settings['system']['diskquota_quotatool_path'] . " -u " . $row['guid'] . " -bl " . $row['diskspace'] . " -q " . $row['diskspace'] . " " . escapeshellarg($settings['system']['diskquota_customer_partition']));
-					}
+		// Select all customers Froxlor knows about
+		$result = $db->query("SELECT `guid`, `loginname`, `diskspace` FROM `" . TABLE_PANEL_CUSTOMERS . "`;");
+		while ($row = $db->fetch_array($result)) {
+			// We do not want to set a quota for root by accident
+			if ($row['guid'] != 0) {
+				// The user has no quota in Froxlor, but on the filesystem
+				if (($row['diskspace'] == 0 || $row['diskspace'] == -1024) 
+						&& $usedquota[$row['guid']]['block']['hard'] != 0
+				) {
+					$cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Disabling quota for " . $row['loginname']);
+					safe_exec($settings['system']['diskquota_quotatool_path'] . " -u " . $row['guid'] . " -bl 0 -q 0 " . escapeshellarg($settings['system']['diskquota_customer_partition']));
+				}
+				// The user quota in Froxlor is different than on the filesystem
+				elseif ($row['diskspace'] != $usedquota[$row['guid']]['block']['hard'] 
+						&& $row['diskspace'] != -1024
+				) {
+					$cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Setting quota for " . $row['loginname'] . " from " . $usedquota[$row['guid']]['block']['hard'] . " to " . $row['diskspace']);
+					safe_exec($settings['system']['diskquota_quotatool_path'] . " -u " . $row['guid'] . " -bl " . $row['diskspace'] . " -q " . $row['diskspace'] . " " . escapeshellarg($settings['system']['diskquota_customer_partition']));
 				}
 			}
 		}
-		else
-		{
-			fwrite($debugHandler, '  cron_tasks: Task10 skipped - filesystem quota not enabled' . "\n");
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, 'Task10 skipped - filesystem quota not enabled');
-		}
 	}
 }
 
@@ -521,5 +512,3 @@ if($db->num_rows($result_tasks) != 0)
 }
 
 $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP() WHERE `settinggroup` = \'system\'   AND `varname` = \'last_tasks_run\' ');
-
-?>

scripts/jobs/cron_traffic.inc.functions.php

@@ -291,80 +291,3 @@ function callWebalizerGetTraffic($logfile, $outputdir, $caption, $usersdomainlis
 
 	return floatval($returnval);
 }
-
-/**
- * This function saves the logfile written by mod_log_sql
- * into a logfile webalizer can parse
- *
- * @param string $domain        The "speciallogfile" - domain(s)
- * @param string $loginname     The loginname of the customer
- * @return bool
- *
- * @author Florian Aders <eleras@syscp.org>
- */
-
-function safeSQLLogfile($domains, $loginname)
-{
-	global $db, $settings, $theme;
-	$sql = "SELECT * FROM access_log ";
-	$where = "WHERE virtual_host = ";
-
-	if(!is_array($domains))
-	{
-		// If it isn't an array, it's a speciallogfile-domain
-
-		$logname = $settings['system']['logfiles_directory'] . $loginname . '-' . $domains . '-access.log';
-		$where.= "'$domains' OR virtual_host = 'www.$domains'";
-	}
-	else
-	{
-		// If we have an array, these are all domains aggregated into a single logfile
-
-		if(count($domains) == 0)
-		{
-			// If the $omains-array is empty, this customer has only speciallogfile-
-			// domains, so just return, all logfiles are already written to disk
-
-			return true;
-		}
-
-		$logname = $settings['system']['logfiles_directory'] . $loginname . '-access.log';
-
-		// Build the "WHERE" - part of the sql-query
-
-		foreach($domains as $domain)
-		{
-			// A domain may be reached with or without the "www" in front.
-
-			$where.= "'$domain' OR virtual_host = 'www.$domain' OR virtual_host = ";
-		}
-
-		$where = substr($where, 0, -19);
-	}
-
-	// We want clean, ordered logfiles
-
-	$sql.= $where . " ORDER BY time_stamp;";
-	$logs = $db->query($sql);
-
-	// Don't overwrite the logfile - append the new stuff
-
-	file_put_contents($logname, "", FILE_APPEND);
-
-	while($logline = $db->fetch_array($logs))
-	{
-		// Create a "CustomLog" - line
-
-		$writelog = $logline['remote_host'] . " " . $logline['virtual_host'] . " " . $logline['remote_user'] . " ";
-		$writelog.= date("[d/M/Y:H:i:s O]", $logline['time_stamp']);
-		$writelog.= " \"" . $logline['request_method'] . " " . $logline['request_uri'] . " " . $logline['request_protocol'] . "\" ";
-		$writelog.= $logline['status'];
-		$writelog.= " " . $logline['bytes_sent'] . " \"" . $logline['referer'] . "\" \"" . $logline['agent'] . "\"\n";
-		file_put_contents($logname, $writelog, FILE_APPEND);
-	}
-
-	// Remove the just written stuff
-
-	$db->query("DELETE FROM access_log " . $where);
-	return true;
-}

scripts/jobs/cron_traffic.php

@@ -153,16 +153,14 @@ while($row_database = $db->fetch_array($databases))
 
 $db_root->close();
 
-# We are using the file-system quota, this will speed up the diskusage - collection
-if ($settings['system']['diskquota_enabled'])
-{
+// We are using the file-system quota, this will speed up the diskusage - collection
+if ($settings['system']['diskquota_enabled']) {
 	$usedquota = getFilesystemQuota();
 }
 
 $result = $db->query("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` ORDER BY `customerid` ASC");
 
-while($row = $db->fetch_array($result))
-{
+while ($row = $db->fetch_array($result)) {
 	/**
 	 * HTTP-Traffic
 	 */
@@ -170,31 +168,24 @@ while($row = $db->fetch_array($result))
 	fwrite($debugHandler, 'http traffic for ' . $row['loginname'] . ' started...' . "\n");
 	$httptraffic = 0;
 
-	if(isset($domainlist[$row['customerid']])
+	if (isset($domainlist[$row['customerid']])
 	   && is_array($domainlist[$row['customerid']])
-	   && count($domainlist[$row['customerid']]) != 0)
-	{
+	   && count($domainlist[$row['customerid']]) != 0
+	) {
 		// Examining which caption to use for default webalizer stats...
-
-		if($row['standardsubdomain'] != '0')
-		{
+		if ($row['standardsubdomain'] != '0') {
 			// ... of course we'd prefer to use the standardsubdomain ...
-
 			$caption = $domainlist[$row['customerid']][$row['standardsubdomain']];
-		}
-		else
-		{
+		} else {
 			// ... but if there is no standardsubdomain, we have to use the loginname ...
-
 			$caption = $row['loginname'];
 
 			// ... which results in non-usable links to files in the stats, so lets have a look if we find a domain which is not speciallogfiledomain
+			foreach ($domainlist[$row['customerid']] as $domainid => $domain) {
 
-			foreach($domainlist[$row['customerid']] as $domainid => $domain)
-			{
-				if(!isset($speciallogfile_domainlist[$row['customerid']])
-				   || !isset($speciallogfile_domainlist[$row['customerid']][$domainid]))
-				{
+				if (!isset($speciallogfile_domainlist[$row['customerid']])
+				   || !isset($speciallogfile_domainlist[$row['customerid']][$domainid])
+				) {
 					$caption = $domain;
 					break;
 				}
@@ -204,38 +195,25 @@ while($row = $db->fetch_array($result))
 		$httptraffic = 0;
 		reset($domainlist[$row['customerid']]);
 
-		if(isset($speciallogfile_domainlist[$row['customerid']])
+		if (isset($speciallogfile_domainlist[$row['customerid']])
 		   && is_array($speciallogfile_domainlist[$row['customerid']])
-		   && count($speciallogfile_domainlist[$row['customerid']]) != 0)
-		{
+		   && count($speciallogfile_domainlist[$row['customerid']]) != 0
+		) {
 			reset($speciallogfile_domainlist[$row['customerid']]);
-			foreach($speciallogfile_domainlist[$row['customerid']] as $domainid => $domain)
-			{
-				if($settings['system']['mod_log_sql'] == 1)
-				{
-					safeSQLLogfile($domain, $row['loginname']);
-
-					// Remove this domain from the domainlist - it's already analysed
-					// and doesn't need to be selected twice
-
-					unset($domainlist[$row['customerid']][$domainid]);
-				}
-
-				if($settings['system']['awstats_enabled'] == '0')
-				{
+			if ($settings['system']['awstats_enabled'] == '0') {
+				foreach ($speciallogfile_domainlist[$row['customerid']] as $domainid => $domain) {
 					$httptraffic+= floatval(callWebalizerGetTraffic($row['loginname'] . '-' . $domain, $row['documentroot'] . '/webalizer/' . $domain . '/', $domain, $domainlist[$row['customerid']]));
 				}
 			}
 		}
 
 		// logrotate speciallogfiles
-		if(isset($speciallogfile_domainlist[$row['customerid']])
-				&& is_array($speciallogfile_domainlist[$row['customerid']])
-				&& count($speciallogfile_domainlist[$row['customerid']]) != 0)
-		{
+		if (isset($speciallogfile_domainlist[$row['customerid']])
+			&& is_array($speciallogfile_domainlist[$row['customerid']])
+			&& count($speciallogfile_domainlist[$row['customerid']]) != 0
+		) {
 			reset($speciallogfile_domainlist[$row['customerid']]);
-			foreach($speciallogfile_domainlist[$row['customerid']] as $domainid => $domain)
-			{
+			foreach ($speciallogfile_domainlist[$row['customerid']] as $domainid => $domain) {
 				
 				$logrotatefile = '/tmp/froxlor_logrotate_tmpfile.conf';
 				$fh = fopen($logrotatefile, 'w');
@@ -264,21 +242,13 @@ while($row = $db->fetch_array($result))
 
 		reset($domainlist[$row['customerid']]);
 
-		if($settings['system']['mod_log_sql'] == 1)
-		{
-			safeSQLLogfile($domainlist[$row['customerid']], $row['loginname']);
-		}
-
 		// callAwstatsGetTraffic is called ONLY HERE and
 		// *not* also in the special-logfiles-loop, because the function
 		// will iterate through all customer-domains and the awstats-configs
 		// know the logfile-name, #246
-		if($settings['system']['awstats_enabled'] == '1')
-		{
+		if ($settings['system']['awstats_enabled'] == '1') {
 			$httptraffic+= floatval(callAwstatsGetTraffic($row['customerid'], $row['documentroot'] . '/awstats/', $domainlist[$row['customerid']]));
-		}
-		else
-		{
+		} else {
 			$httptraffic+= floatval(callWebalizerGetTraffic($row['loginname'], $row['documentroot'] . '/webalizer/', $caption, $domainlist[$row['customerid']]));
 		}
 
@@ -286,8 +256,7 @@ while($row = $db->fetch_array($result))
 		makeChownWithNewStats($row);
 		
 		// logrotate
-		if($settings['system']['logrotate_enabled'] == '1')
-		{
+		if ($settings['system']['logrotate_enabled'] == '1') {
 			fwrite($debugHandler, '   logrotate customers logs' . "\n");
 
 			$logrotatefile = '/tmp/froxlor_logrotate_tmpfile.conf';
@@ -318,8 +287,8 @@ while($row = $db->fetch_array($result))
 		 * Webalizer/AWStats might run for some time, so we'd better check if our database is still present
 		 */
 		if (empty($db->link_id)
-		   || $db->link_id === false)
-		{
+		   || $db->link_id === false
+		) {
 			fwrite($debugHandler, 'Database-connection seems to be down, trying to reconnect' . "\n");
 
 			// just in case
@@ -348,8 +317,7 @@ while($row = $db->fetch_array($result))
 	fwrite($debugHandler, 'ftp traffic for ' . $row['loginname'] . ' started...' . "\n");
 	$ftptraffic = $db->query_first("SELECT SUM(`up_bytes`) AS `up_bytes_sum`, SUM(`down_bytes`) AS `down_bytes_sum` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$row['customerid'] . "'");
 
-	if(!is_array($ftptraffic))
-	{
+	if (!is_array($ftptraffic)) {
 		$ftptraffic = array(
 			'up_bytes_sum' => 0,
 			'down_bytes_sum' => 0
@@ -565,8 +533,7 @@ $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = UNIX_TIMESTAMP()
 
 closeRootDB();
 
-if(function_exists('pcntl_fork')) {
+if (function_exists('pcntl_fork')) {
+	@unlink($TrafficLock);
 	die();
 }
-
-?>

templates/Froxlor/admin/domains/domains_edit.tpl

@@ -15,7 +15,7 @@ $header
 
 					<div id="speciallogwarningpopup" name="speciallogwarningpopup" align="center">
 						<div class="warningtitle">{$lng['admin']['delete_statistics']}</div>
-						</p>{$lng['admin']['speciallogwarning']}</p>
+						</p>{$speciallogwarning}</p>
 						<input type="text" name="delete_stats" id="delete_stats"></p>
 						<div style="margin-top:10px;">
 							<input type="button" class="yesbutton" name="verifybutton" value="{$lng['panel']['delete']}" id="speciallogyesbutton" />&nbsp;

templates/Froxlor/admin/phpconfig/overview_add.tpl

@@ -53,10 +53,6 @@ $header
 						<strong>{$lng['admin']['phpconfig']['template_replace_vars']}</strong>
 					</td>
 				</tr>
-				<tr>
-					<td><em>{SAFE_MODE}</em></td>
-					<td>{$lng['admin']['phpconfig']['safe_mode']}</td>
-				</tr>
 				<tr>
 					<td><em>{PEAR_DIR}</em></td>
 					<td>{$lng['admin']['phpconfig']['pear_dir']}</td>

templates/Froxlor/admin/phpconfig/overview_edit.tpl

@@ -54,10 +54,6 @@ $header
 						<strong>{$lng['admin']['phpconfig']['template_replace_vars']}</strong>
 					</td>
 				</tr>
-				<tr>
-					<td><em>{SAFE_MODE}</em></td>
-					<td>{$lng['admin']['phpconfig']['safe_mode']}</td>
-				</tr>
 				<tr>
 					<td><em>{PEAR_DIR}</em></td>
 					<td>{$lng['admin']['phpconfig']['pear_dir']}</td>

templates/Froxlor/admin/templates/filetemplates_add.tpl

@@ -53,23 +53,23 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{SERVERNAME}</em>:</td>
+					<td><em>{SERVERNAME}</em></td>
 					<td>{$lng['admin']['templates']['SERVERNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{CUSTOMER}</em>:</td>
+					<td><em>{CUSTOMER}</em></td>
 					<td>{$lng['admin']['templates']['CUSTOMER']}</td>
 				</tr>
 				<tr>
-					<td><em>{ADMIN}</em>:</td>
+					<td><em>{ADMIN}</em></td>
 					<td>{$lng['admin']['templates']['ADMIN']}</td>
 				</tr>
 				<tr>
-					<td><em>{CUSTOMER_EMAIL}</em>:</td>
+					<td><em>{CUSTOMER_EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['CUSTOMER_EMAIL']}</td>
 				</tr>
 				<tr>
-					<td><em>{ADMIN_EMAIL}</em>:</td>
+					<td><em>{ADMIN_EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['ADMIN_EMAIL']}</td>
 				</tr>
 			</tbody>
@@ -79,4 +79,3 @@ $header
 
 	</article>
 $footer
-

templates/Froxlor/admin/templates/filetemplates_edit.tpl

@@ -54,23 +54,23 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{SERVERNAME}</em>:</td>
+					<td><em>{SERVERNAME}</em></td>
 					<td>{$lng['admin']['templates']['SERVERNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{CUSTOMER}</em>:</td>
+					<td><em>{CUSTOMER}</em></td>
 					<td>{$lng['admin']['templates']['CUSTOMER']}</td>
 				</tr>
 				<tr>
-					<td><em>{ADMIN}</em>:</td>
+					<td><em>{ADMIN}</em></td>
 					<td>{$lng['admin']['templates']['ADMIN']}</td>
 				</tr>
 				<tr>
-					<td><em>{CUSTOMER_EMAIL}</em>:</td>
+					<td><em>{CUSTOMER_EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['CUSTOMER_EMAIL']}</td>
 				</tr>
 				<tr>
-					<td><em>{ADMIN_EMAIL}</em>:</td>
+					<td><em>{ADMIN_EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['ADMIN_EMAIL']}</td>
 				</tr>
 			</tbody>
@@ -80,4 +80,3 @@ $header
 
 	</article>
 $footer
-

templates/Froxlor/admin/templates/templates.tpl

@@ -63,4 +63,3 @@ $header
 
 	</article>
 $footer
-

templates/Froxlor/admin/templates/templates_add_1.tpl

@@ -27,4 +27,3 @@ $header
 		</section>
 	</article>
 $footer
-

templates/Froxlor/admin/templates/templates_add_2.tpl

@@ -54,27 +54,27 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><i>{SALUTATION}</em>:</td>
+					<td><i>{SALUTATION}</em></td>
 					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
-					<td><i>{FIRSTNAME}</em>:</td>
+					<td><i>{FIRSTNAME}</em></td>
 					<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{NAME}</em>:</td>
+					<td><em>{NAME}</em></td>
 					<td>{$lng['admin']['templates']['NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{COMPANY}</em>:</td>
+					<td><em>{COMPANY}</em></td>
 					<td>{$lng['admin']['templates']['COMPANY']}</td>
 				</tr>
 				<tr>
-					<td><em>{USERNAME}</em>:</td>
+					<td><em>{USERNAME}</em></td>
 					<td>{$lng['admin']['templates']['USERNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{PASSWORD}</em>:</td>
+					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['PASSWORD']}</td>
 				</tr>
 				<tr>
@@ -83,7 +83,7 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{EMAIL}</em>:</td>
+					<td><em>{EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['EMAIL']}</td>
 				</tr>
 				<if $settings['panel']['sendalternativemail'] == 1>
@@ -93,11 +93,11 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{EMAIL}</em>:</td>
+					<td><em>{EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['EMAIL']}</td>
 				</tr>
 				<tr>
-					<td><em>{PASSWORD}</em>:</td>
+					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
 				</tr>
 				</if>
@@ -107,15 +107,15 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{SALUTATION}</em>:</td>
+					<td><em>{SALUTATION}</em></td>
 					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
-					<td><em>{USERNAME}</em>:</td>
+					<td><em>{USERNAME}</em></td>
 					<td>{$lng['admin']['templates']['USERNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{PASSWORD}</em>:</td>
+					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['PASSWORD']}</td>
 				</tr>
 				<tr>
@@ -124,19 +124,19 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{TRAFFIC}</em>:</td>
+					<td><em>{TRAFFIC}</em></td>
 					<td>{$lng['admin']['templates']['TRAFFIC']}</td>
 				</tr>
 				<tr>
-					<td><em>{TRAFFICUSED}</em>:</td>
+					<td><em>{TRAFFICUSED}</em></td>
 					<td>{$lng['admin']['templates']['TRAFFICUSED']}</td>
 				</tr>
 				<tr>
-					<td><em>{MAX_PERCENT}</em>:</td>
+					<td><em>{MAX_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
 				</tr>
 				<tr>
-					<td><em>{USAGE_PERCENT}</em>:</td>
+					<td><em>{USAGE_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
 				</tr>
 				<tr>
@@ -145,19 +145,19 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{DISKAVAILABLE}</em>:</td>
+					<td><em>{DISKAVAILABLE}</em></td>
 					<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
 				</tr>
 				<tr>
-					<td><em>{DISKUSED}</em>:</td>
+					<td><em>{DISKUSED}</em></td>
 					<td>{$lng['admin']['templates']['DISKUSED']}</td>
 				</tr>
 				<tr>
-					<td><em>{MAX_PERCENT}</em>:</td>
+					<td><em>{MAX_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
 				</tr>
 				<tr>
-					<td><em>{USAGE_PERCENT}</em>:</td>
+					<td><em>{USAGE_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
 				</tr>
 				<tr>
@@ -166,23 +166,23 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{SUBJECT}</em>:</td>
+					<td><em>{SUBJECT}</em></td>
 					<td>{$lng['admin']['templates']['SUBJECT']}</td>
 				</tr>
 				<tr>
-					<td><em>{SALUTATION}</em>:</td>
+					<td><em>{SALUTATION}</em></td>
 					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
-					<td><em>{FIRSTNAME}</em>:</td>
+					<td><em>{FIRSTNAME}</em></td>
 					<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{NAME}</em>:</td>
+					<td><em>{NAME}</em></td>
 					<td>{$lng['admin']['templates']['NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{COMPANY}</em>:</td>
+					<td><em>{COMPANY}</em></td>
 					<td>{$lng['admin']['templates']['COMPANY']}</td>
 				</tr>
 				<tr>
@@ -191,27 +191,27 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em>:</td>
+					<td><em>{CUST_NAME}</em></td>
 					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_NAME}</em>:</td>
+					<td><em>{DB_NAME}</em></td>
 					<td>{$lng['admin']['templates']['DB_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_PASS}</em>:</td>
+					<td><em>{DB_PASS}</em></td>
 					<td>{$lng['admin']['templates']['DB_PASS']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_DESC}</em>:</td>
+					<td><em>{DB_DESC}</em></td>
 					<td>{$lng['admin']['templates']['DB_DESC']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_SRV}</em>:</td>
+					<td><em>{DB_SRV}</em></td>
 					<td>{$lng['admin']['templates']['DB_SRV']}</td>
 				</tr>
 				<tr>
-					<td><em>{PMA_URI}</em>:</td>
+					<td><em>{PMA_URI}</em></td>
 					<td>{$lng['admin']['templates']['PMA_URI']}</td>
 				</tr>
 				<tr>
@@ -220,19 +220,19 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em>:</td>
+					<td><em>{CUST_NAME}</em></td>
 					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{USR_NAME}</em>:</td>
+					<td><em>{USR_NAME}</em></td>
 					<td>{$lng['admin']['templates']['USR_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{USR_PASS}</em>:</td>
+					<td><em>{USR_PASS}</em></td>
 					<td>{$lng['admin']['templates']['USR_PASS']}</td>
 				</tr>
 				<tr>
-					<td><em>{USR_PATH}</em>:</td>
+					<td><em>{USR_PATH}</em></td>
 					<td>{$lng['admin']['templates']['USR_PATH']}</td>
 				</tr>
 			</tbody>
@@ -242,4 +242,3 @@ $header
 
 	</article>
 $footer
-

templates/Froxlor/admin/templates/templates_edit.tpl

@@ -55,27 +55,27 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><i>{SALUTATION}</em>:</td>
+					<td><i>{SALUTATION}</em></td>
 					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
-					<td><i>{FIRSTNAME}</em>:</td>
+					<td><i>{FIRSTNAME}</em></td>
 					<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{NAME}</em>:</td>
+					<td><em>{NAME}</em></td>
 					<td>{$lng['admin']['templates']['NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{COMPANY}</em>:</td>
+					<td><em>{COMPANY}</em></td>
 					<td>{$lng['admin']['templates']['COMPANY']}</td>
 				</tr>
 				<tr>
-					<td><em>{USERNAME}</em>:</td>
+					<td><em>{USERNAME}</em></td>
 					<td>{$lng['admin']['templates']['USERNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{PASSWORD}</em>:</td>
+					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['PASSWORD']}</td>
 				</tr>
 				<tr>
@@ -84,7 +84,7 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{EMAIL}</em>:</td>
+					<td><em>{EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['EMAIL']}</td>
 				</tr>
 				<if $settings['panel']['sendalternativemail'] == 1>
@@ -94,11 +94,11 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{EMAIL}</em>:</td>
+					<td><em>{EMAIL}</em></td>
 					<td>{$lng['admin']['templates']['EMAIL']}</td>
 				</tr>
 				<tr>
-					<td><em>{PASSWORD}</em>:</td>
+					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['EMAIL_PASSWORD']}</td>
 				</tr>
 				</if>
@@ -108,15 +108,15 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{SALUTATION}</em>:</td>
+					<td><em>{SALUTATION}</em></td>
 					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
-					<td><em>{USERNAME}</em>:</td>
+					<td><em>{USERNAME}</em></td>
 					<td>{$lng['admin']['templates']['USERNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{PASSWORD}</em>:</td>
+					<td><em>{PASSWORD}</em></td>
 					<td>{$lng['admin']['templates']['PASSWORD']}</td>
 				</tr>
 				<tr>
@@ -125,19 +125,19 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{TRAFFIC}</em>:</td>
+					<td><em>{TRAFFIC}</em></td>
 					<td>{$lng['admin']['templates']['TRAFFIC']}</td>
 				</tr>
 				<tr>
-					<td><em>{TRAFFICUSED}</em>:</td>
+					<td><em>{TRAFFICUSED}</em></td>
 					<td>{$lng['admin']['templates']['TRAFFICUSED']}</td>
 				</tr>
 				<tr>
-					<td><em>{MAX_PERCENT}</em>:</td>
+					<td><em>{MAX_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
 				</tr>
 				<tr>
-					<td><em>{USAGE_PERCENT}</em>:</td>
+					<td><em>{USAGE_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
 				</tr>
 				<tr>
@@ -146,19 +146,19 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{DISKAVAILABLE}</em>:</td>
+					<td><em>{DISKAVAILABLE}</em></td>
 					<td>{$lng['admin']['templates']['DISKAVAILABLE']}</td>
 				</tr>
 				<tr>
-					<td><em>{DISKUSED}</em>:</td>
+					<td><em>{DISKUSED}</em></td>
 					<td>{$lng['admin']['templates']['DISKUSED']}</td>
 				</tr>
 				<tr>
-					<td><em>{MAX_PERCENT}</em>:</td>
+					<td><em>{MAX_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['MAX_PERCENT']}</td>
 				</tr>
 				<tr>
-					<td><em>{USAGE_PERCENT}</em>:</td>
+					<td><em>{USAGE_PERCENT}</em></td>
 					<td>{$lng['admin']['templates']['USAGE_PERCENT']}</td>
 				</tr>
 				<tr>
@@ -167,23 +167,23 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{SUBJECT}</em>:</td>
+					<td><em>{SUBJECT}</em></td>
 					<td>{$lng['admin']['templates']['SUBJECT']}</td>
 				</tr>
 				<tr>
-					<td><em>{SALUTATION}</em>:</td>
+					<td><em>{SALUTATION}</em></td>
 					<td>{$lng['admin']['templates']['SALUTATION']}</td>
 				</tr>
 				<tr>
-					<td><em>{FIRSTNAME}</em>:</td>
+					<td><em>{FIRSTNAME}</em></td>
 					<td>{$lng['admin']['templates']['FIRSTNAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{NAME}</em>:</td>
+					<td><em>{NAME}</em></td>
 					<td>{$lng['admin']['templates']['NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{COMPANY}</em>:</td>
+					<td><em>{COMPANY}</em></td>
 					<td>{$lng['admin']['templates']['COMPANY']}</td>
 				</tr>
 				<tr>
@@ -192,27 +192,27 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em>:</td>
+					<td><em>{CUST_NAME}</em></td>
 					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_NAME}</em>:</td>
+					<td><em>{DB_NAME}</em></td>
 					<td>{$lng['admin']['templates']['DB_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_PASS}</em>:</td>
+					<td><em>{DB_PASS}</em></td>
 					<td>{$lng['admin']['templates']['DB_PASS']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_DESC}</em>:</td>
+					<td><em>{DB_DESC}</em></td>
 					<td>{$lng['admin']['templates']['DB_DESC']}</td>
 				</tr>
 				<tr>
-					<td><em>{DB_SRV}</em>:</td>
+					<td><em>{DB_SRV}</em></td>
 					<td>{$lng['admin']['templates']['DB_SRV']}</td>
 				</tr>
 				<tr>
-					<td><em>{PMA_URI}</em>:</td>
+					<td><em>{PMA_URI}</em></td>
 					<td>{$lng['admin']['templates']['PMA_URI']}</td>
 				</tr>
 				<tr>
@@ -221,19 +221,19 @@ $header
 					</td>
 				</tr>
 				<tr>
-					<td><em>{CUST_NAME}</em>:</td>
+					<td><em>{CUST_NAME}</em></td>
 					<td>{$lng['admin']['templates']['CUST_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{USR_NAME}</em>:</td>
+					<td><em>{USR_NAME}</em></td>
 					<td>{$lng['admin']['templates']['USR_NAME']}</td>
 				</tr>
 				<tr>
-					<td><em>{USR_PASS}</em>:</td>
+					<td><em>{USR_PASS}</em></td>
 					<td>{$lng['admin']['templates']['USR_PASS']}</td>
 				</tr>
 				<tr>
-					<td><em>{USR_PATH}</em>:</td>
+					<td><em>{USR_PATH}</em></td>
 					<td>{$lng['admin']['templates']['USR_PATH']}</td>
 				</tr>
 			</tbody>

templates/Froxlor/admin/templates/templates_filetemplate.tpl

@@ -9,4 +9,3 @@
 		</a>
 	</td>
 </tr>
-

templates/Froxlor/admin/templates/templates_template.tpl

@@ -10,4 +10,3 @@
 		</a>
 	</td>
 </tr>
-

templates/Froxlor/assets/js/main.js

@@ -13,14 +13,16 @@ $(document).ready(function() {
 		return null;
 	}
 
-	var $speciallogdialog = $('#speciallogwarningpopup')
-		.dialog({
-			autoOpen: false,
-			closeOnEscape: false,
-			draggable: false,
-			modal: true,
-			resizable: false,
-		});
+	if ($('#speciallogwarningpopup').length) {
+		var $speciallogdialog = $('#speciallogwarningpopup')
+			.dialog({
+				autoOpen: false,
+				closeOnEscape: false,
+				draggable: false,
+				modal: true,
+				resizable: false,
+			});
+	}
 
 	// make rel="external" links open in a new window
 	$("a[rel='external']").attr('target', '_blank');

templates/misc/configfiles/debian_squeeze/postfix_courier/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/debian_squeeze/postfix_dovecot/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/freebsd/bind9/etc_namedb_default-zone

@@ -0,0 +1,4 @@
+zone "default.zone" {
+	type master;
+	file "/etc/namedb/master/default.zone";
+};

templates/misc/configfiles/freebsd/bind9/etc_namedb_master_default.zone

@@ -0,0 +1,45 @@
+; default zone
+
+$TTL 1W
+
+; SOA Record
+@ IN SOA ns0 hostmaster (
+	2013031201 ; serial
+	1D	; refresh
+	1H	; retry
+	1W	; expiry
+	1D	; minimum
+)
+
+@	IN	NS	ns0
+	IN	MX	10 mail
+
+@	IN	A	<SERVERIP>
+	IN	MX	10 mail
+
+*	IN	A	<SERVERIP>
+	IN	MX	10 mail
+
+; Subdomain Records
+ns0	IN	A	<SERVERIP>
+mail	IN	A	<SERVERIP>
+
+; Additional Records
+@	IN	RP	hostmaster .
+	IN	SPF	"v=spf1 a mx -all"
+	IN	TXT	"dkim=all"
+
+; Services Records
+_http._tcp		IN	SRV	1 0 80 @
+_http._tcp.www		IN	SRV	0 0 80 www
+_ftp._tcp		IN	SRV	0 0 20 @
+_ftp._tcp		IN	SRV	0 0 21 @
+_dns._udp.ns0		IN	SRV	0 1 53 ns0
+_dns._tcp.ns0		IN	SRV	0 0 53 ns0
+_smtps._tcp.mail	IN	SRV	0 0 587 mail
+_smtps._tcp.mail	IN	SRV	1 0 465 mail
+_smtp._tcp.mail		IN	SRV	2 0 25 mail
+_imaps._tcp.mail	IN	SRV	0 0 993 mail
+_imap._tcp.mail		IN	SRV	1 0 143 mail
+_sieve._tcp.mail	IN	SRV	0 0 4190 mail
+_sieve._tcp.mail	IN	SRV	1 0 2000 mail

templates/misc/configfiles/freebsd/bind9/etc_namedb_named.conf

@@ -0,0 +1,32 @@
+options {
+
+	...
+
+	[snip]
+
+	# General
+	directory		"/etc/namedb/working";
+	pid-file		"/var/run/named.pid";
+
+	auth-nxdomain		no;
+
+	# Cache
+	dump-file		"/var/db/named";
+	max-cache-size		8m;
+
+	# DNSSEC
+	//========================================================================
+	// If BIND logs error messages about the root key being expired,
+	// you will need to update your keys.  See https://www.isc.org/bind-keys
+	//========================================================================
+	dnssec-enable		yes;
+	dnssec-validation	yes;
+	dnssec-lookaside	auto;
+
+	random-device		"/dev/urandom";
+
+	[/snip]
+
+	...
+
+};

templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot-sql.conf

@@ -0,0 +1,8 @@
+driver = mysql
+connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
+default_pass_scheme = CRYPT
+password_query = SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('maildir:storage=', (quota*1024)) as userdb_quota FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp' OR '%Ls' = 'sieve')
+user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', (quota*1024)) as quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')
+
+# this query is used for doveadm:
+iterate_query = SELECT username AS user FROM mail_users

templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf

@@ -0,0 +1,138 @@
+### Dovecot 2.x configuration file ###
+
+mail_plugins =
+protocols = imap lmtp sieve
+listen = *, [::]
+
+mail_uid = vmail
+mail_gid = vmail
+mail_access_groups = vmail
+
+disable_plaintext_auth = yes
+auth_mechanisms = plain login
+auth_cache_negative_ttl = 1 mins
+auth_cache_size = 1 k
+
+ssl = yes
+#ssl_cert = </example.crt
+#ssl_key = </example.key
+#ssl_ca = </example_ca.pem
+ssl_require_crl = yes
+ssl_protocols = TLSv1
+ssl_cipher_list = HIGH
+
+
+passdb {
+	args = /usr/local/etc/dovecot/dovecot-sql.conf
+	driver = sql
+}
+
+userdb {
+	args = /usr/local/etc/dovecot/dovecot-sql.conf
+	driver = sql
+}
+
+
+plugin {
+
+	# put your plugins here
+
+}
+
+
+service auth {
+
+	unix_listener /var/spool/postfix/private/auth {
+		group = postfix
+		mode = 0660
+		user = postfix
+	}
+
+}
+
+
+service auth-worker {
+
+	user = dovecot
+
+}
+
+
+lmtp_save_to_detail_mailbox = yes
+
+	service lmtp {
+
+		unix_listener /var/spool/postfix/private/dovecot-lmtp {
+		group = postfix
+		mode = 0660
+		user = postfix
+	}
+
+}
+
+
+service imap-login {
+
+	chroot = login
+	client_limit = 256
+	executable = /usr/local/libexec/dovecot/imap-login
+
+	process_min_avail = 2
+	process_limit = 128
+	service_count = 1
+
+	inet_listener imap {
+		address = *, [::]
+		port = 143
+	}
+
+	inet_listener imaps {
+		address = *, [::]
+		port = 993
+	}
+
+}
+
+
+service imap {
+
+	executable = /usr/local/libexec/dovecot/imap
+
+}
+
+
+service managesieve-login {
+
+	inet_listener sieve {
+		port = 4190
+	}
+
+	inet_listener sieve_deprecated {
+		port = 2000
+	}
+
+}
+
+
+protocol sieve {
+
+	# not implemented yet
+
+}
+
+
+protocol imap {
+
+	mail_plugins = $mail_plugins
+	imap_client_workarounds = delay-newmail tb-extra-mailbox-sep
+	imap_max_line_length = 64 k
+
+}
+
+
+protocol lmtp {
+
+	mail_plugins = $mail_plugins
+	postmaster_address = postmaster@example.net
+
+}

templates/misc/configfiles/freebsd/nginx/usr_local_etc_nginx_nginx.conf

@@ -0,0 +1,62 @@
+### Nginx configuration file ###
+
+daemon on;
+user www www;
+worker_processes 4;
+
+error_log /var/log/nginx/nginx.log crit;
+pid /var/run/nginx.pid;
+
+
+events {
+	use	kqueue;
+	worker_connections	64;
+	accept_mutex_delay	50ms;
+}
+
+
+http {
+
+	access_log	/var/log/nginx/access.log;
+
+	include	mime.types;
+	default_type	application/octet-stream;
+	charset	utf-8;
+
+	sendfile	on;
+	tcp_nopush	on;
+	tcp_nodelay	on;
+
+	# Open File Cache
+	open_file_cache	max=512 inactive=20m;
+	open_file_cache_valid	60s;
+	open_file_cache_errors	on;
+
+	# FastCGI Cache
+	fastcgi_cache_key	"$scheme$request_method$host$request_uri";
+	fastcgi_cache_path	/var/tmp/nginx levels=1:2 keys_zone=cache:10m inactive=20m max_size=12m;
+	fastcgi_temp_path	/var/tmp/nginx 1 2;
+	fastcgi_cache	cache;
+	fastcgi_cache_valid	200	20m;
+	fastcgi_cache_valid	301 302 304	1h;
+	fastcgi_cache_valid	any	1m;
+	fastcgi_cache_use_stale	error timeout invalid_header http_500;
+
+	# SSL
+	#ssl_client_certificate	/path/to/example.pem;
+	#ssl_crl	/path/to/example.crl;
+	ssl_protocols	TLSv1 TLSv1.1 TLSv1.2;
+	ssl_ciphers	HIGH;
+	ssl_prefer_server_ciphers	on;
+	ssl_session_cache	builtin:256 shared:SSL:64k;
+	ssl_session_timeout	20m;
+
+	# GZip
+	gzip	on;
+	gzip_vary	on;
+	gzip_comp_level	6;
+	gzip_static	on;
+
+	include /usr/local/etc/nginx/conf.d/*.conf;
+
+}

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf

@@ -87,7 +87,7 @@ command_directory = /usr/local/sbin
 daemon_directory = /usr/local/libexec/postfix
 data_directory = /var/db/postfix
 mail_owner = postfix
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 mydomain = <SERVERNAME>
 myorigin = $mydomain
 

templates/misc/configfiles/opensuse_11_x/postfix/etc_postfix_main.cf

@@ -34,7 +34,8 @@ transport_maps = hash:/etc/postfix/transport
 sender_canonical_maps = hash:/etc/postfix/sender_canonical
 masquerade_exceptions = root
 masquerade_classes = envelope_sender, header_sender, header_recipient
-myhostname = <SERVERNAME>
+mydomain = <SERVERNAME>
+myhostname = mail.$mydomain
 program_directory = /usr/lib/postfix
 masquerade_domains =
 mydestination = $myhostname $mydomain localhost localhost.$mydomain

templates/misc/configfiles/opensuse_11_x/postfix_dovecot/etc_postfix_main.cf

@@ -1,7 +1,9 @@
 ## General Postfix configuration
 
+mydomain = <SERVERNAME>
+
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/sle_10/postfix/etc_postfix_main.cf

@@ -35,7 +35,7 @@ transport_maps = hash:/etc/postfix/transport
 sender_canonical_maps = hash:/etc/postfix/sender_canonical
 masquerade_exceptions = root
 masquerade_classes = envelope_sender, header_sender, header_recipient
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 mydomain = <SERVERNAME>
 program_directory = /usr/lib/postfix
 masquerade_domains =

templates/misc/configfiles/ubuntu_hardy/postfix_courier/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/ubuntu_hardy/postfix_dovecot/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/ubuntu_lucid/postfix_courier/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/ubuntu_lucid/postfix_dovecot/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/ubuntu_precise/postfix_courier/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,

templates/misc/configfiles/ubuntu_precise/postfix_dovecot/etc_postfix_main.cf

@@ -3,7 +3,7 @@
 mydomain = <SERVERNAME>
 
 # should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = mail.$mydomain
 
 mydestination = $myhostname,
 	$mydomain,