Tagging release 0.9.1

actions/admin/settings/110.accounts.php

@@ -95,14 +95,6 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => array(
-							'fieldname' => 'panel_allow_preset_admin',
-							'fielddata' => array(
-								'settinggroup' => 'panel',
-								'varname' => 'allow_preset_admin',
-							),
-							'onlyif' => 0
-						)
 					),
 				'panel_allow_preset_admin' => array(
 					'label' => $lng['serversettings']['allow_password_reset_admin'],
@@ -111,14 +103,6 @@ return array(
 					'type' => 'bool',
 					'default' => false,
 					'save_method' => 'storeSettingField',
-					'dependency' => array(
-							'fieldname' => 'panel_allow_preset',
-							'fielddata' => array(
-								'settinggroup' => 'panel',
-								'varname' => 'allow_preset',
-							),
-							'onlyif' => 1
-						)
 					),
 				),
 			),

actions/admin/settings/120.system.php

@@ -71,7 +71,7 @@ return array(
 					'label' => $lng['serversettings']['system_realtime_port'],
 					'settinggroup' => 'system',
 					'varname' => 'realtime_port',
-					'type' => (function_exists('socket_create') ? 'int' : 'hidden'),
+					'type' => 'int',
 					'int_max' => 65535,
 					'default' => 0,
 					'save_method' => 'storeSettingField',

admin_customers.php

@@ -781,18 +781,11 @@ if($page == 'customers'
 					$mysqls = - 1;
 				}
 
-				if($settings['aps']['aps_active'] == '1')
+				$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
-				{				
-					$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
 
-					if(isset($_POST['number_of_aps_packages_ul']))
+				if(isset($_POST['number_of_aps_packages_ul']))
-					{
-						$number_of_aps_packages = - 1;
-					}
-				}
-				else
 				{
-					$number_of_aps_packages = 0;
+					$number_of_aps_packages = - 1;
 				}
 
 				$createstdsubdomain = intval($_POST['createstdsubdomain']);

admin_domains.php

@@ -624,9 +624,7 @@ 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`) 
+		$result = $db->query_first("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`adminid`, `d`.`email_only`, `d`.`documentroot`, `d`.`ssl`, `d`.`ssl_redirect`, `d`.`ssl_ipandport`,`d`.`ipandport`, `d`.`aliasdomain`, `d`.`isbinddomain`, `d`.`isemaildomain`, `d`.`subcanemaildomain`, `d`.`dkim`, `d`.`caneditdomain`, `d`.`zonefile`, `d`.`wwwserveralias`, `d`.`openbasedir`, `d`.`safemode`, `d`.`speciallogfile`, `d`.`specialsettings`, `d`.`add_date`, `d`.`registration_date`, `c`.`loginname`, `c`.`name`, `c`.`firstname`, `c`.`company`, `d`.`phpsettingid`, `d`.`mod_fcgid_starter`, `d`.`mod_fcgid_maxrequests` " . "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'] . "' "));
-									WHERE `d`.`parentdomainid`='0' AND `d`.`id`='" . (int)$id . "'" 
-									. ($userinfo['customers_see_all'] ? '' : " AND `d`.`adminid` = '" . (int)$userinfo['adminid'] . "' "));
 
 		if($result['domain'] != '')
 		{

admin_index.php

@@ -84,38 +84,26 @@ if($page == 'overview')
 	$webserverinterface = strtoupper(@php_sapi_name());
 
 	if((isset($_GET['lookfornewversion']) && $_GET['lookfornewversion'] == 'yes')
-	|| (isset($lookfornewversion) && $lookfornewversion == 'yes'))
+	   || (isset($lookfornewversion) && $lookfornewversion == 'yes'))
 	{
 		$update_check_uri = 'http://version.froxlor.org/Froxlor/legacy/' . $version;
-
+		
-		if(ini_get('allow_url_fopen'))
+		if(strtolower(ini_get('allow_url_fopen')) == 'on')
 		{
 			$latestversion = @file($update_check_uri);
-
+	
-			if (isset($latestversion[0]))
+			$latestversion = explode(':', $latestversion);
+	
+			if(is_array($latestversion)
+			   && count($latestversion) >= 2)
 			{
-				$latestversion = explode('|', $latestversion[0]);
+				$lookfornewversion_lable = $latestversion[0];
-
+				$lookfornewversion_link = $latestversion[1];
-				if(is_array($latestversion)
+				$lookfornewversion_addinfo = '';
-				&& count($latestversion) >= 1)
+	
+				if(count($latestversion) >= 3)
 				{
-					$_version = $latestversion[0];
+					$lookfornewversion_addinfo = $latestversion[2];
-					$_message = $latestversion[1];
-					$_link = isset($latestversion[2]) ? $latestversion[2] : htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
-
-					$lookfornewversion_lable = $_version;
-					$lookfornewversion_link = $_link;
-					$lookfornewversion_addinfo = $_message;
-					
-					if (version_compare($version, $_version) == -1) {
-						$isnewerversion = 1;
-					} else {
-						$isnewerversion = 0;
-					}
-				}
-				else
-				{
-					redirectTo($update_check_uri.'/pretty', NULL);
 				}
 			}
 			else
@@ -133,7 +121,6 @@ if($page == 'overview')
 		$lookfornewversion_lable = $lng['admin']['lookfornewversion']['clickhere'];
 		$lookfornewversion_link = htmlspecialchars($filename . '?s=' . urlencode($s) . '&page=' . urlencode($page) . '&lookfornewversion=yes');
 		$lookfornewversion_addinfo = '';
-		$isnewerversion = 0;
 	}
 
 	$userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']);
@@ -190,8 +177,8 @@ if($page == 'overview')
 	$uptime_array = explode(" ", @file_get_contents("/proc/uptime"));
 
 	if(is_array($uptime_array)
-	&& isset($uptime_array[0])
+	   && isset($uptime_array[0])
-	&& is_numeric($uptime_array[0]))
+	   && is_numeric($uptime_array[0]))
 	{
 		// Some calculatioon to get a nicly formatted display
 
@@ -220,7 +207,7 @@ if($page == 'overview')
 elseif($page == 'change_password')
 {
 	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
+	   && $_POST['send'] == 'send')
 	{
 		$old_password = validate($_POST['old_password'], 'old password');
 
@@ -264,7 +251,7 @@ elseif($page == 'change_password')
 elseif($page == 'change_language')
 {
 	if(isset($_POST['send'])
-	&& $_POST['send'] == 'send')
+	   && $_POST['send'] == 'send')
 	{
 		$def_language = validate($_POST['def_language'], 'default language');
 

admin_updates.php

@@ -21,39 +21,20 @@ require ("./lib/init.php");
 if($page == 'overview')
 {
 	$log->logAction(ADM_ACTION, LOG_NOTICE, "viewed admin_updates");
-
+	
-	/**
-	 * this is a dirty hack but syscp 1.4.2.1 does not
-	 * has any version/dbversion in the database (don't know why)
-	 * so we have to set them both to run a correct upgrade
-	 */
-	if (!isFroxlor()) {
-		if (!isset($settings['panel']['version'])
-		|| $settings['panel']['version'] == ''
-		) {
-			$settings['panel']['version'] = '1.4.2.1';
-			$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','version','".$settings['panel']['version']."')");
-		}
-		if (!isset($settings['system']['dbversion'])
-		|| $settings['system']['dbversion'] == ''
-		) {
-			$settings['system']['dbversion'] = 2;
-		}
-	}
-
 	if(hasUpdates($version))
 	{
 		if(isset($_POST['send'])
 		&& $_POST['send'] == 'send')
 		{
-
+	
 			eval("echo \"" . getTemplate("update/update_start") . "\";");
-
+			
 			include_once('./install/updatesql.php');
-
+			
 			$redirect_url = 'admin_index.php';
 			eval("echo \"" . getTemplate("update/update_end") . "\";");
-
+	
 			updateCounters();
 			inserttask('1');
 			@chmod('./lib/userdata.inc.php', 0440);
@@ -62,19 +43,19 @@ if($page == 'overview')
 		{
 			$current_version = $settings['panel']['version'];
 			$new_version = $version;
-
+			
 			$ui_text = $lng['update']['update_information'];
 			$ui_text = str_replace('%curversion', $current_version, $ui_text);
 			$ui_text = str_replace('%newversion', $new_version, $ui_text);
 			$update_information = $ui_text;
-
+			
 			eval("echo \"" . getTemplate("update/index") . "\";");
 		}
 	}
 	else
 	{
 		/*
-		 * @TODO version-webcheck check here
+		 * @TODO version-webcheck check here 
 		 */
 
 		$success_message = $lng['update']['noupdatesavail'];
@@ -82,5 +63,5 @@ if($page == 'overview')
 		eval("echo \"" . getTemplate("update/noupdatesavail") . "\";");
 	}
 }
-
+	
 ?>

customer_domains.php

@@ -439,9 +439,9 @@ elseif($page == 'domains')
 					   || $ssl_redirect != $result['ssl_redirect'])
 					{
 						$log->logAction(USR_ACTION, LOG_INFO, "edited domain '" . $idna_convert->decode($result['domain']) . "'");
-						$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `documentroot`='" . $db->escape($path) . "', `isemaildomain`='" . (int)$isemaildomain . "', `iswildcarddomain`='" . (int)$iswildcarddomain . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ",`openbasedir_path`='" . $db->escape($openbasedir_path) . "', `ssl_redirect`='" . $ssl_redirect . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 						inserttask('1');
 						inserttask('4');
+						$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `documentroot`='" . $db->escape($path) . "', `isemaildomain`='" . (int)$isemaildomain . "', `iswildcarddomain`='" . (int)$iswildcarddomain . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ",`openbasedir_path`='" . $db->escape($openbasedir_path) . "', `ssl_redirect`='" . $ssl_redirect . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
 					}
 
 					redirectTo($filename, Array('page' => $page, 's' => $s));

customer_traffic.php

@@ -174,13 +174,17 @@ if(!is_null($month)
 }
 else
 {
-	$result = $db->query("SELECT MAX(`http`), MAX(`ftp_up`+`ftp_down`), MAX(`mail`)
+	$result = $db->query("(SELECT SUM(`http`) as sum FROM `" . TABLE_PANEL_TRAFFIC . "`
-	                     FROM `" . TABLE_PANEL_TRAFFIC . "`
+	                      WHERE `customerid` = '" . $userinfo['customerid'] . "'
-	                     WHERE `customerid`='" . $userinfo['customerid'] . "'
+	                      GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12)   UNION
-	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");
+	                      (SELECT SUM(`ftp_up`+`ftp_down`) FROM `" . TABLE_PANEL_TRAFFIC . "`
-	$row = mysql_fetch_row($result);
+	                      WHERE `customerid` = '" . $userinfo['customerid'] . "'
-	rsort($row);
+	                      GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12) UNION
-	$traf['max'] = ($row[0] > $row[1] ? ($row[0] > $row[2] ? $row[0] : $row[2]) : ($row[1] > $row[2] ? $row[1] : $row[2]));
+	                      (SELECT SUM(`mail`) FROM `" . TABLE_PANEL_TRAFFIC . "`
+	                      WHERE `customerid` = '" . $userinfo['customerid'] . "'
+	                      GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12) ORDER BY sum DESC LIMIT 1");
+	$row = $db->fetch_array($result);
+	$traf['max'] = ($row[0] > $row[1] ? ($row[0] > $row[2] ? $row[0] : $row[2]) : ($row[1] > $row[2] ? $row[1] : $row[2]));;
 	$result = $db->query("SELECT `month`, `year`, SUM(`http`) AS http, SUM(`ftp_up`) AS ftp_up, SUM(`ftp_down`) AS ftp_down, SUM(`mail`) AS mail
 	                     FROM `" . TABLE_PANEL_TRAFFIC . "` WHERE `customerid` = '" . $userinfo['customerid'] . "'
 	                     GROUP BY CONCAT(`year`,`month`) ORDER BY CONCAT(`year`,`month`) DESC LIMIT 12");

index.php

@@ -226,7 +226,7 @@ if($action == 'forgotpwd')
 
 		if($db->num_rows() == 0)
 		{
-			$sql = "SELECT `adminid`, `name`, `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "`
+			$sql = "SELECT `adminid`, `firstname`, `name`, `email`, `loginname` FROM `" . TABLE_PANEL_ADMINS . "`
 				WHERE `loginname`='" . $db->escape($loginname) . "'
 				AND `email`='" . $db->escape($email) . "'";
 			$result = $db->query($sql);
@@ -292,7 +292,7 @@ if($action == 'forgotpwd')
 				$message = $lng['login']['usernotfound'];
 			}
 
-			unset($user);
+			unset($user, $adminchecked);
 		}
 		else
 		{
@@ -304,20 +304,9 @@ if($action == 'forgotpwd')
 		$message = '';
 	}
 
-	if($adminchecked)
+	if($settings['panel']['allow_preset'] != '1')
 	{
-		if($settings['panel']['allow_preset_admin'] != '1')
+		$message = $lng['pwdreminder']['notallowed'];
-		{
-			$message = $lng['pwdreminder']['notallowed'];
-			unset ($adminchecked);
-		}
-	}
-	else
-	{
-		if($settings['panel']['allow_preset'] != '1')
-		{
-			$message = $lng['pwdreminder']['notallowed'];
-		}
 	}
 
 	eval("echo \"" . getTemplate("fpwd") . "\";");

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.1');
 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/updates/froxlor/0.9/update_0.9.inc.php

@@ -20,13 +20,13 @@ if(isFroxlorVersion('0.9-r0'))
 	showUpdateStep("Updating from 0.9-r0 to 0.9-r1", false);
 	showUpdateStep("Performing database updates");
 	/*
-	 * add missing database-updates if necessary (old: update/update_database.php)
+	 * add missing database-updates if necessary (old: update/update_database.php
 	 */
-	if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 1)
+	if(!isset($settings['system']['dbversion']) || $settings['system']['dbversion'] < '1')
 	{
 		$db->query("ALTER TABLE `panel_databases` ADD `dbserver` INT( 11 ) UNSIGNED NOT NULL default '0';");
 	}
-	if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 2)
+	if(!isset($settings['system']['dbversion']) || $settings['system']['dbversion'] < '2')
 	{
 		$db->query("ALTER TABLE `panel_ipsandports` CHANGE `ssl_cert` `ssl_cert_file` VARCHAR( 255 ) NOT NULL,
 						ADD `ssl_key_file` VARCHAR( 255 ) NOT NULL, 
@@ -287,24 +287,4 @@ if(isFroxlorVersion('0.9'))
 	updateToVersion('0.9.1');
 }
 
-if(isFroxlorVersion('0.9.1'))
-{
-	showUpdateStep("Updating from 0.9.1 to 0.9.2", false);
-	
-	showUpdateStep("Checking whether last-system-guid is sane");
-	
-	$result = $db->query_first("SELECT MAX(`guid`) as `latestguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
-	
-	if (isset($result['latestguid']) 
-		&& (int)$result['latestguid'] > 0 
-		&& $result['latestguid'] != $settings['system']['lastguid']
-	) {
-		checkLastGuid();
-		lastStepStatus(1, 'fixed');
-	} else {
-		lastStepStatus(0);
-	}
-	updateToVersion('0.9.2');
-}
-
 ?>

lib/classes/aps/class.ApsInstaller.php

@@ -45,7 +45,7 @@ class ApsInstaller extends ApsParser
 	{
 		$this->db = $db;
 		$this->db_root = $db_root;
-		$this->RootDir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
+		$this->RootDir = dirname(dirname(__FILE__)) . '/';
 		$this->Hosts = $settings['system']['mysql_access_host'];
 	}
 
@@ -135,20 +135,10 @@ class ApsInstaller extends ApsParser
 		{
 			//setup right path and run installation script
 
-			if(!is_dir($this->RealPath . $this->DomainPath . '/install_scripts/'))
-			{
-				echo 'Directory: '. $this->RealPath . $this->DomainPath . '/install_scripts/ does not exist';
-				return;
-			}
-
 			chdir($this->RealPath . $this->DomainPath . '/install_scripts/');
 			$Return = array();
 			$ReturnStatus = 0;
-
+			$Return = safe_exec('php ' . escapeshellarg($this->RealPath . $this->DomainPath . '/install_scripts/configure install'), $ReturnStatus);
-			// make configure-script executable
-			chmod($this->RealPath . $this->DomainPath . '/install_scripts/configure', 0755);
-
-			$Return = safe_exec('php ' . escapeshellarg($this->RealPath . $this->DomainPath . '/install_scripts/configure') . ' install', $ReturnStatus);
 
 			if($ReturnStatus != 0)
 			{

lib/classes/aps/class.ApsParser.php

@@ -37,7 +37,6 @@ class ApsParser
 	private $userinfo = array();
 	private $settings = array();
 	private $db = false;
-	private $RootDir = '';
 
 	/**
 	 * Constructor of class, setup basic variables needed by the class
@@ -52,7 +51,6 @@ class ApsParser
 		$this->settings = $settings;
 		$this->userinfo = $userinfo;
 		$this->db = $db;
-		$this->RootDir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
 	}
 
 	/**
@@ -795,8 +793,7 @@ class ApsParser
 						}
 						else
 						{
-							$moveproblem = str_replace('{$path}', $this->RootDir, $lng['aps']['moveproblem']);
+							$Errors[] = $lng['aps']['moveproblem'];
-							$Errors[] = $moveproblem;
 						}
 					}
 
@@ -843,7 +840,7 @@ class ApsParser
 		{
 			//split all keywords
 
-			$Elements = preg_split('/[ ,;]/', trim($_GET['keyword']));
+			$Elements = split('[ ,;]', trim($_GET['keyword']));
 
 			if(count($Elements) == 1
 			   && strlen($Elements[0]) == 0)
@@ -1691,11 +1688,10 @@ class ApsParser
 			$Error.= '<li>' . $lng['aps']['class_zip_missing'] . '</li>';
 		}
 
-		if(!is_writable($this->RootDir.'temp/')
+		if(!is_writable('./temp/')
-		   || !is_writable($this->RootDir.'packages/'))
+		   || !is_writable('./packages/'))
 		{
-			$dirpermission = str_replace('{$path}', $this->RootDir, $lng['aps']['dir_permissions']);
+			$Error.= '<li>' . $lng['aps']['dir_permissions'] . '</li>';
-			$Error.= '<li>' . $dirpermission . '</li>';
 		}
 
 		if($Error != '')

lib/classes/aps/class.ApsUpdater.php

@@ -31,27 +31,19 @@ class ApsUpdater extends ApsParser
 	private $RequestDomain = '';
 	private $RootUrl = '';
 	private $RootDir = '';
-	
-	/**
-	 * FroxlorLogger
-	 * @var FroxlorLogger
-	 */
-	private $_cronlog = null;
 
 	/**
 	 * constructor of class. setup some basic variables needed by class
 	 *
-	 * @param	db			instance of the database class
+	 * @param	db			instance of the database class from syscp
-	 * @param	cronlog		instance of the froxlor logger
 	 */
 
-	public function __construct($db, $cronlog)
+	public function __construct($db)
 	{
 		$this->db = $db;
 		$this->RequestDomain = 'apscatalog.com';
 		$this->RootUrl = '/1/';
-		$this->RootDir = dirname(dirname(dirname(dirname(__FILE__)))) . '/';
+		$this->RootDir = dirname(dirname(__FILE__)) . '/';
-		$this->_cronlog = $cronlog;
 	}
 
 	/**
@@ -60,15 +52,13 @@ class ApsUpdater extends ApsParser
 
 	public function UpdateHandler()
 	{
-		$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Changing directory to '" . $this->RootDir . "'");
 		chdir($this->RootDir);
 
 		//return if allow_url_fopen is disabled
 
-		if(!ini_get('allow_url_fopen'))
+		if(ini_get('allow_url_fopen') == '0')
 		{
-			$this->_cronlog->logAction(CRON_ACTION, LOG_ERROR, "The APS updater cronjob requires that allow_url_fopen is enabled for the PHP CLI binary!");
+			echo ("The APS updater cronjob requires that allow_url_fopen is enabled for the PHP CLI binary!\n");
-			echo "The APS updater cronjob requires that allow_url_fopen is enabled for the PHP CLI binary!\n";
 			return;
 		}
 
@@ -78,7 +68,6 @@ class ApsUpdater extends ApsParser
 
 		if($this->db->num_rows($Result) == 0)
 		{
-			$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "No tasks for ApsUpdater");
 			return;
 		}
 
@@ -88,99 +77,89 @@ class ApsUpdater extends ApsParser
 		$this->db->query('DELETE FROM `' . TABLE_APS_TASKS . '` WHERE `Task` = ' . $Task['Task']);
 
 		//fetch all vendors
-		$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Fetching all Vendors from '" . $this->RootUrl . "'");
+
 		$Vendors = self::FetchSubUrls($this->RootUrl);
-		if($Vendors !== false)
+		foreach($Vendors as $Vendor)
 		{
-			foreach($Vendors as $Vendor)
+			//fetch all applications from vendors
+
+			$Applications = self::FetchSubUrls($this->RootUrl . $Vendor);
+			foreach($Applications as $Application)
 			{
-				//fetch all applications from vendors
+				//get newest version of package which is already installed
-				$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Fetching all from Vendor '" . $Vendor. "'");
+
-				$Applications = self::FetchSubUrls($this->RootUrl . $Vendor);
+				$CurrentVersion = '';
-				if($Applications !== false)
+				$Result = $this->db->query('SELECT * FROM `' . TABLE_APS_PACKAGES . '` WHERE `Name` = "' . $this->db->escape(substr($Application, 0, -1)) . '"');
+
+				while($Row = $this->db->fetch_array($Result))
 				{
-					foreach($Applications as $Application)
+					if(version_compare($Row['Version'] . '-' . $Row['Release'], $CurrentVersion) == 1)
 					{
-						//get newest version of package which is already installed
+						$CurrentVersion = $Row['Version'] . '-' . $Row['Release'];
-						$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Checking application '" . substr($Application, 0, -1) . "'");
+					}
+				}
 
-						$CurrentVersion = '';
+				if($this->db->num_rows($Result) != 0)
-						$Result = $this->db->query('SELECT * FROM `' . TABLE_APS_PACKAGES . '` WHERE `Name` = "' . $this->db->escape(substr($Application, 0, -1)) . '"');
+				{
+					//package already installed in system, search for newer version
 
-						while($Row = $this->db->fetch_array($Result))
+					if($Task['Task'] != TASK_SYSTEM_UPDATE)continue;
+
+					//fetch different versions of application from distribution server
+
+					$NewerVersion = '';
+					$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
+					foreach($Versions as $Version)
+					{
+						$OnlineVersion = substr($Version, 0, -1);
+
+						//is package newer than current version?
+
+						if(version_compare($OnlineVersion, $CurrentVersion) == 1)
 						{
-							if(version_compare($Row['Version'] . '-' . $Row['Release'], $CurrentVersion) == 1)
+							//is new package newer than another one found before?
+
+							if(version_compare($OnlineVersion, $NewerVersion) == 1)
 							{
-								$CurrentVersion = $Row['Version'] . '-' . $Row['Release'];
+								$NewerVersion = $OnlineVersion;
 							}
 						}
+					}
 
-						if($this->db->num_rows($Result) != 0)
+					if($NewerVersion != '')
+					{
+						//download package as an update
+
+						self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewerVersion, substr($Application, 0, -1), $NewerVersion);
+						continue;
+					}
+				}
+				else
+				{
+					if($Task['Task'] != TASK_SYSTEM_DOWNLOAD)continue;
+
+					//new packages
+
+					$NewVersion = '';
+					$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
+					foreach($Versions as $Version)
+					{
+						$OnlineVersion = substr($Version, 0, -1);
+
+						//is package newer than another one found before?
+
+						if(version_compare($OnlineVersion, $NewVersion) == 1)
 						{
-							//package already installed in system, search for newer version
+							$NewVersion = $OnlineVersion;
-
-							if($Task['Task'] != TASK_SYSTEM_UPDATE)continue;
-
-							//fetch different versions of application from distribution server
-
-							$NewerVersion = '';
-							$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
-							if($Versions !== false)
-							{
-								foreach($Versions as $Version)
-								{
-									$OnlineVersion = substr($Version, 0, -1);
-
-									//is package newer than current version?
-
-									if(version_compare($OnlineVersion, $CurrentVersion) == 1)
-									{
-										//is new package newer than another one found before?
-
-										if(version_compare($OnlineVersion, $NewerVersion) == 1)
-										{
-											$NewerVersion = $OnlineVersion;
-										}
-									}
-								}
-
-								if($NewerVersion != '')
-								{
-									//download package as an update
-
-									self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewerVersion, substr($Application, 0, -1), $NewerVersion);
-									continue;
-								}
-							}
 						}
-						else
+					}
-						{
-							if($Task['Task'] != TASK_SYSTEM_DOWNLOAD)continue;
 
-							//new packages
+					if($NewVersion != '')
+					{
+						//download package as a new one
 
-							$NewVersion = '';
+						self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewVersion, substr($Application, 0, -1), $NewVersion);
-							$Versions = self::FetchSubUrls($this->RootUrl . $Vendor . $Application);
+						continue;
-							foreach($Versions as $Version)
-							{
-								$OnlineVersion = substr($Version, 0, -1);
-
-								//is package newer than another one found before?
-
-								if(version_compare($OnlineVersion, $NewVersion) == 1)
-								{
-									$NewVersion = $OnlineVersion;
-								}
-							}
-
-							if($NewVersion != '')
-							{
-								//download package as a new one
-
-								self::DownloadPackage($this->RootUrl . $Vendor . $Application . $NewVersion, substr($Application, 0, -1), $NewVersion);
-								continue;
-							}
-						}
 					}
 				}
 			}
@@ -202,13 +181,11 @@ class ApsUpdater extends ApsParser
 
 		//make url valid
 
-		$path = dirname($Url);
+		$Url = str_replace(' ', '%20', $Url);
-		$file = urlencode(basename($Url));
-		$file_url = 'http://' . $this->RequestDomain . $path . '/' . $file . '.aps' . $Downloads[0];
 
 		//get content from website url
-		$this->_cronlog->logAction(CRON_ACTION, LOG_NOTICE, "Downloading '" . $file_url . "'");
+
-		$Content = @file_get_contents($file_url);
+		$Content = @file_get_contents('http://' . $this->RequestDomain . $Url . '.aps' . $Downloads[0]);
 
 		if($Content != false)
 		{
@@ -254,22 +231,21 @@ class ApsUpdater extends ApsParser
 		//make url valid
 
 		$Url = str_replace(' ', '%20', $Url);
-		$file_url = 'http://' . $this->RequestDomain . $Url;
 
 		//get content from website url
 
-		$Content = @file($file_url);
+		$Content = @file('http://' . $this->RequestDomain . $Url);
 
-		if($Content !== false)
+		if($Content != false)
 		{
 			foreach($Content as $Temp)
 			{
 				//skip empty lines
 
 				if($Temp != "\r\n"
-				&& $Temp != "\r"
+				   && $Temp != "\r"
-				&& $Temp != "\n"
+				   && $Temp != "\n"
-				&& $Temp != "")
+				   && $Temp != "")
 				{
 					//remove unwanted characters
 

lib/classes/ticket/class.ticket.php

@@ -637,7 +637,7 @@ class ticket
 	{
 		if($_cid != 0)
 		{	
-			$result = $_db->query('SELECT `id` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `customerid` ="'.(int)$_cid.'"');
+			$result = $_db->query('SELECT `id` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `customer` ="'.(int)$_cid.'"');
 
 			$tickets = array();
 			while($row = $_db->fetch_array($result))

lib/configfiles/etch.inc.php

@@ -68,8 +68,8 @@ return Array(
 						'label' => 'Bind9',
 						'commands' => Array(
 							'apt-get install bind9',
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
 						),
 						'restart' => Array(
 							'/etc/init.d/bind9 restart'
@@ -254,7 +254,6 @@ return Array(
 							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
 						),
 						'commands' => Array(
-							'apt-get install awstats',
 							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
 						),
 						'restart' => Array(

lib/configfiles/freebsd.inc.php

@@ -1,168 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Configfiles
- * @version    $Id$
- */
-
-return Array(
-	'freebsd' => Array(
-		'label' => 'FreeBSD',
-		'services' => Array(
-			'http' => Array(
-				'label' => $lng['admin']['configfiles']['http'],
-				'daemons' => Array(
-					'apache2' => Array(
-						'label' => 'Apache2 Webserver',
-						'commands' => Array(
-							'cd /usr/ports/www/apache22',
-							'make config',
-							'make install',
-							'touch ' . $settings['system']['apacheconf_vhost'],
-							'chown root:0 ' . $settings['system']['apacheconf_vhost'],
-							'chmod 0600 ' . $settings['system']['apacheconf_vhost'],
-							'touch ' . $settings['system']['apacheconf_diroptions'],
-							'chown root:0 ' . $settings['system']['apacheconf_diroptions'],
-							'chmod 0600 ' . $settings['system']['apacheconf_diroptions'],
-							'mkdir -p ' . $settings['system']['documentroot_prefix'],
-							'mkdir -p ' . $settings['system']['logfiles_directory'],
-							'mkdir -p ' . $settings['system']['mod_fcgid_tmpdir'],
-							'chmod 1777 ' . $settings['system']['mod_fcgid_tmpdir'],
-							'echo "accf_http_load=\"YES\"" >> /boot/loader.conf',
-							'echo "accf_data_load=\"YES\"" >> /boot/loader.conf',
-							'echo "apache22_enable=\"YES\"" >> /etc/rc.conf',
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/apache22 restart'
-						)
-					)
-				)
-			),
-			'dns' => Array(
-				'label' => $lng['admin']['configfiles']['dns'],
-				'daemons' => Array(
-					'powerdns' => Array(
-						'label' => 'PowerDNS',
-						'commands_1' => Array(
-							'cd /usr/ports/dns/powerdns',
-							'make config',
-							'make install',
-							'echo "add pdns_enable=\"YES\"" >> /etc/rc.conf',
-						),
-						'files' => Array(
-							'usr_local_etc_pdns_pdns.conf' => '/usr/local/etc/pdns/pdns.conf'
-						),
-						'commands' => Array(
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chown root:0 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
-							'chmod 0600 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/pdns restart'
-						)
-					),
-				)
-			),
-			'smtp' => Array(
-				'label' => $lng['admin']['configfiles']['smtp'],
-				'daemons' => Array(
-					'postfix' => Array(
-						'label' => 'Postfix',
-						'commands_1' => Array(
-							'cd /usr/ports/mail/postfix',
-							'make config',
-							'set Dovecot SASL authentication method',
-							'set Enable SSL and TLS support',
-							'set MySQL maps (choose version with WITH_MYSQL_VER)',
-							'make install'
-						),
-						'commands_2' => Array(
-							'pw groupadd vmail -g 5001 ',
-							'pw useradd vmail -u 5001 -g 5001 -s/sbin/nologin -d/dev/null',			
-							'mkdir -p ' . $settings['system']['vmail_homedir'],
-							'chown -R vmail:vmail ' . $settings['system']['vmail_homedir'],
-							'chmod 0750 ' . $settings['system']['vmail_homedir']
-						),
-						'commands_3' => Array(
-							'echo "sendmail_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "sendmail_submit_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "sendmail_outbound_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "sendmail_msp_queue_enable=\"NO\"" >> /etc/rc.conf',
-							'echo "postfix_enable=\"YES\"" >> /etc/rc.conf'
-						),
-						'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'
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/postfix restart'
-						)
-					)
-				)
-			),
-			'mail' => Array(
-				'label' => $lng['admin']['configfiles']['mail'],
-				'daemons' => Array(
-					'dovecot' => Array(
-						'label' => 'Dovecot',
-						'commands_1' => Array(
-							'cd /usr/ports/mail/dovecot',
-							'make config',
-							'set kqueue(2) support ',
-							'set SSL support ',
-							'set ManageSieve support (optional)',
-							'set MySQL support ',
-							'make install',
-							'echo "add dovecot_enable=\"YES\"" >> /etc/rc.conf'
-						),
-						'files' => Array(
-							'usr_local_etc_dovecot.conf' => '/usr/local/etc/dovecot.conf',
-							'usr_local_etc_dovecot-sql.conf' => '/usr/local/etc/dovecot-sql.conf'
-						),
-						'commands_2' => Array(
-							'echo "dovecot unix - n n - - pipe
-    flags=DRhu user=vmail:vmail argv=/usr/local/libexec/dovecot/deliver -f ${sender} -d ${recipient}" >> /usr/local/etc/postfix/master.cf'
-						),
-						'restart' => Array(
-							'sh /usr/local/etc/rc.d/dovecot restart'
-						)
-					)
-				)
-			),
-			'ftp' => Array(
-				'label' => $lng['admin']['configfiles']['ftp'],
-				'daemons' => Array(
-					'proftpd' => Array(
-						'label' => 'ProFTPd',
-						'files' => Array(
-							'etc_proftpd_proftpd.conf' => '/etc/proftpd/proftpd.conf'
-						),
-						'commands' => Array(
-							'touch /etc/proftpd/proftpd.conf',
-							'chown root:0 /etc/proftpd/proftpd.conf',
-							'chmod 0600 /etc/proftpd/proftpd.conf'
-						),
-						'restart' => Array(
-							'/etc/init.d/proftpd restart'
-						)
-					)
-				)
-			)
-		)
-	)
-);
-
-?>

lib/configfiles/gentoo.inc.php

@@ -72,10 +72,10 @@ return Array(
 							'etc_bind_default.zone' => '/etc/bind/default.zone'
 						),
 						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf',
-							'chown root:0 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf',
+							'chown root:0 ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf',
-							'chmod 0600 ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
+							'chmod 0600 ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
 						),
 						'restart' => Array(
 							'rc-update add named default',

lib/configfiles/hardy.inc.php

@@ -67,8 +67,8 @@ return Array(
 					'bind' => Array(
 						'label' => 'Bind9',
 						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
 						),
 						'restart' => Array(
 							'/etc/init.d/bind9 restart'
@@ -248,7 +248,6 @@ return Array(
 							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
 						),
 						'commands' => Array(
-							'apt-get install awstats',
 							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
 						),
 						'restart' => Array(

lib/configfiles/lenny.inc.php

@@ -68,8 +68,8 @@ return Array(
 						'label' => 'Bind9',
 						'commands' => Array(
 							'apt-get install bind9',
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/bind/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
 						),
 						'restart' => Array(
 							'/etc/init.d/bind9 restart'
@@ -255,7 +255,6 @@ return Array(
 							($settings['system']['webserver'] == 'lighttpd' ? 'etc_lighttpd_froxlor-awstats.conf' : 'etc_apache_vhosts_05_awstats.conf') => ($settings['system']['webserver'] == 'lighttpd' ? '/etc/lighttpd/froxlor-awstats.conf' : '/etc/apache2/sites-enabled/05_awstats.conf')
 						),
 						'commands' => Array(
-							'apt-get install awstats',
 							($settings['system']['webserver'] == 'lighttpd' ? 'echo "include \"froxlor-awstats.conf\"" >> /etc/lighttpd/lighttpd.conf' : '')
 						),
 						'restart' => Array(

lib/configfiles/suse10.inc.php

@@ -45,8 +45,8 @@ return Array(
 					'bind' => Array(
 						'label' => 'Bind9',
 						'commands' => Array(
-							'echo "include \"' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf\";" >> /etc/named.conf',
+							'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/named.conf',
-							'touch ' . $settings['system']['bindconf_directory'] . 'froxlor_bind.conf'
+							'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
 						),
 						'restart' => Array(
 							'/etc/init.d/named restart'

lib/functions/filedir/function.makePathfield.php

@@ -48,7 +48,7 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '')
 
 		if(sizeof($dirList) > 0)
 		{
-			if(sizeof($dirList) <= 100)
+			if(sizeof(dirList) <= 100)
 			{
 				$field = '<select name="path">';
 				foreach($dirList as $key => $dir)

lib/functions/froxlor/function.CronjobFunctions.php

@@ -60,17 +60,16 @@ function getNextCronjobs()
 
 function includeCronjobs($debugHandler, $pathtophpfiles)
 {
-	global $settings;
-
 	$cronjobs = getNextCronjobs();
 	
 	$jobs_to_run = array();
-	$cron_path = makeCorrectDir($pathtophpfiles.'/scripts/jobs/');
 	
 	if($cronjobs !== false
 	&& is_array($cronjobs)
 	&& isset($cronjobs[0]))
 	{
+		$cron_path = makeCorrectDir($pathtophpfiles.'/scripts/jobs/');
+		
 		foreach($cronjobs as $cronjob)
 		{
 			$cron_file = makeCorrectFile($cron_path.$cronjob);
@@ -78,17 +77,6 @@ function includeCronjobs($debugHandler, $pathtophpfiles)
 		}
 	}
 	
-	/**
-	 * if we're on realtime and cron_tasks is not one
-	 * of the jobs to run, we add it so the changes are being applied
-	 */
-	if ($settings['system']['realtime_port'] !== 0) {
-		$cron_file = makeCorrectFile($cron_path.'/cron_tasks.php');
-		if (!in_array($cron_file, $jobs_to_run)) {
-			$jobs_to_run[] = $cron_file;
-		}
-	}
-	
 	return $jobs_to_run;
 }
 

lib/functions/froxlor/function.inserttask.php

@@ -64,23 +64,21 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '')
 	}
 
 	if($doupdate === true
-	   && (int)$settings['system']['realtime_port'] !== 0
+	   && (int)$settings['system']['realtime_port'] !== 0)
-	   && function_exists('socket_create'))
 	{
 		$timeout = 15;
-		//$socket = @socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+		$socket = @socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-		$socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
 
 		if($socket !== false)
 		{
 			// create the request packet
 			$packet = chr(0) . chr(1) . 'RUN' . chr(0);
 			// UDP is connectionless, so we just send on it.
-			//@socket_sendto($socket, $packet, strlen($packet), 0x100, '127.0.0.1', (int)$settings['system']['realtime_port']);			
+			@socket_sendto($socket, $packet, strlen($packet), 0x100, '127.0.0.1', (int)$settings['system']['realtime_port']);			
 
 			/*
 			 * this is for TCP-Connections
-			 */
+			 * 
 			$time = time();
 
 			while(!@socket_connect($socket, '127.0.0.1', (int)$settings['system']['realtime_port']))
@@ -99,9 +97,7 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '')
 					continue;
 				}
 			}
-			/**
+			*/
-			 * close socket
-			 */
 			@socket_close($socket);
 		}
 	}

lib/functions/froxlor/function.openRootDB.php

@@ -30,33 +30,26 @@ function openRootDB($debugHandler, $lockfile)
 {
 	global $db_root;
 
-	require dirname(dirname(dirname(__FILE__))).'/userdata.inc.php';
+	// If one cronscript needs root, it should say $needrootdb = true before the include
-	
+	if(isset($needrootdb)
-	// Legacy sql-root-information
+	&& $needrootdb === true)
-	if(isset($sql['root_user']) && isset($sql['root_password']) && (!isset($sql_root) || !is_array($sql_root)))
 	{
-		$sql_root = array(0 => array('caption' => 'Default', 'host' => $sql['host'], 'user' => $sql['root_user'], 'password' => $sql['root_password']));
+		$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-		unset($sql['root_user']);
+
-		unset($sql['root_password']);
+		if($db_root->link_id == 0)
+		{
+			/**
+			 * Do not proceed further if no database connection could be established
+			 */
+
+			fclose($debugHandler);
+			unlink($lockfile);
+			die('root can\'t connect to mysqlserver. Please check userdata.inc.php! Exiting...');
+		}
+
+		unset($db_root->password);
+		fwrite($debugHandler, 'Database-rootconnection established' . "\n");
 	}
-
-	$db_root = new db($sql_root[0]['host'], $sql_root[0]['user'], $sql_root[0]['password'], '');
-
-	if($db_root->link_id == 0)
-	{
-		/**
-		 * Do not proceed further if no database connection could be established
-		 */
-
-		fclose($debugHandler);
-		unlink($lockfile);
-		die('root can\'t connect to mysqlserver. Please check userdata.inc.php! Exiting...');
-	}
-
-	unset($db_root->password);
-	fwrite($debugHandler, 'Database-rootconnection established' . "\n");
-	
-	unset($sql);
 }
 
 function closeRootDB()

lib/functions/froxlor/function.updateFunctions.php

@@ -134,26 +134,26 @@ function showUpdateStep($task = null, $needs_status = true)
  * outputs [OK] (success), [??] (warning) or [!!] (failure)
  * of the last update-step
  * 
- * @param	int			status	(0 = success, 1 = warning, 2 = failure)
+ * @param	int			status	(0 = success, 1 = warning, -1 = failure)
  * 
  * @return	string		formatted output and log-entry
  */
-function lastStepStatus($status = -1, $message = '')
+function lastStepStatus($status = -1)
 {
 	global $updatelog;
 	
 	switch($status)
 	{
 		case 0:
-			$status_sign = ($message != '') ? '['.$message.']' : '[OK]';
+			$status_sign = '[OK]';
 			$status_color = '1dcd00';
 			break;
 		case 1:
-			$status_sign = ($message != '') ? '['.$message.']' : '[??]';
+			$status_sign = '[??]';
 			$status_color = 'db7100';			
 			break;
 		case 2:
-			$status_sign = ($message != '') ? '['.$message.']' : '[!!]';
+			$status_sign = '[!!]';
 			$status_color = 'ff0000';			
 			break;
 		default:

lib/functions/settings/function.storeSettingField.php

@@ -30,17 +30,6 @@ function storeSettingField($fieldname, $fielddata, $newfieldvalue)
 			{
 				toggleCronStatus($fielddata['cronmodule'], $newfieldvalue);
 			}
-			
-			/*
-			 * satisfy dependencies
-			 */
-			if(isset($fielddata['dependency']) && is_array($fielddata['dependency']))
-			{
-				if((int)$fielddata['dependency']['onlyif'] == (int)$newfieldvalue)
-				{
-					storeSettingField($fielddata['dependency']['fieldname'], $fielddata['dependency']['fielddata'], $newfieldvalue);
-				}
-			}
 
 			return array($fielddata['settinggroup'] . '.' . $fielddata['varname'] => $newfieldvalue);
 		}

lib/functions/system/function.checklastguid.php

@@ -29,24 +29,13 @@
  *
  * @return	null
  */
-function checkLastGuid()
+function checkLastGuid($froxlor_guid = 0)
 {
-	global $log, $cronlog, $db, $settings;
+	global $cronlog;
-	
-	$mylog = null;
-	if (isset($cronlog) && $cronlog instanceof FroxlorLogger) {
-		$mylog = $cronlog;
-	} else {
-		$mylog = $log;
-	}
 
 	$group_lines = array();
 	$group_guids = array();
 	$update_to_guid = 0;
-	
-	$froxlor_guid = 0;
-	$result = $db->query_first("SELECT MAX(`guid`) as `fguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
-	$froxlor_guid = $result['fguid'];
 
 	$g_file = '/etc/group';
 
@@ -65,44 +54,28 @@ function checkLastGuid()
 
 				foreach($group_guids as $idx => $group)
 				{
-					/**
+					$guid = $group[2];
-					 * nogroup | nobody have very high guids
-					 * ignore them
-					 */
-					if($group[0] == 'nogroup'
-						|| $group[0] == 'nobody'
-					) {
-						continue;
-					}
 
-					$guid = isset($group[2]) ? (int)$group[2] : 0;
+					if($guid > $froxlor_guid)
-
-					if($guid > $update_to_guid)
 					{
 						$update_to_guid = $guid;
 					}
 				}
 
-				if($update_to_guid < $froxlor_guid)
+				if($update_to_guid > $froxlor_guid)
 				{
-					$update_to_guid = $froxlor_guid;
+					$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Updating froxlor last guid to '.$update_to_guid);
-					
+					saveSetting('system', 'lastguid', $update_to_guid);
-					if ($update_to_guid != $settings['system']['lastguid'])
-					{
-						$mylog->logAction(CRON_ACTION, LOG_NOTICE, 'Updating froxlor last guid to '.$update_to_guid);
-						saveSetting('system', 'lastguid', $update_to_guid);
-						$settings['system']['lastguid'] = $update_to_guid;
-					}
 				}
 			}
 			else
 			{
-				$mylog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
+				$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
 			}
 		}
 		else
 		{
-			$mylog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
+			$cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'File /etc/group not readable; cannot check for latest guid');
 		}
 	}
 	else

lib/init.php

@@ -155,10 +155,8 @@ $settings = loadSettings(&$settings_data, &$db);
 /*
  * when upgrading from syscp, the header-graphic gets lost
  */
-if(!isset($settings['admin']['froxlor_graphic'])
+if(!isset($settings['admin']['froxlor_graphic'])) {
-	|| $settings['admin']['froxlor_graphic'] == ''
+	$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
-) {
-	$settings['admin']['froxlor_graphic'] = ($settings['admin']['syscp_graphic'] != '') ? $settings['admin']['syscp_graphic'] : 'images/header.gif';
 }
 
 /**

lib/tables.inc.php

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

lng/english.lng.php

@@ -243,7 +243,7 @@ $lng['error']['domainname'] = $lng['domains']['domainname'];
 $lng['question']['question'] = 'Security question';
 $lng['question']['admin_customer_reallydelete'] = 'Do you really want to delete the customer %s? This cannot be undone!';
 $lng['question']['admin_domain_reallydelete'] = 'Do you really want to delete the domain %s?';
-$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Do you really want to disable these Security settings (OpenBasedir and/or SafeMode)?';
+$lng['question']['admin_domain_reallydisablesecuritysetting'] = 'Do you really want to deactivate these Security settings (OpenBasedir and/or SafeMode)?';
 $lng['question']['admin_admin_reallydelete'] = 'Do you really want to delete the admin %s? Every customer and domain will be reassigned to your account.';
 $lng['question']['admin_template_reallydelete'] = 'Do you really want to delete the template \'%s\'?';
 $lng['question']['domains_reallydelete'] = 'Do you really want to delete the domain %s?';
@@ -369,9 +369,9 @@ $lng['serversettings']['webftp_url']['title'] = 'WebFTP URL';
 $lng['serversettings']['webftp_url']['description'] = 'What\'s the URL to  WebFTP? (has to start with http(s)://)';
 $lng['serversettings']['language']['description'] = 'What\'s your standard server language?';
 $lng['serversettings']['maxloginattempts']['title'] = 'Max Login Attempts';
-$lng['serversettings']['maxloginattempts']['description'] = 'Maximum login attempts after which the account gets disabled.';
+$lng['serversettings']['maxloginattempts']['description'] = 'Maximum login attempts after which the account gets deactivated.';
-$lng['serversettings']['deactivatetime']['title'] = 'Deactivation Time';
+$lng['serversettings']['deactivatetime']['title'] = 'Deactivate Time';
-$lng['serversettings']['deactivatetime']['description'] = 'Time (sec.) an account gets disabled after too many login tries.';
+$lng['serversettings']['deactivatetime']['description'] = 'Time (sec.) an account gets deactivated after too many login tries.';
 $lng['serversettings']['pathedit']['title'] = 'Type of path input';
 $lng['serversettings']['pathedit']['description'] = 'Should a path be selected by a dropdown menu or by an input field?';
 $lng['serversettings']['nameservers']['title'] = 'Nameservers';
@@ -425,7 +425,7 @@ $lng['panel']['urloverridespath'] = 'URL (overrides path)';
 $lng['panel']['pathorurl'] = 'Path or URL';
 $lng['error']['sessiontimeoutiswrong'] = 'Only numerical "Session Timeout" is allowed.';
 $lng['error']['maxloginattemptsiswrong'] = 'Only numerical "Max Login Attempts" are allowed.';
-$lng['error']['deactivatetimiswrong'] = 'Only numerical "Deactivation Time" is allowed.';
+$lng['error']['deactivatetimiswrong'] = 'Only numerical "Deactivate Time" is allowed.';
 $lng['error']['accountprefixiswrong'] = 'The "Customerprefix" is wrong.';
 $lng['error']['mysqlprefixiswrong'] = 'The "SQL Prefix" is wrong.';
 $lng['error']['ftpprefixiswrong'] = 'The "FTP Prefix" is wrong.';
@@ -872,7 +872,7 @@ $lng['pwdreminder']['success'] = 'Password reset successfully.<br />You now shou
 // ADDED IN 1.2.19-svn18
 
 $lng['serversettings']['allow_password_reset']['title'] = 'Allow password reset by customers';
-$lng['pwdreminder']['notallowed'] = 'Password reset is disabled';
+$lng['pwdreminder']['notallowed'] = 'Password reset is deactivated';
 
 // ADDED IN 1.2.19-svn20
 
@@ -983,7 +983,7 @@ $lng['error']['info'] = 'Info';
 $lng['admin']['phpconfig']['template_replace_vars'] = 'Variables that will be replaced in the configs';
 $lng['admin']['phpconfig']['safe_mode'] = 'Will be replaced with the safe_mode setting of the domain.';
 $lng['admin']['phpconfig']['pear_dir'] = 'Will be replaced with the global setting for the pear directory.';
-$lng['admin']['phpconfig']['open_basedir_c'] = 'Will insert a ; (semicolon) to comment-out/disable open_basedir when set';
+$lng['admin']['phpconfig']['open_basedir_c'] = 'Will insert a ; (semicolon) to comment-out/deactivate open_basedir when set';
 $lng['admin']['phpconfig']['open_basedir'] = 'Will be replaced with the open_basedir setting of the domain.';
 $lng['admin']['phpconfig']['tmp_dir'] = 'Will be replaced with the temporary directory of the domain.';
 $lng['admin']['phpconfig']['open_basedir_global'] = 'Will be replaced with the global value of the path which will be attached to the open_basedir.';
@@ -1110,7 +1110,7 @@ $lng['aps']['invalidzipfile'] = '<strong>Errors for <em>%s</em></strong><br/><ul
 $lng['aps']['successpackageupdate'] = '<strong><em>%s</em> successfully installed as a Package update</strong>';
 $lng['aps']['successpackageinstall'] = '<strong><em>%s</em> successfully installed as a new Package</strong>';
 $lng['aps']['class_zip_missing'] = 'SimpleXML Class, exec function or ZIP Functions missing or not enabled! For further information about this problem look into the handbook for this module.';
-$lng['aps']['dir_permissions'] = 'The PHP/Webserver process must be able to write in the directory {$path}temp/ and {$path}packages/';
+$lng['aps']['dir_permissions'] = 'The PHP/Webserver process must be able to write in the directory /var/www/froxlor/temp/ and /var/www/froxlor/packages/';
 $lng['aps']['initerror'] = '<strong>There are some problems with this module:</strong><ul>%s</ul>Fix these problems, otherwise the module cannot be used!';
 $lng['aps']['iderror'] = 'Wrong id specified!';
 $lng['aps']['nopacketsforinstallation'] = 'There are no packages to install.';
@@ -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 ist deactivated.<br />See also: <a href="https://wiki.froxlor.org/contrib/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';
@@ -1296,8 +1296,4 @@ $lng['admin']['accountdata'] = 'Account Data';
 $lng['admin']['contactdata'] = 'Contact Data';
 $lng['admin']['servicedata'] = 'Service Data';
 
-// ADDED IN FROXLOR 0.9.2
-
-$lng['admin']['newerversionavailable'] = 'There is a newer version of Froxlor available';
-
 ?>

lng/german.lng.php

@@ -1065,7 +1065,7 @@ $lng['aps']['notazipfile'] = 'Die hochgeladene Datei ist keine gültige ZIP-
 $lng['aps']['filetoobig'] = 'Die Datei ist zu groß.';
 $lng['aps']['filenotcomplete'] = 'Die Datei wurde nicht vollständig hochgeladen.';
 $lng['aps']['phperror'] = 'Es trat ein PHP interner Fehler auf. Der Upload Fehlercode lautet #';
-$lng['aps']['moveproblem'] = 'Die hochgeladene Datei konnte nicht aus dem temporären Ordner verschoben werden. Prüfen Sie ob alle Rechte korrekt gesetzt sind. Dies gilt insbesondere fü die Ordner {$path}temp/ und {$path}packages/.';
+$lng['aps']['moveproblem'] = 'Die hochgeladene Datei konnte nicht aus dem temporären Ordner verschoben werden. Prüfen Sie ob alle Rechte korrekt gesetzt sind. Dies gilt insbesondere fü die Ordner /var/www/froxlor/temp/ und /var/www/froxlor/packages/.';
 $lng['aps']['uploaderrors'] = '<strong>Fehler f&uuml;r die Datei <em>%s</em></strong><br/><ul>%s</ul>';
 $lng['aps']['nospecialchars'] = 'Sonderzeichen sind im Suchausdruck nicht erlaubt!';
 $lng['aps']['noitemsfound'] = 'Es wurden keine Pakete gefunden!';
@@ -1115,7 +1115,7 @@ $lng['aps']['invalidzipfile'] = '<strong>Fehler f&uuml;r <em>%s</em></strong><br
 $lng['aps']['successpackageupdate'] = '<strong><em>%s</em> erfolgreich als Paketupdate installiert</strong>';
 $lng['aps']['successpackageinstall'] = '<strong><em>%s</em> erfolgreich als neues Paket installiert</strong>';
 $lng['aps']['class_zip_missing'] = 'SimpleXML Klasse, exec Funktion oder ZIP Funktionen nicht vorhanden bzw. aktiviert! F&uuml;r genauere Informationen zu diesem Problem schauen Sie bitte in das Handbuch zu diesem Modul.';
-$lng['aps']['dir_permissions'] = 'Der PHP bzw. Webserver Prozess muss Schreibrechte f&uuml;r {$path}temp/ und {$path}packages/ haben.';
+$lng['aps']['dir_permissions'] = 'Der PHP bzw. Webserver Prozess muss Schreibrechte f&uuml;r /var/www/froxlor/temp/ und /var/www/froxlor/packages/ haben.';
 $lng['aps']['initerror'] = '<strong>Es gibt ein paar Probleme mit diesem Modul:</strong><ul>%s</ul>Beheben Sie diese Probleme oder das Modul kann nicht genutzt werden!';
 $lng['aps']['iderror'] = 'Es wurde eine falsche Id &uuml;bergeben!';
 $lng['aps']['nopacketsforinstallation'] = 'Es wurden keine Pakete zur Installation gefunden.';
@@ -1276,8 +1276,4 @@ $lng['admin']['accountdata'] = 'Benutzerdaten';
 $lng['admin']['contactdata'] = 'Kontaktdaten';
 $lng['admin']['servicedata'] = 'Dienstleistungsdaten';
 
-// ADDED IN FROXLOR 0.9.2
-
-$lng['admin']['newerversionavailable'] = 'Eine neuere Version von Froxlor wurde ver&ouml;ffentlicht';
-
 ?>

scripts/froxlor_master_cronjob.php

@@ -32,7 +32,7 @@ fwrite($debugHandler, 'Cronfiles have been included' . "\n");
  * so users in the database don't conflict with system users
  */
 $cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Checking system\'s last guid');
-checkLastGuid();
+checkLastGuid($settings['system']['lastguid']);
 
 /*
  * shutdown cron

scripts/jobs/cron_apsupdater.php

@@ -17,7 +17,7 @@
  * @version    $Id$
  */
 
-$Aps = new ApsUpdater($db, $cronlog);
+$Aps = new ApsUpdater($db);
 $Aps->UpdateHandler();
 
 ?>

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

@@ -61,25 +61,6 @@ class apache
 		$this->logger->logAction(CRON_ACTION, LOG_INFO, 'reloading apache');
 		safe_exec($this->settings['system']['apachereload_command']);
 	}
-	
-	/**
-	 * define a standard <Directory>-statement, bug #32
-	 */
-	private function _createStandardDirectoryEntry()
-	{
-		$vhosts_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/05_froxlor_dirfix_nofcgid.conf');
-
-		if(!isset($this->virtualhosts_data[$vhosts_filename]))
-		{
-			$this->virtualhosts_data[$vhosts_filename] = '';
-		}
-
-		$this->virtualhosts_data[$vhosts_filename].= '# ' . basename($vhosts_filename) . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n" . "\n";	
-		$this->virtualhosts_data[$vhosts_filename].= '  <Directory "' . $this->settings['system']['documentroot_prefix'] . '">' . "\n";
-		$this->virtualhosts_data[$vhosts_filename].= '    Order allow,deny' . "\n";
-		$this->virtualhosts_data[$vhosts_filename].= '    allow from all' . "\n";
-		$this->virtualhosts_data[$vhosts_filename].= '  </Directory>' . "\n";
-	}
 
 	public function createIpPort()
 	{
@@ -98,7 +79,7 @@ class apache
 
 			fwrite($this->debugHandler, '  apache::createIpPort: creating ip/port settings for  ' . $ipport . "\n");
 			$this->logger->logAction(CRON_ACTION, LOG_INFO, 'creating ip/port settings for  ' . $ipport);
-			$vhosts_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/10_froxlor_ipandport_' . trim(str_replace(':', '.', $row_ipsandports['ip']), '.') . '.' . $row_ipsandports['port'] . '.conf');
+			$vhosts_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/10_syscp_ipandport_' . trim(str_replace(':', '.', $row_ipsandports['ip']), '.') . '.' . $row_ipsandports['port'] . '.conf');
 
 			if(!isset($this->virtualhosts_data[$vhosts_filename]))
 			{
@@ -168,13 +149,9 @@ class apache
 				$this->virtualhosts_data[$vhosts_filename].= '</VirtualHost>' . "\n";
 				$this->logger->logAction(CRON_ACTION, LOG_DEBUG, $ipport . ' :: inserted vhostcontainer');
 			}
+
 			unset($vhosts_filename);
 		}
-		
-		/**
-		 * bug #32
-		 */
-		$this->_createStandardDirectoryEntry();
 	}
 
 	/*
@@ -459,11 +436,11 @@ class apache
 	{
 		if($ssl_vhost === true)
 		{
-			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/20_froxlor_ssl_vhost_' . $domain['domain'] . '.conf');
+			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/20_syscp_ssl_vhost_' . $domain['domain'] . '.conf');
 		}
 		else
 		{
-			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/20_froxlor_normal_vhost_' . $domain['domain'] . '.conf');
+			$vhost_filename = makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/20_syscp_normal_vhost_' . $domain['domain'] . '.conf');
 		}
 
 		return $vhost_filename;
@@ -669,7 +646,7 @@ class apache
 		{
 			$row_diroptions['path'] = makeCorrectDir($row_diroptions['path']);
 			mkDirWithCorrectOwnership($row_diroptions['customerroot'], $row_diroptions['path'], $row_diroptions['guid'], $row_diroptions['guid']);
-			$diroptions_filename = makeCorrectFile($this->settings['system']['apacheconf_diroptions'] . '/40_froxlor_diroption_' . md5($row_diroptions['path']) . '.conf');
+			$diroptions_filename = makeCorrectFile($this->settings['system']['apacheconf_diroptions'] . '/40_syscp_diroption_' . md5($row_diroptions['path']) . '.conf');
 
 			if(!isset($this->diroptions_data[$diroptions_filename]))
 			{
@@ -914,7 +891,7 @@ class apache
 				if($vhost_filename != '.'
 				   && $vhost_filename != '..'
 				   && !in_array($vhost_filename, $this->known_vhostfilenames)
-				   && preg_match('/^(05|10|20|30)_(froxlor|syscp)_(dirfix|ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_(.+)\.conf$/', $vhost_filename)
+				   && preg_match('/^(10|20|30)_syscp_(ipandport|normal_vhost|wildcard_vhost|ssl_vhost)_(.+)\.conf$/', $vhost_filename)
 				   && file_exists(makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/' . $vhost_filename)))
 				{
 					fwrite($this->debugHandler, '  apache::wipeOutOldVhostConfigs: unlinking ' . $vhost_filename . "\n");
@@ -945,7 +922,7 @@ class apache
 				if($diroptions_filename != '.'
 				   && $diroptions_filename != '..'
 				   && !in_array($diroptions_filename, $this->known_diroptionsfilenames)
-				   && preg_match('/^40_(froxlor|syscp)_diroption_(.+)\.conf$/', $diroptions_filename)
+				   && preg_match('/^40_syscp_diroption_(.+)\.conf$/', $diroptions_filename)
 				   && file_exists(makeCorrectFile($this->settings['system']['apacheconf_diroptions'] . '/' . $diroptions_filename)))
 				{
 					fwrite($this->debugHandler, '  apache::wipeOutOldDiroptionConfigs: unlinking ' . $diroptions_filename . "\n");

scripts/jobs/cron_tasks.inc.http.20.lighttpd.php

@@ -615,7 +615,7 @@ class lighttpd
 				if($vhost_filename != '.'
 				&& $vhost_filename != '..'
 				&& !in_array($vhost_filename, $this->known_filenames)
-				&& preg_match('/^(05|10|20|30)_(froxlor|syscp)_ipandport_(.+)\.conf$/', $vhost_filename)
+				&& preg_match('/^(10|20|30)_froxlor_ipandport_(.+)\.conf$/', $vhost_filename)
 				&& file_exists(makeCorrectFile($this->settings['system']['apacheconf_vhost'] . '/' . $vhost_filename)))
 				{
 					fwrite($this->debugHandler, '  lighttpd::wipeOutOldConfigs: unlinking ' . $vhost_filename . "\n");

templates/admin/index/index.tpl

@@ -123,21 +123,12 @@ $header
 		</tr>
 		<tr>
 			<td class="field_name_border_left">{$lng['admin']['latestversion']}:</td>
-			<if $isnewerversion != 0 >
+			<td class="field_display"><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
-				<td class="field_display"><a href="$lookfornewversion_link"><strong>$lookfornewversion_lable</strong></a></td>
-			<else>
-				<td class="field_display"><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
-			</if>
 		</tr>
-		<if $isnewerversion != 0 >
+		<if $lookfornewversion_addinfo != ''>
 		<tr>
-			<td class="field_name_border_left" colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td>
+			<td class="field_name_border_left" colspan="2">$lookfornewversion_addinfo</td>
 		</tr>
-			<if $lookfornewversion_addinfo != ''>
-			<tr>
-				<td class="field_name_border_left" colspan="2">$lookfornewversion_addinfo</td>
-			</tr>
-			</if>
 		</if>
 	</table>
 	<br />

templates/misc/configfiles/debian_etch/postfix/etc_postfix_main.cf

@@ -70,7 +70,6 @@ alias_maps = $alias_database
 
 # Default Mailbox size, is set to 0 which means unlimited!
 mailbox_size_limit = 0
-virtual_mailbox_limit = 0
 
 ### TLS settings
 ###

templates/misc/configfiles/debian_etch/xinetd/etc_xinet.d_froxlor

@@ -1,8 +1,8 @@
 service froxlor
 {
         id              = froxlor
-        socket_type     = stream
+        socket_type     = dgram
-        protocol        = tcp
+        protocol        = udp
         wait            = no
 
         user            = root

templates/misc/configfiles/debian_lenny/postfix/etc_postfix_main.cf

@@ -1,93 +1,92 @@
-# Postfix programs paths settings
+# Postfix programs paths settings
-command_directory = /usr/sbin
+command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
+daemon_directory = /usr/lib/postfix
-program_directory = /usr/lib/postfix
+program_directory = /usr/lib/postfix
-sendmail_path = /usr/sbin/sendmail
+sendmail_path = /usr/sbin/sendmail
-
+
-## General Postfix configuration
+## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
+# should be the default domain from your provider eg. "server100.provider.tld"
-mydomain = <SERVERNAME>
+mydomain = <SERVERNAME>
-
+
-# should be different from $mydomain eg. "mail.$mydomain"
+# should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = <SERVERNAME>
-
+
-mydestination = $myhostname,
+mydestination = $myhostname,
-	$mydomain,
+	$mydomain,
-	localhost.$myhostname,
+	localhost.$myhostname,
-	localhost.$mydomain,
+	localhost.$mydomain,
-	localhost
+	localhost
-mynetworks = 127.0.0.0/8
+mynetworks = 127.0.0.0/8
-inet_interfaces = all
+inet_interfaces = all
-append_dot_mydomain = no
+append_dot_mydomain = no
-biff = no
+biff = no
-
+
-# Postfix performance settings
+# Postfix performance settings
-default_destination_concurrency_limit = 20
+default_destination_concurrency_limit = 20
-local_destination_concurrency_limit = 2
+local_destination_concurrency_limit = 2
-
+
-# SMTPD Settings
+# SMTPD Settings
-smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
+smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
-smtpd_helo_required = yes
+smtpd_helo_required = yes
-smtpd_recipient_restrictions = permit_mynetworks,
+smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
+	permit_sasl_authenticated,
-	reject_unauth_destination,
+	reject_unauth_destination,
-	reject_unauth_pipelining,
+	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
+	reject_non_fqdn_recipient
-smtpd_sender_restrictions = permit_mynetworks,
+smtpd_sender_restrictions = permit_mynetworks,
-	permit_sasl_authenticated, 
+	permit_sasl_authenticated, 
-	reject_unknown_hostname, 
+	reject_unknown_hostname, 
-	reject_unknown_recipient_domain, 
+	reject_unknown_recipient_domain, 
-	reject_unknown_sender_domain
+	reject_unknown_sender_domain
-smtpd_client_restrictions = permit_mynetworks,
+smtpd_client_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
+	permit_sasl_authenticated,
-	reject_unknown_client
+	reject_unknown_client
-# Maximum size of Message in bytes (50MB)
+# Maximum size of Message in bytes (50MB)
-message_size_limit = 52428800
+message_size_limit = 52428800
-
+
-## SASL Auth Settings
+## SASL Auth Settings
-smtpd_sasl_auth_enable = yes
+smtpd_sasl_auth_enable = yes
-smtpd_sasl_local_domain = $myhostname
+smtpd_sasl_local_domain = $myhostname
-smtpd_sasl_security_options = noanonymous
+smtpd_sasl_security_options = noanonymous
-broken_sasl_auth_clients = yes
+broken_sasl_auth_clients = yes
-## Dovecot Settings for deliver, SASL Auth and virtual transport
+## Dovecot Settings for deliver, SASL Auth and virtual transport
-## uncomment those line to use Dovecot
+## uncomment those line to use Dovecot
-#mailbox_command = /usr/lib/dovecot/deliver
+#mailbox_command = /usr/lib/dovecot/deliver
-#virtual_transport = dovecot
+#virtual_transport = dovecot
-#dovecot_destination_recipient_limit = 1
+#dovecot_destination_recipient_limit = 1
-
+
-# Virtual delivery settings
+# Virtual delivery settings
-virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
+virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
-virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
+virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
-virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
+virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
+virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
-virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
+virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
+virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-
+
-# Local delivery settings
+# Local delivery settings
-local_transport = local
+local_transport = local
-alias_database = hash:/etc/aliases
+alias_database = hash:/etc/aliases
-alias_maps = $alias_database
+alias_maps = $alias_database
-
+
-# Default Mailbox size, is set to 0 which means unlimited!
+# Default Mailbox size, is set to 0 which means unlimited!
-mailbox_size_limit = 0
+mailbox_size_limit = 0
-virtual_mailbox_limit = 0
+
-
+### TLS settings
-### TLS settings
+###
-###
+## TLS for outgoing mails from the server to another server
-## TLS for outgoing mails from the server to another server
+#smtp_use_tls = yes
-#smtp_use_tls = yes
+#smtp_tls_note_starttls_offer = yes
-#smtp_tls_note_starttls_offer = yes
+## TLS for email client
-## TLS for email client
+#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.pem
+#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.pem
+#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
-#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
+#smtpd_tls_auth_only = no
-#smtpd_tls_auth_only = no
+#smtpd_tls_loglevel = 1
-#smtpd_tls_loglevel = 1
+#smtpd_tls_received_header = yes
-#smtpd_tls_received_header = yes
+#smtpd_tls_session_cache_timeout = 3600s
-#smtpd_tls_session_cache_timeout = 3600s
+#tls_random_source = dev:/dev/urandom
-#tls_random_source = dev:/dev/urandom
+
-
+debugger_command =
-debugger_command =
+         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+         ddd $daemon_directory/$process_name $process_id & sleep 5
-         ddd $daemon_directory/$process_name $process_id & sleep 5
+
-

templates/misc/configfiles/debian_lenny/xinetd/etc_xinet.d_froxlor

@@ -1,8 +1,8 @@
 service froxlor
 {
         id              = froxlor
-        socket_type     = stream
+        socket_type     = dgram
-        protocol        = tcp
+        protocol        = udp
         wait            = no
 
         user            = root

templates/misc/configfiles/freebsd/postfix/etc_periodic.conf

@@ -1,4 +0,0 @@
-daily_clean_hoststat_enable="NO"
-daily_status_mail_rejects_enable="NO"
-daily_status_include_submit_mailq="NO"
-daily_submit_queuerun="NO"

templates/misc/configfiles/freebsd/powerdns/usr_local_etc_pdns_pdns.conf

@@ -1,10 +0,0 @@
-allow-axfr-ips=<SLAVE DNS SERVER>
-allow-recursion=127.0.0.1
-daemon=yes
-guardian=yes
-launch=bind
-lazy-recursion=yes
-recursor=<IP DNSRECURSION>
-master=yes
-bind-config=/etc/namedb/froxlor_bind.conf
-bind-check-interval=180

templates/misc/configfiles/freebsd/proftpd/etc_proftpd_proftpd.conf

@@ -1,76 +0,0 @@
-# Server settings
-ServerName                      "<SERVERNAME> FTP Server"
-ServerType                      standalone
-DefaultServer                   on
-Port                            21
-UseIPv6                         off
-Umask                           022
-SyslogLevel			emerg
-SystemLog                       /var/log/xferlog
-LogFormat                       auth    "%v [%P] %h %t \"%r\" %s"
-ExtendedLog                     /var/log/xferlog        AUTH auth
-
-# General settings
-DeferWelcome                    off
-MultilineRFC2228                on
-ShowSymlinks                    on
-TimeoutNoTransfer               600
-TimeoutStalled                  600
-TimeoutIdle                     1200
-DisplayLogin                    welcome.msg
-DisplayChdir                    .message
-ListOptions                     "-l"
-DenyFilter                      \*.*/
-MaxInstances                    30
-CommandBufferSize		512
-User				nobody
-Group				nogroup
-AllowOverwrite			on
-
-<IfModule mod_quotatab.c>
-    QuotaEngine off
-</IfModule>
-
-<IfModule mod_ratio.c>
-    Ratios off
-</IfModule>
-
-<IfModule mod_delay.c>
-    DelayEngine off
-</IfModule>
-
-<IfModule mod_sql.c>
-    DefaultRoot ~
-    RequireValidShell off
-    AuthOrder mod_sql.c
-    SQLBackend mysql
-    SQLEngine on
-    SQLAuthenticate on
-    SQLAuthTypes Crypt
-    SQLAuthenticate users* groups*
-    SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
-    SQLUserInfo ftp_users username password uid gid homedir shell
-    SQLGroupInfo ftp_groups groupname gid members
-    SQLUserWhereClause "login_enabled = 'y'"
-
-    SQLLog PASS login
-    SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
-
-    SQLLog RETR download
-    SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
-
-    SQLLog STOR upload
-    SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
-</IfModule>
-
-
-#<IfModule mod_tls.c>
-#    TLSEngine on
-#    TLSLog /var/log/xferlog
-#    TLSProtocol SSLv23
-#    TLSRequired off
-#    TLSRSACertificateFile /etc/ssl/cert.pem
-#    TLSRSACertificateKeyFile /etc/ssl/key.pem
-#    TLSVerifyClient off
-#    TLSRenegotiate required off
-#</IfModule>

templates/misc/configfiles/gentoo/postfix/etc_postfix_main.cf

@@ -1,112 +1,111 @@
-# Postfix programs paths settings
+# Postfix programs paths settings
-command_directory = /usr/sbin
+command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
+daemon_directory = /usr/lib/postfix
-program_directory = /usr/lib/postfix
+program_directory = /usr/lib/postfix
-sendmail_path = /usr/sbin/sendmail
+sendmail_path = /usr/sbin/sendmail
-
+
-## General Postfix configuration
+## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
+# should be the default domain from your provider eg. "server100.provider.tld"
-mydomain = <SERVERNAME>
+mydomain = <SERVERNAME>
-
+
-# should be different from $mydomain eg. "mail.$mydomain"
+# should be different from $mydomain eg. "mail.$mydomain"
-myhostname = <SERVERNAME>
+myhostname = <SERVERNAME>
-
+
-mydestination = $myhostname,
+mydestination = $myhostname,
-	$mydomain,
+	$mydomain,
-	localhost.$myhostname,
+	localhost.$myhostname,
-	localhost.$mydomain,
+	localhost.$mydomain,
-	localhost
+	localhost
-mynetworks = 127.0.0.0/8
+mynetworks = 127.0.0.0/8
-inet_interfaces = all
+inet_interfaces = all
-append_dot_mydomain = no
+append_dot_mydomain = no
-biff = no
+biff = no
-
+
-# Postfix performance settings
+# Postfix performance settings
-default_destination_concurrency_limit = 20
+default_destination_concurrency_limit = 20
-local_destination_concurrency_limit = 2
+local_destination_concurrency_limit = 2
-
+
-# SMTPD Settings
+# SMTPD Settings
-smtpd_banner = $myhostname ESMTP $mail_name (Gentoo/GNU)
+smtpd_banner = $myhostname ESMTP $mail_name (Gentoo/GNU)
-smtpd_helo_required = yes
+smtpd_helo_required = yes
-smtpd_recipient_restrictions = permit_mynetworks,
+smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
+	permit_sasl_authenticated,
-	reject_unauth_destination,
+	reject_unauth_destination,
-	reject_unauth_pipelining,
+	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
+	reject_non_fqdn_recipient
-smtpd_sender_restrictions = permit_mynetworks,
+smtpd_sender_restrictions = permit_mynetworks,
-	permit_sasl_authenticated, 
+	permit_sasl_authenticated, 
-	reject_unknown_hostname, 
+	reject_unknown_hostname, 
-	reject_unknown_recipient_domain, 
+	reject_unknown_recipient_domain, 
-	reject_unknown_sender_domain
+	reject_unknown_sender_domain
-smtpd_client_restrictions = permit_mynetworks,
+smtpd_client_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
+	permit_sasl_authenticated,
-	reject_unknown_client
+	reject_unknown_client
-# Maximum size of Message in bytes (50MB)
+# Maximum size of Message in bytes (50MB)
-message_size_limit = 52428800
+message_size_limit = 52428800
-
+
-## SASL Auth Settings
+## SASL Auth Settings
-smtpd_sasl_auth_enable = yes
+smtpd_sasl_auth_enable = yes
-smtpd_sasl_local_domain = $myhostname
+smtpd_sasl_local_domain = $myhostname
-smtpd_sasl_security_options = noanonymous
+smtpd_sasl_security_options = noanonymous
-broken_sasl_auth_clients = yes
+broken_sasl_auth_clients = yes
-## Dovecot Settings for deliver, SASL Auth and virtual transport
+## Dovecot Settings for deliver, SASL Auth and virtual transport
-## uncomment those line to use Dovecot
+## uncomment those line to use Dovecot
-#mailbox_command = /usr/libexec/dovecot/deliver
+#mailbox_command = /usr/libexec/dovecot/deliver
-#smtpd_sasl_type = dovecot
+#smtpd_sasl_type = dovecot
-#smtpd_sasl_path = private/auth
+#smtpd_sasl_path = private/auth
-#virtual_transport = dovecot
+#virtual_transport = dovecot
-#dovecot_destination_recipient_limit = 1
+#dovecot_destination_recipient_limit = 1
-
+
-# Virtual delivery settings
+# Virtual delivery settings
-virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
+virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
-virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
+virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
-virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
+virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
+virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
-virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
+virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
+virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-
+
-# Local delivery settings
+# Local delivery settings
-local_transport = local
+local_transport = local
-alias_database = hash:/etc/mail/aliases
+alias_database = hash:/etc/mail/aliases
-alias_maps = $alias_database
+alias_maps = $alias_database
-
+
-# Default Mailbox size, is set to 0 which means unlimited!
+# Default Mailbox size, is set to 0 which means unlimited!
-mailbox_size_limit = 0
+mailbox_size_limit = 0
-virtual_mailbox_limit = 0
+
-
+### TLS settings
-### TLS settings
+###
-###
+## TLS for outgoing mails from the server to another server
-## TLS for outgoing mails from the server to another server
+#smtp_use_tls = yes
-#smtp_use_tls = yes
+#smtp_tls_note_starttls_offer = yes
-#smtp_tls_note_starttls_offer = yes
+## TLS for email client
-## TLS for email client
+#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.pem
+#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.pem
-#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.pem
+#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
-#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
+#smtpd_tls_auth_only = no
-#smtpd_tls_auth_only = no
+#smtpd_tls_loglevel = 1
-#smtpd_tls_loglevel = 1
+#smtpd_tls_received_header = yes
-#smtpd_tls_received_header = yes
+#smtpd_tls_session_cache_timeout = 3600s
-#smtpd_tls_session_cache_timeout = 3600s
+#tls_random_source = dev:/dev/urandom
-#tls_random_source = dev:/dev/urandom
+
-
+### Quota Settings with vda useflag
-### Quota Settings with vda useflag
+## I use only virtual as localdelivery... This permit me to have full
-## I use only virtual as localdelivery... This permit me to have full
+## virtual domain hosting without using a lots of maps
-## virtual domain hosting without using a lots of maps
+#virtual_transport = virtual
-#virtual_transport = virtual
+## Generate maildirsize files or not
-## Generate maildirsize files or not
+#virtual_create_maildirsize = yes
-#virtual_create_maildirsize = yes
+## I use Courier IMAP compatibles files.
-## I use Courier IMAP compatibles files.
+#virtual_mailbox_extended = yes
-#virtual_mailbox_extended = yes
+## Limits only INBOX part (usefull when
-## Limits only INBOX part (usefull when
+## using when you have IMAP users)
-## using when you have IMAP users)
+#virtual_mailbox_limit_inbox = yes
-#virtual_mailbox_limit_inbox = yes
+## maps of soft disk quotas
-## maps of soft disk quotas
+#virtual_mailbox_limit_maps = mysql:/etc/postfix/mysql-virtual_mailbox_limit_maps.cf
-#virtual_mailbox_limit_maps = mysql:/etc/postfix/mysql-virtual_mailbox_limit_maps.cf
+#virtual_mailbox_limit_override = yes
-#virtual_mailbox_limit_override = yes
+#virtual_maildir_limit_message = Sorry, this user has overdrawn their diskspace quota. Please try again later.
-#virtual_maildir_limit_message = Sorry, this user has overdrawn their diskspace quota. Please try again later.
+#virtual_overquota_bounce = yes
-#virtual_overquota_bounce = yes
+
-
+debugger_command =
-debugger_command =
+         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+         ddd $daemon_directory/$process_name $process_id & sleep 5
-         ddd $daemon_directory/$process_name $process_id & sleep 5
+
-

templates/misc/configfiles/gentoo/xinetd/etc_xinet.d_froxlor

@@ -1,8 +1,8 @@
 service froxlor
 {
         id              = froxlor
-        socket_type     = stream
+        socket_type     = dgram
-        protocol        = tcp
+        protocol        = udp
         wait            = no
 
         user            = root

templates/misc/configfiles/suse_linux_10_0/postfix/etc_postfix_main.cf

@@ -1,64 +1,63 @@
-queue_directory = /var/spool/postfix
+queue_directory = /var/spool/postfix
-command_directory = /usr/sbin
+command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
+daemon_directory = /usr/lib/postfix
-mail_owner = postfix
+mail_owner = postfix
-inet_interfaces = all
+inet_interfaces = all
-unknown_local_recipient_reject_code = 550
+unknown_local_recipient_reject_code = 550
-debug_peer_level = 2
+debug_peer_level = 2
-debugger_command =
+debugger_command =
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         xxgdb $daemon_directory/$process_name $process_id & sleep 5
+         xxgdb $daemon_directory/$process_name $process_id & sleep 5
-sendmail_path = /usr/sbin/sendmail
+sendmail_path = /usr/sbin/sendmail
-newaliases_path = /usr/bin/newaliases
+newaliases_path = /usr/bin/newaliases
-mailq_path = /usr/bin/mailq
+mailq_path = /usr/bin/mailq
-setgid_group = maildrop
+setgid_group = maildrop
-html_directory = /usr/share/doc/packages/postfix/html
+html_directory = /usr/share/doc/packages/postfix/html
-manpage_directory = /usr/share/man
+manpage_directory = /usr/share/man
-sample_directory = /usr/share/doc/packages/postfix/samples
+sample_directory = /usr/share/doc/packages/postfix/samples
-readme_directory = /usr/share/doc/packages/postfix/README_FILES
+readme_directory = /usr/share/doc/packages/postfix/README_FILES
-inet_protocols = all
+inet_protocols = all
-biff = no
+biff = no
-append_dot_mydomain = no
+append_dot_mydomain = no
-mail_spool_directory = /var/mail
+mail_spool_directory = /var/mail
-canonical_maps = hash:/etc/postfix/canonical
+canonical_maps = hash:/etc/postfix/canonical
-virtual_mailbox_base = /var/kunden/mail/
+virtual_mailbox_base = /var/kunden/mail/
-virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
+virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
-virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
+virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
-virtual_alias_domains =
+virtual_alias_domains =
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
+virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
-virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
+virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
+virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-virtual_maps = hash:/etc/postfix/virtual
+virtual_maps = hash:/etc/postfix/virtual
-relocated_maps = hash:/etc/postfix/relocated
+relocated_maps = hash:/etc/postfix/relocated
-transport_maps = hash:/etc/postfix/transport
+transport_maps = hash:/etc/postfix/transport
-sender_canonical_maps = hash:/etc/postfix/sender_canonical
+sender_canonical_maps = hash:/etc/postfix/sender_canonical
-masquerade_exceptions = root
+masquerade_exceptions = root
-masquerade_classes = envelope_sender, header_sender, header_recipient
+masquerade_classes = envelope_sender, header_sender, header_recipient
-myhostname = <SERVERNAME>
+myhostname = <SERVERNAME>
-mydomain = <SERVERNAME>
+mydomain = <SERVERNAME>
-program_directory = /usr/lib/postfix
+program_directory = /usr/lib/postfix
-masquerade_domains =
+masquerade_domains =
-mydestination = $myhostname $mydomain localhost localhost.$mydomain
+mydestination = $myhostname $mydomain localhost localhost.$mydomain
-mynetworks = 127.0.0.0/8
+mynetworks = 127.0.0.0/8
-defer_transports =
+defer_transports =
-disable_dns_lookups = no
+disable_dns_lookups = no
-relayhost =
+relayhost =
-mailbox_command =
+mailbox_command =
-mailbox_transport =
+mailbox_transport =
-strict_8bitmime = no
+strict_8bitmime = no
-disable_mime_output_conversion = no
+disable_mime_output_conversion = no
-smtpd_client_restrictions =
+smtpd_client_restrictions =
-smtpd_helo_required = no
+smtpd_helo_required = no
-smtpd_helo_restrictions =
+smtpd_helo_restrictions =
-strict_rfc821_envelopes = no
+strict_rfc821_envelopes = no
-smtpd_recipient_restrictions = permit_mynetworks permit_sasl_authenticated reject_unauth_destination
+smtpd_recipient_restrictions = permit_mynetworks permit_sasl_authenticated reject_unauth_destination
-smtpd_sasl_auth_enable = yes
+smtpd_sasl_auth_enable = yes
-smtpd_sasl_local_domain = $myhostname
+smtpd_sasl_local_domain = $myhostname
-smtpd_sasl_security_options = noanonymous
+smtpd_sasl_security_options = noanonymous
-broken_sasl_auth_clients = yes
+broken_sasl_auth_clients = yes
-#smtpd_use_tls = no
+#smtpd_use_tls = no
-#smtp_use_tls = no
+#smtp_use_tls = no
-alias_maps = $alias_database
+alias_maps = $alias_database
-mailbox_size_limit = 0
+mailbox_size_limit = 0
-virtual_mailbox_limit = 0
 message_size_limit = 10240000

templates/misc/configfiles/ubuntu_hardy/postfix/etc_postfix_main.cf

@@ -1,93 +1,92 @@
-# Postfix programs paths settings
+# Postfix programs paths settings
-command_directory = /usr/sbin
+command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
+daemon_directory = /usr/lib/postfix
-program_directory = /usr/lib/postfix
+program_directory = /usr/lib/postfix
-sendmail_path = /usr/sbin/sendmail
+sendmail_path = /usr/sbin/sendmail
-
+
-## General Postfix configuration
+## General Postfix configuration
-# should be the default domain from your provider eg. "server100.provider.tld"
+# should be the default domain from your provider eg. "server100.provider.tld"
-mydomain = <SERVERNAME>
+mydomain = <SERVERNAME>
-
+
-# should be different from $mydomain eg. "mail.$mydomain"
+# should be different from $mydomain eg. "mail.$mydomain"
-myhostname = mail.<SERVERNAME>
+myhostname = mail.<SERVERNAME>
-
+
-mydestination = $myhostname,
+mydestination = $myhostname,
-	$mydomain,
+	$mydomain,
-	localhost.$myhostname,
+	localhost.$myhostname,
-	localhost.$mydomain,
+	localhost.$mydomain,
-	localhost
+	localhost
-mynetworks = 127.0.0.0/8
+mynetworks = 127.0.0.0/8
-inet_interfaces = all
+inet_interfaces = all
-append_dot_mydomain = no
+append_dot_mydomain = no
-biff = no
+biff = no
-
+
-# Postfix performance settings
+# Postfix performance settings
-default_destination_concurrency_limit = 20
+default_destination_concurrency_limit = 20
-local_destination_concurrency_limit = 2
+local_destination_concurrency_limit = 2
-
+
-# SMTPD Settings
+# SMTPD Settings
-smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu/GNU)
+smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu/GNU)
-smtpd_helo_required = yes
+smtpd_helo_required = yes
-smtpd_recipient_restrictions = permit_mynetworks,
+smtpd_recipient_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
+	permit_sasl_authenticated,
-	reject_unauth_destination,
+	reject_unauth_destination,
-	reject_unauth_pipelining,
+	reject_unauth_pipelining,
-	reject_non_fqdn_recipient
+	reject_non_fqdn_recipient
-smtpd_sender_restrictions = permit_mynetworks,
+smtpd_sender_restrictions = permit_mynetworks,
-	permit_sasl_authenticated, 
+	permit_sasl_authenticated, 
-	reject_unknown_hostname, 
+	reject_unknown_hostname, 
-	reject_unknown_recipient_domain, 
+	reject_unknown_recipient_domain, 
-	reject_unknown_sender_domain
+	reject_unknown_sender_domain
-smtpd_client_restrictions = permit_mynetworks,
+smtpd_client_restrictions = permit_mynetworks,
-	permit_sasl_authenticated,
+	permit_sasl_authenticated,
-	reject_unknown_client
+	reject_unknown_client
-# Maximum size of Message in bytes (50MB)
+# Maximum size of Message in bytes (50MB)
-message_size_limit = 52428800
+message_size_limit = 52428800
-
+
-## SASL Auth Settings
+## SASL Auth Settings
-smtpd_sasl_auth_enable = yes
+smtpd_sasl_auth_enable = yes
-smtpd_sasl_local_domain = $myhostname
+smtpd_sasl_local_domain = $myhostname
-smtpd_sasl_security_options = noanonymous
+smtpd_sasl_security_options = noanonymous
-broken_sasl_auth_clients = yes
+broken_sasl_auth_clients = yes
-## Dovecot Settings for deliver, SASL Auth and virtual transport
+## Dovecot Settings for deliver, SASL Auth and virtual transport
-## uncomment those line to use Dovecot
+## uncomment those line to use Dovecot
-#mailbox_command = /usr/lib/dovecot/deliver
+#mailbox_command = /usr/lib/dovecot/deliver
-#virtual_transport = dovecot
+#virtual_transport = dovecot
-#dovecot_destination_recipient_limit = 1
+#dovecot_destination_recipient_limit = 1
-
+
-# Virtual delivery settings
+# Virtual delivery settings
-virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
+virtual_mailbox_base = <VIRTUAL_MAILBOX_BASE>
-virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
+virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual_mailbox_maps.cf
-virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
+virtual_mailbox_domains = mysql:/etc/postfix/mysql-virtual_mailbox_domains.cf
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
+virtual_alias_maps = mysql:/etc/postfix/mysql-virtual_alias_maps.cf
-virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
+virtual_uid_maps = static:<VIRTUAL_UID_MAPS>
-virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
+virtual_gid_maps = static:<VIRTUAL_GID_MAPS>
-
+
-# Local delivery settings
+# Local delivery settings
-local_transport = local
+local_transport = local
-alias_database = hash:/etc/aliases
+alias_database = hash:/etc/aliases
-alias_maps = $alias_database
+alias_maps = $alias_database
-
+
-# Default Mailbox size, is set to 0 which means unlimited!
+# Default Mailbox size, is set to 0 which means unlimited!
-mailbox_size_limit = 0
+mailbox_size_limit = 0
-virtual_mailbox_limit = 0
+
-
+### TLS settings
-### TLS settings
+###
-###
+## TLS for outgoing mails from the server to another server
-## TLS for outgoing mails from the server to another server
+#smtp_use_tls = yes
-#smtp_use_tls = yes
+#smtp_tls_note_starttls_offer = yes
-#smtp_tls_note_starttls_offer = yes
+## TLS for email client
-## TLS for email client
+#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.crt
-#smtpd_tls_cert_file = /etc/ssl/server/<SERVERNAME>.crt
+#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.key
-#smtpd_tls_key_file = /etc/ssl/server/<SERVERNAME>.key
+#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
-#smtpd_tls_CAfile = /etc/ssl/cacert.class3.crt  # Just an example for CACert.org
+#smtpd_tls_auth_only = no
-#smtpd_tls_auth_only = no
+#smtpd_tls_loglevel = 1
-#smtpd_tls_loglevel = 1
+#smtpd_tls_received_header = yes
-#smtpd_tls_received_header = yes
+#smtpd_tls_session_cache_timeout = 3600s
-#smtpd_tls_session_cache_timeout = 3600s
+#tls_random_source = dev:/dev/urandom
-#tls_random_source = dev:/dev/urandom
+
-
+debugger_command =
-debugger_command =
+         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+         ddd $daemon_directory/$process_name $process_id & sleep 5
-         ddd $daemon_directory/$process_name $process_id & sleep 5
+
-

templates/misc/configfiles/ubuntu_hardy/xinetd/etc_xinet.d_froxlor

@@ -1,8 +1,8 @@
 service froxlor
 {
         id              = froxlor
-        socket_type     = stream
+        socket_type     = dgram
-        protocol        = tcp
+        protocol        = udp
         wait            = no
 
         user            = root