setting version to 0.9.18

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
correct dovecot-sql configuration for Gentoo, fixes #568
2011-02-28 10:26:35 +01:00 · 2011-02-28 08:23:52 +01:00 · 2011-02-27 13:06:31 +01:00 · 2011-02-25 16:38:34 +01:00 · 2011-02-25 09:13:42 +01:00 · 2011-02-25 08:00:06 +01:00
690 changed files with 15209 additions and 4505 deletions
--- a/actions/admin/settings/100.panel.php
+++ b/actions/admin/settings/100.panel.php
@@ -32,6 +32,17 @@ return array(
 					'option_options_method' => 'getLanguages',
 					'save_method' => 'storeSettingField',
 					),
+				'panel_default_theme' => array(
+					'label' => $lng['serversettings']['default_theme'],
+					'settinggroup' => 'panel',
+					'varname' => 'default_theme',
+					'type' => 'option',
+					'default' => 'Froxlor',
+					'option_mode' => 'one',
+					'option_options' => array('Classic' => 'Classic', 'Froxlor' => 'Froxlor'),
+					/* 'option_options_method' => 'getThemes', // iterate through templates/ and dynamically display all folders found */
+					'save_method' => 'storeSettingField',
+					),
 				'panel_natsorting' => array(
 					'label' => $lng['serversettings']['natsorting'],
 					'settinggroup' => 'panel',
@@ -64,7 +75,7 @@ return array(
 					'type' => 'option',
 					'default' => 'Manual',
 					'option_mode' => 'one',
-					'option_options' => array('Manual' => 'Manual', 'Dropdown' => 'Dropdown'),
+					'option_options' => array('Manual' => $lng['serversettings']['manual'], 'Dropdown' => $lng['serversettings']['dropdown']),
 					'save_method' => 'storeSettingField',
 					),
 				'panel_adminmail' => array(
@@ -151,14 +162,6 @@ return array(
 					'default' => false,
 					'save_method' => 'storeSettingField',
 					),
-				'admin_froxlor_graphic' => array(
-					'label' => $lng['admin']['froxlor_graphic'],
-					'settinggroup' => 'admin',
-					'varname' => 'froxlor_graphic',
-					'type' => 'string',
-					'default' => '',
-					'save_method' => 'storeSettingField',
-					),
 				'panel_allow_domain_change_admin' => array(
 					'label' => $lng['serversettings']['panel_allow_domain_change_admin'],
 					'settinggroup' => 'panel',
--- a/actions/admin/settings/120.system.php
+++ b/actions/admin/settings/120.system.php
@@ -113,6 +113,35 @@ return array(
 					'type' => 'hidden',
 					'default' => 'www-data',
 					),
+				'system_report_enable' => array(
+					'label' => $lng['serversettings']['report']['report'],
+					'settinggroup' => 'system',
+					'varname' => 'report_enable',
+					'type' => 'bool',
+					'default' => true,
+					'cronmodule' => 'froxlor/reports',
+					'save_method' => 'storeSettingField',
+					),
+				'system_report_webmax' => array(
+					'label' => $lng['serversettings']['report']['webmax'],
+					'settinggroup' => 'system',
+					'varname' => 'report_webmax',
+					'type' => 'int',
+					'int_min' => 1,
+					'int_max' => 99,
+					'default' => 90,
+					'save_method' => 'storeSettingField',
+					),
+				'system_report_trafficmax' => array(
+					'label' => $lng['serversettings']['report']['trafficmax'],
+					'settinggroup' => 'system',
+					'varname' => 'report_trafficmax',
+					'type' => 'int',
+					'int_min' => 1,
+					'int_max' => 99,
+					'default' => 90,
+					'save_method' => 'storeSettingField',
+					),
 				'system_debug_cron' => array(
 					'label' => $lng['serversettings']['cron']['debug'],
 					'settinggroup' => 'system',
--- 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$
+ * @version    $Id: admin_admins.php 101 2010-12-08 07:03:42Z d00p $
 */

 define('AREA', 'admin');
@@ -47,6 +47,7 @@ if($page == 'admins'
 			'diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
 			'traffic' => $lng['customer']['traffic'],
 			'traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
+/*
 			'mysqls' => $lng['customer']['mysqls'],
 			'mysqls_used' => $lng['customer']['mysqls'] . ' (' . $lng['panel']['used'] . ')',
 			'ftps' => $lng['customer']['ftps'],
@@ -65,6 +66,7 @@ if($page == 'admins'
 			'email_quota_used' => $lng['customer']['email_quota'] . ' (' . $lng['panel']['used'] . ')',
 			'email_autoresponder' => $lng['customer']['autoresponder'],
 			'email_autoresponder_used' => $lng['customer']['autoresponder'] . ' (' . $lng['panel']['used'] . ')',
+*/
 			'deactivated' => $lng['admin']['deactivated']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_ADMINS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
@@ -86,6 +88,19 @@ if($page == 'admins'
 				$row['traffic'] = round($row['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
 				$row['diskspace_used'] = round($row['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
 				$row['diskspace'] = round($row['diskspace'] / 1024, $settings['panel']['decimal_places']);
+
+				/**
+				 * percent-values for progressbar
+				 */
+				if($row['diskspace'] > 0) {
+					$percent = round(($row['diskspace_used']*100)/$row['diskspace'], 2);
+					$doublepercent = round($percent*2, 2);
+				} else {
+					$percent = 0;
+					$doublepercent = 0;
+				}
+				/* */
+
 				$row = str_replace_array('-1', 'UL', $row, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps subdomains tickets');
 				$row = htmlentities_array($row);
 				eval("\$admins.=\"" . getTemplate("admins/admins_admin") . "\";");
@@ -360,8 +375,38 @@ if($page == 'admins'
 					$change_serversettings = '0';
 				}

-				$result = $db->query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` (`loginname`, `password`, `name`, `email`, `def_language`, `change_serversettings`, `customers`, `customers_see_all`, `domains`, `domains_see_all`, `caneditphpsettings`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `ip`, `can_manage_aps_packages`, `aps_packages`, `email_autoresponder`)
-					                   VALUES ('" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($email) . "','" . $db->escape($def_language) . "', '" . $db->escape($change_serversettings) . "', '" . $db->escape($customers) . "', '" . $db->escape($customers_see_all) . "', '" . $db->escape($domains) . "', '" . $db->escape($domains_see_all) . "', '" . (int)$caneditphpsettings . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '" . (int)$ipaddress . "', " . (int)$can_manage_aps_packages . ", " . (int)$number_of_aps_packages . ", " . $db->escape($email_autoresponder) . ")");
+				$_theme = $settings['panel']['default_theme'];
+
+				$result = $db->query("INSERT INTO 
+					`" . TABLE_PANEL_ADMINS . "`
+				SET 
+					`loginname` = '" . $db->escape($loginname) . "', 
+					`password` = '" . md5($password) . "', 
+					`name` = '" . $db->escape($name) . "', 
+					`email` = '" . $db->escape($email) . "', 
+					`def_language` = '" . $db->escape($def_language) . "', 
+					`change_serversettings` = '" . $db->escape($change_serversettings) . "', 
+					`customers` = '" . $db->escape($customers) . "', 
+					`customers_see_all` = '" . $db->escape($customers_see_all) . "', 
+					`domains` = '" . $db->escape($domains) . "', 
+					`domains_see_all` = '" . $db->escape($domains_see_all) . "', 
+					`caneditphpsettings` = '" . (int)$caneditphpsettings . "', 
+					`diskspace` = '" . $db->escape($diskspace) . "', 
+					`traffic` = '" . $db->escape($traffic) . "', 
+					`subdomains` = '" . $db->escape($subdomains) . "', 
+					`emails` = '" . $db->escape($emails) . "', 
+					`email_accounts` = '" . $db->escape($email_accounts) . "', 
+					`email_forwarders` = '" . $db->escape($email_forwarders) . "', 
+					`email_quota` = '" . $db->escape($email_quota) . "', 
+					`ftps` = '" . $db->escape($ftps) . "', 
+					`tickets` = '" . $db->escape($tickets) . "', 
+					`mysqls` = '" . $db->escape($mysqls) . "', 
+					`ip` = '" . (int)$ipaddress . "', 
+					`can_manage_aps_packages` = '" . (int)$can_manage_aps_packages . "', 
+					`aps_packages` = '" . (int)$number_of_aps_packages . "', 
+					`email_autoresponder` = '" . $db->escape($email_autoresponder) . "',
+					`theme` = '".$db->escape($_theme)."';
+				");
 				$adminid = $db->insert_id();
 				$log->logAction(ADM_ACTION, LOG_INFO, "added admin '" . $loginname . "'");
 				redirectTo($filename, Array('page' => $page, 's' => $s));
@@ -414,6 +459,12 @@ if($page == 'admins'
 			$can_manage_aps_packages = makeyesno('can_manage_aps_packages', '1', '0', '0');
 			$number_of_aps_packages_ul = makecheckbox('number_of_aps_packages_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);

+			$admin_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_add.php';
+			$admin_add_form = htmlform::genHTMLForm($admin_add_data);
+
+			$title = $admin_add_data['admin_add']['title'];
+			$image = $admin_add_data['admin_add']['image'];
+
 			eval("echo \"" . getTemplate("admins/admins_add") . "\";");
 		}
 	}
@@ -786,6 +837,13 @@ if($page == 'admins'
 				$can_manage_aps_packages = makeyesno('can_manage_aps_packages', '1', '0', $result['can_manage_aps_packages']);

 				$result = htmlentities_array($result);
+
+				$admin_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/admin/formfield.admin_edit.php';
+				$admin_edit_form = htmlform::genHTMLForm($admin_edit_data);
+
+				$title = $admin_edit_data['admin_edit']['title'];
+				$image = $admin_edit_data['admin_edit']['image'];
+
 				eval("echo \"" . getTemplate("admins/admins_edit") . "\";");
 			}
 		}
--- a/admin_configfiles.php
+++ b/admin_configfiles.php
@@ -97,7 +97,8 @@ if($userinfo['change_serversettings'] == '1')
 			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
 			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
 			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? makeCorrectDir($settings['system']['mod_fcgid_tmpdir']) : '/tmp/',
-			'<BASE_PATH>' => makeCorrectDir(dirname(__FILE__))
+			'<BASE_PATH>' => makeCorrectDir(dirname(__FILE__)),
+			'<BIND_CONFIG_PATH>' => makeCorrectDir($settings['system']['bindconf_directory'])
 		);
 		$files = '';
 		$configpage = '';
--- 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$
+ * @version    $Id: admin_cronjobs.php 105 2010-12-09 08:02:33Z d00p $
 */

 define('AREA', 'admin');
@@ -140,7 +140,13 @@ if($page == 'cronjobs'
 				{
 					$change_cronfile = true;
 				}
-				
+
+				$cronjobs_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/cronjobs/formfield.cronjobs_edit.php';
+				$cronjobs_edit_form = htmlform::genHTMLForm($cronjobs_edit_data);
+
+				$title = $cronjobs_edit_data['cronjobs_edit']['title'];
+				$image = $cronjobs_edit_data['cronjobs_edit']['image'];
+
 				eval("echo \"" . getTemplate("cronjobs/cronjob_edit") . "\";");
 			}
 		}
--- a/admin_customers.php
+++ b/admin_customers.php
@@ -50,7 +50,8 @@ if($page == 'customers'
 			'c.diskspace' => $lng['customer']['diskspace'],
 			'c.diskspace_used' => $lng['customer']['diskspace'] . ' (' . $lng['panel']['used'] . ')',
 			'c.traffic' => $lng['customer']['traffic'],
-			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')',
+			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')'
+/*
 			'c.mysqls' => $lng['customer']['mysqls'],
 			'c.mysqls_used' => $lng['customer']['mysqls'] . ' (' . $lng['panel']['used'] . ')',
 			'c.ftps' => $lng['customer']['ftps'],
@@ -69,8 +70,10 @@ if($page == 'customers'
 			'c.lastlogin_succ' => $lng['admin']['lastlogin_succ'],
 			'c.phpenabled' => $lng['admin']['phpenabled'],
 			'c.perlenabled' => $lng['admin']['perlenabled']
+*/
 		);

+/*
 		if($settings['ticket']['enabled'] == 1)
 		{
 			$fields['c.tickets'] = $lng['customer']['tickets'];
@@ -82,6 +85,7 @@ if($page == 'customers'
 			$fields['c.email_autoresponder'] = $lng['customer']['autoresponder'];
 			$fields['c.email_autoresponder_used'] = $lng['customer']['autoresponder'] . ' (' . $lng['panel']['used'] . ')';			
 		}
+*/

 		$paging = new paging($userinfo, $db, TABLE_PANEL_CUSTOMERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$customers = '';
@@ -106,6 +110,17 @@ if($page == 'customers'
 				$row['diskspace'] = round($row['diskspace'] / 1024, $settings['panel']['decimal_places']);
 				$last_login = ((int)$row['lastlogin_succ'] == 0) ? $lng['panel']['neverloggedin'] : date('d.m.Y', $row['lastlogin_succ']);

+				/**
+				 * percent-values for progressbar
+				 */
+				if ($row['diskspace'] > 0) {
+					$percent = round(($row['diskspace_used']*100)/$row['diskspace'], 2);
+					$doublepercent = round($percent*2, 2);
+				} else {
+					$percent = 0;
+					$doublepercent = 0;
+				}
+
 				$column_style = '';
 				$unlock_link = '';
 				if($row['loginfail_count'] >= $settings['login']['maxloginattempts']
@@ -598,7 +613,45 @@ if($page == 'customers'
 						$password = substr(md5(uniqid(microtime(), 1)), 12, 6);
 					}

-					$result = $db->query("INSERT INTO `" . TABLE_PANEL_CUSTOMERS . "` (`adminid`, `loginname`, `password`, `name`, `firstname`, `company`, `street`, `zipcode`, `city`, `phone`, `fax`, `email`, `customernumber`, `def_language`, `documentroot`, `guid`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `standardsubdomain`, `phpenabled`, `imap`, `pop3`, `aps_packages`, `perlenabled`, `email_autoresponder`)  VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($firstname) . "', '" . $db->escape($company) . "', '" . $db->escape($street) . "', '" . $db->escape($zipcode) . "', '" . $db->escape($city) . "', '" . $db->escape($phone) . "', '" . $db->escape($fax) . "', '" . $db->escape($email) . "', '" . $db->escape($customernumber) . "','" . $db->escape($def_language) . "', '" . $db->escape($documentroot) . "', '" . $db->escape($guid) . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '0', '" . $db->escape($phpenabled) . "', '" . $db->escape($email_imap) . "', '" . $db->escape($email_pop3) . "', '" . (int)$number_of_aps_packages . "', '" . $db->escape($perlenabled) . "', '" . $db->escape($email_autoresponder) . "')");
+					$_theme = $settings['panel']['default_theme'];
+
+					$result = $db->query(
+						"INSERT INTO `" . TABLE_PANEL_CUSTOMERS . "` SET 
+						`adminid` = '" . (int)$userinfo['adminid'] . "', 
+						`loginname` = '" . $db->escape($loginname) . "', 
+						`password` = '" . md5($password) . "', 
+						`name` = '" . $db->escape($name) . "', 
+						`firstname` = '" . $db->escape($firstname) . "', 
+						`company` = '" . $db->escape($company) . "', 
+						`street` = '" . $db->escape($street) . "', 
+						`zipcode` = '" . $db->escape($zipcode) . "', 
+						`city` = '" . $db->escape($city) . "', 
+						`phone` = '" . $db->escape($phone) . "', 
+						`fax` = '" . $db->escape($fax) . "', 
+						`email` = '" . $db->escape($email) . "', 
+						`customernumber` = '" . $db->escape($customernumber) . "', 
+						`def_language` = '" . $db->escape($def_language) . "', 
+						`documentroot` = '" . $db->escape($documentroot) . "', 
+						`guid` = '" . $db->escape($guid) . "', 
+						`diskspace` = '" . $db->escape($diskspace) . "', 
+						`traffic` = '" . $db->escape($traffic) . "', 
+						`subdomains` = '" . $db->escape($subdomains) . "', 
+						`emails` = '" . $db->escape($emails) . "', 
+						`email_accounts` = '" . $db->escape($email_accounts) . "', 
+						`email_forwarders` = '" . $db->escape($email_forwarders) . "', 
+						`email_quota` = '" . $db->escape($email_quota) . "', 
+						`ftps` = '" . $db->escape($ftps) . "', 
+						`tickets` = '" . $db->escape($tickets) . "', 
+						`mysqls` = '" . $db->escape($mysqls) . "', 
+						`standardsubdomain` = '0', 
+						`phpenabled` = '" . $db->escape($phpenabled) . "', 
+						`imap` = '" . $db->escape($email_imap) . "', 
+						`pop3` = '" . $db->escape($email_pop3) . "', 
+						`aps_packages` = '" . (int)$number_of_aps_packages . "', 
+						`perlenabled` = '" . $db->escape($perlenabled) . "', 
+						`email_autoresponder` = '" . $db->escape($email_autoresponder) . "',
+						`theme` = '" . $db->escape($_theme) . "'"
+					);
 					$customerid = $db->insert_id();
 					$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` + 1";

@@ -806,6 +859,13 @@ if($page == 'customers'
 				$phpenabled = makeyesno('phpenabled', '1', '0', '1');
 				$perlenabled = makeyesno('perlenabled', '1', '0', '0');
 				$store_defaultindex = makeyesno('store_defaultindex', '1', '0', '1');
+
+				$customer_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_add.php';
+				$customer_add_form = htmlform::genHTMLForm($customer_add_data);
+
+				$title = $customer_add_data['customer_add']['title'];
+				$image = $customer_add_data['customer_add']['image'];
+
 				eval("echo \"" . getTemplate("customers/customers_add") . "\";");
 			}
 		}
@@ -1378,6 +1438,13 @@ if($page == 'customers'
 				$email_pop3 = makeyesno('email_pop3', '1', '0', $result['pop3']);

 				$result = htmlentities_array($result);
+
+				$customer_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/customer/formfield.customer_edit.php';
+				$customer_edit_form = htmlform::genHTMLForm($customer_edit_data);
+
+				$title = $customer_edit_data['customer_edit']['title'];
+				$image = $customer_edit_data['customer_edit']['image'];
+
 				eval("echo \"" . getTemplate("customers/customers_edit") . "\";");
 			}
 		}
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -144,8 +144,8 @@ if($page == 'domains'
 		$alias_check = $db->query_first('SELECT COUNT(`id`) AS `count` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$id . '\'');

 		if($result['domain'] != ''
-		   && $alias_check['count'] == 0)
-		{
+			&& $alias_check['count'] == 0
+		) {
 			if(isset($_POST['send'])
 			   && $_POST['send'] == 'send')
 			{
@@ -197,6 +197,9 @@ if($page == 'domains'
 				inserttask('4');
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
+			elseif ($alias_check['count'] > 0) {
+				standard_error('domains_cantdeletedomainwithaliases');
+			}
 			else
 			{
 				$showcheck = false;
@@ -666,6 +669,12 @@ if($page == 'domains'
 				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', '0');				
 				$add_date = date('Y-m-d');

+				$domain_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/domains/formfield.domains_add.php';
+				$domain_add_form = htmlform::genHTMLForm($domain_add_data);
+
+				$title = $domain_add_data['domain_add']['title'];
+				$image = $domain_add_data['domain_add']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_add") . "\";");
 			}
 		}
@@ -1205,6 +1214,13 @@ if($page == 'domains'
 				$specialsettingsforsubdomains = makeyesno('specialsettingsforsubdomains', '1', '0', '1');
 				
 				$result = htmlentities_array($result);
+
+				$domain_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/domains/formfield.domains_edit.php';
+				$domain_edit_form = htmlform::genHTMLForm($domain_edit_data);
+
+				$title = $domain_edit_data['domain_edit']['title'];
+				$image = $domain_edit_data['domain_edit']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
 		}
--- a/admin_index.php
+++ b/admin_index.php
@@ -295,5 +295,34 @@ elseif($page == 'change_language')
 		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
 }
+elseif($page == 'change_theme')
+{
+	if(isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$theme = validate($_POST['theme'], 'theme');

-?>
+		$db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `adminid`='" . (int)$userinfo['adminid'] . "'");
+		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
+
+		$log->logAction(ADM_ACTION, LOG_NOTICE, "changed his/her theme to '" . $theme . "'");
+		redirectTo($filename, Array('s' => $s));
+	}
+	else
+	{
+		$theme_options = '';
+
+		$default_theme = $settings['panel']['default_theme'];
+		if($userinfo['theme'] != '') {
+			$default_theme = $userinfo['theme'];
+		}
+
+		$themes_avail = getThemes();
+		foreach($themes_avail as $t)
+		{
+			$theme_options.= makeoption($t, $t, $default_theme, true);
+		}
+
+		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+	}
+}
--- a/admin_ipsandports.php
+++ b/admin_ipsandports.php
@@ -256,6 +256,13 @@ if($page == 'ipsandports'
 			$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', '1');
 			$vhostcontainer = makeyesno('vhostcontainer', '1', '0', '1');
 			$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', '1');
+
+			$ipsandports_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php';
+			$ipsandports_add_form = htmlform::genHTMLForm($ipsandports_add_data);
+
+			$title = $ipsandports_add_data['ipsandports_add']['title'];
+			$image = $ipsandports_add_data['ipsandports_add']['image'];
+
 			eval("echo \"" . getTemplate("ipsandports/ipsandports_add") . "\";");
 		}
 	}
@@ -396,6 +403,13 @@ if($page == 'ipsandports'
 				$namevirtualhost_statement = makeyesno('namevirtualhost_statement', '1', '0', $result['namevirtualhost_statement']);
 				$vhostcontainer = makeyesno('vhostcontainer', '1', '0', $result['vhostcontainer']);
 				$vhostcontainer_servername_statement = makeyesno('vhostcontainer_servername_statement', '1', '0', $result['vhostcontainer_servername_statement']);
+
+				$ipsandports_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php';
+				$ipsandports_edit_form = htmlform::genHTMLForm($ipsandports_edit_data);
+	
+				$title = $ipsandports_edit_data['ipsandports_edit']['title'];
+				$image = $ipsandports_edit_data['ipsandports_edit']['image'];
+
 				eval("echo \"" . getTemplate("ipsandports/ipsandports_edit") . "\";");
 			}
 		}
--- a/admin_logger.php
+++ b/admin_logger.php
@@ -31,10 +31,10 @@ if($page == 'log'
 	if($action == '')
 	{
 		$fields = array(
-			'action' => $lng['logger']['action'],
 			'date' => $lng['logger']['date'],
 			'type' => $lng['logger']['type'],
-			'user' => $lng['logger']['user']
+			'user' => $lng['logger']['user'],
+			'text' => $lng['logger']['action']
 		);
 		$paging = new paging($userinfo, $db, TABLE_PANEL_LOG, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$paging->sortfield = 'date';
@@ -167,5 +167,3 @@ if($page == 'log'
 		}
 	}
 }
-
-?>
--- a/admin_phpsettings.php
+++ b/admin_phpsettings.php
@@ -39,6 +39,7 @@ if($page == 'overview')
 	if($action == '')
 	{
 		$tablecontent = '';
+		$count = 0;
 		$result = $db->query("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "`");

 		while($row = $db->fetch_array($result))
@@ -68,6 +69,7 @@ if($page == 'overview')
 				$domains = $lng['admin']['phpsettings']['notused'];
 			}

+			$count ++;
 			eval("\$tablecontent.=\"" . getTemplate("phpconfig/overview_overview") . "\";");
 		}

@@ -103,6 +105,13 @@ if($page == 'overview')
 			else
 			{
 				$result = $db->query_first("SELECT * FROM `" . TABLE_PANEL_PHPCONFIGS . "` WHERE `id` = 1");
+
+				$phpconfig_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php';
+				$phpconfig_add_form = htmlform::genHTMLForm($phpconfig_add_data);
+
+				$title = $phpconfig_add_data['phpconfig_add']['title'];
+				$image = $phpconfig_add_data['phpconfig_add']['image'];
+
 				eval("echo \"" . getTemplate("phpconfig/overview_add") . "\";");
 			}
 		}
@@ -172,6 +181,12 @@ if($page == 'overview')
 			}
 			else
 			{
+				$phpconfig_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php';
+				$phpconfig_edit_form = htmlform::genHTMLForm($phpconfig_edit_data);
+
+				$title = $phpconfig_edit_data['phpconfig_edit']['title'];
+				$image = $phpconfig_edit_data['phpconfig_edit']['image'];
+
 				eval("echo \"" . getTemplate("phpconfig/overview_edit") . "\";");
 			}
 		}
--- a/admin_settings.php
+++ b/admin_settings.php
@@ -75,6 +75,10 @@ if(($page == 'settings' || $page == 'overview')
 			$only_enabledisable
 			)
 		) {
+			$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
+			inserttask('1');
+			inserttask('4');
+			inserttask('5');
 			standard_success('settingssaved', '', array('filename' => $filename, 'action' => $action, 'page' => $page));
 		}
 	}
@@ -115,7 +119,7 @@ elseif($page == 'rebuildconfigs'
 		inserttask('1');
 		inserttask('4');
 		inserttask('5');
-		redirectTo('admin_index.php', array('s' => $s));
+		standard_success('rebuildingconfigs', '', array('filename' => 'admin_index.php'));
 	}
 	else
 	{
@@ -214,4 +218,4 @@ elseif($page == 'enforcequotas'
 	{
 		ask_yesno('admin_quotas_reallyenforce', $filename, array('page' => $page));
 	}
-}
+}
--- a/admin_templates.php
+++ b/admin_templates.php
@@ -48,7 +48,8 @@ elseif(isset($_GET['id']))
 $available_templates = array(
 	'createcustomer',
 	'pop_success',
-	'trafficninetypercent',
+	'trafficmaxpercent',
+	'diskmaxpercent',
 	'new_ticket_by_customer',
 	'new_ticket_for_customer',
 	'new_ticket_by_staff',
@@ -151,7 +152,7 @@ elseif($action == 'delete'
 		}
 	}
 }
-elseif($action == 'delete'
+elseif($action == 'deletef'
       && $id != 0)
 {
 	//file templates
@@ -208,6 +209,12 @@ elseif($action == 'add')
 			$template_options.= makeoption($lng['admin']['templates'][$template], $template, NULL, true);
 		}

+		$template_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_add.php';
+		$template_add_form = htmlform::genHTMLForm($template_add_data);
+
+		$title = $template_add_data['template_add']['title'];
+		$image = $template_add_data['template_add']['image'];
+
 		eval("echo \"" . getTemplate("templates/templates_add_2") . "\";");
 	}
 	elseif(isset($_POST['send'])
@@ -311,6 +318,12 @@ elseif($action == 'add')
 				$free_templates.= makeoption($lng['admin']['templates'][$template], $template, '', true);
 			}

+			$filetemplate_add_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_add.php';
+			$filetemplate_add_form = htmlform::genHTMLForm($filetemplate_add_data);
+
+			$title = $filetemplate_add_data['filetemplate_add']['title'];
+			$image = $filetemplate_add_data['filetemplate_add']['image'];
+
 			eval("echo \"" . getTemplate("templates/filetemplates_add") . "\";");
 		}
 	}
@@ -343,11 +356,18 @@ elseif($action == 'edit'
 			$result = $db->query_first("SELECT `language`, `varname`, `value` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `id`='$mailbodyid'");
 			$result = htmlentities_array($result);
 			$mailbody = $result['value'];
+
+			$template_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.template_edit.php';
+			$template_edit_form = htmlform::genHTMLForm($template_edit_data);
+
+			$title = $template_edit_data['template_edit']['title'];
+			$image = $template_edit_data['template_edit']['image'];
+
 			eval("echo \"" . getTemplate("templates/templates_edit") . "\";");
 		}
 	}
 }
-elseif($action == 'edit'
+elseif($action == 'editf'
       && $id != 0)
 {
 	//file templates
@@ -371,6 +391,13 @@ elseif($action == 'edit'
 		else
 		{
 			$row = htmlentities_array($row);
+
+			$filetemplate_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/templates/formfield.filetemplate_edit.php';
+			$filetemplate_edit_form = htmlform::genHTMLForm($filetemplate_edit_data);
+
+			$title = $filetemplate_edit_data['filetemplate_edit']['title'];
+			$image = $filetemplate_edit_data['filetemplate_edit']['image'];
+
 			eval("echo \"" . getTemplate("templates/filetemplates_edit") . "\";");
 		}
 	}
@@ -380,5 +407,3 @@ elseif($action == 'edit'
 		exit;
 	}
 }
-
-?>
--- a/admin_tickets.php
+++ b/admin_tickets.php
@@ -227,6 +227,13 @@ if($page == 'tickets'
 				$priorities = makeoption($lng['ticket']['unf_high'], '1', $settings['ticket']['default_priority']);
 				$priorities.= makeoption($lng['ticket']['unf_normal'], '2', $settings['ticket']['default_priority']);
 				$priorities.= makeoption($lng['ticket']['unf_low'], '3', $settings['ticket']['default_priority']);
+
+				$ticket_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.ticket_new.php';
+				$ticket_new_form = htmlform::genHTMLForm($ticket_new_data);
+
+				$title = $ticket_new_data['ticket_new']['title'];
+				$image = $ticket_new_data['ticket_new']['image'];
+
 				eval("echo \"" . getTemplate("ticket/tickets_new") . "\";");
 			}
 		}
@@ -338,6 +345,11 @@ if($page == 'tickets'
 			$ticket_replies_count = $db->num_rows($andere) + 1;

 			// don't forget the main-ticket!
+			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.ticket_reply.php';
+			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
+ 
+			$title = $ticket_reply_data['ticket_reply']['title'];
+			$image = $ticket_reply_data['ticket_reply']['image'];

 			eval("echo \"" . getTemplate("ticket/tickets_reply") . "\";");
 		}
@@ -491,6 +503,13 @@ elseif($page == 'categories'
 		else
 		{
 			$order = ticket::getHighestOrderNumber($db) + 1;
+
+			$category_new_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.category_new.php';
+			$category_new_form = htmlform::genHTMLForm($category_new_data);
+
+			$title = $category_new_data['category_new']['title'];
+			$image = $category_new_data['category_new']['image'];
+
 			eval("echo \"" . getTemplate("ticket/tickets_newcategory") . "\";");
 		}
 	}
@@ -522,6 +541,13 @@ elseif($page == 'categories'
 		else
 		{
 			$row = $db->query_first('SELECT * FROM `' . TABLE_PANEL_TICKET_CATS . '` WHERE `id` = "' . (int)$id . '"');
+
+			$category_edit_data = include_once dirname(__FILE__).'/lib/formfields/admin/ticket/formfield.category_edit.php';
+			$category_edit_form = htmlform::genHTMLForm($category_edit_data);
+
+			$title = $category_edit_data['category_edit']['title'];
+			$image = $category_edit_data['category_edit']['image'];
+
 			eval("echo \"" . getTemplate("ticket/tickets_editcategory") . "\";");
 		}
 	}
--- a/customer_autoresponder.php
+++ b/customer_autoresponder.php
@@ -279,6 +279,7 @@ if($action == "delete")
 else 
 {
 	$autoresponder = '';
+	$count = 0;
 	$result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' ORDER BY email ASC");

 	while($row = $db->fetch_array($result))
@@ -300,9 +301,8 @@ else
 			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
 		}
 		eval("\$autoresponder.=\"" . getTemplate("email/autoresponder_autoresponder") . "\";");
+		$count++;
 	}	

 	eval("echo \"" . getTemplate("email/autoresponder") . "\";");
 }
-
-?>
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -381,6 +381,13 @@ elseif($page == 'domains')
 				$ssl_redirect = makeyesno('ssl_redirect', '1', '0', $result['ssl_redirect']);
 				$openbasedir = makeoption($lng['domain']['docroot'], 0, NULL, true) . makeoption($lng['domain']['homedir'], 1, NULL, true);
 				$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+
+				$subdomain_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/domains/formfield.domains_add.php';
+				$subdomain_add_form = htmlform::genHTMLForm($subdomain_add_data);
+
+				$title = $subdomain_add_data['domain_add']['title'];
+				$image = $subdomain_add_data['domain_add']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_add") . "\";");
 			}
 		}
@@ -569,6 +576,12 @@ elseif($page == 'domains')
 				$domainip = $result_ipandport['ip'];
 				$result = htmlentities_array($result);

+				$subdomain_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/domains/formfield.domains_edit.php';
+				$subdomain_edit_form = htmlform::genHTMLForm($subdomain_edit_data);
+
+				$title = $subdomain_edit_data['domain_edit']['title'];
+				$image = $subdomain_edit_data['domain_edit']['image'];
+
 				eval("echo \"" . getTemplate("domains/domains_edit") . "\";");
 			}
 		}
--- a/customer_email.php
+++ b/customer_email.php
@@ -282,6 +282,13 @@ elseif($page == 'emails')
 				}

 				$iscatchall = makeyesno('iscatchall', '1', '0', '0');
+
+				$email_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_add.php';
+				$email_add_form = htmlform::genHTMLForm($email_add_data);
+
+				$title = $email_add_data['emails_add']['title'];
+				$image = $email_add_data['emails_add']['image'];
+
 				eval("echo \"" . getTemplate("email/emails_add") . "\";");
 			}
 		}
@@ -321,6 +328,13 @@ elseif($page == 'emails')

 			$destinations_count = count($result['destination']);
 			$result = htmlentities_array($result);
+
+			$email_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_edit.php';
+			$email_edit_form = htmlform::genHTMLForm($email_edit_data);
+
+			$title = $email_edit_data['emails_edit']['title'];
+			$image = $email_edit_data['emails_edit']['image'];
+			
 			eval("echo \"" . getTemplate("email/emails_edit") . "\";");
 		}
 	}
@@ -505,6 +519,13 @@ elseif($page == 'accounts')
 					$result['email_full'] = $idna_convert->decode($result['email_full']);
 					$result = htmlentities_array($result);
 					$quota = $settings['system']['mail_quota'];
+
+					$account_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addaccount.php';
+					$account_add_form = htmlform::genHTMLForm($account_add_data);
+
+					$title = $account_add_data['emails_addaccount']['title'];
+					$image = $account_add_data['emails_addaccount']['image'];
+
 					eval("echo \"" . getTemplate("email/account_add") . "\";");
 				}
 			}
@@ -543,6 +564,13 @@ elseif($page == 'accounts')
 			{
 				$result['email_full'] = $idna_convert->decode($result['email_full']);
 				$result = htmlentities_array($result);
+
+				$account_changepw_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php';
+				$account_changepw_form = htmlform::genHTMLForm($account_changepw_data);
+
+				$title = $account_changepw_data['emails_accountchangepasswd']['title'];
+				$image = $account_changepw_data['emails_accountchangepasswd']['image'];
+
 				eval("echo \"" . getTemplate("email/account_changepw") . "\";");
 			}
 		}
@@ -584,6 +612,13 @@ elseif($page == 'accounts')
 			{
 				$result['email_full'] = $idna_convert->decode($result['email_full']);
 				$result = htmlentities_array($result);
+
+				$quota_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_accountchangequota.php';
+				$quota_edit_form = htmlform::genHTMLForm($quota_edit_data);
+
+				$title = $quota_edit_data['emails_accountchangequota']['title'];
+				$image = $quota_edit_data['emails_accountchangequota']['image'];
+        
 				eval("echo \"" . getTemplate("email/account_changequota") . "\";");
 			}
 		}
@@ -678,6 +713,13 @@ elseif($page == 'forwarders')
 				{
 					$result['email_full'] = $idna_convert->decode($result['email_full']);
 					$result = htmlentities_array($result);
+
+					$forwarder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/email/formfield.emails_addforwarder.php';
+					$forwarder_add_form = htmlform::genHTMLForm($forwarder_add_data);
+
+					$title = $forwarder_add_data['emails_addforwarder']['title'];
+					$image = $forwarder_add_data['emails_addforwarder']['image'];
+
 					eval("echo \"" . getTemplate("email/forwarder_add") . "\";");
 				}
 			}
--- a/customer_extras.php
+++ b/customer_extras.php
@@ -161,6 +161,13 @@ elseif($page == 'htpasswds')
 		else
 		{
 			$pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']);
+
+			$htpasswd_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_add.php';
+			$htpasswd_add_form = htmlform::genHTMLForm($htpasswd_add_data);
+
+			$title = $htpasswd_add_data['htpasswd_add']['title'];
+			$image = $htpasswd_add_data['htpasswd_add']['image'];
+
 			eval("echo \"" . getTemplate("extras/htpasswds_add") . "\";");
 		}
 	}
@@ -220,6 +227,13 @@ elseif($page == 'htpasswds')
 				}

 				$result = htmlentities_array($result);
+
+				$htpasswd_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htpasswd_edit.php';
+				$htpasswd_edit_form = htmlform::genHTMLForm($htpasswd_edit_data);
+
+				$title = $htpasswd_edit_data['htpasswd_edit']['title'];
+				$image = $htpasswd_edit_data['htpasswd_edit']['image'];
+
 				eval("echo \"" . getTemplate("extras/htpasswds_edit") . "\";");
 			}
 		}
@@ -357,6 +371,13 @@ elseif($page == 'htaccess')
 			$options_indexes = makeyesno('options_indexes', '1', '0', '0');
 			$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 			$options_cgi = makeyesno('options_cgi', '1', '0', '0');
+
+			$htaccess_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_add.php';
+			$htaccess_add_form = htmlform::genHTMLForm($htaccess_add_data);
+
+			$title = $htaccess_add_data['htaccess_add']['title'];
+			$image = $htaccess_add_data['htaccess_add']['image'];
+
 			eval("echo \"" . getTemplate("extras/htaccess_add") . "\";");
 		}
 	}
@@ -418,6 +439,13 @@ elseif($page == 'htaccess')
 				$cperlenabled = customerHasPerlEnabled($userinfo['customerid']);
 				$options_cgi = makeyesno('options_cgi', '1', '0', $result['options_cgi']);
 				$result = htmlentities_array($result);
+
+				$htaccess_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/extras/formfield.htaccess_edit.php';
+				$htaccess_edit_form = htmlform::genHTMLForm($htaccess_edit_data);
+	
+				$title = $htaccess_edit_data['htaccess_edit']['title'];
+				$image = $htaccess_edit_data['htaccess_edit']['image'];
+
 				eval("echo \"" . getTemplate("extras/htaccess_edit") . "\";");
 			}
 		}
--- a/customer_ftp.php
+++ b/customer_ftp.php
@@ -97,11 +97,8 @@ elseif($page == 'accounts')
 			   && $_POST['send'] == 'send')
 			{
 				$db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `up_count`=`up_count`+'" . (int)$result['up_count'] . "', `up_bytes`=`up_bytes`+'" . (int)$result['up_bytes'] . "', `down_count`=`down_count`+'" . (int)$result['down_count'] . "', `down_bytes`=`down_bytes`+'" . (int)$result['down_bytes'] . "' WHERE `username`='" . $db->escape($userinfo['loginname']) . "'");
-				$result = $db->query("SELECT `username` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
-				while($row = $db->fetch_array($result))
-				{
-					$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($row['username']) . "'");
-				}
+				$result = $db->query_first("SELECT `username`, `homedir` FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
+				$db->query("DELETE FROM `" . TABLE_FTP_QUOTATALLIES . "` WHERE `name` = '" . $db->escape($result['username']) . "'");
 				$db->query("DELETE FROM `" . TABLE_FTP_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted ftp-account '" . $result['username'] . "'");
 				$db->query("UPDATE `" . TABLE_FTP_GROUPS . "` SET `members`=REPLACE(`members`,'," . $db->escape($result['username']) . "','') WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
@@ -250,18 +247,35 @@ elseif($page == 'accounts')

 				if($settings['customer']['ftpatdomain'] == '1')
 				{
+					$domainlist = array();
 					$domains = '';

 					$result_domains = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");

 					while($row_domain = $db->fetch_array($result_domains))
 					{
-						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
+						$domainlist[] =  $row_domain['domain'];
+					}
+
+					sort($domainlist);
+
+					if(isset($domainlist[0]) && $domainlist[0] != '')
+					{
+						foreach($domainlist as $dom)
+						{
+							$domains .= makeoption($idna_convert->decode($dom), $dom);
+						}
 					}
 				}

 				$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');

+				$ftp_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_add.php';
+				$ftp_add_form = htmlform::genHTMLForm($ftp_add_data);
+
+				$title = $ftp_add_data['ftp_add']['title'];
+				$image = $ftp_add_data['ftp_add']['image'];
+
 				eval("echo \"" . getTemplate("ftp/accounts_add") . "\";");
 			}
 		}
@@ -344,7 +358,13 @@ elseif($page == 'accounts')
 						$domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['domain']);
 					}
 				}
-				
+
+				$ftp_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/ftp/formfield.ftp_edit.php';
+				$ftp_edit_form = htmlform::genHTMLForm($ftp_edit_data);
+
+				$title = $ftp_edit_data['ftp_edit']['title'];
+				$image = $ftp_edit_data['ftp_edit']['image'];
+
 				eval("echo \"" . getTemplate("ftp/accounts_edit") . "\";");
 			}
 		}
--- a/customer_index.php
+++ b/customer_index.php
@@ -185,5 +185,33 @@ elseif($page == 'change_language')
 		eval("echo \"" . getTemplate("index/change_language") . "\";");
 	}
 }
+elseif($page == 'change_theme')
+{
+	if(isset($_POST['send'])
+		&& $_POST['send'] == 'send'
+	) {
+		$theme = validate($_POST['theme'], 'theme');
+ 
+		$db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
+		$db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'");
+		$log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'");
+		redirectTo($filename, Array('s' => $s));
+	}
+	else
+	{
+		$theme_options = '';

-?>
+		$default_theme = $settings['panel']['default_theme'];
+		if($userinfo['theme'] != '') {
+			$default_theme = $userinfo['theme'];
+		}
+
+		$themes_avail = getThemes();
+		foreach($themes_avail as $t)
+		{
+			$theme_options.= makeoption($t, $t, $default_theme, true);
+		}
+
+		eval("echo \"" . getTemplate("index/change_theme") . "\";");
+	}
+}
--- a/customer_mysql.php
+++ b/customer_mysql.php
@@ -80,7 +80,7 @@ elseif($page == 'mysqls')
 	elseif($action == 'delete'
 	       && $id != 0)
 	{
-		$result = $db->query_first('SELECT `id`, `databasename`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');
+		$result = $db->query_first('SELECT `id`, `databasename`, `description`, `dbserver` FROM `' . TABLE_PANEL_DATABASES . '` WHERE `customerid`="' . (int)$userinfo['customerid'] . '" AND `id`="' . (int)$id . '"');

 		if(isset($result['databasename'])
 		   && $result['databasename'] != '')
@@ -127,7 +127,7 @@ elseif($page == 'mysqls')
 			else
 			{
 				$dbnamedesc = $result['databasename'];
-				if($result['description'] != '') {
+				if(isset($result['description']) && $result['description'] != '') {
 					$dbnamedesc.= ' ('.$result['description'].')';
 				}
 				ask_yesno('mysql_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $dbnamedesc);
@@ -256,6 +256,12 @@ elseif($page == 'mysqls')

 				$sendinfomail = makeyesno('sendinfomail', '1', '0', '0');

+				$mysql_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_add.php';
+				$mysql_add_form = htmlform::genHTMLForm($mysql_add_data);
+
+				$title = $mysql_add_data['mysql_add']['title'];
+				$image = $mysql_add_data['mysql_add']['image'];
+
 				eval("echo \"" . getTemplate("mysql/mysqls_add") . "\";");
 			}
 		}
@@ -307,10 +313,16 @@ elseif($page == 'mysqls')
 			}
 			else
 			{
+				$mysql_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/mysql/formfield.mysql_edit.php';
+				$mysql_edit_form = htmlform::genHTMLForm($mysql_edit_data);
+
+				$title = $mysql_edit_data['mysql_edit']['title'];
+				$image = $mysql_edit_data['mysql_edit']['image'];
+
 				eval("echo \"" . getTemplate("mysql/mysqls_edit") . "\";");
 			}
 		}
 	}
 }

-?>
+?>
--- a/customer_tickets.php
+++ b/customer_tickets.php
@@ -247,6 +247,13 @@ elseif($page == 'tickets')
 				}

 				$ticketsopen = (int)$opentickets['count'];
+
+				$ticket_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_add.php';
+				$ticket_add_form = htmlform::genHTMLForm($ticket_add_data);
+
+				$title = $ticket_add_data['ticket_add']['title'];
+				$image = $ticket_add_data['ticket_add']['image'];
+
 				eval("echo \"" . getTemplate("ticket/tickets_new") . "\";");
 			}
 		}
@@ -360,6 +367,12 @@ elseif($page == 'tickets')

 			// don't forget the main-ticket!

+			$ticket_reply_data = include_once dirname(__FILE__).'/lib/formfields/customer/ticket/formfield.ticket_reply.php';
+			$ticket_reply_form = htmlform::genHTMLForm($ticket_reply_data);
+
+			$title = $ticket_reply_data['ticket_reply']['title'];
+			$image = $ticket_reply_data['ticket_reply']['image'];
+
 			eval("echo \"" . getTemplate("ticket/tickets_reply") . "\";");
 		}
 	}
--- a/images/Classic/ball.gif
+++ b/images/Classic/ball.gif
--- a/images/Classic/changelanguage.gif
+++ b/images/Classic/changelanguage.gif
--- a/images/Classic/changetheme.png
+++ b/images/Classic/changetheme.png
--- a/images/Classic/default.png
+++ b/images/Classic/default.png
--- a/images/Classic/endsection.gif
+++ b/images/Classic/endsection.gif
--- a/images/Classic/error.gif
+++ b/images/Classic/error.gif
--- a/images/Classic/error.png
+++ b/images/Classic/error.png
--- a/images/Classic/footer.gif
+++ b/images/Classic/footer.gif
--- a/images/Classic/header_r.gif
+++ b/images/Classic/header_r.gif
--- a/images/Classic/info.png
+++ b/images/Classic/info.png
--- a/images/Classic/login.gif
+++ b/images/Classic/login.gif
--- a/images/Classic/logininternal.gif
+++ b/images/Classic/logininternal.gif
--- a/images/Classic/logo.png
+++ b/images/Classic/logo.png
--- a/images/Classic/multiserver/clock.png
+++ b/images/Classic/multiserver/clock.png
--- a/images/Classic/multiserver/deploy.png
+++ b/images/Classic/multiserver/deploy.png
--- a/images/Classic/multiserver/deploy_dis.png
+++ b/images/Classic/multiserver/deploy_dis.png
--- a/images/Classic/multiserver/edit.png
+++ b/images/Classic/multiserver/edit.png
--- a/images/Classic/multiserver/no.png
+++ b/images/Classic/multiserver/no.png
--- a/images/Classic/multiserver/refresh.png
+++ b/images/Classic/multiserver/refresh.png
--- a/images/Classic/multiserver/refresh_dis.png
+++ b/images/Classic/multiserver/refresh_dis.png
--- a/images/Classic/multiserver/server.png
+++ b/images/Classic/multiserver/server.png
--- a/images/Classic/multiserver/settings.png
+++ b/images/Classic/multiserver/settings.png
--- a/images/Classic/multiserver/settings_dis.png
+++ b/images/Classic/multiserver/settings_dis.png
--- a/images/Classic/multiserver/tick.png
+++ b/images/Classic/multiserver/tick.png
--- a/images/Classic/multiserver/trash.png
+++ b/images/Classic/multiserver/trash.png
--- a/images/Classic/multiserver/view.png
+++ b/images/Classic/multiserver/view.png
--- a/images/Classic/order_asc.gif
+++ b/images/Classic/order_asc.gif
--- a/images/Classic/order_desc.gif
+++ b/images/Classic/order_desc.gif
--- a/images/Classic/section.gif
+++ b/images/Classic/section.gif
--- a/images/Classic/shadow.gif
+++ b/images/Classic/shadow.gif
--- a/images/Classic/subsection.gif
+++ b/images/Classic/subsection.gif
--- a/images/Classic/title.gif
+++ b/images/Classic/title.gif
--- a/images/Classic/traffic_blue.gif
+++ b/images/Classic/traffic_blue.gif
--- a/images/Classic/traffic_green.gif
+++ b/images/Classic/traffic_green.gif
--- a/images/Classic/traffic_red.gif
+++ b/images/Classic/traffic_red.gif
--- a/images/Classic/traffic_yellow.gif
+++ b/images/Classic/traffic_yellow.gif
--- a/images/Froxlor/bar.gif
+++ b/images/Froxlor/bar.gif
--- a/images/Froxlor/bargrey.gif
+++ b/images/Froxlor/bargrey.gif
--- a/images/Froxlor/barred.gif
+++ b/images/Froxlor/barred.gif
--- a/images/Froxlor/bg_cover.gif
+++ b/images/Froxlor/bg_cover.gif
--- a/images/Froxlor/header_g.png
+++ b/images/Froxlor/header_g.png
--- a/images/Froxlor/icons/aps.png
+++ b/images/Froxlor/icons/aps.png
--- a/images/Froxlor/icons/aps_upload.png
+++ b/images/Froxlor/icons/aps_upload.png
--- a/images/Froxlor/icons/archive_ticket.png
+++ b/images/Froxlor/icons/archive_ticket.png
--- a/images/Froxlor/icons/autoresponder.png
+++ b/images/Froxlor/icons/autoresponder.png
--- a/images/Froxlor/icons/autoresponder_add.png
+++ b/images/Froxlor/icons/autoresponder_add.png
--- a/images/Froxlor/icons/bad.png
+++ b/images/Froxlor/icons/bad.png
--- a/images/Froxlor/icons/button_ok.png
+++ b/images/Froxlor/icons/button_ok.png
--- a/images/Froxlor/icons/cancel.png
+++ b/images/Froxlor/icons/cancel.png
--- a/images/Froxlor/icons/categories.png
+++ b/images/Froxlor/icons/categories.png
--- a/images/Froxlor/icons/category_add.png
+++ b/images/Froxlor/icons/category_add.png
--- a/images/Froxlor/icons/category_edit.png
+++ b/images/Froxlor/icons/category_edit.png
--- a/images/Froxlor/icons/category_new.png
+++ b/images/Froxlor/icons/category_new.png
--- a/images/Froxlor/icons/clock.png
+++ b/images/Froxlor/icons/clock.png
--- a/images/Froxlor/icons/clock_add.png
+++ b/images/Froxlor/icons/clock_add.png
--- a/images/Froxlor/icons/clock_delete.png
+++ b/images/Froxlor/icons/clock_delete.png
--- a/images/Froxlor/icons/clock_edit.png
+++ b/images/Froxlor/icons/clock_edit.png
--- a/images/Froxlor/icons/clock_error.png
+++ b/images/Froxlor/icons/clock_error.png
--- a/images/Froxlor/icons/clock_go.png
+++ b/images/Froxlor/icons/clock_go.png
--- a/images/Froxlor/icons/clock_link.png
+++ b/images/Froxlor/icons/clock_link.png
--- a/images/Froxlor/icons/clock_pause.png
+++ b/images/Froxlor/icons/clock_pause.png
--- a/images/Froxlor/icons/clock_play.png
+++ b/images/Froxlor/icons/clock_play.png
--- a/images/Froxlor/icons/clock_red.png
+++ b/images/Froxlor/icons/clock_red.png
--- a/images/Froxlor/icons/clock_stop.png
+++ b/images/Froxlor/icons/clock_stop.png
--- a/images/Froxlor/icons/delete.png
+++ b/images/Froxlor/icons/delete.png
--- a/images/Froxlor/icons/display.png
+++ b/images/Froxlor/icons/display.png
--- a/images/Froxlor/icons/domain_add.png
+++ b/images/Froxlor/icons/domain_add.png
--- a/images/Froxlor/icons/domain_edit.png
+++ b/images/Froxlor/icons/domain_edit.png
--- a/images/Froxlor/icons/domains.png
+++ b/images/Froxlor/icons/domains.png
--- a/images/Froxlor/icons/down.png
+++ b/images/Froxlor/icons/down.png
--- a/images/Froxlor/icons/edit.png
+++ b/images/Froxlor/icons/edit.png
--- a/images/Froxlor/icons/email_add.png
+++ b/images/Froxlor/icons/email_add.png
--- a/images/Froxlor/icons/email_edit.png
+++ b/images/Froxlor/icons/email_edit.png
--- a/images/Froxlor/icons/emails.png
+++ b/images/Froxlor/icons/emails.png
--- a/images/Froxlor/icons/encrypted.png
+++ b/images/Froxlor/icons/encrypted.png
--- a/images/Froxlor/icons/find.png
+++ b/images/Froxlor/icons/find.png
--- a/images/Froxlor/icons/flag.png
+++ b/images/Froxlor/icons/flag.png
--- a/images/Froxlor/icons/group_edit.png
+++ b/images/Froxlor/icons/group_edit.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Kaufmann (d00p)	95d0830584	setting version to 0.9.18 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-28 10:26:35 +01:00
Michael Kaufmann (d00p)	a8fa13dd3c	correct dovecot-sql configuration for Gentoo, fixes #568	2011-02-28 08:23:52 +01:00
Florian Aders (EleRas)	a7a8c51c18	Merged brach redesign to master Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-27 13:06:31 +01:00
Michael Kaufmann (d00p)	50ae198164	check whether directory is executable for the webserver user, fixes #612 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-25 16:38:34 +01:00
Michael Kaufmann (d00p)	b325e50da1	add 'fastcgi_param HTTPS on' for nginx generally if ssl is enabled, refs #610 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-25 09:13:42 +01:00
Michael Kaufmann (d00p)	c6afcc57d9	- in function findDirs() just skip if a directory cannot be read instead of returning the list till this dir, fixes #611 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-25 08:00:06 +01:00
Michael Kaufmann (d00p)	ff4b03f4fa	- add 'fastcgi_param HTTPS on' for nginx+fpm if domain uses SSL, fixes #610	2011-02-25 07:58:13 +01:00
Michael Kaufmann (d00p)	393a5ce570	- let makePathfield return usable values for the formfield (dynamically changing between select, text and hidden, depending on settings) Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-24 10:50:59 +01:00
Michael Kaufmann (d00p)	ca9128bdbf	- fix two TODO's where a second field has to be stuck next to the previous	2011-02-24 10:07:38 +01:00
Michael Kaufmann (d00p)	6837852f52	- check for field 'theme' in table 'panel_session' as it's being used before the update, fixes #607 - add some missing css-classes for the updater Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-23 08:47:14 +01:00
Michael Kaufmann (d00p)	957a0e78a3	Merge branch 'redesign' of git.froxlor.org:froxlor into redesign	2011-02-23 08:28:11 +01:00
Florian Aders (EleRas)	656d725b58	Adding admin to customer - list Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-22 20:49:02 +01:00
Florian Aders (EleRas)	ffed226a4f	Fixing typo in paging- Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-22 20:15:42 +01:00
Michael Kaufmann (d00p)	215abeb105	don't output templated error in cron_usage.inc.diskspace.php Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-18 13:22:48 +01:00
Michael Kaufmann (d00p)	68c8faa8cb	- don't use templated errors in cron, - fix usage of wrong variable Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-18 07:34:26 +01:00
Michael Kaufmann (d00p)	d2e86e936b	Merge branch 'master' of git.froxlor.org:froxlor	2011-02-16 14:02:48 +01:00
Michael Kaufmann (d00p)	d2fe9be860	do not generate any unnecessary webserver configuration-lines for deactivated users, fixes #599 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-16 14:01:37 +01:00
Michael Kaufmann (d00p)	357614992e	add missing image in 'change theme' on admin-side Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-15 21:49:18 +01:00
Florian Aders (EleRas)	134250d1c1	Added icon for changetheme made by scarya Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-15 21:14:02 +01:00
Florian Aders (EleRas)	8a8d485c39	Merge branch 'master' into redesign	2011-02-13 22:29:42 +01:00
Florian Aders (EleRas)	d06b08f020	Added configuration for gentoo / dovecot2 Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 22:28:45 +01:00
Florian Aders (EleRas)	7a70257b95	Forgot one file in the last commit Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 18:40:34 +01:00
Florian Aders (EleRas)	4400125c7e	Fixed icon naming Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 18:36:56 +01:00
Florian Aders (EleRas)	88d0fe5752	Fixing customer ticket reply - view Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 18:01:41 +01:00
Florian Aders (EleRas)	cc1b45ac6e	Readded files which were deleted during broken merge `7b01cb47de` Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 13:10:11 +01:00
Florian Aders (EleRas)	61d5d4a150	Fixed naming of icon in MySQL edit Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 12:52:12 +01:00
Florian Aders (EleRas)	107c84fdbc	Fixed typo in customer -> add ticket form Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 12:48:21 +01:00
Florian Aders (EleRas)	f85d983c84	Fixed naming of icon in FTP edit Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 12:45:19 +01:00
Florian Aders (EleRas)	a0406c9749	Fixed naming of icon in add domain Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-13 12:41:50 +01:00
Michael Kaufmann (d00p)	840d9f5915	fix unmerged templates to use actual $lng-values	2011-02-13 12:33:10 +01:00
Michael Kaufmann (d00p)	59f8002a5d	fix undefined index in templates_edit template	2011-02-13 12:30:56 +01:00
Florian Aders (EleRas)	0b38e192d4	Now with the auto-date-setter Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-12 20:03:08 +01:00
Florian Aders (EleRas)	014e350a9e	It's 2011 :P Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-12 19:54:31 +01:00
Florian Aders (EleRas)	382cf45e08	Changing customer -> ticket to new formfield - stuff Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-12 18:54:44 +01:00
Florian Aders (EleRas)	abe8446736	Merge branch 'redesign' of git.froxlor.org:froxlor into redesign	2011-02-12 18:38:09 +01:00
Florian Aders (EleRas)	ed4acb0118	Fixing forms in customer -> mysql classic template Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-12 18:37:11 +01:00
Andreas Burchert (scarya)	8032addc0a	Finished template for Classic: extras	2011-02-12 18:36:00 +01:00
Florian Aders (EleRas)	0cfc75976f	Fixing customer -> ftp in classic layout Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-12 18:33:59 +01:00
Michael Kaufmann (d00p)	8e83c5f788	bugfix domain-formfields (again)	2011-02-12 18:27:32 +01:00
Andreas Burchert (scarya)	7b01cb47de	Merge branch 'redesign' of git.froxlor.org:froxlor into redesign Conflicts: templates/Froxlor/customer/email/emails_add.tpl templates/Froxlor/customer/email/emails_edit.tpl templates/Froxlor/customer/email/forwarder_add.tpl	2011-02-12 18:25:19 +01:00
Andreas Burchert (scarya)	b13d20d44c	Fixed email templates in design: Classic, Froxlor	2011-02-12 18:20:22 +01:00
Michael Kaufmann (d00p)	b8ab1edc56	fix domain-formfields	2011-02-12 18:16:54 +01:00
Michael Kaufmann (d00p)	cc96aef50f	fix integration of formfields in customer-domains	2011-02-12 17:48:54 +01:00
Michael Kaufmann (d00p)	9ddd3a2a58	fix typo	2011-02-12 17:42:02 +01:00
Michael Kaufmann (d00p)	fea75e2c2f	fix even more templates	2011-02-12 17:34:20 +01:00
Michael Kaufmann (d00p)	87b15ce57d	fix more templates for fieldform usage	2011-02-12 17:32:36 +01:00
Michael Kaufmann (d00p)	a807ffd918	fix more customer_email formfiled usage	2011-02-12 17:24:07 +01:00
Michael Kaufmann (d00p)	f3d505170a	bugfix customer_email formfield integration	2011-02-12 17:17:13 +01:00
Michael Kaufmann (d00p)	13904cfd7b	Merge branch 'redesign' of git.froxlor.org:froxlor into redesign	2011-02-12 16:48:27 +01:00
Michael Kaufmann (d00p)	3e83ae8a6e	use htpasswd-formfields	2011-02-12 16:47:07 +01:00
Michael Kaufmann (d00p)	44febee357	use htaccess-formfields	2011-02-12 16:42:25 +01:00
unknown	0b20a154f5	Finished email stuff.	2011-02-12 16:18:24 +01:00
Michael Kaufmann (d00p)	b9101b2041	Merge branch 'redesign' of git.froxlor.org:froxlor into redesign	2011-02-12 16:14:33 +01:00
Michael Kaufmann (d00p)	9e798c6362	add formfields for customer_extras	2011-02-12 16:13:57 +01:00
Florian Aders (EleRas)	9e1bd811a5	Merge branch 'redesign' of git.froxlor.org:froxlor into redesign	2011-02-12 16:08:10 +01:00
Florian Aders (EleRas)	26aed64bf8	Converted customer -> ftp to new formbuilder Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>	2011-02-12 16:08:05 +01:00
Michael Kaufmann (d00p)	3f93044121	add formields for email stuff	2011-02-12 15:47:37 +01:00
Florian Aders (EleRas)	8cb615df5f	Converted customer -> mysql to new formbuilder	2011-02-12 15:15:55 +01:00
Andreas Burchert	885bf7e88c	Added customer/domain formfields.	2011-02-11 22:08:22 +01:00
Florian Aders (EleRas)	efabfd7183	Merge branch 'master' into redesign	2011-02-11 13:39:07 +01:00
Florian Aders (EleRas)	d8b43f60b8	Added missing smtpd_sasl_type = dovecot for gentoo-postfix-config	2011-02-11 13:32:22 +01:00
Michael Kaufmann (d00p)	0a2fed06cb	test Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-09 10:56:12 +01:00
Michael Kaufmann (d00p)	e13d588c07	Merge branch 'master' into redesign	2011-02-09 10:54:31 +01:00
Michael Kaufmann (d00p)	460e153c6f	FreeBSD's dovecot uses ssl=yes as default value (even if commented out), so we have to set it to 'no' if no ssl is used, fixes #572 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-09 09:55:33 +01:00
Michael Kaufmann (d00p)	cb36615228	check database-connection after each customer in traffic-cron (sometimes analyzing big access-logs takes too long), fixes #544 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-09 09:53:05 +01:00
Michael Kaufmann (d00p)	6dca567827	added parameter '-k' to the 'du' command in traffic-cron, -k displays block counts in 1024-byte (1-Kbyte) blocks (lead to wrong filesize-calculations on FreeBSD), fixes #578 Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-09 09:47:44 +01:00
Florian Aders (EleRas)	80379232a9	Remove IDs from settings, makes merging easier	2011-02-08 15:35:08 +01:00
Michael Kaufmann (d00p)	3a3aa73d2d	update idna_converter-class, thx to mathias, fixes #579	2011-02-08 14:31:21 +01:00
Michael Kaufmann (d00p)	c949c153ed	fix undefined index in classic-theme Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-08 14:03:18 +01:00
Michael Kaufmann (d00p)	a4dba36f82	beautify message if there are no customers to add a new ticket for Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-08 14:00:22 +01:00
Michael Kaufmann (d00p)	bee19fabfa	merged more of the re-design files to current state Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-08 13:17:24 +01:00
Michael Kaufmann (d00p)	43770d37e1	manually merged re-design changes to 80% of the files Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-08 12:53:24 +01:00
Michael Kaufmann (d00p)	7b6b145229	add more new files for re-design Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-08 10:38:47 +01:00
Michael Kaufmann (d00p)	57d52bd59e	merge/add new formfield-files for re-design Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-08 10:34:14 +01:00
Michael Kaufmann (d00p)	d6b4bd8d36	add new images and templates for re-design Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>	2011-02-08 10:30:03 +01:00
Michael Kaufmann (d00p)	c28f70d885	fixed endless redirection with lighty when accessing webalizer, thx to vmp32k	2011-02-08 07:58:14 +01:00
Michael Kaufmann (d00p)	fad2ae873d	show message when trying to delete a domain which is used as alias-domain instead of blank page, fixes #571	2011-02-06 09:57:31 +00:00
Michael Kaufmann (d00p)	30c025202c	set base-path dynamically in crond-config for freebsd, fixes #575	2011-02-02 06:26:21 +00:00
Michael Kaufmann (d00p)	9cb64e34dc	fix path in powerdns-configs (bind-path is a setting), fixes #574	2011-02-01 21:24:47 +00:00
Michael Kaufmann (d00p)	72af7c600f	correct postfix mx-access commands for FreeBSD, fixes #573	2011-01-31 17:14:32 +00:00
Michael Kaufmann (d00p)	903a91b9ea	- replace placeholder with actual email address, fixes #566	2011-01-27 12:35:27 +00:00
Michael Kaufmann (d00p)	2b699849ca	fix install-sql	2011-01-26 21:13:18 +00:00
Michael Kaufmann (d00p)	a7ae6e54de	- set correct version for svn1 - correct default-php.ini for open_basedir - fix upgrading from SysCP (getPhpConfigs() fails cause the table is being added after it's being used in the update-process)	2011-01-26 15:01:19 +00:00
Michael Kaufmann (d00p)	1396aca657	- fix missing language-entries for usage-mail template (no fallback to english in e-mail templates, we're looking for translaters btw :P), refs #564 - fix possible missing setting in database (httgroup), fixes #564	2011-01-26 11:41:35 +00:00
Michael Kaufmann (d00p)	b19cabef79	round values in usage-cron, fixes #563	2011-01-26 11:20:19 +00:00
Michael Kaufmann (d00p)	c3f5e6c4db	fix inserting of deletion-task for ftp-accounts, fixes #553 , refs #293	2011-01-26 10:58:59 +00:00
Michael Kaufmann (d00p)	f4b6d9930f	- respect domain openbasedir settings when using php-fpm, fixes #562 - various improvements/cleanings in the gentoo configfiles array	2011-01-26 09:44:09 +00:00
Michael Kaufmann (d00p)	f77ddac4ed	set version to 0.9.17 for upcoming release	2011-01-25 06:23:31 +00:00
Michael Kaufmann (d00p)	932e1f95c5	fix maxlength of textbox in admin:edit, fixes #559	2011-01-19 06:28:48 +00:00
Michael Kaufmann (d00p)	a8b52d50af	- prework for docroot-settings-extension, refs #533	2011-01-18 07:18:28 +00:00
Michael Kaufmann (d00p)	f10f63b6be	add missing language-string for database_edit, fixes #554	2011-01-16 11:58:24 +00:00
Michael Kaufmann (d00p)	c5cdd9f567	- fix minor issues diskspace-usage-report, refs #466 - show current year for copyright in footer	2011-01-14 07:31:01 +00:00
Michael Kaufmann (d00p)	e5b2fd90c0	Add "Notification mail for customers when 90% percent of disk space is exhausted", fixes #466	2011-01-14 07:09:53 +00:00
Michael Kaufmann (d00p)	f7b43f470f	remove double $$, fixes #552	2011-01-13 11:43:40 +00:00
Michael Kaufmann (d00p)	515e542179	- localize path setting (dropdown/manual), thx to arnoldB, fixes #547 - include diskusage- (todo) and traffic-report cron, refs #466, fixes #153 - allow customzing of warning-level in percent for diskusage- and traffic-report cron, refs #466	2011-01-11 08:40:59 +00:00
Michael Kaufmann (d00p)	cc4637095d	respect ssl_redirect setting for domains, fixes #542	2011-01-09 16:25:32 +00:00
Michael Kaufmann (d00p)	bffa8817d9	ftp user cannot be edited, fixes #337	2011-01-09 13:44:10 +00:00
Michael Kaufmann (d00p)	98b82ed0c6	improve behavior of ssl-redirect, fixes #541	2011-01-08 11:58:14 +00:00
Michael Kaufmann (d00p)	4f52982a7e	more fixes for freebsd (more to follow)	2011-01-07 19:22:24 +00:00
Michael Kaufmann (d00p)	1edba0c368	+mailbox_size_limit = 0 for FreeBSD-postfix	2011-01-07 18:33:14 +00:00
Michael Kaufmann (d00p)	06983ca382	some freebsd-config enhancements, fixes #537	2011-01-06 09:37:49 +00:00
Michael Kaufmann (d00p)	c53ef5b96e	fix libnss-nsswitch.conf for FreeBSD, fixes 538	2011-01-06 09:17:25 +00:00
Michael Kaufmann (d00p)	a2b7f98332	add missing 'description' field to sql-query to avoid undefined index in resultset, thx to adlerweb	2011-01-04 21:27:09 +00:00
Michael Kaufmann (d00p)	c25ad76200	remove unnecessary variable $entry in error-message in autoresponder, thx to monotek for finding thi	2011-01-04 20:16:25 +00:00
Florian Aders (EleRas)	7057984534	remove now unneeded inserttasks, refs #535	2011-01-04 11:41:44 +00:00
Florian Aders (EleRas)	02a4fd4e1d	Rebuild configurations after a setting is changed, fixes #535	2011-01-04 11:39:04 +00:00