Tagging 0.9.23

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>

.gitignore

@@ -0,0 +1,2 @@
+packages/*
+temp/*

actions/admin/settings/000.version.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/100.panel.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Language
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/110.accounts.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/120.system.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(
@@ -27,6 +27,7 @@ return array(
 					'settinggroup' => 'system',
 					'varname' => 'documentroot_prefix',
 					'type' => 'string',
+					'string_type' => 'dir',
 					'default' => '/var/customers/webs/',
 					'save_method' => 'storeSettingField',
 					'plausibility_check_method' => 'checkPathConflicts'
@@ -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',

actions/admin/settings/130.webserver.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/135.fcgid.php

@@ -12,7 +12,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/136.phpfpm.php

@@ -12,7 +12,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/137.perl.php

@@ -12,7 +12,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(
@@ -43,6 +43,7 @@ return array(
 					'settinggroup' => 'perl',
 					'varname' => 'suexecpath',
 					'type' => 'string',
+					'string_type' => 'dir',
 					'default' => '/var/www/cgi-bin/',
 					'save_method' => 'storeSettingField',
 					'websrv_avail' => array('apache2')

actions/admin/settings/140.statistics.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/150.mail.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/155.ftpserver.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id: 220.ftpserver.php 1 2010-04-07 10:00:00Z monotek $
+ *
  */
 
 return array(

actions/admin/settings/160.nameserver.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/170.logger.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/180.dkim.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(
@@ -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/185.spf.php

@@ -12,7 +12,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/190.ticket.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/200.aps.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/210.security.php

@@ -14,7 +14,7 @@
  * @author     Froxlor team <team@froxlor.org> (2010-)
  * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
  * @package    Settings
- * @version    $Id$
+ *
  */
 
 return array(

actions/admin/settings/215.backup.php

@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ *
+ */
+
+return array(
+	'groups' => array(
+		'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',
+					'string_type' => 'dir',
+					'default' => '/var/customers/backups/',
+					'string_regexp' => '/^/.*/$/',
+					'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',
+				),
+				'backup_passive_mode' => array(
+					'label' => $lng['serversettings']['backup_ftp_passive_mode'],
+					'settinggroup' => 'system',
+					'varname' => 'backup_ftp_passive',
+					'type' => 'bool',
+					'default' => true,
+					'save_method' => 'storeSettingField',
+					'overview_option' => false,
+				),
+				),
+			),
+		),
+	);
+
+?>

actions/admin/settings/220.quota.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2011 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> (2011-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Settings
+ *
+ */
+
+return array(
+	'groups' => array(
+		'diskquota' => array(
+			'title' => $lng['diskquota'],
+			'fields' => array(
+				'diskquota_enabled' => array(
+					'label' => $lng['serversettings']['diskquota_enabled'],
+					'settinggroup' => 'system',
+					'varname' => 'diskquota_enabled',
+					'type' => 'bool',
+					'default' => false,
+					'save_method' => 'storeSettingField',
+					'overview_option' => true
+				),
+				'diskquota_repquota_path' => array(
+					'label' => $lng['serversettings']['diskquota_repquota_path']['description'],
+					'settinggroup' => 'system',
+					'varname' => 'diskquota_repquota_path',
+					'type' => 'string',
+					'default' => '/usr/sbin/repquota',
+					'save_method' => 'storeSettingField',
+				),
+				'diskquota_quotatool_path' => array(
+					'label' => $lng['serversettings']['diskquota_quotatool_path']['description'],
+					'settinggroup' => 'system',
+					'varname' => 'diskquota_quotatool_path',
+					'type' => 'string',
+					'default' => '/usr/bin/quotatool',
+					'save_method' => 'storeSettingField',
+				),
+				'diskquota_customer_partition' => array(
+					'label' => $lng['serversettings']['diskquota_customer_partition']['description'],
+					'settinggroup' => 'system',
+					'varname' => 'diskquota_customer_partition',
+					'type' => 'string',
+					'default' => '/dev/root',
+					'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: admin_admins.php 101 2010-12-08 07:03:42Z d00p $
+ *
  */
 
 define('AREA', 'admin');
@@ -289,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']);
 
@@ -452,11 +463,11 @@ 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';
@@ -617,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']))
@@ -829,12 +852,12 @@ 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_aps.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$
+ *
  */
 
 // Required code

admin_configfiles.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$
+ *
  */
 
 define('AREA', 'admin');

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: 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];

admin_customers.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$
+ *
  */
 
 define('AREA', 'admin');
@@ -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'],
@@ -50,7 +53,8 @@ if($page == 'customers'
 			'c.diskspace' => $lng['customer']['diskspace'],
 			'c.diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
 			'c.traffic' => $lng['customer']['traffic'],
-			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')'
+			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
+			'c.backup_allowed' => $lng['backup_allowed']
 /*
 			'c.mysqls' => $lng['customer']['mysqls'],
 			'c.mysqls_used' => $lng['customer']['mysqls'] . ' (' . $lng['panel']['used'] . ')',
@@ -89,7 +93,7 @@ if($page == 'customers'
 
 		$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);
@@ -333,6 +337,12 @@ if($page == 'customers'
 					inserttask('6', $result['loginname']);
 				}
 
+				# Using filesystem - quota, insert a task which cleans the filesystem - quota
+				if ($settings['system']['diskquota_enabled'])
+				{
+					inserttask('10');
+				}
+
 				/*
 				 * move old tickets to archive
 				 */
@@ -380,6 +390,7 @@ if($page == 'customers'
 				$customernumber = validate($_POST['customernumber'], 'customer number', '/^[A-Za-z0-9 \-]*$/Di');
 				$def_language = validate($_POST['def_language'], 'default language');
 				$diskspace = intval_ressource($_POST['diskspace']);
+				$gender = intval_ressource($_POST['gender']);
 
 				if(isset($_POST['diskspace_ul']))
 				{
@@ -449,9 +460,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']))
 				{
@@ -487,7 +506,9 @@ 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');
 				// only check if not empty,
 				// cause empty == generate password automatically
@@ -495,10 +516,37 @@ if($page == 'customers'
 				{
 					$password = validatePassword($password);
 				}
-				$sendpassword = intval($_POST['sendpassword']);
-				$phpenabled = intval($_POST['phpenabled']);
-				$perlenabled = intval($_POST['perlenabled']);
-				$store_defaultindex = intval($_POST['store_defaultindex']);
+
+				$backup_allowed = 0;
+				if(isset($_POST['backup_allowed']))
+					$backup_allowed = intval($_POST['backup_allowed']);
+
+				if ($backup_allowed != 0)
+				{
+					$backup_allowed = 1;
+				}
+
+				// gender out of range? [0,2]
+				if ($gender < 0 || $gender > 2) {
+					$gender = 0;
+				}
+
+				$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;
 
@@ -622,6 +670,7 @@ if($page == 'customers'
 						`password` = '" . md5($password) . "',
 						`name` = '" . $db->escape($name) . "',
 						`firstname` = '" . $db->escape($firstname) . "',
+						`gender` = '" . (int)$gender . "',
 						`company` = '" . $db->escape($company) . "',
 						`street` = '" . $db->escape($street) . "',
 						`zipcode` = '" . $db->escape($zipcode) . "',
@@ -650,6 +699,7 @@ if($page == 'customers'
 						`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();
@@ -724,6 +774,11 @@ if($page == 'customers'
 					$log->logAction(ADM_ACTION, LOG_INFO, "added user '" . $loginname . "'");
 					inserttask('2', $loginname, $guid, $guid, $store_defaultindex);
 
+					# Using filesystem - quota, insert a task which cleans the filesystem - quota
+					if ($settings['system']['diskquota_enabled'])
+					{
+						inserttask('10');
+					}
 					// Add htpasswd for the webalizer stats
 
 					if(CRYPT_STD_DES == 1)
@@ -852,13 +907,18 @@ 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');
+
+				$gender_options = makeoption($lng['gender']['undef'], 0, true, true, true);
+				$gender_options .= makeoption($lng['gender']['male'], 1, null, true, true);
+				$gender_options .= makeoption($lng['gender']['female'], 2, null, true, true);
 
 				$customer_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_add.php';
 				$customer_add_form = htmlform::genHTMLForm($customer_add_data);
@@ -893,6 +953,7 @@ if($page == 'customers'
 				$def_language = validate($_POST['def_language'], 'default language');
 				$password = validate($_POST['new_customer_password'], 'new password');
 				$diskspace = intval_ressource($_POST['diskspace']);
+				$gender = intval_ressource($_POST['gender']);
 
 				if(isset($_POST['diskspace_ul']))
 				{
@@ -962,9 +1023,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']))
 				{
@@ -979,7 +1048,22 @@ if($page == 'customers'
 					$tickets = - 1;
 				}
 
-				$mysqls = intval_ressource($_POST['mysqls']);
+				$backup_allowed = 0;
+				if (isset($_POST['backup_allowed']))
+					$backup_allowed = intval($_POST['backup_allowed']);
+
+				if($backup_allowed != '0'){
+					$backup_allowed = 1;
+				}
+
+				// gender out of range? [0,2]
+				if ($gender < 0 || $gender > 2) {
+					$gender = 0;
+				}
+
+				$mysqls = 0;
+				if(isset($_POST['mysqls']))
+					$mysqls = intval_ressource($_POST['mysqls']);
 
 				if(isset($_POST['mysqls_ul']))
 				{
@@ -1000,10 +1084,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;
 
@@ -1126,6 +1221,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');
 					}
@@ -1144,9 +1280,16 @@ 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) . "', `gender`='" . $db->escape($gender) . "', `company`='" . $db->escape($company) . "', `street`='" . $db->escape($street) . "', `zipcode`='" . $db->escape($zipcode) . "', `city`='" . $db->escape($city) . "', `phone`='" . $db->escape($phone) . "', `fax`='" . $db->escape($fax) . "', `email`='" . $db->escape($email) . "', `customernumber`='" . $db->escape($customernumber) . "', `def_language`='" . $db->escape($def_language) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "', `backup_allowed`='" . $db->escape($backup_allowed) . "' WHERE `customerid`='" . (int)$id . "'");
 					$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` ";
 
+					# Using filesystem - quota, insert a task which cleans the filesystem - quota
+					if ($settings['system']['diskquota_enabled'])
+					{
+						inserttask('10');
+					}
+
 					if($mysqls != '-1'
 					   || $result['mysqls'] != '-1')
 					{
@@ -1430,15 +1573,19 @@ 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);
 
+				$gender_options = makeoption($lng['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true);
+				$gender_options .= makeoption($lng['gender']['male'], 1, ($result['gender'] == '1' ? true : false), true, true);
+				$gender_options .= makeoption($lng['gender']['female'], 2, ($result['gender'] == '2' ? true : false), true, true);
+
 				$customer_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_edit.php';
 				$customer_edit_form = htmlform::genHTMLForm($customer_edit_data);
 

admin_domains.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$
+ *
  */
 
 define('AREA', 'admin');
@@ -227,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']);
@@ -260,7 +273,8 @@ if($page == 'domains'
 				}
 
 				$documentroot = $customer['documentroot'];
-				$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', ''));
+				$registration_date = trim($_POST['registration_date']);
+				$registration_date = validate($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', ''));
 
 				if($userinfo['change_serversettings'] == '1')
 				{
@@ -362,12 +376,15 @@ if($page == 'domains'
 
 				if($settings['system']['use_ssl'] == "1"
 				   && isset($_POST['ssl'])
-				   && isset($_POST['ssl_redirect'])
+				   /*&& isset($_POST['ssl_redirect'])*/
 				   && isset($_POST['ssl_ipandport'])
 				   && $_POST['ssl'] != '0')
 				{
 					$ssl = (int)$_POST['ssl'];
-					$ssl_redirect = (int)$_POST['ssl_redirect'];
+					$ssl_redirect = 0;
+					if (isset($_POST['ssl_redirect'])) {
+						$ssl_redirect = (int)$_POST['ssl_redirect'];
+					}
 					$ssl_ipandport = (int)$_POST['ssl_ipandport'];
 					$ssl_ipandport_check = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = '" . $db->escape($ssl_ipandport) . "' AND `ssl` = '1'" . $additional_ip_condition);
 
@@ -473,7 +490,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'));
 				}
@@ -527,7 +545,7 @@ if($page == 'domains'
 					);
 
 					$security_questions = array(
-						'reallydisablesecuritysetting' => (($openbasedir == '0' || $safemode == '0') && $userinfo['change_serversettings'] == '1'),
+						'reallydisablesecuritysetting' => ($openbasedir == '0' && $userinfo['change_serversettings'] == '1'),
 						'reallydocrootoutofcustomerroot' => (substr($documentroot, 0, strlen($customer['documentroot'])) != $customer['documentroot'] && !preg_match('/^https?\:\/\//', $documentroot))
 					);
 					$question_nr = 1;
@@ -655,18 +673,18 @@ 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';
@@ -764,12 +782,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', ''));
+				$registration_date = trim($_POST['registration_date']);
+				$registration_date = validate($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')
 				{
@@ -867,12 +895,15 @@ if($page == 'domains'
 
 				if($settings['system']['use_ssl'] == "1"
 				   && isset($_POST['ssl'])
-				   && isset($_POST['ssl_redirect'])
+				   /*&& isset($_POST['ssl_redirect'])*/
 				   && isset($_POST['ssl_ipandport'])
 				   && $_POST['ssl'] != '0')
 				{
 					$ssl = (int)$_POST['ssl'];
-					$ssl_redirect = (int)$_POST['ssl_redirect'];
+					$ssl_redirect = 0;
+					if (isset($_POST['ssl_redirect'])) {
+						$ssl_redirect = (int)$_POST['ssl_redirect'];
+					}
 					$ssl_ipandport = (int)$_POST['ssl_ipandport'];
 					$ssl_ipandport_check = $db->query_first("SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = '" . $db->escape($ssl_ipandport) . "' AND `ssl` = '1'" . $additional_ip_condition);
 
@@ -992,7 +1023,7 @@ if($page == 'domains'
 				);
 
 				$security_questions = array(
-					'reallydisablesecuritysetting' => (($openbasedir == '0' || $safemode == '0') && $userinfo['change_serversettings'] == '1'),
+					'reallydisablesecuritysetting' => ($openbasedir == '0' && $userinfo['change_serversettings'] == '1'),
 					'reallydocrootoutofcustomerroot' => (substr($documentroot, 0, strlen($customer['documentroot'])) != $customer['documentroot'] && !preg_match('/^https?\:\/\//', $documentroot))
 				);
 				foreach($security_questions as $question_name => $question_launch)
@@ -1186,20 +1217,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']);
 
@@ -1211,7 +1242,7 @@ 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);
 

admin_index.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$
+ *
  */
 
 define('AREA', 'admin');

admin_ipsandports.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$
+ *
  */
 
 define('AREA', 'admin');
@@ -251,11 +251,11 @@ 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);
@@ -397,12 +397,12 @@ 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);

admin_logger.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$
+ *
  */
 
 define('AREA', 'admin');

admin_message.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$
+ *
  */
 
 define('AREA', 'admin');

admin_phpsettings.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$
+ *
  */
 
 define('AREA', 'admin');

admin_settings.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$
+ *
  */
 
 define('AREA', 'admin');
@@ -65,6 +65,11 @@ if(($page == 'settings' || $page == 'overview')
 			$only_enabledisable = true;
 		}
 		
+		// check if the session timeout is too low #815
+		if (isset($_POST['session_sessiontimeout']) && $_POST['session_sessiontimeout'] <= 60) {
+			standard_error($lng['error']['session_timeout'], $lng['error']['session_timeout_desc']);
+		}
+
 		if(processFormEx(
 			$settings_data,
 			$_POST,
@@ -79,6 +84,7 @@ if(($page == 'settings' || $page == 'overview')
 			inserttask('1');
 			inserttask('4');
 			inserttask('5');
+			inserttask('9');
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
 	}
@@ -119,6 +125,8 @@ elseif($page == 'rebuildconfigs'
 		inserttask('1');
 		inserttask('4');
 		inserttask('5');
+		inserttask('9');
+		inserttask('10');
 		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 	}
 	else

admin_templates.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$
+ *
  */
 
 define('AREA', 'admin');

admin_tickets.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$
+ *
  */
 
 define('AREA', 'admin');
@@ -111,7 +111,7 @@ if($page == 'tickets'
 						} else {
 							$customer = $lng['ticket']['nonexistingcustomer'];
 						}
-						eval("\$tickets.=\"" . getTemplate("ticket/tickets_customer") . "\";");
+						eval("\$tickets.=\"" . getTemplate("tickets/tickets_customer") . "\";");
 					}
 
 					$tickets_count++;
@@ -146,7 +146,7 @@ if($page == 'tickets'
 						$row['subject'] = substr($row['subject'], 0, 17) . '...';
 					}
 
-					eval("\$tickets.=\"" . getTemplate("ticket/tickets_tickets") . "\";");
+					eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
 					$count++;
 					$_cid = $row['customerid'];
 				}
@@ -155,7 +155,7 @@ if($page == 'tickets'
 			$i++;
 		}
 
-		eval("echo \"" . getTemplate("ticket/tickets") . "\";");
+		eval("echo \"" . getTemplate("tickets/tickets") . "\";");
 	}
 	elseif($action == 'new')
 	{
@@ -228,13 +228,13 @@ if($page == 'tickets'
 				$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_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/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") . "\";");
+				eval("echo \"" . getTemplate("tickets/tickets_new") . "\";");
 			}
 		}
 		else
@@ -313,7 +313,7 @@ if($page == 'tickets'
 
 			$subject = $mainticket->Get('subject');
 			$message = $mainticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_main") . "\";");
+			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
 			$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
                                 WHERE `id`="' . (int)$mainticket->Get('category') . '"');
 			$row = $db->fetch_array($result);
@@ -335,7 +335,7 @@ if($page == 'tickets'
 
 				$subject = $subticket->Get('subject');
 				$message = $subticket->Get('message');
-				eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_list") . "\";");
+				eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
 			}
 
 			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
@@ -345,13 +345,13 @@ 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_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/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") . "\";");
+			eval("echo \"" . getTemplate("tickets/tickets_reply") . "\";");
 		}
 	}
 	elseif($action == 'close'
@@ -466,14 +466,14 @@ elseif($page == 'categories'
 			{
 				$row = htmlentities_array($row);
 				$closedtickets_count = ($row['ticketcount'] - $row['ticketcountnotclosed']);
-				eval("\$ticketcategories.=\"" . getTemplate("ticket/tickets_categories") . "\";");
+				eval("\$ticketcategories.=\"" . getTemplate("tickets/tickets_categories") . "\";");
 				$count++;
 			}
 
 			$i++;
 		}
 
-		eval("echo \"" . getTemplate("ticket/categories") . "\";");
+		eval("echo \"" . getTemplate("tickets/categories") . "\";");
 	}
 	elseif($action == 'addcategory')
 	{
@@ -504,13 +504,13 @@ elseif($page == 'categories'
 		{
 			$order = ticket::getHighestOrderNumber($db) + 1;
 
-			$category_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.category_new.php';
+			$category_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/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") . "\";");
+			eval("echo \"" . getTemplate("tickets/tickets_newcategory") . "\";");
 		}
 	}
 	elseif($action == 'editcategory'
@@ -542,13 +542,13 @@ elseif($page == 'categories'
 		{
 			$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_data = include_once dirname(__FILE__).'/lib/formfields/admin/tickets/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") . "\";");
+			eval("echo \"" . getTemplate("tickets/tickets_editcategory") . "\";");
 		}
 	}
 	elseif($action == 'deletecategory'
@@ -597,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'],
@@ -656,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'])
@@ -671,7 +669,7 @@ elseif($page == 'archive'
 								$customer = $lng['ticket']['nonexistingcustomer'];
 							}
 
-							eval("\$tickets.=\"" . getTemplate("ticket/tickets_customer") . "\";");
+							eval("\$tickets.=\"" . getTemplate("tickets/tickets_customer") . "\";");
 						}
 
 						$tickets_count++;
@@ -691,7 +689,9 @@ elseif($page == 'archive'
 							$ticket['subject'] = substr($ticket['subject'], 0, 17) . '...';
 						}
 
-						eval("\$tickets.=\"" . getTemplate("ticket/archived_tickets") . "\";");
+						$ticket = htmlentities_array($ticket);
+
+						eval("\$tickets.=\"" . getTemplate("tickets/archived_tickets") . "\";");
 						$count++;
 						$_cid = $ticket['customerid'];
 					}
@@ -700,7 +700,7 @@ elseif($page == 'archive'
 				$i++;
 			}
 
-			eval("echo \"" . getTemplate("ticket/archivesearch") . "\";");
+			eval("echo \"" . getTemplate("tickets/archivesearch") . "\";");
 		}
 		else
 		{
@@ -729,7 +729,7 @@ elseif($page == 'archive'
 						$ticket['subject'] = substr($ticket['subject'], 0, 17) . '...';
 					}
 
-					eval("\$tickets.=\"" . getTemplate("ticket/archived_tickets") . "\";");
+					eval("\$tickets.=\"" . getTemplate("tickets/archived_tickets") . "\";");
 				}
 			}
 
@@ -754,7 +754,7 @@ elseif($page == 'archive'
 				$customers.= makeoption(getCorrectFullUserDetails($row_customer) . ' (' . $row_customer['loginname'] . ')', $row_customer['customerid']);
 			}
 
-			eval("echo \"" . getTemplate("ticket/archive") . "\";");
+			eval("echo \"" . getTemplate("tickets/archive") . "\";");
 		}
 	}
 	elseif($action == 'view'
@@ -777,9 +777,9 @@ elseif($page == 'archive'
 			$by = $lng['ticket']['customer'];
 		}
 
-		$subject = $mainticket->Get('subject');
-		$message = $mainticket->Get('message');
-		eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_main") . "\";");
+		$subject = htmlentities($mainticket->Get('subject'));
+		$message = htmlentities($mainticket->Get('message'));
+		eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
 		$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
                               WHERE `id`="' . (int)$mainticket->Get('category') . '"');
 		$row = $db->fetch_array($result);
@@ -799,20 +799,20 @@ elseif($page == 'archive'
 				$by = $lng['ticket']['customer'];
 			}
 
-			$subject = $subticket->Get('subject');
-			$message = $subticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_list") . "\";");
+			$subject = htmlentities($subticket->Get('subject'));
+			$message = htmlentities($subticket->Get('message'));
+			eval("\$ticket_replies.=\"" . getTemplate("tickets/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!
 
-		eval("echo \"" . getTemplate("ticket/tickets_view") . "\";");
+		eval("echo \"" . getTemplate("tickets/tickets_view") . "\";");
 	}
 	elseif($action == 'delete'
 	       && $id != 0)

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
+ *
+ */
+
+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") . "\";");
+}

admin_updates.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$
+ *
  */
 
 define('AREA', 'admin');

cache/.gitignore

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

customer_aps.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$
+ *
  */
 
 // Required code

customer_autoresponder.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$
+ *
  */
 
 // Required code
@@ -110,15 +110,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');
+	#$isactive = makeyesno('active', '1', '0', '1');
 
-	$autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addautoresponder.php';
+	$autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_add.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") . "\";");
+	eval("echo \"" . getTemplate("autoresponder/autoresponder_add") . "\";");
 }
 
 // Edit autoresponder
@@ -241,15 +241,15 @@ if($action == "edit")
 	}
 	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
 
-	$isactive = makeyesno('active', '1', '0', $row['enabled']);
+	#$isactive = makeyesno('active', '1', '0', $row['enabled']);
 
-	$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_editautoresponder.php';
+	$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_edit.php';
 	$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
 
 	$title = $autoresponder_edit_data['autoresponder_edit']['title'];
 	$image = $autoresponder_edit_data['autoresponder_edit']['image'];
 
-	eval("echo \"" . getTemplate("email/autoresponder_edit") . "\";");
+	eval("echo \"" . getTemplate("autoresponder/autoresponder_edit") . "\";");
 }
 
 // Delete autoresponder
@@ -310,9 +310,9 @@ else
 		{
 			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
 		}
-		eval("\$autoresponder.=\"" . getTemplate("email/autoresponder_autoresponder") . "\";");
+		eval("\$autoresponder.=\"" . getTemplate("autoresponder/autoresponder_autoresponder") . "\";");
 		$count++;
 	}
 
-	eval("echo \"" . getTemplate("email/autoresponder") . "\";");
+	eval("echo \"" . getTemplate("autoresponder/autoresponder") . "\";");
 }

customer_domains.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$
+ *
  */
 
 define('AREA', 'customer');
@@ -378,7 +378,7 @@ 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']);
 
@@ -541,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
 				{
@@ -563,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']."'");

customer_email.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$
+ *
  */
 
 define('AREA', 'customer');
@@ -281,7 +281,7 @@ 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);

customer_extras.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$
+ *
  */
 
 define('AREA', 'customer');
@@ -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 == '')
@@ -368,9 +393,9 @@ 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);
@@ -435,9 +460,9 @@ 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';

customer_ftp.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$
+ *
  */
 
 define('AREA', 'customer');
@@ -49,7 +49,7 @@ elseif($page == 'accounts')
 			'homedir' => $lng['panel']['path']
 		);
 		$paging = new paging($userinfo, $db, TABLE_FTP_USERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
-		$result = $db->query("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . $userinfo['customerid'] . "' " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit());
+		$result = $db->query("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . $userinfo['customerid'] . "'  AND `username` NOT LIKE '%_backup'" . $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);
@@ -268,7 +268,7 @@ elseif($page == 'accounts')
 					}
 				}
 
-				$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);
@@ -312,6 +312,11 @@ elseif($page == 'accounts')
 					{
 						$log->logAction(USR_ACTION, LOG_INFO, "updated ftp-account password for '" . $result['username'] . "'");
 						$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+						
+						// also update customers backup user password if password of main ftp user is changed
+						if(!preg_match('/' . $settings['customer']['ftpprefix'] . '/', $result['username'])){
+						    $db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT('" . $db->escape($password) . "') WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $result['username'] . "_backup'");
+						}
 					}
 				}
 				
@@ -324,6 +329,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'] . "'");

customer_index.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$
+ *
  */
 
 define('AREA', 'customer');

customer_mysql.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$
+ *
  */
 
 define('AREA', 'customer');
@@ -254,7 +254,7 @@ 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);

customer_tickets.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$
+ *
  */
 
 define('AREA', 'customer');
@@ -37,7 +37,7 @@ elseif(isset($_GET['id']))
 if($page == 'overview')
 {
 	$log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_tickets");
-	eval("echo \"" . getTemplate("ticket/ticket") . "\";");
+	eval("echo \"" . getTemplate("tickets/ticket") . "\";");
 }
 elseif($page == 'tickets')
 {
@@ -104,7 +104,7 @@ elseif($page == 'tickets')
 					$row['subject'] = substr($row['subject'], 0, 17) . '...';
 				}
 
-				eval("\$tickets.=\"" . getTemplate("ticket/tickets_tickets") . "\";");
+				eval("\$tickets.=\"" . getTemplate("tickets/tickets_tickets") . "\";");
 				$count++;
 			}
 
@@ -157,7 +157,7 @@ elseif($page == 'tickets')
 		}
 
 		$ticketsopen = (int)$opentickets['count'];
-		eval("echo \"" . getTemplate("ticket/tickets") . "\";");
+		eval("echo \"" . getTemplate("tickets/tickets") . "\";");
 	}
 	elseif($action == 'new')
 	{
@@ -248,13 +248,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_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/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") . "\";");
+				eval("echo \"" . getTemplate("tickets/tickets_new") . "\";");
 			}
 		}
 		else
@@ -334,7 +334,7 @@ elseif($page == 'tickets')
 
 			$subject = $mainticket->Get('subject');
 			$message = $mainticket->Get('message');
-			eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_main") . "\";");
+			eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_main") . "\";");
 			$result = $db->query('SELECT `name` FROM `' . TABLE_PANEL_TICKET_CATS . '`
                                 WHERE `id`="' . (int)$mainticket->Get('category') . '"');
 			$row = $db->fetch_array($result);
@@ -356,7 +356,7 @@ elseif($page == 'tickets')
 
 				$subject = $subticket->Get('subject');
 				$message = $subticket->Get('message');
-				eval("\$ticket_replies.=\"" . getTemplate("ticket/tickets_tickets_list") . "\";");
+				eval("\$ticket_replies.=\"" . getTemplate("tickets/tickets_tickets_list") . "\";");
 			}
 
 			$priorities = makeoption($lng['ticket']['high'], '1', $mainticket->Get('priority'), true, true);
@@ -367,13 +367,13 @@ 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_data = include_once dirname(__FILE__).'/lib/formfields/customer/tickets/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") . "\";");
+			eval("echo \"" . getTemplate("tickets/tickets_reply") . "\";");
 		}
 	}
 	elseif($action == 'close'

customer_traffic.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$
+ *
  */
 
 define('AREA', 'customer');