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
357 changed files with 3633 additions and 1636 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(
--- 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
@@ -14,7 +14,7 @@
 * @author     Froxlor team <team@froxlor.org> (2010-)
 * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
 * @package    Settings
- * @version    $Id: 215.backup.php 1 2010-09-14 08:09:17Z monotek $
+ *
 */

 return array(
@@ -98,6 +98,15 @@ return array(
 					'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');
--- 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');
--- 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');
@@ -384,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']))
 				{
@@ -519,6 +520,11 @@ if($page == 'customers'
 					$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']);
@@ -658,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) . "', 
@@ -686,7 +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) . "',
+						`backup_allowed` = '" . $db->escape($backup_allowed) . "',
 						`theme` = '" . $db->escape($_theme) . "'"
 					);
 					$customerid = $db->insert_id();
@@ -898,6 +905,10 @@ if($page == 'customers'
 				#$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);

@@ -931,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']))
 				{
@@ -1033,6 +1045,11 @@ if($page == 'customers'
 					$backup_allowed = 1;
 				}

+				// gender out of range? [0,2]
+				if ($gender < 0 || $gender > 2) {
+					$gender = 0;
+				}
+				
 				$mysqls = 0;
 				if(isset($_POST['mysqls']))
 					$mysqls = intval_ressource($_POST['mysqls']);
@@ -1253,7 +1270,7 @@ if($page == 'customers'
 					}

 					// $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `name`='" . $db->escape($name) . "', `firstname`='" . $db->escape($firstname) . "', `company`='" . $db->escape($company) . "', `street`='" . $db->escape($street) . "', `zipcode`='" . $db->escape($zipcode) . "', `city`='" . $db->escape($city) . "', `phone`='" . $db->escape($phone) . "', `fax`='" . $db->escape($fax) . "', `email`='" . $db->escape($email) . "', `customernumber`='" . $db->escape($customernumber) . "', `def_language`='" . $db->escape($def_language) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "' WHERE `customerid`='" . (int)$id . "'");
-					$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `name`='" . $db->escape($name) . "', `firstname`='" . $db->escape($firstname) . "', `company`='" . $db->escape($company) . "', `street`='" . $db->escape($street) . "', `zipcode`='" . $db->escape($zipcode) . "', `city`='" . $db->escape($city) . "', `phone`='" . $db->escape($phone) . "', `fax`='" . $db->escape($fax) . "', `email`='" . $db->escape($email) . "', `customernumber`='" . $db->escape($customernumber) . "', `def_language`='" . $db->escape($def_language) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "', `backup_allowed`='" . $db->escape($backup_allowed) . "' WHERE `customerid`='" . (int)$id . "'");
+					$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'
@@ -1548,6 +1565,10 @@ if($page == 'customers'
 				$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');
@@ -273,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')
 				{
@@ -375,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);

@@ -780,7 +784,8 @@ if($page == 'domains'
 				$issubof = intval($_POST['issubof']);
 				$subcanemaildomain = intval($_POST['subcanemaildomain']);
 				$caneditdomain = intval($_POST['caneditdomain']);
-				$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']))
@@ -890,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);

--- 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');
--- 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');
--- 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
@@ -13,7 +13,7 @@
 * @author     Morton Jonuschat <m.jonuschat@chrome-it.de>
 * @license    GPLv2 http://files.syscp.org/misc/COPYING.txt
 * @package    Panel
- * @version    $Id: $
+ *
 */

 define('AREA', 'admin');
--- 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
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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/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');
--- 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.20');
+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');
@@ -628,6 +631,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 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');
 # --------------------------------------------------------

 #
--- 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'))
@@ -1534,3 +1534,89 @@ if(isFroxlorVersion('0.9.20-svn2'))

 	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 
--- 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'
--- 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(
--- 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(
--- a/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php
+++ b/lib/formfields/admin/cronjobs/formfield.cronjobs_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.cronjobs_edit.php 105 2010-12-09 08:02:33Z d00p $
+ *
 */

 return array(
--- a/lib/formfields/admin/customer/formfield.customer_add.php
+++ b/lib/formfields/admin/customer/formfield.customer_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.customer_add.php 96 2010-12-07 11:53:52Z d00p $
+ *
 */

 return array(
@@ -82,6 +82,11 @@ return array(
 						'type' => 'text',
 						'mandatory_ex' => true
 					),
+					'gender' => array(
+						'label' => $lng['gender']['title'],
+						'type' => 'select',
+						'select_var' => $gender_options
+					),
 					'company' => array(
 						'label' => $lng['customer']['company'],
 						'type' => 'text',
--- a/lib/formfields/admin/customer/formfield.customer_edit.php
+++ b/lib/formfields/admin/customer/formfield.customer_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.customer_edit.php 100 2010-12-07 12:20:17Z d00p $
+ *
 */

 return array(
@@ -82,6 +82,11 @@ return array(
 						'mandatory_ex' => true,
 						'value' => $result['firstname']
 					),
+					'gender' => array(
+						'label' => $lng['gender']['title'],
+						'type' => 'select',
+						'select_var' => $gender_options
+					),
 					'company' => array(
 						'label' => $lng['customer']['company'],
 						'type' => 'text',
--- a/lib/formfields/admin/domains/formfield.domains_add.php
+++ b/lib/formfields/admin/domains/formfield.domains_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.domains_add.php 112 2010-12-14 12:11:20Z d00p $
+ *
 */

 return 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