set version to 0.9.18.1

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

actions/admin/settings/100.panel.php

@@ -32,6 +32,16 @@ return array(
 					'option_options_method' => 'getLanguages',
 					'save_method' => 'storeSettingField',
 					),
+				'panel_default_theme' => array(
+					'label' => $lng['serversettings']['default_theme'],
+					'settinggroup' => 'panel',
+					'varname' => 'default_theme',
+					'type' => 'option',
+					'default' => 'Froxlor',
+					'option_mode' => 'one',
+					'option_options_method' => 'getThemes',
+					'save_method' => 'storeSettingField',
+					),
 				'panel_natsorting' => array(
 					'label' => $lng['serversettings']['natsorting'],
 					'settinggroup' => 'panel',
@@ -64,7 +74,7 @@ return array(
 					'type' => 'option',
 					'default' => 'Manual',
 					'option_mode' => 'one',
-					'option_options' => array('Manual' => 'Manual', 'Dropdown' => 'Dropdown'),
+					'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']),
 					'save_method' => 'storeSettingField',
 					),
 				'panel_adminmail' => array(
@@ -151,14 +161,6 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
-				'admin_froxlor_graphic' => array(
-					'label' => $lng['admin']['froxlor_graphic'],
-					'settinggroup' => 'admin',
-					'varname' => 'froxlor_graphic',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
 				'panel_allow_domain_change_admin' => array(
 					'label' => $lng['serversettings']['panel_allow_domain_change_admin'],
 					'settinggroup' => 'panel',

actions/admin/settings/110.accounts.php

@@ -38,6 +38,14 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
+				'login_domain_login' => array(
+					'label' => $lng['serversettings']['login_domain_login'],
+					'settinggroup' => 'login',
+					'varname' => 'domain_login',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					),
 				'login_maxloginattempts' => array(
 					'label' => $lng['serversettings']['maxloginattempts'],
 					'settinggroup' => 'login',

actions/admin/settings/120.system.php

@@ -29,6 +29,7 @@ return array(
 					'type' => 'string',
 					'default' => '/var/customers/webs/',
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkPathConflicts'
 					),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
@@ -83,15 +84,6 @@ return array(
 					'plausibility_check_method' => 'checkMysqlAccessHost',
 					'save_method' => 'storeSettingMysqlAccessHost',
 					),
-				'system_realtime_port' => array(
-					'label' => $lng['serversettings']['system_realtime_port'],
-					'settinggroup' => 'system',
-					'varname' => 'realtime_port',
-					'type' => (function_exists('socket_create') ? 'int' : 'hidden'),
-					'int_max' => 65535,
-					'default' => 0,
-					'save_method' => 'storeSettingField',
-					),
 				'system_index_file_extension' => array(
 					'label' => $lng['serversettings']['index_file_extension'],
 					'settinggroup' => 'system',
@@ -109,6 +101,47 @@ 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_report_enable' => array(
+					'label' => $lng['serversettings']['report']['report'],
+					'settinggroup' => 'system',
+					'varname' => 'report_enable',
+					'type' => 'bool',
+					'default' => true,
+					'cronmodule' => 'froxlor/reports',
+					'save_method' => 'storeSettingField',
+					),
+				'system_report_webmax' => array(
+					'label' => $lng['serversettings']['report']['webmax'],
+					'settinggroup' => 'system',
+					'varname' => 'report_webmax',
+					'type' => 'int',
+					'int_min' => 1,
+					'int_max' => 99,
+					'default' => 90,
+					'save_method' => 'storeSettingField',
+					),
+				'system_report_trafficmax' => array(
+					'label' => $lng['serversettings']['report']['trafficmax'],
+					'settinggroup' => 'system',
+					'varname' => 'report_trafficmax',
+					'type' => 'int',
+					'int_min' => 1,
+					'int_max' => 99,
+					'default' => 90,
+					'save_method' => 'storeSettingField',
+					),
 				'system_debug_cron' => array(
 					'label' => $lng['serversettings']['cron']['debug'],
 					'settinggroup' => 'system',

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')
 					),
 				),
 			),
@@ -198,6 +222,7 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
+					'overview_option' => true
 					),
 				'system_ssl_cert_file' => array(
 					'label' => $lng['serversettings']['ssl']['ssl_cert_file'],
@@ -229,6 +254,16 @@ return array(
 					'default' => '',
 					'save_method' => 'storeSettingField',
 					),
+				'system_ssl_cert_chainfile' => array(
+					'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile'],
+					'settinggroup' => 'system',
+					'varname' => 'ssl_cert_chainfile',
+					'type' => 'string',
+					'string_type' => 'file',
+					'string_emptyallowed' => true,
+					'default' => '',
+					'save_method' => 'storeSettingField',
+					),
 				'system_ssl_openssl_cnf' => array(
 					'label' => $lng['serversettings']['ssl']['openssl_cnf'],
 					'settinggroup' => 'system',
@@ -242,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,31 +28,8 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkFcgidPhpFpm',
 					'overview_option' => true
-					),
-				'system_mod_fcgid_enabled_ownvhost' => array(
-					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_ownvhost',
-					'type' => 'bool',
-					'default' => false,
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_httpuser' => array(
-					'label' => $lng['admin']['mod_fcgid_user'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpuser',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
-					),
-				'system_mod_fcgid_httpgroup' => array(
-					'label' => $lng['admin']['mod_fcgid_group'],
-					'settinggroup' => 'system',
-					'varname' => 'mod_fcgid_httpgroup',
-					'type' => 'string',
-					'default' => 'froxlorlocal',
-					'save_method' => 'storeSettingField',
 					),					
 				'system_mod_fcgid_configdir' => array(
 					'label' => $lng['serversettings']['mod_fcgid']['configdir'],
@@ -60,6 +38,7 @@ return array(
 					'type' => 'string',
 					'string_type' => 'dir',
 					'default' => '/var/www/php-fcgi-scripts/',
+					'plausibility_check_method' => 'checkPathConflicts',
 					'save_method' => 'storeSettingField',
 					),
 				'system_mod_fcgid_tmpdir' => array(
@@ -90,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'],
@@ -117,9 +97,47 @@ return array(
 					'option_options_method' => 'getPhpConfigs',
 					'save_method' => 'storeSettingField',
 					),
-				),
-			),
-		),
+				'system_mod_fcgid_enabled_ownvhost' => array(
+					'label' => $lng['serversettings']['mod_fcgid_ownvhost'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_ownvhost',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
+					),
+				'system_mod_fcgid_httpuser' => array(
+					'label' => $lng['admin']['mod_fcgid_user'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_httpuser',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
+					),
+				'system_mod_fcgid_httpgroup' => array(
+					'label' => $lng['admin']['mod_fcgid_group'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_httpgroup',
+					'type' => 'string',
+					'default' => 'froxlorlocal',
+					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
+					),
+				'system_mod_fcgid_defaultini_ownvhost' => array(
+					'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
+					'settinggroup' => 'system',
+					'varname' => 'mod_fcgid_defaultini_ownvhost',
+					'type' => 'option',
+					'default' => '1',
+					'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')
 					),
 				),
 			),

actions/admin/settings/140.statistics.php

@@ -66,6 +66,15 @@ return array(
 					'string_type' => 'dir',
 					'default' => '/etc/awstats/',
 					'save_method' => 'storeSettingField',
+					),
+				'system_awstats_icons' => array(
+					'label' => $lng['serversettings']['awstats_icons'],
+					'settinggroup' => 'system',
+					'varname' => 'awstats_icons',
+					'type' => 'string',
+					'string_type' => 'dir',
+					'default' => '/usr/share/awstats/icon/',
+					'save_method' => 'storeSettingField',
 					)
 				)
 			)

actions/admin/settings/190.ticket.php

@@ -58,6 +58,7 @@ return array(
 					'option_mode' => 'one',
 					'option_options' => array(0 => html_entity_decode($lng['admin']['tickets']['daily']), 1 => html_entity_decode($lng['admin']['tickets']['weekly']), 2 => html_entity_decode($lng['admin']['tickets']['monthly']), 3 => html_entity_decode($lng['admin']['tickets']['yearly'])),
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'setCycleOfCronjob',
 					),
 				'ticket_concurrently_open' => array(
 					'label' => $lng['serversettings']['ticket']['concurrentlyopen'],

admin_admins.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Panel
- * @version    $Id$
+ * @version    $Id: admin_admins.php 101 2010-12-08 07:03:42Z d00p $
  */
 
 define('AREA', 'admin');
@@ -47,6 +47,7 @@ if($page == 'admins'
 			'diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
 			'traffic' => $lng['customer']['traffic'],
 			'traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
+/*
 			'mysqls' => $lng['customer']['mysqls'],
 			'mysqls_used' => $lng['customer']['mysqls'] . ' (' . $lng['panel']['used'] . ')',
 			'ftps' => $lng['customer']['ftps'],
@@ -65,6 +66,7 @@ if($page == 'admins'
 			'email_quota_used' => $lng['customer']['email_quota'] . ' (' . $lng['panel']['used'] . ')',
 			'email_autoresponder' => $lng['customer']['autoresponder'],
 			'email_autoresponder_used' => $lng['customer']['autoresponder'] . ' (' . $lng['panel']['used'] . ')',
+*/
 			'deactivated' => $lng['admin']['deactivated']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_ADMINS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
@@ -86,6 +88,19 @@ if($page == 'admins'
 				$row['traffic'] = round($row['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
 				$row['diskspace_used'] = round($row['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
 				$row['diskspace'] = round($row['diskspace'] / 1024, $settings['panel']['decimal_places']);
+
+				/**
+				 * percent-values for progressbar
+				 */
+				if($row['diskspace'] > 0) {
+					$percent = round(($row['diskspace_used']*100)/$row['diskspace'], 2);
+					$doublepercent = round($percent*2, 2);
+				} else {
+					$percent = 0;
+					$doublepercent = 0;
+				}
+				/* */
+
 				$row = str_replace_array('-1', 'UL', $row, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps subdomains tickets');
 				$row = htmlentities_array($row);
 				eval("\$admins.=\"" . getTemplate("admins/admins_admin") . "\";");
@@ -360,8 +375,38 @@ if($page == 'admins'
 					$change_serversettings = '0';
 				}
 
-				$result = $db->query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` (`loginname`, `password`, `name`, `email`, `def_language`, `change_serversettings`, `customers`, `customers_see_all`, `domains`, `domains_see_all`, `caneditphpsettings`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `ip`, `can_manage_aps_packages`, `aps_packages`, `email_autoresponder`)
-					                   VALUES ('" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($email) . "','" . $db->escape($def_language) . "', '" . $db->escape($change_serversettings) . "', '" . $db->escape($customers) . "', '" . $db->escape($customers_see_all) . "', '" . $db->escape($domains) . "', '" . $db->escape($domains_see_all) . "', '" . (int)$caneditphpsettings . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '" . (int)$ipaddress . "', " . (int)$can_manage_aps_packages . ", " . (int)$number_of_aps_packages . ", " . $db->escape($email_autoresponder) . ")");
+				$_theme = $settings['panel']['default_theme'];
+
+				$result = $db->query("INSERT INTO 
+					`" . TABLE_PANEL_ADMINS . "`
+				SET 
+					`loginname` = '" . $db->escape($loginname) . "', 
+					`password` = '" . md5($password) . "', 
+					`name` = '" . $db->escape($name) . "', 
+					`email` = '" . $db->escape($email) . "', 
+					`def_language` = '" . $db->escape($def_language) . "', 
+					`change_serversettings` = '" . $db->escape($change_serversettings) . "', 
+					`customers` = '" . $db->escape($customers) . "', 
+					`customers_see_all` = '" . $db->escape($customers_see_all) . "', 
+					`domains` = '" . $db->escape($domains) . "', 
+					`domains_see_all` = '" . $db->escape($domains_see_all) . "', 
+					`caneditphpsettings` = '" . (int)$caneditphpsettings . "', 
+					`diskspace` = '" . $db->escape($diskspace) . "', 
+					`traffic` = '" . $db->escape($traffic) . "', 
+					`subdomains` = '" . $db->escape($subdomains) . "', 
+					`emails` = '" . $db->escape($emails) . "', 
+					`email_accounts` = '" . $db->escape($email_accounts) . "', 
+					`email_forwarders` = '" . $db->escape($email_forwarders) . "', 
+					`email_quota` = '" . $db->escape($email_quota) . "', 
+					`ftps` = '" . $db->escape($ftps) . "', 
+					`tickets` = '" . $db->escape($tickets) . "', 
+					`mysqls` = '" . $db->escape($mysqls) . "', 
+					`ip` = '" . (int)$ipaddress . "', 
+					`can_manage_aps_packages` = '" . (int)$can_manage_aps_packages . "', 
+					`aps_packages` = '" . (int)$number_of_aps_packages . "', 
+					`email_autoresponder` = '" . $db->escape($email_autoresponder) . "',
+					`theme` = '".$db->escape($_theme)."';
+				");
 				$adminid = $db->insert_id();
 				$log->logAction(ADM_ACTION, LOG_INFO, "added admin '" . $loginname . "'");
 				redirectTo($filename, Array('page' => $page, 's' => $s));
@@ -414,6 +459,12 @@ if($page == 'admins'
 			$can_manage_aps_packages = makeyesno('can_manage_aps_packages', '1', '0', '0');
 			$number_of_aps_packages_ul = makecheckbox('number_of_aps_packages_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 
+			$admin_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_add.php';
+			$admin_add_form = htmlform::genHTMLForm($admin_add_data);
+
+			$title = $admin_add_data['admin_add']['title'];
+			$image = $admin_add_data['admin_add']['image'];
+
 			eval("echo \"" . getTemplate("admins/admins_add") . "\";");
 		}
 	}
@@ -786,6 +837,13 @@ if($page == 'admins'
 				$can_manage_aps_packages = makeyesno('can_manage_aps_packages', '1', '0', $result['can_manage_aps_packages']);
 
 				$result = htmlentities_array($result);
+
+				$admin_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_edit.php';
+				$admin_edit_form = htmlform::genHTMLForm($admin_edit_data);
+
+				$title = $admin_edit_data['admin_edit']['title'];
+				$image = $admin_edit_data['admin_edit']['image'];
+
 				eval("echo \"" . getTemplate("admins/admins_edit") . "\";");
 			}
 		}

admin_configfiles.php

@@ -96,8 +96,9 @@ 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__)),
+			'<BIND_CONFIG_PATH>' => makeCorrectDir($settings['system']['bindconf_directory'])
 		);
 		$files = '';
 		$configpage = '';

admin_cronjobs.php

@@ -12,7 +12,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Panel
- * @version    $Id$
+ * @version    $Id: admin_cronjobs.php 105 2010-12-09 08:02:33Z d00p $
  */
 
 define('AREA', 'admin');
@@ -140,7 +140,13 @@ if($page == 'cronjobs'
 				{
 					$change_cronfile = true;
 				}
-				
+
+				$cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php';
+				$cronjobs_edit_form = htmlform::genHTMLForm($cronjobs_edit_data);
+
+				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
+				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
+
 				eval("echo \"" . getTemplate("cronjobs/cronjob_edit") . "\";");
 			}
 		}

admin_customers.php

@@ -50,7 +50,8 @@ if($page == 'customers'
 			'c.diskspace' => $lng['customer']['diskspace'],
 			'c.diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
 			'c.traffic' => $lng['customer']['traffic'],
-			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
+			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')'
+/*
 			'c.mysqls' => $lng['customer']['mysqls'],
 			'c.mysqls_used' => $lng['customer']['mysqls'] . ' (' . $lng['panel']['used'] . ')',
 			'c.ftps' => $lng['customer']['ftps'],
@@ -69,8 +70,10 @@ if($page == 'customers'
 			'c.lastlogin_succ' => $lng['admin']['lastlogin_succ'],
 			'c.phpenabled' => $lng['admin']['phpenabled'],
 			'c.perlenabled' => $lng['admin']['perlenabled']
+*/
 		);
 
+/*
 		if($settings['ticket']['enabled'] == 1)
 		{
 			$fields['c.tickets'] = $lng['customer']['tickets'];
@@ -82,6 +85,7 @@ if($page == 'customers'
 			$fields['c.email_autoresponder'] = $lng['customer']['autoresponder'];
 			$fields['c.email_autoresponder_used'] = $lng['customer']['autoresponder'] . ' (' . $lng['panel']['used'] . ')';			
 		}
+*/
 
 		$paging = new paging($userinfo, $db, TABLE_PANEL_CUSTOMERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$customers = '';
@@ -106,11 +110,24 @@ if($page == 'customers'
 				$row['diskspace'] = round($row['diskspace'] / 1024, $settings['panel']['decimal_places']);
 				$last_login = ((int)$row['lastlogin_succ'] == 0) ? $lng['panel']['neverloggedin'] : date('d.m.Y', $row['lastlogin_succ']);
 
+				/**
+				 * percent-values for progressbar
+				 */
+				if ($row['diskspace'] > 0) {
+					$percent = round(($row['diskspace_used']*100)/$row['diskspace'], 2);
+					$doublepercent = round($percent*2, 2);
+				} else {
+					$percent = 0;
+					$doublepercent = 0;
+				}
+
 				$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 +161,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)
 	{
@@ -188,6 +230,7 @@ if($page == 'customers'
 				$db->query("DELETE FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$id . "'");
 				$domains_deleted = $db->affected_rows();
 				$db->query("DELETE FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `customerid`='" . (int)$id . "'");
+				$db->query("DELETE FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `customerid`='" . (int)$id . "'");
 				$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid`='" . (int)$id . "' AND `adminsession` = '0'");
 				$db->query("DELETE FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE `customerid`='" . (int)$id . "'");
 				$db->query("DELETE FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid`='" . (int)$id . "'");
@@ -446,7 +489,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']);
@@ -565,7 +613,45 @@ if($page == 'customers'
 						$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
 					}
 
-					$result = $db->query("INSERT INTO `" . TABLE_PANEL_CUSTOMERS . "` (`adminid`, `loginname`, `password`, `name`, `firstname`, `company`, `street`, `zipcode`, `city`, `phone`, `fax`, `email`, `customernumber`, `def_language`, `documentroot`, `guid`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `standardsubdomain`, `phpenabled`, `imap`, `pop3`, `aps_packages`, `perlenabled`, `email_autoresponder`)  VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($firstname) . "', '" . $db->escape($company) . "', '" . $db->escape($street) . "', '" . $db->escape($zipcode) . "', '" . $db->escape($city) . "', '" . $db->escape($phone) . "', '" . $db->escape($fax) . "', '" . $db->escape($email) . "', '" . $db->escape($customernumber) . "','" . $db->escape($def_language) . "', '" . $db->escape($documentroot) . "', '" . $db->escape($guid) . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '0', '" . $db->escape($phpenabled) . "', '" . $db->escape($email_imap) . "', '" . $db->escape($email_pop3) . "', '" . (int)$number_of_aps_packages . "', '" . $db->escape($perlenabled) . "', '" . $db->escape($email_autoresponder) . "')");
+					$_theme = $settings['panel']['default_theme'];
+
+					$result = $db->query(
+						"INSERT INTO `" . TABLE_PANEL_CUSTOMERS . "` SET 
+						`adminid` = '" . (int)$userinfo['adminid'] . "', 
+						`loginname` = '" . $db->escape($loginname) . "', 
+						`password` = '" . md5($password) . "', 
+						`name` = '" . $db->escape($name) . "', 
+						`firstname` = '" . $db->escape($firstname) . "', 
+						`company` = '" . $db->escape($company) . "', 
+						`street` = '" . $db->escape($street) . "', 
+						`zipcode` = '" . $db->escape($zipcode) . "', 
+						`city` = '" . $db->escape($city) . "', 
+						`phone` = '" . $db->escape($phone) . "', 
+						`fax` = '" . $db->escape($fax) . "', 
+						`email` = '" . $db->escape($email) . "', 
+						`customernumber` = '" . $db->escape($customernumber) . "', 
+						`def_language` = '" . $db->escape($def_language) . "', 
+						`documentroot` = '" . $db->escape($documentroot) . "', 
+						`guid` = '" . $db->escape($guid) . "', 
+						`diskspace` = '" . $db->escape($diskspace) . "', 
+						`traffic` = '" . $db->escape($traffic) . "', 
+						`subdomains` = '" . $db->escape($subdomains) . "', 
+						`emails` = '" . $db->escape($emails) . "', 
+						`email_accounts` = '" . $db->escape($email_accounts) . "', 
+						`email_forwarders` = '" . $db->escape($email_forwarders) . "', 
+						`email_quota` = '" . $db->escape($email_quota) . "', 
+						`ftps` = '" . $db->escape($ftps) . "', 
+						`tickets` = '" . $db->escape($tickets) . "', 
+						`mysqls` = '" . $db->escape($mysqls) . "', 
+						`standardsubdomain` = '0', 
+						`phpenabled` = '" . $db->escape($phpenabled) . "', 
+						`imap` = '" . $db->escape($email_imap) . "', 
+						`pop3` = '" . $db->escape($email_pop3) . "', 
+						`aps_packages` = '" . (int)$number_of_aps_packages . "', 
+						`perlenabled` = '" . $db->escape($perlenabled) . "', 
+						`email_autoresponder` = '" . $db->escape($email_autoresponder) . "',
+						`theme` = '" . $db->escape($_theme) . "'"
+					);
 					$customerid = $db->insert_id();
 					$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` + 1";
 
@@ -751,7 +837,7 @@ if($page == 'customers'
 
 				while(list($language_file, $language_name) = each($languages))
 				{
-					$language_options.= makeoption($language_name, $language_file, $userinfo['def_language'], true);
+					$language_options.= makeoption($language_name, $language_file, $settings['panel']['standardlanguage'], true);
 				}
 
 				$diskspace_ul = makecheckbox('diskspace_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
@@ -773,6 +859,13 @@ if($page == 'customers'
 				$phpenabled = makeyesno('phpenabled', '1', '0', '1');
 				$perlenabled = makeyesno('perlenabled', '1', '0', '0');
 				$store_defaultindex = makeyesno('store_defaultindex', '1', '0', '1');
+
+				$customer_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_add.php';
+				$customer_add_form = htmlform::genHTMLForm($customer_add_data);
+
+				$title = $customer_add_data['customer_add']['title'];
+				$image = $customer_add_data['customer_add']['image'];
+
 				eval("echo \"" . getTemplate("customers/customers_add") . "\";");
 			}
 		}
@@ -1345,6 +1438,13 @@ if($page == 'customers'
 				$email_pop3 = makeyesno('email_pop3', '1', '0', $result['pop3']);
 
 				$result = htmlentities_array($result);
+
+				$customer_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_edit.php';
+				$customer_edit_form = htmlform::genHTMLForm($customer_edit_data);
+
+				$title = $customer_edit_data['customer_edit']['title'];
+				$image = $customer_edit_data['customer_edit']['image'];
+
 				eval("echo \"" . getTemplate("customers/customers_edit") . "\";");
 			}
 		}

admin_domains.php

@@ -144,8 +144,8 @@ if($page == 'domains'
 		$alias_check = $db->query_first('SELECT COUNT(`id`) AS `count` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$id . '\'');
 
 		if($result['domain'] != ''
-		   && $alias_check['count'] == 0)
-		{
+			&& $alias_check['count'] == 0
+		) {
 			if(isset($_POST['send'])
 			   && $_POST['send'] == 'send')
 			{
@@ -197,6 +197,9 @@ if($page == 'domains'
 				inserttask('4');
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
+			elseif ($alias_check['count'] > 0) {
+				standard_error('domains_cantdeletedomainwithaliases');
+			}
 			else
 			{
 				$showcheck = false;
@@ -666,6 +669,12 @@ if($page == 'domains'
 				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', '0');				
 				$add_date = date('Y-m-d');
 
+				$domain_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/domains/formfield.domains_add.php';
+				$domain_add_form = htmlform::genHTMLForm($domain_add_data);
+
+				$title = $domain_add_data['domain_add']['title'];
+				$image = $domain_add_data['domain_add']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_add") . "\";");
 			}
 		}
@@ -1205,6 +1214,13 @@ if($page == 'domains'
 				$specialsettingsforsubdomains = makeyesno('specialsettingsforsubdomains', '1', '0', '1');
 				
 				$result = htmlentities_array($result);
+
+				$domain_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/domains/formfield.domains_edit.php';
+				$domain_edit_form = htmlform::genHTMLForm($domain_edit_data);
+
+				$title = $domain_edit_data['domain_edit']['title'];
+				$image = $domain_edit_data['domain_edit']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
 		}

admin_index.php

@@ -295,5 +295,34 @@ elseif($page == 'change_language')
 		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
 }
+elseif($page == 'change_theme')
+{
+	if(isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$theme = validate($_POST['theme'], 'theme');
 
-?>
+		$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "'");
+		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
+
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
+		redirectTo($filename, Array('s' => $s));
+	}
+	else
+	{
+		$theme_options = '';
+
+		$default_theme = $settings['panel']['default_theme'];
+		if($userinfo['theme'] != '') {
+			$default_theme = $userinfo['theme'];
+		}
+
+		$themes_avail = getThemes();
+		foreach($themes_avail as $t)
+		{
+			$theme_options.= makeoption($t, $t, $default_theme, true);
+		}
+
+		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+	}
+}

admin_ipsandports.php

@@ -141,11 +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');
 			$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')
 			{
@@ -187,6 +198,20 @@ if($page == 'ipsandports'
 				$ssl_ca_file = makeCorrectFile($ssl_ca_file);
 			}
 
+			if($ssl_cert_chainfile != '')
+			{
+				$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
+			}
+
+			if(strlen(trim($docroot)) > 0)
+			{
+				$docroot = makeCorrectDir($docroot);
+			}
+			else
+			{
+				$docroot = '';
+			}
+
 			$result_checkfordouble = $db->query_first("SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `ip`='" . $db->escape($ip) . "' AND `port`='" . (int)$port . "'");
 
 			if($result_checkfordouble['id'] != '')
@@ -195,7 +220,23 @@ if($page == 'ipsandports'
 			}
 			else
 			{
-				$db->query("INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "` (`ip`, `port`, `listen_statement`, `namevirtualhost_statement`, `vhostcontainer`, `vhostcontainer_servername_statement`, `specialsettings`, `ssl`, `ssl_cert_file`, `ssl_key_file`, `ssl_ca_file`, `default_vhostconf_domain`) VALUES ('" . $db->escape($ip) . "', '" . (int)$port . "', '" . (int)$listen_statement . "', '" . (int)$namevirtualhost_statement . "', '" . (int)$vhostcontainer . "', '" . (int)$vhostcontainer_servername_statement . "', '" . $db->escape($specialsettings) . "', '" . (int)$ssl . "', '" . $db->escape($ssl_cert_file) . "', '" . $db->escape($ssl_key_file) . "', '" . $db->escape($ssl_ca_file) . "', '" . $db->escape($default_vhostconf_domain) . "')");
+				$db->query("INSERT INTO `" . TABLE_PANEL_IPSANDPORTS . "`
+					SET 
+						`ip` = '" . $db->escape($ip) . "', 
+						`port` = '" . (int)$port . "', 
+						`listen_statement` = '" . (int)$listen_statement . "', 
+						`namevirtualhost_statement` = '" . (int)$namevirtualhost_statement . "', 
+						`vhostcontainer` = '" . (int)$vhostcontainer . "', 
+						`vhostcontainer_servername_statement` = '" . (int)$vhostcontainer_servername_statement . "', 
+						`specialsettings` = '" . $db->escape($specialsettings) . "', 
+						`ssl` = '" . (int)$ssl . "', 
+						`ssl_cert_file` = '" . $db->escape($ssl_cert_file) . "', 
+						`ssl_key_file` = '" . $db->escape($ssl_key_file) . "', 
+						`ssl_ca_file` = '" . $db->escape($ssl_ca_file) . "',
+						`ssl_cert_chainfile` = '" . $db->escape($ssl_cert_chainfile) . "', 
+						`default_vhostconf_domain` = '" . $db->escape($default_vhostconf_domain) . "',
+						`docroot` = '" . $db->escape($docroot) . "';
+					");
 
 				if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
 				{
@@ -215,6 +256,13 @@ if($page == 'ipsandports'
 			$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', '1');
 			$vhostcontainer = makeyesno('vhostcontainer', '1', '0', '1');
 			$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', '1');
+
+			$ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
+			$ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data);
+
+			$title = $ipsandports_add_data['ipsandports_add']['title'];
+			$image = $ipsandports_add_data['ipsandports_add']['image'];
+
 			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
 		}
 	}
@@ -237,11 +285,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');
 				$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')
 				{
@@ -283,6 +342,20 @@ if($page == 'ipsandports'
 					$ssl_ca_file = makeCorrectFile($ssl_ca_file);
 				}
 
+				if($ssl_cert_chainfile != '')
+				{
+					$ssl_cert_chainfile = makeCorrectFile($ssl_cert_chainfile);
+				}
+
+				if(strlen(trim($docroot)) > 0)
+				{
+					$docroot = makeCorrectDir($docroot);
+				}
+				else
+				{
+					$docroot = '';
+				}
+
 				if($result['ip'] != $ip
 				   && $result['ip'] == $settings['system']['ipaddress']
 				   && $result_sameipotherport['id'] == '')
@@ -296,7 +369,26 @@ if($page == 'ipsandports'
 				}
 				else
 				{
-					$db->query("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "` SET `ip`='" . $db->escape($ip) . "', `port`='" . (int)$port . "', `listen_statement`='" . (int)$listen_statement . "', `namevirtualhost_statement`='" . (int)$namevirtualhost_statement . "', `vhostcontainer`='" . (int)$vhostcontainer . "', `vhostcontainer_servername_statement`='" . (int)$vhostcontainer_servername_statement . "', `specialsettings`='" . $db->escape($specialsettings) . "', `ssl`='" . (int)$ssl . "', `ssl_cert_file`='" . $db->escape($ssl_cert_file) . "', `ssl_key_file`='" . $db->escape($ssl_key_file) . "', `ssl_ca_file`='" . $db->escape($ssl_ca_file) . "', `default_vhostconf_domain`='" . $db->escape($default_vhostconf_domain) . "' WHERE `id`='" . (int)$id . "'");
+
+					$db->query("UPDATE `" . TABLE_PANEL_IPSANDPORTS . "`
+					SET 
+						`ip` = '" . $db->escape($ip) . "', 
+						`port` = '" . (int)$port . "', 
+						`listen_statement` = '" . (int)$listen_statement . "', 
+						`namevirtualhost_statement` = '" . (int)$namevirtualhost_statement . "', 
+						`vhostcontainer` = '" . (int)$vhostcontainer . "', 
+						`vhostcontainer_servername_statement` = '" . (int)$vhostcontainer_servername_statement . "', 
+						`specialsettings` = '" . $db->escape($specialsettings) . "', 
+						`ssl` = '" . (int)$ssl . "', 
+						`ssl_cert_file` = '" . $db->escape($ssl_cert_file) . "', 
+						`ssl_key_file` = '" . $db->escape($ssl_key_file) . "', 
+						`ssl_ca_file` = '" . $db->escape($ssl_ca_file) . "',
+						`ssl_cert_chainfile` = '" . $db->escape($ssl_cert_chainfile) . "', 
+						`default_vhostconf_domain` = '" . $db->escape($default_vhostconf_domain) . "',
+						`docroot` = '" . $db->escape($docroot) . "' 
+					WHERE `id`='" . (int)$id . "'
+					");
+
 					$log->logAction(ADM_ACTION, LOG_WARNING, "changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
 					inserttask('1');
 					inserttask('4');
@@ -311,6 +403,13 @@ if($page == 'ipsandports'
 				$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', $result['namevirtualhost_statement']);
 				$vhostcontainer = makeyesno('vhostcontainer', '1', '0', $result['vhostcontainer']);
 				$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', $result['vhostcontainer_servername_statement']);
+
+				$ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
+				$ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data);
+	
+				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
+				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
+
 				eval("echo \"" . getTemplate("ipsandports/ipsandports_edit") . "\";");
 			}
 		}

admin_logger.php

@@ -31,10 +31,10 @@ if($page == 'log'
 	if($action == '')
 	{
 		$fields = array(
-			'action' => $lng['logger']['action'],
 			'date' => $lng['logger']['date'],
 			'type' => $lng['logger']['type'],
-			'user' => $lng['logger']['user']
+			'user' => $lng['logger']['user'],
+			'text' => $lng['logger']['action']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_LOG, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$paging->sortfield = 'date';
@@ -167,5 +167,3 @@ if($page == 'log'
 		}
 	}
 }
-
-?>

admin_phpsettings.php

@@ -39,6 +39,7 @@ if($page == 'overview')
 	if($action == '')
 	{
 		$tablecontent = '';
+		$count = 0;
 		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");
 
 		while($row = $db->fetch_array($result))
@@ -68,6 +69,7 @@ if($page == 'overview')
 				$domains = $lng['admin']['phpsettings']['notused'];
 			}
 
+			$count ++;
 			eval("\$tablecontent.=\"" . getTemplate("phpconfig/overview_overview") . "\";");
 		}
 
@@ -103,6 +105,13 @@ if($page == 'overview')
 			else
 			{
 				$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
+
+				$phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
+				$phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data);
+
+				$title = $phpconfig_add_data['phpconfig_add']['title'];
+				$image = $phpconfig_add_data['phpconfig_add']['image'];
+
 				eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";");
 			}
 		}
@@ -172,6 +181,12 @@ if($page == 'overview')
 			}
 			else
 			{
+				$phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
+				$phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data);
+
+				$title = $phpconfig_edit_data['phpconfig_edit']['title'];
+				$image = $phpconfig_edit_data['phpconfig_edit']['image'];
+
 				eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";");
 			}
 		}

admin_settings.php

@@ -75,6 +75,10 @@ if(($page == 'settings' || $page == 'overview')
 			$only_enabledisable
 			)
 		) {
+			$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
+			inserttask('1');
+			inserttask('4');
+			inserttask('5');
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
 	}
@@ -115,7 +119,7 @@ elseif($page == 'rebuildconfigs'
 		inserttask('1');
 		inserttask('4');
 		inserttask('5');
-		redirectTo('admin_index.php', array('s' => $s));
+		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 	}
 	else
 	{
@@ -214,4 +218,4 @@ elseif($page == 'enforcequotas'
 	{
 		ask_yesno('admin_quotas_reallyenforce', $filename, array('page' => $page));
 	}
-}
+}

admin_templates.php

@@ -48,7 +48,8 @@ elseif(isset($_GET['id']))
 $available_templates = array(
 	'createcustomer',
 	'pop_success',
-	'trafficninetypercent',
+	'trafficmaxpercent',
+	'diskmaxpercent',
 	'new_ticket_by_customer',
 	'new_ticket_for_customer',
 	'new_ticket_by_staff',
@@ -151,7 +152,7 @@ elseif($action == 'delete'
 		}
 	}
 }
-elseif($action == 'delete'
+elseif($action == 'deletef'
        && $id != 0)
 {
 	//file templates
@@ -208,6 +209,12 @@ elseif($action == 'add')
 			$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true);
 		}
 
+		$template_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_add.php';
+		$template_add_form = htmlform::genHTMLForm($template_add_data);
+
+		$title = $template_add_data['template_add']['title'];
+		$image = $template_add_data['template_add']['image'];
+
 		eval("echo \"" . getTemplate("templates/templates_add_2") . "\";");
 	}
 	elseif(isset($_POST['send'])
@@ -311,6 +318,12 @@ elseif($action == 'add')
 				$free_templates.= makeoption($lng['admin']['templates'][$template], $template, '', true);
 			}
 
+			$filetemplate_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_add.php';
+			$filetemplate_add_form = htmlform::genHTMLForm($filetemplate_add_data);
+
+			$title = $filetemplate_add_data['filetemplate_add']['title'];
+			$image = $filetemplate_add_data['filetemplate_add']['image'];
+
 			eval("echo \"" . getTemplate("templates/filetemplates_add") . "\";");
 		}
 	}
@@ -343,11 +356,18 @@ elseif($action == 'edit'
 			$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `id`='$mailbodyid'");
 			$result = htmlentities_array($result);
 			$mailbody = $result['value'];
+
+			$template_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_edit.php';
+			$template_edit_form = htmlform::genHTMLForm($template_edit_data);
+
+			$title = $template_edit_data['template_edit']['title'];
+			$image = $template_edit_data['template_edit']['image'];
+
 			eval("echo \"" . getTemplate("templates/templates_edit") . "\";");
 		}
 	}
 }
-elseif($action == 'edit'
+elseif($action == 'editf'
        && $id != 0)
 {
 	//file templates
@@ -371,6 +391,13 @@ elseif($action == 'edit'
 		else
 		{
 			$row = htmlentities_array($row);
+
+			$filetemplate_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
+			$filetemplate_edit_form = htmlform::genHTMLForm($filetemplate_edit_data);
+
+			$title = $filetemplate_edit_data['filetemplate_edit']['title'];
+			$image = $filetemplate_edit_data['filetemplate_edit']['image'];
+
 			eval("echo \"" . getTemplate("templates/filetemplates_edit") . "\";");
 		}
 	}
@@ -380,5 +407,3 @@ elseif($action == 'edit'
 		exit;
 	}
 }
-
-?>

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);
@@ -140,6 +140,7 @@ if($page == 'tickets'
 						$cananswer = 1;
 					}
 
+					$row['subject'] = html_entity_decode($row['subject']);
 					if(strlen($row['subject']) > 20)
 					{
 						$row['subject'] = substr($row['subject'], 0, 17) . '...';
@@ -226,6 +227,13 @@ if($page == 'tickets'
 				$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']);
 				$priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']);
 				$priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']);
+
+				$ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.ticket_new.php';
+				$ticket_new_form = htmlform::genHTMLForm($ticket_new_data);
+
+				$title = $ticket_new_data['ticket_new']['title'];
+				$image = $ticket_new_data['ticket_new']['image'];
+
 				eval("echo \"" . getTemplate("ticket/tickets_new") . "\";");
 			}
 		}
@@ -337,6 +345,11 @@ if($page == 'tickets'
 			$ticket_replies_count = $db->num_rows($andere) + 1;
 
 			// don't forget the main-ticket!
+			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.ticket_reply.php';
+			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
+ 
+			$title = $ticket_reply_data['ticket_reply']['title'];
+			$image = $ticket_reply_data['ticket_reply']['image'];
 
 			eval("echo \"" . getTemplate("ticket/tickets_reply") . "\";");
 		}
@@ -472,7 +485,8 @@ elseif($page == 'categories'
 			
 			if($order < 1 || $order >= 1000)
 			{
-				$order = 1;
+				// use the latest available
+				$order = ticket::getHighestOrderNumber($db) + 1;
 			}
 
 			if($category == '')
@@ -488,6 +502,14 @@ elseif($page == 'categories'
 		}
 		else
 		{
+			$order = ticket::getHighestOrderNumber($db) + 1;
+
+			$category_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.category_new.php';
+			$category_new_form = htmlform::genHTMLForm($category_new_data);
+
+			$title = $category_new_data['category_new']['title'];
+			$image = $category_new_data['category_new']['image'];
+
 			eval("echo \"" . getTemplate("ticket/tickets_newcategory") . "\";");
 		}
 	}
@@ -519,6 +541,13 @@ elseif($page == 'categories'
 		else
 		{
 			$row = $db->query_first('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `id` = "' . (int)$id . '"');
+
+			$category_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.category_edit.php';
+			$category_edit_form = htmlform::genHTMLForm($category_edit_data);
+
+			$title = $category_edit_data['category_edit']['title'];
+			$image = $category_edit_data['category_edit']['image'];
+
 			eval("echo \"" . getTemplate("ticket/tickets_editcategory") . "\";");
 		}
 	}

customer_autoresponder.php

@@ -109,7 +109,15 @@ if($action == "add")
 	
 	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
 	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
+	
+	$isactive = makeyesno('active', '1', '0', '1');
 
+	$autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addautoresponder.php';
+	$autoresponder_add_form = htmlform::genHTMLForm($autoresponder_add_data);
+
+	$title = $autoresponder_add_data['autoresponder_add']['title'];
+	$image = $autoresponder_add_data['autoresponder_add']['image'];
+	
 	eval("echo \"" . getTemplate("email/autoresponder_add") . "\";");
 }
 
@@ -212,6 +220,7 @@ if($action == "edit")
 	if($date_from == -1)
 	{
 		$deactivated = '-1';
+		$date_from = '';
 	}
 	else
 	{
@@ -223,7 +232,7 @@ if($action == "edit")
 	if($date_until == -1)
 	{
 		$deactivated = '-1';
-		$date_until = '-1';
+		$date_until = '';
 	}
 	else
 	{
@@ -231,13 +240,14 @@ if($action == "edit")
 		$date_until = date('d-m-Y', $date_until);
 	}
 	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
+	
+	$isactive = makeyesno('active', '1', '0', $row['enabled']);
 
-	$checked = '';
+	$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_editautoresponder.php';
+	$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
 
-	if($row['enabled'] == 1)
-	{
-		$checked = "checked=\"checked\"";
-	}
+	$title = $autoresponder_edit_data['autoresponder_edit']['title'];
+	$image = $autoresponder_edit_data['autoresponder_edit']['image'];
 
 	eval("echo \"" . getTemplate("email/autoresponder_edit") . "\";");
 }
@@ -279,6 +289,7 @@ if($action == "delete")
 else 
 {
 	$autoresponder = '';
+	$count = 0;
 	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' ORDER BY email ASC");
 
 	while($row = $db->fetch_array($result))
@@ -300,9 +311,8 @@ else
 			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
 		}
 		eval("\$autoresponder.=\"" . getTemplate("email/autoresponder_autoresponder") . "\";");
+		$count++;
 	}	
 
 	eval("echo \"" . getTemplate("email/autoresponder") . "\";");
 }
-
-?>

customer_domains.php

@@ -368,9 +368,9 @@ elseif($page == 'domains')
 					$aliasdomains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id']);
 				}
 
+				$redirectcode = '';
 				if($settings['customredirect']['enabled'] == '1')
 				{
-					$redirectcode = '';
 					$codes = getRedirectCodesArray();
 					foreach($codes as $rc)
 					{
@@ -381,6 +381,13 @@ elseif($page == 'domains')
 				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, NULL, true) . makeoption($lng['domain']['homedir'], 1, NULL, true);
 				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+
+				$subdomain_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/domains/formfield.domains_add.php';
+				$subdomain_add_form = htmlform::genHTMLForm($subdomain_add_data);
+
+				$title = $subdomain_add_data['domain_add']['title'];
+				$image = $subdomain_add_data['domain_add']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_add") . "\";");
 			}
 		}
@@ -545,10 +552,10 @@ elseif($page == 'domains')
 					$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot']);
 				}
 
+				$redirectcode = '';
 				if($settings['customredirect']['enabled'] == '1')
 				{
 					$def_code = getDomainRedirectId($id);
-					$redirectcode = '';
 					$codes = getRedirectCodesArray();
 					foreach($codes as $rc)
 					{
@@ -569,6 +576,12 @@ elseif($page == 'domains')
 				$domainip = $result_ipandport['ip'];
 				$result = htmlentities_array($result);
 
+				$subdomain_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/domains/formfield.domains_edit.php';
+				$subdomain_edit_form = htmlform::genHTMLForm($subdomain_edit_data);
+
+				$title = $subdomain_edit_data['domain_edit']['title'];
+				$image = $subdomain_edit_data['domain_edit']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
 		}

customer_email.php

@@ -282,6 +282,13 @@ elseif($page == 'emails')
 				}
 
 				$iscatchall = makeyesno('iscatchall', '1', '0', '0');
+
+				$email_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_add.php';
+				$email_add_form = htmlform::genHTMLForm($email_add_data);
+
+				$title = $email_add_data['emails_add']['title'];
+				$image = $email_add_data['emails_add']['image'];
+
 				eval("echo \"" . getTemplate("email/emails_add") . "\";");
 			}
 		}
@@ -321,6 +328,13 @@ elseif($page == 'emails')
 
 			$destinations_count = count($result['destination']);
 			$result = htmlentities_array($result);
+
+			$email_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_edit.php';
+			$email_edit_form = htmlform::genHTMLForm($email_edit_data);
+
+			$title = $email_edit_data['emails_edit']['title'];
+			$image = $email_edit_data['emails_edit']['image'];
+			
 			eval("echo \"" . getTemplate("email/emails_edit") . "\";");
 		}
 	}
@@ -505,6 +519,13 @@ elseif($page == 'accounts')
 					$result['email_full'] = $idna_convert->decode($result['email_full']);
 					$result = htmlentities_array($result);
 					$quota = $settings['system']['mail_quota'];
+
+					$account_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addaccount.php';
+					$account_add_form = htmlform::genHTMLForm($account_add_data);
+
+					$title = $account_add_data['emails_addaccount']['title'];
+					$image = $account_add_data['emails_addaccount']['image'];
+
 					eval("echo \"" . getTemplate("email/account_add") . "\";");
 				}
 			}
@@ -543,6 +564,13 @@ elseif($page == 'accounts')
 			{
 				$result['email_full'] = $idna_convert->decode($result['email_full']);
 				$result = htmlentities_array($result);
+
+				$account_changepw_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php';
+				$account_changepw_form = htmlform::genHTMLForm($account_changepw_data);
+
+				$title = $account_changepw_data['emails_accountchangepasswd']['title'];
+				$image = $account_changepw_data['emails_accountchangepasswd']['image'];
+
 				eval("echo \"" . getTemplate("email/account_changepw") . "\";");
 			}
 		}
@@ -584,6 +612,13 @@ elseif($page == 'accounts')
 			{
 				$result['email_full'] = $idna_convert->decode($result['email_full']);
 				$result = htmlentities_array($result);
+
+				$quota_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangequota.php';
+				$quota_edit_form = htmlform::genHTMLForm($quota_edit_data);
+
+				$title = $quota_edit_data['emails_accountchangequota']['title'];
+				$image = $quota_edit_data['emails_accountchangequota']['image'];
+        
 				eval("echo \"" . getTemplate("email/account_changequota") . "\";");
 			}
 		}
@@ -678,6 +713,13 @@ elseif($page == 'forwarders')
 				{
 					$result['email_full'] = $idna_convert->decode($result['email_full']);
 					$result = htmlentities_array($result);
+
+					$forwarder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addforwarder.php';
+					$forwarder_add_form = htmlform::genHTMLForm($forwarder_add_data);
+
+					$title = $forwarder_add_data['emails_addforwarder']['title'];
+					$image = $forwarder_add_data['emails_addforwarder']['image'];
+
 					eval("echo \"" . getTemplate("email/forwarder_add") . "\";");
 				}
 			}

customer_extras.php

@@ -161,6 +161,13 @@ elseif($page == 'htpasswds')
 		else
 		{
 			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+
+			$htpasswd_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_add.php';
+			$htpasswd_add_form = htmlform::genHTMLForm($htpasswd_add_data);
+
+			$title = $htpasswd_add_data['htpasswd_add']['title'];
+			$image = $htpasswd_add_data['htpasswd_add']['image'];
+
 			eval("echo \"" . getTemplate("extras/htpasswds_add") . "\";");
 		}
 	}
@@ -220,6 +227,13 @@ elseif($page == 'htpasswds')
 				}
 
 				$result = htmlentities_array($result);
+
+				$htpasswd_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_edit.php';
+				$htpasswd_edit_form = htmlform::genHTMLForm($htpasswd_edit_data);
+
+				$title = $htpasswd_edit_data['htpasswd_edit']['title'];
+				$image = $htpasswd_edit_data['htpasswd_edit']['image'];
+
 				eval("echo \"" . getTemplate("extras/htpasswds_edit") . "\";");
 			}
 		}
@@ -357,6 +371,13 @@ elseif($page == 'htaccess')
 			$options_indexes = makeyesno('options_indexes', '1', '0', '0');
 			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 			$options_cgi = makeyesno('options_cgi', '1', '0', '0');
+
+			$htaccess_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_add.php';
+			$htaccess_add_form = htmlform::genHTMLForm($htaccess_add_data);
+
+			$title = $htaccess_add_data['htaccess_add']['title'];
+			$image = $htaccess_add_data['htaccess_add']['image'];
+
 			eval("echo \"" . getTemplate("extras/htaccess_add") . "\";");
 		}
 	}
@@ -418,6 +439,13 @@ elseif($page == 'htaccess')
 				$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 				$options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
 				$result = htmlentities_array($result);
+
+				$htaccess_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_edit.php';
+				$htaccess_edit_form = htmlform::genHTMLForm($htaccess_edit_data);
+	
+				$title = $htaccess_edit_data['htaccess_edit']['title'];
+				$image = $htaccess_edit_data['htaccess_edit']['image'];
+
 				eval("echo \"" . getTemplate("extras/htaccess_edit") . "\";");
 			}
 		}

customer_ftp.php

@@ -97,11 +97,8 @@ elseif($page == 'accounts')
 			   && $_POST['send'] == 'send')
 			{
 				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `up_count`=`up_count`+'" . (int)$result['up_count'] . "', `up_bytes`=`up_bytes`+'" . (int)$result['up_bytes'] . "', `down_count`=`down_count`+'" . (int)$result['down_count'] . "', `down_bytes`=`down_bytes`+'" . (int)$result['down_bytes'] . "' WHERE `username`='" . $db->escape($userinfo['loginname']) . "'");
-				$result = $db->query("SELECT `username` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-				while($row = $db->fetch_array($result))
-				{
-					$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($row['username']) . "'");
-				}
+				$result = $db->query_first("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+				$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($result['username']) . "'");
 				$db->query("DELETE FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
 				$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=REPLACE(`members`,'," . $db->escape($result['username']) . "','') WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
@@ -195,7 +192,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'] . "'");
@@ -250,18 +247,35 @@ elseif($page == 'accounts')
 
 				if($settings['customer']['ftpatdomain'] == '1')
 				{
+					$domainlist = array();
 					$domains = '';
 
 					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
 
 					while($row_domain = $db->fetch_array($result_domains))
 					{
-						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
+						$domainlist[] =  $row_domain['domain'];
+					}
+
+					sort($domainlist);
+
+					if(isset($domainlist[0]) && $domainlist[0] != '')
+					{
+						foreach($domainlist as $dom)
+						{
+							$domains .= makeoption($idna_convert->decode($dom), $dom);
+						}
 					}
 				}
 
 				$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
 
+				$ftp_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_add.php';
+				$ftp_add_form = htmlform::genHTMLForm($ftp_add_data);
+
+				$title = $ftp_add_data['ftp_add']['title'];
+				$image = $ftp_add_data['ftp_add']['image'];
+
 				eval("echo \"" . getTemplate("ftp/accounts_add") . "\";");
 			}
 		}
@@ -344,7 +358,13 @@ elseif($page == 'accounts')
 						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
 					}
 				}
-				
+
+				$ftp_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_edit.php';
+				$ftp_edit_form = htmlform::genHTMLForm($ftp_edit_data);
+
+				$title = $ftp_edit_data['ftp_edit']['title'];
+				$image = $ftp_edit_data['ftp_edit']['image'];
+
 				eval("echo \"" . getTemplate("ftp/accounts_edit") . "\";");
 			}
 		}

customer_index.php

@@ -185,5 +185,33 @@ elseif($page == 'change_language')
 		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
 }
+elseif($page == 'change_theme')
+{
+	if(isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$theme = validate($_POST['theme'], 'theme');
+ 
+		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
+		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
+		redirectTo($filename, Array('s' => $s));
+	}
+	else
+	{
+		$theme_options = '';
 
-?>
+		$default_theme = $settings['panel']['default_theme'];
+		if($userinfo['theme'] != '') {
+			$default_theme = $userinfo['theme'];
+		}
+
+		$themes_avail = getThemes();
+		foreach($themes_avail as $t)
+		{
+			$theme_options.= makeoption($t, $t, $default_theme, true);
+		}
+
+		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+	}
+}

customer_mysql.php

@@ -80,7 +80,7 @@ elseif($page == 'mysqls')
 	elseif($action == 'delete'
 	       && $id != 0)
 	{
-		$result = $db->query_first('SELECT `id`, `databasename`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
+		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
 
 		if(isset($result['databasename'])
 		   && $result['databasename'] != '')
@@ -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(isset($result['description']) && $result['description'] != '') {
+					$dbnamedesc.= ' ('.$result['description'].')';
+				}
+				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
 			}
 		}
 	}
@@ -252,6 +256,12 @@ elseif($page == 'mysqls')
 
 				$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
 
+				$mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php';
+				$mysql_add_form = htmlform::genHTMLForm($mysql_add_data);
+
+				$title = $mysql_add_data['mysql_add']['title'];
+				$image = $mysql_add_data['mysql_add']['image'];
+
 				eval("echo \"" . getTemplate("mysql/mysqls_add") . "\";");
 			}
 		}
@@ -303,10 +313,16 @@ elseif($page == 'mysqls')
 			}
 			else
 			{
+				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
+				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
+
+				$title = $mysql_edit_data['mysql_edit']['title'];
+				$image = $mysql_edit_data['mysql_edit']['image'];
+
 				eval("echo \"" . getTemplate("mysql/mysqls_edit") . "\";");
 			}
 		}
 	}
 }
 
-?>
+?>

customer_tickets.php

@@ -98,6 +98,7 @@ elseif($page == 'tickets')
 					$cananswer = 0;
 				}
 
+				$row['subject'] = html_entity_decode($row['subject']);
 				if(strlen($row['subject']) > 20)
 				{
 					$row['subject'] = substr($row['subject'], 0, 17) . '...';
@@ -246,6 +247,13 @@ elseif($page == 'tickets')
 				}
 
 				$ticketsopen = (int)$opentickets['count'];
+
+				$ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_add.php';
+				$ticket_add_form = htmlform::genHTMLForm($ticket_add_data);
+
+				$title = $ticket_add_data['ticket_add']['title'];
+				$image = $ticket_add_data['ticket_add']['image'];
+
 				eval("echo \"" . getTemplate("ticket/tickets_new") . "\";");
 			}
 		}
@@ -359,6 +367,12 @@ elseif($page == 'tickets')
 
 			// don't forget the main-ticket!
 
+			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_reply.php';
+			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
+
+			$title = $ticket_reply_data['ticket_reply']['title'];
+			$image = $ticket_reply_data['ticket_reply']['image'];
+
 			eval("echo \"" . getTemplate("ticket/tickets_reply") . "\";");
 		}
 	}