Changes in mail module.

Author: tbrehm

config/amavis/amavisd.conf

@@ -32,19 +32,33 @@
 $conf["app_title"] = "ISPConfig";
 $conf["app_version"] = "3.0.0";
 
-//$conf["rootpath"]			= "F:\\server\\www\\ispconfig3\\interface";
-$conf["rootpath"]			= "D:\\www\\ispconfig3\\interface";
+
+$conf["rootpath"]			= "D:\\server\\www\\ispconfig3\\interface";
+//$conf["rootpath"]			= "D:\\www\\ispconfig3\\interface";
 //$conf["rootpath"]			= "/home/www/ispconfig3/web/cms";
 
 $conf["fs_div"]				= "\\"; // File system divider, \\ on windows and / on linux and unix
 $conf["classpath"]			= $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."classes";
 $conf["temppath"]			= $conf["rootpath"].$conf["fs_div"]."temp";
 
 
+define("DIR_TRENNER","\\");
+define("SERVER_ROOT","D:\\server\\www\\ispconfig3\\interface");
+define("INCLUDE_ROOT",SERVER_ROOT.DIR_TRENNER."lib");
+define("CLASSES_ROOT",INCLUDE_ROOT.DIR_TRENNER."classes");
+
 /*
         Database Settings
 */
 
+define("DB_TYPE","mysql");
+define("DB_HOST","localhost");
+define("DB_DATABASE","ispconfig3");
+define("DB_USER","root");
+define("DB_PASSWORD","");
+
+
+
 
 $conf["db_type"]			= 'mysql';
 $conf["db_host"]			= 'localhost';
@@ -65,9 +79,9 @@
         Themes
 */
 
-$conf["theme"]					= 'default';
+$conf["theme"]									= 'default';
 $conf["html_content_encoding"]	= 'text/html; charset=iso-8859-1';
-$conf["logo"] 					= 'themes/default/images/mydnsconfig_logo.gif';
+$conf["logo"] 									= 'themes/default/images/mydnsconfig_logo.gif';
 
 /*
         Default Language
@@ -80,7 +94,7 @@
         Auto Load Modules
 */
 
-$conf["start_db"]		= true;
+$conf["start_db"]				= true;
 $conf["start_session"]	= true;
 
 /*

interface/lib/config.inc.php

@@ -1,13 +1,14 @@
 [global]
 webserver=apache
-mailserver=exim
+mailserver=postfix
 dnsserver=mydns
 
 [mail]
-module=exim_mysql
-maildir_path=/var/spool/mail/[domain]/[localpart]
-mailuser_uid=0
-mailuser_gid=0
+module=postfix_mysql
+maildir_path=/var/spool/mail/[domain]/[localpart]/
+homedir_path=/var/spool/mail/[domain]/[localpart]/
+mailuser_uid=5000
+mailuser_gid=5000
 
 [web]
 module=generic

interface/lib/server_conf.master

@@ -37,8 +37,8 @@
 $form["description"] 	= "";
 $form["name"] 			= "mail_alias";
 $form["action"]			= "mail_alias_edit.php";
-$form["db_table"]		= "mail_redirect";
-$form["db_table_idx"]	= "redirect_id";
+$form["db_table"]		= "mail_forwarding";
+$form["db_table_idx"]	= "forwarding_id";
 $form["db_history"]		= "yes";
 $form["tab_default"]	= "alias";
 $form["list_default"]	= "mail_alias_list.php";
@@ -66,7 +66,7 @@
 			'width'		=> '30',
 			'maxlength'	=> '255'
 		),
-		'email' => array (
+		'source' => array (
 			'datatype'	=> 'VARCHAR',
 			'formtype'	=> 'TEXT',
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISEMAIL',
@@ -82,7 +82,7 @@
 			'formtype'	=> 'SELECT',
 			'default'	=> '',
 			'datasource'	=> array ( 	'type'			=> 'SQL',
-										'querystring' 	=> 'SELECT email FROM mail_box WHERE {AUTHSQL} ORDER BY email',
+										'querystring' 	=> 'SELECT email FROM mail_user WHERE {AUTHSQL} ORDER BY email',
 										'keyfield'		=> 'email',
 										'valuefield'	=> 'email'
 									 ),