Tagging release 0.9.3

- its PHPMailer not phpMailer

admin_configfiles.php

@@ -97,7 +97,8 @@ if($userinfo['change_serversettings'] == '1')
 			'<VIRTUAL_GID_MAPS>' => $settings['system']['vmail_gid'],
 			'<AWSTATS_PATH>' => $settings['system']['awstats_path'],
 			'<SSLPROTOCOLS>' => ($settings['system']['use_ssl'] == '1') ? 'imaps pop3s' : '',
-			'<REALTIME_PORT>' => $settings['system']['realtime_port']
+			'<REALTIME_PORT>' => $settings['system']['realtime_port'],
+			'<CUSTOMER_TMP>' => ($settings['system']['mod_fcgid_tmpdir'] != '') ? $settings['system']['mod_fcgid_tmpdir'] : '/tmp/'
 		);
 		$files = '';
 		$configpage = '';

admin_customers.php

@@ -622,23 +622,22 @@ if($page == 'customers'
 						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($def_language) . '\' AND `templategroup`=\'mails\' AND `varname`=\'createcustomer_mailbody\'');
 						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['createcustomer']['mailbody']), $replace_arr));
 
-						$mail->From = $userinfo['email'];
-						$mail->FromName = $userinfo['name'];
+						$_mailerror = false;
+						try {
 							$mail->Subject = $mail_subject;
-						$mail->Body = $mail_body;
+							$mail->AltBody = $mail_body;
+							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
 							$mail->AddAddress($email, getCorrectUserSalutation(array('firstname' => $firstname, 'name' => $name, 'company' => $company)));
-
-						if(!$mail->Send())
-						{
-							if($mail->ErrorInfo != '')
-							{
-								$mailerr_msg = $mail->ErrorInfo;
-							}
-							else
-							{
-								$mailerr_msg = $email;
+							$mail->Send();
+						} catch(phpmailerException $e) {
+							$mailerr_msg = $e->errorMessage();
+							$_mailerror = true;
+						} catch (Exception $e) {
+							$mailerr_msg = $e->getMessage();
+							$_mailerror = true;
 						}
 
+						if ($_mailerror) {
 							$log->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 							standard_error('errorsendingmail', $email);
 						}

admin_domains.php

@@ -624,8 +624,10 @@ if($page == 'domains'
 	elseif($action == 'edit'
 	       && $id != 0)
 	{
-		$result = $db->query_first("SELECT `d`.*, `c`.* FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) 
-									WHERE `d`.`parentdomainid`='0' AND `d`.`id`='" . (int)$id . "'" 
+		$result = $db->query_first("SELECT `d`.*, `c`.`customerid` FROM `" . TABLE_PANEL_DOMAINS . "` `d` 
+									LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) 
+									WHERE `d`.`parentdomainid`='0' 
+									AND `d`.`id`='" . (int)$id . "'" 
 									. ($userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '" . (int)$userinfo['adminid'] . "' "));
 
 		if($result['domain'] != '')

admin_updates.php

@@ -37,7 +37,21 @@ if($page == 'overview')
 		if (!isset($settings['system']['dbversion'])
 		|| $settings['system']['dbversion'] == ''
 		) {
-			$settings['system']['dbversion'] = 2;
+			/**
+			 * for syscp-stable (1.4.2.1) this value has to be 0
+			 * so the required table-fields are added correctly
+			 * and the svn-version has its value in the database
+			 * -> bug #54
+			 */
+			
+			$result = $db->query_first("SELECT `value` FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `varname` = 'dbversion'");
+			
+			if(isset($result['value']))
+			{
+				$settings['system']['dbversion'] = (int)$result['value'];
+			} else {
+				$settings['system']['dbversion'] = 0;
+			}
 		}
 	}
 

customer_email.php

@@ -427,23 +427,24 @@ elseif($page == 'accounts')
 						$mail_subject = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success']['subject']), $replace_arr));
 						$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($userinfo['def_language']) . '\' AND `templategroup`=\'mails\' AND `varname`=\'pop_success_mailbody\'');
 						$mail_body = html_entity_decode(replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success']['mailbody']), $replace_arr));
-						$mail->From = $admin['email'];
-						$mail->FromName = getCorrectUserSalutation($admin);
+						
+						$_mailerror = false;
+						try {
+							$mail->SetFrom($admin['email'], getCorrectUserSalutation($admin));
 							$mail->Subject = $mail_subject;
-						$mail->Body = $mail_body;
+							$mail->AltBody = $mail_body;
+							$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
 							$mail->AddAddress($email_full, getCorrectUserSalutation($userinfo));
-
-						if(!$mail->Send())
-						{
-							if($mail->ErrorInfo != '')
-							{
-								$mailerr_msg = $mail->ErrorInfo;
-							}
-							else
-							{
-								$mailerr_msg = $email;
+							$mail->Send();
+						} catch(phpmailerException $e) {
+							$mailerr_msg = $e->errorMessage();
+							$_mailerror = true;
+						} catch (Exception $e) {
+							$mailerr_msg = $e->getMessage();
+							$_mailerror = true;
 						}
 
+						if ($_mailerror) {	
 							$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 							standard_error('errorsendingmail', $email);
 						}
@@ -457,23 +458,24 @@ elseif($page == 'accounts')
 							$mail_subject = replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success_alternative']['subject']), $replace_arr);
 							$result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_TEMPLATES . '` WHERE `adminid`=\'' . (int)$userinfo['adminid'] . '\' AND `language`=\'' . $db->escape($userinfo['def_language']) . '\' AND `templategroup`=\'mails\' AND `varname`=\'pop_success_alternative_mailbody\'');
 							$mail_body = replace_variables((($result['value'] != '') ? $result['value'] : $lng['mails']['pop_success_alternative']['mailbody']), $replace_arr);
-							$mail->From = $admin['email'];
-							$mail->FromName = getCorrectUserSalutation($admin);
+							
+							$_mailerror = false;
+							try {
+								$mail->SetFrom($admin['email'], getCorrectUserSalutation($admin));
 								$mail->Subject = $mail_subject;
-							$mail->Body = $mail_body;
+								$mail->AltBody = $mail_body;
+								$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
 								$mail->AddAddress($idna_convert->encode($alternative_email), getCorrectUserSalutation($userinfo));
-
-							if(!$mail->Send())
-							{
-								if($mail->ErrorInfo != '')
-								{
-									$mailerr_msg = $mail->ErrorInfo;
-								}
-								else
-								{
-									$mailerr_msg = $alternative_email;
+								$mail->Send();
+							} catch(phpmailerException $e) {
+								$mailerr_msg = $e->errorMessage();
+								$_mailerror = true;
+							} catch (Exception $e) {
+								$mailerr_msg = $e->getMessage();
+								$_mailerror = true;
 							}
 	
+							if ($_mailerror) {	
 								$log->logAction(USR_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 								standard_error(array('errorsendingmail', $alternative_email));
 							}

index.php

@@ -258,23 +258,23 @@ if($action == 'forgotpwd')
 				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
 				$rstlog->logAction(USR_ACTION, LOG_WARNING, "Password for user '" . $user['loginname'] . "' has been reset!");
 				$body = strtr($lng['pwdreminder']['body'], array('%s' => $user['firstname'] . ' ' . $user['name'], '%p' => $password));
-				$mail->From = $settings['panel']['adminmail'];
-				$mail->FromName = 'Froxlor';
+				
+				$_mailerror = false;
+				try {
 					$mail->Subject = $lng['pwdreminder']['subject'];
-				$mail->Body = $body;
+					$mail->AltBody = $body;
+					$mail->MsgHTML(str_replace("\\n", "<br />", $body));
 					$mail->AddAddress($user['email'], $user['firstname'] . ' ' . $user['name']);
-
-				if(!$mail->Send())
-				{
-					if($mail->ErrorInfo != '')
-					{
-						$mailerr_msg = $mail->ErrorInfo;
-					}
-					else
-					{
-						$mailerr_msg = $email;
+					$mail->Send();
+				} catch(phpmailerException $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
 				}
 
+				if ($_mailerror) {
 					$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
 					$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 					redirectTo('index.php', Array('showmessage' => '4'), true);

install/froxlor.sql

@@ -451,7 +451,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.2');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');

install/install.php

@@ -428,7 +428,6 @@ if(isset($_POST['installstep'])
 	if(!extension_loaded('bcmath'))
 	{
 		status_message('orange', $lng['install']['notinstalled'] . '<br />' . $lng['install']['bcmathdescription']);
-		$_die = false;
 	}
 	else
 	{
@@ -442,7 +441,6 @@ if(isset($_POST['installstep'])
 	   && $php_ob != '')
 	{
 		status_message('orange', $lng['install']['openbasedirenabled']);
-		$_die = false;
 	}
 	else
 	{

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -307,4 +307,11 @@ if(isFroxlorVersion('0.9.1'))
 	updateToVersion('0.9.2');
 }
 
+if(isFroxlorVersion('0.9.2'))
+{
+	showUpdateStep("Updating from 0.9.2 to 0.9.3");
+	lastStepStatus(0);
+	updateToVersion('0.9.3');
+}
+
 ?>

lib/classes/ticket/class.ticket.php

@@ -286,14 +286,25 @@ class ticket
 
 		if($customerid != - 1)
 		{
-			$mail->From = $this->settings['ticket']['noreply_email'];
-			$mail->FromName = $this->settings['ticket']['noreply_name'];
+			$_mailerror = false;
+			try {
+				$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
 				$mail->Subject = $mail_subject;
-			$mail->Body = $mail_body;
+				$mail->AltBody = $mail_body;
+				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
 				$mail->AddAddress($usr['email'], $usr['firstname'] . ' ' . $usr['name']);
+				$mail->Send();
+			} catch(phpmailerException $e) {
+				$mailerr_msg = $e->errorMessage();
+				$_mailerror = true;
+			} catch (Exception $e) {
+				$mailerr_msg = $e->getMessage();
+				$_mailerror = true;
+			}
 	
-			if(!$mail->Send())
-			{
+			if ($_mailerror) {
+				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
+				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 				standard_error(array('errorsendingmail', $usr['email']));
 			}
 
@@ -301,15 +312,27 @@ class ticket
 		}
 		else
 		{
-			$admin = $this->db->query_first("SELECT `name`, email` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`='" . (int)$this->userinfo['adminid'] . "'");
-			$mail->From = $this->settings['ticket']['noreply_email'];
-			$mail->FromName = $this->settings['ticket']['noreply_name'];
-			$mail->Subject = $mail_subject;
-			$mail->Body = $mail_body;
-			$mail->AddAddress($admin['email'], $admin['name']);
+			$admin = $this->db->query_first("SELECT `name`, `email` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `adminid`='" . (int)$this->userinfo['adminid'] . "'");
 			
-			if(!$mail->Send())
-			{
+			$_mailerror = false;
+			try {		
+				$mail->SetFrom($this->settings['ticket']['noreply_email'], $this->settings['ticket']['noreply_name']);
+				$mail->Subject = $mail_subject;
+				$mail->AltBody = $mail_body;
+				$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
+				$mail->AddAddress($admin['email'], $admin['name']);
+				$mail->Send();
+			} catch(phpmailerException $e) {
+				$mailerr_msg = $e->errorMessage();
+				$_mailerror = true;
+			} catch (Exception $e) {
+				$mailerr_msg = $e->getMessage();
+				$_mailerror = true;
+			}
+	
+			if ($_mailerror) {
+				$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'ticket_class'), $this->db, $this->settings);
+				$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 				standard_error(array('errorsendingmail', $admin['email']));
 			}
 
@@ -668,7 +691,7 @@ class ticket
 			{
 				if(strtolower($_var) == 'message')
 				{
-					return htmlspecialchars_decode(nl2br($this->t_data[$_var]));
+					return str_replace('script>', 'pre>', htmlspecialchars_decode(nl2br($this->t_data[$_var])));
 				}
 				else
 				{

lib/configfiles/etch.inc.php

@@ -29,6 +29,7 @@ return Array(
 						'commands' => Array(
 							'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'],
 							'a2dismod userdir',
@@ -52,6 +53,7 @@ return Array(
 							$configcommand['d_inclighty'],
 							'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'],
 						),
@@ -191,6 +193,9 @@ return Array(
 				'daemons' => Array(
 					'proftpd' => Array(
 						'label' => 'ProFTPd',
+						'commands' => Array(
+							'apt-get install proftpd-basic proftpd-mod-mysql'
+						),
 						'files' => Array(
 							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
 							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'

lib/configfiles/freebsd.inc.php

@@ -36,6 +36,7 @@ return Array(
 							'chmod 0600 ' . $settings['system']['apacheconf_diroptions'],
 							'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'],
 							'echo "accf_http_load=\"YES\"" >> /boot/loader.conf',
@@ -102,10 +103,10 @@ return Array(
 						),
 						'files' => Array(
 							'etc_periodic.conf' => '/etc/periodic.conf',
-							'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'
+							'usr_local_etc_postfix_main.cf' => '/usr/local/etc/postfix/main.cf',
+							'usr_local_etc_postfix_mysql-virtual_alias_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_alias_maps.cf',
+							'usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf',
+							'usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf' => '/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf'
 						),
 						'restart' => Array(
 							'sh /usr/local/etc/rc.d/postfix restart'

lib/configfiles/gentoo.inc.php

@@ -34,9 +34,10 @@ return Array(
 							'chown root:0 ' . $settings['system']['apacheconf_diroptions'],
 							'chmod 0600 ' . $settings['system']['apacheconf_diroptions'],
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
+							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : '',
 							'mkdir -p ' . $settings['system']['logfiles_directory'],
 							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
 						),
 						'restart' => Array(
 							'rc-update add apache2 default',
@@ -54,7 +55,8 @@ return Array(
 							$configcommand['v_inclighty'],
 							$configcommand['d_inclighty'],
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory']
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : ''
 						),
 						'restart' => Array(
 							'rc-update add lighttpd default',

lib/configfiles/hardy.inc.php

@@ -29,9 +29,10 @@ return Array(
 						'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',
+							'a2dismod userdir'
 						),
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
@@ -52,8 +53,9 @@ return Array(
 							$configcommand['d_inclighty'],
 							'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'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
 						),
 						'restart' => Array(
 							'/etc/init.d/lighttpd restart'
@@ -188,6 +190,9 @@ return Array(
 				'daemons' => Array(
 					'proftpd' => Array(
 						'label' => 'ProFTPd',
+						'commands' => Array(
+							'apt-get install proftpd-basic proftpd-mod-mysql'
+						),
 						'files' => Array(
 							'etc_proftpd_modules.conf' => '/etc/proftpd/modules.conf',
 							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'

lib/configfiles/lenny.inc.php

@@ -29,9 +29,10 @@ return Array(
 						'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',
+							'a2dismod userdir'
 						),
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'
@@ -52,8 +53,9 @@ return Array(
 							$configcommand['d_inclighty'],
 							'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'],
+							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir']
 						),
 						'restart' => Array(
 							'/etc/init.d/lighttpd restart'
@@ -191,6 +193,9 @@ return Array(
 				'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',

lib/configfiles/suse10.inc.php

@@ -31,7 +31,8 @@ return Array(
 							$configcommand['diroptions'],
 							$configcommand['include'],
 							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory']
+							'mkdir -p ' . $settings['system']['logfiles_directory'],
+							($settings['system']['deactivateddocroot'] != '') ? 'mkdir -p ' . $settings['system']['deactivateddocroot'] : ''
 						),
 						'restart' => Array(
 							'/etc/init.d/apache2 restart'

lib/functions/filedir/function.safe_exec.php

@@ -82,7 +82,7 @@ function safe_exec($exec_string, &$return_value = false)
 	$ok = false;
 	foreach($allowed_commands as $allowed_command)
 	{
-		if(strpos($exec_string, $allowed_command) == 0
+		if(strpos($exec_string, $allowed_command) === 0
 		   && (strlen($exec_string) === ($allowed_command_pos = strlen($allowed_command)) || substr($exec_string, $allowed_command_pos, 1) === ' '))
 		{
 			$ok = true;

lib/functions/formfields/hidden/function.validateFormFieldHidden.php

@@ -19,13 +19,20 @@
 
 function validateFormFieldHidden($fieldname, $fielddata, $newfieldvalue)
 {
-	if($newfieldvalue === $fielddata['value'])
-	{
+	/**
+	 * don't show error on cronjob-timestamps changing
+	 * because it might be possible that the cronjob ran
+	 * while settings have been edited (bug #52)
+	 */
+	if($newfieldvalue === $fielddata['value']
+		|| $fieldname == 'system_last_tasks_run'
+		|| $fieldname == 'system_last_traffic_run'
+		|| $fieldname == 'system_lastcronrun'
+	) {
 		return true;
 	}
 	else
 	{
-		// TODO: Throw some error that actually makes sense - false would just throw unknown error
-		return false;
+		return 'hiddenfieldvaluechanged';
 	}
 }

lib/init.php

@@ -416,6 +416,6 @@ if($page == '')
  */
 
 $mail = new PHPMailer();
-$mail->From = $settings['panel']['adminmail'];
+$mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator');
  
 ?>

lib/tables.inc.php

@@ -68,7 +68,8 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.2';
+$version = '0.9.3';
 $dbversion = '2';
+$branding = '';
 
 ?>

lng/english.lng.php

@@ -1192,7 +1192,7 @@ $lng['error']['admindoesntexist'] = 'The admin you have chosen doesn\'t exist.';
 // ADDED IN 1.2.19-svn37
 
 $lng['serversettings']['system_realtime_port']['title'] = 'Port for realtime Froxlor';
-$lng['serversettings']['system_realtime_port']['description'] = 'Froxlor connects to this port at localhost everytime a new cron task is scheduled. If value is 0 (zero), this feature is disabled.<br />See also: <a href="https://wiki.froxlor.org/contrib/realtime">Make Froxlor work in realtime (Froxlor Wiki)</a>';
+$lng['serversettings']['system_realtime_port']['description'] = 'Froxlor connects to this port at localhost everytime a new cron task is scheduled. If value is 0 (zero), this feature is disabled.<br />See also: <a href="http://wiki.froxlor.org/doc/realtime">Make Froxlor work in realtime (Froxlor Wiki)</a>';
 $lng['serversettings']['session_allow_multiple_login']['title'] = 'Allow multiple login';
 $lng['serversettings']['session_allow_multiple_login']['description'] = 'If activated a user could login multiple times.';
 $lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Allow moving domains between admins';
@@ -1300,4 +1300,9 @@ $lng['admin']['servicedata'] = 'Service Data';
 
 $lng['admin']['newerversionavailable'] = 'There is a newer version of Froxlor available';
 
+// ADDED IN FROXLOR 0.9.3
+
+$lng['emails']['noemaildomainaddedyet'] = 'You do not have a (email-)domain in your account yet.';
+$lng['error']['hiddenfieldvaluechanged'] = 'The value for the hidden field &quot;%s&quot; changed while editing the settings.<br /><br />This is usually not a big problem but the settings could not be saved because of this.';
+
 ?>

lng/german.lng.php

@@ -1196,7 +1196,7 @@ $lng['error']['admindoesntexist'] = 'Der ausgewählte Admin existiert nicht.
 // ADDED IN 1.2.19-svn37
 
 $lng['serversettings']['system_realtime_port']['title'] = 'Port für Realtime Froxlor';
-$lng['serversettings']['system_realtime_port']['description'] = 'Dieser Port auf localhost wird bei jedem neuen Cron-Task kontaktiert. Wenn der Wert 0 (Null) ist, dann ist dieses Feature deaktiviert.<br />Siehe dazu auch: <a href="https://wiki.froxlor.org/contrib/realtime">Make Froxlor work in realtime (Froxlor Wiki)</a>';
+$lng['serversettings']['system_realtime_port']['description'] = 'Dieser Port auf localhost wird bei jedem neuen Cron-Task kontaktiert. Wenn der Wert 0 (Null) ist, dann ist dieses Feature deaktiviert.<br />Siehe dazu auch: <a href="http://wiki.froxlor.org/doc/realtime">Make Froxlor work in realtime (Froxlor Wiki)</a>';
 $lng['serversettings']['session_allow_multiple_login']['title'] = 'Erlaube gleichzeitigen Login';
 $lng['serversettings']['session_allow_multiple_login']['description'] = 'Wenn diese Option aktiviert ist, k&ouml;nnen sich Nutzer mehrmals gleichzeitig anmelden.';
 $lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Erlaube Verschieben von Domains unter Admins';
@@ -1280,4 +1280,9 @@ $lng['admin']['servicedata'] = 'Dienstleistungsdaten';
 
 $lng['admin']['newerversionavailable'] = 'Eine neuere Version von Froxlor wurde ver&ouml;ffentlicht';
 
+// ADDED IN FROXLOR 0.9.3
+
+$lng['emails']['noemaildomainaddedyet'] = 'Sie haben bisher noch keine (E-Mail-)Domain in Ihrem Konto.';
+$lng['error']['hiddenfieldvaluechanged'] = 'Der Wert des verborgenen Feldes &quot;%s&quot; hat sich w&auml;hrend dem &Auml;ndern der Einstellungen ge&auml;ndert.<br /><br />Dies ist im Grunde kein schwerwiegendes Problem, allerdings konnten so die Einstellungen nicht gespeichert werden.';
+
 ?>

lng/phpmailer.lang-en.php

@@ -1,22 +0,0 @@
-<?php
-
-/**
- * PHPMailer language file.
- * English Version
- */
-
-$PHPMAILER_LANG = array();
-$PHPMAILER_LANG["provide_address"] = 'You must provide at least one ' . 'recipient email address.';
-$PHPMAILER_LANG["mailer_not_supported"] = ' mailer is not supported.';
-$PHPMAILER_LANG["execute"] = 'Could not execute: ';
-$PHPMAILER_LANG["instantiate"] = 'Could not instantiate mail function.';
-$PHPMAILER_LANG["authenticate"] = 'SMTP Error: Could not authenticate.';
-$PHPMAILER_LANG["from_failed"] = 'The following From address failed: ';
-$PHPMAILER_LANG["recipients_failed"] = 'SMTP Error: The following ' . 'recipients failed: ';
-$PHPMAILER_LANG["data_not_accepted"] = 'SMTP Error: Data not accepted.';
-$PHPMAILER_LANG["connect_host"] = 'SMTP Error: Could not connect to SMTP host.';
-$PHPMAILER_LANG["file_access"] = 'Could not access file: ';
-$PHPMAILER_LANG["file_open"] = 'File Error: Could not open file: ';
-$PHPMAILER_LANG["encoding"] = 'Unknown encoding: ';
-
-?>

lng/portugues.lng.php

@@ -1084,7 +1084,7 @@ $lng['aps']['noinstancesexisting'] = 'Não existem estâncias para ad
 $lng['error']['customerdoesntexist'] = 'O cliente que você escolheu não existe';
 $lng['error']['admindoesntexist'] = 'O administrador que você escolheu não existe';
 $lng['serversettings']['system_realtime_port']['title'] = 'Porta para Froxlor em tempo real';
-$lng['serversettings']['system_realtime_port']['description'] = 'Froxlor connects to this port at localhost everytime a new cron task is scheduled. If value is 0 (zero), this feature ist deactivated.<br />See also: <a href="https://wiki.froxlor.org/contrib/realtime">Make Froxlor work in realtime (Froxlor Wiki)</a>';
+$lng['serversettings']['system_realtime_port']['description'] = 'Froxlor connects to this port at localhost everytime a new cron task is scheduled. If value is 0 (zero), this feature is disabled.<br />See also: <a href="http://wiki.froxlor.org/contrib/realtime">Make Froxlor work in realtime (Froxlor Wiki)</a>';
 $lng['serversettings']['session_allow_multiple_login']['title'] = 'AAtiva login m&uacute;ltiplo';
 $lng['serversettings']['session_allow_multiple_login']['description'] = 'Se ativado um usu&aacute;rio pode ter m&uacute;ltiplos logins';
 $lng['serversettings']['panel_allow_domain_change_admin']['title'] = 'Ativa mover dom&iacute;nios entre admins';

scripts/jobs/cron_autoresponder.php

@@ -209,28 +209,25 @@ if($db->num_rows($result) > 0)
 					continue;
 				}
 
-				//send mail with mailer class
-				$mail->From = $to;
-				$mail->FromName = $to;
+				$_mailerror = false;
+				try {
+					$mail->SetFrom($to, $to);
+					$mail->AddReplyTo($to, $to);
 					$mail->Subject = $row['subject'];
-				$mail->Body = html_entity_decode($message);
+					$mail->AltBody = $message;
+					$mail->MsgHTML(html_entity_decode($message));
 					$mail->AddAddress($from, $from);
 					$mail->AddCustomHeader('Precedence: bulk');
-
-				// set correct return path
-				$mail->Sender = $to;
-
-				if(!$mail->Send())
-				{
-					if($mail->ErrorInfo != '')
-					{
-						$mailerr_msg = $mail->ErrorInfo;
-					}
-					else
-					{
-						$mailerr_msg = $from;
+					$mail->Send();
+				} catch(phpmailerException $e) {
+					$mailerr_msg = $e->errorMessage();
+					$_mailerror = true;
+				} catch (Exception $e) {
+					$mailerr_msg = $e->getMessage();
+					$_mailerror = true;
 				}
 		
+				if ($_mailerror) {
 					$cronlog->logAction(CRON_ACTION, LOG_WARNING, "Error sending autoresponder mail: " . $mailerr_msg);
 				}
 

scripts/jobs/cron_tasks.inc.http.10.apache.php

@@ -387,10 +387,14 @@ class apache
 		{
 			// The normal access/error - logging is enabled
 			$error_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-error.log');
+			// Create the logfile if it does not exist (fixes #46)
+			touch($error_log);
 			chown($error_log, $this->settings['system']['httpuser']);
 			chgrp($error_log, $this->settings['system']['httpgroup']);
 			
 			$access_log = makeCorrectFile($this->settings['system']['logfiles_directory'] . $domain['loginname'] . $speciallogfile . '-access.log');
+			// Create the logfile if it does not exist (fixes #46)
+			touch($access_log);
 			chown($access_log, $this->settings['system']['httpuser']);
 			chgrp($access_log, $this->settings['system']['httpgroup']);
 					

scripts/jobs/cron_tasks.php

@@ -55,9 +55,22 @@ while($row = $db->fetch_array($result_tasks))
 		{
 			$awstatsclean['header'] = "## GENERATED BY FROXLOR\n";
 			$awstatsclean['path'] = '/etc/awstats';
+
+			/**
+			 * dont do anyting if the directory not exists
+			 * (e.g. awstats not installed yet or whatever)
+			 * fixes #45
+			 */
+			if (is_dir($awstatsclean['dir'])) 
+			{
 				$awstatsclean['dir'] = dir($awstatsclean['path']);
 				while($awstatsclean['entry'] = $awstatsclean['dir']->read()) {
 					$awstatsclean['fullentry'] = $awstatsclean['path'].'/'.$awstatsclean['entry'];
+					/**
+					 * dont do anything if the file does not exist
+					 */
+					if (file_exists($awstatsclean['fullentry']))
+					{
 						$awstatsclean['fh'] = fopen($awstatsclean['fullentry'], 'r');
 						$awstatsclean['headerRead'] = fgets($awstatsclean['fh'], strlen($awstatsclean['header'])+1);
 						fclose($awstatsclean['fh']);
@@ -65,6 +78,12 @@ while($row = $db->fetch_array($result_tasks))
 							@unlink($awstatsclean['fullentry']);
 						}
 					}
+					else
+					{
+						$cronlog->logAction(CRON_ACTION, LOG_WARNING, "File '".$awstatsclean['fullentry']."' could not be found, please check if you followed all the instructions on the configuration page");
+					}
+				}
+			}
 			unset($awstatsclean);
 		}
 		//end dhr

scripts/jobs/cron_traffic_report.php

@@ -26,7 +26,7 @@ $yesterday = time() - (60 * 60 * 24);
 
 require (dirname(__FILE__) . '/../lib/class.phpmailer.php');
 $mail = new PHPMailer();
-$mail->From = $settings['panel']['adminmail'];
+$mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator');
 
 // Warn the customers at 90% traffic-usage
 
@@ -82,15 +82,26 @@ while($row = $db->fetch_array($result))
                                 AND `templategroup`='mails'
                                 AND `varname`='trafficninetypercent_mailbody'");
 		$mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficninetypercent']['mailbody']), $replace_arr));
-		$mail->From = $row['adminmail'];
-		$mail->FromName = $row['adminname'];
-		$mail->Subject = $mail_subject;
-		$mail->Body = $mail_body;
-		$mail->AddAddress($row['email'], $row['firstname'] . ' ' . $row['name']);
 		
-		if(!$mail->Send())
+		$_mailerror = false;
+		try {
+			$mail->SetFrom($row['adminmail'], $row['adminname']);
+			$mail->Subject = $mail_subject;
+			$mail->AltBody = $mail_body;
+			$mail->MsgHTML($mail_body);
+			$mail->AddAddress($row['email'], $row['firstname'] . ' ' . $row['name']);
+			$mail->Send();
+		} catch(phpmailerException $e) {
+			$mailerr_msg = $e->errorMessage();
+			$_mailerror = true;
+		} catch (Exception $e) {
+			$mailerr_msg = $e->getMessage();
+			$_mailerror = true;
+		}
+
+		if($_mailerror)
 		{
-			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mail->ErrorInfo);
+			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $_mailerror);
 			standard_error('errorsendingmail', $row["email"]);
 		}
 
@@ -150,15 +161,25 @@ while($row = $db->fetch_array($result))
                                 AND `templategroup`='mails'
                                 AND `varname`='trafficninetypercent_mailbody'");
 		$mail_body = html_entity_decode(replace_variables((($result2['value'] != '') ? $result2['value'] : $lng['mails']['trafficninetypercent']['mailbody']), $replace_arr));
-		$mail->From = $row['email'];
-		$mail->FromName = $row['firstname'] . " " . $row['name'];
-		$mail->Subject = $mail_subject;
-		$mail->Body = $mail_body;
-		$mail->AddAddress($row['email'], $row['name']);
 		
-		if(!$mail->Send())
-		{
-			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mail->ErrorInfo);
+		$_mailerror = false;
+		try {
+			$mail->SetFrom($row['email'], $row['firstname'] . " " . $row['name']);
+			$mail->Subject = $mail_subject;
+			$mail->AltBody = $mail_body;
+			$mail->MsgHTML($mail_body);
+			$mail->AddAddress($row['email'], $row['name']);
+			$mail->Send();
+		} catch(phpmailerException $e) {
+			$mailerr_msg = $e->errorMessage();
+			$_mailerror = true;
+		} catch (Exception $e) {
+			$mailerr_msg = $e->getMessage();
+			$_mailerror = true;
+		}
+
+		if ($_mailerror) {
+			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 			standard_error('errorsendingmail', $row["email"]);
 		}
 
@@ -189,15 +210,25 @@ while($row = $db->fetch_array($result))
 
 		$mail_body.= '---------------------------------------------' . "\n";
 		$mail_body.= sprintf('%-15s', $row['loginname']) . ' ' . sprintf('%-12d', $row['traffic_used_total']) . ' (' . sprintf('%00.3f%%', (($row['traffic_used_total'] * 100) / $row['traffic'])) . ')   ' . $row['traffic'] . "\n";
-		$mail->From = $row['email'];
-		$mail->FromName = $row['name'];
-		$mail->Subject = $mail_subject;
-		$mail->Body = $mail_body;
-		$mail->AddAddress($row['email'], $row['name']);
 		
-		if(!$mail->Send())
-		{
-			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mail->ErrorInfo);
+		$_mailerror = false;
+		try {
+			$mail->SetFrom($row['email'], $row['name']);
+			$mail->Subject = $mail_subject;
+			$mail->AltBody = $mail_body;
+			$mail->MsgHTML($mail_body);
+			$mail->AddAddress($row['email'], $row['name']);
+			$mail->Send();
+		} catch(phpmailerException $e) {
+			$mailerr_msg = $e->errorMessage();
+			$_mailerror = true;
+		} catch (Exception $e) {
+			$mailerr_msg = $e->getMessage();
+			$_mailerror = true;
+		}
+
+		if ($_mailerror) {
+			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
 			standard_error('errorsendingmail', $row["email"]);
 		}
 

templates/admin/index/index.tpl

@@ -119,7 +119,7 @@ $header
 		{$cron_last_runs}
 		<tr>
 			<td class="field_name_border_left">{$lng['admin']['installedversion']}:</td>
-			<td class="field_display">{$version}</td>
+			<td class="field_display">{$version}{$branding}</td>
 		</tr>
 		<tr>
 			<td class="field_name_border_left">{$lng['admin']['latestversion']}:</td>

templates/admin/ticket/archivesearch.tpl

@@ -21,7 +21,7 @@ $header
       		</if>
       		<if $tickets_count < 1 >
         		<tr>
-				<td class="field_display_border_left" colspan="5">{$lng['ticket']['noresults']}</td>
+				<td class="field_display_border_left" colspan="6">{$lng['ticket']['noresults']}</td>
 				</tr>
 			</if>
 		</table>

templates/customer/email/emails_add.tpl

@@ -7,6 +7,7 @@ $header
 			<tr>
 				<td class="maintitle" colspan="2"><b><img src="images/title.gif" alt="" />&nbsp;{$lng['emails']['emails_add']}</b></td>
 			</tr>
+			<if $domains != '' >
 				<tr>
 					<td class="main_field_name">{$lng['emails']['emailaddress']}:</td>
 					<td class="main_field_display" nowrap="nowrap"><input type="text" name="email_part" value="" size="15" /> @ <select class="dropdown_noborder" name="domain">$domains</select></td>
@@ -18,6 +19,11 @@ $header
 				<tr>
 					<td class="main_field_confirm" colspan="2"><input type="hidden" name="send" value="send" /><input type="submit" class="bottom" value="{$lng['emails']['emails_add']}" /></td>
 				</tr>
+			<else
+				<tr>
+					<td class="main_field_name" colspan="2">{$lng['emails']['noemaildomainaddedyet']}</td>
+				</tr>
+			</if>
 		</table>
 	</form>
 	<br />

templates/footer.tpl

@@ -6,7 +6,7 @@
 				<td width="100%" class="footer">
 					<br />Froxlor
 					<if ($settings['admin']['show_version_login'] == '1' && $filename == 'index.php') || ($filename != 'index.php' && $settings['admin']['show_version_footer'] == '1')>
-						 {$version}
+						 {$version}{$branding}
 					</if>
 					&copy; 2009-2010 by <a href="http://www.froxlor.org/" target="_blank">the Froxlor Team</a>
 					<br />Theme based on work by: Luca Piona and Luca Longinotti

templates/misc/configfiles/debian_etch/lighttpd/etc_lighttpd.conf

@@ -33,7 +33,7 @@ url.access-deny = ("~", ".inc")
 fastcgi.server = (
 ".php" => (
 		"localhost" => (
-			"socket" => "/var/kunden/tmp/lighttpd-fcgi-sock-lighttpd",
+			"socket" => "<CUSTOMER_TMP>lighttpd-fcgi-sock-lighttpd",
 			"broken-scriptfilename" => "enable",
 			"bin-path" => "/usr/bin/php5-cgi",
 			"min-procs" => 1,

templates/misc/configfiles/debian_lenny/lighttpd/etc_lighttpd.conf

@@ -33,7 +33,7 @@ url.access-deny = ("~", ".inc")
 fastcgi.server = (
 ".php" => (
 		"localhost" => (
-			"socket" => "/var/kunden/tmp/lighttpd-fcgi-sock-lighttpd",
+			"socket" => "<CUSTOMER_TMP>lighttpd-fcgi-sock-lighttpd",
 			"broken-scriptfilename" => "enable",
 			"bin-path" => "/usr/bin/php5-cgi",
 			"min-procs" => 1,

templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot-sql.conf

@@ -0,0 +1,5 @@
+driver = mysql
+connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=<SQL_UNPRIVILEGED_PASSWORD>
+default_pass_scheme = CRYPT
+password_query = SELECT username AS user, password_enc AS password FROM mail_users WHERE username = '%u'
+user_query = SELECT CONCAT(homedir,maildir) AS home, concat('maildir:',homedir,maildir) AS mail, uid, gid FROM mail_users where username = '%u'

templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot.conf

@@ -0,0 +1,109 @@
+## Dovecot configuration file
+#
+syslog_facility = local1
+#log_timestamp = .%Y-%m-%d %H:%M:%S 
+#login_log_format_elements = user=<%u>method=%m rip=%r lip=%l %c
+#login_log_format = %$: %s
+#log_path = /var/log/dovecot.log
+#info_log_path = /var/log/dovecot-info.log
+#mail_debug = yes
+#auth_debug_passwords= yes
+#auth_verbose= yes
+#
+#ssl=yes
+#ssl_ca_file = /etc/ssl/<SERVERNAME>.crt
+#ssl_cert_file = /etc/ssl/<SERVERNAME>.crt
+#ssl_key_file = /etc/ssl/<SERVERNAME>.key 
+#ssl_key_password = 
+#
+# imap imaps pop3 pop3s (use imaps and pop3s if configured for SSL)
+
+protocols = imap pop3 <SSLPROTOCOLS>
+
+#
+# Uncomment the ssl_listen statements and comment out listen if using SSL
+#
+protocol imap {
+    listen = *:143
+#    ssl_listen = *:993
+}
+
+protocol pop3 {
+    listen = *:110
+#    ssl_listen = *:995
+}
+#
+shutdown_clients = yes
+
+login_chroot = yes
+disable_plaintext_auth = no
+login_process_per_connection = yes
+login_processes_count = 2
+login_max_processes_count = 128
+login_max_connections = 256
+login_greeting = Welcome to <SERVERNAME> Mail Server.
+verbose_proctitle = no
+maildir_copy_with_hardlinks = yes
+
+protocol imap {
+    login_executable = /usr/local/libexec/dovecot/imap-login
+    mail_executable = /usr/local/libexec/dovecot/imap
+    imap_max_line_length = 65536
+    imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
+}
+
+protocol pop3 {
+    login_executable = /usr/local/libexec/dovecot/pop3-login
+    mail_executable = /usr/local/libexec/dovecot/pop3
+    pop3_uidl_format = %08Xu%08Xv
+    pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+}
+
+protocol lda {
+    postmaster_address = postmaster@<SERVERNAME>
+    sendmail_path = /usr/sbin/sendmail
+#    mail_plugins = sieve
+#    log_path = /var/log/dovecot-deliver.log
+#    info_log_path = /var/log/dovecot-deliver.log
+}
+
+protocol managesieve {
+    # Specify an alternative address:port the daemon must listen on
+    # (default: *:2000)
+#    listen = localhost:2000
+#    managesieve_logout_format = bytes ( in=%i : out=%o )    
+}
+
+
+plugin { 
+#    quota = maildir
+# Used by both the Sieve plugin and the ManageSieve protocol
+#    sieve=~/.dovecot.sieve
+#    sieve_dir=~/sieve
+}
+
+auth default {
+    mechanisms = plain login
+    passdb sql {
+	args = /usr/local/etc/dovecot-sql.conf
+    }
+    userdb sql {
+	args = /usr/local/etc/dovecot-sql.conf
+    }
+    user = root
+    count = 1
+    socket listen {
+	master {
+	    path = /var/run/dovecot/auth-master
+	    mode = 0660
+	    user = vmail
+	    group = vmail
+	}
+	client {
+	    path = /var/spool/postfix/private/auth
+	    mode = 0660
+	    user = postfix
+	    group = postfix
+    	}
+    }
+}

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_main.cf

@@ -0,0 +1,100 @@
+smtpd_sender_restrictions = 
+     permit_sasl_authenticated, 
+     permit_mynetworks,
+     reject_unknown_hostname, 
+     reject_unknown_recipient_domain, 
+     reject_unknown_sender_domain,
+
+smtpd_recipient_restrictions = 
+    permit_mynetworks,
+    permit_sasl_authenticated,
+    reject_sender_login_mismatch,
+    reject_non_fqdn_hostname,
+    reject_non_fqdn_sender,
+    reject_non_fqdn_recipient,
+    reject_unauth_destination,
+    reject_unauth_pipelining,
+    reject_invalid_hostname,
+    reject_rbl_client sbl-xbl.spamhaus.org,
+#   sqlgrey enable
+#   check_policy_service inet:127.0.0.1:2501,
+
+smtpd_client_restrictions = 
+    permit_mynetworks,
+    permit_sasl_authenticated,
+    reject_unknown_client,
+
+smtpd_sasl_auth_enable = yes
+smtpd_sasl_authenticated_header = yes
+smtpd_sasl_local_domain = $myhostname
+smtpd_sasl_security_options = noanonymous
+broken_sasl_auth_clients = yes
+smtpd_sasl_type = dovecot
+smtpd_sasl_path = private/auth    
+
+soft_bounce = yes
+
+# Maximum size of Message in bytes (50MB)
+message_size_limit = 52428800
+
+smtp_use_tls = yes
+smtpd_use_tls = yes
+smtpd_tls_security_level = may
+smtpd_tls_auth_only = no
+smtp_tls_note_starttls_offer = yes
+smtpd_tls_key_file = /etc/ssl/<SERVERNAME>.key.unencrypted
+smtpd_tls_cert_file = /etc/ssl/<SERVERNAME>.crt
+smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
+smtpd_tls_loglevel = 0
+smtpd_tls_received_header = yes
+smtpd_tls_session_cache_timeout = 3600s
+tls_random_source = dev:/dev/urandom
+
+virtual_alias_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_alias_maps.cf
+virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
+virtual_mailbox_domains = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_mailbox_domains.cf
+virtual_mailbox_limit = 0
+virtual_mailbox_maps = proxy:mysql:/usr/local/etc/postfix/mysql-virtual_mailbox_maps.cf
+virtual_uid_maps        = static:<VIRTUAL_UID_MAPS>
+virtual_gid_maps        = static:<VIRTUAL_GID_MAPS>
+virtual_create_maildirsize = yes
+virtual_mailbox_extended = yes
+proxy_read_maps = $local_recipient_maps $mydestination $virtual_alias_maps
+    $virtual_alias_domains $virtual_mailbox_maps $virtual_mailbox_domains
+    $relay_recipient_maps $relay_domains $canonical_maps $sender_canonical_maps
+    $recipient_canonical_maps $relocated_maps $transport_maps $mynetworks
+virtual_mailbox_limit_override = yes
+virtual_maildir_limit_message = Sorry, this user has overdrawn their diskspace quota. Please try again later.
+virtual_overquota_bounce = yes
+virtual_transport = virtual
+## Dovecot Settings for deliver, SASL Auth and virtual transport
+# uncomment those line to use Dovecot
+#mailbox_command = /usr/local/libexec/dovecot/deliver
+#virtual_transport = dovecot
+#dovecot_destination_recipient_limit = 1
+#alias_maps = $alias_database
+
+queue_directory = /var/spool/postfix
+command_directory = /usr/local/sbin
+daemon_directory = /usr/local/libexec/postfix
+data_directory = /var/db/postfix
+mail_owner = postfix
+myhostname = <SERVERNAME>
+mydomain = <SERVERNAME>
+myorigin = $mydomain
+inet_interfaces = all
+unknown_local_recipient_reject_code = 550
+mynetworks_style = host
+debug_peer_level = 2
+debugger_command =
+    PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+    ddd $daemon_directory/$process_name $process_id & sleep 5
+sendmail_path = /usr/local/sbin/sendmail
+newaliases_path = /usr/local/bin/newaliases
+mailq_path = /usr/local/bin/mailq
+setgid_group = maildrop
+html_directory = /usr/local/share/doc/postfix
+manpage_directory = /usr/local/man
+sample_directory = /usr/local/etc/postfix
+readme_directory = /usr/local/share/doc/postfix
+

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_alias_maps.cf

@@ -0,0 +1,8 @@
+user = <SQL_UNPRIVILEGED_USER>
+password = <SQL_UNPRIVILEGED_PASSWORD>
+dbname = <SQL_DB>
+table = mail_virtual
+select_field = destination
+where_field = email
+additional_conditions = and TRIM(destination) <> ''
+hosts = <SQL_HOST> 

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_domains.cf

@@ -0,0 +1,8 @@
+user = <SQL_UNPRIVILEGED_USER>
+password = <SQL_UNPRIVILEGED_PASSWORD>
+dbname = <SQL_DB>
+table = panel_domains
+select_field = domain
+where_field = domain
+additional_conditions = and isemaildomain = '1'
+hosts = <SQL_HOST> 

templates/misc/configfiles/freebsd/postfix/usr_local_etc_postfix_mysql-virtual_mailbox_maps.cf

@@ -0,0 +1,7 @@
+user = <SQL_UNPRIVILEGED_USER>
+password = <SQL_UNPRIVILEGED_PASSWORD>
+dbname = <SQL_DB>
+table = mail_users
+select_field = maildir
+where_field = email
+hosts = <SQL_HOST> 

templates/misc/configfiles/gentoo/lighttpd/etc_lighttpd.conf

@@ -35,7 +35,7 @@ include "mime-types.conf"
 fastcgi.server = (
 ".php" => (
 		"localhost" => (
-			"socket" => "/tmp/lighttpd-fcgi-sock-lighttpd",
+			"socket" => "<CUSTOMER_TMP>lighttpd-fcgi-sock-lighttpd",
 			"broken-scriptfilename" => "enable",
 			"bin-path" => "/usr/bin/php-cgi",
 			"min-procs" => 1,

templates/misc/configfiles/ubuntu_hardy/lighttpd/etc_lighttpd.conf

@@ -33,7 +33,7 @@ url.access-deny = ("~", ".inc")
 fastcgi.server = (
 ".php" => (
 		"localhost" => (
-			"socket" => "/var/kunden/tmp/lighttpd-fcgi-sock-lighttpd",
+			"socket" => "<CUSTOMER_TMP>lighttpd-fcgi-sock-lighttpd",
 			"broken-scriptfilename" => "enable",
 			"bin-path" => "/usr/bin/php5-cgi",
 			"min-procs" => 1,