Tagging 0.9.20.1

Signed-off-by: Florian Aders (EleRas) <eleras@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/120.system.php

@@ -27,9 +27,10 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'documentroot_prefix',
 					'type' => 'string',
+					'string_type' => 'dir',
 					'default' => '/var/customers/webs/',
-					'plausibility_check_method' => 'checkPathConflicts',
 					'save_method' => 'storeSettingField',
+					'plausibility_check_method' => 'checkPathConflicts'
 					),
 				'system_ipaddress' => array(
 					'label' => $lng['serversettings']['ipaddress'],
@@ -67,6 +68,14 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
+				'system_validatedomain' => array(
+					'label' => $lng['serversettings']['validate_domain'],
+					'settinggroup' => 'system',
+					'varname' => 'validate_domain',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					),
 				'system_stdsubdomain' => array(
 					'label' => $lng['serversettings']['stdsubdomainhost'],
 					'settinggroup' => 'system',
@@ -101,6 +110,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/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,14 +36,26 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
+					'websrv_avail' => array('apache2')
 					),
 				'system_perl_suexeccgipath' => array(
 					'label' => $lng['serversettings']['perl']['suexeccgipath'],
 					'settinggroup' => 'perl',
 					'varname' => 'suexecpath',
 					'type' => 'string',
+					'string_type' => 'dir',
 					'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/180.dkim.php

@@ -36,6 +36,7 @@ return array(
 					'settinggroup' => 'dkim',
 					'varname' => 'dkim_prefix',
 					'type' => 'string',
+					'string_type' => 'dir',
 					'default' => '/etc/postfix/dkim/',
 					'save_method' => 'storeSettingField',
 					),

actions/admin/settings/215.backup.php

@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ * @version    $Id: 215.backup.php 1 2010-09-14 08:09:17Z monotek $
+ */
+
+return array(
+	'groups' => array(
+		'backup' => array(
+			'title' => $lng['backup'],
+			'fields' => array(
+				'backup_enabled' => array(
+					'label' => $lng['serversettings']['backup_enabled'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_enabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'overview_option' => true
+				),
+				'backup_dir' => array(
+					'label' => $lng['serversettings']['backupdir']['description'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_dir',
+					'type' => 'string',
+					'default' => '#froxlor_backup',
+					'save_method' => 'storeSettingField',
+				),
+				'backup_mysqldump_path' => array(
+					'label' => $lng['serversettings']['mysqldump_path']['description'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_mysqldump_path',
+					'type' => 'string',
+					'default' => '/usr/bin/mysqldump',
+					'save_method' => 'storeSettingField',
+				),
+				'backup_count' => array(
+					'label' => $lng['serversettings']['backup_count'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_count',
+					'type' => 'bool',
+					'default' => 'true',
+					'save_method' => 'storeSettingField',
+					'overview_option' => false
+				),				
+				'backup_bigfile' => array(
+					'label' => $lng['serversettings']['backup_bigfile'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_bigfile',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'overview_option' => false
+				),
+				'backup_ftp_enabled_' => array(
+					'label' => $lng['serversettings']['backup_ftp_enabled'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_ftp_enabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'overview_option' => false
+				),
+				'backup_server' => array(
+					'label' => $lng['serversettings']['backup_ftp_server'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_ftp_server',
+					'type' => 'string',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+				),
+				'backup_user' => array(
+					'label' => $lng['serversettings']['backup_ftp_user'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_ftp_user',
+					'type' => 'string',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+				),
+				'backup_pass' => array(
+					'label' => $lng['serversettings']['backup_ftp_pass'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_ftp_pass',
+					'type' => 'string',
+					'default' => '',
+					'save_method' => 'storeSettingField',
+				),
+				),
+			),
+		),
+	);
+
+?>

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") . "\";");
@@ -274,10 +289,21 @@ if($page == 'admins'
 				$can_manage_aps_packages = 0;
 			}
 
-			$customers_see_all = intval($_POST['customers_see_all']);
-			$domains_see_all = intval($_POST['domains_see_all']);
-			$caneditphpsettings = intval($_POST['caneditphpsettings']);
-			$change_serversettings = intval($_POST['change_serversettings']);
+			$customers_see_all = 0;
+			if(isset($_POST['customers_see_all']))
+				$customers_see_all = intval($_POST['customers_see_all']);
+			
+			$domains_see_all = 0;
+			if(isset($_POST['domains_see_all']))
+				$domains_see_all = intval($_POST['domains_see_all']);
+			
+			$caneditphpsettings = 0;
+			if(isset($_POST['caneditphpsettings']))
+				$caneditphpsettings = intval($_POST['caneditphpsettings']);
+			
+			$change_serversettings = 0;
+			if(isset($_POST['change_serversettings']))
+				$change_serversettings = intval($_POST['change_serversettings']);
 
 			$diskspace = intval_ressource($_POST['diskspace']);
 
@@ -360,8 +386,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));
@@ -407,13 +463,19 @@ if($page == 'admins'
 			$ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 			$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 			$mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-			$change_serversettings = makeyesno('change_serversettings', '1', '0', '0');
-			$customers_see_all = makeyesno('customers_see_all', '1', '0', '0');
-			$domains_see_all = makeyesno('domains_see_all', '1', '0', '0');
-			$caneditphpsettings = makeyesno('caneditphpsettings', '1', '0', '0');
-			$can_manage_aps_packages = makeyesno('can_manage_aps_packages', '1', '0', '0');
+			#$change_serversettings = makeyesno('change_serversettings', '1', '0', '0');
+			#$customers_see_all = makeyesno('customers_see_all', '1', '0', '0');
+			#$domains_see_all = makeyesno('domains_see_all', '1', '0', '0');
+			#$caneditphpsettings = makeyesno('caneditphpsettings', '1', '0', '0');
+			#$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") . "\";");
 		}
 	}
@@ -566,12 +628,24 @@ if($page == 'admins'
 						$number_of_aps_packages = - 1;
 					}
 
-					$customers_see_all = intval($_POST['customers_see_all']);
-					$domains_see_all = intval($_POST['domains_see_all']);
-					$caneditphpsettings = intval($_POST['caneditphpsettings']);
-					$change_serversettings = intval($_POST['change_serversettings']);
 					$can_manage_aps_packages = intval($_POST['can_manage_aps_packages']);
 
+					$customers_see_all = 0;
+					if(isset($_POST['customers_see_all']))
+						$customers_see_all = intval($_POST['customers_see_all']);
+					
+					$domains_see_all = 0;
+					if(isset($_POST['domains_see_all']))
+						$domains_see_all = intval($_POST['domains_see_all']);
+					
+					$caneditphpsettings = 0;
+					if(isset($_POST['caneditphpsettings']))
+						$caneditphpsettings = intval($_POST['caneditphpsettings']);
+					
+					$change_serversettings = 0;
+					if(isset($_POST['change_serversettings']))
+						$change_serversettings = intval($_POST['change_serversettings']);
+					
 					$diskspace = intval($_POST['diskspace']);
 
 					if(isset($_POST['diskspace_ul']))
@@ -778,14 +852,21 @@ if($page == 'admins'
 					}
 				}
 
-				$change_serversettings = makeyesno('change_serversettings', '1', '0', $result['change_serversettings']);
-				$customers_see_all = makeyesno('customers_see_all', '1', '0', $result['customers_see_all']);
-				$domains_see_all = makeyesno('domains_see_all', '1', '0', $result['domains_see_all']);
-				$caneditphpsettings = makeyesno('caneditphpsettings', '1', '0', $result['caneditphpsettings']);
-				$deactivated = makeyesno('deactivated', '1', '0', $result['deactivated']);
-				$can_manage_aps_packages = makeyesno('can_manage_aps_packages', '1', '0', $result['can_manage_aps_packages']);
+				#$change_serversettings = makeyesno('change_serversettings', '1', '0', $result['change_serversettings']);
+				#$customers_see_all = makeyesno('customers_see_all', '1', '0', $result['customers_see_all']);
+				#$domains_see_all = makeyesno('domains_see_all', '1', '0', $result['domains_see_all']);
+				#$caneditphpsettings = makeyesno('caneditphpsettings', '1', '0', $result['caneditphpsettings']);
+				#$deactivated = makeyesno('deactivated', '1', '0', $result['deactivated']);
+				#$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');
@@ -121,7 +121,7 @@ if($page == 'cronjobs'
 			}
 			else
 			{
-				$isactive = makeyesno('isactive', '1', '0', $result['isactive']);
+				#$isactive = makeyesno('isactive', '1', '0', $result['isactive']);
 				// interval
 				$interval_nfo = explode(' ', $result['interval']);
 				$interval_value = $interval_nfo[0];
@@ -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

@@ -40,6 +40,9 @@ if($page == 'customers'
 {
 	if($action == '')
 	{
+		// clear request data
+		unset($_SESSION['requestData']);
+		
 		$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_customers");
 		$fields = array(
 			'c.loginname' => $lng['login']['username'],
@@ -51,6 +54,8 @@ if($page == 'customers'
 			'c.diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
 			'c.traffic' => $lng['customer']['traffic'],
 			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
+			'c.backup_allowed' => $lng['backup_allowed']
+/*
 			'c.mysqls' => $lng['customer']['mysqls'],
 			'c.mysqls_used' => $lng['customer']['mysqls'] . ' (' . $lng['panel']['used'] . ')',
 			'c.ftps' => $lng['customer']['ftps'],
@@ -69,8 +74,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,10 +89,11 @@ 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 = '';
-		$result = $db->query("SELECT `c`.*, `a`.`loginname` AS `adminname` " . "FROM `" . TABLE_PANEL_CUSTOMERS . "` `c`, `" . TABLE_PANEL_ADMINS . "` `a` " . "WHERE " . ($userinfo['customers_see_all'] ? '' : " `c`.`adminid` = '" . (int)$userinfo['adminid'] . "' AND ") . "`c`.`adminid`=`a`.`adminid` " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$result = $db->query("SELECT `c`.*, `a`.`loginname` AS `adminname` " . "FROM `" . TABLE_PANEL_CUSTOMERS . "` `c`, `" . TABLE_PANEL_ADMINS . "` `a` " . "WHERE " . ($userinfo['customers_see_all'] ? '' : " `c`.`adminid` = '" . (int)$userinfo['adminid'] . "' AND ") . "`c`.`adminid`=`a`.`adminid` " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy(false) . " " . $paging->getSqlLimit());
 		$paging->setEntries($db->num_rows($result));
 		$sortcode = $paging->getHtmlSortCode($lng, true);
 		$arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s);
@@ -106,11 +114,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 +165,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)
 	{
@@ -407,9 +453,17 @@ if($page == 'customers'
 					$email_autoresponder = 0;
 				}
 
-				$email_imap = intval_ressource($_POST['email_imap']);
-				$email_pop3 = intval_ressource($_POST['email_pop3']);
-				$ftps = intval_ressource($_POST['ftps']);
+				$email_imap = 0;
+				if(isset($_POST['email_imap'])) 
+					$email_imap = intval_ressource($_POST['email_imap']);
+				
+				$email_pop3 = 0;
+				if(isset($_POST['email_pop3'])) 
+					$email_pop3 = intval_ressource($_POST['email_pop3']);
+				
+				$ftps = 0;
+				if(isset($_POST['ftps']))
+					$ftps = intval_ressource($_POST['ftps']);
 
 				if(isset($_POST['ftps_ul']))
 				{
@@ -444,14 +498,43 @@ if($page == 'customers'
 				{
 					$number_of_aps_packages = 0;
 				}
-
-				$createstdsubdomain = intval($_POST['createstdsubdomain']);
+			
+				$createstdsubdomain = 0;
+				if(isset($_POST['createstdsubdomain']))
+					$createstdsubdomain = intval($_POST['createstdsubdomain']);
 				$password = validate($_POST['new_customer_password'], 'password');
-				$password = validatePassword($password);
-				$sendpassword = intval($_POST['sendpassword']);
-				$phpenabled = intval($_POST['phpenabled']);
-				$perlenabled = intval($_POST['perlenabled']);
-				$store_defaultindex = intval($_POST['store_defaultindex']);
+				// only check if not empty,
+				// cause empty == generate password automatically
+				if($password != '')
+				{
+					$password = validatePassword($password);
+				}
+				
+				$backup_allowed = 0;
+				if(isset($_POST['backup_allowed']))
+					$backup_allowed = intval($_POST['backup_allowed']);
+				
+				if ($backup_allowed != 0)
+				{
+					$backup_allowed = 1;
+				}
+				
+				$sendpassword = 0;
+				if(isset($_POST['sendpassword']))
+					$sendpassword = intval($_POST['sendpassword']);
+				
+				$phpenabled = 0;
+				if(isset($_POST['phpenabled']))
+					$phpenabled = intval($_POST['phpenabled']);
+				
+				$perlenabled = 0;
+				if(isset($_POST['perlenabled']))
+					$perlenabled = intval($_POST['perlenabled']);
+					
+				$store_defaultindex = 0;
+				if(isset($_POST['store_defaultindex']))
+					$store_defaultindex = intval($_POST['store_defaultindex']);
+					
 				$diskspace = $diskspace * 1024;
 				$traffic = $traffic * 1024 * 1024;
 
@@ -566,7 +649,46 @@ 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) . "',
+						`backup_allowed` = '" . $db->escape($backup_allowed) . "',
+						`theme` = '" . $db->escape($_theme) . "'"
+					);
 					$customerid = $db->insert_id();
 					$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` + 1";
 
@@ -767,13 +889,21 @@ if($page == 'customers'
 				$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$number_of_aps_packages_ul = makecheckbox('number_of_aps_packages_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-				$createstdsubdomain = makeyesno('createstdsubdomain', '1', '0', '1');
-				$email_imap = makeyesno('email_imap', '1', '0', '1');
-				$email_pop3 = makeyesno('email_pop3', '1', '0', '1');
-				$sendpassword = makeyesno('sendpassword', '1', '0', '1');
-				$phpenabled = makeyesno('phpenabled', '1', '0', '1');
-				$perlenabled = makeyesno('perlenabled', '1', '0', '0');
-				$store_defaultindex = makeyesno('store_defaultindex', '1', '0', '1');
+				#$createstdsubdomain = makeyesno('createstdsubdomain', '1', '0', '1');
+				#$email_imap = makeyesno('email_imap', '1', '0', '1');
+				#$email_pop3 = makeyesno('email_pop3', '1', '0', '1');
+				#$sendpassword = makeyesno('sendpassword', '1', '0', '1');
+				#$phpenabled = makeyesno('phpenabled', '1', '0', '1');
+				#$perlenabled = makeyesno('perlenabled', '1', '0', '0');
+				#$store_defaultindex = makeyesno('store_defaultindex', '1', '0', '1');
+				$backup_allowed = makeyesno('backup_allowed', '1', '0', '0');
+				
+				$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") . "\";");
 			}
 		}
@@ -870,9 +1000,17 @@ if($page == 'customers'
 					$email_autoresponder = 0;
 				}				
 
-				$email_imap = intval_ressource($_POST['email_imap']);
-				$email_pop3 = intval_ressource($_POST['email_pop3']);
-				$ftps = intval_ressource($_POST['ftps']);
+				$email_imap = 0;
+				if(isset($_POST['email_imap'])) 
+					$email_imap = intval_ressource($_POST['email_imap']);
+				
+				$email_pop3 = 0;
+				if(isset($_POST['email_pop3'])) 
+					$email_pop3 = intval_ressource($_POST['email_pop3']);
+				
+				$ftps = 0;
+				if(isset($_POST['ftps']))
+					$ftps = intval_ressource($_POST['ftps']);
 
 				if(isset($_POST['ftps_ul']))
 				{
@@ -886,8 +1024,18 @@ if($page == 'customers'
 				{
 					$tickets = - 1;
 				}
+				
+				$backup_allowed = 0;
+				if (isset($_POST['backup_allowed']))
+					$backup_allowed = intval($_POST['backup_allowed']);
+				
+				if($backup_allowed != '0'){
+					$backup_allowed = 1;
+				}
 
-				$mysqls = intval_ressource($_POST['mysqls']);
+				$mysqls = 0;
+				if(isset($_POST['mysqls']))
+					$mysqls = intval_ressource($_POST['mysqls']);
 
 				if(isset($_POST['mysqls_ul']))
 				{
@@ -908,10 +1056,21 @@ if($page == 'customers'
 					$number_of_aps_packages = 0;
 				}
 
-				$createstdsubdomain = intval($_POST['createstdsubdomain']);
-				$deactivated = intval($_POST['deactivated']);
-				$phpenabled = intval($_POST['phpenabled']);
-				$perlenabled = intval($_POST['perlenabled']);
+				$createstdsubdomain = 0;
+				if(isset($_POST['createstdsubdomain']))
+					$createstdsubdomain = intval($_POST['createstdsubdomain']);
+					
+				$deactivated = 0;
+				if(isset($_POST['deactivated']))
+					$deactivated = intval($_POST['deactivated']);
+				
+				$phpenabled = 0;
+				if(isset($_POST['phpenabled']))
+					$phpenabled = intval($_POST['phpenabled']);
+				
+				$perlenabled = 0;
+				if(isset($_POST['perlenabled']))
+					$perlenabled = intval($_POST['perlenabled']);
 				$diskspace = $diskspace * 1024;
 				$traffic = $traffic * 1024 * 1024;
 
@@ -1034,6 +1193,47 @@ if($page == 'customers'
 						$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `postfix`='" . (($deactivated) ? 'N' : 'Y') . "', `pop3`='" . (($deactivated) ? '0' : '1') . "', `imap`='" . (($deactivated) ? '0' : '1') . "' WHERE `customerid`='" . (int)$id . "'");
 						$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `login_enabled`='" . (($deactivated) ? 'N' : 'Y') . "' WHERE `customerid`='" . (int)$id . "'");
 						$db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `deactivated`='" . (int)$deactivated . "' WHERE `customerid`='" . (int)$id . "'");
+						
+						/* Retrieve customer's databases */
+						$databases = $db->query("SELECT * FROM " . TABLE_PANEL_DATABASES . " WHERE customerid='" . (int)$id . "' ORDER BY `dbserver`");
+						$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
+						unset($db_root->password);
+						$last_dbserver = 0;
+
+						/* For each of them */
+						while($row_database = $db->fetch_array($databases))
+						{
+							if($last_dbserver != $row_database['dbserver'])
+							{
+								$db_root->query('FLUSH PRIVILEGES;');
+								$db_root->close();
+								$db_root = new db($sql_root[$row_database['dbserver']]['host'], $sql_root[$row_database['dbserver']]['user'], $sql_root[$row_database['dbserver']]['password'], '');
+								unset($db_root->password);
+								$last_dbserver = $row_database['dbserver'];
+							}
+
+							foreach(array_unique(explode(',', $settings['system']['mysql_access_host'])) as $mysql_access_host)
+							{
+								$mysql_access_host = trim($mysql_access_host);
+								
+								/* Prevent access, if deactivated */
+								if($deactivated)
+								{
+									$db_root->query('REVOKE ALL PRIVILEGES ON * . * FROM `' . $db_root->escape($row_database['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
+									$db_root->query('REVOKE ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($row_database['databasename'])) . '` . * FROM `' . $db_root->escape($row_database['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
+								}
+								else /* Otherwise grant access */
+								{					
+									$db_root->query('GRANT ALL PRIVILEGES ON `' . $db_root->escape($row_database['databasename']) .'`.* TO `' . $db_root->escape($row_database['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
+									$db_root->query('GRANT ALL PRIVILEGES ON `' . str_replace('_', '\_', $db_root->escape($row_database['databasename'])) . '` . * TO `' . $db_root->escape($row_database['databasename']) . '`@`' . $db_root->escape($mysql_access_host) . '`');
+								}
+							}
+						}
+
+						/* At last flush the new privileges */
+						$db_root->query('FLUSH PRIVILEGES;');
+						$db_root->close();
+						
 						$log->logAction(ADM_ACTION, LOG_INFO, "deactivated user '" . $result['loginname'] . "'");
 						inserttask('1');
 					}
@@ -1052,7 +1252,8 @@ if($page == 'customers'
 						$db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `imap`='" . (int)$email_imap . "' WHERE `customerid`='" . (int)$id . "'");
 					}
 
-					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `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) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "' WHERE `customerid`='" . (int)$id . "'");
+					// $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `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) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "' WHERE `customerid`='" . (int)$id . "'");
+					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `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) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "', `backup_allowed`='" . $db->escape($backup_allowed) . "' WHERE `customerid`='" . (int)$id . "'");
 					$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` ";
 
 					if($mysqls != '-1'
@@ -1338,14 +1539,21 @@ if($page == 'customers'
 					$result['aps_packages'] = '';
 				}
 
-				$createstdsubdomain = makeyesno('createstdsubdomain', '1', '0', (($result['standardsubdomain'] != '0') ? '1' : '0'));
-				$phpenabled = makeyesno('phpenabled', '1', '0', $result['phpenabled']);
-				$perlenabled = makeyesno('perlenabled', '1', '0', $result['perlenabled']);
-				$deactivated = makeyesno('deactivated', '1', '0', $result['deactivated']);
-				$email_imap = makeyesno('email_imap', '1', '0', $result['imap']);
-				$email_pop3 = makeyesno('email_pop3', '1', '0', $result['pop3']);
-
+				#$createstdsubdomain = makeyesno('createstdsubdomain', '1', '0', (($result['standardsubdomain'] != '0') ? '1' : '0'));
+				#$phpenabled = makeyesno('phpenabled', '1', '0', $result['phpenabled']);
+				#$perlenabled = makeyesno('perlenabled', '1', '0', $result['perlenabled']);
+				#$deactivated = makeyesno('deactivated', '1', '0', $result['deactivated']);
+				#$email_imap = makeyesno('email_imap', '1', '0', $result['imap']);
+				#$email_pop3 = makeyesno('email_pop3', '1', '0', $result['pop3']);
+				$backup_allowed = makeyesno('backup_allowed', '1', '0', $result['backup_allowed']);
 				$result = htmlentities_array($result);
+
+				$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;
@@ -224,10 +227,23 @@ if($page == 'domains'
 
 				$domain = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/', '/^https?\:\/\//'), '', validate($_POST['domain'], 'domain')));
 				$subcanemaildomain = intval($_POST['subcanemaildomain']);
+				
+				$isemaildomain = 0;
+				if(isset($_POST['isemaildomain']))
 				$isemaildomain = intval($_POST['isemaildomain']);
-				$email_only = intval($_POST['email_only']);
-				$wwwserveralias = intval($_POST['wwwserveralias']);
-				$speciallogfile = intval($_POST['speciallogfile']);
+				
+				$email_only = 0;
+				if(isset($_POST['email_only']))
+					$email_only = intval($_POST['email_only']);
+					
+				$wwwserveralias = 0;
+				if(isset($_POST['wwwserveralias']))
+					$wwwserveralias = intval($_POST['wwwserveralias']);
+				
+				$speciallogfile = 0;
+				if(isset($_POST['speciallogfile']))
+					$speciallogfile = intval($_POST['speciallogfile']);
+					
 				$aliasdomain = intval($_POST['alias']);
 				$issubof = intval($_POST['issubof']);
 				$customerid = intval($_POST['customerid']);
@@ -470,7 +486,8 @@ if($page == 'domains'
 				{
 					standard_error(array('stringisempty', 'mydomain'));
 				}
-				elseif(!validateDomain($domain))
+				/* Check whether domain validation is enabled and if, validate the domain */
+				elseif($settings['system']['validate_domain'] && !validateDomain($domain))
 				{
 					standard_error(array('stringiswrong', 'mydomain'));
 				}
@@ -652,20 +669,26 @@ if($page == 'domains'
 					$phpconfigs.= makeoption($row['description'], $row['id'], $settings['system']['mod_fcgid_defaultini'], true, true);
 				}
 
-				$isbinddomain = makeyesno('isbinddomain', '1', '0', '1');
-				$isemaildomain = makeyesno('isemaildomain', '1', '0', '1');
-				$email_only = makeyesno('email_only', '1', '0', '0');
+				#$isbinddomain = makeyesno('isbinddomain', '1', '0', '1');
+				#$isemaildomain = makeyesno('isemaildomain', '1', '0', '1');
+				#$email_only = makeyesno('email_only', '1', '0', '0');
 				$subcanemaildomain = makeoption($lng['admin']['subcanemaildomain']['never'], '0', '0', true, true) . makeoption($lng['admin']['subcanemaildomain']['choosableno'], '1', '0', true, true) . makeoption($lng['admin']['subcanemaildomain']['choosableyes'], '2', '0', true, true) . makeoption($lng['admin']['subcanemaildomain']['always'], '3', '0', true, true);
-				$dkim = makeyesno('dkim', '1', '0', '1');
-				$wwwserveralias = makeyesno('wwwserveralias', '1', '0', '1');
-				$caneditdomain = makeyesno('caneditdomain', '1', '0', '1');
-				$openbasedir = makeyesno('openbasedir', '1', '0', '1');
-				$safemode = makeyesno('safemode', '1', '0', '1');
-				$speciallogfile = makeyesno('speciallogfile', '1', '0', '0');
-				$ssl = makeyesno('ssl', '1', '0', '0');
-				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', '0');				
+				#$dkim = makeyesno('dkim', '1', '0', '1');
+				#$wwwserveralias = makeyesno('wwwserveralias', '1', '0', '1');
+				#$caneditdomain = makeyesno('caneditdomain', '1', '0', '1');
+				#$openbasedir = makeyesno('openbasedir', '1', '0', '1');
+				#$safemode = makeyesno('safemode', '1', '0', '1');
+				#$speciallogfile = makeyesno('speciallogfile', '1', '0', '0');
+				#$ssl = makeyesno('ssl', '1', '0', '0');
+				#$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") . "\";");
 			}
 		}
@@ -755,13 +778,22 @@ if($page == 'domains'
 
 				$aliasdomain = intval($_POST['alias']);
 				$issubof = intval($_POST['issubof']);
-				$isemaildomain = intval($_POST['isemaildomain']);
-				$email_only = intval($_POST['email_only']);
 				$subcanemaildomain = intval($_POST['subcanemaildomain']);
 				$caneditdomain = intval($_POST['caneditdomain']);
-				$wwwserveralias = intval($_POST['wwwserveralias']);
 				$registration_date = validate($_POST['registration_date'], 'registration_date', '/^(19|20)\d\d[-](0[1-9]|1[012])[-](0[1-9]|[12][0-9]|3[01])$/', '', array('0000-00-00', '0', ''));
 
+				$isemaildomain = 0;
+				if(isset($_POST['isemaildomain']))
+				$isemaildomain = intval($_POST['isemaildomain']);
+				
+				$email_only = 0;
+				if(isset($_POST['email_only']))
+					$email_only = intval($_POST['email_only']);
+					
+				$wwwserveralias = 0;
+				if(isset($_POST['wwwserveralias']))
+					$wwwserveralias = intval($_POST['wwwserveralias']);
+				
 				if($userinfo['change_serversettings'] == '1')
 				{
 					$isbinddomain = intval($_POST['isbinddomain']);
@@ -1177,20 +1209,20 @@ if($page == 'domains'
 				}
 
 				$result['specialsettings'] = $result['specialsettings'];
-				$isbinddomain = makeyesno('isbinddomain', '1', '0', $result['isbinddomain']);
-				$wwwserveralias = makeyesno('wwwserveralias', '1', '0', $result['wwwserveralias']);
-				$isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
-				$email_only = makeyesno('email_only', '1', '0', $result['email_only']);
-				$ssl = makeyesno('ssl', '1', '0', $result['ssl']);
-				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
+				#$isbinddomain = makeyesno('isbinddomain', '1', '0', $result['isbinddomain']);
+				#$wwwserveralias = makeyesno('wwwserveralias', '1', '0', $result['wwwserveralias']);
+				#$isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
+				#$email_only = makeyesno('email_only', '1', '0', $result['email_only']);
+				#$ssl = makeyesno('ssl', '1', '0', $result['ssl']);
+				#$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
 				$subcanemaildomain = makeoption($lng['admin']['subcanemaildomain']['never'], '0', $result['subcanemaildomain'], true, true);
 				$subcanemaildomain.= makeoption($lng['admin']['subcanemaildomain']['choosableno'], '1', $result['subcanemaildomain'], true, true);
 				$subcanemaildomain.= makeoption($lng['admin']['subcanemaildomain']['choosableyes'], '2', $result['subcanemaildomain'], true, true);
 				$subcanemaildomain.= makeoption($lng['admin']['subcanemaildomain']['always'], '3', $result['subcanemaildomain'], true, true);
-				$dkim = makeyesno('dkim', '1', '0', $result['dkim']);
-				$caneditdomain = makeyesno('caneditdomain', '1', '0', $result['caneditdomain']);
-				$openbasedir = makeyesno('openbasedir', '1', '0', $result['openbasedir']);
-				$safemode = makeyesno('safemode', '1', '0', $result['safemode']);
+				#$dkim = makeyesno('dkim', '1', '0', $result['dkim']);
+				#$caneditdomain = makeyesno('caneditdomain', '1', '0', $result['caneditdomain']);
+				#$openbasedir = makeyesno('openbasedir', '1', '0', $result['openbasedir']);
+				#$safemode = makeyesno('safemode', '1', '0', $result['safemode']);
 				$speciallogfile = ($result['speciallogfile'] == 1 ? $lng['panel']['yes'] : $lng['panel']['no']);
 				$result['add_date'] = date('Y-m-d', $result['add_date']);
 
@@ -1202,9 +1234,16 @@ if($page == 'domains'
 					$phpconfigs.= makeoption($phpconfigs_row['description'], $phpconfigs_row['id'], $result['phpsettingid'], true, true);
 				}
 
-				$specialsettingsforsubdomains = makeyesno('specialsettingsforsubdomains', '1', '0', '1');
+				#$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,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')
 			{
@@ -242,11 +251,18 @@ if($page == 'ipsandports'
 		}
 		else
 		{
-			$enable_ssl = makeyesno('ssl', '1', '0', '0');
-			$listen_statement = makeyesno('listen_statement', '1', '0', '1');
-			$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', '1');
-			$vhostcontainer = makeyesno('vhostcontainer', '1', '0', '1');
-			$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', '1');
+			#$enable_ssl = makeyesno('ssl', '1', '0', '0');
+			#$listen_statement = makeyesno('listen_statement', '1', '0', '1');
+			#$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") . "\";");
 		}
 	}
@@ -269,13 +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');
-				$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')
 				{
@@ -372,12 +397,19 @@ if($page == 'ipsandports'
 			}
 			else
 			{
-				$enable_ssl = makeyesno('ssl', '1', '0', $result['ssl']);
+				#$enable_ssl = makeyesno('ssl', '1', '0', $result['ssl']);
 				$result = htmlentities_array($result);
-				$listen_statement = makeyesno('listen_statement', '1', '0', $result['listen_statement']);
-				$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']);
+				#$listen_statement = makeyesno('listen_statement', '1', '0', $result['listen_statement']);
+				#$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,11 @@ 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');
+			inserttask('9');
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
 	}
@@ -115,7 +120,8 @@ elseif($page == 'rebuildconfigs'
 		inserttask('1');
 		inserttask('4');
 		inserttask('5');
-		redirectTo('admin_index.php', array('s' => $s));
+		inserttask('9');
+		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 	}
 	else
 	{
@@ -214,4 +220,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);
@@ -227,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") . "\";");
 			}
 		}
@@ -338,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") . "\";");
 		}
@@ -473,7 +485,8 @@ elseif($page == 'categories'
 			
 			if($order < 1 || $order >= 1000)
 			{
-				$order = 1;
+				// use the latest available
+				$order = ticket::getHighestOrderNumber($db) + 1;
 			}
 
 			if($category == '')
@@ -489,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") . "\";");
 		}
 	}
@@ -520,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") . "\";");
 		}
 	}
@@ -569,8 +597,7 @@ elseif($page == 'archive'
 			{
 				$categories[$x] = isset($_POST['category' . $x]) ? $_POST['category' . $x] : '';
 			}
-
-			$query = ticket::getArchiveSearchStatement($subject, $priority, $fromdate, $todate, $message, $customer, $userinfo['adminid'], $categories);
+			$query = ticket::getArchiveSearchStatement($db, $subject, $priority, $fromdate, $todate, $message, $customer, $userinfo['adminid'], $categories);
 			$fields = array(
 				'lastchange' => $lng['ticket']['lastchange'],
 				'ticket_answers' => $lng['ticket']['ticket_answers'],
@@ -628,7 +655,6 @@ elseif($page == 'archive'
 				{
 					if($paging->checkDisplay($i))
 					{
-						$ticket = htmlentities_array($ticket);
 						$ticket['lastchange'] = date("d.m.y H:i", $ticket['lastchange']);
 
 						if($_cid != $ticket['customerid'])
@@ -663,6 +689,8 @@ elseif($page == 'archive'
 							$ticket['subject'] = substr($ticket['subject'], 0, 17) . '...';
 						}
 
+						$ticket = htmlentities_array($ticket);
+
 						eval("\$tickets.=\"" . getTemplate("ticket/archived_tickets") . "\";");
 						$count++;
 						$_cid = $ticket['customerid'];
@@ -749,8 +777,8 @@ elseif($page == 'archive'
 			$by = $lng['ticket']['customer'];
 		}
 
-		$subject = $mainticket->Get('subject');
-		$message = $mainticket->Get('message');
+		$subject = htmlentities($mainticket->Get('subject'));
+		$message = htmlentities($mainticket->Get('message'));
 		eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_main") . "\";");
 		$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
                               WHERE `id`="' . (int)$mainticket->Get('category') . '"');
@@ -771,15 +799,15 @@ elseif($page == 'archive'
 				$by = $lng['ticket']['customer'];
 			}
 
-			$subject = $subticket->Get('subject');
-			$message = $subticket->Get('message');
+			$subject = htmlentities($subticket->Get('subject'));
+			$message = htmlentities($subticket->Get('message'));
 			eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_list") . "\";");
 		}
 
-		$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
-		$priorities.= makeoption($lng['ticket']['normal'], '2', $mainticket->Get('priority'), true, true);
-		$priorities.= makeoption($lng['ticket']['low'], '3', $mainticket->Get('priority'), true, true);
-		$subject = $mainticket->Get('subject');
+		$priorities = makeoption($lng['ticket']['high'], '1', htmlentities($mainticket->Get('priority')), true, true);
+		$priorities.= makeoption($lng['ticket']['normal'], '2', htmlentities($mainticket->Get('priority')), true, true);
+		$priorities.= makeoption($lng['ticket']['low'], '3', htmlentities($mainticket->Get('priority')), true, true);
+		$subject = htmlentities($mainticket->Get('subject'));
 		$ticket_replies_count = $db->num_rows($andere) + 1;
 
 		// don't forget the main-ticket!

admin_traffic.php

@@ -0,0 +1,148 @@
+<?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     Morton Jonuschat <m.jonuschat@chrome-it.de>
+ * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
+ * @package    Panel
+ * @version    $Id: $
+ */
+
+define('AREA', 'admin');
+
+/**
+ * Include our init.php, which manages Sessions, Language etc.
+ */
+
+require ("./lib/init.php");
+
+if($action == 'logout')
+{
+	$db->query("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['adminid'] . "' AND `adminsession` = '1'");
+	redirectTo('index.php');
+	exit;
+}
+
+if(isset($_POST['id']))
+{
+	$id = intval($_POST['id']);
+}
+elseif(isset($_GET['id']))
+{
+	$id = intval($_GET['id']);
+}
+
+$months = array(
+	'0' => 'empty',
+	'1' => 'jan',
+	'2' => 'feb',
+	'3' => 'mar',
+	'4' => 'apr',
+	'5' => 'may',
+	'6' => 'jun',
+	'7' => 'jul',
+	'8' => 'aug',
+	'9' => 'sep',
+	'10' => 'oct',
+	'11' => 'nov',
+	'12' => 'dec',
+);
+
+if($page == 'overview' || $page == 'customers') 
+{
+	if($action == 'su' && $id != 0)
+	{
+		$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$id . "' " . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' "));
+
+		if($result['loginname'] != '')
+		{
+			$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid`='" . (int)$userinfo['userid'] . "'");
+			$s = md5(uniqid(microtime(), 1));
+			$db->query("INSERT INTO `" . TABLE_PANEL_SESSIONS . "` (`hash`, `userid`, `ipaddress`, `useragent`, `lastactivity`, `language`, `adminsession`) VALUES ('" . $db->escape($s) . "', '" . (int)$id . "', '" . $db->escape($result['ipaddress']) . "', '" . $db->escape($result['useragent']) . "', '" . time() . "', '" . $db->escape($result['language']) . "', '0')");
+			redirectTo('customer_traffic.php', Array(
+				's' => $s
+			));
+		}
+		else
+		{
+			redirectTo('index.php', Array(
+				'action' => 'login'
+			));
+		}
+	}
+	$customerview = 1;
+	$stats_tables = '';
+	$minyear = $db->query_first("SELECT `year` FROM `". TABLE_PANEL_TRAFFIC . "` ORDER BY `year` ASC LIMIT 1");
+	if (!isset($minyear['year']) || $minyear['year'] == 0)
+	{
+		$maxyears = 0;
+	}
+	else
+	{
+		$maxyears = date("Y") - $minyear['year'];
+	}
+	for($years = 0; $years<=$maxyears; $years++) {
+		$overview['year'] = date("Y")-$years;
+		$overview['type'] = $lng['traffic']['customer'];
+		$domain_list = '';
+		$customer_name_list = $db->query("SELECT `customerid`,`company`,`name`,`firstname` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `deactivated`='0'" . ($userinfo['customers_see_all'] ? '' : " AND `adminid` = '" . (int)$userinfo['adminid'] . "' ") . " ORDER BY name");
+		$totals = array(
+			'jan' => 0,
+			'feb' => 0,
+			'mar' => 0,
+			'apr' => 0,
+			'may' => 0,
+			'jun' => 0,
+			'jul' => 0,
+			'aug' => 0,
+			'sep' => 0,
+			'oct' => 0,
+			'nov' => 0,
+			'dec' => 0,
+		);
+		while($customer_name = $db->fetch_array($customer_name_list)) {
+			$virtual_host = array(
+				'name' => ($customer_name['company'] == '' ? $customer_name['name'] . ", " . $customer_name['firstname'] : $customer_name['company']),
+				'customerid' => $customer_name['customerid'],
+				'jan' => '-',
+				'feb' => '-',
+				'mar' => '-',
+				'apr' => '-',
+				'may' => '-',
+				'jun' => '-',
+				'jul' => '-',
+				'aug' => '-',
+				'sep' => '-',
+				'oct' => '-',
+				'nov' => '-',
+				'dec' => '-',
+			);
+			
+			$traffic_list = $db->query("SELECT month, SUM(http+ftp_up+ftp_down+mail)*1024 AS traffic FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE year = " . (date("Y")-$years) . " AND `customerid` = '" . $customer_name['customerid'] . "' GROUP BY month ORDER BY month");
+			while($traffic_month = $db->fetch_array($traffic_list)) {
+				$virtual_host[$months[(int)$traffic_month['month']]] = size_readable($traffic_month['traffic'], 'GiB', 'bi', '%01.3f %s');
+				$totals[$months[(int)$traffic_month['month']]] += $traffic_month['traffic'];
+			}
+			eval("\$domain_list .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
+		}
+		// sum up totals
+		$virtual_host = array(
+			'name' => $lng['traffic']['months']['total'],
+		);
+		foreach($totals as $month => $bytes) {
+			$virtual_host[$month] = ($bytes == 0 ? '-' : size_readable($bytes, 'GiB', 'bi', '%01.3f %s'));
+		}
+		$customerview = 0;
+		eval("\$total_list = sprintf(\"%s\", \"" . getTemplate("traffic/index_table_row") . "\");");
+		eval("\$stats_tables .= sprintf(\"%s\", \"" . getTemplate("traffic/index_table") . "\");");
+	}
+	eval("echo \"" . getTemplate("traffic/index") . "\";");
+}

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)
 					{
@@ -378,9 +378,16 @@ elseif($page == 'domains')
 					}
 				}
 
-				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
+				#$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") . "\";");
 			}
 		}
@@ -534,10 +541,17 @@ elseif($page == 'domains')
 
 				if(preg_match('/^https?\:\/\//', $result['documentroot'])
 				   && validateUrl($idna_convert->encode($result['documentroot']))
-				   && $settings['panel']['pathedit'] == 'Dropdown')
-				{
-					$urlvalue = $result['documentroot'];
-					$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+				) {
+					if($settings['panel']['pathedit'] == 'Dropdown')
+					{
+						$urlvalue = $result['documentroot'];
+						$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+					}
+					else
+					{
+						$urlvalue = '';
+						$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot'], true);						
+					}
 				}
 				else
 				{
@@ -545,10 +559,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)
 					{
@@ -556,9 +570,9 @@ elseif($page == 'domains')
 					}
 				}
 
-				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
-				$iswildcarddomain = makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']);
-				$isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
+				#$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
+				#$iswildcarddomain = makeyesno('iswildcarddomain', '1', '0', $result['iswildcarddomain']);
+				#$isemaildomain = makeyesno('isemaildomain', '1', '0', $result['isemaildomain']);
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, $result['openbasedir_path'], true) . makeoption($lng['domain']['homedir'], 1, $result['openbasedir_path'], true);
 
 				$result_ipandport = $db->query_first("SELECT `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` WHERE `id`='".(int)$result['ipandport']."'");
@@ -569,6 +583,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

@@ -281,7 +281,14 @@ elseif($page == 'emails')
 					$domains.= makeoption($idna_convert->decode($row['domain']), $row['domain']);
 				}
 
-				$iscatchall = makeyesno('iscatchall', '1', '0', '0');
+				#$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

@@ -39,6 +39,31 @@ if($page == 'overview')
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras");
 	eval("echo \"" . getTemplate("extras/extras") . "\";");
 }
+elseif($page == 'backup')
+{
+    $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_extras_backup");
+
+    $result = $db->query("SELECT `backup_enabled` FROM `" . TABLE_PANEL_CUSTOMERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+    $row = $db->fetch_array($result);
+
+    $backup_enabled = makeyesno('backup_enabled', '1', '0', $row['backup_enabled']);
+
+    if(isset($_POST['send']) && $_POST['send'] == 'send'){
+	$backup_enabled = ($_POST['backup_enabled'] == '1' ? '1' : '0');
+	$backup_ftp_enabled = ($_POST['backup_ftp_enabled'] == '1' ? '1' : '0');
+	
+        $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `backup_enabled`='" . $backup_enabled . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+	redirectTo($filename, Array('page' => $page, 's' => $s));
+    }
+
+    $backup_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.backup.php';
+	$backup_form = htmlform::genHTMLForm($backup_data);
+
+	$title = $backup_data['backup']['title'];
+	$image = $backup_data['backup']['image'];
+    
+    eval("echo \"" . getTemplate("extras/backup") . "\";");
+}
 elseif($page == 'htpasswds')
 {
 	if($action == '')
@@ -161,6 +186,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 +252,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") . "\";");
 			}
 		}
@@ -354,9 +393,16 @@ elseif($page == 'htaccess')
 		else
 		{
 			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
-			$options_indexes = makeyesno('options_indexes', '1', '0', '0');
+			#$options_indexes = makeyesno('options_indexes', '1', '0', '0');
 			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-			$options_cgi = makeyesno('options_cgi', '1', '0', '0');
+			#$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") . "\";");
 		}
 	}
@@ -414,10 +460,17 @@ elseif($page == 'htaccess')
 				$result['error404path'] = $result['error404path'];
 				$result['error403path'] = $result['error403path'];
 				$result['error500path'] = $result['error500path'];
-				$options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
+				#$options_indexes = makeyesno('options_indexes', '1', '0', $result['options_indexes']);
 				$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
-				$options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
+				#$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,17 +247,34 @@ 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');
+				#$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") . "\";");
 			}
@@ -310,6 +324,7 @@ elseif($page == 'accounts')
 						if(!file_exists($path))
 						{
 							mkDirWithCorrectOwnership($userinfo['documentroot'], $path, $result['uid'], $result['gid']);
+							inserttask(5); /* Let the cronjob do the rest */
 						}
 
 						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account homdir for '" . $result['username'] . "'");
@@ -344,7 +359,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);
 			}
 		}
 	}
@@ -250,7 +254,13 @@ elseif($page == 'mysqls')
 					$mysql_servers .= makeoption($mysql_server_details['caption'], $mysql_server);
 				}
 
-				$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');
+				#$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

@@ -247,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") . "\";");
 			}
 		}
@@ -360,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") . "\";");
 		}
 	}