Tagging 0.9.21

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
Moved apache reload to the end of cronjob, fixes #775
2011-05-30 18:57:48 +02:00 · 2011-05-27 21:56:11 +02:00 · 2011-05-21 17:23:49 +02:00 · 2011-05-18 22:17:58 +02:00 · 2011-05-18 22:07:04 +02:00 · 2011-05-18 20:55:01 +02:00
389 changed files with 5725 additions and 2070 deletions
--- a/actions/admin/settings/000.version.php
+++ b/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(
--- a/actions/admin/settings/100.panel.php
+++ b/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(
--- a/actions/admin/settings/110.accounts.php
+++ b/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(
--- a/actions/admin/settings/120.system.php
+++ b/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(
@@ -68,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',
--- a/actions/admin/settings/130.webserver.php
+++ b/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(
--- a/actions/admin/settings/135.fcgid.php
+++ b/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(
--- a/actions/admin/settings/136.phpfpm.php
+++ b/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(
--- a/actions/admin/settings/137.perl.php
+++ b/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(
--- a/actions/admin/settings/140.statistics.php
+++ b/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(
--- a/actions/admin/settings/150.mail.php
+++ b/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(
--- a/actions/admin/settings/155.ftpserver.php
+++ b/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(
--- a/actions/admin/settings/160.nameserver.php
+++ b/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(
--- a/actions/admin/settings/170.logger.php
+++ b/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(
--- a/actions/admin/settings/180.dkim.php
+++ b/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(
--- a/actions/admin/settings/185.spf.php
+++ b/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(
--- a/actions/admin/settings/190.ticket.php
+++ b/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(
--- a/actions/admin/settings/200.aps.php
+++ b/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(
--- a/actions/admin/settings/210.security.php
+++ b/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(
--- a/actions/admin/settings/215.backup.php
+++ b/actions/admin/settings/215.backup.php
@@ -0,0 +1,115 @@
+<?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',
+					'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',
+				),
+				'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,
+				),
+				),
+			),
+		),
+	);
+
+?>
--- a/admin_admins.php
+++ b/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);

--- a/admin_aps.php
+++ b/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
--- a/admin_configfiles.php
+++ b/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');
--- a/admin_cronjobs.php
+++ b/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];
--- a/admin_customers.php
+++ b/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');
@@ -53,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'] . ')',
@@ -383,6 +384,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']))
 				{
@@ -452,9 +454,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']))
 				{
@@ -489,8 +499,10 @@ 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
@@ -498,10 +510,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;

@@ -625,6 +664,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) . "', 
@@ -653,6 +693,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();
@@ -855,14 +896,19 @@ 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);

@@ -896,6 +942,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']))
 				{
@@ -965,9 +1012,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']))
 				{
@@ -981,8 +1036,23 @@ 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']);
+				// 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']))
 				{
@@ -1003,10 +1073,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;

@@ -1188,7 +1269,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) . "', `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` ";

 					if($mysqls != '-1'
@@ -1474,15 +1556,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);

--- a/admin_domains.php
+++ b/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'));
 				}
@@ -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,13 +782,23 @@ 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')
 				{
 					$isbinddomain = intval($_POST['isbinddomain']);
@@ -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);

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

--- a/admin_index.php
+++ b/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');
--- a/admin_ipsandports.php
+++ b/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);
--- a/admin_logger.php
+++ b/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');
--- a/admin_message.php
+++ b/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');
--- a/admin_phpsettings.php
+++ b/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');
--- a/admin_settings.php
+++ b/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');
@@ -79,6 +79,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 +120,7 @@ elseif($page == 'rebuildconfigs'
 		inserttask('1');
 		inserttask('4');
 		inserttask('5');
+		inserttask('9');
 		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 	}
 	else
--- a/admin_templates.php
+++ b/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');
--- a/admin_tickets.php
+++ b/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');
--- a/admin_traffic.php
+++ b/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") . "\";");
+}
--- a/admin_updates.php
+++ b/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');
--- a/customer_aps.php
+++ b/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
--- a/customer_autoresponder.php
+++ b/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,7 +110,7 @@ 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_form = htmlform::genHTMLForm($autoresponder_add_data);
@@ -241,7 +241,7 @@ 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_form = htmlform::genHTMLForm($autoresponder_edit_data);
--- a/customer_domains.php
+++ b/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']);

@@ -570,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']."'");
--- a/customer_email.php
+++ b/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);
--- a/customer_extras.php
+++ b/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';
--- a/customer_ftp.php
+++ b/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');
@@ -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);
@@ -324,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'] . "'");
--- a/customer_index.php
+++ b/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');
--- a/customer_mysql.php
+++ b/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);
--- a/customer_tickets.php
+++ b/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');
--- a/customer_traffic.php
+++ b/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');
--- a/images/Froxlor/icons/backup.png
+++ b/images/Froxlor/icons/backup.png
--- a/images/Froxlor/icons/backup_big.png
+++ b/images/Froxlor/icons/backup_big.png
--- a/images/Froxlor/icons/res_recalculate.png
+++ b/images/Froxlor/icons/res_recalculate.png
--- a/images/Froxlor/icons/res_recalculate_big.png
+++ b/images/Froxlor/icons/res_recalculate_big.png
--- a/index.php
+++ b/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', 'login');
@@ -258,6 +258,9 @@ if($action == 'login')
 				$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
 				$message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']);
 				break;
+			case 5:
+				$message = $lng['error']['user_banned'];
+				break;
 		}

 		$update_in_progress = '';
@@ -280,7 +283,7 @@ if($action == 'forgotpwd')
 	{
 		$loginname = validate($_POST['loginname'], 'loginname');
 		$email = validateEmail($_POST['loginemail'], 'email');
-		$sql = "SELECT `adminid`, `customerid`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language` FROM `" . TABLE_PANEL_CUSTOMERS . "`
+		$sql = "SELECT `adminid`, `customerid`, `firstname`, `name`, `company`, `email`, `loginname`, `def_language`, `deactivated` FROM `" . TABLE_PANEL_CUSTOMERS . "`
 				WHERE `loginname`='" . $db->escape($loginname) . "'
 				AND `email`='" . $db->escape($email) . "'";
 		$result = $db->query($sql);
@@ -305,6 +308,13 @@ if($action == 'forgotpwd')
 		if($result !== null)
 		{
 			$user = $db->fetch_array($result);
+			
+			/* Check whether user is banned */
+			if($user['deactivated'])
+			{
+				$message = $lng['pwdreminder']['notallowed'];
+				redirectTo('index.php', Array('showmessage' => '5'), true);
+			}

 			if(($adminchecked && $settings['panel']['allow_preset_admin'] == '1')
 			|| $adminchecked == false)
@@ -384,7 +394,7 @@ if($action == 'forgotpwd')
 				{
 					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
 					$rstlog->logAction(USR_ACTION, LOG_WARNING, "User '" . $loginname . "' tried to reset pwd but wasn't found in database!");
-					$message = $lng['login']['usernotfound'];
+					$message = $lng['login']['combination_not_found'];
 				}

 				unset($user);
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -186,6 +186,7 @@ CREATE TABLE `panel_customers` (
  `adminid` int(11) unsigned NOT NULL default '0',
  `name` varchar(255) NOT NULL default '',
  `firstname` varchar(255) NOT NULL default '',
+  `gender` int(1) NOT NULL DEFAULT '0',
  `company` varchar(255) NOT NULL default '',
  `street` varchar(255) NOT NULL default '',
  `zipcode` varchar(255) NOT NULL default '',
@@ -234,6 +235,8 @@ CREATE TABLE `panel_customers` (
  `email_autoresponder` int(5) NOT NULL default '0',
  `email_autoresponder_used` int(5) NOT NULL default '0',
  `theme` varchar(255) NOT NULL default 'Froxlor',
+  `backup_allowed` TINYINT( 1 ) NOT NULL DEFAULT '1',
+  `backup_enabled` TINYINT( 1 ) NOT NULL DEFAULT '0',
   PRIMARY KEY  (`customerid`),
   UNIQUE KEY `loginname` (`loginname`)
 ) ENGINE=MyISAM ;
@@ -465,7 +468,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'vmail_homedir', '/var/customers/mail/');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.19');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.21');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900');
@@ -617,7 +620,18 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_webmax', '90');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_trafficmax', '90');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'default_theme', 'Froxlor');
-
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'validate_domain', '1');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_enabled', '1');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_dir', '#froxlor_backup');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_mysqldump_path', '/usr/bin/mysqldump');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_count', '1');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_bigfile', '1');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_enabled', '0');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_enabled', '0');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_server', '');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_user', '');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_pass', '');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_passive', '1');
 # --------------------------------------------------------

 #
@@ -1026,7 +1040,7 @@ INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`,
 INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (6, 'froxlor/ticket', 'cron_used_tickets_reset.php', '1 DAY', '1', 'cron_ticketsreset');
 INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (7, 'froxlor/ticket', 'cron_ticketarchive.php', '1 MONTH', '1', 'cron_ticketarchive');
 INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (8, 'froxlor/reports', 'cron_usage_report.php', '1 DAY', '1', 'cron_usage_report');
-
+INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES (9, 'froxlor/backup', 'cron_backup.php', '1 Day', '1', 'cron_backup');
 # --------------------------------------------------------

 #
--- a/install/install.php
+++ b/install/install.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 /**
--- a/install/lng/english.lng.php
+++ b/install/lng/english.lng.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$
+ *
 */

 /**
--- a/install/lng/french.lng.php
+++ b/install/lng/french.lng.php
@@ -15,7 +15,7 @@
 * @author     Froxlor Team <team@froxlor.org>
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Language
- * @version    $Id$
+ *
 */

 /**
@@ -23,16 +23,16 @@
 */

 $lng['install']['language'] = 'Langue d\'installation';
-$lng['install']['welcome'] = 'Bienvenue <20> l\'installation de Froxlor';
-$lng['install']['welcometext'] = 'Merci beaucoup d\'avoir choisi Froxlor. Pour installer Froxlor remplissez les cases ci-dessous avec les informations demand<6E>es.<br /><b>Attention :</b> Si vous entrez le nom d\'une base de donn<6E>es existante, celle-ci sera effac<61>e !';
-$lng['install']['database'] = 'Base de donn<6E>es';
-$lng['install']['mysql_hostname'] = 'Nom d\'h<>te du serveur MySQL';
-$lng['install']['mysql_database'] = 'Base de donn<6E>es MySQL';
-$lng['install']['mysql_unpriv_user'] = 'Utilisateur pour l\'acc<63>s non privil<69>gi<67> <20> MySQL';
-$lng['install']['mysql_unpriv_pass'] = 'Mot de passe pour l\'acc<63>s non privil<69>gi<67> <20> MySQL';
-$lng['install']['mysql_root_user'] = 'Utilisateur pour l\'acc<63>s root <20> MySQL';
-$lng['install']['mysql_root_pass'] = 'Mot de passe pour l\'acc<63>s root <20> MySQL';
-$lng['install']['admin_account'] = 'Acc<63>s administratif';
+$lng['install']['welcome'] = 'Bienvenue <20> l\'installation de Froxlor';
+$lng['install']['welcometext'] = 'Merci beaucoup d\'avoir choisi Froxlor. Pour installer Froxlor remplissez les cases ci-dessous avec les informations demand<6E>es.<br /><b>Attention :</b> Si vous entrez le nom d\'une base de donn<6E>es existante, celle-ci sera effac<61>e !';
+$lng['install']['database'] = 'Base de donn<6E>es';
+$lng['install']['mysql_hostname'] = 'Nom d\'h<>te du serveur MySQL';
+$lng['install']['mysql_database'] = 'Base de donn<6E>es MySQL';
+$lng['install']['mysql_unpriv_user'] = 'Utilisateur pour l\'acc<63>s non privil<69>gi<67> <20> MySQL';
+$lng['install']['mysql_unpriv_pass'] = 'Mot de passe pour l\'acc<63>s non privil<69>gi<67> <20> MySQL';
+$lng['install']['mysql_root_user'] = 'Utilisateur pour l\'acc<63>s root <20> MySQL';
+$lng['install']['mysql_root_pass'] = 'Mot de passe pour l\'acc<63>s root <20> MySQL';
+$lng['install']['admin_account'] = 'Acc<63>s administratif';
 $lng['install']['admin_user'] = 'Login de l\'administrateur';
 $lng['install']['admin_pass'] = 'Mot de passe de l\'administrateur';
 $lng['install']['admin_pass_confirm'] = 'Mot de passe de l\'administrateur (confirmation)';
@@ -47,19 +47,19 @@ $lng['install']['installdata'] = 'Installation - Data';
 * Progress
 */

-$lng['install']['testing_mysql'] = 'V<>rification du login root de MySQL ...';
-$lng['install']['erasing_old_db'] = 'Effacement de l\'ancienne base de donn<6E>es ...';
-$lng['install']['create_mysqluser_and_db'] = 'Cr<43>ation de la base de donn<6E>es puis des utilisateurs ...';
-$lng['install']['testing_new_db'] = 'V<>rification de la base de donn<6E>es et des utilisateurs ...';
-$lng['install']['importing_data'] = 'Importation des informations dans la base de donn<6E>es ...';
-$lng['install']['changing_data'] = 'Modification des donn<6E>es import<72>s ...';
+$lng['install']['testing_mysql'] = 'V<>rification du login root de MySQL ...';
+$lng['install']['erasing_old_db'] = 'Effacement de l\'ancienne base de donn<6E>es ...';
+$lng['install']['create_mysqluser_and_db'] = 'Cr<43>ation de la base de donn<6E>es puis des utilisateurs ...';
+$lng['install']['testing_new_db'] = 'V<>rification de la base de donn<6E>es et des utilisateurs ...';
+$lng['install']['importing_data'] = 'Importation des informations dans la base de donn<6E>es ...';
+$lng['install']['changing_data'] = 'Modification des donn<6E>es import<72>s ...';
 $lng['install']['adding_admin_user'] = 'Ajout de l\'utilisateur administrateur ...';
-$lng['install']['creating_configfile'] = 'Cr<43>ation du fichier de configuration ...';
-$lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php a <20>t<EFBFBD> sauvegard<72> dans le dossier lib/ de Froxlor.';
-$lng['install']['creating_configfile_temp'] = 'Le fichier a <20>t<EFBFBD> sauvegard<72> dans /tmp/userdata.inc.php, veuillez le d<>placer / copier dans le dossier lib/ de Froxlor.';
-$lng['install']['creating_configfile_failed'] = 'Erreur en cr<63>ant le fichier lib/userdata.inc.php, veuillez le cr<63>er avec le contenu ci-dessous :';
-$lng['install']['froxlor_succ_installed'] = 'Froxlor a <20>t<EFBFBD> install<6C> correctement.';
-$lng['install']['click_here_to_login'] = 'Cliquez ici pour vous rendre <20> l\'invite de connexion.';
+$lng['install']['creating_configfile'] = 'Cr<43>ation du fichier de configuration ...';
+$lng['install']['creating_configfile_succ'] = 'OK, userdata.inc.php a <20>t<EFBFBD> sauvegard<72> dans le dossier lib/ de Froxlor.';
+$lng['install']['creating_configfile_temp'] = 'Le fichier a <20>t<EFBFBD> sauvegard<72> dans /tmp/userdata.inc.php, veuillez le d<>placer / copier dans le dossier lib/ de Froxlor.';
+$lng['install']['creating_configfile_failed'] = 'Erreur en cr<63>ant le fichier lib/userdata.inc.php, veuillez le cr<63>er avec le contenu ci-dessous :';
+$lng['install']['froxlor_succ_installed'] = 'Froxlor a <20>t<EFBFBD> install<6C> correctement.';
+$lng['install']['click_here_to_login'] = 'Cliquez ici pour vous rendre <20> l\'invite de connexion.';
 $lng['install']['httpuser'] = 'Nom du utilisateur du HTTP';
 $lng['install']['httpgroup'] = 'Nom du la group du HTTP';

@@ -69,5 +69,5 @@ $lng['install']['httpgroup'] = 'Nom du la group du HTTP';

 $lng['install']['webserver'] = 'Version du serveur';

-$lng['install']['phpxml'] = 'Tester si PHP XML-extension est install<6C>e...';
+$lng['install']['phpxml'] = 'Tester si PHP XML-extension est install<6C>e...';
 ?>
--- a/install/lng/german.lng.php
+++ b/install/lng/german.lng.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$
+ *
 */

 /**
--- a/install/scripts/htpasswd-htaccess-remover.php
+++ b/install/scripts/htpasswd-htaccess-remover.php
@@ -12,7 +12,7 @@
 * @author     Michael Duergner <michael@duergner.com>
 * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
 * @package    System
- * @version    $Id$
+ *
 */

 if(@php_sapi_name() != 'cli'
--- a/install/scripts/language-check.php
+++ b/install/scripts/language-check.php
@@ -12,7 +12,7 @@
 * @author     Martin Burchert <eremit@syscp.org>
 * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
 * @package    System
- * @version    $Id$
+ *
 */

 // some configs
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 if(isFroxlorVersion('0.9-r0'))
@@ -1490,3 +1490,133 @@ if(isFroxlorVersion('0.9.18.1'))

 	updateToVersion('0.9.19');
 }
+
+if(isFroxlorVersion('0.9.19'))
+{
+	showUpdateStep("Updating from 0.9.19 to 0.9.20-svn1");
+	lastStepStatus(0);
+	
+	showUpdateStep("Adding new setting for domain validation");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'validate_domain', '1')");
+	lastStepStatus(0);
+	
+	updateToVersion('0.9.20-svn1');
+}
+
+
+if(isFroxlorVersion('0.9.20-svn1'))
+{
+	showUpdateStep("Updating from 0.9.20-svn1 to 0.9.20-svn2");
+
+	// adding backup stuff
+
+	$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `backup_allowed` TINYINT( 1 ) NOT NULL DEFAULT '1'");
+	$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `backup_enabled` TINYINT( 1 ) NOT NULL DEFAULT '0'");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_enabled', '1')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_dir', '#froxlor_backup')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_mysqldump_path', '/usr/bin/mysqldump')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_count', '1')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_bigfile', '1')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_enabled', '0')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_server', '')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_user', '')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_pass', '')");
+	$db->query("INSERT INTO `" . TABLE_PANEL_CRONRUNS . "` (`module`, `cronfile`, `interval`, `isactive`, `desc_lng_key`) VALUES ('froxlor/backup', 'cron_backup.php', '1 Day', '1', 'cron_backup');");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.20-svn2');
+}
+
+if(isFroxlorVersion('0.9.20-svn2'))
+{
+	showUpdateStep("Updating from 0.9.20-svn2 to 0.9.20");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.20');
+}
+
+if(isFroxlorVersion('0.9.20'))
+{
+	showUpdateStep("Updating from 0.9.20 to 0.9.20.1");
+	lastStepStatus(0);
+
+	updateToVersion('0.9.20.1');
+}
+
+if(isFroxlorVersion('0.9.20.1'))
+{
+	showUpdateStep("Updating from 0.9.20.1 to 0.9.20.1-svn1");
+	lastStepStatus(0);
+
+	showUpdateStep("Fixing possible broken tables");
+	
+	// The customer-table may miss the columns, if installed a fresh 0.9.20 or 0.9.20.1 - add them
+	$result = $db->query("DESCRIBE `" . TABLE_PANEL_CUSTOMERS . "`");
+	$columnfound = 0;
+        while($row = $db->fetch_array($result))
+	{
+		if($row['Field'] == 'backup_allowed')
+		{
+			$columnfound = 1;
+		}
+	}
+	if (!$columnfound)
+	{
+		$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `backup_allowed` TINYINT( 1 ) NOT NULL DEFAULT '1'");
+		$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `backup_enabled` TINYINT( 1 ) NOT NULL DEFAULT '0'");
+	}
+
+	// The admin-table may have the columns, if installed a fresh 0.9.20.1 - remove them
+	$result = $db->query("DESCRIBE `" . TABLE_PANEL_ADMINS . "`");
+	$columnfound = 0;
+	while($row = $db->fetch_array($result))
+	{
+		if($row['Field'] == 'backup_allowed')
+		{
+			$columnfound = 1;
+		}
+	}
+	if ($columnfound)
+	{
+		$db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` DROP `backup_allowed`;");
+		$db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` DROP `backup_enabled`;");
+	}
+	lastStepStatus(0);
+
+	updateToVersion('0.9.20.1-svn1');
+}
+
+if(isFroxlorVersion('0.9.20.1-svn1') || isFroxlorVersion('0.9.20.2-svn1'))
+{
+	showUpdateStep("Updating from 0.9.20.1-svn1 to 0.9.21-svn1");
+	lastStepStatus(0);
+
+	// add table column for gender
+	$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `gender` INT( 1 ) NOT NULL DEFAULT '0' AFTER `firstname`");
+	
+
+	lastStepStatus(0);
+
+	updateToVersion('0.9.21-svn1');
+}
+
+if(isFroxlorVersion('0.9.21-svn1'))
+{
+	showUpdateStep("Updating from 0.9.21-svn1 to 0.9.21-svn2");
+	lastStepStatus(0);
+	
+	/* add new setting: backup FTP mode */
+	$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_passive', '1')");
+	
+	lastStepStatus(0);
+
+	updateToVersion('0.9.21-svn2');
+}
+
+if(isFroxlorVersion('0.9.21-svn2'))
+{
+	showUpdateStep("Updating from 0.9.21-svn2 to 0.9.21");
+	lastStepStatus(0);
+	
+	updateToVersion('0.9.21');
+}
--- a/install/updates/froxlor/upgrade_syscp.inc.php
+++ b/install/updates/froxlor/upgrade_syscp.inc.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 $updateto = '0.9-r0';
--- a/install/updates/preconfig.php
+++ b/install/updates/preconfig.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Language
- * @version    $Id$
+ *
 */

 /**
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Language
- * @version    $Id$
+ *
 */

 /**
--- a/install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php
+++ b/install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 /**
--- a/install/updates/syscp/1.0/update_1.0_1.0.10.inc.php
+++ b/install/updates/syscp/1.0/update_1.0_1.0.10.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 define('TABLE_POSTFIX_TRANSPORT', 'postfix_transport');
--- a/install/updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php
+++ b/install/updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 if($settings['panel']['version'] == '1.2-beta1'
--- a/install/updates/syscp/1.2/update_1.2.19_1.4.inc.php
+++ b/install/updates/syscp/1.2/update_1.2.19_1.4.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 if($settings['panel']['version'] == '1.2.19')
--- a/install/updates/syscp/1.4/update_1.4.inc.php
+++ b/install/updates/syscp/1.4/update_1.4.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 if($settings['panel']['version'] == '1.4')
--- a/install/updatesql.php
+++ b/install/updatesql.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Install
- * @version    $Id$
+ *
 */

 $updatelog = FroxlorLogger::getInstanceOf(array('loginname' => 'updater'), $db, $settings);
--- a/lib/classes/aps/class.ApsInstaller.php
+++ b/lib/classes/aps/class.ApsInstaller.php
@@ -17,7 +17,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    APS
- * @version    $Id$
+ *
 * @todo		logging
 *				run with user uid/gid
 *				folder truncation/tar all files
--- a/lib/classes/aps/class.ApsParser.php
+++ b/lib/classes/aps/class.ApsParser.php
@@ -17,7 +17,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    APS
- * @version    $Id$
+ *
 * @todo		implement charset validation
 *				reconfigure
 *				patch- and versionmanagement
@@ -3300,7 +3300,7 @@ class ApsParser
 					eval("\$Data.=\"" . getTemplate("aps/data") . "\";");
 				}

-				$Temp = '<input name="license" type="checkbox" value="true" /> ' . $lng['aps']['error_license'];
+				$Temp = '<label><input name="license" type="checkbox" value="true" /> ' . $lng['aps']['error_license'] . '</label>';

 				if(in_array('license', $WrongData))
 				{
--- a/lib/classes/aps/class.ApsUpdater.php
+++ b/lib/classes/aps/class.ApsUpdater.php
@@ -17,7 +17,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    APS
- * @version    $Id$
+ *
 * @todo		logging
 *				install specific packages by name
 *				other solution than using url_fopen
--- a/lib/classes/aps/class.DynamicProperties.php
+++ b/lib/classes/aps/class.DynamicProperties.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    APS
- * @version    $Id$
+ *
 */

 class DynamicProperties { /* empty class for some magic */ }
--- a/lib/classes/database/class.db.php
+++ b/lib/classes/database/class.db.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Classes
- * @version    $Id$
+ *
 */

 /**
--- a/lib/classes/domains/class.docrootsettings.php
+++ b/lib/classes/domains/class.docrootsettings.php
@@ -13,7 +13,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Classes
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * @since      0.9.17-svn2
 *
--- a/lib/classes/froxlorclient/class.froxlorclient.php
+++ b/lib/classes/froxlorclient/class.froxlorclient.php
@@ -13,7 +13,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Multiserver
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * @since      0.9.14-svn8
 *
--- a/lib/classes/idna/class.idna_convert_wrapper.php
+++ b/lib/classes/idna/class.idna_convert_wrapper.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Classes
- * @version    $Id$
+ *
 */

 /**
--- a/lib/classes/logger/abstract.AbstractLogger.php
+++ b/lib/classes/logger/abstract.AbstractLogger.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Logger
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * 
 * Logger - Abstract-Logger-Class
--- a/lib/classes/logger/class.FileLogger.php
+++ b/lib/classes/logger/class.FileLogger.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Logger
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * 
 * Logger - File-Logger-Class
--- a/lib/classes/logger/class.FroxlorLogger.php
+++ b/lib/classes/logger/class.FroxlorLogger.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Logger
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * 
 * Logger - Froxlor-Base-Logger-Class
--- a/lib/classes/logger/class.MysqlLogger.php
+++ b/lib/classes/logger/class.MysqlLogger.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Logger
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * 
 * Logger - MySQL-Logger-Class
--- a/lib/classes/logger/class.SysLogger.php
+++ b/lib/classes/logger/class.SysLogger.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Logger
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * 
 * Logger - SysLog-Logger-Class
--- a/lib/classes/output/class.htmlform.php
+++ b/lib/classes/output/class.htmlform.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Classes
- * @version    $Id: class.htmlform.php 130 2010-12-22 00:54:11Z d00p $
+ *
 */

 class htmlform 
@@ -253,8 +253,10 @@ class htmlform
 		}
 		
 		if (isset($_SESSION['requestData'])) {
-			if (isset($_SESSION['requestData'][$fieldname])) {
-				$checked[] = $_SESSION['requestData'][$fieldname];
+			if(isset($_SESSION['requestData'][$fieldname])) {
+				$checked = array($_SESSION['requestData'][$fieldname]);
+			} else {
+				$checked = array();
 			}
 		}
 		
--- a/lib/classes/output/class.paging.php
+++ b/lib/classes/output/class.paging.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Classes
- * @version    $Id$
+ *
 */

 /**
--- a/lib/classes/phpinterface/class.phpinterface.php
+++ b/lib/classes/phpinterface/class.phpinterface.php
@@ -13,7 +13,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Cron
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * @since      0.9.16
 *
--- a/lib/classes/phpinterface/class.phpinterface_fcgid.php
+++ b/lib/classes/phpinterface/class.phpinterface_fcgid.php
@@ -13,7 +13,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Cron
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * @since      0.9.16
 *
--- a/lib/classes/phpinterface/class.phpinterface_fpm.php
+++ b/lib/classes/phpinterface/class.phpinterface_fpm.php
@@ -13,7 +13,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Cron
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 * @since      0.9.16
 *
--- a/lib/classes/phpmailer/class.PHPMailer.php
+++ b/lib/classes/phpmailer/class.PHPMailer.php
@@ -34,7 +34,7 @@
 * @author Andy Prevost
 * @author Marcus Bointon
 * @copyright 2004 - 2009 Andy Prevost
- * @version $Id$
+
 * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
 */

--- a/lib/classes/phpmailer/class.SMTP.php
+++ b/lib/classes/phpmailer/class.SMTP.php
@@ -35,7 +35,7 @@
 * @author Marcus Bointon
 * @copyright 2004 - 2008 Andy Prevost
 * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
- * @version $Id$
+
 */

 /**
--- a/lib/classes/ticket/class.ticket.php
+++ b/lib/classes/ticket/class.ticket.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Logger
- * @version    $Id$
+ *
 * @link       http://www.nutime.de/
 *
 * Support Tickets - Tickets-Class
--- a/lib/configfiles/freebsd.inc.php
+++ b/lib/configfiles/freebsd.inc.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Configfiles
- * @version    $Id$
+ *
 */

 return Array(
--- a/lib/configfiles/gentoo.inc.php
+++ b/lib/configfiles/gentoo.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Configfiles
- * @version    $Id$
+ *
 */

 return Array(
--- a/lib/configfiles/hardy.inc.php
+++ b/lib/configfiles/hardy.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Configfiles
- * @version    $Id$
+ *
 */

 return Array(
--- a/lib/configfiles/lenny.inc.php
+++ b/lib/configfiles/lenny.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Configfiles
- * @version    $Id$
+ *
 */

 return Array(
--- a/lib/configfiles/lucid.inc.php
+++ b/lib/configfiles/lucid.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Configfiles
- * @version    $Id: lenny.inc.php 860 2010-04-30 16:38:02Z Dessa $
+ * 
 */

 return Array(
--- a/lib/configfiles/squeeze.inc.php
+++ b/lib/configfiles/squeeze.inc.php
@@ -0,0 +1,385 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2003-2009 the SysCP Team (see authors).
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Florian Lippert <flo@syscp.org> (2003-2009)
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Configfiles
+ *
+ */
+
+return Array(
+	'debian_squeeze' => Array(
+		'label' => 'Debian 6.0 (Squeeze)',
+		'services' => Array(
+			'http' => Array(
+				'label' => $lng['admin']['configfiles']['http'],
+				'daemons' => Array(
+					'apache2' => Array(
+						'label' => 'Apache 2',
+						'commands' => Array(
+							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
+							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+							'a2dismod userdir'
+						),
+						'files' => ((int)$settings['phpfpm']['enabled'] == 1) ?
+							Array(
+								'etc_apache2_mods-enabled_fastcgi.conf' => '/etc/apache2/mods-enabled/fastcgi.conf'
+							)
+							:
+							null,
+						'restart' => Array(
+							'/etc/init.d/apache2 restart'
+						),
+					),
+					'lighttpd' => Array(
+						'label' => 'Lighttpd Webserver',
+						'commands_1' => Array(
+							'apt-get install lighttpd',
+						),
+						'files' => Array(
+							'etc_lighttpd.conf' => '/etc/lighttpd/lighttpd.conf',
+						),
+						'commands_2' => Array(
+							$configcommand['vhost'],
+							$configcommand['diroptions'],
+							$configcommand['v_inclighty'],
+							$configcommand['d_inclighty'],
+							'lighty-disable-mod cgi',
+							'lighty-disable-mod fastcgi',
+							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
+							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
+						),
+						'restart' => Array(
+							'/etc/init.d/lighttpd restart'
+						)
+					),
+					'nginx' => Array(
+						'label' => 'Nginx Webserver',
+						'commands_1' => Array(
+							'apt-get install nginx php5-cgi',
+						),
+						'files' => Array(
+							'etc_nginx_nginx.conf' => '/etc/nginx/nginx.conf',
+							'etc_init.d_php-fcgi' => '/etc/init.d/php-fcgi'
+						),
+						'commands_2' => Array(
+							'rm /etc/nginx/sites-enabled/default',
+							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							//'mkdir -p ' . $settings['system']['deactivateddocroot'],
+							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod u+x /etc/init.d/php-fcgi'
+						),
+						'restart' => Array(
+							'/etc/init.d/php-fcgi start',
+							'/etc/init.d/nginx restart'
+						)
+					)
+				)
+			),
+			'dns' => Array(
+				'label' => $lng['admin']['configfiles']['dns'],
+				'daemons' => Array(
+					'bind' => Array(
+						'label' => 'Bind9',
+						'commands' => Array(
+							'apt-get install bind9',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'chown root:bind ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'chmod 0644 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
+						),
+						'restart' => Array(
+							'/etc/init.d/bind9 restart'
+						)
+					),
+					'powerdns' => Array(
+						'label' => 'PowerDNS',
+						'files' => Array(
+							'etc_powerdns_pdns.conf' => '/etc/powerdns/pdns.conf',
+							'etc_powerdns_pdns-froxlor.conf' => '/etc/powerdns/pdns_froxlor.conf',
+						),
+						'restart' => Array(
+							'/etc/init.d/pdns restart'
+						)
+					),
+				)
+			),
+			'smtp' => Array(
+				'label' => $lng['admin']['configfiles']['smtp'],
+				'daemons' => Array(
+					'postfix_courier' => Array(
+						'label' => 'Postfix/Courier',
+						'commands' => Array(
+							'apt-get install postfix postfix-mysql libsasl2-2 libsasl2-modules libsasl2-modules-sql',
+							'mkdir -p /var/spool/postfix/etc/pam.d',
+							'mkdir -p /var/spool/postfix/var/run/mysqld',
+							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
+							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
+							'mkdir -p ' . $settings['system']['vmail_homedir'],
+							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
+							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
+							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'touch /etc/postfix/mysql-virtual_sender_permissions.cf',
+							'touch /etc/postfix/sasl/smtpd.conf',
+							'chown root:root /etc/postfix/main.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf',
+							'chown root:root /etc/postfix/sasl/smtpd.conf',
+							'chmod 0644 /etc/postfix/main.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf',
+							'chmod 0600 /etc/postfix/sasl/smtpd.conf',
+						),
+						'files' => Array(
+							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
+							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
+							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf',
+							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
+						),
+						'restart' => Array(
+							'newaliases',
+							'/etc/init.d/postfix restart'
+						)
+					),
+					'dkim' => Array(
+						'label' => 'DomainKey filter',
+						'commands_1' => Array(
+							'apt-get install dkim-filter',
+							'mkdir -p /etc/postfix/dkim'
+						),
+						'files' => Array(
+							'dkim-filter.conf' => '/etc/dkim-filter.conf'
+						),
+						'commands_2' => Array(
+							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
+							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
+							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
+							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
+						),
+						'restart' => Array(
+							'/etc/init.d/dkim-filter restart',
+							'/etc/init.d/postfix restart'
+						)
+					),
+					'postfix_dovecot' => Array(
+						'label' => 'Postfix/Dovecot',
+						'commands' => Array(
+							'apt-get install postfix postfix-mysql',
+							'mkdir -p /var/spool/postfix/etc/pam.d',
+							'mkdir -p /var/spool/postfix/var/run/mysqld',
+							'groupadd -g ' . $settings['system']['vmail_gid'] . ' vmail',
+							'useradd -u ' . $settings['system']['vmail_uid'] . ' -g vmail vmail',
+							'mkdir -p ' . $settings['system']['vmail_homedir'],
+							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
+							'touch /etc/postfix/mysql-virtual_alias_maps.cf',
+							'touch /etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'touch /etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'touch /etc/postfix/mysql-virtual_sender_permissions.cf',
+							'chown root:root /etc/postfix/main.cf',
+							'chown root:root /etc/postfix/master.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_alias_maps.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'chown root:postfix /etc/postfix/mysql-virtual_sender_permissions.cf',
+							'chmod 0644 /etc/postfix/main.cf',
+							'chmod 0644 /etc/postfix/master.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_alias_maps.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'chmod 0640 /etc/postfix/mysql-virtual_sender_permissions.cf'
+						),
+						'files' => Array(
+							'etc_postfix_main.cf' => '/etc/postfix/main.cf',
+							'etc_postfix_master.cf' => '/etc/postfix/master.cf',
+							'etc_postfix_mysql-virtual_alias_maps.cf' => '/etc/postfix/mysql-virtual_alias_maps.cf',
+							'etc_postfix_mysql-virtual_mailbox_domains.cf' => '/etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'etc_postfix_mysql-virtual_mailbox_maps.cf' => '/etc/postfix/mysql-virtual_mailbox_maps.cf',
+							'etc_postfix_mysql-virtual_sender_permissions.cf' => '/etc/postfix/mysql-virtual_sender_permissions.cf'
+						),
+						'restart' => Array(
+							'/etc/init.d/postfix restart',
+							'newaliases'
+						)
+					),
+					'postfix_mxaccess' => Array(
+						'label' => 'Postfix MX-Access (anti spam)',
+						'files' => Array(
+							'etc_postfix_mx_access' => '/etc/postfix/mx_access',
+							'etc_postfix_main.cf' => '/etc/postfix/main.cf'
+						),
+						'commands_1' => Array(
+							'postmap /etc/postfix/mx_access'
+						),
+						'restart' => Array(
+							'/etc/init.d/postfix restart'
+						)
+					),
+					'exim4' => Array(
+						'label' => 'Exim4',
+						'commands_1' => Array(
+							'dpkg-reconfigure exim4-config',
+							'# choose "no configuration at this time" and "splitted configuration files" in the dialog'
+						),
+						'files' => Array(
+							'etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul' => '/etc/exim4/conf.d/acl/30_exim4-config_check_rcpt.rul',
+							'etc_exim4_conf.d_auth_30_froxlor-config' => '/etc/exim4/conf.d/auth/30_froxlor-config',
+							'etc_exim4_conf.d_main_10_froxlor-config_options' => '/etc/exim4/conf.d/main/10_froxlor-config_options',
+							'etc_exim4_conf.d_router_180_froxlor-config' => '/etc/exim4/conf.d/router/180_froxlor-config',
+							'etc_exim4_conf.d_transport_30_froxlor-config' => '/etc/exim4/conf.d/transport/30_froxlor-config'
+						),
+						'commands_2' => Array(
+							'chmod o-rx /var/lib/exim4',
+							'chmod o-rx /etc/exim4/conf.d/main/10_froxlor-config_options'
+						),
+						'restart' => Array(
+							'/etc/init.d/exim4 restart'
+						)
+					)
+				)
+			),
+			'mail' => Array(
+				'label' => $lng['admin']['configfiles']['mail'],
+				'daemons' => Array(
+					'courier' => Array(
+						'label' => 'Courier',
+						'commands' => Array(
+							'apt-get install courier-pop courier-imap courier-authlib-mysql'
+						),
+						'files' => Array(
+							'etc_courier_authdaemonrc' => '/etc/courier/authdaemonrc',
+							'etc_courier_authmysqlrc' => '/etc/courier/authmysqlrc'
+						),
+						'restart' => Array(
+							'/etc/init.d/courier-authdaemon restart',
+							'/etc/init.d/courier-pop restart'
+						)
+					),
+					'dovecot' => Array(
+						'label' => 'Dovecot',
+						'commands_1' => Array(
+							'apt-get install dovecot-imapd dovecot-pop3d'
+						),
+						'files' => Array(
+							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
+							'etc_dovecot_dovecot-sql.conf' => '/etc/dovecot/dovecot-sql.conf'
+						),
+						'commands_2' => Array(
+							'chmod 0640 /etc/dovecot/dovecot-sql.conf'
+						),
+						'restart' => Array(
+							'/etc/init.d/dovecot restart'
+						)
+					)
+				)
+			),
+			'ftp' => Array(
+				'label' => $lng['admin']['configfiles']['ftp'],
+				'daemons' => Array(
+					'proftpd' => Array(
+						'label' => 'ProFTPd',
+						'commands' => Array(
+							'apt-get install proftpd-basic proftpd-mod-mysql'
+						),
+						'files' => Array(
+							'etc_proftpd_sql.conf' => '/etc/proftpd/sql.conf',
+							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
+							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
+						),
+						'restart' => Array(
+							'/etc/init.d/proftpd restart'
+						)
+					),
+					'pure-ftpd' => Array(
+						'label' => 'Pure FTPd',
+						'commands_1' => Array(
+							'apt-get install pure-ftpd-common pure-ftpd-mysql'
+						),
+						'files' => Array(
+							'etc_pure-ftpd_conf_MinUID' => '/etc/pure-ftpd/conf/MinUID',
+							'etc_pure-ftpd_conf_MySQLConfigFile' => '/etc/pure-ftpd/conf/MySQLConfigFile',
+							'etc_pure-ftpd_conf_NoAnonymous' => '/etc/pure-ftpd/conf/NoAnonymous',
+							'etc_pure-ftpd_conf_MaxIdleTime' => '/etc/pure-ftpd/conf/MaxIdleTime',
+							'etc_pure-ftpd_conf_ChrootEveryone' => '/etc/pure-ftpd/conf/ChrootEveryone',
+							'etc_pure-ftpd_conf_PAMAuthentication' => '/etc/pure-ftpd/conf/PAMAuthentication',
+							'etc_pure-ftpd_db_mysql.conf' => '/etc/pure-ftpd/db/mysql.conf',
+							'etc_pure-ftpd_conf_CustomerProof' => '/etc/pure-ftpd/conf/CustomerProof',
+							'etc_pure-ftpd_conf_Bind' => '/etc/pure-ftpd/conf/Bind',
+							'etc_default_pure-ftpd-common' => '/etc/default/pure-ftpd-common'
+						),
+						'commands_2' => Array(
+							'chmod 0640 /etc/pure-ftpd/db/mysql.conf'
+						),
+						'restart' => Array(
+							'/etc/init.d/pure-ftpd-mysql restart'
+						)
+					),
+				)
+			),
+			'etc' => Array(
+				'label' => $lng['admin']['configfiles']['etc'],
+				'daemons' => Array(
+					'cron' => Array(
+						'label' => 'Crond (cronscript)',
+						'files' => Array(
+							'etc_cron.d_froxlor' => '/etc/cron.d/froxlor'
+						),
+						'restart' => Array(
+							'/etc/init.d/cron restart'
+						)
+					),
+					'awstats' => Array(
+						'label' => 'Awstats',
+						'commands' => Array(
+							'apt-get install awstats',
+							'cp /usr/share/awstats/tools/awstats_buildstaticpages.pl '.makeCorrectDir($settings['system']['awstats_path']),
+							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
+							'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+						),
+					),
+					'libnss' => Array(
+						'label' => 'libnss (system login with mysql)',
+						'commands' => Array(
+							'apt-get install libnss-mysql nscd',
+							'chmod 600 /etc/nss-mysql.conf /etc/nss-mysql-root.conf'
+						),
+						'files' => Array(
+							'etc_nss-mysql.conf' => '/etc/nss-mysql.conf',
+							'etc_nss-mysql-root.conf' => '/etc/nss-mysql-root.conf',
+							'etc_nsswitch.conf' => '/etc/nsswitch.conf',
+						),
+						'restart' => Array(
+							'/etc/init.d/nscd restart'
+						)
+					)
+				)
+			)
+		)
+	)
+);
+
+?>
--- a/lib/configfiles/suse10.inc.php
+++ b/lib/configfiles/suse10.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Configfiles
- * @version    $Id$
+ *
 */

 return Array(
--- a/lib/configfiles_index.inc.php
+++ b/lib/configfiles_index.inc.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Lib
- * @version    $Id$
+ *
 */

 $configcommand = array();
@@ -45,5 +45,5 @@ else

 $cfgPath = 'lib/configfiles/';
 $configfiles = Array();
-$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php');
+$configfiles = array_merge(include $cfgPath . 'squeeze.inc.php', include $cfgPath . 'lenny.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php');

--- a/lib/cron_init.php
+++ b/lib/cron_init.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Cron
- * @version    $Id$
+ *
 */

 if(@php_sapi_name() != 'cli'
@@ -171,7 +171,7 @@ fwrite($debugHandler, 'Froxlor settings have been loaded from the database' . "\
 * if settings['system']['mod_fcgid_ownvhost'] is set, we have to check
 * whether the permission of the files are still correct
 */
-if((int)$settings['system']['mod_fcgid_ownvhost'] == 1)
+if((int)$settings['system']['mod_fcgid'] == 1 && (int)$settings['system']['mod_fcgid_ownvhost'] == 1)
 {
 	fwrite($debugHandler, 'Checking froxlor file permissions');
 	$mypath = makeCorrectDir(dirname(dirname(__FILE__))); // /var/www/froxlor, needed for chown
--- a/lib/cron_shutdown.php
+++ b/lib/cron_shutdown.php
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Cron
- * @version    $Id$
+ *
 */

 if($settings['logger']['log_cron'] == '1')
--- a/lib/formfields/admin/admin/formfield.admin_add.php
+++ b/lib/formfields/admin/admin/formfield.admin_add.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Formfields
- * @version    $Id: formfield.admin_add.php 104 2010-12-08 07:23:22Z d00p $
+ *
 */

 return array(
@@ -34,6 +34,11 @@ return array(
 						'type' => 'password',
 						'mandatory' => true
 					),
+					'admin_password_suggestion' => array(
+						'label' => $lng['customer']['generated_pwd'],
+						'type' => 'text',
+						'value' => generatePassword(),
+					),
 					'def_language' => array(
 						'label' => $lng['login']['language'],
 						'type' => 'select',
@@ -68,8 +73,11 @@ return array(
 					),
 					'change_serversettings' => array(
 						'label' => $lng['admin']['change_serversettings'],
-						'type' => 'yesno',
-						'yesno_var' => $change_serversettings,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					),
 					'customers' => array(
 						'label' => $lng['admin']['customers'],
@@ -81,8 +89,11 @@ return array(
 					),
 					'customers_see_all' => array(
 						'label' => $lng['admin']['customers_see_all'],
-						'type' => 'yesno',
-						'yesno_var' => $customers_see_all,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					),
 					'domains' => array(
 						'label' => $lng['admin']['domains'],
@@ -94,13 +105,19 @@ return array(
 					),
 					'domains_see_all' => array(
 						'label' => $lng['admin']['domains_see_all'],
-						'type' => 'yesno',
-						'yesno_var' => $domains_see_all,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					),
 					'caneditphpsettings' => array(
 						'label' => $lng['admin']['caneditphpsettings'],
-						'type' => 'yesno',
-						'yesno_var' => $caneditphpsettings,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array()
 					),
 					'diskspace' => array(
 						'label' => $lng['customer']['diskspace'],
@@ -192,8 +209,11 @@ return array(
 					),
 					'can_manage_aps_packages' => array(
 						'label' => $lng['aps']['canmanagepackages'],
-						'type' => 'yesno',
-						'yesno_var' => $can_manage_aps_packages,
+						'type' => 'checkbox',
+						'values' => array(
+										array ('label' => $lng['panel']['yes'], 'value' => '1')
+									),
+						'value' => array(),
 						'visible' => ($settings['aps']['aps_active'] == '1' ? true : false)
 					),
 					'number_of_aps_packages' => array(
--- a/lib/formfields/admin/admin/formfield.admin_edit.php
+++ b/lib/formfields/admin/admin/formfield.admin_edit.php
@@ -12,7 +12,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Formfields
- * @version    $Id: formfield.admin_edit.php 104 2010-12-08 07:23:22Z d00p $
+ *
 */

 return array(
@@ -31,8 +31,11 @@ return array(
 					),
 					'deactivated' => array(
 						'label' => $lng['admin']['deactivated_user'],
-						'type' => 'yesno',
-						'yesno_var' => $deactivated,
+						'type' => 'checkbox',
+                        'values' => array(
+                                        array ('label' => $lng['panel']['yes'], 'value' => '1')
+                                    ),
+                        'value' => array($result['deactivated']),
 						'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
 					),
 					'admin_password' => array(
@@ -40,6 +43,12 @@ return array(
 						'type' => 'password',
 						'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
 					),
+					'admin_password_suggestion' => array(
+						'label' => $lng['customer']['generated_pwd'],
+						'type' => 'text',
+						'value' => generatePassword(),
+						'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
+					),
 					'def_language' => array(
 						'label' => $lng['login']['language'],
 						'type' => 'select',
@@ -78,8 +87,11 @@ return array(
 					),
 					'change_serversettings' => array(
 						'label' => $lng['admin']['change_serversettings'],
-						'type' => 'yesno',
-						'yesno_var' => $change_serversettings,
+						'type' => 'checkbox',
+                        'values' => array(
+                                        array ('label' => $lng['panel']['yes'], 'value' => '1')
+                                    ),
+                        'value' => array($result['change_serversettings'])
 					),
 					'customers' => array(
 						'label' => $lng['admin']['customers'],
@@ -91,8 +103,11 @@ return array(
 					),
 					'customers_see_all' => array(
 						'label' => $lng['admin']['customers_see_all'],
-						'type' => 'yesno',
-						'yesno_var' => $customers_see_all,
+						'type' => 'checkbox',
+                        'values' => array(
+                                        array ('label' => $lng['panel']['yes'], 'value' => '1')
+                                    ),
+                        'value' => array($result['customers_see_all'])
 					),
 					'domains' => array(
 						'label' => $lng['admin']['domains'],
@@ -104,13 +119,19 @@ return array(
 					),
 					'domains_see_all' => array(
 						'label' => $lng['admin']['domains_see_all'],
-						'type' => 'yesno',
-						'yesno_var' => $domains_see_all,
+						'type' => 'checkbox',
+                        'values' => array(
+                                        array ('label' => $lng['panel']['yes'], 'value' => '1')
+                                    ),
+                        'value' => array($result['domains_see_all'])
 					),
 					'caneditphpsettings' => array(
 						'label' => $lng['admin']['caneditphpsettings'],
-						'type' => 'yesno',
-						'yesno_var' => $caneditphpsettings,
+						'type' => 'checkbox',
+                        'values' => array(
+                                        array ('label' => $lng['panel']['yes'], 'value' => '1')
+                                    ),
+                        'value' => array($result['caneditphpsettings'])
 					),
 					'diskspace' => array(
 						'label' => $lng['customer']['diskspace'],
@@ -202,8 +223,11 @@ return array(
 					),
 					'can_manage_aps_packages' => array(
 						'label' => $lng['aps']['canmanagepackages'],
-						'type' => 'yesno',
-						'yesno_var' => $can_manage_aps_packages,
+						'type' => 'checkbox',
+                        'values' => array(
+                                        array ('label' => $lng['panel']['yes'], 'value' => '1')
+                                    ),
+                        'value' => array($result['can_manage_aps_packages']),
 						'visible' => ($settings['aps']['aps_active'] == '1' ? true : false)
 					),
 					'number_of_aps_packages' => array(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Florian Aders (EleRas)	9a4b45838a	Tagging 0.9.21 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-05-30 18:57:48 +02:00
Andreas Burchert (scarya)	48df1bac4b	Moved apache reload to the end of cronjob, fixes #775	2011-05-27 21:56:11 +02:00
Andreas Burchert (scarya)	63aed1e8f4	Fix char-errors in Italian language file, fixes #790 Thanks to arnoldB	2011-05-21 17:23:49 +02:00
Andreas Burchert (scarya)	426e87a337	Forgot curly brackets.	2011-05-18 22:17:58 +02:00
Andreas Burchert (scarya)	cd141ce381	Externalized string.	2011-05-18 22:07:04 +02:00
Andreas Burchert (scarya)	ece63b8a36	Fix some language related strings, fixes #760 Thanks to arnoldB!	2011-05-18 20:55:01 +02:00
Andreas Burchert (scarya)	af423248da	Small fix in Classic theme.	2011-05-18 16:49:41 +02:00
Christoph Burchert (Chb)	5ca7e173b0	consequently use Denglish, fixes gonna fix Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-05-18 14:10:44 +02:00
Christoph Burchert (Chb)	f845f7771a	consequently use wrong English, fixes gonna fix Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-05-18 13:56:18 +02:00
Andreas Burchert (scarya)	500a829161	Update version to -svn2.	2011-05-18 13:30:13 +02:00
Andreas Burchert (scarya)	96c34b9b29	Fix issue with SSL and SSL redirect, fixes #778 Thanks to mnaumann.	2011-05-18 13:19:43 +02:00
Christoph Burchert (Chb)	ec7c19cceb	fix the fix Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-05-18 10:04:23 +02:00
Christoph Burchert (Chb)	7a4501e581	added new setting: backup ftp passive mode, fixes #785 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-05-18 02:08:45 +02:00
Christoph Burchert (Chb)	75c5fae6b2	added options for continuous up- and downloads to proftpd config, fixes #784 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-05-18 01:35:54 +02:00
Andreas Burchert (scarya)	7a5bf65184	Added ISO-3166-2 country codes, refs #471	2011-05-15 21:25:00 +02:00
Andreas Burchert (scarya)	103626e82a	Small fix in english language file.	2011-05-13 18:22:09 +02:00
Andreas Burchert (scarya)	ca1a77d883	Set version in froxlor.sql	2011-05-13 18:13:05 +02:00
Andreas Burchert (scarya)	ac68a5d35f	Updated froxlor.sql and tables.inc	2011-05-13 17:39:16 +02:00
Andreas Burchert (scarya)	f63f1d947b	You should think frist before commiting...	2011-05-13 17:33:39 +02:00
Andreas Burchert (scarya)	5b6aa1aa8d	More fixing...	2011-05-13 17:31:01 +02:00
Andreas Burchert (scarya)	12177fd21d	Patch the updater.	2011-05-13 17:28:11 +02:00
Andreas Burchert (scarya)	aa4254ad47	Added gender selection to add/edit customer, fixes #280	2011-05-12 18:58:01 +02:00
Andreas Burchert (scarya)	e2076603dd	Added language stuff for customer gender, refs #280	2011-05-12 15:34:19 +02:00
Florian Aders (EleRas)	2ea90c1b45	Update italian languagefile, thx to Emilien Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-05-05 17:45:21 +02:00
Florian Aders (EleRas)	cf66dcf38d	fixed updater, I now really hate that bitch Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-05-04 14:34:36 +02:00
Andreas Burchert (scarya)	51a83d8b09	Removed @version in file header. This isn't used by git.	2011-05-04 11:59:20 +02:00
Andreas Burchert (scarya)	e467409cbb	Added <label> tag to license agreement in aps.	2011-05-01 15:32:59 +02:00
Andreas Burchert (scarya)	05b59621a6	Added trim() to registration date check, fixes #741	2011-05-01 13:27:24 +02:00
Florian Aders (EleRas)	e148e7d584	Update version, try fixing all possible broken states, refs #742 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-28 09:47:22 +02:00
Florian Aders (EleRas)	3fb6d4eac9	Fixed SQL, now the real one, fu, fixes #742 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-28 08:27:35 +02:00
Florian Aders (EleRas)	4aa78b07be	Tagging 0.9.20.1 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-27 19:41:41 +02:00
Florian Aders (EleRas)	88048bf4c8	renamed lenny -> queeze, fixes #740 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-27 14:19:21 +02:00
Florian Aders (EleRas)	0bfc3393a0	added missing comma, fixes #739 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-27 13:34:21 +02:00
Florian Aders (EleRas)	018bc0b329	added missing columns, refs #186 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-27 11:58:45 +02:00
Florian Aders (EleRas)	f9543806a1	fixed type in backupsystem, refs #186 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-27 11:56:08 +02:00
Florian Aders (EleRas)	b9d65390c5	Added configfiles for squeeze, fixes #730 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-26 12:43:07 +02:00
Florian Aders (EleRas)	8740393b8c	Tagging 0.9.20 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-26 11:14:00 +02:00
Florian Aders (EleRas)	1ddad9295f	Tagging 0.9.20 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-26 10:28:50 +02:00
Florian Aders (EleRas)	d14493c9be	Fixed typo in backup-settings, refs #186 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-26 10:14:09 +02:00
Andreas Burchert (scarya)	329c3f03c7	Added icons for backup function, refs #186	2011-04-26 10:08:23 +02:00
Florian Aders (EleRas)	16144944ca	Fixed another bug in admin traffic summary, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 18:03:31 +02:00
Florian Aders (EleRas)	6d0e44e103	Fix small bug in admin traffic summary, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 17:45:47 +02:00
Andreas Burchert (scarya)	7db2fc6aeb	... fixed, the unfixed fix... hopefuly the last time -.-, refs #186	2011-04-24 10:49:14 +02:00
Andreas Burchert (scarya)	9aecf4ca8a	Fix the unfixed fix.	2011-04-24 10:40:51 +02:00
Florian Aders (EleRas)	1b05b64fea	Now use the correct js-source in header, fuuuuuuuuuuuu, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 10:39:04 +02:00
Florian Aders (EleRas)	ed52821a11	Now use the correct jquery in tablesorting, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 10:36:53 +02:00
Andreas Burchert (scarya)	20141ec173	Unfixed classic template, refs #186	2011-04-24 10:33:51 +02:00
Andreas Burchert (scarya)	194e4cfd20	Fixed templates, refs #186	2011-04-24 10:30:58 +02:00
Florian Aders (EleRas)	5a5653d594	Fixed linebreak in updater Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 10:27:46 +02:00
Florian Aders (EleRas)	a810a49a74	Fixed sorting, now use correct binary prefixes, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 10:24:56 +02:00
Florian Aders (EleRas)	654af4fbc6	Fixed updater, refs #186 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 09:18:20 +02:00
Andreas Burchert (scarya)	35ffb12950	Fix for versioning. Signed-off-by: Andreas Burchert (scarya) <scarya@froxlor.org>	2011-04-24 02:55:44 +02:00
Andreas Burchert (scarya)	7890730afa	Added backup function to froxlor, fixes #186 Thanks to monotek.	2011-04-24 02:18:58 +02:00
Andreas Burchert (scarya)	a97e7d3697	Fixed htpasswd creation for nginx, fixes #722 Thanks to altmir.	2011-04-24 01:26:17 +02:00
Andreas Burchert (scarya)	b34c0e268e	Added check for deactivated fcgid settings, fixes #725 Thanks to crazy4chrissi.	2011-04-24 01:04:21 +02:00
Florian Aders (EleRas)	63fe3e7019	Added german translation for traffic summary, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 01:03:09 +02:00
Florian Aders (EleRas)	886e8632a7	Improved error message for system-hostname as customerdomain, fixes #690 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 01:02:10 +02:00
Florian Aders (EleRas)	b18a3cabc2	Fixed error if no traffic - entry exists yet, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 00:57:08 +02:00
Florian Aders (EleRas)	f3f7127f82	Fix style of table-captions, fixes #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 00:25:01 +02:00
Florian Aders (EleRas)	8a8082b579	Use included jquery, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 00:23:01 +02:00
Florian Aders (EleRas)	7a27095e7b	Traffic - summary, new templates, refs #492 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 00:18:12 +02:00
Florian Aders (EleRas)	a08a34283d	Added traffic overview for admins over all customers, refs #492 , thx yabawock Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-24 00:01:37 +02:00
Florian Aders (EleRas)	76db59a1b1	Show description of fields in dashboard, fixes #600 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-23 21:45:54 +02:00
Florian Aders (EleRas)	a86fb44e61	Fixed date in configure - hint Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-23 21:36:29 +02:00
Christoph Burchert (Chb)	b6b294b682	added no_more option to exim4 configuration to prevent further routing, fixes #655 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-04-23 11:38:29 +02:00
Florian Aders (EleRas)	96e7ede031	Fixed updater - version introduced in commit `7491442a25` Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-18 14:01:43 +02:00
Christoph Burchert (Chb)	e87c16b598	added password generator, fixes #346 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-04-16 16:46:38 +02:00
Andreas Burchert (scarya)	d02daee582	Changed '>=' to '>', fixes #711	2011-04-16 15:38:25 +02:00
Andreas Burchert (scarya)	77b515751e	Forgot to add the new translated string.	2011-04-16 15:28:19 +02:00
Christoph Burchert (Chb)	0ade48117c	added new setting for domain validation, fixes #718 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-04-16 15:17:21 +02:00
Christoph Burchert (Chb)	7491442a25	added new setting for domain validation, fixes #718 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-04-16 15:13:43 +02:00
Andreas Burchert (scarya)	6ba2d99b67	Added proper strings for resend password failed, fixes #704	2011-04-16 15:11:57 +02:00
Christoph Burchert (Chb)	5c980946a9	insert cronjob task after changig ftp home directory, fixes #698 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-04-16 14:26:52 +02:00
Christoph Burchert (Chb)	213e959568	disabled password reset for banned users, fixes #677 Signed-off-by: Christoph Burchert (Chb) <derchb@froxlor.org>	2011-04-16 13:32:11 +02:00
Florian Aders (EleRas)	f36643851f	Redesign of resource-recalculation, fixes #699 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-10 10:50:10 +02:00
Andreas Burchert (scarya)	dea3601549	Added icons for recalculate resource page, refs #699	2011-04-10 10:39:55 +02:00
Florian Aders (EleRas)	29665ff3c8	Fixing execution of all files containing ".php", fixes #687 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-04-10 10:08:03 +02:00
Robert Förster (Dessa)	fc72d7ec32	fix the fix	2011-04-01 11:27:28 +02:00
Robert Förster (Dessa)	b0f3d09cb9	fix typo, refs #660	2011-04-01 07:44:32 +02:00
Andreas Burchert (scarya)	a9ab3825f5	Fixed undefined indices on admin pages, refs #645 1h0m	2011-03-30 14:52:59 +02:00
Andreas Burchert (scarya)	630e2966e2	Removed unused makeyesno functions, refs #645 @1h0m	2011-03-30 14:52:59 +02:00
Andreas Burchert (scarya)	df6441ef80	Replaced yes/no with checkboxes, refs #645 @1h0m	2011-03-30 14:52:59 +02:00
Andreas Burchert (scarya)	1730088ab1	Replaced yes/no selection with checkboxes, refs #645 @2h0m Finished all for admin pages. admin_<section>.php files need to be cleaned.	2011-03-30 14:52:58 +02:00
Andreas Burchert (scarya)	7d97544f05	Fix in _checkbox().	2011-03-30 13:30:28 +02:00