Tagging Froxlor 0.9.16

- added php-xml extension check ti installation (fixes #530)
-> thanks to lando

actions/admin/settings/120.system.php

@@ -28,8 +28,8 @@ return array(
 					'varname' => 'documentroot_prefix',
 					'type' => 'string',
 					'default' => '/var/customers/webs/',
-					'plausibility_check_method' => 'checkPathConflicts',
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkPathConflicts'
 					),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
@@ -101,6 +101,18 @@ return array(
 					'default' => true,
 					'save_method' => 'storeSettingField',
 					),
+				'system_httpuser' => array(
+					'settinggroup' => 'system',
+					'varname' => 'httpuser',
+					'type' => 'hidden',
+					'default' => 'www-data',
+					),
+				'system_httpgroup' => array(
+					'settinggroup' => 'system',
+					'varname' => 'httpgroup',
+					'type' => 'hidden',
+					'default' => 'www-data',
+					),
 				'system_debug_cron' => array(
 					'label' => $lng['serversettings']['cron']['debug'],
 					'settinggroup' => 'system',

actions/admin/settings/125.multiserver.php

@@ -1,36 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Settings
- * @version    $Id$
- */
-
-return array(
-	'groups' => array(
-		'multiserver' => array(
-			'title' => $lng['admin']['multiserver'],
-			'fields' => array(
-				'multiserver_enabled' => array(
-					'label' => $lng['multiserver']['enabled'],
-					'settinggroup' => 'multiserver',
-					'varname' => 'enabled',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					'overview_option' => true,
-					'disabled' => true
-					)
-				)
-			)
-		)
-	);

actions/admin/settings/130.webserver.php

@@ -27,9 +27,9 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'webserver',
 					'type' => 'option',
-					'default' => 'Apache2',
+					'default' => 'apache2',
 					'option_mode' => 'one',
-					'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd'),
+					'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
 					'save_method' => 'storeSettingField',
 					'overview_option' => true
 					),
@@ -76,22 +76,6 @@ return array(
 					'default' => '/etc/apache2/htpasswd/',
 					'save_method' => 'storeSettingField',
 					),
-				'system_apachereload_command' => array(
-					'label' => $lng['serversettings']['apachereload_command'],
-					'settinggroup' => 'system',
-					'varname' => 'apachereload_command',
-					'type' => 'string',
-					'default' => '/etc/init.d/apache2 reload',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_log_sql' => array(
-					'label' => $lng['serversettings']['mod_log_sql'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_log_sql',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
 				'system_logfiles_directory' => array(
 					'label' => $lng['serversettings']['logfiles_directory'],
 					'settinggroup' => 'system',
@@ -128,6 +112,41 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
+				'system_apachereload_command' => array(
+					'label' => $lng['serversettings']['apachereload_command'],
+					'settinggroup' => 'system',
+					'varname' => 'apachereload_command',
+					'type' => 'string',
+					'default' => '/etc/init.d/apache2 reload',
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpreload_command' => array(
+					'label' => $lng['serversettings']['phpreload_command'],
+					'settinggroup' => 'system',
+					'varname' => 'phpreload_command',
+					'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('nginx')
+					),
+				'system_nginx_php_backend' => array(
+					'label' => $lng['serversettings']['nginx_php_backend'],
+					'settinggroup' => 'system',
+					'varname' => 'nginx_php_backend',
+					'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string',
+					'default' => '127.0.0.1:8888',
+					'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',
@@ -143,6 +162,7 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2', 'nginx')
 					),
 				'defaultwebsrverrhandler_err403' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'],
@@ -151,6 +171,7 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2', 'nginx')
 					),
 				'defaultwebsrverrhandler_err404' => array(
 					'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'],
@@ -167,6 +188,7 @@ return array(
 					'type' => 'string',
 					'default' => '',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2', 'nginx')
 					),
 				'customredirect_enabled' => array(
 					'label' => $lng['serversettings']['customredirect_enabled'],
@@ -175,6 +197,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2', 'lighttpd')
 					),
 				'customredirect_default' => array(
 					'label' => $lng['serversettings']['customredirect_default'],
@@ -185,6 +208,7 @@ return array(
 					'option_mode' => 'one',
 					'option_options_method' => 'getRedirectCodes',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2', 'lighttpd')
 					),
 				),
 			),
@@ -253,4 +277,4 @@ return array(
 		),
 	);
 
-?>
+?>

actions/admin/settings/135.fcgid.php

@@ -19,6 +19,7 @@ return array(
 	'groups' => array(
 		'fcgid' => array(
 			'title' => $lng['admin']['fcgid_settings'],
+			'websrv_avail' => array('apache2', 'lighttpd'),
 			'fields' => array(
 				'system_mod_fcgid_enabled' => array(
 					'label' => $lng['serversettings']['mod_fcgid'],
@@ -27,6 +28,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkFcgidPhpFpm',
 					'overview_option' => true
 					),					
 				'system_mod_fcgid_configdir' => array(
@@ -67,6 +69,7 @@ return array(
 					'option_options' => array(0 => 'ScriptAlias', 1=> 'FCGIWrapper'),
 					'default' => 1,
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
 					),
 				'system_mod_fcgid_starter' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['starter'],
@@ -101,6 +104,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
 					),
 				'system_mod_fcgid_httpuser' => array(
 					'label' => $lng['admin']['mod_fcgid_user'],
@@ -109,6 +113,7 @@ return array(
 					'type' => 'string',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
 					),
 				'system_mod_fcgid_httpgroup' => array(
 					'label' => $lng['admin']['mod_fcgid_group'],
@@ -117,6 +122,7 @@ return array(
 					'type' => 'string',
 					'default' => 'froxlorlocal',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
 					),
 				'system_mod_fcgid_defaultini_ownvhost' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
@@ -127,6 +133,7 @@ return array(
 					'option_mode' => 'one',
 					'option_options_method' => 'getPhpConfigs',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
 					),
 				)
 			)

actions/admin/settings/136.phpfpm.php

@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ * @version    $Id$
+ */
+
+return array(
+	'groups' => array(
+		'phpfpm' => array(
+			'title' => $lng['admin']['phpfpm_settings'],
+			'fields' => array(
+				'system_phpfpm_enabled' => array(
+					'label' => $lng['serversettings']['phpfpm'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'enabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkFcgidPhpFpm',
+					'overview_option' => true
+					),
+				'system_phpfpm_enabled_ownvhost' => array(
+					'label' => $lng['phpfpm']['ownvhost'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'enabled_ownvhost',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_httpuser' => array(
+					'label' => $lng['phpfpm']['vhost_httpuser'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'vhost_httpuser',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField'
+					),
+				'system_phpfpm_httpgroup' => array(
+					'label' => $lng['phpfpm']['vhost_httpgroup'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'vhost_httpgroup',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField'
+					),
+				/*
+				 * @TODO implement if phpfpm knows custom php.ini files
+				 * 
+				'system_phpfpm_defaultini_ownvhost' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'vhost_defaultini',
+					'type' => 'option',
+					'default' => '1',
+					'option_mode' => 'one',
+					'option_options_method' => 'getPhpConfigs',
+					'save_method' => 'storeSettingField',
+					),
+				*/
+				'system_phpfpm_configdir' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['configdir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'configdir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/etc/php-fpm.d/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_tmpdir' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['tmpdir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'tmpdir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/var/customers/tmp/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_peardir' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['peardir'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'peardir',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/usr/share/php/:/usr/share/php5/',
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_reload' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['reload'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'reload',
+					'type' => 'string',
+					'default' => '/etc/init.d/php-fpm restart',
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_pm' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['pm'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'pm',
+					'type' => 'option',
+					'default' => 'static',
+					'option_mode' => 'one',
+					'option_options' => array('static' => 'static', 'dynamic' => 'dynamic'),
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_max_children' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['max_children'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'max_children',
+					'type' => 'int',
+					'default' => 1,
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_start_servers' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['start_servers'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'start_servers',
+					'type' => 'int',
+					'default' => 20,
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_min_spare_servers' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['min_spare_servers'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'min_spare_servers',
+					'type' => 'int',
+					'default' => 5,
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_max_spare_servers' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['max_spare_servers'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'max_spare_servers',
+					'type' => 'int',
+					'default' => 35,
+					'save_method' => 'storeSettingField',
+					),
+				'system_phpfpm_max_requests' => array(
+					'label' => $lng['serversettings']['phpfpm_settings']['max_requests'],
+					'settinggroup' => 'phpfpm',
+					'varname' => 'max_requests',
+					'type' => 'int',
+					'default' => 0,
+					'save_method' => 'storeSettingField',
+					),
+				),
+			),
+		),
+	);
+
+?>

actions/admin/settings/137.perl.php

@@ -27,6 +27,7 @@ return array(
 					'type' => 'string',
 					'default' => '/usr/bin/perl',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('lighttpd')
 					),	
 				'system_perl_suexecworkaround' => array(
 					'label' => $lng['serversettings']['perl']['suexecworkaround'],
@@ -35,6 +36,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
 					),
 				'system_perl_suexeccgipath' => array(
 					'label' => $lng['serversettings']['perl']['suexeccgipath'],
@@ -43,6 +45,16 @@ return array(
 					'type' => 'string',
 					'default' => '/var/www/cgi-bin/',
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
+					),
+				'perl_server' => array(
+					'label' => $lng['serversettings']['perl_server'],
+					'settinggroup' => 'serversettings',
+					'varname' => 'perl_server',
+					'type' => 'string',
+					'default' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock',
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('nginx')
 					),
 				),
 			),

admin_configfiles.php

@@ -96,8 +96,8 @@ if($userinfo['change_serversettings'] == '1')
 			'<VIRTUAL_UID_MAPS>' => $settings['system']['vmail_uid'],
 			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
 			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
-			'<REALTIME_PORT>' => $settings['system']['realtime_port'],
+			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/',
-			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/'
+			'<BASE_PATH>' => makeCorrectDir(dirname(__FILE__))
 		);
 		$files = '';
 		$configpage = '';

admin_customers.php

@@ -107,10 +107,12 @@ if($page == 'customers'
 				$last_login = ((int)$row['lastlogin_succ'] == 0) ? $lng['panel']['neverloggedin'] : date('d.m.Y', $row['lastlogin_succ']);
 
 				$column_style = '';
+				$unlock_link = '';
 				if($row['loginfail_count'] >= $settings['login']['maxloginattempts']
 					&& $row['lastlogin_fail'] > (time() - $settings['login']['deactivatetime'])
 				) {
 					$column_style = ' style="background-color: #f99122;"';
+					$unlock_link = '<a href="'.$filename.'?s='.$s.'&amp;page='.$page.'&amp;action=unlock&amp;id='.$row['customerid'].'">'.$lng['panel']['unlock'].'</a><br />';
 				}
 
 				$row = str_replace_array('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps tickets subdomains email_autoresponder');
@@ -144,6 +146,31 @@ if($page == 'customers'
 			redirectTo('index.php', Array('action' => 'login'));
 		}
 	}
+	elseif($action == 'unlock'
+	       && $id != 0)
+	{
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$id . "' " . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . $db->escape($userinfo['adminid']) . "' "));
+
+		if($result['loginname'] != '')
+		{
+			if(isset($_POST['send'])
+			   && $_POST['send'] == 'send')
+			{
+				$result = $db->query("UPDATE 
+					`" . TABLE_PANEL_CUSTOMERS . "` 
+				SET 
+					`loginfail_count` = '0' 
+				WHERE 
+					`customerid`= '" . (int)$id . "'"
+				);
+				redirectTo($filename, Array('page' => $page, 's' => $s));
+			}
+			else
+			{
+				ask_yesno('customer_reallyunlock', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['loginname']);
+			}
+		}
+	}
 	elseif($action == 'delete'
 	       && $id != 0)
 	{
@@ -447,7 +474,12 @@ if($page == 'customers'
 
 				$createstdsubdomain = intval($_POST['createstdsubdomain']);
 				$password = validate($_POST['new_customer_password'], 'password');
-				$password = validatePassword($password);
+				// only check if not empty,
+				// cause empty == generate password automatically
+				if($password != '')
+				{
+					$password = validatePassword($password);
+				}
 				$sendpassword = intval($_POST['sendpassword']);
 				$phpenabled = intval($_POST['phpenabled']);
 				$perlenabled = intval($_POST['perlenabled']);

admin_ipsandports.php

@@ -141,13 +141,22 @@ if($page == 'ipsandports'
 			$vhostcontainer = intval($_POST['vhostcontainer']);
 			$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
 			$vhostcontainer_servername_statement = intval($_POST['vhostcontainer_servername_statement']);
-			$ssl = intval($_POST['ssl']);
-			$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-			$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-			$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-			$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
 			$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
 			$docroot = validate($_POST['docroot'], 'docroot');
+			if((int)$settings['system']['use_ssl'] == 1)
+			{
+				$ssl = intval($_POST['ssl']);
+				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
+				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
+				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
+				$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
+			} else {
+				$ssl = 0;
+				$ssl_cert_file = '';
+				$ssl_key_file = '';
+				$ssl_ca_file = '';
+				$ssl_cert_chainfile = '';
+			}
 			
 			if($listen_statement != '1')
 			{
@@ -269,13 +278,22 @@ if($page == 'ipsandports'
 				$vhostcontainer = intval($_POST['vhostcontainer']);
 				$specialsettings = validate(str_replace("\r\n", "\n", $_POST['specialsettings']), 'specialsettings', '/^[^\0]*$/');
 				$vhostcontainer_servername_statement = intval($_POST['vhostcontainer_servername_statement']);
-				$ssl = intval($_POST['ssl']);
-				$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
-				$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
-				$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
-				$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
 				$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
 				$docroot =  validate($_POST['docroot'], 'docroot');
+				if((int)$settings['system']['use_ssl'] == 1)
+				{
+					$ssl = intval($_POST['ssl']);
+					$ssl_cert_file = validate($_POST['ssl_cert_file'], 'ssl_cert_file');
+					$ssl_key_file = validate($_POST['ssl_key_file'], 'ssl_key_file');
+					$ssl_ca_file = validate($_POST['ssl_ca_file'], 'ssl_ca_file');
+					$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
+				} else {
+					$ssl = 0;
+					$ssl_cert_file = '';
+					$ssl_key_file = '';
+					$ssl_ca_file = '';
+					$ssl_cert_chainfile = '';
+				}
 				
 				if($listen_statement != '1')
 				{

admin_tickets.php

@@ -56,7 +56,7 @@ if($page == 'tickets'
 		$paging = new paging($userinfo, $db, TABLE_PANEL_TICKETS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$paging->sortfield = 'lastchange';
 		$paging->sortorder = 'desc';
-		$result = $db->query('SELECT `main`.`id`, `main`.`customerid`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` WHERE `sub`.`answerto` = `main`.`id`) as `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` FROM `' . TABLE_PANEL_TICKETS . '` as `main` WHERE `main`.`answerto` = "0"  AND `archived` = "0" AND `adminid` = "' . (int)$userinfo['adminid'] . '" ' . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$result = $db->query('SELECT `main`.`id`, `main`.`customerid`, (SELECT COUNT(`sub`.`id`) FROM `' . TABLE_PANEL_TICKETS . '` `sub` WHERE `sub`.`answerto` = `main`.`id`) as `ticket_answers`, `main`.`lastchange`, `main`.`subject`, `main`.`status`, `main`.`lastreplier`, `main`.`priority` FROM `' . TABLE_PANEL_TICKETS . '` as `main` WHERE `main`.`answerto` = "0"  AND `archived` = "0" ' . ($userinfo['customers_see_all'] ? '' : ' AND  `adminid` = "' . (int)$userinfo['adminid'] . '"') . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
 		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
@@ -473,7 +473,8 @@ elseif($page == 'categories'
 			
 			if($order < 1 || $order >= 1000)
 			{
-				$order = 1;
+				// use the latest available
+				$order = ticket::getHighestOrderNumber($db) + 1;
 			}
 
 			if($category == '')
@@ -489,6 +490,7 @@ elseif($page == 'categories'
 		}
 		else
 		{
+			$order = ticket::getHighestOrderNumber($db) + 1;
 			eval("echo \"" . getTemplate("ticket/tickets_newcategory") . "\";");
 		}
 	}

customer_ftp.php

@@ -195,7 +195,7 @@ elseif($page == 'accounts')
 					$result = $db->query("SELECT `bytes_in_used` FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $userinfo['loginname'] . "'");
 					while($row = $db->fetch_array($result))
 					{
-						$db->query("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $db->escape($username) . "', 'user', '" . $db->escape($row[bytes_in_used]) . "', '0', '0', '0', '0', '0')");
+						$db->query("INSERT INTO `" . TABLE_FTP_QUOTATALLIES . "` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $db->escape($username) . "', 'user', '" . $db->escape($row['bytes_in_used']) . "', '0', '0', '0', '0', '0')");
 					}
 					$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=CONCAT_WS(',',`members`,'" . $db->escape($username) . "') WHERE `customerid`='" . $userinfo['customerid'] . "' AND `gid`='" . (int)$userinfo['guid'] . "'");
 					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `ftps_used`=`ftps_used`+1, `ftp_lastaccountnumber`=`ftp_lastaccountnumber`+1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");

customer_mysql.php

@@ -126,7 +126,11 @@ elseif($page == 'mysqls')
 			}
 			else
 			{
-				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $result['databasename']);
+				$dbnamedesc = $result['databasename'];
+				if($result['description'] != '') {
+					$dbnamedesc.= ' ('.$result['description'].')';
+				}
+				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
 			}
 		}
 	}

index.php

@@ -336,7 +336,7 @@ if($action == 'forgotpwd')
 					try {
 						$mail->Subject = $mail_subject;
 						$mail->AltBody = $mail_body;
-						$mail->MsgHTML(str_replace("\\n", "<br />", $mail_body));
+						$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
 						$mail->AddAddress($user['email'], $user['firstname'] . ' ' . $user['name']);
 						$mail->Send();
 					} catch(phpmailerException $e) {

install/froxlor.sql

@@ -15,7 +15,7 @@ CREATE TABLE `ftp_groups` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `groupname` (`groupname`),
   KEY `customerid` (`customerid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `ftp_groups`
@@ -48,7 +48,7 @@ CREATE TABLE `ftp_users` (
   PRIMARY KEY  (`id`),
   UNIQUE KEY `username` (`username`),
   KEY `customerid` (`customerid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `ftp_users`
@@ -80,7 +80,7 @@ CREATE TABLE `mail_users` (
   `imap` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `email` (`email`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `mail_users`
@@ -105,7 +105,7 @@ CREATE TABLE `mail_virtual` (
   `iscatchall` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `email` (`email`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `mail_virtual`
@@ -168,7 +168,7 @@ CREATE TABLE `panel_admins` (
   `email_autoresponder_used` int(5) NOT NULL default '0',
    PRIMARY KEY  (`adminid`),
    UNIQUE KEY `loginname` (`loginname`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 
 # --------------------------------------------------------
@@ -234,7 +234,7 @@ CREATE TABLE `panel_customers` (
   `email_autoresponder_used` int(5) NOT NULL default '0',
    PRIMARY KEY  (`customerid`),
    UNIQUE KEY `loginname` (`loginname`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 #
 # Dumping data for table `panel_customers`
 #
@@ -256,7 +256,7 @@ CREATE TABLE `panel_databases` (
   `apsdb` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_databases`
@@ -310,7 +310,7 @@ CREATE TABLE `panel_domains` (
   KEY `customerid` (`customerid`),
   KEY `parentdomain` (`parentdomainid`),
   KEY `domain` (`domain`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_domains`
@@ -340,7 +340,7 @@ CREATE TABLE `panel_ipsandports` (
   `ssl_cert_chainfile` varchar(255) NOT NULL,
   `docroot` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_ipsandports`
@@ -366,7 +366,7 @@ CREATE TABLE `panel_htaccess` (
   `error401path` varchar(255) NOT NULL default '',
   `options_cgi` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`id`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_htaccess`
@@ -389,7 +389,7 @@ CREATE TABLE `panel_htpasswds` (
   `authname` varchar(255) NOT NULL default 'Restricted Area',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_htpasswds`
@@ -435,7 +435,7 @@ CREATE TABLE `panel_settings` (
   `varname` varchar(255) NOT NULL default '',
   `value` text NOT NULL,
   PRIMARY KEY  (`settingid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 
 # --------------------------------------------------------
@@ -462,7 +462,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.14');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.16');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');
@@ -594,6 +594,23 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (153, 'system', 'awstats_icons', '/usr/share/awstats/icon/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (154, 'system', 'ssl_cert_chainfile', '');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (155, 'login', 'domain_login', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (156, 'system', 'nginx_php_backend', '127.0.0.1:8888');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (157, 'system', 'perl_server', 'unix:/var/run/nginx/cgiwrap-dispatch.sock');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (158, 'system', 'phpreload_command', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (159, 'phpfpm', 'enabled', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (160, 'phpfpm', 'configdir', '/etc/php-fpm.d/');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (161, 'phpfpm', 'reload', '/etc/init.d/php-fpm restart');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (162, 'phpfpm', 'pm', 'static');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (163, 'phpfpm', 'max_children', '1');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (164, 'phpfpm', 'start_servers', '20');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (165, 'phpfpm', 'min_spare_servers', '5');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (166, 'phpfpm', 'max_spare_servers', '35');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (167, 'phpfpm', 'max_requests', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (168, 'phpfpm', 'tmpdir', '/var/customers/tmp/');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (169, 'phpfpm', 'peardir', '/usr/share/php/:/usr/share/php5/');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (170, 'phpfpm', 'enabled_ownvhost', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (171, 'phpfpm', 'vhost_httpuser', 'froxlorlocal');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (172, 'phpfpm', 'vhost_httpgroup', 'froxlorlocal');
 
 # --------------------------------------------------------
 
@@ -607,7 +624,7 @@ CREATE TABLE `panel_tasks` (
   `type` int(11) NOT NULL default '0',
   `data` text NOT NULL,
   PRIMARY KEY  (`id`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_tasks`
@@ -630,7 +647,7 @@ CREATE TABLE `panel_templates` (
   `value` longtext NOT NULL,
   PRIMARY KEY  (id),
   KEY adminid (adminid)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;
 
 #
 # Dumping data for table `panel_templates`
@@ -657,7 +674,7 @@ CREATE TABLE `panel_traffic` (
   `mail` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_traffic`
@@ -684,7 +701,7 @@ CREATE TABLE `panel_traffic_admins` (
   `mail` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `adminid` (`adminid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_traffic_admins`
@@ -710,7 +727,7 @@ CREATE TABLE `panel_diskspace` (
   `mysql` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `customerid` (`customerid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_diskspace`
@@ -735,7 +752,7 @@ CREATE TABLE `panel_diskspace_admins` (
   `mysql` bigint(30) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `adminid` (`adminid`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_diskspace_admins`
@@ -753,7 +770,7 @@ CREATE TABLE `panel_languages` (
   `language` varchar(30) NOT NULL default '',
   `file` varchar(255) NOT NULL default '',
   PRIMARY KEY  (`id`)
-) TYPE=MyISAM ;
+) ENGINE=MyISAM ;
 
 #
 # Dumping data for table `panel_languages`

install/install.php

@@ -22,6 +22,12 @@
  * installer, (c) 1999 - 2004 phpBB Group.
  */
 
+// ensure that default timezone is set
+if(function_exists("date_default_timezone_set") && function_exists("date_default_timezone_get"))
+{
+	@date_default_timezone_set(@date_default_timezone_get());
+}
+
 if(file_exists('../lib/userdata.inc.php'))
 {
 	/**
@@ -206,6 +212,20 @@ function requirement_checks()
 	{
 		status_message('green', 'OK');
 	}
+	
+	status_message('begin', $lng['install']['phpxml']);
+	
+	if(!extension_loaded('xml'))
+	{
+		status_message('red', $lng['install']['notinstalled']);
+		$_die = true;
+	}
+	else
+	{
+		status_message('green', 'OK');
+	}
+
+
 
 	status_message('begin', $lng['install']['phpfilter']);
 
@@ -443,6 +463,11 @@ else
 	{
 		$webserver = 'lighttpd';
 	}
+    elseif(substr(strtoupper(@php_sapi_name()), 0, 8) == "NGINX"
+	       || stristr($_SERVER['SERVER_SOFTWARE'], "nginx"))
+	{
+		$webserver = 'nginx';
+	}
 	else
 	{
 		// we don't need to bail out, since unknown does not affect any critical installation routines
@@ -665,6 +690,14 @@ if(isset($_POST['installstep'])
 		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/lighttpd/lighttpd.pem' WHERE `settinggroup` = 'system' AND `varname` = 'ssl_cert_file'");
 		$ssettings = '';
 	}
+        elseif($webserver == "nginx")
+	{
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/nginx/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_vhost'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/nginx/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_diroptions'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/nginx/froxlor-htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'");
+		$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/nginx reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
+		$ssettings = '';
+	}
 
 	// insert the lastcronrun to be the installation date
 
@@ -895,7 +928,7 @@ else
 			</tr>
 			<tr>
 				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $webserver == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['webserver']; ?>:</td>
-				<td class="main_field_display"><input type="radio" name="webserver" value="apache2" <?php echo $webserver == "apache2" ? 'checked="checked"' : "" ?>/>Apache2&nbsp;<br /><input type="radio" name="webserver" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>Lighttpd</td>
+				<td class="main_field_display"><input type="radio" name="webserver" value="apache2" <?php echo $webserver == "apache2" ? 'checked="checked"' : "" ?>/>Apache2&nbsp;<br /><input type="radio" name="webserver" value="lighttpd" <?php echo $webserver == "lighttpd" ? 'checked="checked"' : "" ?>/>Lighttpd2&nbsp;<br /><input type="radio" name="webserver" value="nginx" <?php echo $webserver == "nginx" ? 'checked="checked"' : "" ?>/>Nginx</td>
 			</tr>
 			<tr>
 				<td class="main_field_name"<?php echo ((!empty($_POST['installstep']) && $serverip == '') ? ' style="color:red;"' : ''); ?>><?php echo $lng['install']['httpuser']; ?>:</td>

install/lng/english.lng.php

@@ -97,5 +97,5 @@ $lng['install']['froxlor_succ_checks'] = 'All requirements are satisfied';
 $lng['install']['phpmagic_quotes_runtime'] = 'Checking whether magic_quotes_runtime is off';
 $lng['install']['active'] = 'no';
 $lng['install']['phpmagic_quotes_runtime_description'] = 'PHP setting "magic_quotes_runtime" must be set to "Off" in order to avoid strange behavior of Froxlor. Disabling it for now (this is only temporary, please fix our php.ini).';
-
+$lng['install']['phpxml'] = 'Testing if PHP XML-extension is installed...';
 ?>

install/lng/french.lng.php

@@ -68,4 +68,5 @@ $lng['install']['httpgroup'] = 'Nom du la group du HTTP';
 
 $lng['install']['webserver'] = 'Version du serveur';
 
+$lng['install']['phpxml'] = 'Tester si PHP XML-extension est install<6C>e...';
 ?>

install/lng/german.lng.php

@@ -97,5 +97,5 @@ $lng['install']['froxlor_succ_checks'] = 'Alle Vorraussetzungen sind erfüll
 $lng['install']['phpmagic_quotes_runtime'] = 'Prüfe ob magic_quotes_runtime ausgeschalten ist';
 $lng['install']['active'] = 'nein';
 $lng['install']['phpmagic_quotes_runtime_description'] = 'Die PHP Einstellung "magic_quotes_runtime" muss deaktiviert sein ("Off"), um merkwürdige Verhalten von Froxlor zu umgehen. Sie wurde deaktiviert (nur temporär, bitte php.ini anpassen).';
-
+$lng['install']['phpxml'] = 'Teste, ob die PHP XML-Erweiterung installiert ist...';
 ?>

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

@@ -937,7 +937,7 @@ if(isFroxlorVersion('0.9.11'))
 
 	$update_fcgid_ownvhost = isset($_POST['update_fcgid_ownvhost']) ? (int)$_POST['update_fcgid_ownvhost'] : '0';
 	$update_fcgid_httpuser = isset($_POST['update_fcgid_httpuser']) ? $_POST['update_fcgid_httpuser'] : 'froxlorlocal';
-	$update_fcgid_httpgroup = isset($_POST['update_fcgid_ownvhost']) ? $_POST['update_fcgid_ownvhost'] : 'froxlorlocal';
+	$update_fcgid_httpgroup = isset($_POST['update_fcgid_httpgroup']) ? $_POST['update_fcgid_httpgroup'] : 'froxlorlocal';
 
 	if($update_fcgid_httpuser == '') {
 		$update_fcgid_httpuser = 'froxlorlocal';
@@ -1169,6 +1169,37 @@ if(isFroxlorVersion('0.9.14-svn5'))
 	updateToVersion('0.9.14-svn6');
 }
 
+if(isFroxlorVersion('0.9.14-svn6'))
+{
+	showUpdateStep("Updating from 0.9.14-svn6 to 0.9.14-svn10", false);
+
+	// remove deprecated realtime-feature
+	showUpdateStep("Removing realtime-feature (deprecated)");
+	$db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'realtime_port';");
+	lastStepStatus(0);
+
+	// remove deprecated panel_navigation
+	showUpdateStep("Removing table `panel_navigation` (deprecated)");
+	$db->query("DROP TABLE IF EXISTS `panel_navigation`;");
+	lastStepStatus(0);
+
+	// remove deprecated panel_cronscript
+	showUpdateStep("Removing table `panel_cronscript` (deprecated)");
+	$db->query("DROP TABLE IF EXISTS `panel_cronscript`;");
+	lastStepStatus(0);
+
+	// make ticket-system ipv6 compatible
+	showUpdateStep("Altering IP field in panel_tickets (IPv6 compatibility)");
+	$db->query("ALTER TABLE `" . TABLE_PANEL_TICKETS . "` MODIFY `ip` varchar(39) NOT NULL default '';");
+	lastStepStatus(0);
+
+	showUpdateStep("Removing deprecated legacy-cronjob from database");
+	$db->query("DELETE FROM `".TABLE_PANEL_CRONRUNS."` WHERE `cronfile` ='cron_legacy.php';");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.14-svn10');
+}
+
 /*
  * revert database changes we did for multiserver-support
  * before branching - sorry guys :/
@@ -1211,37 +1242,6 @@ if(isFroxlorVersion('0.9.14-svn9'))
 	updateToVersion('0.9.14-svn10');
 }
 
-if(isFroxlorVersion('0.9.14-svn6'))
-{
-	showUpdateStep("Updating from 0.9.14-svn6 to 0.9.14-svn10", false);
-
-	// remove deprecated realtime-feature
-	showUpdateStep("Removing realtime-feature (deprecated)");
-	$db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'realtime_port';");
-	lastStepStatus(0);
-
-	// remove deprecated panel_navigation
-	showUpdateStep("Removing table `panel_navigation` (deprecated)");
-	$db->query("DROP TABLE IF EXISTS `panel_navigation`;");
-	lastStepStatus(0);
-
-	// remove deprecated panel_cronscript
-	showUpdateStep("Removing table `panel_cronscript` (deprecated)");
-	$db->query("DROP TABLE IF EXISTS `panel_cronscript`;");
-	lastStepStatus(0);
-
-	// make ticket-system ipv6 compatible
-	showUpdateStep("Altering IP field in panel_tickets (IPv6 compatibility)");
-	$db->query("ALTER TABLE `" . TABLE_PANEL_TICKETS . "` MODIFY `ip` varchar(39) NOT NULL default '';");
-	lastStepStatus(0);
-
-	showUpdateStep("Removing deprecated legacy-cronjob from database");
-	$db->query("DELETE FROM `".TABLE_PANEL_CRONRUNS."` WHERE `cronfile` ='cron_legacy.php';");
-	lastStepStatus(0);
-
-	updateToVersion('0.9.14-svn10');
-}
-
 if(isFroxlorVersion('0.9.14-svn10'))
 {
 	showUpdateStep("Updating from 0.9.14-svn10 to 0.9.14 final");
@@ -1249,3 +1249,107 @@ if(isFroxlorVersion('0.9.14-svn10'))
 
 	updateToVersion('0.9.14');
 }
+
+if(isFroxlorVersion('0.9.14'))
+{
+	showUpdateStep("Updating from 0.9.14 to 0.9.15-svn1", false);
+	
+	showUpdateStep("Adding new settings for Nginx support");
+	$db->query("INSERT INTO `".TABLE_PANEL_SETTINGS."` (`settinggroup`, `varname`, `value`) VALUES ('system', 'nginx_php_backend', '127.0.0.1:8888')");
+	$db->query("INSERT INTO `".TABLE_PANEL_SETTINGS."` (`settinggroup`, `varname`, `value`) VALUES ('system', 'perl_server', 'unix:/var/run/nginx/cgiwrap-dispatch.sock')");
+	$db->query("INSERT INTO `".TABLE_PANEL_SETTINGS."` (`settinggroup`, `varname`, `value`) VALUES ('system', 'phpreload_command', '')");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.15-svn1');
+}
+
+if(isFroxlorVersion('0.9.15-svn1'))
+{
+	showUpdateStep("Updating from 0.9.15-svn1 to 0.9.15 final");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.15');
+}
+
+if(isFroxlorVersion('0.9.15'))
+{
+	showUpdateStep("Updating from 0.9.15 to 0.9.16-svn1", false);
+
+	$update_phpfpm_enabled = isset($_POST['update_phpfpm_enabled']) ? (int)$_POST['update_phpfpm_enabled'] : '0';
+	$update_phpfpm_configdir = isset($_POST['update_phpfpm_configdir']) ? makeCorrectDir($_POST['update_phpfpm_configdir']) : '/etc/php-fpm.d/';
+	$update_phpfpm_tmpdir = isset($_POST['update_phpfpm_tmpdir']) ? makeCorrectDir($_POST['update_phpfpm_tmpdir']) : '/var/customers/tmp';
+	$update_phpfpm_peardir = isset($_POST['update_phpfpm_peardir']) ? makeCorrectDir($_POST['update_phpfpm_peardir']) : '/usr/share/php/:/usr/share/php5/';
+	$update_phpfpm_reload = isset($_POST['update_phpfpm_reload']) ? $_POST['update_phpfpm_reload'] : '/etc/init.d/php-fpm restart';
+
+	$update_phpfpm_pm = isset($_POST['update_phpfpm_pm']) ? $_POST['update_phpfpm_pm'] : 'static';
+	$update_phpfpm_max_children = isset($_POST['update_phpfpm_max_children']) ? (int)$_POST['update_phpfpm_max_children'] : '1';
+	$update_phpfpm_max_requests = isset($_POST['update_phpfpm_max_requests']) ? (int)$_POST['update_phpfpm_max_requests'] : '0';
+	
+	if($update_phpfpm_pm == 'dynamic')
+	{
+		$update_phpfpm_start_servers = isset($_POST['update_phpfpm_start_servers']) ? (int)$_POST['update_phpfpm_start_servers'] : '20';
+		$update_phpfpm_min_spare_servers = isset($_POST['update_phpfpm_min_spare_servers']) ? (int)$_POST['update_phpfpm_min_spare_servers'] : '5';
+		$update_phpfpm_max_spare_servers = isset($_POST['update_phpfpm_max_spare_servers']) ? (int)$_POST['update_phpfpm_max_spare_servers'] : '35';
+	}
+	else
+	{
+		$update_phpfpm_start_servers = 20;
+		$update_phpfpm_min_spare_servers = 5;
+		$update_phpfpm_max_spare_servers = 35;
+	}
+
+	if($update_phpfpm_configdir == '') {
+		$update_phpfpm_configdir = '/etc/php-fpm.d/';
+	}
+	if($update_phpfpm_reload == '') {
+		$update_phpfpm_reload = '/etc/init.d/php-fpm restart';
+	}
+	
+	showUpdateStep("Adding new settings for PHP-FPM #1");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'enabled', '".(int)$update_phpfpm_enabled."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'configdir', '".$db->escape($update_phpfpm_configdir)."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'reload', '".$db->escape($update_phpfpm_reload)."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'pm', '".$db->escape($update_phpfpm_pm)."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'max_children', '".(int)$update_phpfpm_max_children."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'max_requests', '".(int)$update_phpfpm_max_requests."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'start_servers', '".(int)$update_phpfpm_start_servers."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'min_spare_servers', '".(int)$update_phpfpm_min_spare_servers."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'max_spare_servers', '".(int)$update_phpfpm_max_spare_servers."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'tmpdir', '".$db->escape($update_phpfpm_tmpdir)."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'peardir', '".$db->escape($update_phpfpm_peardir)."');");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.16-svn1');
+}
+
+if(isFroxlorVersion('0.9.16-svn1'))
+{
+	showUpdateStep("Updating from 0.9.16-svn1 to 0.9.16-svn2", false);
+
+	$update_phpfpm_enabled_ownvhost = isset($_POST['update_phpfpm_enabled_ownvhost']) ? (int)$_POST['update_phpfpm_enabled_ownvhost'] : '0';
+	$update_phpfpm_httpuser = isset($_POST['update_phpfpm_httpuser']) ? $_POST['update_phpfpm_httpuser'] : 'froxlorlocal';
+	$update_phpfpm_httpgroup = isset($_POST['update_phpfpm_httpgroup']) ? $_POST['update_phpfpm_httpgroup'] : 'froxlorlocal';
+
+	if($update_phpfpm_httpuser == '') {
+		$update_phpfpm_httpuser = 'froxlorlocal';
+	}
+	if($update_phpfpm_httpgroup == '') {
+		$update_phpfpm_httpgroup = 'froxlorlocal';
+	}
+
+	showUpdateStep("Adding new settings for PHP-FPM #2");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'enabled_ownvhost', '".(int)$update_phpfpm_enabled_ownvhost."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'vhost_httpuser', '".$db->escape($update_phpfpm_httpuser)."');");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'vhost_httpgroup', '".$db->escape($update_phpfpm_httpgroup)."');");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.16-svn2');
+}
+
+if(isFroxlorVersion('0.9.16-svn2'))
+{
+        showUpdateStep("Updating from 0.9.16-svn2 to 0.9.16 final");
+        lastStepStatus(0);
+
+        updateToVersion('0.9.16');
+}

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

@@ -251,7 +251,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 			$question.= 'Local user: ';
 			$question.= '<input type="text" class="text" name="update_fcgid_httpuser" value="froxlorlocal" /><br /><br />';
 			$question.= 'Local group:&nbsp;';
-			$question.= '<input type="text" class="text" name="update_fcgid_ownvhost" value="froxlorlocal" /><br />';
+			$question.= '<input type="text" class="text" name="update_fcgid_httpgroup" value="froxlorlocal" /><br />';
 			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 		}
 	}
@@ -351,4 +351,54 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
 		$question = '';
 		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
 	}
+	
+	if(versionInUpdate($current_version, '0.9.16-svn1'))
+	{
+		$has_preconfig = true;
+		$description = 'Froxlor now features support for php-fpm.';
+		$question = '<strong>Do you want to enable php-fpm?:</strong>&nbsp;';
+		$question.= makeyesno('update_phpfpm_enabled', '1', '0', '0').'<br /><br />';
+		$question.= 'If \'yes\', please specify the configuration directory:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_configdir" value="/etc/php-fpm.d/" /><br /><br />';
+		$question.= 'Please specify the temporary files directory:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_tmpdir" value="/var/customers/tmp/" /><br /><br />';
+		$question.= 'Please specify the PEAR directory:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_peardir" value="/usr/share/php/:/usr/share/php5/" /><br /><br />';
+		$question.= 'Please specify the php-fpm restart-command:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_reload" value="/etc/init.d/php-fpm restart" /><br /><br />';
+		$question.= 'Please specify the php-fpm rocess manager control:&nbsp;';
+		$question.= '<select name="update_phpfpm_pm">';
+		$redirects = makeoption('static', 'static', 'static');
+		$redirects.= makeoption('dynamic', 'dynamic', 'static');
+		$question .= $redirects.'</select><br /><br />';
+		$question.= 'Please specify the number of child processes:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_max_children" value="1" /><br /><br />';
+		$question.= 'Please specify the number of requests per child before respawning:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_max_requests" value="0" /><br /><br />';
+		$question.= '<em>The following settings are only required if you chose process manager = dynamic</em><br /><br />';
+		$question.= 'Please specify the number of child processes created on startup:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_start_servers" value="20" /><br /><br />';
+		$question.= 'Please specify the desired minimum number of idle server processes:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_min_spare_servers" value="5" /><br /><br />';
+		$question.= 'Please specify the desired maximum number of idle server processes:&nbsp;';
+		$question.= '<input type="text" class="text" name="update_phpfpm_max_spare_servers" value="35" /><br />';
+		eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+	}
+
+	if(versionInUpdate($current_version, '0.9.16-svn2'))
+	{
+		if((int)$settings['phpfpm']['enabled'] == 1)
+		{
+			$has_preconfig = true;
+			$description = 'You can chose whether you want Froxlor to use PHP-FPM itself too now.';
+			$question = '<strong>Use PHP-FPM for the Froxlor Panel?:</strong>&nbsp;';
+			$question.= makeyesno('update_phpfpm_enabled_ownvhost', '1', '0', '0').'<br /><br />';
+			$question.= '<strong>If \'yes\', please specify local user/group (have to exist, Froxlor does not add them automatically):</strong><br /><br />';
+			$question.= 'Local user:&nbsp;';
+			$question.= '<input type="text" class="text" name="update_phpfpm_httpuser" value="'.$settings['system']['mod_fcgid_httpuser'].'" /><br /><br />';
+			$question.= 'Local group:&nbsp;';
+			$question.= '<input type="text" class="text" name="update_phpfpm_httpgroup" value="'.$settings['system']['mod_fcgid_httpgroup'].'" /><br />';
+			eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
+		}
+	}
 }

install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php

@@ -43,9 +43,9 @@ if($settings['panel']['version'] == '1.0.10')
 	// Adding tables
 
 	$db->query("DROP TABLE IF EXISTS `" . TABLE_PANEL_HTACCESS . "`;");
-	$db->query("CREATE TABLE `" . TABLE_PANEL_HTACCESS . "` (" . "  `id` int(11) unsigned NOT NULL auto_increment," . "  `customerid` int(11) unsigned NOT NULL default '0'," . "  `path` varchar(255) NOT NULL default ''," . "  `options_indexes` tinyint(1) NOT NULL default '0'," . "  PRIMARY KEY  (`id`)" . ") TYPE=MyISAM ;");
+	$db->query("CREATE TABLE `" . TABLE_PANEL_HTACCESS . "` (" . "  `id` int(11) unsigned NOT NULL auto_increment," . "  `customerid` int(11) unsigned NOT NULL default '0'," . "  `path` varchar(255) NOT NULL default ''," . "  `options_indexes` tinyint(1) NOT NULL default '0'," . "  PRIMARY KEY  (`id`)" . ") ENGINE=MyISAM ;");
 	$db->query("DROP TABLE IF EXISTS `" . TABLE_PANEL_ADMINS . "`;");
-	$db->query("CREATE TABLE `" . TABLE_PANEL_ADMINS . "` (" . "  `adminid` int(11) unsigned NOT NULL auto_increment," . "  `loginname` varchar(50) NOT NULL default ''," . "  `password` varchar(50) NOT NULL default ''," . "  `name` varchar(255) NOT NULL default ''," . "  `email` varchar(255) NOT NULL default ''," . "  `customers` int(15) NOT NULL default '0'," . "  `customers_used` int(15) NOT NULL default '0'," . "  `customers_see_all` tinyint(1) NOT NULL default '0'," . "  `domains` int(15) NOT NULL default '0'," . "  `domains_used` int(15) NOT NULL default '0'," . "  `domains_see_all` tinyint(1) NOT NULL default '0'," . "  `change_serversettings` tinyint(1) NOT NULL default '0'," . "  `diskspace` int(15) NOT NULL default '0'," . "  `diskspace_used` int(15) NOT NULL default '0'," . "  `mysqls` int(15) NOT NULL default '0'," . "  `mysqls_used` int(15) NOT NULL default '0'," . "  `emails` int(15) NOT NULL default '0'," . "  `emails_used` int(15) NOT NULL default '0'," . "  `email_forwarders` int(15) NOT NULL default '0'," . "  `email_forwarders_used` int(15) NOT NULL default '0'," . "  `ftps` int(15) NOT NULL default '0'," . "  `ftps_used` int(15) NOT NULL default '0'," . "  `subdomains` int(15) NOT NULL default '0'," . "  `subdomains_used` int(15) NOT NULL default '0'," . "  `traffic` int(15) NOT NULL default '0'," . "  `traffic_used` int(15) NOT NULL default '0'," . "  `deactivated` tinyint(1) NOT NULL default '0'," . "  `lastlogin_succ` int(11) unsigned NOT NULL default '0'," . "  `lastlogin_fail` int(11) unsigned NOT NULL default '0'," . "  `loginfail_count` int(11) unsigned NOT NULL default '0'," . "   PRIMARY KEY  (`adminid`)" . ") TYPE=MyISAM ;");
+	$db->query("CREATE TABLE `" . TABLE_PANEL_ADMINS . "` (" . "  `adminid` int(11) unsigned NOT NULL auto_increment," . "  `loginname` varchar(50) NOT NULL default ''," . "  `password` varchar(50) NOT NULL default ''," . "  `name` varchar(255) NOT NULL default ''," . "  `email` varchar(255) NOT NULL default ''," . "  `customers` int(15) NOT NULL default '0'," . "  `customers_used` int(15) NOT NULL default '0'," . "  `customers_see_all` tinyint(1) NOT NULL default '0'," . "  `domains` int(15) NOT NULL default '0'," . "  `domains_used` int(15) NOT NULL default '0'," . "  `domains_see_all` tinyint(1) NOT NULL default '0'," . "  `change_serversettings` tinyint(1) NOT NULL default '0'," . "  `diskspace` int(15) NOT NULL default '0'," . "  `diskspace_used` int(15) NOT NULL default '0'," . "  `mysqls` int(15) NOT NULL default '0'," . "  `mysqls_used` int(15) NOT NULL default '0'," . "  `emails` int(15) NOT NULL default '0'," . "  `emails_used` int(15) NOT NULL default '0'," . "  `email_forwarders` int(15) NOT NULL default '0'," . "  `email_forwarders_used` int(15) NOT NULL default '0'," . "  `ftps` int(15) NOT NULL default '0'," . "  `ftps_used` int(15) NOT NULL default '0'," . "  `subdomains` int(15) NOT NULL default '0'," . "  `subdomains_used` int(15) NOT NULL default '0'," . "  `traffic` int(15) NOT NULL default '0'," . "  `traffic_used` int(15) NOT NULL default '0'," . "  `deactivated` tinyint(1) NOT NULL default '0'," . "  `lastlogin_succ` int(11) unsigned NOT NULL default '0'," . "  `lastlogin_fail` int(11) unsigned NOT NULL default '0'," . "  `loginfail_count` int(11) unsigned NOT NULL default '0'," . "   PRIMARY KEY  (`adminid`)" . ") ENGINE=MyISAM ;");
 
 	// Insert Admin user
 

install/updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php

@@ -51,7 +51,7 @@ if($settings['panel']['version'] == '1.2.2-cvs1')
   				`language` varchar(30)           NOT NULL default '',
   				`file`     varchar(255)          NOT NULL default '',
   			PRIMARY KEY  (`id`)
-			) TYPE=MyISAM
+			) ENGINE=MyISAM
 		");
 	$db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`id`, `language`, `file`) VALUES (1, 'Deutsch', 'lng/german.lng.php');");
 	$db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`id`, `language`, `file`) VALUES (2, 'English', 'lng/english.lng.php');");
@@ -88,7 +88,7 @@ if($settings['panel']['version'] == '1.2.2-cvs3')
 			  `id` int(11) unsigned NOT NULL auto_increment,
 			  `file` varchar(255) NOT NULL default '',
 			  PRIMARY KEY  (`id`)
-			) TYPE=MyISAM
+			) ENGINE=MyISAM
 		");
 	$db->query("INSERT INTO `" . TABLE_PANEL_CRONSCRIPT . "` (`id`, `file`) VALUES (1, 'cron_traffic.php');");
 	$db->query("INSERT INTO `" . TABLE_PANEL_CRONSCRIPT . "` (`id`, `file`) VALUES (2, 'cron_tasks.php');");
@@ -146,7 +146,7 @@ if($settings['panel']['version'] == '1.2.3-cvs4')
 			  PRIMARY KEY  (`id`),
 			  KEY `adminid` (`adminid`),
 			  UNIQUE `date` (`adminid` , `year` , `month` , `day`)
-			) TYPE=MyISAM
+			) ENGINE=MyISAM
 		");
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.3-cvs5' WHERE `settinggroup`='panel' AND `varname`='version'");
 	$settings['panel']['version'] = '1.2.3-cvs5';
@@ -267,7 +267,7 @@ if($settings['panel']['version'] == '1.2.6')
   			`value` longtext NOT NULL,
   			PRIMARY KEY  (`id`),
   			KEY `adminid` (`adminid`)
-			) TYPE=MyISAM
+			) ENGINE=MyISAM
 		');
 	$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.6-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'");
 	$settings['panel']['version'] = '1.2.6-cvs1';
@@ -458,7 +458,7 @@ if($settings['panel']['version'] == '1.2.12-svn1')
 			`port` int(5) NOT NULL default \'80\',
 			`default` int(1) NOT NULL default \'0\',
 			PRIMARY KEY  (`id`)
-			) TYPE=MyISAM');
+			) ENGINE=MyISAM');
 	$db->query('INSERT INTO `' . TABLE_PANEL_IPSANDPORTS . '` (`ip`, `port`, `default`) VALUES (\'' . $settings['system']['ipaddress'] . '\', \'80\', \'1\')');
 	$db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = \'1.2.12-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\'');
 	$settings['panel']['version'] = '1.2.12-svn2';

install/updates/syscp/1.2/update_1.2.19_1.4.inc.php

@@ -620,7 +620,7 @@ else
 		  `mysql` bigint(30) unsigned NOT NULL default '0',
 		  PRIMARY KEY  (`id`),
 		  KEY `customerid` (`customerid`)
-		) TYPE=MyISAM ;");
+		) ENGINE=MyISAM ;");
 		$db->query("CREATE TABLE `" . TABLE_PANEL_DISKSPACE_ADMINS . "` (
 		  `id` int(11) unsigned NOT NULL auto_increment,
 		  `adminid` int(11) unsigned NOT NULL default '0',
@@ -633,7 +633,7 @@ else
 		  `mysql` bigint(30) unsigned NOT NULL default '0',
 		  PRIMARY KEY  (`id`),
 		  KEY `adminid` (`adminid`)
-		) TYPE=MyISAM ;");
+		) ENGINE=MyISAM ;");
 		$db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (1, 'hosting', 10, 'hosting', 'lib/billing_class_hosting.php', 'invoice_fee_hosting', 'hosting_caption', 'hosting_rowcaption_setup', 'hosting_rowcaption_interval');");
 		$db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (2, 'domains', 20, 'domains', 'lib/billing_class_domains.php', 'invoice_fee_domains', 'domains_caption', 'domains_rowcaption_setup', 'domains_rowcaption_interval');");
 		$db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (3, 'traffic', 30, 'traffic', 'lib/billing_class_traffic.php', 'invoice_fee_traffic', 'traffic_caption', 'traffic_rowcaption_setup', 'traffic_rowcaption_interval');");

lib/classes/phpinterface/class.phpinterface.php

@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Cron
+ * @version    $Id$
+ * @link       http://www.nutime.de/
+ * @since      0.9.16
+ *
+ */
+
+class phpinterface
+{
+	/**
+	 * Database handler
+	 * @var object
+	 */
+	private $_db = false;
+
+	/**
+	 * Settings array
+	 * @var array
+	 */
+	private $_settings = array();
+
+	/**
+	 * Domain-Data array
+	 * @var array
+	 */
+	private $_domain = array();
+
+	/**
+	 * Interface object
+	 * @var object
+	 */
+	private $_interface = null;
+
+	/**
+	 * Admin-User data array
+	 * @var array
+	 */
+	private $_admin_cache = array();
+
+	/**
+	 * main constructor
+	 */
+	public function __construct($db, $settings, $domain)
+	{
+		$this->_db = $db;
+		$this->_settings = $settings;
+		$this->_domain = $domain;
+		$this->_setInterface();
+	}
+
+	/**
+	 * returns the interface-object
+	 * from where we can control it
+	 */
+	public function getInterface()
+	{
+		return $this->_interface;
+	}
+	
+	/**
+	 * set interface-object by type of
+	 * php-interface: fcgid or php-fpm
+	 * sets private $_interface variable
+	 */
+	private function _setInterface()
+	{
+		// php-fpm
+		if((int)$this->_settings['phpfpm']['enabled'] == 1)
+		{
+			$this->_interface = new phpinterface_fpm($this->_db, $this->_settings, $this->_domain);
+		}
+		elseif((int)$this->_settings['system']['mod_fcgid'] == 1)
+		{
+			$this->_interface = new phpinterface_fcgid($this->_db, $this->_settings, $this->_domain);
+		}
+	}
+
+	/**
+	 * return the php-configuration from the database
+	 * 
+	 * @param int $php_config_id id of the php-configuration
+	 * 
+	 * @return array
+	 */
+	public function getPhpConfig($php_config_id)
+	{
+		$php_config_id = intval($php_config_id);
+
+		// If domain has no config, we will use the default one.
+
+		if($php_config_id == 0)
+		{
+			$php_config_id = 1;
+		}
+
+		if(!isset($this->php_configs_cache[$php_config_id]))
+		{
+			$this->_php_configs_cache[$php_config_id] = $this->_db->query_first(
+				"SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` 
+				WHERE `id` = " . (int)$php_config_id
+			);
+		}
+
+		return $this->_php_configs_cache[$php_config_id];
+	}
+
+}

lib/classes/phpinterface/class.phpinterface_fcgid.php

@@ -0,0 +1,291 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Cron
+ * @version    $Id$
+ * @link       http://www.nutime.de/
+ * @since      0.9.16
+ *
+ */
+
+class phpinterface_fcgid
+{
+	/**
+	 * Database handler
+	 * @var object
+	 */
+	private $_db = false;
+
+	/**
+	 * Settings array
+	 * @var array
+	 */
+	private $_settings = array();
+
+	/**
+	 * Domain-Data array
+	 * @var array
+	 */
+	private $_domain = array();
+
+	/**
+	 * Admin-Date cache array
+	 * @var array
+	 */
+	private $_admin_cache = array();
+
+	/**
+	 * main constructor
+	 */
+	public function __construct($db, $settings, $domain)
+	{
+		$this->_db = $db;
+		$this->_settings = $settings;
+		$this->_domain = $domain;
+	}
+
+	public function createConfig($phpconfig)
+	{
+		// create starter
+		$starter_file = "#!/bin/sh\n\n";
+		$starter_file.= "#\n";
+		$starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $this->_domain['domain'] . "' with id #" . $this->_domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
+		$starter_file.= "# Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
+		$starter_file.= "#\n\n";
+		$starter_file.= "umask 022\n";
+		$starter_file.= "PHPRC=" . escapeshellarg($this->getConfigDir()) . "\n";
+		$starter_file.= "export PHPRC\n";
+
+		// set number of processes for one domain
+		if((int)$this->_domain['mod_fcgid_starter'] != - 1)
+		{
+			$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$$this->_domain['mod_fcgid_starter'] . "\n";
+		}
+		else
+		{
+			if((int)$phpconfig['mod_fcgid_starter'] != - 1)
+			{
+				$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$phpconfig['mod_fcgid_starter'] . "\n";
+			}
+			else
+			{
+				$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$this->_settings['system']['mod_fcgid_starter'] . "\n";
+			}
+		}
+
+		$starter_file.= "export PHP_FCGI_CHILDREN\n";
+
+		// set number of maximum requests for one domain
+		if((int)$this->_domain['mod_fcgid_maxrequests'] != - 1)
+		{
+			$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$this->_domain['mod_fcgid_maxrequests'] . "\n";
+		}
+		else
+		{
+			if((int)$phpconfig['mod_fcgid_maxrequests'] != - 1)
+			{
+				$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$phpconfig['mod_fcgid_maxrequests'] . "\n";
+			}
+			else
+			{
+				$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$this->_settings['system']['mod_fcgid_maxrequests'] . "\n";
+			}
+		}
+
+		$starter_file.= "export PHP_FCGI_MAX_REQUESTS\n";
+
+		// Set Binary
+		$starter_file.= "exec " . $phpconfig['binary'] . " -c " . escapeshellarg($this->getConfigDir()) . "\n";
+
+		//remove +i attibute, so starter can be overwritten
+		if(file_exists($this->getStarterFile()))
+		{
+			removeImmutable($this->getStarterFile());
+		}
+
+		$starter_file_handler = fopen($this->getStarterFile(), 'w');
+		fwrite($starter_file_handler, $starter_file);
+		fclose($starter_file_handler);
+		safe_exec('chmod 750 ' . escapeshellarg($this->getStarterFile()));
+		safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($this->getStarterFile()));
+		setImmutable($this->getStarterFile());
+	}
+
+	public function createIniFile($phpconfig)
+	{
+		$openbasedir = '';
+		$openbasedirc = ';';
+
+		if($this->_domain['openbasedir'] == '1')
+		{
+			$openbasedirc = '';
+			$_phpappendopenbasedir = '';
+
+			$_custom_openbasedir = explode(':', $this->_settings['system']['mod_fcgid_peardir']);
+			foreach($_custom_openbasedir as $cobd)
+			{
+				$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
+			}
+
+			$_custom_openbasedir = explode(':', $this->_settings['system']['phpappendopenbasedir']);
+			foreach($_custom_openbasedir as $cobd)
+			{
+				$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
+			}
+
+			if($this->_domain['openbasedir_path'] == '0' && strstr($this->_domain['documentroot'], ":") === false)
+			{
+				$openbasedir = appendOpenBasedirPath($this->_domain['documentroot'], true);
+			}
+			else
+			{
+				$openbasedir = appendOpenBasedirPath($this->_domain['customerroot'], true);
+			}
+
+			$openbasedir .= appendOpenBasedirPath($this->getTempDir());
+			$openbasedir .= $_phpappendopenbasedir;
+
+			$openbasedir = explode(':', $openbasedir);
+			$clean_openbasedir = array();
+			foreach($openbasedir as $number => $path)
+			{
+				if(trim($path) != '/')
+				{
+					$clean_openbasedir[] = makeCorrectDir($path);
+				}
+			}
+			$openbasedir = implode(':', $clean_openbasedir);
+		}
+		else
+		{
+			$openbasedir = 'none';
+			$openbasedirc = ';';
+		}
+
+		$admin = $this->_getAdminData($this->_domain['adminid']);
+		$php_ini_variables = array(
+			'SAFE_MODE' => ($this->_domain['safemode'] == '0' ? 'Off' : 'On'),
+			'PEAR_DIR' => $this->_settings['system']['mod_fcgid_peardir'],
+			'OPEN_BASEDIR' => $openbasedir,
+			'OPEN_BASEDIR_C' => $openbasedirc,
+			'OPEN_BASEDIR_GLOBAL' => $this->_settings['system']['phpappendopenbasedir'],
+			'TMP_DIR' => $this->getTempDir(),
+			'CUSTOMER_EMAIL' => $this->_domain['email'],
+			'ADMIN_EMAIL' => $admin['email'],
+			'DOMAIN' => $this->_domain['domain'],
+			'CUSTOMER' => $this->_domain['loginname'],
+			'ADMIN' => $admin['loginname']
+		);
+
+		//insert a small header for the file
+
+		$phpini_file = ";\n";
+		$phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $this->_domain['domain'] . "' with id #" . $this->_domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
+		$phpini_file.= "; Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
+		$phpini_file.= ";\n\n";
+		$phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables);
+		$phpini_file = str_replace('"none"', 'none', $phpini_file);
+		$phpini_file = preg_replace('/\"+/', '"', $phpini_file);
+		$phpini_file_handler = fopen($this->getIniFile(), 'w');
+		fwrite($phpini_file_handler, $phpini_file);
+		fclose($phpini_file_handler);
+		safe_exec('chown root:0 ' . escapeshellarg($this->getIniFile()));
+		safe_exec('chmod 0644 ' . escapeshellarg($this->getIniFile()));
+	}
+
+	/**
+	 * fcgid-config directory
+	 * 
+	 * @param boolean $createifnotexists create the directory if it does not exist
+	 * 
+	 * @return string the directory
+	 */
+	public function getConfigDir($createifnotexists = true)
+	{
+		$configdir = makeCorrectDir($this->_settings['system']['mod_fcgid_configdir'] . '/' . $this->_domain['loginname'] . '/' . $this->_domain['domain'] . '/');
+
+		if(!is_dir($configdir) && $createifnotexists)
+		{
+			safe_exec('mkdir -p ' . escapeshellarg($configdir));
+			safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($configdir));
+		}
+
+		return $configdir;
+	}
+
+	/**
+	 * fcgid-temp directory
+	 * 
+	 * @param boolean $createifnotexists create the directory if it does not exist
+	 * 
+	 * @return string the directory
+	 */
+	public function getTempDir($createifnotexists = true)
+	{
+		$tmpdir = makeCorrectDir($this->_settings['system']['mod_fcgid_tmpdir'] . '/' . $this->_domain['loginname'] . '/');
+
+		if(!is_dir($tmpdir) && $createifnotexists)
+		{
+			safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
+			safe_exec('chown -R ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($tmpdir));
+			safe_exec('chmod 0750 ' . escapeshellarg($tmpdir));
+		}
+		
+		return $tmpdir;
+	}
+
+	/**
+	 * return path of php-starter file
+	 * 
+	 * @return string the directory
+	 */
+	public function getStarterFile()
+	{
+		$starter_filename = makeCorrectFile($this->getConfigDir() . '/php-fcgi-starter');
+		return $starter_filename;
+	}
+
+	/**
+	 * return path of php.ini file
+	 * 
+	 * @return string full with path file-name
+	 */
+	public function getIniFile()
+	{
+		$phpini_filename = makeCorrectFile($this->getConfigDir() . '/php.ini');
+		return $phpini_filename;
+	}
+
+	/**
+	 * return the admin-data of a specific admin
+	 * 
+	 * @param int $adminid id of the admin-user
+	 * 
+	 * @return array
+	 */
+	private function _getAdminData($adminid)
+	{
+		$adminid = intval($adminid);
+
+		if(!isset($this->_admin_cache[$adminid]))
+		{
+			$this->_admin_cache[$adminid] = $this->_db->query_first(
+				"SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` 
+				WHERE `adminid` = " . (int)$adminid
+			);
+		}
+
+		return $this->_admin_cache[$adminid];
+	}
+}

lib/classes/phpinterface/class.phpinterface_fpm.php

@@ -0,0 +1,174 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Michael Kaufmann <mkaufmann@nutime.de>
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Cron
+ * @version    $Id$
+ * @link       http://www.nutime.de/
+ * @since      0.9.16
+ *
+ */
+
+class phpinterface_fpm
+{
+	/**
+	 * Database handler
+	 * @var object
+	 */
+	private $_db = false;
+
+	/**
+	 * Settings array
+	 * @var array
+	 */
+	private $_settings = array();
+
+	/**
+	 * Domain-Data array
+	 * @var array
+	 */
+	private $_domain = array();
+
+	/**
+	 * main constructor
+	 */
+	public function __construct($db, $settings, $domain)
+	{
+		$this->_db = $db;
+		$this->_settings = $settings;
+		$this->_domain = $domain;
+	}
+
+	public function createConfig($phpconfig)
+	{
+		$fh = @fopen($this->getConfigFile(), 'w');
+		if($fh)
+		{
+			$fpm_pm = $this->_settings['phpfpm']['pm'];
+			$fpm_children = (int)$this->_settings['phpfpm']['max_children'];
+			$fpm_start_servers = (int)$this->_settings['phpfpm']['start_servers'];
+			$fpm_min_spare_servers = (int)$this->_settings['phpfpm']['min_spare_servers'];
+			$fpm_max_spare_servers = (int)$this->_settings['phpfpm']['max_spare_servers'];
+			$fpm_requests = (int)$this->_settings['phpfpm']['max_requests'];
+
+			if($fpm_children == 0) {
+				$fpm_children = 1;
+			}
+
+			$fpm_config = ';PHP-FPM configuration for "'.$this->_domain['domain'].'" created on ' . date("Y.m.d H:i:s") . "\n";
+			$fpm_config.= '['.$this->_domain['domain'].']'."\n";
+			$fpm_config.= 'listen = '.$this->getSocketFile()."\n";
+			if($this->_domain['loginname'] == 'froxlor.panel')
+			{
+				$fpm_config.= 'listen.owner = '.$this->_domain['guid']."\n";
+				$fpm_config.= 'listen.group = '.$this->_domain['guid']."\n";
+			}
+			else
+			{
+				$fpm_config.= 'listen.owner = '.$this->_domain['loginname']."\n";
+				$fpm_config.= 'listen.group = '.$this->_domain['loginname']."\n";
+			}
+			$fpm_config.= 'listen.mode = 0666'."\n";
+
+			if($this->_domain['loginname'] == 'froxlor.panel')
+			{
+				$fpm_config.= 'user = '.$this->_domain['guid']."\n";
+				$fpm_config.= 'group = '.$this->_domain['guid']."\n";
+			}
+			else
+			{
+				$fpm_config.= 'user = '.$this->_domain['loginname']."\n";
+				$fpm_config.= 'group = '.$this->_domain['loginname']."\n";
+			}
+
+			$fpm_config.= 'pm = '.$fpm_pm."\n";
+			$fpm_config.= 'pm.max_children = '.$fpm_children."\n";
+			if($fpm_pm == 'dynamic') {
+				$fpm_config.= 'pm.start_servers = '.$fpm_start_servers."\n";
+				$fpm_config.= 'pm.min_spare_servers = '.$fpm_min_spare_servers."\n";
+				$fpm_config.= 'pm.max_spare_servers = '.$fpm_max_spare_servers."\n";
+			}
+			$fpm_config.= 'pm.max_requests = '.$fpm_requests."\n";
+
+			$fpm_config.= ';chroot = '.makeCorrectDir($this->_domain['documentroot'])."\n";
+
+			$tmpdir = makeCorrectDir($this->_settings['phpfpm']['tmpdir'] . '/' . $this->_domain['loginname'] . '/');
+			if(!is_dir($tmpdir))
+			{
+				safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
+			}
+			//$slowlog = makeCorrectFile($this->_settings['system']['logfiles_directory'] . $this->_domain['loginname'] . '/php-fpm_slow.log');
+
+			$fpm_config.= 'env[TMP] = '.$tmpdir."\n";
+			$fpm_config.= 'env[TMPDIR] = '.$tmpdir."\n";
+			$fpm_config.= 'env[TEMP] = '.$tmpdir."\n";
+
+			$fpm_config.= 'php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f '.$this->_domain['email']."\n";
+			if($this->_domain['loginname'] != 'froxlor.panel')
+			{
+				$fpm_config.= 'php_admin_value[open_basedir] = ' . makeCorrectDir($this->_settings['system']['documentroot_prefix'] . '/' . $this->_domain['loginname'] . '/') .':' . makeCorrectDir($this->_settings['phpfpm']['tmpdir'] . '/' . $this->_domain['loginname'] . '/') . ':' . $this->_settings['phpfpm']['peardir'] . "\n";
+			}
+			$fpm_config.= 'php_admin_value[session.save_path] = ' . makeCorrectDir($this->_settings['phpfpm']['tmpdir'] . '/' . $this->_domain['loginname'] . '/') . "\n";
+			$fpm_config.= 'php_admin_value[upload_tmp_dir] = ' . makeCorrectDir($this->_settings['phpfpm']['tmpdir'] . '/' . $this->_domain['loginname'] . '/') . "\n";
+
+			fwrite($fh, $fpm_config, strlen($fpm_config));
+			fclose($fh);
+		}
+	}
+
+	public function createIniFile($phpconfig)
+	{
+		return;
+	}
+
+	/**
+	 * fpm-config file
+	 * 
+	 * @param boolean $createifnotexists create the directory if it does not exist
+	 * 
+	 * @return string the full path to the file
+	 */
+	public function getConfigFile($createifnotexists = true)
+	{
+		$configdir = makeCorrectDir($this->_settings['phpfpm']['configdir']);
+		$config = makeCorrectFile($configdir.'/'.$this->_domain['domain'].'.conf');
+
+		if(!is_dir($configdir) && $createifnotexists)
+		{
+			safe_exec('mkdir -p ' . escapeshellarg($configdir));
+		}
+
+		return $config;
+	}
+
+	/**
+	 * return path of fpm-socket file
+	 * 
+	 * @param boolean $createifnotexists create the directory if it does not exist
+	 * 
+	 * @return string the full path to the socket
+	 */
+	public function getSocketFile($createifnotexists = true)
+	{
+		$socketdir = makeCorrectDir('/var/run/'.$this->_settings['system']['webserver'].'/');
+		$socket = makeCorrectFile($socketdir.'/'.$this->_domain['loginname'].'-'.$this->_domain['domain'].'-php-fpm.socket');
+
+		if(!is_dir($socketdir) && $createifnotexists)
+		{
+			safe_exec('mkdir -p '.$socketdir);
+			safe_exec('chown -R '.$this->_settings['system']['httpuser'].':'.$this->_settings['system']['httpgroup'].' '.$socketdir);
+		}
+
+		return $socket;
+	}
+}

lib/classes/ticket/class.ticket.php

@@ -320,7 +320,7 @@ class ticket
 			if ($_mailerror) {
 				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
 				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-				standard_error(array('errorsendingmail', $usr['email']));
+				standard_error('errorsendingmail', $usr['email']);
 			}
 
 			$mail->ClearAddresses();
@@ -348,7 +348,7 @@ class ticket
 			if ($_mailerror) {
 				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
 				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
-				standard_error(array('errorsendingmail', $admin['email']));
+				standard_error('errorsendingmail', $admin['email']);
 			}
 
 			$mail->ClearAddresses();
@@ -442,6 +442,20 @@ class ticket
 		return null;
 	}
 
+	/**
+	 * get the highest order number
+	 * 
+	 * @param object $_db database-object
+	 * 
+	 * @return int highest order number
+	 */
+	static public function getHighestOrderNumber($_db = null)
+	{
+		$sql = "SELECT MAX(`logicalorder`) as `highestorder` FROM `" . TABLE_PANEL_TICKET_CATS . "`;";
+		$result = $_db->query_first($sql);
+		return (isset($result['highestorder']) ? (int)$result['highestorder'] : 1);
+	}
+
 	/**
 	 * returns the last x archived tickets
 	 */

lib/configfiles/etch.inc.php

@@ -1,313 +0,0 @@
-<?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    Configfiles
- * @version    $Id$
- */
-
-return Array(
-	'debian_etch' => Array(
-		'label' => 'Debian 4.0 (Etch) [deprecated]',
-		'services' => Array(
-			'http' => Array(
-				'label' => $lng['admin']['configfiles']['http'],
-				'daemons' => Array(
-					'apache2' => Array(
-						'label' => 'Apache 2',
-						'commands' => Array(
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'a2dismod userdir',
-						),
-						'restart' => Array(
-							'/etc/init.d/apache2 restart'
-						),
-					),
-					'lighttpd' => Array(
-						'label' => 'Lighttpd Webserver',
-						'commands_1' => Array(
-							'apt-get install lighttpd',
-						),
-						'files' => Array(
-							'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf',
-						),
-						'commands_2' => Array(
-							$configcommand['vhost'],
-							$configcommand['diroptions'],
-							$configcommand['v_inclighty'],
-							$configcommand['d_inclighty'],
-							'lighty-disable-mod cgi',
-							'lighty-disable-mod fastcgi',
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							'mkdir -p ' . $settings['system']['deactivateddocroot'],
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-						),
-						'restart' => Array(
-							'/etc/init.d/lighttpd restart'
-						)
-					)
-				)
-			),
-			'dns' => Array(
-				'label' => $lng['admin']['configfiles']['dns'],
-				'daemons' => Array(
-					'bind' => Array(
-						'label' => 'Bind9',
-						'commands' => Array(
-							'apt-get install bind9',
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'              
-						),
-						'restart' => Array(
-							'/etc/init.d/bind9 restart'
-						)
-					),
-					'powerdns' => Array(
-						'label' => 'PowerDNS',
-						'files' => Array(
-							'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf',
-							'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf',
-						),
-						'restart' => Array(
-							'/etc/init.d/pdns restart'
-						)
-					),
-				)
-			),
-			'smtp' => Array(
-				'label' => $lng['admin']['configfiles']['smtp'],
-				'daemons' => Array(
-					'postfix' => Array(
-						'label' => 'Postfix',
-						'commands' => Array(
-							'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql',
-							'mkdir -p /etc/postfix/sasl',
-							'mkdir -p /var/spool/postfix/etc/pam.d',
-							'mkdir -p /var/spool/postfix/var/run/mysqld',
-							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
-							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'touch /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'touch /etc/postfix/sasl/smtpd.conf',
-							'chown root:root /etc/postfix/main.cf',
-							'chown root:root /etc/postfix/master.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'chown root:root /etc/postfix/sasl/smtpd.conf',
-							'chmod 0644 /etc/postfix/main.cf',
-							'chmod 0644 /etc/postfix/master.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf',
-							'chmod 0600 /etc/postfix/sasl/smtpd.conf',
-						),
-						'files' => Array(
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
-							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
-							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
-							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
-							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
-							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf',
-							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
-						),
-						'restart' => Array(
-							'newaliases',
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'dkim' => Array(
-						'label' => 'DomainKey filter',
-						'commands_1' => Array(
-							'apt-get install dkim-filter',
-							'mkdir -p /etc/postfix/dkim'
-						),
-						'files' => Array(
-							'dkim-filter.conf' => '/etc/dkim-filter.conf'
-						),
-						'commands_2' => Array(
-							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
-							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
-							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
-							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
-						),
-						'restart' => Array(
-							'/etc/init.d/dkim-filter restart',
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'postfix_mxaccess' => Array(
-						'label' => 'Postfix MX-Access (anti spam)',
-						'files' => Array(
-							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
-							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
-						),
-						'commands_1' => Array(
-							'postmap /etc/postfix/mx_access'
-						),
-						'restart' => Array(
-							'/etc/init.d/postfix restart'
-						)
-					),
-					'exim4' => Array(
-						'label' => 'Exim4',
-						'commands_1' => Array(
-							'dpkg-reconfigure exim4-config',
-							'# choose "no configuration at this time" and "splitted configuration files" in the dialog'
-						),
-						'files' => Array(
-							'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul',
-							'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config',
-							'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options',
-							'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config',
-							'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config'
-						),
-						'commands_2' => Array(
-							'chmod o-rx /var/lib/exim4',
-							'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options'
-						),
-						'restart' => Array(
-							'/etc/init.d/exim4 restart'
-						)
-					)
-				)
-			),
-			'mail' => Array(
-				'label' => $lng['admin']['configfiles']['mail'],
-				'daemons' => Array(
-					'courier' => Array(
-						'label' => 'Courier',
-						'commands' => Array(
-							'apt-get install courier-pop courier-imap courier-authlib-mysql'
-						),
-						'files' => Array(
-							'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc',
-							'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc'
-						),
-						'restart' => Array(
-							'/etc/init.d/courier-authdaemon restart',
-							'/etc/init.d/courier-pop restart'
-						)
-					),
-					'dovecot' => Array(
-						'label' => 'Dovecot',
-						'commands' => Array(
-							'apt-get install dovecot-imapd dovecot-pop3d'
-						),
-						'files' => Array(
-							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
-							'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/dovecot restart'
-						)
-					)
-				)
-			),
-			'ftp' => Array(
-				'label' => $lng['admin']['configfiles']['ftp'],
-				'daemons' => Array(
-					'proftpd' => Array(
-						'label' => 'ProFTPd',
-						'commands' => Array(
-							'apt-get install proftpd-basic proftpd-mod-mysql'
-						),
-						'files' => Array(
-							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
-							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/proftpd restart'
-						)
-					),
-					'pure-ftpd' => Array(
-						'label' => 'Pure FTPd',
-						'commands' => Array(
-							'apt-get install pure-ftpd-common pure-ftpd-mysql'
-						),
-						'files' => Array(
-							'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID',
-							'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile',
-							'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous',
-							'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime',
-							'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone',
-							'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication',
-							'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf',
-							'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof',
-							'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind',
-							'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common'
-						),
-						'restart' => Array(
-							'/etc/init.d/pure-ftpd-mysql restart'
-						)
-					),
-				)
-			),
-			'etc' => Array(
-				'label' => $lng['admin']['configfiles']['etc'],
-				'daemons' => Array(
-					'cron' => Array(
-						'label' => 'Crond (cronscript)',
-						'files' => Array(
-							'etc_cron.d_froxlor' => '/etc/cron.d/froxlor'
-						),
-						'restart' => Array(
-							'/etc/init.d/cron restart'
-						)
-					),
-					'awstats' => Array(
-						'label' => 'Awstats',
-						'commands' => 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')
-						),
-					),
-					'libnss' => Array(
-						'label' => 'libnss (system login with mysql)',
-						'commands' => Array(
-							'apt-get install libnss-mysql nscd',
-							'chmod 600 /etc/nss-mysql.conf /etc/nss-mysql-root.conf'
-						),
-						'files' => Array(
-							'etc_nss-mysql.conf' => '/etc/nss-mysql.conf',
-							'etc_nss-mysql-root.conf' => '/etc/nss-mysql-root.conf',
-							'etc_nsswitch.conf' => '/etc/nsswitch.conf',
-						),
-						'restart' => Array(
-							'/etc/init.d/nscd restart'
-						)
-					)
-				)
-			)
-		)
-	)
-);
-
-?>

lib/configfiles/freebsd.inc.php

@@ -88,8 +88,8 @@ return Array(
 							'make install'
 						),
 						'commands_2' => Array(
-							'pw groupadd vmail -g 5001 ',
+							'pw groupadd vmail -g '.$settings['system']['vmail_gid'],
-							'pw useradd vmail -u 5001 -g 5001 -s/sbin/nologin -d/dev/null',			
+							'pw useradd vmail -u '.$settings['system']['vmail_uid'].' -g '.$settings['system']['vmail_gid'].' -s/sbin/nologin -d/dev/null',			
 							'mkdir -p ' . $settings['system']['vmail_homedir'],
 							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
 							'chmod 0750 ' . $settings['system']['vmail_homedir']

lib/configfiles/gentoo.inc.php

@@ -39,6 +39,12 @@ return Array(
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
 						),
+						'files' => ((int)$settings['phpfpm']['enabled'] == 1) ?
+							Array(
+								'etc_apache2_modules.d_70_fastcgi.conf' => '/etc/apache2/modules.d/70_fastcgi.conf'
+							)
+							:
+							null,
 						'restart' => Array(
 							'rc-update add apache2 default',
 							'/etc/init.d/apache2 restart'
@@ -62,7 +68,49 @@ return Array(
 							'rc-update add lighttpd default',
 							'/etc/init.d/lighttpd restart'
 						)
-					)
+					),
+					'nginx' => Array(
+						'label' => 'Nginx Webserver',
+						'commands_1' => Array(
+							'emerge nginx',
+						),
+						'files' => Array(
+							'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
+							'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi'
+						),
+						'commands_2' => Array(
+							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							'mkdir -p ' . $settings['system']['deactivateddocroot'],
+							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod u+x /etc/init.d/php-fcgi'
+						),
+						'restart' => Array(
+							'/etc/init.d/nginx restart'
+						)
+					),
+                                        'nginx' => Array(
+                                                'label' => 'Nginx Webserver',
+                                                'commands_1' => Array(
+                                                        'emerge nginx',
+                                                ),
+                                                'files' => Array(
+                                                        'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
+                                                        'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi'
+                                                ),
+                                                'commands_2' => Array(
+                                                        'mkdir -p ' . $settings['system']['documentroot_prefix'],
+                                                        'mkdir -p ' . $settings['system']['logfiles_directory'],
+                                                        'mkdir -p ' . $settings['system']['deactivateddocroot'],
+                                                        'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+                                                        'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+                                                        'chmod u+x /etc/init.d/php-fcgi'
+                                                ),
+                                                'restart' => Array(
+                                                        '/etc/init.d/nginx restart'
+                                                )
+                                        )
 				)
 			),
 			'dns' => Array(

lib/configfiles/hardy.inc.php

@@ -34,6 +34,12 @@ return Array(
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 							'a2dismod userdir'
 						),
+						'files' => ((int)$settings['phpfpm']['enabled'] == 1) ?
+							Array(
+								'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf'
+							)
+							:
+							null,
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
 						)
@@ -62,6 +68,29 @@ return Array(
 						'restart' => Array(
 							'/etc/init.d/lighttpd restart'
 						)
+					),
+					'nginx' => Array(
+						'label' => 'Nginx Webserver',
+						'commands_1' => Array(
+							'apt-get install nginx php5-cgi',
+						),
+						'files' => Array(
+							'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
+							'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi'
+						),
+						'commands_2' => Array(
+							'rm /etc/nginx/sites-enabled/default',
+							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							//'mkdir -p ' . $settings['system']['deactivateddocroot'],
+							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod u+x /etc/init.d/php-fcgi'
+						),
+						'restart' => Array(
+							'/etc/init.d/php-fcgi start',
+							'/etc/init.d/nginx restart'
+						)
 					)
 				)
 			),

lib/configfiles/lenny.inc.php

@@ -34,6 +34,12 @@ return Array(
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 							'a2dismod userdir'
 						),
+						'files' => ((int)$settings['phpfpm']['enabled'] == 1) ?
+							Array(
+								'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf'
+							)
+							:
+							null,
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
 						),
@@ -62,6 +68,29 @@ return Array(
 						'restart' => Array(
 							'/etc/init.d/lighttpd restart'
 						)
+					),
+					'nginx' => Array(
+						'label' => 'Nginx Webserver',
+						'commands_1' => Array(
+							'apt-get install nginx php5-cgi',
+						),
+						'files' => Array(
+							'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
+							'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi'
+						),
+						'commands_2' => Array(
+							'rm /etc/nginx/sites-enabled/default',
+							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							//'mkdir -p ' . $settings['system']['deactivateddocroot'],
+							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod u+x /etc/init.d/php-fcgi'
+						),
+						'restart' => Array(
+							'/etc/init.d/php-fcgi start',
+							'/etc/init.d/nginx restart'
+						)
 					)
 				)
 			),

lib/configfiles/lucid.inc.php

@@ -34,6 +34,12 @@ return Array(
 							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
 							'a2dismod userdir'
 						),
+						'files' => ((int)$settings['phpfpm']['enabled'] == 1) ?
+							Array(
+								'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf'
+							)
+							:
+							null,
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
 						),
@@ -61,9 +67,32 @@ return Array(
 						),
 						'restart' => Array(
 							'/etc/init.d/lighttpd restart'
+						),
+					),
+					'nginx' => Array(
+						'label' => 'Nginx Webserver',
+						'commands_1' => Array(
+							'apt-get install nginx php5-cgi',
+						),
+						'files' => Array(
+							'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
+							'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi'
+						),
+						'commands_2' => Array(
+							'rm /etc/nginx/sites-enabled/default',
+							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							'mkdir -p ' . $settings['system']['deactivateddocroot'],
+							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod u+x /etc/init.d/php-fcgi'
+						),
+						'restart' => Array(
+							'/etc/init.d/php-fcgi start',
+							'/etc/init.d/nginx restart'
 						)
-					)
+					),
-				)
+				),
 			),
 			'dns' => Array(
 				'label' => $lng['admin']['configfiles']['dns'],

lib/configfiles_index.inc.php

@@ -45,6 +45,6 @@ else
 
 $cfgPath = 'lib/configfiles/';
 $configfiles = Array();
-$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'etch.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php');
+$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php');
 
 ?>

lib/functions/formfields/function.buildFormEx.php

@@ -17,6 +17,7 @@
 
 function buildFormEx($form, $part = '')
 {
+	global $settings;
 	$fields = '';
 
 	if(validateFormDefinition($form))
@@ -34,24 +35,42 @@ function buildFormEx($form, $part = '')
 			// only show one section
 			elseif($part != '' && ($groupname == $part || $part == 'all'))
 			{
-				if(isset($groupdetails['title']) && $groupdetails['title'] != '')
+				/**
+				 * this part checks for the 'websrv_avail' entry in the settings-array
+				 * if found, we check if the current webserver is in the array. If this
+				 * is not the case, we change the setting type to "hidden", #502
+				 */
+				$do_show = true;
+				if(isset($groupdetails['websrv_avail']) && is_array($groupdetails['websrv_avail']))
 				{
-					$fields .= getFormGroupOutput($groupname, $groupdetails);
+					$websrv = $settings['system']['webserver'];
-				}
+					if(!in_array($websrv, $groupdetails['websrv_avail']))
-				
-				if(validateFieldDefinition($groupdetails))
-				{
-					// Prefetch form fields
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
 					{
-						$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
+						$do_show = false;
-						$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
 					}
-	
+				}
-					// Collect form field output
+
-					foreach($groupdetails['fields'] as $fieldname => $fielddetails)
+				if($do_show)
+				{
+					if(isset($groupdetails['title']) && $groupdetails['title'] != '')
 					{
-						$fields .= getFormFieldOutput($fieldname, $fielddetails);
+						$fields .= getFormGroupOutput($groupname, $groupdetails);
+					}
+					
+					if(validateFieldDefinition($groupdetails))
+					{
+						// Prefetch form fields
+						foreach($groupdetails['fields'] as $fieldname => $fielddetails)
+						{
+							$groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails));
+							$form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname];
+						}
+		
+						// Collect form field output
+						foreach($groupdetails['fields'] as $fieldname => $fielddetails)
+						{
+							$fields .= getFormFieldOutput($fieldname, $fielddetails);
+						}
 					}
 				}
 			}

lib/functions/formfields/function.getFormFieldOutput.php

@@ -19,6 +19,8 @@
 
 function getFormFieldOutput($fieldname, $fielddata)
 {
+	global $settings;
+
 	$returnvalue = '';
 	if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldOutput' . ucfirst($fielddata['type'])))
 	{
@@ -44,7 +46,26 @@ function getFormFieldOutput($fieldname, $fielddata)
 				$fielddata['value'] = null;
 			}
 		}
-		$returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata);
+		
+		/**
+		 * this part checks for the 'websrv_avail' entry in the settings-array
+		 * if found, we check if the current webserver is in the array. If this
+		 * is not the case, we change the setting type to "hidden", #502
+		 */
+		$do_show = true;
+		if(isset($fielddata['websrv_avail']) && is_array($fielddata['websrv_avail']))
+		{
+			$websrv = $settings['system']['webserver'];
+			if(!in_array($websrv, $fielddata['websrv_avail']))
+			{
+				$do_show = false;
+			}
+		}
+
+		if($do_show)
+		{
+			$returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata);
+		}
 	}
 	return $returnvalue;
 }

lib/functions/formfields/function.getFormGroupOutput.php

@@ -71,6 +71,24 @@ function getFormOverviewGroupOutput($groupname, $groupdetails)
 		}
 	}
 
-	eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
+	/**
+	 * this part checks for the 'websrv_avail' entry in the settings-array
+	 * if found, we check if the current webserver is in the array. If this
+	 * is not the case, we change the setting type to "hidden", #502
+	 */
+	$do_show = true;
+	if(isset($groupdetails['websrv_avail']) && is_array($groupdetails['websrv_avail']))
+	{
+		$websrv = $settings['system']['webserver'];
+		if(!in_array($websrv, $groupdetails['websrv_avail']))
+		{
+			$do_show = false;
+		}
+	}	
+
+	if($do_show)
+	{
+		eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
+	}
 	return $group;
 }

lib/functions/froxlor/function.inserttask.php

@@ -43,8 +43,8 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '', $param4 = '
 	       && $param1 != ''
 	       && $param2 != ''
 	       && $param3 != ''
-	       && $param4 != '')
+	       && ($param4 == 0 || $param4 == 1)
-	{
+	) {
 		$data = Array();
 		$data['loginname'] = $param1;
 		$data['uid'] = $param2;

lib/functions/froxlor/function.isCustomerStdSubdomain.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ * @version    $Id$
+ */
+
+/*
+ * returns true or false whether a 
+ * given domain id is the std-subdomain
+ * of a customer
+ *
+ * @param	int		domain-id
+ *
+ * @return	boolean
+ */
+function isCustomerStdSubdomain($did = 0)
+{
+	global $db;
+
+	if($did > 0)
+	{
+		$result = $db->query_first("SELECT `customerid` FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `standardsubdomain` = '".(int)$did."'");
+		if(is_array($result) 
+			&& isset($result['customerid'])
+			&& $result['customerid'] > 0
+		) {
+			return true;
+		}
+	}
+	return false;
+}

lib/functions/froxlor/function.updateCounters.php

@@ -315,6 +315,11 @@ function updateCounters($returndebuginfo = false)
 			$admin_resources[$admin['adminid']]['email_autoresponder_used'] = 0;
 		}
 
+                if(!isset($admin_resources[$admin['adminid']]['email_autoresponder_used']))
+                {
+                        $admin_resources[$admin['adminid']]['email_autoresponder_used'] = 0;
+                }
+
 		$admin['email_autoresponder_used_new'] = $admin_resources[$admin['adminid']]['email_autoresponder_used'];
 
 		if(!isset($admin_resources[$admin['adminid']]['subdomains_used']))
@@ -322,6 +327,11 @@ function updateCounters($returndebuginfo = false)
 			$admin_resources[$admin['adminid']]['subdomains_used'] = 0;
 		}
 
+		if(!isset($admin_resources[$admin['adminid']]['aps_packages_used']))
+		{
+			$admin_resources[$admin['adminid']]['aps_packages_used'] = 0;
+		}
+
 		$admin['aps_packages_used_new'] = $admin_resources[$admin['adminid']]['aps_packages_used'];
 
 		if(!isset($admin_resources[$admin['adminid']]['aps_packages_used']))

lib/functions/validate/function.checkFcgidPhpFpm.php

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Functions
+ * @version    $Id$
+ */
+
+function checkFcgidPhpFpm($fieldname, $fielddata, $newfieldvalue, $allnewfieldvalues)
+{
+	global $settings;
+
+	$returnvalue = array(FORMFIELDS_PLAUSIBILITY_CHECK_OK);
+
+	/*
+	 * check whether fcgid should be enabled but php-fpm is
+	 */
+	if($fieldname == 'system_mod_fcgid_enabled'
+		&& (int)$newfieldvalue == 1
+		&& (int)$settings['phpfpm']['enabled'] == 1
+	) {
+		$returnvalue = array(FORMFIELDS_PLAUSIBILITY_CHECK_ERROR, 'phpfpmstillenabled');
+	}
+	/*
+	 * check whether php-fpm should be enabled but fcgid is
+	 */
+	elseif($fieldname == 'system_phpfpm_enabled'
+		&& (int)$newfieldvalue == 1
+		&& (int)$settings['system']['mod_fcgid'] == 1
+	) {
+		$returnvalue = array(FORMFIELDS_PLAUSIBILITY_CHECK_ERROR, 'fcgidstillenabled');
+	}
+
+	return $returnvalue;
+}

lib/init.php

@@ -183,7 +183,12 @@ if(!isset($settings['admin']['froxlor_graphic'])
  */
 
 $remote_addr = $_SERVER['REMOTE_ADDR'];
-$http_user_agent = $_SERVER['HTTP_USER_AGENT'];
+
+if (empty($_SERVER['HTTP_USER_AGENT'])) {
+	$http_user_agent = 'unknown';
+} else {
+	$http_user_agent = $_SERVER['HTTP_USER_AGENT'];
+}
 unset($userinfo);
 unset($userid);
 unset($customerid);

lib/navigation/00.froxlor.main.php

@@ -218,7 +218,14 @@ return array (
 				array (
 					'url' => 'admin_phpsettings.php?page=overview',
 					'label' => $lng['menue']['phpsettings']['maintitle'],
-					'show_element' => ( getSetting('system', 'mod_fcgid') == true ),
+					'show_element' => ( 
+						getSetting('system', 'mod_fcgid') == true 
+						/* 
+						 * @TODO activate if phpfpm knows custom php.ini files
+						 * 
+						 * || getSetting('phpfpm', 'enabled') == true
+						 */
+						),
 				),
 			),
 		),

lib/navigation/30.multiserver.php

@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Navigation
- * @version    $Id$
- */
-
-return array (
-	'admin' => array (
-		'multiserver' => array (
-			'label' => $lng['admin']['multiserver'],
-			'required_resources' => 'change_serversettings',
-			'show_element' => ( getSetting('multiserver', 'enabled') == true ),
-			'elements' => array (
-				array (
-					'url' => 'admin_clients.php?page=clients',
-					'label' => $lng['menue']['multiserver']['clients'],
-				)
-			)
-		)
-	)
-);

lib/tables.inc.php

@@ -71,7 +71,7 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.14';
+$version = '0.9.16';
 $dbversion = '2';
 $branding = '';
 

lng/english.lng.php

@@ -547,8 +547,8 @@ $lng['panel']['back'] = 'Back';
 
 $lng['serversettings']['mod_log_sql']['title'] = 'Temporary save logs in the database';
 $lng['serversettings']['mod_log_sql']['description'] = 'Use <a 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 href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - documentation">apache-configuration</a>!</b>';
-$lng['serversettings']['mod_fcgid']['title'] = 'Include PHP via mod_fcgid/suexec';
+$lng['serversettings']['mod_fcgid']['title'] = 'Enable FCGID';
-$lng['serversettings']['mod_fcgid']['description'] = 'Use mod_fcgid/suexec/libnss_mysql to run PHP with the corresponding useraccount.<br/><b>This needs a special webserver configuration, see <a href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a></b><br /><br /><div style="color:red">NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.</div>';
+$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 href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a></b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Use alternative email-address';
 $lng['serversettings']['sendalternativemail']['description'] = 'Send the password-email to a different address during email-account-creation';
 $lng['emails']['alternative_emailaddress'] = 'Alternative e-mail-address';
@@ -708,7 +708,7 @@ $lng['serversettings']['ticket']['noreply_name'] = 'Ticket e-mail sendername';
 // ADDED IN 1.2.19-svn1
 
 $lng['serversettings']['mod_fcgid']['configdir']['title'] = 'Configuration directory';
-$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Where should all fcgid-configuration files be stored? If you don\'t use a self compiled suexec binary, which is the normal situation, this path must be under /var/www/';
+$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Where should all fcgid-configuration files be stored? If you don\'t use a self compiled suexec binary, which is the normal situation, this path must be under /var/www/<br /><br /><div style="color:red">NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.</div>';
 $lng['serversettings']['mod_fcgid']['tmpdir']['title'] = 'Temp directory';
 
 // ADDED IN 1.2.19-svn3
@@ -1442,7 +1442,7 @@ $lng['admin']['perlenabled'] = 'Perl enabled';
 
 // ADDED IN FROXLOR 0.9.11-svn3
 $lng['serversettings']['perl_path']['title'] = 'Path to perl';
-$lng['serversettings']['perl_path']['description'] = 'Only relevant if you use lighttpd. Default is /usr/bin/perl';
+$lng['serversettings']['perl_path']['description'] = 'Default is /usr/bin/perl';
 
 // ADDED IN FROXLOR 0.9.12-svn1
 $lng['admin']['fcgid_settings'] = 'FCGID';
@@ -1453,7 +1453,7 @@ $lng['admin']['mod_fcgid_group'] = 'Local group to use for FCGID (Froxlor vHost)
 
 // ADDED IN FROXLOR 0.9.12-svn2
 $lng['admin']['perl_settings'] = 'Perl/CGI';
-$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Enable SuExec workaround (Apache only)';
+$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Enable SuExec workaround';
 $lng['serversettings']['perl']['suexecworkaround']['description'] = 'Enable only if customer docroots are not within the apache suexec path.<br />If enabled, Froxlor will generate a symlink from the customers perl-enabled directory + /cgi-bin/ to the given path.<br />Note that perl will then only work in the folders subdirectory /cgi-bin/ and not in the folder itself (as it does without this fix!)';
 $lng['serversettings']['perl']['suexeccgipath']['title'] = 'Path for customer perl-enabled directory symlinks';
 $lng['serversettings']['perl']['suexeccgipath']['description'] = 'You only need to set this if the SuExec-workaround is enabled.<br />ATTENTION: Be sure this path is within the suexec path or else this workaround is uselsess';
@@ -1511,4 +1511,39 @@ $lng['admin']['ipsandports']['docroot']['description'] = 'You can define a custo
 // ADDED IN FROXLOR 0.9.14-svn6
 $lng['serversettings']['login_domain_login'] = 'Allow login with domains';
 
-?>
+// ADDED IN FROXLOR 0.9.14
+$lng['panel']['unlock'] = 'unlock';
+$lng['question']['customer_reallyunlock'] = 'Do you really want to unlock customer %s?'; 
+
+// ADDED IN FROXLOR 0.9.15-svn1
+$lng['serversettings']['perl_server']['title'] = 'Perl server location';
+$lng['serversettings']['perl_server']['description'] = 'Default is set for using the guide found at: http://wiki.nginx.org/SimpleCGI';
+$lng['serversettings']['nginx_php_backend']['title'] = 'Nginx PHP backend';
+$lng['serversettings']['nginx_php_backend']['description'] = 'this is where the PHP process is listening for requests from nginx, can be a unix socket of ip:port combination';
+$lng['serversettings']['phpreload_command']['title'] = 'PHP reload command';
+$lng['serversettings']['phpreload_command']['description'] = 'this is used to reload the PHP backend if any is used<br />Default: blank';
+
+// ADDED IN FROXLOR 0.9.16
+$lng['error']['intvaluetoolow'] = 'The given number is too low (field %s)';
+$lng['error']['intvaluetoohigh'] = 'The given number is too high (field %s)';
+$lng['admin']['phpfpm_settings'] = 'PHP-FPM';
+$lng['serversettings']['phpfpm'] = 'Enable php-fpm';
+$lng['serversettings']['phpfpm_settings']['configdir'] = 'Configuration directory of php-fpm';
+$lng['serversettings']['phpfpm_settings']['reload'] = 'php-fpm restart command';
+$lng['serversettings']['phpfpm_settings']['pm'] = 'Process manager control (pm)';
+$lng['serversettings']['phpfpm_settings']['max_children']['title'] = 'The number of child processes';
+$lng['serversettings']['phpfpm_settings']['max_children']['description'] = 'The number of child processes to be created when pm is set to \'static\' and the maximum number of child processes to be created when pm is set to \'dynamic\'<br />Equivalent to the PHP_FCGI_CHILDREN';
+$lng['serversettings']['phpfpm_settings']['start_servers']['title'] = 'The number of child processes created on startup';
+$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\'';
+$lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'] = 'The desired minimum number of idle server processes';
+$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\'<br />Note: Mandatory when pm is set to \'dynamic\'';
+$lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'] = 'The desired maximum number of idle server processes';
+$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Note: Used only when pm is set to \'dynamic\'<br />Note: Mandatory when pm is set to \'dynamic\'';
+$lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests per child before respawning';
+$lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'For endless request processing specify \'0\'. Equivalent to PHP_FCGI_MAX_REQUESTS.';
+$lng['error']['phpfpmstillenabled'] = 'PHP-FPM is currently active. Please deactivate it before activating FCGID';
+$lng['error']['fcgidstillenabled'] = 'FCGID is currently active. Please deactivate it before activating PHP-FPM';
+$lng['phpfpm']['vhost_httpuser'] = 'Local user to use for PHP-FPM (Froxlor vHost)';
+$lng['phpfpm']['vhost_httpgroup'] = 'Local group to use for PHP-FPM (Froxlor vHost)';
+$lng['phpfpm']['ownvhost']['title'] = 'Enable PHP-FPM for the Froxlor vHost';
+$lng['phpfpm']['ownvhost']['description'] = 'If enabled, Froxlor will also be running under a local user';

lng/german.lng.php

@@ -547,7 +547,7 @@ $lng['panel']['back'] = 'Zurück';
 $lng['serversettings']['mod_log_sql']['title'] = 'Logs in Datenbank zwischenspeichern';
 $lng['serversettings']['mod_log_sql']['description'] = '<a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> benutzen um die Webzugriffe tempor&auml;r zu speichern<br /><b>Dies ben&ouml;tigt eine spezielle Apache-Konfiguration</b>';
 $lng['serversettings']['mod_fcgid']['title'] = 'PHP &uuml;ber mod_fcgid/suexec einbinden';
-$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen<br /><b>Dies ben&ouml;tigt eine spezielle <a href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - Dokumentation">Apache-Konfiguration</a></b><br /><br /><div style="color:red">ACHTUNG: Der Inhalt dieses Ordners wird regelm&auml;&szlig;ig geleert, daher sollten keinerlei Daten dort manuell abgelegt werden.</div>';
+$lng['serversettings']['mod_fcgid']['description'] = 'PHP unter dem jeweiligen Useraccount laufen lassen.<br /><br /><b>Dies ben&ouml;tigt eine spezielle Webserver-Konfiguration f&uuml;r Apache, siehe <a href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a>.</b>';
 $lng['serversettings']['sendalternativemail']['title'] = 'Alternative E-Mail-Adresse benutzen';
 $lng['serversettings']['sendalternativemail']['description'] = 'W&auml;hrend des Erstellens eines Accounts das Passwort an eine andere E-Mail-Adresse senden';
 $lng['emails']['alternative_emailaddress'] = 'Alternative E-Mail-Adresse';
@@ -578,7 +578,6 @@ $lng['serversettings']['mysql_access_host']['description'] = 'Eine durch Komma g
 // CHANGED IN 1.2.18
 
 $lng['serversettings']['mod_log_sql']['description'] = '<a href="http://www.outoforder.cc/projects/apache/mod_log_sql/" title="mod_log_sql">mod_log_sql</a> benutzen um die Webzugriffe tempor&auml;r zu speichern<br /><b>Dies ben&ouml;tigt eine spezielle <a href="http://files.froxlor.org/docs/mod_log_sql/" title="mod_log_sql - Dokumentation">Apache-Konfiguration</a></b>';
-$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen<br /><b>Dies ben&ouml;tigt eine spezielle Webserver-Konfiguration, siehe <a href="http://wiki.froxlor.org/contrib/fcgid-handbook">http://wiki.froxlor.org/contrib/fcgid-handbook</a>.</b>';
 
 // ADDED IN 1.2.18-svn1
 
@@ -712,7 +711,7 @@ $lng['serversettings']['ticket']['noreply_name'] = 'Ticket E-Mail Absendername';
 // ADDED IN 1.2.19-svn
 
 $lng['serversettings']['mod_fcgid']['configdir']['title'] = 'Konfigurations-Verzeichnis';
-$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Wo sollen alle Konfigurationsdateien von fcgid liegen? Wenn Sie keine selbst kompilierte suexec Binary benutzen, was in der Regel der Fall ist, muss dieser Pfad unter /var/www/ liegen.';
+$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Wo sollen alle Konfigurationsdateien von fcgid liegen? Wenn Sie keine selbst kompilierte suexec Binary benutzen, was in der Regel der Fall ist, muss dieser Pfad unter /var/www/ liegen.<br /><br /><div style="color:red">ACHTUNG: Der Inhalt dieses Ordners wird regelm&auml;&szlig;ig geleert, daher sollten keinerlei Daten dort manuell abgelegt werden.</div>';
 $lng['serversettings']['mod_fcgid']['tmpdir']['title'] = 'Tempor&auml;res Verzeichnis';
 
 // ADDED IN 1.2.19-svn3
@@ -1425,7 +1424,7 @@ $lng['admin']['perlenabled'] = 'Perl verf&uuml;gbar';
 
 // ADDED IN FROXLOR 0.9.11-svn3
 $lng['serversettings']['perl_path']['title'] = 'Pfad zu Perl';
-$lng['serversettings']['perl_path']['description'] = 'Nur n&ouml;tig f&uuml;r lighttpd-Nutzer. Standard ist /usr/bin/perl';
+$lng['serversettings']['perl_path']['description'] = 'Standard ist /usr/bin/perl';
 
 // ADDED IN FROXLOR 0.9.12-svn1
 $lng['admin']['fcgid_settings'] = 'FCGID';
@@ -1436,7 +1435,7 @@ $lng['admin']['mod_fcgid_group'] = 'Lokale Gruppe f&uuml;r FCGID (Froxlor Vhost)
 
 // ADDED IN FROXLOR 0.9.12-svn2
 $lng['admin']['perl_settings'] = 'Perl/CGI';
-$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Aktiviere SuExec Workaround (nur f&uuml;r Apache)';
+$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Aktiviere SuExec Workaround';
 $lng['serversettings']['perl']['suexecworkaround']['description'] = 'Aktivieren Sie den Workaround nur, wenn die Kunden-Heimatverzeichnisse sich nicht unterhalb des suexec-Pfades liegen.<br />Wenn aktiviert erstellt Froxlor eine Verkn&uuml;pfung des vom Kunden f&uuml;r Perl aktiviertem Pfad + /cgi-bin/ im angegebenen suexec-Pfad.<br />Bitte beachten Sie, dass Perl dann nur im Unterordner /cgi-bin/ des Kunden-Ordners funktioniert und nicht direkt in diesem Ordner (wie es ohne den Workaround w&auml;re!)';
 $lng['serversettings']['perl']['suexeccgipath']['title'] = 'Pfad f&uuml;r Verkn&uuml;pfungen zu Kunden-Perl-Verzeichnis';
 $lng['serversettings']['perl']['suexeccgipath']['description'] = 'Diese Einstellung wird nur ben&ouml;tigt, wenn der SuExec-Workaround aktiviert ist.<br />ACHTUNG: Stellen Sie sicher, dass sich der angegebene Pfad innerhalb des Suexec-Pfades befindet ansonsten ist der Workaround nutzlos';
@@ -1489,9 +1488,44 @@ $lng['admin']['ipsandports']['ssl_cert_chainfile'] = 'Pfad zu dem SSL Certificat
 
 // ADDED IN FROXLOR 0.9.14-svn5
 $lng['admin']['ipsandports']['docroot']['title'] = 'Benutzerdefinierter Docroot (leer = zeige auf Froxlor)';
-$lng['admin']['ipsandports']['docroot']['description'] = 'Hier kann ein benutzerdefinierter Document-Root (der Zeilordner f&uuml;r einen Zugriff) f&uuml;r diese IP/Port Kombination gesetzt werden.<br /><strong>ACHTUNG:</strong> Bitte &uuml;berlege vorher, welchen Pfad du hier angibst!';
+$lng['admin']['ipsandports']['docroot']['description'] = 'Hier kann ein benutzerdefinierter Document-Root (der Zielordner f&uuml;r einen Zugriff) f&uuml;r diese IP/Port Kombination gesetzt werden.<br /><strong>ACHTUNG:</strong> Bitte &uuml;berlege vorher, welchen Pfad du hier angibst!';
 
 // ADDED IN FROXLOR 0.9.14-svn6
 $lng['serversettings']['login_domain_login'] = 'Erlaube Anmeldung mit Domains';
 
-?>
+// ADDED IN FROXLOR 0.9.14
+$lng['panel']['unlock'] = 'entsperren';
+$lng['question']['customer_reallyunlock'] = 'Wollen Sie den Kunden %s wirklich entsperren?';
+
+// ADDED IN FROXLOR 0.9.15-svn1
+$lng['serversettings']['perl_server']['title'] = 'Perl Server Ort';
+$lng['serversettings']['perl_server']['description'] = 'Der Standardwert ist diesem Guide entnommen: http://wiki.nginx.org/SimpleCGI';
+$lng['serversettings']['nginx_php_backend']['title'] = 'Nginx PHP Backend';
+$lng['serversettings']['nginx_php_backend']['description'] = 'Dies ist das Backend, auf dem PHP auf Anfragen von Nginx h&ouml;rt. Kann ein UNIX Socket oder eine IP:Port Kombination sein';
+$lng['serversettings']['phpreload_command']['title'] = 'PHP Reload Befehl';
+$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird ben&ouml;tigt, um das PHP Backend bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)';
+
+// ADDED IN FROXLOR 0.9.16
+$lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld %s)';
+$lng['error']['intvaluetoohigh'] = 'Die angegebene Zahl ist zu gro&szlig; (Feld %s)';
+$lng['admin']['phpfpm_settings'] = 'PHP-FPM';
+$lng['serversettings']['phpfpm'] = 'Aktiviere php-fpm';
+$lng['serversettings']['phpfpm_settings']['configdir'] = 'Pfad zu php-fpm Konfigurationen';
+$lng['serversettings']['phpfpm_settings']['reload'] = 'Kommando zum Neustarten von php-fpm';
+$lng['serversettings']['phpfpm_settings']['pm'] = 'Prozess Manager Control (PM)';
+$lng['serversettings']['phpfpm_settings']['max_children']['title'] = 'Anzahl der Kind-Prozesse';
+$lng['serversettings']['phpfpm_settings']['max_children']['description'] = 'Die Anzahl der zu startenden Kind-Prozesse wenn PM auf \'static\' steht und die maximale Anzahl der Prozesse wenn PM auf \'dynamic\' steht.<br />Equivalent zu PHP_FCGI_CHILDREN';
+$lng['serversettings']['phpfpm_settings']['start_servers']['title'] = 'Anzahl der beim Starten zu erstellenden Kind-Prozesse';
+$lng['serversettings']['phpfpm_settings']['start_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht';
+$lng['serversettings']['phpfpm_settings']['min_spare_servers']['title'] = 'Mindestanzahl der Idle-Prozesse';
+$lng['serversettings']['phpfpm_settings']['min_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht<br />Wichtig: Pflichtangabe wenn PM auf \'dynamic\' steht';
+$lng['serversettings']['phpfpm_settings']['max_spare_servers']['title'] = 'Maximale Anzahl der Idle-Prozesse';
+$lng['serversettings']['phpfpm_settings']['max_spare_servers']['description'] = 'Hinweis: Nur wenn PM auf \'dynamic\' steht<br />Wichtig: Pflichtangabe wenn PM auf \'dynamic\' steht';
+$lng['serversettings']['phpfpm_settings']['max_requests']['title'] = 'Requests pro Kindprozess bevor Neuerstellung (respawning)';
+$lng['serversettings']['phpfpm_settings']['max_requests']['description'] = 'F&uuml;r keine Begrenzung \'0\' angeben. Equivalent zu PHP_FCGI_MAX_REQUESTS.';
+$lng['error']['phpfpmstillenabled'] = 'PHP-FPM ist derzeit aktiviert. Bitte deaktiviere es, um FCGID zu aktivieren';
+$lng['error']['fcgidstillenabled'] = 'FCGID ist derzeit aktiviert. Bitte deaktiviere es, um PHP-FPM zu aktivieren';
+$lng['phpfpm']['vhost_httpuser'] = 'Lokaler Benutzer f&uuml;r PHP-FPM (Froxlor Vhost)';
+$lng['phpfpm']['vhost_httpgroup'] = 'Lokale Gruppe f&uuml;r PHP-FPM (Froxlor Vhost)';
+$lng['phpfpm']['ownvhost']['title'] = 'Verwende PHP-FPM im Froxlor Vhost';
+$lng['phpfpm']['ownvhost']['description'] = 'Wenn verwendet, wird Froxlor selbst unter einem lokalem Benutzer ausgef&uuml;hrt';

lng/polish.lng.php

@@ -75,7 +75,7 @@ $lng['customer']['unlimited'] = 'bez limitu';
  * Customermenue
  */
 
-$lng['menue']['main']['main'] = 'Panel g&#322<EFBFBD>wny';
+$lng['menue']['main']['main'] = 'Panel g<EFBFBD><EFBFBD>wny';
 $lng['menue']['main']['changepassword'] = 'Zmie&#324 has&#322o';
 $lng['menue']['main']['changelanguage'] = 'Zmie&#324 j&#281zyk';
 $lng['menue']['email']['email'] = 'E-mail';
@@ -218,16 +218,16 @@ $lng['error']['errordocpathdupe'] = 'Option for path %s already exists';
 $lng['error']['adduserfirst'] = 'Prosz&#281 w pierwszej kolejno&#347ci utworzy&#263 klienta';
 $lng['error']['domainalreadyexists'] = 'The domain %s is already assigned to a customer';
 $lng['error']['nolanguageselect'] = 'Nie wybrano j&#281zyka.';
-$lng['error']['nosubjectcreate'] = 'Musisz zdefiniowa&#263 temat dla szablonu e-maila.';
+$lng['error']['nosubjectcreate'] = 'Musisz zdefiniowa<EFBFBD> temat dla szablonu e-maila.';
-$lng['error']['nomailbodycreate'] = 'Musisz zdefiniowa&#263 tre&#347&#263 dla szablonu e-maila.';
+$lng['error']['nomailbodycreate'] = 'Musisz zdefiniowa<EFBFBD> tre<72><65> dla szablonu e-maila.';
-$lng['error']['templatenotfound'] = 'Szablon nie zosta&#322 znaleziony.';
+$lng['error']['templatenotfound'] = 'Szablon nie zosta<EFBFBD> znaleziony.';
 $lng['error']['alltemplatesdefined'] = 'You cant define more templates, all languages are supported already.';
 $lng['error']['wwwnotallowed'] = 'www is not allowed for subdomains.';
 $lng['error']['subdomainiswrong'] = 'The subdomain %s contains invalid characters.';
-$lng['error']['domaincantbeempty'] = 'Nazwa domeny nie mo&#380e by&#263 pusta.';
+$lng['error']['domaincantbeempty'] = 'Nazwa domeny nie mo<EFBFBD>e by<62> pusta.';
-$lng['error']['domainexistalready'] = 'Domena %s ju&#380 istnieje.';
+$lng['error']['domainexistalready'] = 'Domena %s ju<EFBFBD> istnieje.';
 $lng['error']['domainisaliasorothercustomer'] = 'The selected alias domain is either itself an alias domain or belongs to another customer.';
-$lng['error']['emailexistalready'] = 'Adres e-mail %s ju&#380 istnieje.';
+$lng['error']['emailexistalready'] = 'Adres e-mail %s ju<EFBFBD> istnieje.';
 $lng['error']['maindomainnonexist'] = 'The main-domain %s does not exist.';
 $lng['error']['destinationnonexist'] = 'Please create your forwarder in the field \'Destination\'.';
 $lng['error']['destinationalreadyexistasmail'] = 'The forwarder to %s already exists as active EMail-Address.';
@@ -242,7 +242,7 @@ $lng['error']['domainname'] = $lng['domains']['domainname'];
 $lng['question']['question'] = 'Pytanie bezpiecze&#324stwa';
 $lng['question']['admin_customer_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 klienta %s? Ta czynno&#347&#263 jest niedwracalna!';
 $lng['question']['admin_domain_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 domen&#281 %s?';
-$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Czy na pewno chcesz deaktywowa&#263 ustawienia bezpiecze&#324stwa (OpenBasedir i/lub SafeMode)?';
+$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Czy na pewno chcesz deaktywowa<EFBFBD> ustawienia bezpiecze<EFBFBD>stwa (OpenBasedir i/lub SafeMode)?';
 $lng['question']['admin_admin_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 administratora %s? Wszystcy klienci i domeny zostan&#261 przypisani do Twojego konta.';
 $lng['question']['admin_template_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 szablon \'%s\'?';
 $lng['question']['domains_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 domen&#281 %s?';
@@ -254,7 +254,6 @@ $lng['question']['extras_reallydelete_pathoptions'] = 'Do you really want to del
 $lng['question']['ftp_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 konto FTP %s?';
 $lng['question']['mysql_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 baz&#281 danych %s? Ta czynno&#347&#263 jest niedwracalna!';
 $lng['question']['admin_configs_reallyrebuild'] = 'Czy napewno chcesz przebudowa&#263 pliki konfiguracyjne Apacha i Binda?';
-$lng['question']['admin_customer_alsoremovefiles'] = 'Remove user files too?';
 
 /**
  * Mails
@@ -329,27 +328,27 @@ $lng['admin']['webserver'] = 'Webserwer';
  */
 
 $lng['serversettings']['session_timeout']['title'] = 'Timeout Sesji';
-$lng['serversettings']['session_timeout']['description'] = 'jak d&#322ugo u&#380ytkownik mo&#380e by&#263 nieaktywny przed automatycznym wylogowaniem (sekund)?';
+$lng['serversettings']['session_timeout']['description'] = 'jak d<EFBFBD>ugo u<>ytkownik mo<6D>e by<62> nieaktywny przed automatycznym wylogowaniem (sekund)?';
 $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']['ftpprefix']['title'] = 'FTP Prefix';
 $lng['serversettings']['ftpprefix']['description'] = 'Which prefix should ftp accounts have?';
-$lng['serversettings']['documentroot_prefix']['title'] = 'Katalog domowy';
+$lng['serversettings']['documentroot_prefix']['title'] = 'Home directory';
-$lng['serversettings']['documentroot_prefix']['description'] = 'Gdzie powinny by&#263 przechowywane wszystkie katalogi domowe?';
+$lng['serversettings']['documentroot_prefix']['description'] = 'Where should all home directories be stored?';
-$lng['serversettings']['logfiles_directory']['title'] = 'Katalog z logami';
+$lng['serversettings']['logfiles_directory']['title'] = 'Logfiles directory';
-$lng['serversettings']['logfiles_directory']['description'] = 'Gdzie powinny by&#263 przechowywane wszystkie logi?';
+$lng['serversettings']['logfiles_directory']['description'] = 'Where should all log files be stored?';
 $lng['serversettings']['ipaddress']['title'] = 'Adres IP';
 $lng['serversettings']['ipaddress']['description'] = 'Jaki jest adres IP tego serwera?';
 $lng['serversettings']['hostname']['title'] = 'Hostname';
 $lng['serversettings']['hostname']['description'] = 'Jaki jest Hostname serwera?';
-$lng['serversettings']['apachereload_command']['title'] = 'Komenda prze<7A>adowania Apache';
+$lng['serversettings']['apachereload_command']['title'] = 'Apache reload command';
-$lng['serversettings']['apachereload_command']['description'] = 'Jaka jest komenda, do prze<7A>adowania plik<69>w konfiguracyjnych Apacha?';
+$lng['serversettings']['apachereload_command']['description'] = 'What\'s the apache command to reload apache configfiles?';
-$lng['serversettings']['bindconf_directory']['title'] = 'Katalog z konfiguracj<63> Bunda';
+$lng['serversettings']['bindconf_directory']['title'] = 'Bind config directory';
-$lng['serversettings']['bindconf_directory']['description'] = 'Gdzie maja by<62> zapisywane pliki konfiguracyjne dla Binda?';
+$lng['serversettings']['bindconf_directory']['description'] = 'Where should bind configfiles be saved?';
-$lng['serversettings']['bindreload_command']['title'] = 'Komenda prze<7A>adowania Binda';
+$lng['serversettings']['bindreload_command']['title'] = 'Bind reload command';
-$lng['serversettings']['bindreload_command']['description'] = 'Jaka jest komenda, do prze<7A>adowania plik<69>w konfiguracyjnych Binda?';
+$lng['serversettings']['bindreload_command']['description'] = 'What\'s the bind command to reload bind configfiles?';
 $lng['serversettings']['binddefaultzone']['title'] = 'Bind default zone';
 $lng['serversettings']['binddefaultzone']['description'] = 'What\'s the name of the default zone?';
 $lng['serversettings']['vmail_uid']['title'] = 'Mails-UID';
@@ -357,20 +356,20 @@ $lng['serversettings']['vmail_uid']['description'] = 'Which UserID should mails
 $lng['serversettings']['vmail_gid']['title'] = 'Mails-GID';
 $lng['serversettings']['vmail_gid']['description'] = 'Which GroupID should mails have?';
 $lng['serversettings']['vmail_homedir']['title'] = 'Katalog domowy e-maili';
-$lng['serversettings']['vmail_homedir']['description'] = 'Gdzie maj&#261 by&#263 sk&#322adowane wiadomo&#347ci e-mail?';
+$lng['serversettings']['vmail_homedir']['description'] = 'Gdzie maj<EFBFBD> by<62> sk<73>adowane wiadomo<EFBFBD>ci e-mail?';
 $lng['serversettings']['adminmail']['title'] = 'Nadawca';
-$lng['serversettings']['adminmail']['description'] = 'Jaki jest adres nadawcy dla wiadomo&#347ci wysy&#322anych z panelu?';
+$lng['serversettings']['adminmail']['description'] = 'Jaki jest adres nadawcy dla wiadomo<EFBFBD>ci wysy<EFBFBD>anych z panelu?';
 $lng['serversettings']['phpmyadmin_url']['title'] = 'URL do phpMyAdmina';
-$lng['serversettings']['phpmyadmin_url']['description'] = 'Jaki jest adres URL do phpMyAdmina? (Musi si&#281 rozpoczyna&#263 do http(s)://)';
+$lng['serversettings']['phpmyadmin_url']['description'] = 'What\'s the URL to phpMyAdmin? (has to start with http(s)://)';
-$lng['serversettings']['webmail_url']['title'] = 'URL do WebMaila';
+$lng['serversettings']['webmail_url']['title'] = 'WebMail URL';
-$lng['serversettings']['webmail_url']['description'] = 'Jaki jest adres URL do WebMaila? (Musi si&#281 rozpoczyna&#263 do http(s)://)';
+$lng['serversettings']['webmail_url']['description'] = 'What\'s the URL to WebMail? (has to start with http(s)://)';
-$lng['serversettings']['webftp_url']['title'] = 'URL do WebFTPa';
+$lng['serversettings']['webftp_url']['title'] = 'WebFTP URL';
-$lng['serversettings']['webftp_url']['description'] = 'Jaki jest adres URL do WebFTPa? (Musi si&#281 rozpoczyna&#263 do http(s)://)';
+$lng['serversettings']['webftp_url']['description'] = 'What\'s the URL to  WebFTP? (has to start with http(s)://)';
-$lng['serversettings']['language']['description'] = 'Jaki jest standardowy j&#281zyk serwera?';
+$lng['serversettings']['language']['description'] = 'What\'s your standard server language?';
-$lng['serversettings']['maxloginattempts']['title'] = 'Maksymalna ilo<6C><6F> pr<70>b logowania';
+$lng['serversettings']['maxloginattempts']['title'] = 'Max Login Attempts';
 $lng['serversettings']['maxloginattempts']['description'] = 'Maximum login attempts after which the account gets deactivated.';
 $lng['serversettings']['deactivatetime']['title'] = 'Czas zablokowania';
-$lng['serversettings']['deactivatetime']['description'] = 'Czas (sek.) zablokowania dost&#281pu do konta po nieudanym logowaniu.';
+$lng['serversettings']['deactivatetime']['description'] = 'Czas (sek.) zablokowania dost<EFBFBD>pu do konta po nieudanym logowaniu.';
 $lng['serversettings']['pathedit']['title'] = 'Type of path input';
 $lng['serversettings']['pathedit']['description'] = 'Should a path be selected by a dropdown menu or by an input field?';
 $lng['serversettings']['nameservers']['title'] = 'Serwery Nazw (Nameserwery)';
@@ -382,7 +381,7 @@ $lng['serversettings']['mxservers']['description'] = 'A comma seperated list con
  * CHANGED BETWEEN 1.2.12 and 1.2.13
  */
 
-$lng['mysql']['description'] = 'W tym miejscu mo&#380esz tworzy&#263 i zmienia&#263 Twoje bazy MySQL.<br />The changes are made instantly and the database can be used immediately.<br />At the menu on the left side you find the tool phpMyAdmin with which you can easily administer your database.<br /><br />To use your databases in your own php-scripts use the following settings: (The data in <i>italics</i> have to be changed into the equivalents you typed in!)<br />Hostname: <b><SQL_HOST></b><br />Username: <b><i>Databasename</i></b><br />Password: <b><i>the password you\'ve chosen</i></b><br />Database: <b><i>Databasename</i></b>';
+$lng['mysql']['description'] = 'W tym miejscu mo<EFBFBD>esz tworzy<EFBFBD> i zmienia<EFBFBD> Twoje bazy MySQL.<br />The changes are made instantly and the database can be used immediately.<br />At the menu on the left side you find the tool phpMyAdmin with which you can easily administer your database.<br /><br />To use your databases in your own php-scripts use the following settings: (The data in <i>italics</i> have to be changed into the equivalents you typed in!)<br />Hostname: <b><SQL_HOST></b><br />Username: <b><i>Databasename</i></b><br />Password: <b><i>the password you\'ve chosen</i></b><br />Database: <b><i>Databasename</i></b>';
 
 /**
  * ADDED BETWEEN 1.2.12 and 1.2.13
@@ -396,9 +395,9 @@ $lng['error']['cantdeletesystemip'] = 'You cannot delete the last system IP, eit
 $lng['error']['myipaddress'] = '\'IP\'';
 $lng['error']['myport'] = '\'Port\'';
 $lng['error']['myipdefault'] = 'You need to select an IP/Port combination that should become default.';
-$lng['error']['myipnotdouble'] = 'Kombinacja IP/Port ju&#380 istnieje.';
+$lng['error']['myipnotdouble'] = 'Kombinacja IP/Port ju<EFBFBD> istnieje.';
 $lng['error']['admin_domain_emailsystemhostname'] = 'Sorry. You can not use the Server Hostname as email domain';
-$lng['question']['admin_ip_reallydelete'] = 'Czy na pewno chcesz skasowa&#263 adres IP %s?';
+$lng['question']['admin_ip_reallydelete'] = 'Czy na pewno chcesz skasowa<EFBFBD> adres IP %s?';
 $lng['admin']['ipsandports']['ipsandports'] = 'IP i Porty';
 $lng['admin']['ipsandports']['add'] = 'Dodaj IP/Port';
 $lng['admin']['ipsandports']['edit'] = 'Edytuj IP/Port';
@@ -534,7 +533,7 @@ $lng['admin']['configfiles']['choosedaemon'] = '-- Wybierz daemona --';
 // ADDED IN 1.2.16-svn10
 
 $lng['serversettings']['ftpdomain']['title'] = 'konta FTP @domena';
-$lng['serversettings']['ftpdomain']['description'] = 'Klienci mog&#261 tworzy&#263 konta FTP uzytkownik@domenaklienta?';
+$lng['serversettings']['ftpdomain']['description'] = 'Klienci mog<EFBFBD> tworzy<EFBFBD> konta FTP uzytkownik@domenaklienta?';
 $lng['panel']['back'] = 'Back';
 
 // ADDED IN 1.2.16-svn12
@@ -582,9 +581,9 @@ $lng['admin']['ipsandports']['create_vhostcontainer_servername_statement'] = 'Cr
 $lng['admin']['webalizersettings'] = 'Usttawienia Webalizera';
 $lng['admin']['webalizer']['normal'] = 'Normalny';
 $lng['admin']['webalizer']['quiet'] = 'Cichy';
-$lng['admin']['webalizer']['veryquiet'] = 'Bez danych wyj&#347cia';
+$lng['admin']['webalizer']['veryquiet'] = 'Bez danych wyj<EFBFBD>cia';
-$lng['serversettings']['webalizer_quiet']['title'] = 'Dane wyj&#347cia Webalizera';
+$lng['serversettings']['webalizer_quiet']['title'] = 'Dane wyj<EFBFBD>cia Webalizera';
-$lng['serversettings']['webalizer_quiet']['description'] = 'Gadatliwo&#347&#263 programu Webalizer';
+$lng['serversettings']['webalizer_quiet']['description'] = 'Gadatliwo<EFBFBD><EFBFBD> programu Webalizer';
 
 // ADDED IN 1.2.18-svn3
 
@@ -597,7 +596,7 @@ $lng['menue']['ticket']['archive'] = 'Archiwum zg&#322osze&#324';
 $lng['ticket']['description'] = 'Here you can send help-requests to your responsible administrator.<br />Notifications will be sent via e-mail.';
 $lng['ticket']['ticket_new'] = 'Utw<74>rz nowe zg&#322oszenie';
 $lng['ticket']['ticket_reply'] = 'Odpowied&#378 na zg&#322oszenie';
-$lng['ticket']['ticket_reopen'] = 'Ponownie otw<74>rz zg&#322oszenie';
+$lng['ticket']['ticket_reopen'] = 'Ponownie otw<74>rz zg<EFBFBD>oszenie';
 $lng['ticket']['ticket_newcateory'] = 'Utw<74>rz now&#261 kategori&#281';
 $lng['ticket']['ticket_editcateory'] = 'Edytuj kategori&#281';
 $lng['ticket']['ticket_view'] = 'View ticketcourse';
@@ -627,7 +626,7 @@ $lng['ticket']['reopen'] = 'Ponownie otw
 $lng['ticket']['archive'] = 'Zarchiwizuj';
 $lng['ticket']['ticket_delete'] = 'Kasuj zg&#322oszenie';
 $lng['ticket']['lastarchived'] = 'Recently archived tickets';
-$lng['ticket']['archivedtime'] = 'Zarchiwizowano';
+$lng['ticket']['archivedtime'] = 'Archived';
 $lng['ticket']['open'] = 'Otwarte';
 $lng['ticket']['wait_reply'] = 'czeka na odpowiedz';
 $lng['ticket']['replied'] = 'Replied';
@@ -635,9 +634,9 @@ $lng['ticket']['closed'] = 'Zamkni&#281te';
 $lng['ticket']['staff'] = 'Dzia&#322 pomocy technicznej';
 $lng['ticket']['customer'] = 'Klient';
 $lng['ticket']['old_tickets'] = 'Ticket messages';
-$lng['ticket']['search'] = 'Przeszukaj archiwum';
+$lng['ticket']['search'] = 'Search archive';
 $lng['ticket']['nocustomer'] = 'Nie wybrano';
-$lng['ticket']['archivesearch'] = 'Wynik przeszukiwania archiwum';
+$lng['ticket']['archivesearch'] = 'Archive searchresults';
 $lng['ticket']['noresults'] = 'Nie znaleziono zg&#322osze&#324';
 $lng['ticket']['notmorethanxopentickets'] = 'Due to spam-protection you cannot have more than %s open tickets';
 $lng['ticket']['supportstatus'] = 'Status wsparcia technicznego';
@@ -690,7 +689,7 @@ $lng['customer']['tickets'] = 'Zg&#322oszenia wsparcia technicznego';
 
 $lng['admin']['domain_nocustomeraddingavailable'] = 'Nie jest mo&#380liwe, by doda&#263 teraz domen&#281. W pierwszej kolejno&#347ci trzeba doda&#263 klienta.';
 $lng['serversettings']['ticket']['enable'] = 'Wspracie techniczne w&#322&#261czone';
-$lng['serversettings']['ticket']['concurrentlyopen'] = 'Ile zg&#322osze&#324 mo&#380e by&#263 otwartych w jednym czasie?';
+$lng['serversettings']['ticket']['concurrentlyopen'] = 'Ile zg<EFBFBD>osze<EFBFBD> mo<6D>e by<62> otwartych w jednym czasie?';
 $lng['error']['norepymailiswrong'] = 'The &quot;Noreply-address&quot; is wrong. Only a valid email-address is allowed.';
 $lng['error']['tadminmailiswrong'] = 'The &quot;Ticketadmin-address&quot; is wrong. Only a valid email-address is allowed.';
 $lng['ticket']['awaitingticketreply'] = 'Masz %s zg&#322osze&#324 do pomocy technicznej';
@@ -710,7 +709,7 @@ $lng['serversettings']['mod_fcgid']['tmpdir'] = 'Katalog plik
 $lng['serversettings']['ticket']['reset_cycle'] = 'Okresowe reset licznika u&#380ycia zg&#322osze&#324 pomocy technicznej';
 $lng['serversettings']['ticket']['reset_cycle_desc'] = 'Resetowanie zg&#322osze&#324 pomocy technicznej powoduje ustawienie licznika na warto&#347&#263 0 przy ka&#380dym cyklu';
 $lng['admin']['tickets']['daily'] = 'Dziennie';
-$lng['admin']['tickets']['weekly'] = 'Tygodniowo';
+$lng['admin']['tickets']['weekly'] = 'Wygodniowo';
 $lng['admin']['tickets']['monthly'] = 'Miesi&#281cznie';
 $lng['admin']['tickets']['yearly'] = 'Rocznie';
 $lng['error']['ticketresetcycleiswrong'] = 'The cycle for ticket-resets has to be "daily", "weekly", "monthly" or "yearly".';
@@ -766,7 +765,7 @@ $lng['logger']['truncate'] = 'Wyszy&#347&#263 logi';
 
 // ADDED IN 1.2.19-svn7
 
-$lng['serversettings']['ssl']['use_ssl'] = 'U&#380yj SSL';
+$lng['serversettings']['ssl']['use_ssl'] = 'U<EFBFBD>yj SSL';
 $lng['serversettings']['ssl']['ssl_cert_file'] = 'Gdzie jest zlokalizowany Certyfikat';
 $lng['serversettings']['ssl']['openssl_cnf'] = 'Standardowe dane do tworzenia pliku certyfikatu';
 $lng['panel']['reseller'] = 'reseller';
@@ -776,7 +775,7 @@ $lng['error']['nomessagetosend'] = 'Nie wprowadzono wiadomo&#347ci.';
 $lng['error']['noreceipientsgiven'] = 'Nie wprowadzono &#380adnego odbiorcy';
 $lng['admin']['emaildomain'] = 'Emaildomain';
 $lng['admin']['email_only'] = 'Only email?';
-$lng['admin']['wwwserveralias'] = 'Doda&#263 &quot;www.&quot; ServerAlias';
+$lng['admin']['wwwserveralias'] = 'Doda<EFBFBD> &quot;www.&quot; ServerAlias';
 $lng['admin']['ipsandports']['enable_ssl'] = 'Is this an SSL Port?';
 $lng['admin']['ipsandports']['ssl_cert_file'] = 'Path to the SSL Certificate';
 $lng['panel']['send'] = 'send';
@@ -825,6 +824,8 @@ $lng['error']['cannotuseawstatsandwebalizeratonetime'] = 'You cannot enable Weba
 $lng['serversettings']['webalizer_enabled'] = 'Enable webalizer statistics';
 $lng['serversettings']['awstats_enabled'] = 'Enable awstats statistics';
 $lng['admin']['awstatssettings'] = 'Ustawienia Awstats';
+$lng['serversettings']['awstats_domain_file']['title'] = 'Awstats domainfiles directory';
+$lng['serversettings']['awstats_model_file']['title'] = 'Awstats model file';
 
 // ADDED IN 1.2.19-svn16
 
@@ -868,8 +869,15 @@ $lng['pwdreminder']['success'] = 'Password reset successfully.<br />You now shou
 
 // ADDED IN 1.2.19-svn18
 
-$lng['serversettings']['allow_preset'] = 'Zezwalaj na resetowanie has&#322a przez klient<6E>w';
+$lng['serversettings']['allow_preset'] = 'Allow password reset by customers';
-$lng['pwdreminder']['notallowed'] = 'Resetowanie has&#322a jest nieaktywne';
+$lng['pwdreminder']['notallowed'] = 'Password reset is deactivated';
+
+// ADDED IN 1.2.19-svn20
+
+$lng['serversettings']['awstats_path']['title'] = 'Path to awstats cgi-bin folder';
+$lng['serversettings']['awstats_path']['description'] = 'e.g. /usr/share/webapps/awstats/6.1/webroot/cgi-bin/';
+$lng['serversettings']['awstats_updateall_command']['title'] = 'Path to &quot;awstats_updateall.pl&quot;';
+$lng['serversettings']['awstats_updateall_command']['description'] = 'e.g. /usr/bin/awstats_updateall.pl';
 
 // ADDED IN 1.2.19-svn21
 
@@ -895,18 +903,18 @@ $lng['domains']['topleveldomain'] = 'Top-Level-Domain';
 
 // ADDED IN 1.2.19-svn22
 
-$lng['serversettings']['allow_password_reset']['description'] = 'Klienci mog&#261 zresetowa&#263 has&#322o, a nowe has&#322o zostanie wys&#322ane na ich adres e-mail';
+$lng['serversettings']['allow_password_reset']['description'] = 'Customers can reset their password and a new password will be sent to their e-mail address';
-$lng['serversettings']['allow_password_reset_admin']['title'] = 'Zezwalaj na resetowanie has&#322a przez administrator<6F>w';
+$lng['serversettings']['allow_password_reset_admin']['title'] = 'Allow password reset by admins';
-$lng['serversettings']['allow_password_reset_admin']['description'] = 'Administratorzy/Resellerzy mog&#261 resetowa&#263 has&#322o, a nowe has&#322o zostanie wys&#322ane na ich adres e-mail';
+$lng['serversettings']['allow_password_reset_admin']['description'] = 'Admins/reseller can reset their password and a new password will be sent to their e-mail address';
 
 // ADDED IN 1.2.19-svn25
 
 $lng['emails']['quota'] = 'Quota';
-$lng['emails']['noquota'] = 'Brak quoty';
+$lng['emails']['noquota'] = 'No quota';
-$lng['emails']['updatequota'] = 'Aktualizuj Quot&#281';
+$lng['emails']['updatequota'] = 'Update Quota';
-$lng['serversettings']['mail_quota']['title'] = 'Quota skrzynki pocztowej';
+$lng['serversettings']['mail_quota']['title'] = 'Mailbox-quota';
-$lng['serversettings']['mail_quota']['description'] = 'Standardowa quota dla nowoutworzonych skrzynek pocztowych (MegaBajty).';
+$lng['serversettings']['mail_quota']['description'] = 'The default quota for a new created mailboxes (MegaByte).';
-$lng['serversettings']['mail_quota_enabled']['title'] = 'U&#380yj Quoty skrzynek pocztowych dla klient<6E>w';
+$lng['serversettings']['mail_quota_enabled']['title'] = 'Use mailbox-quota for customers';
 $lng['serversettings']['mail_quota_enabled']['description'] = 'Activate to use quotas on mailboxes. Default is <b>No</b> since this requires a special setup.';
 $lng['serversettings']['mail_quota_enabled']['removelink'] = 'Click here to wipe all quotas for mail accounts.';
 $lng['serversettings']['mail_quota_enabled']['enforcelink'] = 'Click here to enforce default quota to all User mail accounts.';
@@ -941,7 +949,7 @@ $lng['error']['autoresponderalreadyexists'] = 'There is already an autoresponder
 $lng['error']['invalidautoresponder'] = 'The given account is invalid.';
 $lng['serversettings']['autoresponder_active']['title'] = 'U&#380yj modu&#322u autorespondera';
 $lng['serversettings']['autoresponder_active']['description'] = 'Do you want to use the autoresponder module?';
-$lng['admin']['security_settings'] = 'Opcje bezpiecze&#324stwa';
+$lng['admin']['security_settings'] = 'Security Options';
 $lng['admin']['know_what_youre_doing'] = 'Zmie&#324 TYLKO je&#347li wiesz co robisz!';
 $lng['admin']['show_version_login']['title'] = 'Pokazuj wersj&#281 Froxlora przy logowaniu';
 $lng['admin']['show_version_login']['description'] = 'Pokazuj wersj&#281 Froxlora w stopce struno logowania';
@@ -1136,29 +1144,29 @@ $lng['aps']['allpackages'] = 'All Packages';
 $lng['question']['reallyremovepackages'] = '<strong>Do you really want to delete these packages?</strong><br/><br/>Packages with dependencies can only be remove if the corresponding Instances have been removed!<br/><br/>';
 $lng['aps']['nopackagesinsystem'] = 'There were no packages installed in the system which could be managed.';
 $lng['aps']['packagenameandstatus'] = 'Packagename &amp; Status';
-$lng['aps']['activate_aps']['title'] = 'Instalator aplikacji w&#322&#261czony';
+$lng['aps']['activate_aps']['title'] = 'Enable APS Installer';
 $lng['aps']['activate_aps']['description'] = 'Here the APS Installer can be enabled and disabled globaly.';
-$lng['aps']['packages_per_page']['title'] = 'Paczek na stronie';
+$lng['aps']['packages_per_page']['title'] = 'Packages per page';
 $lng['aps']['packages_per_page']['description'] = 'How many packages should be displayed per page for customers?';
-$lng['aps']['upload_fields']['title'] = 'Ilo&#347&#263 p<>l Uploadu na stronie';
+$lng['aps']['upload_fields']['title'] = 'Upload fields per page';
 $lng['aps']['upload_fields']['description'] = 'How many upload fields should be displayed on the page to install new packages in the system?';
 $lng['aps']['exceptions']['title'] = 'Exceptions for Package validation';
 $lng['aps']['exceptions']['description'] = 'Some packages need special configuration parameters or modules. The Installer cannot always determine if this options/extensions are available. For this reason you can now define exceptions that packages can be installed in the system. Do only select options which match your real configuration setup. For further information about this problem look into the handbook for this module.';
-$lng['aps']['settings_php_extensions'] = 'Rozszerzenia PHP';
+$lng['aps']['settings_php_extensions'] = 'PHP-Extensions';
-$lng['aps']['settings_php_configuration'] = 'Konfiguracja PHP';
+$lng['aps']['settings_php_configuration'] = 'PHP-Configuration';
-$lng['aps']['settings_webserver_modules'] = 'Modu&#322y Webserwera';
+$lng['aps']['settings_webserver_modules'] = 'Webserver modules';
 $lng['aps']['settings_webserver_misc'] = 'Webserver miscellaneous';
 $lng['aps']['specialoptions'] = 'Special options';
-$lng['aps']['removeunused'] = 'Usu&#324 nieuzywane paczki';
+$lng['aps']['removeunused'] = 'Remove unused packages';
 $lng['aps']['enablenewest'] = 'Enabled newest version of package, lock others';
-$lng['aps']['installations'] = 'Instalacje';
+$lng['aps']['installations'] = 'Installations';
-$lng['aps']['statistics'] = 'Statystyki';
+$lng['aps']['statistics'] = 'Statistics';
 $lng['aps']['numerofpackagesinstalled'] = '%s Packages installed<br/>';
 $lng['aps']['numerofpackagesenabled'] = '%s Packages enabled<br/>';
 $lng['aps']['numerofpackageslocked'] = '%s Packages locked<br/>';
 $lng['aps']['numerofinstances'] = '%s Instances installed<br/>';
 $lng['question']['reallydoaction'] = '<strong>Do you really want to execute the selected actions?</strong><br/><br/>Data which can be lost by continuing, cannot be restored later.<br/><br/>';
-$lng['aps']['linktolicense'] = 'Link do licencji';
+$lng['aps']['linktolicense'] = 'Link to license';
 $lng['aps']['initerror_customer'] = 'There is currently a problem with this Froxlor extension. Contact your administrator for further information.';
 $lng['aps']['numerofinstances'] = '%s Installations at all<br/>';
 $lng['aps']['numerofinstancessuccess'] = '%s successful Installations<br/>';
@@ -1183,11 +1191,11 @@ $lng['error']['admindoesntexist'] = 'The admin you have chosen doesn\'t exist.';
 
 $lng['serversettings']['system_realtime_port']['title'] = 'Port for realtime Froxlor';
 $lng['serversettings']['system_realtime_port']['description'] = 'Froxlor connects to this port at localhost everytime a new cron task is scheduled. If value is 0 (zero), this feature is disabled.<br />See also: <a href="https://wiki.froxlor.org/contrib/realtime">Make Froxlor work in realtime (Froxlor Wiki)</a>';
-$lng['serversettings']['session_allow_multiple_login']['title'] = 'Zezwalaj na jednoczesne logowanie';
+$lng['serversettings']['session_allow_multiple_login']['title'] = 'Allow multiple login';
-$lng['serversettings']['session_allow_multiple_login']['description'] = 'Je&#347li jest zaznaczone u&#380ytkownik mo&#380e zalogowa&#263 si&#281 jednocze&#347cie, wiele razy.';
+$lng['serversettings']['session_allow_multiple_login']['description'] = 'If activated a user could login multiple times.';
-$lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Zezwalaj na przenoszenie domen pomi&#281dzy administratorami';
+$lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Allow moving domains between admins';
 $lng['serversettings']['panel_allow_domain_change_admin']['description'] = 'If activated you can change the admin of a domain at domainsettings.<br /><b>Attention:</b> If a customer isn\'t assigned to the same admin as the domain, the admin can see every other domain of that customer!';
-$lng['serversettings']['panel_allow_domain_change_customer']['title'] = 'Zezwalaj na przenoszenie domen pomi&#281dzy klientami';
+$lng['serversettings']['panel_allow_domain_change_customer']['title'] = 'Allow moving domains between customers';
 $lng['serversettings']['panel_allow_domain_change_customer']['description'] = 'If activated you can change the customer of a domain at domainsettings.<br /><b>Attention:</b> Froxlor won\'t change any paths. This could render a domain unusable!';
 $lng['domains']['associated_with_domain'] = 'Associated';
 $lng['domains']['aliasdomains'] = 'Alias domains';
@@ -1204,17 +1212,17 @@ $lng['serversettings']['mod_fcgid']['maxrequests']['title'] = 'Maximum Requests
 $lng['serversettings']['mod_fcgid']['maxrequests']['description'] = 'How many requests should be allowed per domain?';
 
 // fix bug #1124
-$lng['admin']['webserver'] = 'Webserwer';
+$lng['admin']['webserver'] = 'Webserver';
 $lng['error']['admin_domain_emailsystemhostname'] = 'The server-hostname cannot be used as email-domain.';
-$lng['aps']['license_link'] = 'Link do licencji';
+$lng['aps']['license_link'] = 'Link to the license';
 
 // ADDED IN 1.4.2.1-1
 
-$lng['mysql']['mysql_server'] = 'Serwer MySQL';
+$lng['mysql']['mysql_server'] = 'MySQL-Server';
 
 // ADDED IN 1.4.2.1-2
 
-$lng['admin']['ipsandports']['webserverdefaultconfig'] = 'Domy&#347lna Konfiguracja Webserwera';
+$lng['admin']['ipsandports']['webserverdefaultconfig'] = 'Webserver Default Config';
 $lng['admin']['ipsandports']['webserverdomainconfig'] = 'Webserver Domain Config';
 $lng['admin']['ipsandports']['webserverssldomainconfig'] = 'Webserver SSL Config';
 $lng['admin']['ipsandports']['ssl_key_file'] = 'Path to the SSL Keyfile';
@@ -1250,137 +1258,49 @@ $lng['panel']['off'] = 'off';
 $lng['update']['updateinprogress_onlyadmincanlogin'] = 'A newer version of Froxlor has been installed but not yet set up.<br />Only the administrator can log in and finish the update.';
 $lng['update']['update'] = 'Aktualizacja Froxlora';
 $lng['update']['proceed'] = 'Proceed';
-$lng['update']['update_information']['part_a'] = 'The Froxlor files have been updated to version <strong>%newversion</strong>. The installed version is <strong>%curversion</strong>.';
+$lng['update']['update_information'] = 'The Froxlor files have been updated to version <strong>%newversion</strong>. The installed version is <strong>%curversion</strong>.<br /><br />Customers will not be able to log in until the update has been finished.<br /><strong>Proceed?</strong>';
-$lng['update']['update_information']['part_b'] = '<br /><br />Customers will not be able to log in until the update has been finished.<br /><strong>Proceed?</strong>';
 $lng['update']['noupdatesavail'] = '<strong>You already have the latest Froxlor version.</strong>';
-$lng['admin']['specialsettingsforsubdomains'] = 'Apply specialsettings to all subdomains (*.example.com)';
+$lng['admin']['cron']['cronsettings'] = 'ustawienia Cronjob';
-$lng['serversettings']['specialsettingsforsubdomains']['description'] = 'If yes these custom vhost-settings will be added to all subdomains; if no subdomain-specialsettings are being removed.';
-$lng['tasks']['outstanding_tasks'] = 'Outstanding cron-tasks';
-$lng['tasks']['rebuild_webserverconfig'] = 'Przebudowanie konfiguracji webserwera';
-$lng['tasks']['adding_customer'] = 'Dodanie nowego klienta %loginname%';
-$lng['tasks']['rebuild_bindconfig'] = 'Przebudowanie konfiguracji binda';
-$lng['tasks']['creating_ftpdir'] = 'Tworzenie katalogu dla nowych u&#380ytkownik<69>w FTP';
-$lng['tasks']['deleting_customerfiles'] = 'Kasowanie plik<69>w klienta %loginname%';
-$lng['tasks']['noneoutstanding'] = 'Obecnie nie ma zaplanowanych zada&#324 dla Froxlora';
-$lng['ticket']['nonexistingcustomer'] = '(usuni&#281ty klient)';
-$lng['admin']['ticket_nocustomeraddingavailable'] = 'It\'s not possible to open a new support-ticket currently. You first need to add at least one customer.';
-
-// ADDED IN FROXLOR 0.9.1
-
-$lng['admin']['accountdata'] = 'Dane konta';
-$lng['admin']['contactdata'] = 'Dane kontaktowe';
-$lng['admin']['servicedata'] = 'Dane us&#322ugi';
-
-// ADDED IN FROXLOR 0.9.2
-
-$lng['admin']['newerversionavailable'] = 'Jest dost&#281pna nowa wersja Froxlora';
-
-// ADDED IN FROXLOR 0.9.3
-
-$lng['emails']['noemaildomainaddedyet'] = 'You do not have a (email-)domain in your account yet.';
-$lng['error']['hiddenfieldvaluechanged'] = 'The value for the hidden field &quot;%s&quot; changed while editing the settings.<br /><br />This is usually not a big problem but the settings could not be saved because of this.';
-
-// ADDED IN FROXLOR 0.9.3-svn1
-
-$lng['serversettings']['panel_password_min_length']['title'] = 'Minimalna d&#322ugo&#347&#263 has&#322a';
-$lng['serversettings']['panel_password_min_length']['description'] = 'Here you can set a minimum length for passwords. \'0\' means: no minimum length required.';
-$lng['error']['notrequiredpasswordlength'] = 'The given password is too short. Please enter at least %s characters.';
-$lng['serversettings']['system_store_index_file_subs']['title'] = 'Store default index file also to new subfolders';
-$lng['serversettings']['system_store_index_file_subs']['description'] = 'If enabled, the default index-file is being stored to every subdomain-path newly created (not if the folder already exists!)';
-
-// ADDED IN FROXLOR 0.9.3-svn2
-
-$lng['serversettings']['adminmail_return']['title'] = 'Reply-To address';
-$lng['serversettings']['adminmail_return']['description'] = 'Define an e-mail address as reply-to-address for mails sent by the panel.';
-$lng['serversettings']['adminmail_defname'] = 'Panel e-mail sender name';
-
-// ADDED IN FROXLOR 0.9.3-svn3
-$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_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';
-$lng['dkim']['dkim_add_adsp']['description'] = 'If you don\'t know what this is, leave it "enabled"';
-$lng['dkim']['dkim_add_adsppolicy']['title'] = 'ADSP policy';
-$lng['dkim']['dkim_add_adsppolicy']['description'] = 'For more information about this setting see <a href="http://wiki.froxlor.org/contrib/dkim-adsp-policies">http://wiki.froxlor.org/contrib/dkim-adsp-policies</a>';
-
-$lng['admin']['cron']['cronsettings'] = 'ustawienia zada&#324 cyklicznych';
 $lng['cron']['cronname'] = 'cronjob-name';
-$lng['cron']['lastrun'] = 'ostatnio uruchomiony';
+$lng['cron']['lastrun'] = 'last run';
-$lng['cron']['interval'] = 'interwa&#322';
+$lng['cron']['interval'] = 'interval';
-$lng['cron']['isactive'] = 'w&#322&#261czony';
+$lng['cron']['isactive'] = 'enabled';
-$lng['cron']['description'] = 'opis';
+$lng['admin']['cron']['add'] = 'Add a new cronjob';
+$lng['cron']['description'] = 'description';
 $lng['crondesc']['cron_unknown_desc'] = 'no description given';
-$lng['admin']['cron']['add'] = 'Add cronjob';
 $lng['crondesc']['cron_tasks'] = 'przebudowanie plik<69>w konfiguracyjnych';
 $lng['crondesc']['cron_legacy'] = 'legacy (old) cronjob';
 $lng['crondesc']['cron_apsinstaller'] = 'Instalator aplikacji';
 $lng['crondesc']['cron_autoresponder'] = 'e-mail autoresponder';
 $lng['crondesc']['cron_apsupdater'] = 'Aktualizacja pakiet<65>w instalatora aplikacji';
 $lng['crondesc']['cron_traffic'] = 'obliczanie ruchu';
-$lng['crondesc']['cron_ticketsreset'] = 'resetowanie licznik<EFBFBD>w zg&#322osze&#324';
+$lng['crondesc']['cron_ticketsreset'] = 'resetowanie licznika zg&#322osze&#324';
 $lng['crondesc']['cron_ticketarchive'] = 'archiwizowanie starych zg&#322osze&#324';
-$lng['cronmgmt']['seconds'] = 'sekund';
+$lng['admin']['specialsettingsforsubdomains'] = 'Apply specialsettings to all subdomains (*.example.com)';
-$lng['cronmgmt']['minutes'] = 'minut';
+$lng['serversettings']['specialsettingsforsubdomains']['description'] = 'If yes these custom vhost-settings will be added to all subdomains; if no subdomain-specialsettings are being removed.';
-$lng['cronmgmt']['hours'] = 'godzin';
+$lng['tasks']['outstanding_tasks'] = 'Outstanding cron-tasks';
-$lng['cronmgmt']['days'] = 'dni';
+$lng['tasks']['rebuild_webserverconfig'] = 'Rebuilding webserver-configuration';
-$lng['cronmgmt']['weeks'] = 'tygodni';
+$lng['tasks']['adding_customer'] = 'Adding new customer %loginname%';
-$lng['cronmgmt']['months'] = 'miesi&#281cy';
+$lng['tasks']['rebuild_bindconfig'] = 'Rebuilding bind-configuration';
-$lng['admin']['cronjob_edit'] = 'Edytuj zadania cykliczne';
+$lng['tasks']['creating_ftpdir'] = 'Creating directory for new ftp-user';
-$lng['cronjob']['cronjobsettings'] = 'Ustawienia zadania cykliczne';
+$lng['tasks']['deleting_customerfiles'] = 'Deleting customer-files %loginname%';
-$lng['cronjob']['cronjobinterval'] = 'Interwa&#322 uruchomienia';
+$lng['tasks']['noneoutstanding'] = 'There are currently no outstanding tasks for Froxlor';
-$lng['panel']['options'] = 'opcje';
+$lng['ticket']['nonexistingcustomer'] = '(deleted customer)';
-$lng['admin']['warning'] = 'WA&#379NE - Przeczytaj to!';
+$lng['admin']['ticket_nocustomeraddingavailable'] = 'It\'s not possible to open a new support-ticket currently. You first need to add at least one customer.';
-$lng['cron']['changewarning'] = 'Changing these values can have a negative cause to the behavior of Froxlor and its automated tasks.<br /><br />Please, only change values here if you are *damn sure* you know what you are doing.';
 
-$lng['serversettings']['stdsubdomainhost']['title'] = 'Customer standard subdomain';
+// ADDED IN FROXLOR 0.9.1
-$lng['serversettings']['stdsubdomainhost']['description'] = 'What hostname should be used to create standard subdomains for customer. If empty, the system-hostname is used.';
 
-// ADDED IN FROXLOR 0.9.4-svn1
+$lng['admin']['accountdata'] = 'Account Data';
-$lng['ftp']['account_edit'] = 'Edytuj konto ftp';
+$lng['admin']['contactdata'] = 'Contact Data';
-$lng['ftp']['editpassdescription'] = 'Ustal nowe has&#322o lub zostaw puste by nie zmienia&#263.';
+$lng['admin']['servicedata'] = 'Service Data';
-$lng['customer']['sendinfomail'] = 'Send data via email to me';
-$lng['customer']['mysql_add']['infomail_subject'] = '[Froxlor] Nowa baza danych utworzona';
-$lng['customer']['mysql_add']['infomail_body']['pma'] = "\nMasz dost&#281p do Twojej bazy danych uzywaj&#261c phpMyAdmina pod adresem {URI}\n";
-$lng['customer']['mysql_add']['infomail_body']['main'] = "Witaj {CUST_NAME},\n\nw&#322a&#347nie doda&#322e&#347 now&#261 baz&#281 danych. Przesy&#322amy dane uruchomieniowe:\n\nBaza danych: {DB_NAME}\nHas&#322o: {DB_PASS}\nOpis: {DB_DESC}\n{PMA_URI}\nZ powa&#380aniem, Froxlor";
-$lng['error']['domains_cantdeletedomainwithapsinstances'] = 'Nie mo&#380esz usun&#261&#263 domeny, poniewa&#380 jest na niej zainstalowana aplikacja z instalatora aplikacji. W pierwszej kolejno&#347ci odinstaluj t&#261 aplikacj&#281.';
-$lng['serversettings']['awstats_path'] = '<27>cie&#380ka do AWStats \'awstats_buildstaticpages.pl\'';
-$lng['serversettings']['awstats_conf'] = 'AWStats configuration path';
-$lng['error']['overviewsettingoptionisnotavalidfield'] = 'Woops, a field that should be displayed as an option in the settings-overview is not an excepted type. You can blame the developers for this. This should not happen!';
-$lng['admin']['configfiles']['compactoverview'] = 'Compact-overview';
-$lng['admin']['lastlogin_succ'] = 'Ostatnie logowanie';
-$lng['panel']['neverloggedin'] = 'Brak logowania do tej pory';
 
-// ADDED IN FROXLOR 0.9.6-svn1
+// ADDED IN FROXLOR 0.9.2
-$lng['serversettings']['defaultttl'] = 'TTL domeny dla binda w sekundach (domy&#347lnie \'604800\' = 1 tydzie&#324)';
-$lng['ticket']['logicalorder'] = 'Logical order';
-$lng['ticket']['orderdesc'] = 'Here you can define your own logical order for the ticket-category. Use 1 - 999, lower numbers are displayed first.';
 
-// ADDED IN FROXLOR 0.9.6-svn3
+$lng['admin']['newerversionavailable'] = 'There is a newer version of Froxlor available';
-$lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'W&#322&#261czone standardowe strony b&#322&#281d<31>w dla wszystkich klient<6E>w';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Plik/URL dla b&#322&#281du 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Plik/URL dla b&#322&#281du 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
-$lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Plik/URL dla b&#322&#281du 404';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Plik/URL dla b&#322&#281du 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '<div style="color:red">'.$lng['panel']['not_supported'].'lighttpd</div>';
 
-// ADDED IN FROXLOR 0.9.6-svn4
+// ADDED IN FROXLOR 0.9.3
-$lng['serversettings']['ticket']['default_priority'] = 'Standardowy priorytet dla zg<7A>osze<7A> pomocy technicznej';
 
-// ADDED IN FROXLOR 0.9.6-svn5
+$lng['emails']['noemaildomainaddedyet'] = 'You do not have a (email-)domain in your account yet.';
-$lng['serversettings']['mod_fcgid']['defaultini'] = 'Default PHP configuration for new domains';
+$lng['error']['hiddenfieldvaluechanged'] = 'The value for the hidden field &quot;%s&quot; changed while editing the settings.<br /><br />This is usually not a big problem but the settings could not be saved because of this.';
 
-// ADDED IN FROXLOR 0.9.6-svn6
+?>
-$lng['admin']['ftpserver'] = 'Serwer FTP';
-$lng['admin']['ftpserversettings'] = 'Ustawienia Serwera FTP';
-$lng['serversettings']['ftpserver']['desc'] = 'Je<4A>li pureftpd jest zaznaczone, plik .ftpquota z quotami u<>ytkownika b<>dzie tworzony i aktualizowany codziennie';
-
-// CHANGED IN FROXLOR 0.9.6-svn6
-$lng['serversettings']['ftpprefix']['description'] = 'Which prefix should ftp accounts have?<br/><b>If you change this you also have to change the Quota SQL Query in your FTP Server config file in case you use it!</b> ';
-
-?>

scripts/froxlor_master_cronjob.php

@@ -19,6 +19,19 @@ include_once(dirname(__FILE__) . '/../lib/cron_init.php');
 
 $jobs_to_run = includeCronjobs($debugHandler, $pathtophpfiles);
 
+/**
+ * check for --force to include cron_tasks 
+ * even if it's not its turn
+ */
+if(isset($argv[1]) && strtolower($argv[1]) == '--force')
+{
+	$crontasks = makeCorrectFile($pathtophpfiles.'/scripts/jobs/cron_tasks.php');
+	if(!in_array($crontasks, $jobs_to_run))
+	{
+		array_unshift($jobs_to_run, $crontasks);
+	}
+}
+
 foreach($jobs_to_run as $cron)
 {
 	require_once($cron);

scripts/jobs/cron_autoresponder.php

@@ -132,24 +132,40 @@ if($db->num_rows($result) > 0)
 					}
 
 					//fetching to field
-					if(!strlen($to)
+					if((!strlen($to) || $to != $row['email'])
-					   && preg_match("/^To:(.+)<(.*)>$/", $line, $match)
+						&& preg_match("/^To:(.+)<(.*)>$/", $line, $match)
 					) {
 						$to = $match[2];
 					}
-					elseif(!strlen($to)
+					elseif((!strlen($to) || $to != $row['email'])
-					       && preg_match("/^To:\s+(.*@.*)$/", $line, $match) 
+						&& preg_match("/^To:\s+(.*@.*)$/", $line, $match)
+					) {
+						$to = $match[1];
+					}
+					/*
+					 * if we still don't have a To:-address
+					 * OR even worse, the $to is NOT the mail-address
+					 * of the customer which autoresponder this is
+					 * we have to check for CC too, #476
+					 */
+					elseif((!strlen($to) || $to != $row['email'])
+						&& preg_match("/^Cc:(.+)<(.*)>$/", $line, $match)
+					) {
+						$to = $match[2];
+					}
+					elseif((!strlen($to) || $to != $row['email'])
+						&& preg_match("/^Cc:\s+(.*@.*)$/", $line, $match)
 					) {
 						$to = $match[1];
 					}
 
 					//fetching sender field
-					if(!strlen($to)
+					if(!strlen($sender)
 					   && preg_match("/^Sender:(.+)<(.*)>$/", $line, $match)
 					) {
 						$sender = $match[2];
 					}
-					elseif(!strlen($to)
+					elseif(!strlen($sender)
 					       && preg_match("/Sender:\s+(.*@.*)$/", $line, $match)
 					) {
 						$sender = $match[1];
@@ -169,6 +185,13 @@ if($db->num_rows($result) > 0)
 					}
 				}
 
+				// check if the receiver is really the one 
+				// with the autoresponder
+				if(!strlen($to) || $to != $row['email'])
+				{
+					$to = '';
+				}
+
 				//skip mail when marked as spam
 				if($spam == true)
 				{

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

@@ -57,6 +57,12 @@ class apache
 
 	public function reload()
 	{
+		if((int)$this->settings['phpfpm']['enabled'] == 1)
+		{
+			fwrite($this->debugHandler, '   apache::reload: reloading php-fpm' . "\n");
+			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading php-fpm');
+			safe_exec(escapeshellcmd($this->settings['phpfpm']['reload']));
+		}
 		fwrite($this->debugHandler, '   apache::reload: reloading apache' . "\n");
 		$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading apache');
 		safe_exec(escapeshellcmd($this->settings['system']['apachereload_command']));
@@ -76,9 +82,10 @@ class apache
 		}
 		$vhosts_filename = makeCorrectFile($vhosts_folder . '/05_froxlor_dirfix_nofcgid.conf');
 
-		if($this->settings['system']['mod_fcgid'] == '1')
+		if($this->settings['system']['mod_fcgid'] == '1'
-		{
+			|| $this->settings['phpfpm']['enabled'] == '1'
-			// if we use fcgid we don't need this file
+		) {
+			// if we use fcgid or php-fpm we don't need this file
 			if(file_exists($vhosts_filename))
 			{
 				fwrite($this->debugHandler, '  apache::_createStandardDirectoryEntry: unlinking ' . basename($vhosts_filename) . "\n");
@@ -220,7 +227,7 @@ class apache
 				if($this->settings['system']['mod_fcgid_ownvhost'] == '1')
 				{
 					
-					$configdir = makeCorrectDir($this->settings['system']['mod_fcgid_configdir'] . '/froxlor.panel/');
+					$configdir = makeCorrectDir($this->settings['system']['mod_fcgid_configdir'] . '/froxlor.panel/' . $this->settings['system']['hostname']);
 					if((int)$this->settings['system']['mod_fcgid_wrapper'] == 0)
 					{
 						$this->virtualhosts_data[$vhosts_filename].= '  SuexecUserGroup "' . $this->settings['system']['mod_fcgid_httpuser'] . '" "' . $this->settings['system']['mod_fcgid_httpgroup'] . '"' . "\n";
@@ -239,6 +246,35 @@ class apache
 						$this->virtualhosts_data[$vhosts_filename].= '  </Directory>' . "\n";
 					}
 				}
+				// create php-fpm <Directory>-Part (config is created in apache_fcgid)
+				elseif($this->settings['phpfpm']['enabled'] == '1')
+				{
+					$domain = array(
+						'id' => 'none',
+						'domain' => $this->settings['system']['hostname'],
+						'adminid' => 1, /* first admin-user (superadmin) */
+						'mod_fcgid_starter' => -1,
+						'mod_fcgid_maxrequests' => -1,
+						'guid' => $this->settings['phpfpm']['vhost_httpuser'],
+						'openbasedir' => 0,
+						'safemode' => '0',
+						'email' => $this->settings['panel']['adminmail'],
+						'loginname' => 'froxlor.panel',
+						'documentroot' => $mypath
+					);
+
+					$php = new phpinterface($this->getDB(), $this->settings, $domain);
+					$this->virtualhosts_data[$vhosts_filename].= '  SuexecUserGroup "' . $this->settings['system']['mod_fcgid_httpuser'] . '" "' . $this->settings['system']['mod_fcgid_httpgroup'] . '"' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '  FastCgiExternalServer ' . $mypath . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $this->settings['system']['mod_fcgid_httpuser'] . ' -group ' . $this->settings['system']['mod_fcgid_httpuser'] . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '  <Directory "' . $mypath . '">' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '    AddHandler php5-fastcgi .php'. "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '    Action php5-fastcgi /fastcgiphp' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '    Options +ExecCGI' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '    Order allow,deny' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '    allow from all' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '  </Directory>' . "\n";
+					$this->virtualhosts_data[$vhosts_filename].= '  Alias /fastcgiphp ' . $mypath . 'fpm.external' . "\n";
+				}
 
 				/**
 				 * dirprotection, see #72
@@ -504,6 +540,15 @@ class apache
 					$stats_text.= '  Alias /webalizer "' . makeCorrectFile($domain['customerroot'] . '/webalizer') . '"' . "\n";
 				}
 			}
+			// if the docroots are equal, we still have to set an alias for awstats
+			// 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')
+			{
+				$stats_text.= '  Alias /awstats "' . makeCorrectFile($domain['documentroot'] . '/awstats/' . $domain['domain']) . '"' . "\n";
+				$stats_text.= '  Alias /awstats-icon "' . makeCorrectDir($this->settings['system']['awstats_icons']) . '"' . "\n";
+			}
 		}
 
 		return $stats_text;
@@ -612,7 +657,7 @@ class apache
 				// After inserting the AWStats information, 
 				// be sure to build the awstats conf file as well
 				// and chown it using $awstats_params, #258
-				$awstats_param = array(
+				$awstats_params = array(
 					'loginname' => $domain['loginname'],
 					'guid' => $domain['guid'],
 					'documentroot' => $domain['documentroot']
@@ -631,12 +676,14 @@ class apache
 	protected function getVhostFilename($domain, $ssl_vhost = false)
 	{
 		if((int)$domain['parentdomainid'] == 0 
+			&& isCustomerStdSubdomain((int)$domain['id']) == false
 			&& ((int)$domain['ismainbutsubto'] == 0
 			|| domainMainToSubExists($domain['ismainbutsubto']) == false)
 		) {
 			$vhost_no = '22';
 		}
 		elseif((int)$domain['parentdomainid'] == 0 
+			&& isCustomerStdSubdomain((int)$domain['id']) == false
 			&& (int)$domain['ismainbutsubto'] > 0
 		) {
 			$vhost_no = '21';
@@ -1078,6 +1125,11 @@ class apache
 				$this->wipeOutOldDiroptionConfigs();
 			}
 		}
+		else
+		{
+			// no more diroptions, but there might be some file-corpses which have to be removed
+			$this->wipeOutOldDiroptionConfigs();
+		}
 
 		// Write htpasswds
 
@@ -1113,6 +1165,11 @@ class apache
 				$this->logger->logAction(CRON_ACTION, LOG_WARNING, 'WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!');
 			}
 		}
+		else
+		{
+			// no more htpasswds, but there might be some file-corpses which have to be removed
+			$this->wipeOutOldHtpasswdConfigs();
+		}
 
 		// Write virtualhosts
 

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

@@ -26,219 +26,58 @@ if(@php_sapi_name() != 'cli'
 
 class apache_fcgid extends apache
 {
-	private $php_configs_cache = array();
-	private $admin_cache = array();
-
-	/*
-	*	We put together the needed php options in the virtualhost entries
-	*/
-
 	protected function composePhpOptions($domain)
 	{
 		$php_options_text = '';
 
 		if($domain['phpenabled'] == '1')
 		{
-			// This vHost has PHP enabled and we are using mod_fcgid
+			$php = new phpinterface($this->getDB(), $this->settings, $domain);
-			//create basic variables for config
+			$phpconfig = $php->getPhpConfig((int)$domain['phpsettingid']);
 
-			$configdir = makeCorrectDir($this->settings['system']['mod_fcgid_configdir'] . '/' . $domain['loginname'] . '/' . $domain['domain'] . '/');
+			if((int)$this->settings['phpfpm']['enabled'] == 1)
-			$starter_filename = makeCorrectFile($configdir . '/php-fcgi-starter');
-			$phpini_filename = makeCorrectFile($configdir . '/php.ini');
-			$tmpdir = makeCorrectDir($this->settings['system']['mod_fcgid_tmpdir'] . '/' . $domain['loginname'] . '/');
-
-			// create config dir if necessary
-
-			if(!is_dir($configdir))
-			{
-				safe_exec('mkdir -p ' . escapeshellarg($configdir));
-				safe_exec('chown ' . $domain['guid'] . ':' . $domain['guid'] . ' ' . escapeshellarg($configdir));
-			}
-
-			// create tmp dir if necessary
-
-			if(!is_dir($tmpdir))
-			{
-				safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
-				safe_exec('chown -R ' . $domain['guid'] . ':' . $domain['guid'] . ' ' . escapeshellarg($tmpdir));
-				safe_exec('chmod 0750 ' . escapeshellarg($tmpdir));
-			}
-
-			// Load php config
-
-			$phpconfig = $this->getPhpConfig((int)$domain['phpsettingid']);
-
-			if((int)$this->settings['system']['mod_fcgid_wrapper'] == 0)
 			{
 				$php_options_text.= '  SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
-				$php_options_text.= '  ScriptAlias /php/ ' . $configdir . "\n";
+				$php_options_text.= '  FastCgiExternalServer ' . makeCorrectDir($domain['documentroot']) . 'fpm.external -socket ' . $php->getInterface()->getSocketFile() . ' -user ' . $domain['loginname'] . ' -group ' . $domain['loginname'] . "\n";
-			}
+				$php_options_text.= '  <Directory "' . makeCorrectDir($domain['documentroot']) . '">' . "\n";
-			else
+				$php_options_text.= '    AddHandler php5-fastcgi .php'. "\n";
-			{
+				$php_options_text.= '    Action php5-fastcgi /fastcgiphp' . "\n";
-				$php_options_text.= '  SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
-				$php_options_text.= '  <Directory "' . $domain['documentroot'] . '">' . "\n";
-				$file_extensions = explode(' ', $phpconfig['file_extensions']);
-				$php_options_text.= '    AddHandler fcgid-script .' . implode(' .', $file_extensions) . "\n";
-				foreach($file_extensions as $file_extension)
-				{
-					$php_options_text.= '    FCGIWrapper ' . $starter_filename . ' .' . $file_extension . "\n";
-				}
-
 				$php_options_text.= '    Options +ExecCGI' . "\n";
 				$php_options_text.= '    Order allow,deny' . "\n";
 				$php_options_text.= '    allow from all' . "\n";
 				$php_options_text.= '  </Directory>' . "\n";
-			}
+				$php_options_text.= '  Alias /fastcgiphp ' . makeCorrectDir($domain['documentroot']) . 'fpm.external' . "\n";
-
-			// create starter
-
-			$starter_file = "#!/bin/sh\n\n";
-			$starter_file.= "#\n";
-			$starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
-			$starter_file.= "# Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
-			$starter_file.= "#\n\n";
-			$starter_file.= "umask 022\n";
-			$starter_file.= "PHPRC=" . escapeshellarg($configdir) . "\n";
-			$starter_file.= "export PHPRC\n";
-
-			// set number of processes for one domain
-
-			if((int)$domain['mod_fcgid_starter'] != - 1)
-			{
-				$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$domain['mod_fcgid_starter'] . "\n";
 			}
 			else
 			{
-				if((int)$phpconfig['mod_fcgid_starter'] != - 1)
+				if((int)$this->settings['system']['mod_fcgid_wrapper'] == 0)
 				{
-					$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$phpconfig['mod_fcgid_starter'] . "\n";
+					$php_options_text.= '  SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
+					$php_options_text.= '  ScriptAlias /php/ ' . $php->getInterface()->getConfigDir() . "\n";
 				}
 				else
 				{
-					$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$this->settings['system']['mod_fcgid_starter'] . "\n";
+					$php_options_text.= '  SuexecUserGroup "' . $domain['loginname'] . '" "' . $domain['loginname'] . '"' . "\n";
-				}
+					$php_options_text.= '  <Directory "' . $domain['documentroot'] . '">' . "\n";
-			}
+					$file_extensions = explode(' ', $phpconfig['file_extensions']);
-
+					$php_options_text.= '    AddHandler fcgid-script .' . implode(' .', $file_extensions) . "\n";
-			$starter_file.= "export PHP_FCGI_CHILDREN\n";
+					foreach($file_extensions as $file_extension)
-
-			// set number of maximum requests for one domain
-
-			if((int)$domain['mod_fcgid_maxrequests'] != - 1)
-			{
-				$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$domain['mod_fcgid_maxrequests'] . "\n";
-			}
-			else
-			{
-				if((int)$phpconfig['mod_fcgid_maxrequests'] != - 1)
-				{
-					$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$phpconfig['mod_fcgid_maxrequests'] . "\n";
-				}
-				else
-				{
-					$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$this->settings['system']['mod_fcgid_maxrequests'] . "\n";
-				}
-			}
-
-			$starter_file.= "export PHP_FCGI_MAX_REQUESTS\n";
-
-			// Set Binary
-
-			$starter_file.= "exec " . $phpconfig['binary'] . " -c " . escapeshellarg($configdir) . "\n";
-
-			//remove +i attibute, so starter can be overwritten
-
-			if(file_exists($starter_filename))
-			{
-				removeImmutable($starter_filename);
-			}
-
-			$starter_file_handler = fopen($starter_filename, 'w');
-			fwrite($starter_file_handler, $starter_file);
-			fclose($starter_file_handler);
-			safe_exec('chmod 750 ' . escapeshellarg($starter_filename));
-			safe_exec('chown ' . $domain['guid'] . ':' . $domain['guid'] . ' ' . escapeshellarg($starter_filename));
-			setImmutable($starter_filename);
-
-			// define the php.ini
-
-			$openbasedir = '';
-			$openbasedirc = ';';
-
-			if($domain['openbasedir'] == '1')
-			{
-				$openbasedirc = '';
-				$_phpappendopenbasedir = '';
-
-				$_custom_openbasedir = explode(':', $this->settings['system']['mod_fcgid_peardir']);
-				foreach($_custom_openbasedir as $cobd)
-				{
-					$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
-				}
-				
-				$_custom_openbasedir = explode(':', $this->settings['system']['phpappendopenbasedir']);
-				foreach($_custom_openbasedir as $cobd)
-				{
-					$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
-				}
-
-				if($domain['openbasedir_path'] == '0' && strstr($domain['documentroot'], ":") === false)
-				{
-					$openbasedir = appendOpenBasedirPath($domain['documentroot'], true);
-				}
-				else
-				{
-					$openbasedir = appendOpenBasedirPath($domain['customerroot'], true);
-				}
-
-				$openbasedir .= appendOpenBasedirPath($tmpdir);
-				$openbasedir .= $_phpappendopenbasedir;
-
-				$openbasedir = explode(':', $openbasedir);
-				$clean_openbasedir = array();
-				foreach($openbasedir as $number => $path)
-				{
-					if(trim($path) != '/')
 					{
-						$clean_openbasedir[] = makeCorrectDir($path);
+						$php_options_text.= '    FCGIWrapper ' . $php->getInterface()->getStarterFile() . ' .' . $file_extension . "\n";
 					}
+					$php_options_text.= '    Options +ExecCGI' . "\n";
+					$php_options_text.= '    Order allow,deny' . "\n";
+					$php_options_text.= '    allow from all' . "\n";
+					$php_options_text.= '  </Directory>' . "\n";
 				}
-				$openbasedir = implode(':', $clean_openbasedir);
-			}
-			else
-			{
-				$openbasedir = 'none';
-				$openbasedirc = ';';
 			}
 
-			$admin = $this->getAdminData($domain['adminid']);
+			// create starter-file | config-file
-			$php_ini_variables = array(
+			$php->getInterface()->createConfig($phpconfig);
-				'SAFE_MODE' => ($domain['safemode'] == '0' ? 'Off' : 'On'),
+			
-				'PEAR_DIR' => $this->settings['system']['mod_fcgid_peardir'],
+			// create php.ini 
-				'OPEN_BASEDIR' => $openbasedir,
+			// @TODO make php-fpm support this
-				'OPEN_BASEDIR_C' => $openbasedirc,
+			$php->getInterface()->createIniFile($phpconfig);
-				'OPEN_BASEDIR_GLOBAL' => $this->settings['system']['phpappendopenbasedir'],
-				'TMP_DIR' => $tmpdir,
-				'CUSTOMER_EMAIL' => $domain['email'],
-				'ADMIN_EMAIL' => $admin['email'],
-				'DOMAIN' => $domain['domain'],
-				'CUSTOMER' => $domain['loginname'],
-				'ADMIN' => $admin['loginname']
-			);
-
-			//insert a small header for the file
-
-			$phpini_file = ";\n";
-			$phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
-			$phpini_file.= "; Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
-			$phpini_file.= ";\n\n";
-			$phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables);
-			$phpini_file = str_replace('"none"', 'none', $phpini_file);
-			$phpini_file = preg_replace('/\"+/', '"', $phpini_file);
-			$phpini_file_handler = fopen($phpini_filename, 'w');
-			fwrite($phpini_file_handler, $phpini_file);
-			fclose($phpini_file_handler);
-			safe_exec('chown root:0 ' . escapeshellarg($phpini_filename));
-			safe_exec('chmod 0644 ' . escapeshellarg($phpini_filename));
 		}
 		else
 		{
@@ -248,149 +87,56 @@ class apache_fcgid extends apache
 		return $php_options_text;
 	}
 
-	private function getPhpConfig($php_config_id)
-	{
-		$php_config_id = intval($php_config_id);
-
-		// If domain has no config, we will use the default one.
-
-		if($php_config_id == 0)
-		{
-			$php_config_id = 1;
-		}
-
-		if(!isset($this->php_configs_cache[$php_config_id]))
-		{
-			$this->php_configs_cache[$php_config_id] = $this->getDB()->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$php_config_id);
-		}
-
-		return $this->php_configs_cache[$php_config_id];
-	}
-
-	private function getAdminData($adminid)
-	{
-		$adminid = intval($adminid);
-
-		if(!isset($this->admin_cache[$adminid]))
-		{
-			$this->admin_cache[$adminid] = $this->getDB()->query_first("SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = " . (int)$adminid);
-		}
-
-		return $this->admin_cache[$adminid];
-	}
-	
 	public function createOwnVhostStarter()
 	{
-		if ($this->settings['system']['mod_fcgid_ownvhost'] == '1')
+		if ($this->settings['system']['mod_fcgid_ownvhost'] == '1'
-		{
+			|| ($this->settings['phpfpm']['enabled'] == '1'
+				&& $this->settings['phpfpm']['enabled_ownvhost'] == '1')
+		) {
 			$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); // /var/www/froxlor, needed for chown
-			$configdir = makeCorrectDir($this->settings['system']['mod_fcgid_configdir'] . '/froxlor.panel/');
+
-			$starter_filename = makeCorrectFile($configdir . '/php-fcgi-starter');
+			if ($this->settings['system']['mod_fcgid_ownvhost'] == '1')
-			$phpini_filename = makeCorrectFile($configdir . '/php.ini');
+			{
-			$tmpdir = makeCorrectDir($this->settings['system']['mod_fcgid_tmpdir'] . '/froxlor.panel/');
+				$user = $this->settings['system']['mod_fcgid_httpuser'];
-			
+				$group = $this->settings['system']['mod_fcgid_httpgroup'];
-			$user = $this->settings['system']['mod_fcgid_httpuser'];
+			}
-			$group = $this->settings['system']['mod_fcgid_httpgroup'];
+			elseif($this->settings['phpfpm']['enabled'] == '1'
+				&& $this->settings['phpfpm']['enabled_ownvhost'] == '1'
+			) {
+				$user = $this->settings['phpfpm']['vhost_httpuser'];
+				$group = $this->settings['phpfpm']['vhost_httpgroup'];	
+			}
+
+			$domain = array(
+				'id' => 'none',
+				'domain' => $this->settings['system']['hostname'],
+				'adminid' => 1, /* first admin-user (superadmin) */
+				'mod_fcgid_starter' => -1,
+				'mod_fcgid_maxrequests' => -1,
+				'guid' => $user,
+				'openbasedir' => 0,
+				'safemode' => '0',
+				'email' => $this->settings['panel']['adminmail'],
+				'loginname' => 'froxlor.panel',
+				'documentroot' => $mypath
+			);
 
 			// all the files and folders have to belong to the local user
 			// now because we also use fcgid for our own vhost
 			safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($mypath));
-			
+						
-			// create config dir if necessary
-			if(!is_dir($configdir))
-			{
-				safe_exec('mkdir -p ' . escapeshellarg($configdir));
-				safe_exec('chown ' . $user . ':' . $group . ' ' . escapeshellarg($configdir));
-			}
-
-			// create tmp dir if necessary
-			if(!is_dir($tmpdir))
-			{
-				safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
-				safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($tmpdir));
-				safe_exec('chmod 0750 ' . escapeshellarg($tmpdir));
-			}
-			
 			// get php.ini for our own vhost
-			$phpconfig = $this->getPhpConfig((int)$this->settings['system']['mod_fcgid_defaultini_ownvhost']); 
+			$php = new phpinterface($this->getDB(), $this->settings, $domain);
 
-			// create starter
+			// @FIXME don't use fcgid settings if not fcgid in use, but we don't have anything else atm
-			$starter_file = "#!/bin/sh\n\n";
+			$phpconfig = $php->getPhpConfig($this->settings['system']['mod_fcgid_defaultini_ownvhost']);
-			$starter_file.= "#\n";
-			$starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for the Froxlor vhost\n";
-			$starter_file.= "# Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
-			$starter_file.= "#\n\n";
-			$starter_file.= "umask 022\n";
-			$starter_file.= "PHPRC=" . escapeshellarg($configdir) . "\n";
-			$starter_file.= "export PHPRC\n";
-			if((int)$phpconfig['mod_fcgid_starter'] != - 1)
-			{
-				$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$phpconfig['mod_fcgid_starter'] . "\n";
-			}
-			else
-			{
-				$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$this->settings['system']['mod_fcgid_starter'] . "\n";
-			}
-			$starter_file.= "export PHP_FCGI_CHILDREN\n";
-			if((int)$phpconfig['mod_fcgid_maxrequests'] != - 1)
-			{
-				$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$phpconfig['mod_fcgid_maxrequests'] . "\n";
-			}
-			else
-			{
-				$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$this->settings['system']['mod_fcgid_maxrequests'] . "\n";
-			}
-			$starter_file.= "export PHP_FCGI_MAX_REQUESTS\n";
 
-			// Set Binary
+			// create starter-file | config-file
-			$starter_file.= "exec " . $phpconfig['binary'] . " -c " . escapeshellarg($configdir) . "\n";
+			$php->getInterface()->createConfig($phpconfig);
-
+			
-			//remove +i attibute, so starter can be overwritten
+			// create php.ini 
-			if(file_exists($starter_filename))
+			// @TODO make php-fpm support this
-			{
+			$php->getInterface()->createIniFile($phpconfig);
-				removeImmutable($starter_filename);
-			}
-
-			$starter_file_handler = fopen($starter_filename, 'w');
-			fwrite($starter_file_handler, $starter_file);
-			fclose($starter_file_handler);
-			safe_exec('chmod 750 ' . escapeshellarg($starter_filename));
-			safe_exec('chown ' . $user . ':' . $group . ' ' . escapeshellarg($starter_filename));
-			setImmutable($starter_filename);
-
-			// define the php.ini
-
-			$php_ini_variables = array(
-				'SAFE_MODE' => 'Off',
-				'PEAR_DIR' => $this->settings['system']['mod_fcgid_peardir'],
-				'OPEN_BASEDIR' => 'none',
-				'OPEN_BASEDIR_C' => ';',
-				'OPEN_BASEDIR_GLOBAL' => '',
-				'TMP_DIR' => $tmpdir,
-				'CUSTOMER_EMAIL' => $this->settings['panel']['adminmail'],
-				'ADMIN_EMAIL' => $this->settings['panel']['adminmail'],
-				'DOMAIN' => $this->settings['system']['hostname'],
-				'CUSTOMER' => $user,
-				'ADMIN' => $user
-			);
-
-			//insert a small header for the file
-
-			$phpini_file = ";\n";
-			$phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for Froxlor-vhost from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
-			$phpini_file.= "; Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
-			$phpini_file.= ";\n\n";
-			$phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables);
-			$phpini_file = str_replace('"none"', 'none', $phpini_file);
-			$phpini_file = preg_replace('/\"+/', '"', $phpini_file);
-			$phpini_file_handler = fopen($phpini_filename, 'w');
-			fwrite($phpini_file_handler, $phpini_file);
-			fclose($phpini_file_handler);
-			safe_exec('chown root:0 ' . escapeshellarg($phpini_filename));
-			safe_exec('chmod 0644 ' . escapeshellarg($phpini_filename));
 		}
 	}
-
 }
-
-?>

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

@@ -61,6 +61,12 @@ class lighttpd
 
 	public function reload()
 	{
+		if((int)$this->settings['phpfpm']['enabled'] == 1)
+		{
+			fwrite($this->debugHandler, '   lighttpd::reload: reloading php-fpm' . "\n");
+			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading php-fpm');
+			safe_exec(escapeshellcmd($this->settings['phpfpm']['reload']));
+		}
 		fwrite($this->debugHandler, '   lighttpd::reload: reloading lighttpd' . "\n");
 		$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading lighttpd');
 		safe_exec(escapeshellcmd($this->settings['system']['apachereload_command']));
@@ -77,11 +83,13 @@ class lighttpd
 			{
 				$ip = '[' . $row_ipsandports['ip'] . ']';
 				$port = $row_ipsandports['port'];
+				$ipv6 = 'server.use-ipv6 = "enable"'."\n";
 			}
 			else
 			{
 				$ip = $row_ipsandports['ip'];
 				$port = $row_ipsandports['port'];
+				$ipv6 = '';
 			}
 
 			fwrite($this->debugHandler, '  lighttpd::createIpPort: creating ip/port settings for  ' . $ip . ":" . $port . "\n");
@@ -99,6 +107,7 @@ class lighttpd
 			{
 				$this->lighttpd_data[$vhost_filename].= 'server.port = ' . $port . "\n";
 				$this->lighttpd_data[$vhost_filename].= 'server.bind = "' . $ip . '"' . "\n";
+				$this->lighttpd_data[$vhost_filename].= $ipv6;
 			}
 			
 			if($row_ipsandports['vhostcontainer'] == '1')
@@ -135,6 +144,38 @@ class lighttpd
 				$this->lighttpd_data[$vhost_filename].= '  }' . "\n";
 				*/
 
+				/**
+				 * own php-fpm vhost
+				 */
+				if((int)$this->settings['phpfpm']['enabled'] == 1)
+				{
+					$domain = array(
+						'id' => 'none',
+						'domain' => $this->settings['system']['hostname'],
+						'adminid' => 1, /* first admin-user (superadmin) */
+						'mod_fcgid_starter' => -1,
+						'mod_fcgid_maxrequests' => -1,
+						'guid' => $this->settings['phpfpm']['vhost_httpuser'],
+						'openbasedir' => 0,
+						'safemode' => '0',
+						'email' => $this->settings['panel']['adminmail'],
+						'loginname' => 'froxlor.panel',
+						'documentroot' => $mypath
+					);
+	
+					$php = new phpinterface($this->getDB(), $this->settings, $domain);
+
+					$this->lighttpd_data[$vhost_filename].= '  fastcgi.server = ( '."\n";
+					$this->lighttpd_data[$vhost_filename].=	"\t".'".php" => ('."\n";
+					$this->lighttpd_data[$vhost_filename].=	"\t\t".'"localhost" => ('."\n";
+					$this->lighttpd_data[$vhost_filename].=	"\t\t".'"socket" => "'.$php->getInterface()->getSocketFile().'",'."\n";
+					$this->lighttpd_data[$vhost_filename].=	"\t\t".'"check-local" => "enable",'."\n";
+					$this->lighttpd_data[$vhost_filename].=	"\t\t".'"disable-time" => 1'."\n";
+					$this->lighttpd_data[$vhost_filename].=	"\t".')'."\n";
+					$this->lighttpd_data[$vhost_filename].=	"\t".')'."\n";
+					$this->lighttpd_data[$vhost_filename].=	'  )'."\n";
+				}
+
 				if($row_ipsandports['specialsettings'] != '')
 				{
 					$this->lighttpd_data[$vhost_filename].= $row_ipsandports['specialsettings'] . "\n";
@@ -306,6 +347,7 @@ class lighttpd
 				$_inc_path = substr($_tmp_path, $_pos+1);
 
 				if((int)$domain['parentdomainid'] == 0 
+					&& isCustomerStdSubdomain((int)$domain['id']) == false
 					&& ((int)$domain['ismainbutsubto'] == 0
 					|| domainMainToSubExists($domain['ismainbutsubto']) == false) 
 				) {
@@ -316,6 +358,7 @@ class lighttpd
 					}
 				}
 				elseif((int)$domain['parentdomainid'] == 0 
+					&& isCustomerStdSubdomain((int)$domain['id']) == false
 					&& (int)$domain['ismainbutsubto'] > 0
 				) {
 					$vhost_no = '51';
@@ -558,12 +601,12 @@ class lighttpd
 				// After inserting the AWStats information, 
 				// be sure to build the awstats conf file as well
 				// and chown it using $awstats_params, #258
-				$awstats_param = array(
+				$awstats_params = array(
 					'loginname' => $domain['loginname'],
 					'guid' => $domain['guid'],
 					'documentroot' => $domain['documentroot']
 				);
-				createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_param);
+				createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params);
 			}
 		}
 
@@ -855,6 +898,15 @@ class lighttpd
 					$stats_text.= '  alias.url = ( "/webalizer/" => "'.makeCorrectFile($domain['customerroot'] . '/webalizer').'" )' . "\n";
 				}
 			}
+			// if the docroots are equal, we still have to set an alias for awstats
+			// 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')
+			{
+				$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";
+			}
 		}
 
 		return $stats_text;

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

@@ -28,241 +28,86 @@ if(@php_sapi_name() != 'cli'
 
 class lighttpd_fcgid extends lighttpd
 {
-	private $php_configs_cache = array();
-	private $admin_cache = array();
-
 	protected function composePhpOptions($domain)
 	{
 		$php_options_text = '';
 
 		if($domain['phpenabled'] == '1')
 		{
-			// This vHost has PHP enabled and we are using mod_fcgid
+			$php = new phpinterface($this->getDB(), $this->settings, $domain);
-			//create basic variables for config
+			$phpconfig = $php->getPhpConfig((int)$domain['phpsettingid']);
 
-			$configdir = makeCorrectDir($this->settings['system']['mod_fcgid_configdir'] . '/' . $domain['loginname'] . '/' . $domain['domain'] . '/');
+			// vhost data for php-fpm
-			$starter_filename = makeCorrectFile($configdir . '/php-fcgi-starter');
+			if((int)$this->settings['phpfpm']['enabled'] == 1)
-			$phpini_filename = makeCorrectFile($configdir . '/php.ini');
-			$tmpdir = makeCorrectDir($this->settings['system']['mod_fcgid_tmpdir'] . '/' . $domain['loginname'] . '/');
-
-			// create config dir if necessary
-
-			if(!is_dir($configdir))
 			{
-				safe_exec('mkdir -p ' . escapeshellarg($configdir));
+				$php_options_text = '  fastcgi.server = ( '."\n";
-				safe_exec('chown ' . $domain['guid'] . ':' . $domain['guid'] . ' ' . escapeshellarg($configdir));
+				$php_options_text.=	"\t".'".php" => ('."\n";
-			}
-
-			// create tmp dir if necessary
-
-			if(!is_dir($tmpdir))
-			{
-				safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
-				safe_exec('chown -R ' . $domain['guid'] . ':' . $domain['guid'] . ' ' . escapeshellarg($tmpdir));
-				safe_exec('chmod 0750 ' . escapeshellarg($tmpdir));
-			}
-
-			// Load php config
-
-			$phpconfig = $this->getPhpConfig((int)$domain['phpsettingid']);
-
-			$php_options_text = '  fastcgi.server = ( '."\n";
-			$file_extensions = explode(' ', $phpconfig['file_extensions']);
-			foreach($file_extensions as $f_extension)
-			{
-				$php_options_text.=	"\t".'".'.$f_extension.'" => ('."\n";
 				$php_options_text.=	"\t\t".'"localhost" => ('."\n";
-				$php_options_text.=	"\t\t".'"socket" => "/var/run/lighttpd/'.$domain['loginname'].'-'.$domain['domain'].'-php.socket",'."\n";
+				$php_options_text.=	"\t\t".'"socket" => "'.$php->getInterface()->getSocketFile().'",'."\n";
-				$php_options_text.=	"\t\t".'"bin-path" => "'.$phpconfig['binary'].' -c '.$phpini_filename.'",'."\n";
+				$php_options_text.=	"\t\t".'"check-local" => "enable",'."\n";
-				$php_options_text.=	"\t\t".'"bin-environment" => ('."\n";
+				$php_options_text.=	"\t\t".'"disable-time" => 1'."\n";
-				if((int)$domain['mod_fcgid_starter'] != - 1)
+				$php_options_text.=	"\t".')'."\n";
+				$php_options_text.=	"\t".')'."\n";
+				$php_options_text.=	'  )'."\n";				
+			}
+			// vhost data for fcgid
+			elseif((int)$this->settings['system']['mod_fcgid'] == 1)
+			{
+				$php_options_text = '  fastcgi.server = ( '."\n";
+				$file_extensions = explode(' ', $phpconfig['file_extensions']);
+				foreach($file_extensions as $f_extension)
 				{
-					$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$domain['mod_fcgid_starter'] . '",'."\n";
+					$php_options_text.=	"\t".'".'.$f_extension.'" => ('."\n";
-				}
+					$php_options_text.=	"\t\t".'"localhost" => ('."\n";
-				else
+					$php_options_text.=	"\t\t".'"socket" => "/var/run/lighttpd/'.$domain['loginname'].'-'.$domain['domain'].'-php.socket",'."\n";
-				{
+					$php_options_text.=	"\t\t".'"bin-path" => "'.$phpconfig['binary'].' -c '.$php->getInterface()->getIniFile().'",'."\n";
-					if((int)$phpconfig['mod_fcgid_starter'] != - 1)
+					$php_options_text.=	"\t\t".'"bin-environment" => ('."\n";
+					if((int)$domain['mod_fcgid_starter'] != - 1)
 					{
-						$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$phpconfig['mod_fcgid_starter'] . '",'."\n";
+						$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$domain['mod_fcgid_starter'] . '",'."\n";
 					}
 					else
 					{
-						$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$this->settings['system']['mod_fcgid_starter'] . '",'."\n";
+						if((int)$phpconfig['mod_fcgid_starter'] != - 1)
+						{
+							$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$phpconfig['mod_fcgid_starter'] . '",'."\n";
+						}
+						else
+						{
+							$php_options_text.=	"\t\t\t".'"PHP_FCGI_CHILDREN" => "' . (int)$this->settings['system']['mod_fcgid_starter'] . '",'."\n";
+						}
 					}
-				}
+	
-
+					if((int)$domain['mod_fcgid_maxrequests'] != - 1)
-				if((int)$domain['mod_fcgid_maxrequests'] != - 1)
-				{
-					$php_options_text.=	"\t\t\t".'"PHP_FCGI_MAX_REQUESTS" => "' . (int)$domain['mod_fcgid_maxrequests'] . '"'."\n";
-				}
-				else
-				{
-					if((int)$phpconfig['mod_fcgid_maxrequests'] != - 1)
 					{
-						$php_options_text.=	"\t\t\t".'"PHP_FCGI_MAX_REQUESTS" => "' . (int)$phpconfig['mod_fcgid_maxrequests'] . '"'."\n";
+						$php_options_text.=	"\t\t\t".'"PHP_FCGI_MAX_REQUESTS" => "' . (int)$domain['mod_fcgid_maxrequests'] . '"'."\n";
 					}
 					else
 					{
-						$php_options_text.=	"\t\t\t".'"PHP_FCGI_MAX_REQUESTS" => "' . (int)$this->settings['system']['mod_fcgid_maxrequests'] . '"'."\n";
+						if((int)$phpconfig['mod_fcgid_maxrequests'] != - 1)
+						{
+							$php_options_text.=	"\t\t\t".'"PHP_FCGI_MAX_REQUESTS" => "' . (int)$phpconfig['mod_fcgid_maxrequests'] . '"'."\n";
+						}
+						else
+						{
+							$php_options_text.=	"\t\t\t".'"PHP_FCGI_MAX_REQUESTS" => "' . (int)$this->settings['system']['mod_fcgid_maxrequests'] . '"'."\n";
+						}
 					}
-				}
+	
-
+					$php_options_text.=	"\t\t".')'."\n";
-				$php_options_text.=	"\t\t".')'."\n";
+					$php_options_text.=	"\t".')'."\n";
-				$php_options_text.=	"\t".')'."\n";
+					$php_options_text.=	"\t".')'."\n";
-				$php_options_text.=	"\t".')'."\n";
+	
-
+				} // foreach extension
-			} // foreach extension
+				$php_options_text.=	'  )'."\n";
-			$php_options_text.=	'  )'."\n";
-
-			// create starter
-
-			$starter_file = "#!/bin/sh\n\n";
-			$starter_file.= "#\n";
-			$starter_file.= "# starter created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
-			$starter_file.= "# Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
-			$starter_file.= "#\n\n";
-			$starter_file.= "umask 022\n";
-			$starter_file.= "PHPRC=" . escapeshellarg($configdir) . "\n";
-			$starter_file.= "export PHPRC\n";
-
-			// set number of processes for one domain
-
-			if((int)$domain['mod_fcgid_starter'] != - 1)
-			{
-				$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$domain['mod_fcgid_starter'] . "\n";
-			}
-			else
-			{
-				if((int)$phpconfig['mod_fcgid_starter'] != - 1)
-				{
-					$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$phpconfig['mod_fcgid_starter'] . "\n";
-				}
-				else
-				{
-					$starter_file.= "PHP_FCGI_CHILDREN=" . (int)$this->settings['system']['mod_fcgid_starter'] . "\n";
-				}
 			}
 
-			$starter_file.= "export PHP_FCGI_CHILDREN\n";
+			// create starter-file | config-file
-
+			$php->getInterface()->createConfig($phpconfig);
-			// set number of maximum requests for one domain
+			
-
+			// create php.ini 
-			if((int)$domain['mod_fcgid_maxrequests'] != - 1)
+			// @TODO make php-fpm support this
-			{
+			$php->getInterface()->createIniFile($phpconfig);
-				$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$domain['mod_fcgid_maxrequests'] . "\n";
-			}
-			else
-			{
-				if((int)$phpconfig['mod_fcgid_maxrequests'] != - 1)
-				{
-					$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$phpconfig['mod_fcgid_maxrequests'] . "\n";
-				}
-				else
-				{
-					$starter_file.= "PHP_FCGI_MAX_REQUESTS=" . (int)$this->settings['system']['mod_fcgid_maxrequests'] . "\n";
-				}
-			}
-
-			$starter_file.= "export PHP_FCGI_MAX_REQUESTS\n";
-
-			// Set Binary
-
-			$starter_file.= "exec " . $phpconfig['binary'] . " -c " . escapeshellarg($configdir) . "\n";
-
-			//remove +i attibute, so starter can be overwritten
-
-			if(file_exists($starter_filename))
-			{
-				removeImmutable($starter_filename);
-			}
-
-			$starter_file_handler = fopen($starter_filename, 'w');
-			fwrite($starter_file_handler, $starter_file);
-			fclose($starter_file_handler);
-			safe_exec('chmod 750 ' . escapeshellarg($starter_filename));
-			safe_exec('chown ' . $domain['guid'] . ':' . $domain['guid'] . ' ' . escapeshellarg($starter_filename));
-			setImmutable($starter_filename);
-
-			// define the php.ini
-
-			$openbasedir = '';
-			$openbasedirc = ';';
-
-			if($domain['openbasedir'] == '1')
-			{
-				$openbasedirc = '';
-				$_phpappendopenbasedir = '';
-
-				$_custom_openbasedir = explode(':', $this->settings['system']['mod_fcgid_peardir']);
-				foreach($_custom_openbasedir as $cobd)
-				{
-					$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
-				}
-
-				$_custom_openbasedir = explode(':', $this->settings['system']['phpappendopenbasedir']);
-				foreach($_custom_openbasedir as $cobd)
-				{
-					$_phpappendopenbasedir .= appendOpenBasedirPath($cobd);
-				}
-
-				if($domain['openbasedir_path'] == '0' && strstr($domain['documentroot'], ":") === false)
-				{
-					$openbasedir = appendOpenBasedirPath($domain['documentroot'], true);
-				}
-				else
-				{
-					$openbasedir = appendOpenBasedirPath($domain['customerroot'], true);
-				}
-
-				$openbasedir .= appendOpenBasedirPath($tmpdir);
-				$openbasedir .= $_phpappendopenbasedir;
-
-				$openbasedir = explode(':', $openbasedir);
-				$clean_openbasedir = array();
-				foreach($openbasedir as $number => $path)
-				{
-					if(trim($path) != '/')
-					{
-						$clean_openbasedir[] = makeCorrectDir($path);
-					}
-				}
-				$openbasedir = implode(':', $clean_openbasedir);
-			}
-			else
-			{
-				$openbasedir = 'none';
-				$openbasedirc = ';';
-			}
-
-			$admin = $this->getAdminData($domain['adminid']);
-			$php_ini_variables = array(
-				'SAFE_MODE' => ($domain['safemode'] == '0' ? 'Off' : 'On'),
-				'PEAR_DIR' => $this->settings['system']['mod_fcgid_peardir'],
-				'OPEN_BASEDIR' => $openbasedir,
-				'OPEN_BASEDIR_C' => $openbasedirc,
-				'OPEN_BASEDIR_GLOBAL' => $this->settings['system']['phpappendopenbasedir'],
-				'TMP_DIR' => $tmpdir,
-				'CUSTOMER_EMAIL' => $domain['email'],
-				'ADMIN_EMAIL' => $admin['email'],
-				'DOMAIN' => $domain['domain'],
-				'CUSTOMER' => $domain['loginname'],
-				'ADMIN' => $admin['loginname']
-			);
-
-			//insert a small header for the file
-
-			$phpini_file = ";\n";
-			$phpini_file.= "; php.ini created/changed on " . date("Y.m.d H:i:s") . " for domain '" . $domain['domain'] . "' with id #" . $domain['id'] . " from php template '" . $phpconfig['description'] . "' with id #" . $phpconfig['id'] . "\n";
-			$phpini_file.= "; Do not change anything in this file, it will be overwritten by the Froxlor Cronjob!\n";
-			$phpini_file.= ";\n\n";
-			$phpini_file.= replace_variables($phpconfig['phpsettings'], $php_ini_variables);
-			$phpini_file = str_replace('"none"', 'none', $phpini_file);
-			$phpini_file = preg_replace('/\"+/', '"', $phpini_file);
-			$phpini_file_handler = fopen($phpini_filename, 'w');
-			fwrite($phpini_file_handler, $phpini_file);
-			fclose($phpini_file_handler);
-			safe_exec('chown root:0 ' . escapeshellarg($phpini_filename));
-			safe_exec('chmod 0644 ' . escapeshellarg($phpini_filename));
 		}
 		else
 		{
@@ -272,36 +117,46 @@ class lighttpd_fcgid extends lighttpd
 		return $php_options_text;
 	}
 
-	private function getPhpConfig($php_config_id)
+	public function createOwnVhostStarter()
 	{
-		$php_config_id = intval($php_config_id);
+		if ($this->settings['phpfpm']['enabled'] == '1'
+			&& $this->settings['phpfpm']['enabled_ownvhost'] == '1'
+		) {
+			$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); // /var/www/froxlor, needed for chown
 
-		// If domain has no config, we will use the default one.
+			$user = $this->settings['phpfpm']['vhost_httpuser'];
+			$group = $this->settings['phpfpm']['vhost_httpgroup'];	
 
-		if($php_config_id == 0)
+			$domain = array(
-		{
+				'id' => 'none',
-			$php_config_id = 1;
+				'domain' => $this->settings['system']['hostname'],
+				'adminid' => 1, /* first admin-user (superadmin) */
+				'mod_fcgid_starter' => -1,
+				'mod_fcgid_maxrequests' => -1,
+				'guid' => $user,
+				'openbasedir' => 0,
+				'safemode' => '0',
+				'email' => $this->settings['panel']['adminmail'],
+				'loginname' => 'froxlor.panel',
+				'documentroot' => $mypath
+			);
+
+			// all the files and folders have to belong to the local user
+			// now because we also use fcgid for our own vhost
+			safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($mypath));
+						
+			// get php.ini for our own vhost
+			$php = new phpinterface($this->getDB(), $this->settings, $domain);
+
+			// @FIXME don't use fcgid settings, but we don't have anything else atm
+			$phpconfig = $php->getPhpConfig($this->settings['system']['mod_fcgid_defaultini_ownvhost']);
+
+			// create starter-file | config-file
+			$php->getInterface()->createConfig($phpconfig);
+			
+			// create php.ini 
+			// @TODO make php-fpm support this
+			$php->getInterface()->createIniFile($phpconfig);
 		}
-
-		if(!isset($this->php_configs_cache[$php_config_id]))
-		{
-			$this->php_configs_cache[$php_config_id] = $this->getDB()->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = " . (int)$php_config_id);
-		}
-
-		return $this->php_configs_cache[$php_config_id];
-	}
-
-	private function getAdminData($adminid)
-	{
-		$adminid = intval($adminid);
-
-		if(!isset($this->admin_cache[$adminid]))
-		{
-			$this->admin_cache[$adminid] = $this->getDB()->query_first("SELECT `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid` = " . (int)$adminid);
-		}
-
-		return $this->admin_cache[$adminid];
 	}
 }
-
-?>

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

@@ -0,0 +1,990 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Configfiles
+ * @version    $Id$
+ */
+
+if(@php_sapi_name() != 'cli'
+&& @php_sapi_name() != 'cgi'
+&& @php_sapi_name() != 'cgi-fcgi')
+{
+	die('This script only works in the shell.');
+}
+
+class nginx
+{
+	private $db = false;
+	private $logger = false;
+	private $debugHandler = false;
+	private $idnaConvert = false;
+
+	//	protected
+
+	protected $settings = array();
+	protected $nginx_data = array();
+	protected $needed_htpasswds = array();
+	protected $auth_backend_loaded = false;
+	protected $htpasswds_data = array();
+	protected $known_htpasswdsfilenames = array();
+	protected $mod_accesslog_loaded = "0";
+	protected $vhost_root_autoindex = false;
+	protected $known_vhostfilenames = array();
+
+	public function __construct($db, $logger, $debugHandler, $idnaConvert, $settings)
+	{
+		$this->db = $db;
+		$this->logger = $logger;
+		$this->debugHandler = $debugHandler;
+		$this->idnaConvert = $idnaConvert;
+		$this->settings = $settings;
+	}
+
+	protected function getDB()
+	{
+		return $this->db;
+	}
+
+	public function reload()
+	{
+		fwrite($this->debugHandler, '   nginx::reload: reloading nginx' . "\n");
+		$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading nginx');
+		safe_exec($this->settings['system']['apachereload_command']);
+
+		/**
+		 * nginx does not auto-spawn fcgi-processes
+		 */
+		if ($this->settings['system']['phpreload_command'] != ''
+			&& (int)$this->settings['phpfpm']['enabled'] == 0
+		) {
+		 	fwrite($this->debugHandler, '   nginx::reload: restarting php processes' . "\n");
+			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'restarting php processes');
+			safe_exec($this->settings['system']['phpreload_command']);
+		}
+		elseif((int)$this->settings['phpfpm']['enabled'] == 1)
+		{
+			fwrite($this->debugHandler, '   nginx::reload: reloading php-fpm' . "\n");
+			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading php-fpm');
+			safe_exec(escapeshellcmd($this->settings['phpfpm']['reload']));
+		}
+	}
+
+	public function createVirtualHosts()
+	{
+	}
+
+	public function createFileDirOptions()
+	{
+	}
+
+	/**
+	 * define a default ErrorDocument-statement, bug #unknown-yet
+	 */
+	private function _createStandardErrorHandler()
+	{
+		if($this->settings['defaultwebsrverrhandler']['enabled'] == '1'
+			&& ($this->settings['defaultwebsrverrhandler']['err401'] != ''
+			|| $this->settings['defaultwebsrverrhandler']['err403'] != ''
+			|| $this->settings['defaultwebsrverrhandler']['err404'] != ''
+			|| $this->settings['defaultwebsrverrhandler']['err500'] != '')
+		) {
+			$vhosts_folder = '';
+			if(is_dir($this->settings['system']['apacheconf_vhost']))
+			{
+				$vhosts_folder = makeCorrectDir($this->settings['system']['apacheconf_vhost']);
+			} else {
+				$vhosts_folder = makeCorrectDir(dirname($this->settings['system']['apacheconf_vhost']));
+			}
+			
+			$vhosts_filename = makeCorrectFile($vhosts_folder . '/05_froxlor_default_errorhandler.conf');
+
+			if(!isset($this->nginx_data[$vhosts_filename]))
+			{
+				$this->nginx_data[$vhosts_filename] = '';
+			}
+	
+			if($this->settings['defaultwebsrverrhandler']['err401'] != '')
+			{
+				$this->nginx_data[$vhosts_filename].= 'error_page 401 ' . $this->settings['defaultwebsrverrhandler']['err401'] . ';' . "\n";
+			}
+
+			if($this->settings['defaultwebsrverrhandler']['err403'] != '')
+			{
+				$this->nginx_data[$vhosts_filename].= 'error_page 403 ' . $this->settings['defaultwebsrverrhandler']['err403'] . ';' . "\n";
+			}
+
+			if($this->settings['defaultwebsrverrhandler']['err404'] != '')
+			{
+				$this->nginx_data[$vhosts_filename].= 'error_page 404 ' . $this->settings['defaultwebsrverrhandler']['err404'] . ';' . "\n";
+			}
+			
+			if($this->settings['defaultwebsrverrhandler']['err500'] != '')
+			{
+				$this->nginx_data[$vhosts_filename].= 'error_page 500 ' . $this->settings['defaultwebsrverrhandler']['err500'] . ';' . "\n";
+			}
+
+		}
+	}
+	
+	public function createIpPort()
+	{
+		$query = "SELECT * FROM `" . TABLE_PANEL_IPSANDPORTS . "` ORDER BY `ip` ASC, `port` ASC";
+		$result_ipsandports = $this->db->query($query);
+
+		while($row_ipsandports = $this->db->fetch_array($result_ipsandports))
+		{
+			if(filter_var($row_ipsandports['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+			{
+				$ip = '[' . $row_ipsandports['ip'] . ']';
+				$port = $row_ipsandports['port'];
+			}
+			else
+			{
+				$ip = $row_ipsandports['ip'];
+				$port = $row_ipsandports['port'];
+			}
+
+			fwrite($this->debugHandler, '  nginx::createIpPort: creating ip/port settings for  ' . $ip . ":" . $port . "\n");
+			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'creating ip/port settings for  ' . $ip . ":" . $port);
+			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/10_froxlor_ipandport_' . trim(str_replace(':', '.', $row_ipsandports['ip']), '.') . '.' . $row_ipsandports['port'] . '.conf');
+
+			if(!isset($this->nginx_data[$vhost_filename]))
+			{
+				$this->nginx_data[$vhost_filename] = '';
+			}
+
+			$this->nginx_data[$vhost_filename].= 'server { ' . "\n";
+
+			/**
+			 * this HAS to be set for the default host in nginx or else no vhost will work
+			 */
+			$this->nginx_data[$vhost_filename].= "\t". 'listen    ' . $ip . ':' . $port . ' default;' . "\n";
+
+			if($row_ipsandports['vhostcontainer'] == '1')
+			{
+				$this->nginx_data[$vhost_filename].= "\t".'# Froxlor default vhost' . "\n";
+				$this->nginx_data[$vhost_filename].= "\t".'server_name    ' . $this->settings['system']['hostname'] . ';' . "\n";
+			}
+
+			$this->nginx_data[$vhost_filename].= "\t".'access_log      /var/log/nginx/access.log;' . "\n";
+
+			if($row_ipsandports['vhostcontainer'] == '1')
+			{
+				$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__))));
+				$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";
+				$this->nginx_data[$vhost_filename].= "\t".'}'."\n";
+
+				if($row_ipsandports['specialsettings'] != '')
+				{
+					$this->nginx_data[$vhost_filename].= $row_ipsandports['specialsettings'] . "\n";
+				}
+			}
+				
+			/**
+			 * SSL config options
+			 */
+			if($row_ipsandports['ssl'] == '1')
+			{
+				if($row_ipsandports['ssl_cert_file'] == '')
+				{
+					$row_ipsandports['ssl_cert_file'] = $this->settings['system']['ssl_cert_file'];
+				}
+
+				if($row_ipsandports['ssl_key_file'] == '')
+				{
+					$row_ipsandports['ssl_key_file'] = $this->settings['system']['ssl_key_file'];
+				}
+
+				if($row_ipsandports['ssl_ca_file'] == '')
+				{
+					$row_ipsandports['ssl_ca_file'] = $this->settings['system']['ssl_ca_file'];
+				}
+
+				if($row_ipsandports['ssl_cert_file'] != '')
+				{
+					$this->nginx_data[$vhost_filename].= "\t" . 'ssl on;' . "\n";
+					$this->nginx_data[$vhost_filename].= "\t" . 'ssl_certificate ' . makeCorrectFile($row_ipsandports['ssl_cert_file']) . ';' . "\n";
+					$this->nginx_data[$vhost_filename].= "\t" . 'ssl_certificate_key ' .makeCorrectFile($row_ipsandports['ssl_key_file']) . ';' .  "\n";
+						
+					if($row_ipsandports['ssl_ca_file'] != '')
+					{
+						$this->lighttpd_data[$vhost_filename].= 'ssl_client_certificate ' . makeCorrectFile($row_ipsandports['ssl_ca_file']) . ';' . "\n";
+					}
+				}
+			}
+
+			$this->nginx_data[$vhost_filename].= "\t".'location ~ \.php$ {'."\n";
+			$this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_index index.php;'."\n";
+			$this->nginx_data[$vhost_filename].= "\t\t".'include /etc/nginx/fastcgi_params;'."\n";
+			$this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n";
+			if((int)$this->settings['phpfpm']['enabled'] == 1)
+			{
+				$domain = array(
+					'id' => 'none',
+					'domain' => $this->settings['system']['hostname'],
+					'adminid' => 1, /* first admin-user (superadmin) */
+					'mod_fcgid_starter' => -1,
+					'mod_fcgid_maxrequests' => -1,
+					'guid' => $this->settings['phpfpm']['vhost_httpuser'],
+					'openbasedir' => 0,
+					'safemode' => '0',
+					'email' => $this->settings['panel']['adminmail'],
+					'loginname' => 'froxlor.panel',
+					'documentroot' => $mypath
+				);
+
+				$php = new phpinterface($this->getDB(), $this->settings, $domain);
+				$this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_pass unix:' . $php->getInterface()->getSocketFile() . ';' . "\n";
+			}
+			else
+			{
+				$this->nginx_data[$vhost_filename].= "\t\t".'fastcgi_pass ' . $this->settings['system']['nginx_php_backend'] . ';' . "\n";
+			}
+			$this->nginx_data[$vhost_filename].= "\t".'}'."\n";
+
+			$this->nginx_data[$vhost_filename].= '}' . "\n\n";
+			// End of Froxlor server{}-part
+
+			$this->createNginxHosts($row_ipsandports['ip'], $row_ipsandports['port'], $row_ipsandports['ssl'], $vhost_filename);
+		}
+		
+		/**
+		 * standard error pages
+		 */
+		$this->_createStandardErrorHandler();
+	}
+
+	protected function createNginxHosts($ip, $port, $ssl, $vhost_filename)
+	{
+		$query = "SELECT * FROM " . TABLE_PANEL_IPSANDPORTS . " WHERE `ip`='" . $ip . "' AND `port`='" . $port . "'";
+		$ipandport = $this->db->query_first($query);
+
+		if($ssl == '0')
+		{
+			$query2 = "SELECT `d`.*, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot`, `c`.`deactivated`, `c`.`phpenabled` AS `phpenabled` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) WHERE `d`.`ipandport`='" . $ipandport['id'] . "' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC";
+		}
+		else
+		{
+			$query2 = "SELECT `d`.*, `pd`.`domain` AS `parentdomain`, `c`.`loginname`, `c`.`guid`, `c`.`email`, `c`.`documentroot` AS `customerroot`, `c`.`deactivated`, `c`.`phpenabled` AS `phpenabled` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `pd` ON (`pd`.`id` = `d`.`parentdomainid`) WHERE `d`.`ssl_ipandport`='" . $ipandport['id'] . "' AND `d`.`aliasdomain` IS NULL ORDER BY `d`.`iswildcarddomain`, `d`.`domain` ASC";
+		}
+
+		$included_vhosts = array();
+		$result_domains = $this->db->query($query2);
+		while($domain = $this->db->fetch_array($result_domains))
+		{
+			if (is_dir($this->settings['system']['apacheconf_vhost']))
+			{
+				safe_exec('mkdir -p '.escapeshellarg(makeCorrectDir($this->settings['system']['apacheconf_vhost'])));
+				$vhost_filename = $this->getVhostFilename($domain);
+			}
+
+			if(!isset($this->nginx_data[$vhost_filename]))
+			{
+				$this->nginx_data[$vhost_filename] = '';
+			}
+
+			$query = "SELECT * FROM " . TABLE_PANEL_IPSANDPORTS . " WHERE `id`='" . $domain['ipandport'] . "'";
+			$ipandport = $this->db->query_first($query);
+			$domain['ip'] = $ipandport['ip'];
+			$domain['port'] = $ipandport['port'];
+			$domain['ssl_cert_file'] = $ipandport['ssl_cert_file'];
+
+			if( (!empty($this->nginx_data[$vhost_filename]) && !is_dir($this->settings['system']['apacheconf_vhost']))
+			|| is_dir($this->settings['system']['apacheconf_vhost']))
+			{
+				if($ssl == '1')
+				{
+					$ssl_vhost = true;
+					$ips_and_ports_index = 'ssl_ipandport';
+				}
+				else
+				{
+					$ssl_vhost = false;
+					$ips_and_ports_index = 'ipandport';
+				}
+
+				$this->nginx_data[$vhost_filename].= $this->getVhostContent($domain, $ssl_vhost);
+				$this->nginx_data[$vhost_filename].= isset($this->needed_htpasswds[$domain[$ips_and_ports_index]]) ? $this->needed_htpasswds[$domain[$ips_and_ports_index]] . "\n" : '';
+			}
+		}
+	}
+
+	protected function getVhostFilename($domain, $ssl_vhost = false)
+	{
+		if((int)$domain['parentdomainid'] == 0
+		&& isCustomerStdSubdomain((int)$domain['id']) == false
+		&& ((int)$domain['ismainbutsubto'] == 0
+		|| domainMainToSubExists($domain['ismainbutsubto']) == false)
+		) {
+			$vhost_no = '22';
+		}
+		elseif((int)$domain['parentdomainid'] == 0
+		&& isCustomerStdSubdomain((int)$domain['id']) == false
+		&& (int)$domain['ismainbutsubto'] > 0
+		) {
+			$vhost_no = '21';
+		}
+		else
+		{
+			$vhost_no = '20';
+		}
+
+		if($ssl_vhost === true)
+		{
+			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/'.$vhost_no.'_froxlor_ssl_vhost_' . $domain['domain'] . '.conf');
+		}
+		else
+		{
+			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/'.$vhost_no.'_froxlor_normal_vhost_' . $domain['domain'] . '.conf');
+		}
+
+		return $vhost_filename;
+	}
+
+	protected function getVhostContent($domain, $ssl_vhost = false)
+	{
+		if($ssl_vhost === true
+		&& $domain['ssl'] != '1')
+		{
+			return '';
+		}
+
+		if($ssl_vhost === true
+		&& $domain['ssl'] == '1')
+		{
+			$query = "SELECT * FROM " . TABLE_PANEL_IPSANDPORTS . " WHERE `id`='" . $domain['ssl_ipandport'] . "'";
+		}
+		else
+		{
+			$query = "SELECT * FROM " . TABLE_PANEL_IPSANDPORTS . " WHERE `id`='" . $domain['ipandport'] . "'";
+		}
+
+		$ipandport = $this->db->query_first($query);
+		$domain['ip'] = $ipandport['ip'];
+		$domain['port'] = $ipandport['port'];
+		$domain['ssl_cert_file'] = $ipandport['ssl_cert_file'];
+
+		if(filter_var($domain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+		{
+			$ipport = '[' . $domain['ip'] . ']:' . $domain['port'];
+		}
+		else
+		{
+			$ipport = $domain['ip'] . ':' . $domain['port'];
+		}
+
+		$vhost_content = '';
+		$vhost_content.= 'server { ' . "\n";
+		$vhost_content.= "\t" . 'listen ' . $ipport . ';' . "\n";
+
+		$vhost_content.= $this->getServerNames($domain);
+
+		if(preg_match('/^https?\:\/\//', $domain['documentroot']))
+		{
+			$vhost_content.= "\t".'rewrite ^(.*) '.$this->idnaConvert->encode($domain['documentroot']).'$1 permanent;'."\n";
+		}
+		else
+		{
+			mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true);
+
+			$vhost_content.= $this->getLogFiles($domain);
+			$vhost_content.= $this->getWebroot($domain, $ssl_vhost);
+			$vhost_content.= $this->create_pathOptions($domain);
+			//$vhost_content.= $this->create_htaccess($domain);
+			$vhost_content.= $this->composePhpOptions($domain);
+			$vhost_content.= $this->getStats($domain);
+
+			if ($domain['specialsettings'] != "") {
+				$vhost_content.= $domain['specialsettings'] . "\n";
+			}
+		}
+		$vhost_content.= '}' . "\n\n";
+
+		return $vhost_content;
+	}
+
+	protected function create_pathOptions($domain)
+	{
+		$has_location = false;
+
+		$query = "SELECT * FROM " . TABLE_PANEL_HTACCESS . " WHERE `path` LIKE '" . $domain['documentroot'] . "%'";
+		$result = $this->db->query($query);
+
+		$path_options = '';
+
+		$htpasswds = $this->getHtpasswds($domain);
+
+		while($row = $this->db->fetch_array($result))
+		{
+			if(!empty($row['error404path']))
+			{
+				$path_options.= "\t".'error_page   404    ' . $row['error404path'] . ';' . "\n";
+			}
+
+			if(!empty($row['error403path']))
+			{
+				$path_options.= "\t".'error_page   403    ' . $row['error403path'] . ';' . "\n";
+			}
+
+			if(!empty($row['error500path']))
+			{
+				$path_options.= "\t".'error_page   502 503 504    ' . $row['error500path'] . ';' . "\n";
+			}
+
+			if($row['options_indexes'] != '0')
+			{
+				$path = makeCorrectDir(substr($row['path'], strlen($domain['documentroot']) - 1));
+
+				mkDirWithCorrectOwnership($domain['documentroot'], $row['path'], $domain['guid'], $domain['guid']);
+
+				if (trim($path) == '/') {
+					$this->vhost_root_autoindex = true;
+				}
+				else
+				{
+					$path_options.= "\t".'location ' . $path . ' {' . "\n";
+					$path_options.= "\t\t" . 'autoindex  on;' . "\n";
+					// check if we have a htpasswd for this path
+					// (damn nginx does not like more than one
+					// 'location'-part with the same path)
+					if(count($htpasswds) > 0)
+					{
+						foreach($htpasswds as $idx => $single)
+						{
+							if($path == $single['path'])
+							{
+								$path_options.= "\t\t" . 'auth_basic            "Restricted Area";' . "\n";
+								$path_options.= "\t\t" . 'auth_basic_user_file  ' . $single['usrf'] . ';'."\n";
+								// remove already used entries so we do not have doubles
+								unset($htpasswds[$idx]);
+							}
+						}
+					}
+					$path_options.= "\t".'}' . "\n";
+
+					$this->vhost_root_autoindex = false;
+				}
+			}
+			
+			/**
+			 * Perl suport
+			 * required the fastCGI wrapper to be running to receive the CGI requests.
+			 */
+			if(customerHasPerlEnabled($domain['customerid'])
+			&& $row['options_cgi'] != '0')
+			{
+				$path = makeCorrectDir(substr($row['path'], strlen($domain['documentroot']) - 1));
+				mkDirWithCorrectOwnership($domain['documentroot'], $row['path'], $domain['guid'], $domain['guid']);
+
+				// We need to remove the last slash, otherwise the regex wouldn't work
+				if($row['path'] != $domain['documentroot']) {
+					$path = substr($path, 0, -1);
+				}
+				$path_options.= "\t" . 'location ~ \(.pl|.cgi)$ {' . "\n";
+				$path_options.= "\t\t" . 'gzip off; #gzip makes scripts feel slower since they have to complete before getting gzipped' . "\n";
+    			$path_options.= "\t\t" . 'fastcgi_pass  '. $this->settings['system']['perl_server'] . ';' . "\n";
+   				$path_options.= "\t\t" . 'fastcgi_index index.cgi;' . "\n";
+				$path_options.= "\t\t" . 'include /etc/nginx/fastcgi_params;'."\n";
+				$path_options.= "\t" . '}' . "\n";
+			}
+			
+		}
+
+		/*
+		 * now the rest of the htpasswds
+		 */
+		if(count($htpasswds) > 0)
+		{
+			foreach($htpasswds as $idx => $single)
+			{
+				$path_options.= "\t" . 'location ' . $single['path'] . ' {' . "\n";
+				$path_options.= "\t\t" . 'auth_basic            "Restricted Area";' . "\n";
+				$path_options.= "\t\t" . 'auth_basic_user_file  ' . $single['usrf'] . ';'."\n";
+				$path_options.= "\t".'}' . "\n";
+			}
+		}
+
+		return $path_options;
+	}
+
+	protected function getHtpasswds($domain)
+	{
+		$query = "SELECT * FROM " . TABLE_PANEL_HTPASSWDS . " WHERE `customerid`='" . $domain['customerid'] . "'";
+		$result = $this->db->query($query);
+
+		$returnval = array();
+		$x = 0;
+		while($row_htpasswds = $this->db->fetch_array($result))
+		{
+			if(count($row_htpasswds['htpasswds']) > 0)
+			{
+				$htpasswd_filename = makeCorrectFile($this->settings['system']['apacheconf_htpasswddir'] . '/' . $row_htpasswds['customerid'] . '-' . md5($row_htpasswds['path']) . '.htpasswd');
+
+				if(!isset($this->htpasswds_data[$htpasswd_filename]))
+				{
+					$this->htpasswds_data[$htpasswd_filename] = '';
+				}
+
+				foreach($row['htpasswds'] as $row_htpasswd)
+				{
+					$this->htpasswds_data[$htpasswd_filename].= $row_htpasswd['username'] . ':' . $row_htpasswd['password'] . "\n";
+				}
+
+				$path = makeCorrectDir(substr($row['path'], strlen($domain['documentroot']) - 1));
+
+				$returnval[$x]['path'] = $path;
+				$returnval[$x]['root'] = makeCorrectDir($domain['documentroot']);
+				$returnval[$x]['usrf'] = $htpasswd_filename;
+				$x++;
+			}
+		}
+		return $returnval;
+	}
+
+	protected function composePhpOptions($domain)
+	{
+		$phpopts = '';
+		if($domain['phpenabled'] == '1')
+		{
+			$phpopts = "\t".'location ~ \.php$ {'."\n";
+			$phpopts.= "\t\t".'fastcgi_index index.php;'."\n";
+			$phpopts.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n";
+			$phpopts.= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n";
+			$phpopts.= "\t\t".'fastcgi_pass ' . $this->settings['system']['nginx_php_backend'] . ';' . "\n";
+			$phpopts.= "\t".'}'."\n";
+		}
+		return $phpopts;
+	}
+
+	protected function getWebroot($domain, $ssl)
+	{
+		$webroot_text = '';
+
+		if($domain['deactivated'] == '1'
+		&& $this->settings['system']['deactivateddocroot'] != '')
+		{
+			$webroot_text.= "\t".'# Using docroot for deactivated users...' . "\n";
+			$webroot_text.= "\t".'root     '.$this->settings['system']['deactivateddocroot'].';'."\n";
+		}
+		else
+		{
+			$webroot_text.= "\t".'root     '.makeCorrectDir($domain['documentroot']).';'."\n";
+		}
+
+		$webroot_text.= "\t".'location / {'."\n";
+		$webroot_text.= "\t\t".'index    index.php index.html index.htm;'."\n";
+
+		if($this->vhost_root_autoindex) {
+			$webroot_text.= "\t\t".'autoindex on;'."\n";
+			$this->vhost_root_autoindex = false;
+		}
+
+		$webroot_text.= "\t".'}'."\n";
+
+		return $webroot_text;
+	}
+
+	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')
+				{
+					$stats_text.= "\t" . 'location /awstats {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']) . ';' . "\n";
+					$stats_text.= "\t" . '}' . "\n";
+					$stats_text.= "\t" . 'location /awstats-icon {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' . makeCorrectDir($this->settings['system']['awstats_icons']) . ';' . "\n";
+					$stats_text.= "\t\t" . '}' . "\n";
+				}
+				else
+				{
+					$stats_text.= "\t" . 'location /webalizer {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' .  makeCorrectFile($domain['customerroot'] . '/webalizer/' . $domain['domain']) . ';' . "\n";
+					$stats_text.= "\t" . '}' . "\n";
+
+				}
+			}
+			else
+			{
+				if($this->settings['system']['awstats_enabled'] == '1')
+				{
+					$stats_text.= "\t" . 'location /awstats {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['parentdomain']) . ';' . "\n";
+					$stats_text.= "\t" . '}' . "\n";
+					$stats_text.= "\t" . 'location /awstats-icon {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' . makeCorrectDir($this->settings['system']['awstats_icons']) . ';' . "\n";
+					$stats_text.= "\t\t" . '}' . "\n";
+				}
+				else
+				{
+					$stats_text.= "\t" . 'location /webalizer {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' .  makeCorrectFile($domain['customerroot'] . '/webalizer/' . $domain['parentdomain']) . ';' . "\n";
+					$stats_text.= "\t" . '}' . "\n";
+
+				}
+			}
+		}
+		else
+		{
+			if($domain['customerroot'] != $domain['documentroot'])
+			{
+				if($this->settings['system']['awstats_enabled'] == '1')
+				{
+					$stats_text.= "\t" . 'location /awstats {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' . makeCorrectFile($domain['customerroot'] . '/awstats/' . $domain['domain']) . ';' . "\n";
+					$stats_text.= "\t" . '}' . "\n";
+					$stats_text.= "\t" . 'location /awstats-icon {' . "\n";
+					$stats_text.= "\t\t" . 'alias ' . makeCorrectDir($this->settings['system']['awstats_icons']) . ';' . "\n";
+					$stats_text.= "\t\t" . '}' . "\n";
+				}
+				else
+				{
+					$stats_text.= "\t" . 'location /webalizer {' . "\n";
+					$stats_text.= "\t\t" . 'root ' .  makeCorrectFile($domain['customerroot'] . '/webalizer/' . $domain['domain']) . ';' . "\n";
+					$stats_text.= "\t" . '}' . "\n";
+
+				}
+			}
+			// if the docroots are equal, we still have to set an alias for awstats
+			// 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')
+			{
+				$stats_text.= "\t" . 'location /awstats {' . "\n";
+				$stats_text.= "\t\t" . 'alias ' . makeCorrectFile($domain['documentroot'] . '/awstats/' . $domain['domain']) . ';' . "\n";
+				$stats_text.= "\t" . '}' . "\n";
+				$stats_text.= "\t" . 'location /awstats-icon {' . "\n";
+				$stats_text.= "\t\t" . 'alias ' . makeCorrectDir($this->settings['system']['awstats_icons']) . ';' . "\n";
+				$stats_text.= "\t\t" . '}' . "\n";
+			}
+		}
+		
+
+		return $stats_text;
+	}
+
+	/**
+	 * @TODO mod_log_sql
+	 */
+	protected function getLogFiles($domain)
+	{
+		$logfiles_text = '';
+
+		if($domain['speciallogfile'] == '1'
+		&& $this->settings['system']['mod_log_sql'] != '1')
+		{
+			if($domain['parentdomainid'] == '0')
+			{
+				$speciallogfile = '-' . $domain['domain'];
+			}
+			else
+			{
+				$speciallogfile = '-' . $domain['parentdomain'];
+			}
+		}
+		else
+		{
+			$speciallogfile = '';
+		}
+
+		// 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']);
+
+		$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)
+			{
+				// 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)
+				{
+					$server_alias.= ' ' . $alias_domain['domain'] . ' ';
+
+					if($alias_domain['iswildcarddomain'] == '1')
+					{
+						$server_alias.= '*.' . $domain['domain'];
+					}
+					else
+					{
+						if($alias_domain['wwwserveralias'] == '1')
+						{
+							$server_alias.= 'www.' . $alias_domain['domain'];
+						}
+						else
+						{
+							$server_alias.= '';
+						}
+					}
+				}
+
+				if($domain['iswildcarddomain'] == '1')
+				{
+					$alias = '*.' . $domain['domain'];
+				}
+				else
+				{
+					if($domain['wwwserveralias'] == '1')
+					{
+						$alias = 'www.' . $domain['domain'];
+					}
+					else
+					{
+						$alias = '';
+					}
+				}
+
+				// After inserting the AWStats information,
+				// be sure to build the awstats conf file as well
+				// and chown it using $awstats_params, #258
+				$awstats_params = array(
+					'loginname' => $domain['loginname'],
+					'guid' => $domain['guid'],
+					'documentroot' => $domain['documentroot']
+				);
+				createAWStatsConf($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log', $domain['domain'], $alias . $server_alias, $domain['customerroot'], $awstats_params);
+			}
+		}
+
+		return $logfiles_text;
+	}
+
+	public function createOwnVhostStarter()
+	{
+	}
+
+	protected function getServerNames($domain)
+	{
+		$server_alias = '';
+
+		if($domain['iswildcarddomain'] == '1')
+		{
+			$server_alias = '*.' . $domain['domain'];
+		}
+		else
+		{
+			if($domain['wwwserveralias'] == '1')
+			{
+				$server_alias = 'www.' . $domain['domain'];
+			}
+			else
+			{
+				$server_alias = '';
+			}
+		}
+
+		$alias_domains = $this->db->query('SELECT `domain`, `iswildcarddomain`, `wwwserveralias` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . $domain['id'] . '\'');
+
+		while(($alias_domain = $this->db->fetch_array($alias_domains)) !== false)
+		{
+			$server_alias.= ' ' . $alias_domain['domain'];
+
+			if($alias_domain['iswildcarddomain'] == '1')
+			{
+				$server_alias.= ' *.' . $alias_domain['domain'];
+			}
+			else
+			{
+				if($alias_domain['wwwserveralias'] == '1')
+				{
+					$server_alias.= ' www.' . $alias_domain['domain'];
+				}
+			}
+		}
+
+		$servernames_text = "\t".'server_name    '.$domain['domain'];
+		if(trim($server_alias) != '')
+		{
+			$servernames_text.=  ' '.$server_alias;
+		}
+		$servernames_text.= ';' . "\n";
+
+		return $servernames_text;
+	}
+
+	public function writeConfigs()
+	{
+		fwrite($this->debugHandler, '  nginx::writeConfigs: rebuilding ' . $this->settings['system']['apacheconf_vhost'] . "\n");
+		$this->logger->logAction(CRON_ACTION, LOG_INFO, "rebuilding " . $this->settings['system']['apacheconf_vhost']);
+
+		if(!isConfigDir($this->settings['system']['apacheconf_vhost']))
+		{
+			// Save one big file
+			$vhosts_file = '';
+				
+			// sort by filename so the order is:
+			// 1. subdomains
+			// 2. subdomains as main-domains
+			// 3. main-domains
+			ksort($this->nginx_data);
+				
+			foreach($this->nginx_data as $vhosts_filename => $vhost_content)
+			{
+				$vhosts_file.= $vhost_content . "\n\n";
+			}
+
+			$vhosts_filename = $this->settings['system']['apacheconf_vhost'];
+
+			// Apply header
+
+			$vhosts_file = '# ' . basename($vhosts_filename) . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n" . "\n" . $vhosts_file;
+			$vhosts_file_handler = fopen($vhosts_filename, 'w');
+			fwrite($vhosts_file_handler, $vhosts_file);
+			fclose($vhosts_file_handler);
+		}
+		else
+		{
+			if(!file_exists($this->settings['system']['apacheconf_vhost']))
+			{
+				fwrite($this->debugHandler, '  nginx::writeConfigs: mkdir ' . escapeshellarg(makeCorrectDir($this->settings['system']['apacheconf_vhost'])) . "\n");
+				$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'mkdir ' . escapeshellarg(makeCorrectDir($this->settings['system']['apacheconf_vhost'])));
+				safe_exec('mkdir -p ' . escapeshellarg(makeCorrectDir($this->settings['system']['apacheconf_vhost'])));
+			}
+
+			// Write a single file for every vhost
+
+			foreach($this->nginx_data as $vhosts_filename => $vhosts_file)
+			{
+				$this->known_filenames[] = basename($vhosts_filename);
+
+				// Apply header
+
+				$vhosts_file = '# ' . basename($vhosts_filename) . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n" . "\n" . $vhosts_file;
+
+				if(!empty($vhosts_filename))
+				{
+					$vhosts_file_handler = fopen($vhosts_filename, 'w');
+					fwrite($vhosts_file_handler, $vhosts_file);
+					fclose($vhosts_file_handler);
+				}
+
+			}
+				
+			$this->wipeOutOldVhostConfigs();
+				
+		}
+
+		/*
+		 * htaccess stuff
+		 */
+		if(count($this->htpasswds_data) > 0)
+		{
+			if(!file_exists($this->settings['system']['apacheconf_htpasswddir']))
+			{
+				$umask = umask();
+				umask(0000);
+				mkdir($this->settings['system']['apacheconf_htpasswddir'], 0751);
+				umask($umask);
+			}
+			elseif(!is_dir($this->settings['system']['apacheconf_htpasswddir']))
+			{
+				fwrite($this->debugHandler, '  cron_tasks: WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!' . "\n");
+				echo 'WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!';
+				$this->logger->logAction(CRON_ACTION, LOG_WARNING, 'WARNING!!! ' . $this->settings['system']['apacheconf_htpasswddir'] . ' is not a directory. htpasswd directory protection is disabled!!!');
+			}
+
+			if(is_dir($this->settings['system']['apacheconf_htpasswddir']))
+			{
+				foreach($this->htpasswds_data as $htpasswd_filename => $htpasswd_file)
+				{
+					$this->known_htpasswdsfilenames[] = basename($htpasswd_filename);
+					$htpasswd_file_handler = fopen($htpasswd_filename, 'w');
+					fwrite($htpasswd_file_handler, $htpasswd_file);
+					fclose($htpasswd_file_handler);
+				}
+
+				$this->wipeOutOldHtpasswdConfigs();
+			}
+		}
+	}
+
+	protected function wipeOutOldVhostConfigs()
+	{
+		fwrite($this->debugHandler, '  nginx::wipeOutOldVhostConfigs: cleaning ' . $this->settings['system']['apacheconf_vhost'] . "\n");
+		$this->logger->logAction(CRON_ACTION, LOG_INFO, "cleaning " . $this->settings['system']['apacheconf_vhost']);
+
+		if(isConfigDir($this->settings['system']['apacheconf_vhost'], true))
+		{
+			$vhost_file_dirhandle = opendir($this->settings['system']['apacheconf_vhost']);
+
+			while(false !== ($vhost_filename = readdir($vhost_file_dirhandle)))
+			{
+				if($vhost_filename != '.'
+				&& $vhost_filename != '..'
+				&& !in_array($vhost_filename, $this->known_filenames)
+				&& preg_match('/^(05|10|20|21|22|30|50|51)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_(.+)\.conf$/', $vhost_filename)
+				&& file_exists(makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/' . $vhost_filename)))
+				{
+					fwrite($this->debugHandler, '  nginx::wipeOutOldVhostConfigs: unlinking ' . $vhost_filename . "\n");
+					$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $vhost_filename);
+					unlink(makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/' . $vhost_filename));
+				}
+			}
+		}
+	}
+
+	/*
+	 *	We remove old htpasswd config files
+	 */
+	protected function wipeOutOldHtpasswdConfigs()
+	{
+		fwrite($this->debugHandler, '  nginx::wipeOutOldHtpasswdConfigs: cleaning ' . $this->settings['system']['apacheconf_htpasswddir'] . "\n");
+		$this->logger->logAction(CRON_ACTION, LOG_INFO, "cleaning " . $this->settings['system']['apacheconf_htpasswddir']);
+
+		if(isConfigDir($this->settings['system']['apacheconf_htpasswddir'])
+		&& file_exists($this->settings['system']['apacheconf_htpasswddir'])
+		&& is_dir($this->settings['system']['apacheconf_htpasswddir']))
+		{
+			$htpasswds_file_dirhandle = opendir($this->settings['system']['apacheconf_htpasswddir']);
+
+			while(false !== ($htpasswd_filename = readdir($htpasswds_file_dirhandle)))
+			{
+				if($htpasswd_filename != '.'
+				&& $htpasswd_filename != '..'
+				&& !in_array($htpasswd_filename, $this->known_htpasswdsfilenames)
+				&& file_exists(makeCorrectFile($this->settings['system']['apacheconf_htpasswddir'] . '/' . $htpasswd_filename)))
+				{
+					fwrite($this->debugHandler, '  nginx::wipeOutOldHtpasswdConfigs: unlinking ' . $htpasswd_filename . "\n");
+					$this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $htpasswd_filename);
+					unlink(makeCorrectFile($this->settings['system']['apacheconf_htpasswddir'] . '/' . $htpasswd_filename));
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Cron
+ * @version    $Id$
+ */
+
+/*
+ * This script creates the php.ini's used by mod_suPHP+php-cgi
+ */
+
+if(@php_sapi_name() != 'cli'
+&& @php_sapi_name() != 'cgi'
+&& @php_sapi_name() != 'cgi-fcgi')
+{
+	die('This script only works in the shell.');
+}
+
+class nginx_phpfpm extends nginx
+{
+	protected function composePhpOptions($domain)
+	{
+		$php_options_text = '';
+
+		if($domain['phpenabled'] == '1')
+		{
+			$php = new phpinterface($this->getDB(), $this->settings, $domain);
+			$phpconfig = $php->getPhpConfig((int)$domain['phpsettingid']);
+			
+			$php_options_text = "\t".'location ~ \.php$ {'."\n";
+			$php_options_text.= "\t\t".'fastcgi_index index.php;'."\n";
+			$php_options_text.= "\t\t".'include /etc/nginx/fastcgi_params;'."\n";
+			$php_options_text.= "\t\t".'fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;'."\n";
+			$php_options_text.= "\t\t".'fastcgi_pass unix:' . $php->getInterface()->getSocketFile() . ';' . "\n";
+			$php_options_text.= "\t".'}'."\n";
+
+			// create starter-file | config-file
+			$php->getInterface()->createConfig($phpconfig);
+			
+			// create php.ini 
+			// @TODO make php-fpm support this
+			$php->getInterface()->createIniFile($phpconfig);
+		}
+		else
+		{
+			$php_options_text.= '  # PHP is disabled for this vHost' . "\n";
+		}
+
+		return $php_options_text;
+	}
+
+	public function createOwnVhostStarter()
+	{
+		if ($this->settings['phpfpm']['enabled'] == '1'
+			&& $this->settings['phpfpm']['enabled_ownvhost'] == '1'
+		) {
+			$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__)))); // /var/www/froxlor, needed for chown
+
+			$user = $this->settings['phpfpm']['vhost_httpuser'];
+			$group = $this->settings['phpfpm']['vhost_httpgroup'];	
+
+			$domain = array(
+				'id' => 'none',
+				'domain' => $this->settings['system']['hostname'],
+				'adminid' => 1, /* first admin-user (superadmin) */
+				'mod_fcgid_starter' => -1,
+				'mod_fcgid_maxrequests' => -1,
+				'guid' => $user,
+				'openbasedir' => 0,
+				'safemode' => '0',
+				'email' => $this->settings['panel']['adminmail'],
+				'loginname' => 'froxlor.panel',
+				'documentroot' => $mypath
+			);
+
+			// all the files and folders have to belong to the local user
+			// now because we also use fcgid for our own vhost
+			safe_exec('chown -R ' . $user . ':' . $group . ' ' . escapeshellarg($mypath));
+						
+			// get php.ini for our own vhost
+			$php = new phpinterface($this->getDB(), $this->settings, $domain);
+
+			// @FIXME don't use fcgid settings, but we don't have anything else atm
+			$phpconfig = $php->getPhpConfig($this->settings['system']['mod_fcgid_defaultini_ownvhost']);
+
+			// create starter-file | config-file
+			$php->getInterface()->createConfig($phpconfig);
+			
+			// create php.ini 
+			// @TODO make php-fpm support this
+			$php->getInterface()->createIniFile($phpconfig);
+		}
+	}
+}

scripts/jobs/cron_tasks.php

@@ -25,6 +25,8 @@ require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.10.apache
 require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.15.apache_fcgid.php'));
 require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.20.lighttpd.php'));
 require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.25.lighttpd_fcgid.php'));
+require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.30.nginx.php'));
+require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.35.nginx_phpfpm.php'));
 
 /**
  * LOOK INTO TASKS TABLE TO SEE IF THERE ARE ANY UNDONE JOBS
@@ -55,7 +57,7 @@ while($row = $db->fetch_array($result_tasks))
 		{
 			$awstatsclean['header'] = "## GENERATED BY FROXLOR\n";
 			$awstatsclean['headerold'] = "## GENERATED BY SYSCP\n";
-			$awstatsclean['path'] = '/etc/awstats';
+			$awstatsclean['path'] = $settings['system']['awstats_conf'];
 
 			/**
 			 * dont do anyting if the directory not exists
@@ -66,7 +68,7 @@ while($row = $db->fetch_array($result_tasks))
 			{
 				$awstatsclean['dir'] = dir($awstatsclean['path']);
 				while($awstatsclean['entry'] = $awstatsclean['dir']->read()) {
-					$awstatsclean['fullentry'] = $awstatsclean['path'].'/'.$awstatsclean['entry'];
+					$awstatsclean['fullentry'] = makeCorrectFile($awstatsclean['path'].'/'.$awstatsclean['entry']);
 					/**
 					 * dont do anything if the file does not exist
 					 */
@@ -119,11 +121,25 @@ while($row = $db->fetch_array($result_tasks))
 			}
 		}
 
+		// clear php-fpm-configurations prior to re-creation to keep it clean
+		if ($settings['phpfpm']['enabled'] == '1')
+		{
+			$configdir = makeCorrectDir($settings['phpfpm']['configdir']);
+
+			if (is_dir($configdir)) 
+			{
+				// now get rid of old stuff 
+				//(but append /* so we don't delete the directory)
+				$configdir.='/*';
+				safe_exec('rm -rf '. makeCorrectFile($configdir));
+			}
+		}
+
 		if(!isset($webserver))
 		{
 			if($settings['system']['webserver'] == "apache2")
 			{
-				if($settings['system']['mod_fcgid'] == 1)
+				if($settings['system']['mod_fcgid'] == 1 || $settings['phpfpm']['enabled'] == 1)
 				{
 					$webserver = new apache_fcgid($db, $cronlog, $debugHandler, $idna_convert, $settings);
 				}
@@ -134,7 +150,7 @@ while($row = $db->fetch_array($result_tasks))
 			}
 			elseif($settings['system']['webserver'] == "lighttpd")
 			{
-				if($settings['system']['mod_fcgid'] == 1)
+				if($settings['system']['mod_fcgid'] == 1 || $settings['phpfpm']['enabled'] == 1)
 				{
 					$webserver = new lighttpd_fcgid($db, $cronlog, $debugHandler, $idna_convert, $settings);
 				}
@@ -143,6 +159,17 @@ while($row = $db->fetch_array($result_tasks))
 					$webserver = new lighttpd($db, $cronlog, $debugHandler, $idna_convert, $settings);
 				}
 			}
+			elseif($settings['system']['webserver'] == "nginx")
+			{
+				if($settings['phpfpm']['enabled'] == 1)
+				{
+					$webserver = new nginx_phpfpm($db, $cronlog, $debugHandler, $idna_convert, $settings);
+				}
+				else
+				{
+					$webserver = new nginx($db, $cronlog, $debugHandler, $idna_convert, $settings);
+				}
+			}
 		}
 
 		if(isset($webserver))

templates/admin/customers/customers_customer.tpl

@@ -27,5 +27,5 @@
 	<td class="field_name"><b><font color="green">{$row['emails_used']}</font></b>/<b><font color="#FD6204">{$row['emails']}</font></b><br /><b><font color="green">{$row['subdomains_used']}</font></b>/<b><font color="#FD6204">{$row['subdomains']}</font></b></td>
 	<td class="field_name"><b><font color="green">{$row['email_accounts_used']}</font></b>/<b><font color="#FD6204">{$row['email_accounts']}</font></b><br /><b><font color="green">{$row['email_forwarders_used']}</font></b>/<b><font color="#FD6204">{$row['email_forwarders']}</font></b></td>
 	<td class="field_name" style=" text-align: center; "><if $row['deactivated'] == '1'>{$lng['panel']['yes']}<else>{$lng['panel']['no']}</if><br />{$last_login}</td>
-	<td class="field_name"><a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}">{$lng['panel']['edit']}</a><br /><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}">{$lng['panel']['delete']}</a></td>
+	<td class="field_name">{$unlock_link}<a href="$filename?s=$s&amp;page=$page&amp;action=edit&amp;id={$row['customerid']}">{$lng['panel']['edit']}</a><br /><a href="$filename?s=$s&amp;page=$page&amp;action=delete&amp;id={$row['customerid']}">{$lng['panel']['delete']}</a></td>
 </tr>

templates/admin/ticket/categories.tpl

@@ -10,7 +10,7 @@ $header
 			</tr>
 			<if 15 < $categories_count >
 			<tr>
-				<td class="field_display_border_left" colspan="4"><a href="$filename?page=categories&amp;action=new&amp;s=$s">{$lng['ticket']['ticket_newcateory']}</a></td>
+				<td class="field_display_border_left" colspan="4"><a href="$filename?page=categories&amp;action=addcategory&amp;s=$s">{$lng['ticket']['ticket_newcateory']}</a></td>
 			</tr>
 			</if>
 			<tr>

templates/admin/ticket/tickets_newcategory.tpl

@@ -13,7 +13,7 @@ $header
 			</tr>
 			<tr>
 				<td class="main_field_name"><b>{$lng['ticket']['logicalorder']}:</b><br />{$lng['ticket']['orderdesc']}</td>
-				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="logicalorder" maxlength="3" value="1" /></td>
+				<td class="main_field_display" nowrap="nowrap"><input type="text" class="text" name="logicalorder" maxlength="3" value="{$order}" /></td>
 			</tr>
 			<tr>
 				<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['ticket']['ticket_newcateory']}" /></td>

templates/misc/configfiles/debian_etch/courier/etc_courier_authdaemonrc

@@ -1,68 +0,0 @@
-##VERSION: $Id: authdaemonrc.in,v 1.8 2001/10/07 02:16:22 mrsam Exp $
-#
-# Copyright 2000-2001 Double Precision, Inc.  See COPYING for
-# distribution information.
-#
-# authdaemonrc created from authdaemonrc.dist by sysconftool
-#
-# Do not alter lines that begin with ##, they are used when upgrading
-# this configuration.
-#
-# This file configures authdaemond, the resident authentication daemon.
-#
-# Comments in this file are ignored.  Although this file is intended to
-# be sourced as a shell script, authdaemond parses it manually, so
-# the acceptable syntax is a bit limited.  Multiline variable contents,
-# with the \ continuation character, are not allowed.  Everything must
-# fit on one line.  Do not use any additional whitespace for indentation,
-# or anything else.
-
-##NAME: authmodulelist:0
-#
-# The authentication modules that are linked into authdaemond.  The
-# default list is installed.  You may selectively disable modules simply
-# by removing them from the following list.  The available modules you
-# can use are: authcustom authcram authuserdb authldap authmysql authpam
-
-authmodulelist="authmysql"
-
-##NAME: authmodulelistorig:1
-#
-# This setting is used by Courier's webadmin module, and should be left
-# alone
-
-authmodulelistorig="authcustom authcram authuserdb authldap authmysql authpam"
-
-##NAME: daemons:0
-#
-# The number of daemon processes that are started.  authdaemon is typically
-# installed where authentication modules are relatively expensive: such
-# as authldap, or authmysql, so it's better to have a number of them running.
-# PLEASE NOTE:  Some platforms may experience a problem if there's more than
-# one daemon.  Specifically, SystemV derived platforms that use TLI with
-# socket emulation.  I'm suspicious of TLI's ability to handle multiple
-# processes accepting connections on the same filesystem domain socket.
-#
-# You may need to increase daemons if as your system load increases.  Symptoms
-# include sporadic authentication failures.  If you start getting
-# authentication failures, increase daemons.  However, the default of 5
-# SHOULD be sufficient.  Bumping up daemon count is only a short-term
-# solution.  The permanent solution is to add more resources: RAM, faster
-# disks, faster CPUs...
-
-daemons=5
-
-##NAME: version:0
-#
-# When you have multiple versions of authdaemond.* installed, authdaemond
-# just picks the first one it finds.  Set "version" to override that.
-# For example:  version=authdaemond.plain
-
-version=""
-
-##NAME: authdaemonvar:0
-#
-# authdaemonvar is here, but is not used directly by authdaemond.  It's
-# used by various configuration and build scripts, so don't touch it!
-
-authdaemonvar=/var/run/courier/authdaemon

templates/misc/configfiles/debian_etch/courier/etc_courier_authmysqlrc

@@ -1,13 +0,0 @@
-MYSQL_SERVER <SQL_HOST>
-MYSQL_USERNAME <SQL_UNPRIVILEGED_USER>
-MYSQL_PASSWORD <SQL_UNPRIVILEGED_PASSWORD>
-MYSQL_PORT 3306
-MYSQL_DATABASE <SQL_DB>
-MYSQL_USER_TABLE mail_users
-MYSQL_CRYPT_PWFIELD password_enc
-MYSQL_UID_FIELD uid
-MYSQL_GID_FIELD gid
-MYSQL_LOGIN_FIELD username
-MYSQL_HOME_FIELD homedir
-MYSQL_MAILDIR_FIELD maildir
-MYSQL_QUOTA_FIELD (quota*1024*1024)

templates/misc/configfiles/debian_etch/cron/etc_cron.d_froxlor

@@ -1,8 +0,0 @@
-#
-# Set PATH, otherwise restart-scripts won't find start-stop-daemon
-#
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-#
-# Regular cron jobs for the froxlor package
-#
-*/5 * * * *	root	/usr/bin/php5 -q /var/www/froxlor/scripts/froxlor_master_cronjob.php

templates/misc/configfiles/debian_etch/dkim/dkim-filter.conf

@@ -1,11 +0,0 @@
-#
-# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!!
-#
-# Instead, just set the shown values in the file to the
-# given values ;-)
-#
-
-Syslog			yes
-Domain			/etc/postfix/dkim/domains
-KeyList			/etc/postfix/dkim/dkim-keys.conf
-Socket                  inet:8891@localhost

templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot-sql.conf

@@ -1,5 +0,0 @@
-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'
-user_query = SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('maildir:storage=', (quota*1024)) as quota FROM mail_users WHERE username = '%u' OR email = '%u'

templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf

@@ -1,71 +0,0 @@
-protocols = imap pop3 <SSLPROTOCOLS>
-listen = *
-mail_access_groups = vmail
-mail_debug = no
-## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
-disable_plaintext_auth = no
-
-### SSL Settings
-### After setting this options, set disable_plaintext_auth to yes (see above)
-### and add imaps pop3s to the protocols
-#ssl_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#ssl_key_file = /etc/ssl/server/<SERVERNAME>.key
-## This is an example with CACerts class3 cert!
-#ssl_ca_file = /path/to/cacert.class3.crt
-#ssl_cipher_list = ALL:!LOW:!SSLv2
-
-protocol imap {
-	mail_plugins = quota imap_quota
-}
-
-protocol pop3 {
-    # leave this uncommented if you are migrating from Courier also see Migration from Courier
-    pop3_uidl_format = UID%u-%v
-    mail_plugins = quota
-    
-}
-protocol lda {
-	# postmaster is the one in charge of the mail system. MUST be set to a valid address!
-    postmaster_address = <postmaster-address>
-    auth_socket_path = /var/run/dovecot/auth-master
-    mail_plugins = quota
-    sendmail_path = /usr/sbin/sendmail
-}
-
-auth default {
-    mechanisms = plain login
-    passdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    userdb prefetch {
-    }
-    
-    userdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    user = vmail
-    socket listen {
-    	# Postfix uses the client socket for SMTP Auth
-        client {
-            # Assuming the default Postfix $queue_directory setting
-            path = /var/spool/postfix/private/auth
-            mode = 0660
-            # Assuming the default Postfix user and group
-            user = postfix
-            group = postfix
-        }
-        # Note that we're setting a master socket. SMTP AUTH for Postfix and Exim uses client sockets.
-        master {
-			path = /var/run/dovecot/auth-master
-			mode = 0660
-			user = vmail
-			group = vmail
-    }
-        
-    }
-}
-plugin {
-	quota = maildir
-}

templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul

@@ -1,125 +0,0 @@
-### acl/30_exim4-config_check_rcpt
-#################################
-
-acl_check_rcpt:
-  accept
-    hosts = :
-
-  warn
-    hosts = +relay_from_hosts
-    control = submission/sender_retain
-
-  .ifdef CHECK_RCPT_LOCAL_LOCALPARTS
-  deny
-    domains = +local_domains:+froxlor_domain
-    local_parts = CHECK_RCPT_LOCAL_LOCALPARTS
-    message = restricted characters in address
-  .endif
-
-  .ifdef CHECK_RCPT_REMOTE_LOCALPARTS
-  deny
-    domains = !+local_domains
-    local_parts = CHECK_RCPT_REMOTE_LOCALPARTS
-    message = restricted characters in address
-  .endif
-
-  accept
-    .ifndef CHECK_RCPT_POSTMASTER
-    local_parts = postmaster
-    .else
-    local_parts = CHECK_RCPT_POSTMASTER
-    .endif
-    domains = +local_domains:+froxlor_domain
-
-  deny
-    message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster
-    !acl = acl_local_deny_exceptions
-    senders = ${if exists{CONFDIR/local_sender_blacklist}\
-                   {CONFDIR/local_sender_blacklist}\
-                   {}}
-
-  deny
-    message = sender IP address $sender_host_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster
-    !acl = acl_local_deny_exceptions
-    hosts = ${if exists{CONFDIR/local_host_blacklist}\
-                 {CONFDIR/local_host_blacklist}\
-                 {}}
-
-  .ifdef CHECK_RCPT_VERIFY_SENDER
-  deny
-    message = Sender verification failed
-    !acl = acl_local_deny_exceptions
-    !verify = sender
-  .endif
-
-  deny
-    !acl = acl_local_deny_exceptions
-    senders = ${if exists{CONFDIR/local_sender_callout}\
-                         {CONFDIR/local_sender_callout}\
-                   {}}
-    !verify = sender/callout
-
-  deny
-    !acl = acl_local_deny_exceptions
-    recipients = ${if exists{CONFDIR/local_rcpt_callout}\
-                            {CONFDIR/local_rcpt_callout}\
-                      {}}
-    !verify = recipient/callout
-
-  .ifdef CHECK_RCPT_REVERSE_DNS
-  warn
-    message = X-Host-Lookup-Failed: Reverse DNS lookup failed for $sender_host_address (${if eq{$host_lookup_failed}{1}{failed}{deferred}})
-     condition = ${if and{{def:sender_host_address}{!def:sender_host_name}}\
-                      {yes}{no}}
-  .endif
-
-  .ifdef CHECK_RCPT_IP_DNSBLS
-  warn
-    message = X-Warning: $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    log_message = $sender_host_address is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    dnslists = CHECK_RCPT_IP_DNSBLS
-  .endif
-
-  .ifdef CHECK_RCPT_DOMAIN_DNSBLS
-  warn
-    message = X-Warning: $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    log_message = $sender_address_domain is listed at $dnslist_domain ($dnslist_value: $dnslist_text)
-    !senders = ${if exists{CONFDIR/local_domain_dnsbl_whitelist}\
-                    {CONFDIR/local_domain_dnsbl_whitelist}\
-                    {}}
-    dnslists = CHECK_RCPT_DOMAIN_DNSBLS/$sender_address_domain
-  .endif
-
-  .ifdef CHECK_RCPT_LOCAL_ACL_FILE
-  .include CHECK_RCPT_LOCAL_ACL_FILE
-  .endif
-
-  accept
-    domains = +local_domains:+froxlor_domain
-    endpass
-    message = unknown user
-    verify = recipient
-
-  accept
-    domains = +relay_to_domains
-    endpass
-    .ifdef CHECK_RCPT_GIVE_UNKNOWN_USER
-    message = ${if eq{$acl_verify_message}{Unrouteable address}{unknown user}{$acl_verify_message}}
-    .else
-    message = unrouteable address
-    .endif
-    verify = recipient
-
-  ############
-  # If control reaches this point, the domain is neither in +local_domains
-  # nor in +relay_to_domains.
-  ############
-
-  accept
-    hosts = +relay_from_hosts
-
-  accept
-    authenticated = *
-
-  deny
-    message = relay not permitted

templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_auth_30_froxlor-config

@@ -1,30 +0,0 @@
-### auth/30_froxlor-config
-#################################
-
-plain_server:
-  driver = plaintext
-  public_name = PLAIN
-  server_condition = "${if and { \
-                        {!eq{$2}{}} \
-                        {!eq{$3}{}} \
-                        {crypteq{$3}{${lookup mysql{FROXLOR_AUTH_PLAIN}{$value}fail}}} \
-                        } {yes}{no}}"
-  server_set_id = $2
-  server_prompts = :
-#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
-#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
-#   .endif
-
-login_server:
-  driver = plaintext
-  public_name = LOGIN
-  server_prompts = "Username:: : Password::"
-  server_condition = "${if and { \
-                        {!eq{$1}{}} \
-                        {!eq{$2}{}} \
-                        {crypteq{$2}{${lookup mysql{FROXLOR_AUTH_LOGIN}{$value}fail}}} \
-                        } {yes}{no}}"
-  server_set_id = $1
-#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
-#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
-#   .endif

templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_main_10_froxlor-config_options

@@ -1,20 +0,0 @@
-hide mysql_servers = <SQL_HOST>/<SQL_DB>/<SQL_UNPRIVILEGED_USER>/<SQL_UNPRIVILEGED_PASSWORD>
-
-FROXLOR_LOCAL_DOMAIN	= SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1'
-
-FROXLOR_MAILALIAS		= SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \
-				(( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \
-				OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \
-				AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1
-
-FROXLOR_MAILUSER		= SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \
-				email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y'
-
-FROXLOR_PARENT_DOMAIN	= SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \
-				ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain
-
-FROXLOR_AUTH_PLAIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}'
-
-FROXLOR_AUTH_LOGIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}'
-
-domainlist froxlor_domain = mysql;FROXLOR_LOCAL_DOMAIN

templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_router_180_froxlor-config

@@ -1,12 +0,0 @@
-froxlor_mailalias:
-  debug_print = "R: froxlor_mailalias for $local_part@$domain"
-  driver = redirect
-  domains = +froxlor_domain
-  data = ${lookup mysql {FROXLOR_MAILALIAS}{$value}fail}
-
-froxlor_mailuser:
-  debug_print = "R: froxlor_mailuser for $local_part@$domain"
-  driver = redirect
-  domains = +froxlor_domain
-  data = ${lookup mysql {FROXLOR_MAILUSER}{$value}fail}
-  directory_transport = maildir_froxlor

templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_transport_30_froxlor-config

@@ -1,13 +0,0 @@
-maildir_froxlor:
-  debug_print = "T: maildir_froxlor for $local_part@$domain"
-  driver = appendfile
-  create_directory
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  maildir_format
-  directory_mode = 0770
-  mode = 0660
-  mode_fail_narrower = false
-  user = 2000
-  group = 2000

templates/misc/configfiles/debian_etch/libnss/etc_nss-mysql-root.conf

@@ -1,16 +0,0 @@
-conf.version = 2;
-shadow.host = inet:<SQL_HOST>:3306;
-shadow.database = <SQL_DB>;
-shadow.db_user = <SQL_UNPRIVILEGED_USER>;
-shadow.db_password = <SQL_UNPRIVILEGED_PASSWORD>;
-shadow.table = ftp_users u;
-shadow.where_clause = ;
-shadow.userid_column = u.id;
-shadow.user_column = u.username;
-shadow.password_column = u.password;
-shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1);
-shadow.min_column = 0;
-shadow.max_column = 99999;
-shadow.warn_column = 7;
-shadow.inact_column = -1;
-shadow.expire_column = -1;

templates/misc/configfiles/debian_etch/libnss/etc_nss-mysql.conf

@@ -1,24 +0,0 @@
-conf.version = 2;
-users.host = inet:<SQL_HOST>:3306;
-users.database = <SQL_DB>;
-users.db_user = <SQL_UNPRIVILEGED_USER>;
-users.db_password = <SQL_UNPRIVILEGED_PASSWORD>;
-users.table = ftp_users u;
-users.where_clause = u.login_enabled = 'Y';
-users.user_column = u.username;
-users.password_column = u.password;
-users.userid_column = u.id;
-users.uid_column = u.uid;
-users.gid_column = u.gid;
-users.realname_column = u.username;
-users.homedir_column = u.homedir;
-users.shell_column = u.shell;
-groups.group_info_table = ftp_groups g;
-groups.where_clause = ;
-groups.group_name_column = g.groupname;
-groups.groupid_column = g.id;
-groups.gid_column = g.gid;
-groups.password_column = "x";
-groups.members_table = ftp_groups ug;
-groups.member_userid_column = ug.customerid;
-groups.member_groupid_column = ug.id;

templates/misc/configfiles/debian_etch/libnss/etc_nsswitch.conf

@@ -1,20 +0,0 @@
-# Make sure that `passwd`, `group` and `shadow` have mysql in their lines 
-# You should place mysql at the end, so that it is queried after the other mechanisams
-#
-passwd:         compat mysql
-group:          compat mysql
-shadow:         compat mysql
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files

templates/misc/configfiles/debian_etch/lighttpd/etc_lighttpd.conf

@@ -1,57 +0,0 @@
-###############################################################################
-# Default lighttpd.conf for Froxlor.
-###############################################################################
-var.basedir  = "/var/www"
-var.logdir   = "/var/log/lighttpd"
-var.statedir = "/var/lib/lighttpd"
-
-server.modules = (
-	"mod_rewrite",
-	"mod_redirect",
-	"mod_alias",
-	"mod_access",
-	"mod_auth",
-	"mod_fastcgi",
-	"mod_cgi",
-	"mod_accesslog"
-)
-
-server.username      = "www-data"
-server.groupname     = "www-data"
-server.document-root = var.basedir
-server.pid-file      = "/var/run/lighttpd.pid"
-accesslog.filename   = var.logdir + "/access.log"
-server.errorlog      = var.logdir  + "/error.log"
-
-server.indexfiles    = ("index.php", "index.html",
-						"index.htm", "default.htm")
-						
-server.name			 = "<SERVERNAME>"
-server.port          = 80
-server.bind          = "<SERVERIP>"
-url.access-deny = ("~", ".inc")
-
-fastcgi.server = (
-".php" => (
-		"localhost" => (
-			"socket" => "/tmp/lighttpd-fcgi-sock-lighttpd",
-			"broken-scriptfilename" => "enable",
-			"bin-path" => "/usr/bin/php5-cgi",
-			"min-procs" => 1,
-			"max-procs" => 1,
-			"max-load-per-proc" => 4,
-			"idle-timeout" => 60,
-			"bin-environment" => (
-				"UID" => "www-data",
-				"GID" => "www-data",
-				"PHP_FCGI_CHILDREN" => "0",
-				"PHP_FCGI_MAX_REQUESTS" => "10000"
-			),
-			"bin-copy-environment" => ( "" )
-		)
-	)
-)
-
-#### external configuration files
-## mimetype mapping
-include_shell "/usr/share/lighttpd/create-mime.assign.pl"

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

@@ -1,96 +0,0 @@
-# Postfix programs paths settings
-command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
-program_directory = /usr/lib/postfix
-sendmail_path = /usr/sbin/sendmail
-
-## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
-mydomain = <SERVERNAME>
-
-# should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
-
-mydestination = $myhostname,
-	$mydomain,
-	localhost.$myhostname,
-	localhost.$mydomain,
-	localhost
-mynetworks = 127.0.0.0/8
-inet_interfaces = all
-append_dot_mydomain = no
-biff = no
-
-# Postfix performance settings
-default_destination_concurrency_limit = 20
-local_destination_concurrency_limit = 2
-
-# SMTPD Settings
-smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
-smtpd_helo_required = yes
-smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unauth_destination,
-	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
-smtpd_sender_restrictions = permit_mynetworks,
-	reject_sender_login_mismatch,
-	permit_sasl_authenticated, 
-	reject_unknown_hostname, 
-	reject_unknown_recipient_domain, 
-	reject_unknown_sender_domain
-smtpd_client_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unknown_client
-# Maximum size of Message in bytes (50MB)
-message_size_limit = 52428800
-
-## SASL Auth Settings
-smtpd_sasl_auth_enable = yes
-smtpd_sasl_local_domain = $myhostname
-smtpd_sasl_security_options = noanonymous
-broken_sasl_auth_clients = yes
-## Dovecot Settings for deliver, SASL Auth and virtual transport
-## uncomment those line to use Dovecot
-#mailbox_command = /usr/lib/dovecot/deliver
-#virtual_transport = dovecot
-#dovecot_destination_recipient_limit = 1
-#smtpd_sasl_path = private/auth
-
-# Virtual delivery settings
-virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
-virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
-virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
-smtpd_sender_login_maps = mysql:/etc/postfix/mysql-virtual_sender_permissions.cf
-virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-
-# Local delivery settings
-local_transport = local
-alias_database = hash:/etc/aliases
-alias_maps = $alias_database
-
-# Default Mailbox size, is set to 0 which means unlimited!
-mailbox_size_limit = 0
-virtual_mailbox_limit = 0
-
-### TLS settings
-###
-## TLS for outgoing mails from the server to another server
-#smtp_use_tls = yes
-#smtp_tls_note_starttls_offer = yes
-## TLS for email client
-#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
-#smtpd_tls_auth_only = no
-#smtpd_tls_loglevel = 1
-#smtpd_tls_received_header = yes
-#smtpd_tls_session_cache_timeout = 3600s
-#tls_random_source = dev:/dev/urandom
-
-debugger_command =
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         ddd $daemon_directory/$process_name $process_id & sleep 5
-

templates/misc/configfiles/debian_etch/postfix/etc_postfix_master.cf

@@ -1,4 +0,0 @@
-# Add this lines to be able to use dovecot as delivery agent
-# Dovecot LDA
-dovecot	  unix	-	n	n	-	-	pipe
-	flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -d ${recipient}

templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_alias_maps.cf

@@ -1,8 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = mail_virtual
-select_field = destination
-where_field = email
-additional_conditions = and TRIM(destination) <> ''
-hosts = <SQL_HOST> 

templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_mailbox_domains.cf

@@ -1,8 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = panel_domains
-select_field = domain
-where_field = domain
-additional_conditions = and isemaildomain = '1'
-hosts = <SQL_HOST> 

templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_mailbox_maps.cf

@@ -1,7 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-table = mail_users
-select_field = maildir
-where_field = email
-hosts = <SQL_HOST> 

templates/misc/configfiles/debian_etch/postfix/etc_postfix_mysql-virtual_sender_permissions.cf

@@ -1,5 +0,0 @@
-user = <SQL_UNPRIVILEGED_USER>
-password = <SQL_UNPRIVILEGED_PASSWORD>
-dbname = <SQL_DB>
-query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s'));
-hosts = <SQL_HOST>

templates/misc/configfiles/debian_etch/postfix/etc_postfix_sasl_smtpd.conf

@@ -1,11 +0,0 @@
-pwcheck_method: auxprop
-auxprop_plugin: sql
-allowanonymouslogin: no
-allowplaintext: yes
-mech_list: plain login cram-md5 digest-md5
-sql_engine: mysql
-sql_hostnames: <SQL_HOST>
-sql_user: <SQL_UNPRIVILEGED_USER>
-sql_passwd: <SQL_UNPRIVILEGED_PASSWORD>
-sql_database: <SQL_DB>
-sql_select: SELECT password FROM mail_users WHERE username='%u@%r' OR email='%u@%r'

templates/misc/configfiles/debian_etch/postfix_mxaccess/etc_postfix_main.cf

@@ -1,25 +0,0 @@
-#
-# ATTENTION - this is not the full postfix-main.cf file
-#
-# it only provides additional configuration-entries!
-#
-
-#
-# look for the follow statement
-#
-smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unauth_destination,
-	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
-
-#
-# and extend it with the following line
-# so it looks like this
-#
-smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
-	reject_unauth_destination,
-	reject_unauth_pipelining,
-	reject_non_fqdn_recipient,
-	check_recipient_mx_access cidr:/etc/postfix/mx_access

templates/misc/configfiles/debian_etch/postfix_mxaccess/etc_postfix_mx_access

@@ -1,9 +0,0 @@
-0.0.0.0/8         REJECT Domain MX in broadcast network
-10.0.0.0/8        REJECT Domain MX in RFC 1918 private network
-169.254.0.0/16    REJECT Domain MX in link local network
-172.16.0.0/12     REJECT Domain MX in RFC 1918 private network
-192.0.2.0/24      REJECT Domain MX in TEST-NET network
-192.168.0.0/16    REJECT Domain MX in RFC 1918 private network
-224.0.0.0/4       REJECT Domain MX in class D multicast network
-240.0.0.0/5       REJECT Domain MX in class E reserved network
-248.0.0.0/5       REJECT Domain MX in reserved network

templates/misc/configfiles/debian_etch/powerdns/etc_powerdns_pdns-froxlor.conf

@@ -1,7 +0,0 @@
-allow-axfr-ips=<NAMESERVERS>
-#local-ipv6=YOUR_IPv6_(if_any)
-bind-config=/etc/bind/named.conf
-bind-check-interval=180
-log-dns-details=yes
-local-address=<SERVERIP>,127.0.0.1
-

templates/misc/configfiles/debian_etch/powerdns/etc_powerdns_pdns.conf

@@ -1,17 +0,0 @@
-allow-recursion=127.0.0.1
-config-dir=/etc/powerdns
-daemon=yes
-guardian=yes
-launch=bind
-lazy-recursion=yes
-local-port=53
-master=yes
-module-dir=/usr/lib/powerdns
-setgid=pdns
-setuid=pdns
-socket-dir=/var/run
-version-string=powerdns
-bind-config=/etc/bind/named.conf
-bind-check-interval=300
-include=/etc/powerdns/pdns_froxlor.conf
-

templates/misc/configfiles/debian_etch/proftpd/etc_proftpd_modules.conf

@@ -1,34 +0,0 @@
-#
-# This file is used to manage DSO modules and features.
-#
-
-# This is the directory where DSO modules resides
-
-ModulePath /usr/lib/proftpd
-
-# Allow only user root to load and unload modules, but allow everyone
-# to see which modules have been loaded
-
-ModuleControlsACLs insmod,rmmod allow user root
-ModuleControlsACLs lsmod allow user *
-
-#LoadModule mod_ctrls_admin.c
-LoadModule mod_tls.c
-LoadModule mod_sql.c
-#LoadModule mod_ldap.c
-LoadModule mod_sql_mysql.c
-#LoadModule mod_sql_postgres.c
-LoadModule mod_quotatab.c
-#LoadModule mod_quotatab_file.c
-#LoadModule mod_quotatab_ldap.c
-LoadModule mod_quotatab_sql.c
-#LoadModule mod_radius.c
-LoadModule mod_wrap.c
-LoadModule mod_rewrite.c
-
-# keep this module the last one
-LoadModule mod_ifsession.c
-
-<IfModule mod_delay.c>
-  DelayEngine off
-</IfModule>

templates/misc/configfiles/debian_etch/proftpd/etc_proftpd_proftpd.conf

@@ -1,75 +0,0 @@
-Include /etc/proftpd/modules.conf
-
-ServerName                      "<SERVERNAME> FTP Server"
-ServerType                      standalone
-DeferWelcome                    off
-
-MultilineRFC2228                on
-DefaultServer                   on
-ShowSymlinks                    on
-AllowOverwrite                  on
-
-TimeoutNoTransfer               600
-TimeoutStalled                  600
-TimeoutIdle                     1200
-
-DisplayLogin                    welcome.msg
-DisplayFirstChdir               .message
-ListOptions                     "-l"
-
-DenyFilter                      \*.*/
-
-Port                            21
-MaxInstances                    30
-UseIPv6                         off
-
-TransferLog						/var/log/proftpd/xferlog
-SystemLog						/var/log/proftpd/proftpd.log
-
-# make proftpd faster / do not perform ident and reverse dns lookup
-UseReverseDNS off
-
-# Set the user and group that the server normally runs at.
-User                            nobody
-Group                           nogroup
-
-<Directory /*>
-# Umask 022 is a good standard umask to prevent new files and dirs
-# (second parm) from being group and world writable.
-  Umask                         022  022
-# Normally, we want files to be overwriteable.
-  AllowOverwrite                on
-</Directory>
-
-DefaultRoot ~
-RequireValidShell off
-
-AuthOrder mod_sql.c
-
-SQLAuthTypes Crypt
-SQLAuthenticate users* groups*
-SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
-SQLUserInfo ftp_users username password uid gid homedir shell
-SQLGroupInfo ftp_groups groupname gid members
-SQLUserWhereClause "login_enabled = 'y'"
-
-SQLLog PASS login
-SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
-
-SQLLog RETR download
-SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
-
-SQLLog STOR upload
-SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
-
-
-QuotaEngine on
-QuotaShowQuotas on
-QuotaDisplayUnits Mb
-QuotaLock /var/lock/ftpd.quotatab.lock
-QuotaLimitTable sql:/get-quota-limit
-QuotaTallyTable sql:/get-quota-tally/update-quota-tally/insert-quota-tally
-SQLNamedQuery get-quota-limit SELECT "ftp_users.username AS name, ftp_quotalimits.quota_type, ftp_quotalimits.per_session, ftp_quotalimits.limit_type, panel_customers.diskspace*1024 AS bytes_in_avail, ftp_quotalimits.bytes_out_avail, ftp_quotalimits.bytes_xfer_avail, ftp_quotalimits.files_in_avail, ftp_quotalimits.files_out_avail, ftp_quotalimits.files_xfer_avail FROM ftp_users, ftp_quotalimits, panel_customers WHERE ftp_users.username = '%{0}' AND panel_customers.loginname = SUBSTRING_INDEX('%{0}', 'ftp', 1) AND quota_type ='%{1}'"
-SQLNamedQuery get-quota-tally SELECT "name, quota_type, bytes_in_used,bytes_out_used, bytes_xfer_used, files_in_used, files_out_used,files_xfer_used FROM ftp_quotatallies WHERE name = '%{0}' AND quota_type = '%{1}'"
-SQLNamedQuery update-quota-tally UPDATE "bytes_in_used = bytes_in_used + %{0}, bytes_out_used = bytes_out_used + %{1}, bytes_xfer_used = bytes_xfer_used + %{2}, files_in_used = files_in_used + %{3}, files_out_used= files_out_used + %{4}, files_xfer_used = files_xfer_used + %{5} WHERE name= '%{6}' AND quota_type = '%{7}'" ftp_quotatallies
-SQLNamedQuery insert-quota-tally INSERT "%{0}, %{1}, %{2}, %{3}, %{4},%{5}, %{6}, %{7}" ftp_quotatallies

templates/misc/configfiles/debian_etch/pure-ftpd/etc_default_pure-ftpd-common

@@ -1,5 +0,0 @@
-STANDALONE_OR_INETD=standalone
-VIRTUALCHROOT=false
-UPLOADSCRIPT=
-UPLOADUID=
-UPLOADGID=

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_Bind

@@ -1 +0,0 @@
-21

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_ChrootEveryone

@@ -1 +0,0 @@
-yes

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_CustomerProof

@@ -1 +0,0 @@
-1

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_MaxIdleTime

@@ -1 +0,0 @@
-15

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_MinUID

@@ -1 +0,0 @@
-1000

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_MySQLConfigFile

@@ -1 +0,0 @@
-/etc/pure-ftpd/db/mysql.conf

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_NoAnonymous

@@ -1 +0,0 @@
-yes

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_conf_PAMAuthentication

@@ -1 +0,0 @@
-no

templates/misc/configfiles/debian_etch/pure-ftpd/etc_pure-ftpd_db_mysql.conf

@@ -1,11 +0,0 @@
-MYSQLServer	<SQL_HOST>
-MYSQLUser       <SQL_UNPRIVILEGED_USER>
-MYSQLPassword   <SQL_UNPRIVILEGED_PASSWORD>
-MYSQLDatabase   <SQL_DB>
-MYSQLCrypt      any
-
-MYSQLGetPW      SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y"
-MYSQLGetUID     SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y"
-MYSQLGetGID     SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y"
-MYSQLGetDir     SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y"
-MySQLGetQTASZ 	SELECT panel_customers.diskspace/1024 AS QuotaSize FROM panel_customers, ftp_users WHERE username = "\L" AND panel_customers.loginname = SUBSTRING_INDEX('\L', 'ftp', 1)

templates/misc/configfiles/debian_lenny/apache2/etc_apache2_mods-enabled_fastcgi.conf

@@ -0,0 +1,11 @@
+<IfModule mod_fastcgi.c>
+    FastCgiWrapper /usr/lib/apache2/suexec
+    FastCgiIpcDir /var/run/apache2/
+
+    <Location "/fastcgiphp">
+        Order Deny,Allow
+        Deny from All
+        # Prevent accessing this path directly
+        Allow from env=REDIRECT_STATUS
+    </Location>
+</IfModule>