From b4e90c97c397a0436a2033f6e171cc4ea92fe276 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 26 Nov 2005 14:53:32 +0000
Subject: [PATCH] exim4 config improved

---
 config/exim4/exim4.conf.template              |   44 +-
 interface/lib/config.inc.php                  |    6 +-
 interface/sql/ispconfig3db.sql                | 1043 +++++++++--------
 .../templates/mail_domain_catchall_edit.htm   |    2 +-
 4 files changed, 563 insertions(+), 532 deletions(-)

diff --git a/config/exim4/exim4.conf.template b/config/exim4/exim4.conf.template
index cbb0e6dff1..c211e2e271 100644
--- a/config/exim4/exim4.conf.template
+++ b/config/exim4/exim4.conf.template
@@ -7,7 +7,7 @@ MYSQL_SERVER=localhost
 MYSQL_USER=root
 MYSQL_PASSWORD=matze
 MYSQL_DB=mailserver
-MYSQL_EMAILTABLE=mail_email
+MYSQL_EMAILTABLE=mail_box
 MYSQL_DOMAINTABLE=mail_domain
 MYSQL_WHITETABLE=mail_whitelist
 MYSQL_BLACKTABLE=mail_blacklist
@@ -42,8 +42,8 @@ hide mysql_servers = "MYSQL_SERVER/MYSQL_DB/MYSQL_USER/MYSQL_PASSWORD"
 
 primary_hostname = MAILSERVER_HOSTNAME
 
-domainlist local_domains = mysql;SELECT DISTINCT domain FROM MYSQL_DOMAINTABLE WHERE domain='${quote_mysql:$domain}' AND (type = 'local' OR type = 'alias')
-domainlist relay_to_domains = mysql;SELECT DISTINCT domain FROM MYSQL_DOMAINTABLE WHERE domain='${quote_mysql:$domain}' AND type = 'relay'
+domainlist local_domains = mysql;SELECT DISTINCT domain FROM MYSQL_DOMAINTABLE WHERE domain='${quote_mysql:$domain}' AND type = 'local'
+domainlist relay_to_domains = mysql;SELECT DISTINCT domain FROM MYSQL_DOMAINTABLE WHERE domain='${quote_mysql:$domain}' AND (type = 'relay' OR type = 'alias')
 hostlist   relay_from_hosts = 127.0.0.1
 domainlist mmdomains = ${lookup mysql {SELECT domain FROM mail_mailman_domain}}
 
@@ -151,6 +151,11 @@ fail_router:
   data = ":fail:"
   allow_fail
 
+domain_aliases:
+   driver=redirect
+   domains=${lookup mysql{SELECT domain FROM mail_domain WHERE domain='${domain}' AND type = 'alias'}}
+   data=$local_part@${lookup mysql{SELECT destination FROM mail_domain WHERE domain='${domain}'}}
+
 mailman_router:
    driver = accept
    domains = +mmdomains
@@ -171,14 +176,9 @@ dnslookup:
   ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
   no_more
 
-domain_aliases:
-   driver=redirect
-   domains=${lookup mysql{SELECT domain FROM mail_domain WHERE type = 'alias'}}
-   data=$local_part@${lookup mysql{SELECT destination FROM mail_domain WHERE domain='${domain}'}}
-
 blacklist_router:
   driver = manualroute
-  senders = ${lookup mysql {SELECT DISTINCT MYSQL_BLACKTABLE.address FROM MYSQL_BLACKTABLE WHERE '${quote_mysql:$sender_address}' LIKE MYSQL_BLACKTABLE.address}{$value}}
+  senders = ${lookup mysql {SELECT DISTINCT address FROM MYSQL_BLACKTABLE WHERE '${quote_mysql:$sender_address}' LIKE address}{$value}}
   condition = "${if !def:h_X-Spam-Flag: {1}{0}}"
   headers_add = X-Spam-Flag: YES
   route_list = * localhost
@@ -222,13 +222,15 @@ mysql_email_forward:
 #  transport = spamcheck
 #  verify = false
 
-#spampurge_router:
-#  driver = manualroute
-#  domains = ${lookup mysql {SELECT SUBSTRING_INDEX(email,'@',-1) FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}') AND spampurge='yes'}{$value}}
-#  condition = "${if eq{$h_X-Spam-Flag:}{YES} {1}{0}}"
-#  route_list = "* localhost byname"
-#  transport = devnull_transport
-#  verify = false
+spamdelete_router:
+  driver = manualroute
+  domains = ${lookup mysql {SELECT SUBSTRING_INDEX(email,'@',-1) FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}') AND spamdelete = '1'}{$value}}
+  # condition = "${if eq{$h_X-Spam-Flag:}{YES} {1}{0}}"
+  condition = "${if match{$h_X-Spam-Flag}{YES} {1}{0}}"
+  route_list = "* localhost byname"
+  transport = devnull_transport
+  verify = false
+
 
 autoresponder_router:
   driver = accept
@@ -247,12 +249,12 @@ forward_router:
 
 local_mailbox_router:
   driver = accept
-  domains = ${lookup mysql {SELECT SUBSTRING_INDEX(email,'@',-1) FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}') AND maildir != ''}{$value}}
+  domains = ${lookup mysql {SELECT SUBSTRING_INDEX(email,'@',-1) FROM MYSQL_EMAILTABLE WHERE email=CONCAT('${quote_mysql:$local_part}','@','${quote_mysql:$domain}') AND maildir != '' AND active = '1'}{$value}}
   transport = local_delivery
   
-mysql_default_router:
+mysql_catchall_router:
    driver=redirect
-   data=${lookup mysql{ SELECT dest FROM mail_virtual_default WHERE domain='${domain}'}}
+   data=${lookup mysql{ SELECT destination FROM mail_domain_catchall WHERE domain='${domain}'}}
    allow_fail
    allow_defer
 
@@ -404,14 +406,14 @@ begin authenticators
 fixed_plain:
   driver = plaintext
   public_name = PLAIN
-  server_condition = ${lookup mysql{SELECT email FROM MYSQL_EMAILTABLE WHERE email='${quote_mysql:$2}' AND cryptpwd=encrypt('${quote_mysql:$3}' AND active = '1', cryptpwd)}{1}fail}
+  server_condition = ${lookup mysql{SELECT email FROM MYSQL_EMAILTABLE WHERE email='${quote_mysql:$2}' AND cryptpwd=encrypt('${quote_mysql:$3}', cryptpwd) AND active = '1'}{1}fail}
   server_set_id = $2
 
 fixed_login:
   driver = plaintext
   public_name = LOGIN
   server_prompts = "Username:: : Password::"
-  server_condition = ${lookup mysql{SELECT email FROM MYSQL_EMAILTABLE WHERE email='${quote_mysql:$1}' AND cryptpwd=encrypt('${quote_mysql:$2}' AND active = '1', cryptpwd)}{1}fail}
+  server_condition = ${lookup mysql{SELECT email FROM MYSQL_EMAILTABLE WHERE email='${quote_mysql:$1}' AND cryptpwd=encrypt('${quote_mysql:$2}', cryptpwd) AND active = '1'}{1}fail}
   server_set_id = $1
   
 cram:
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 137e890def..8f63a893ba 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -29,9 +29,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ini_set('register_globals',0);
 
-$conf["rootpath"]                 = "D:\\www\\ispconfig3\\interface";
-//$conf["rootpath"]                 = "D:\\www\\ispconfig3\\interface";
-//$conf["rootpath"]                 = "/home/www/ispconfig3/web/cms";
+$conf["rootpath"] 		= "F:\\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";
diff --git a/interface/sql/ispconfig3db.sql b/interface/sql/ispconfig3db.sql
index d3bf57ab15..8077833de2 100644
--- a/interface/sql/ispconfig3db.sql
+++ b/interface/sql/ispconfig3db.sql
@@ -1,507 +1,536 @@
-# phpMyAdmin MySQL-Dump
-# version 2.4.0-rc1
-# http://www.phpmyadmin.net/ (download page)
-#
-# Host: localhost
-# Erstellungszeit: 25. November 2005 um 17:03
-# Server Version: 4.0.22
-# PHP-Version: 5.0.2
-# Datenbank: `ispconfig3`
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_blacklist`
-#
-
-DROP TABLE IF EXISTS mail_blacklist;
-CREATE TABLE mail_blacklist (
-  blacklist_id int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_id int(11) NOT NULL default '0',
-  address varchar(255) NOT NULL default '',
-  active enum('0','1') NOT NULL default '1',
-  PRIMARY KEY  (blacklist_id),
-  KEY server_id (server_id,address)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_blacklist`
-#
-
-INSERT INTO mail_blacklist VALUES (1, 1, 1, 'riud', 'riud', '', 1, 'test@du.com', '1');
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_box`
-#
-
-DROP TABLE IF EXISTS mail_box;
-CREATE TABLE mail_box (
-  mailbox_id int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_id int(11) NOT NULL default '0',
-  email varchar(255) NOT NULL default '',
-  cryptpwd varchar(128) NOT NULL default '',
-  clearpwd varchar(128) NOT NULL default '',
-  name varchar(128) NOT NULL default '',
-  uid int(10) unsigned NOT NULL default '0',
-  gid int(10) unsigned NOT NULL default '0',
-  maildir varchar(255) NOT NULL default '',
-  quota varchar(255) NOT NULL default '',
-  cc varchar(50) NOT NULL default '',
-  forward varchar(50) NOT NULL default '',
-  autoresponder enum('0','1') NOT NULL default '0',
-  autoresponder_text tinytext NOT NULL,
-  active enum('0','1') NOT NULL default '1',
-  antivirus enum('yes','no') NOT NULL default 'no',
-  spamscan enum('yes','no') NOT NULL default 'no',
-  spamdelete enum('yes','no') NOT NULL default 'no',
-  PRIMARY KEY  (mailbox_id),
-  KEY server_id (server_id,email)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_box`
-#
-
-INSERT INTO mail_box VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'till@test.de', '$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/', '', '', 0, 0, '', '', '', '', '0', '', '1', 'no', 'no', 'no');
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_domain`
-#
-
-DROP TABLE IF EXISTS mail_domain;
-CREATE TABLE mail_domain (
-  domain_id int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_id int(11) NOT NULL default '0',
-  domain varchar(255) NOT NULL default '',
-  type enum('local','relay','alias') NOT NULL default 'local',
-  relay_host varchar(255) NOT NULL default '',
-  destination varchar(255) NOT NULL default '',
-  active tinyint(4) NOT NULL default '1',
-  PRIMARY KEY  (domain_id),
-  KEY server_id (server_id,domain,type)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_domain`
-#
-
-INSERT INTO mail_domain VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'test.de', 'local', '', '', 1);
-INSERT INTO mail_domain VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'test2.de', 'alias', '', 'test.de', 1);
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_domain_catchall`
-#
-
-DROP TABLE IF EXISTS mail_domain_catchall;
-CREATE TABLE mail_domain_catchall (
-  domain_catchall_id int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_id int(11) NOT NULL default '0',
-  domain varchar(255) NOT NULL default '',
-  destination varchar(255) NOT NULL default '',
-  active enum('0','1') NOT NULL default '1',
-  PRIMARY KEY  (domain_catchall_id),
-  KEY server_id (server_id,domain)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_domain_catchall`
-#
-
-INSERT INTO mail_domain_catchall VALUES (1, 1, 1, 'riud', 'riud', '', 1, 'test.de', 'info@ensign.de', '1');
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_greylist`
-#
-
-DROP TABLE IF EXISTS mail_greylist;
-CREATE TABLE mail_greylist (
-  greylist_id int(11) NOT NULL auto_increment,
-  relay_ip varchar(64) default NULL,
-  from_domain varchar(255) default NULL,
-  block_expires datetime NOT NULL default '0000-00-00 00:00:00',
-  record_expires datetime NOT NULL default '0000-00-00 00:00:00',
-  origin_type enum('MANUAL','AUTO') NOT NULL default 'AUTO',
-  create_time datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (greylist_id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_greylist`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_mailman_domain`
-#
-
-DROP TABLE IF EXISTS mail_mailman_domain;
-CREATE TABLE mail_mailman_domain (
-  mailman_id int(11) NOT NULL auto_increment,
-  server_id int(11) NOT NULL default '0',
-  domain varchar(255) NOT NULL default '',
-  mm_home varchar(255) NOT NULL default '',
-  mm_wrap varchar(255) NOT NULL default '',
-  mm_user varchar(50) NOT NULL default '',
-  mm_group varchar(50) NOT NULL default '',
-  PRIMARY KEY  (mailman_id,server_id,domain)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_mailman_domain`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_redirect`
-#
-
-DROP TABLE IF EXISTS mail_redirect;
-CREATE TABLE mail_redirect (
-  redirect_id int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_id int(11) NOT NULL default '0',
-  email varchar(255) NOT NULL default '',
-  destination varchar(255) NOT NULL default '',
-  type enum('alias','forward') NOT NULL default 'alias',
-  active enum('0','1') NOT NULL default '1',
-  PRIMARY KEY  (redirect_id),
-  KEY server_id (server_id,email)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_redirect`
-#
-
-INSERT INTO mail_redirect VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tom@test.de', 'till@test.de', 'alias', '1');
-INSERT INTO mail_redirect VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'hallo@test.de', 't.brehm@ensign.de', 'forward', '1');
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_transport`
-#
-
-DROP TABLE IF EXISTS mail_transport;
-CREATE TABLE mail_transport (
-  whitelist_id int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_id int(11) NOT NULL default '0',
-  domain varchar(255) NOT NULL default '',
-  destination varchar(255) NOT NULL default '',
-  active enum('0','1') NOT NULL default '1',
-  PRIMARY KEY  (whitelist_id),
-  KEY server_id (server_id,destination),
-  KEY server_id_2 (server_id,domain)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_transport`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `mail_whitelist`
-#
-
-DROP TABLE IF EXISTS mail_whitelist;
-CREATE TABLE mail_whitelist (
-  whitelist_id int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_id int(11) NOT NULL default '0',
-  address varchar(255) NOT NULL default '',
-  active enum('0','1') NOT NULL default '1',
-  PRIMARY KEY  (whitelist_id),
-  KEY server_id (server_id,address)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `mail_whitelist`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `reseller`
-#
-
-DROP TABLE IF EXISTS reseller;
-CREATE TABLE reseller (
-  reseller_id bigint(20) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  company varchar(255) NOT NULL default '',
-  title varchar(255) NOT NULL default '',
-  firstname varchar(255) NOT NULL default '',
-  surname varchar(255) NOT NULL default '',
-  street varchar(255) NOT NULL default '',
-  zip varchar(255) NOT NULL default '',
-  city varchar(255) NOT NULL default '',
-  country varchar(255) NOT NULL default '',
-  telephone varchar(255) NOT NULL default '',
-  mobile varchar(255) NOT NULL default '',
-  fax varchar(255) NOT NULL default '',
-  email varchar(255) NOT NULL default '',
-  internet varchar(255) NOT NULL default '',
-  icq varchar(255) NOT NULL default '',
-  notes text NOT NULL,
-  limit_client int(11) NOT NULL default '-1',
-  limit_domain int(11) NOT NULL default '-1',
-  limit_subdomain int(11) NOT NULL default '-1',
-  limit_mailbox int(11) NOT NULL default '-1',
-  limit_mailalias int(11) NOT NULL default '-1',
-  limit_webquota int(11) NOT NULL default '-1',
-  limit_mailquota int(11) NOT NULL default '-1',
-  limit_database int(11) NOT NULL default '-1',
-  ip_address text NOT NULL,
-  PRIMARY KEY  (reseller_id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `reseller`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `server`
-#
-
-DROP TABLE IF EXISTS server;
-CREATE TABLE server (
-  server_id bigint(20) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  server_name varchar(255) NOT NULL default '',
-  mail_server int(11) NOT NULL default '0',
-  web_server int(11) NOT NULL default '0',
-  dns_server int(11) NOT NULL default '0',
-  file_server int(11) NOT NULL default '0',
-  mysql_server int(11) NOT NULL default '0',
-  postgresql_server int(11) NOT NULL default '0',
-  firebird_server int(11) NOT NULL default '0',
-  active int(11) NOT NULL default '1',
-  PRIMARY KEY  (server_id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `server`
-#
-
-INSERT INTO server VALUES (1, 1, 1, 'riud', 'riud', '', 'Server 1', 1, 0, 0, 0, 0, 0, 0, 1);
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_datalog`
-#
-
-DROP TABLE IF EXISTS sys_datalog;
-CREATE TABLE sys_datalog (
-  datalog_id bigint(20) NOT NULL auto_increment,
-  dbtable varchar(255) NOT NULL default '',
-  dbidx varchar(255) NOT NULL default '',
-  action char(1) NOT NULL default '',
-  tstamp bigint(20) NOT NULL default '0',
-  user varchar(255) NOT NULL default '',
-  data text NOT NULL,
-  PRIMARY KEY  (datalog_id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_datalog`
-#
-
-INSERT INTO sys_datalog VALUES (1, 'mail_domain', 'domain_id:0', 'i', 1132758298, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:7:"test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:8:"hallo.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"alias";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (2, 'mail_domain', 'domain_id:2', 'u', 1132759303, 'admin', 'a:1:{s:6:"domain";a:2:{s:3:"old";s:7:"test.de";s:3:"new";s:8:"test2.de";}}');
-INSERT INTO sys_datalog VALUES (3, 'mail_domain', 'domain_id:2', 'u', 1132759328, 'admin', 'a:1:{s:11:"destination";a:2:{s:3:"old";s:8:"hallo.de";s:3:"new";s:7:"test.de";}}');
-INSERT INTO sys_datalog VALUES (4, 'mail_box', 'mailbox_id:0', 'i', 1132775402, 'admin', 'a:3:{s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:12:"till@test.de";}s:8:"cryptpwd";a:2:{s:3:"old";N;s:3:"new";s:5:"hallo";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (5, 'mail_box', 'mailbox_id:1', 'u', 1132775575, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (6, 'mail_box', 'mailbox_id:1', 'u', 1132775587, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (7, 'mail_box', 'mailbox_id:1', 'u', 1132775898, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (8, 'mail_box', 'mailbox_id:1', 'u', 1132775901, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (9, 'mail_box', 'mailbox_id:1', 'u', 1132777011, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (10, 'mail_box', 'mailbox_id:1', 'u', 1132777757, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (11, 'mail_box', 'mailbox_id:1', 'u', 1132777760, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (12, 'mail_box', 'mailbox_id:1', 'u', 1132777764, 'admin', 'a:2:{s:5:"email";a:2:{s:3:"old";s:12:"till@test.de";s:3:"new";s:13:"till2@test.de";}s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (13, 'mail_box', 'mailbox_id:1', 'u', 1132777768, 'admin', 'a:2:{s:5:"email";a:2:{s:3:"old";s:13:"till2@test.de";s:3:"new";s:12:"till@test.de";}s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (14, 'mail_box', 'mailbox_id:1', 'u', 1132778380, 'admin', 'a:2:{s:9:"server_id";a:2:{s:3:"old";s:1:"0";s:3:"new";i:1;}s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (15, 'mail_box', 'mailbox_id:1', 'u', 1132784990, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (16, 'mail_box', 'mailbox_id:0', 'i', 1132785424, 'admin', 'a:3:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:8:"@test.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (17, 'mail_box', 'mailbox_id:1', 'u', 1132786068, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (18, 'mail_box', 'mailbox_id:1', 'u', 1132786083, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (19, 'mail_box', 'mailbox_id:1', 'u', 1132786772, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (20, 'mail_box', 'mailbox_id:1', 'u', 1132786777, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:4:"test";}}');
-INSERT INTO sys_datalog VALUES (21, 'mail_box', 'mailbox_id:1', 'u', 1132786796, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:0:"";s:3:"new";s:4:"test";}}');
-INSERT INTO sys_datalog VALUES (22, 'mail_box', 'mailbox_id:1', 'u', 1132786860, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:0:"";s:3:"new";s:4:"test";}}');
-INSERT INTO sys_datalog VALUES (23, 'mail_box', 'mailbox_id:1', 'u', 1132787252, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:0:"";s:3:"new";s:4:"test";}}');
-INSERT INTO sys_datalog VALUES (24, 'mail_box', 'mailbox_id:1', 'u', 1132787548, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (25, 'mail_box', 'mailbox_id:1', 'u', 1132787761, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (26, 'mail_box', 'mailbox_id:0', 'i', 1132787775, 'admin', 'a:3:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:12:"test@test.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (27, 'mail_box', 'mailbox_id:1', 'u', 1132788121, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (28, 'mail_box', 'mailbox_id:1', 'u', 1132788482, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
-INSERT INTO sys_datalog VALUES (29, 'mail_redirect', 'redirect_id:0', 'i', 1132859789, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:11:"tom@test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:12:"till@test.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"alias";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (30, 'mail_redirect', 'redirect_id:0', 'i', 1132868928, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:13:"hallo@test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:17:"t.brehm@ensign.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:7:"forward";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (31, 'mail_domain_catchall', 'domain_catchall_id:0', 'i', 1132930015, 'admin', 'a:3:{s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:7:"test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:14:"info@ensign.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (32, 'mail_domain_catchall', 'domain_catchall_id:0', 'i', 1132930049, 'admin', 'a:3:{s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:7:"test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:14:"info@ensign.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (33, 'mail_domain_catchall', 'domain_catchall_id:1', 'u', 1132930357, 'admin', 'a:1:{s:9:"server_id";a:2:{s:3:"old";s:1:"0";s:3:"new";i:1;}}');
-INSERT INTO sys_datalog VALUES (34, 'mail_blacklist', 'blacklist_id:0', 'i', 1132932985, 'admin', 'a:3:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:7:"address";a:2:{s:3:"old";N;s:3:"new";s:11:"test@du.com";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_dbsync`
-#
-
-DROP TABLE IF EXISTS sys_dbsync;
-CREATE TABLE sys_dbsync (
-  id bigint(20) NOT NULL auto_increment,
-  jobname varchar(255) NOT NULL default '',
-  sync_interval_minutes int(11) NOT NULL default '0',
-  db_type varchar(255) NOT NULL default '',
-  db_host varchar(255) NOT NULL default '',
-  db_name varchar(255) NOT NULL default '',
-  db_username varchar(255) NOT NULL default '',
-  db_password varchar(255) NOT NULL default '',
-  db_tables varchar(255) NOT NULL default 'admin,forms',
-  empty_datalog int(11) NOT NULL default '0',
-  sync_datalog_external int(11) NOT NULL default '0',
-  active int(11) NOT NULL default '1',
-  last_datalog_id bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (id),
-  KEY last_datalog_id (last_datalog_id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_dbsync`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_filesync`
-#
-
-DROP TABLE IF EXISTS sys_filesync;
-CREATE TABLE sys_filesync (
-  id bigint(20) NOT NULL auto_increment,
-  jobname varchar(255) NOT NULL default '',
-  sync_interval_minutes int(11) NOT NULL default '0',
-  ftp_host varchar(255) NOT NULL default '',
-  ftp_path varchar(255) NOT NULL default '',
-  ftp_username varchar(255) NOT NULL default '',
-  ftp_password varchar(255) NOT NULL default '',
-  local_path varchar(255) NOT NULL default '',
-  wput_options varchar(255) NOT NULL default '--timestamping --reupload --dont-continue',
-  active int(11) NOT NULL default '1',
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_filesync`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_group`
-#
-
-DROP TABLE IF EXISTS sys_group;
-CREATE TABLE sys_group (
-  groupid int(11) NOT NULL auto_increment,
-  name varchar(255) NOT NULL default '',
-  description text NOT NULL,
-  PRIMARY KEY  (groupid)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_group`
-#
-
-INSERT INTO sys_group VALUES (1, 'admin', 'Administrators group');
-INSERT INTO sys_group VALUES (2, 'user', 'Users Group');
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_user`
-#
-
-DROP TABLE IF EXISTS sys_user;
-CREATE TABLE sys_user (
-  userid int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  username varchar(100) NOT NULL default '',
-  passwort varchar(100) NOT NULL default '',
-  modules varchar(255) NOT NULL default '',
-  startmodule varchar(255) NOT NULL default '',
-  app_theme varchar(100) NOT NULL default 'default',
-  typ varchar(20) NOT NULL default 'user',
-  active tinyint(4) NOT NULL default '1',
-  name varchar(100) NOT NULL default '',
-  vorname varchar(100) NOT NULL default '',
-  unternehmen varchar(100) NOT NULL default '',
-  strasse varchar(100) NOT NULL default '',
-  ort varchar(100) NOT NULL default '',
-  plz varchar(10) NOT NULL default '',
-  land varchar(50) NOT NULL default '',
-  email varchar(100) NOT NULL default '',
-  url varchar(255) NOT NULL default '',
-  telefon varchar(100) NOT NULL default '',
-  fax varchar(100) NOT NULL default '',
-  language varchar(10) NOT NULL default 'de',
-  groups varchar(255) NOT NULL default '',
-  default_group int(11) NOT NULL default '0',
-  PRIMARY KEY  (userid)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_user`
-#
-
-INSERT INTO sys_user VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,designer,sites', 'admin', 'default', 'admin', 1, '', 'Administrator', '', '', '', '', '', '', '', '', '', 'en', '1,2', 0);
-
+-- phpMyAdmin SQL Dump
+-- version 2.6.2-Debian-3sarge1
+-- http://www.phpmyadmin.net
+-- 
+-- Host: localhost
+-- Erstellungszeit: 25. November 2005 um 19:28
+-- Server Version: 4.0.24
+-- PHP-Version: 4.3.10-16
+-- 
+-- Datenbank: `mailserver`
+-- 
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_blacklist`
+-- 
+
+DROP TABLE IF EXISTS `mail_blacklist`;
+CREATE TABLE `mail_blacklist` (
+  `blacklist_id` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_id` int(11) NOT NULL default '0',
+  `address` varchar(255) NOT NULL default '',
+  `active` enum('0','1') NOT NULL default '1',
+  PRIMARY KEY  (`blacklist_id`),
+  KEY `server_id` (`server_id`,`address`)
+) TYPE=MyISAM AUTO_INCREMENT=2 ;
+
+-- 
+-- Daten für Tabelle `mail_blacklist`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_box`
+-- 
+
+DROP TABLE IF EXISTS `mail_box`;
+CREATE TABLE `mail_box` (
+  `mailbox_id` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_id` int(11) NOT NULL default '0',
+  `email` varchar(255) NOT NULL default '',
+  `cryptpwd` varchar(128) NOT NULL default '',
+  `clearpwd` varchar(128) NOT NULL default '',
+  `name` varchar(128) NOT NULL default '',
+  `uid` int(10) unsigned NOT NULL default '0',
+  `gid` int(10) unsigned NOT NULL default '0',
+  `maildir` varchar(255) NOT NULL default '',
+  `quota` varchar(255) NOT NULL default '',
+  `cc` varchar(50) NOT NULL default '',
+  `forward` varchar(50) NOT NULL default '',
+  `autoresponder` enum('0','1') NOT NULL default '0',
+  `autoresponder_text` tinytext NOT NULL,
+  `active` enum('0','1') NOT NULL default '1',
+  `antivirus` enum('yes','no') NOT NULL default 'no',
+  `spamscan` enum('yes','no') NOT NULL default 'no',
+  `spamdelete` enum('1','0') NOT NULL default '0',
+  PRIMARY KEY  (`mailbox_id`),
+  KEY `server_id` (`server_id`,`email`)
+) TYPE=MyISAM AUTO_INCREMENT=2 ;
+
+-- 
+-- Daten für Tabelle `mail_box`
+-- 
+
+INSERT INTO `mail_box` (`mailbox_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `email`, `cryptpwd`, `clearpwd`, `name`, `uid`, `gid`, `maildir`, `quota`, `cc`, `forward`, `autoresponder`, `autoresponder_text`, `active`, `antivirus`, `spamscan`, `spamdelete`) VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'till@test.int', '$1$tRlfKeOB$iHJgCn8mH8x/dh/XWy6v0/', '', '', 0, 0, '/var/spool/mail/till', '100', '', '', '0', '', '1', 'no', 'no', '1');
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_domain`
+-- 
+
+DROP TABLE IF EXISTS `mail_domain`;
+CREATE TABLE `mail_domain` (
+  `domain_id` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_id` int(11) NOT NULL default '0',
+  `domain` varchar(255) NOT NULL default '',
+  `type` enum('local','relay','alias') NOT NULL default 'local',
+  `relay_host` varchar(255) NOT NULL default '',
+  `destination` varchar(255) NOT NULL default '',
+  `active` tinyint(4) NOT NULL default '1',
+  PRIMARY KEY  (`domain_id`),
+  KEY `server_id` (`server_id`,`domain`,`type`)
+) TYPE=MyISAM AUTO_INCREMENT=7 ;
+
+-- 
+-- Daten für Tabelle `mail_domain`
+-- 
+
+INSERT INTO `mail_domain` (`domain_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `domain`, `type`, `relay_host`, `destination`, `active`) VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'test.int', 'local', '', '', 1);
+INSERT INTO `mail_domain` (`domain_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `domain`, `type`, `relay_host`, `destination`, `active`) VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'test2.int', 'alias', '', 'test.int', 1);
+INSERT INTO `mail_domain` (`domain_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `domain`, `type`, `relay_host`, `destination`, `active`) VALUES (5, 1, 0, 'riud', 'riud', '', 1, 'ensign.int', 'alias', '', 'ensign.de', 1);
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_domain_catchall`
+-- 
+
+DROP TABLE IF EXISTS `mail_domain_catchall`;
+CREATE TABLE `mail_domain_catchall` (
+  `domain_catchall_id` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_id` int(11) NOT NULL default '0',
+  `domain` varchar(255) NOT NULL default '',
+  `destination` varchar(255) NOT NULL default '',
+  `active` enum('0','1') NOT NULL default '1',
+  PRIMARY KEY  (`domain_catchall_id`),
+  KEY `server_id` (`server_id`,`domain`)
+) TYPE=MyISAM AUTO_INCREMENT=2 ;
+
+-- 
+-- Daten für Tabelle `mail_domain_catchall`
+-- 
+
+INSERT INTO `mail_domain_catchall` (`domain_catchall_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `domain`, `destination`, `active`) VALUES (1, 1, 1, 'riud', 'riud', '', 1, 'test.int', 'till@test.int', '1');
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_greylist`
+-- 
+
+DROP TABLE IF EXISTS `mail_greylist`;
+CREATE TABLE `mail_greylist` (
+  `greylist_id` int(11) NOT NULL auto_increment,
+  `relay_ip` varchar(64) default NULL,
+  `from_domain` varchar(255) default NULL,
+  `block_expires` datetime NOT NULL default '0000-00-00 00:00:00',
+  `record_expires` datetime NOT NULL default '0000-00-00 00:00:00',
+  `origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO',
+  `create_time` datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY  (`greylist_id`)
+) TYPE=MyISAM AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten für Tabelle `mail_greylist`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_mailman_domain`
+-- 
+
+DROP TABLE IF EXISTS `mail_mailman_domain`;
+CREATE TABLE `mail_mailman_domain` (
+  `mailman_id` int(11) NOT NULL auto_increment,
+  `server_id` int(11) NOT NULL default '0',
+  `domain` varchar(255) NOT NULL default '',
+  `mm_home` varchar(255) NOT NULL default '',
+  `mm_wrap` varchar(255) NOT NULL default '',
+  `mm_user` varchar(50) NOT NULL default '',
+  `mm_group` varchar(50) NOT NULL default '',
+  PRIMARY KEY  (`mailman_id`,`server_id`,`domain`)
+) TYPE=MyISAM AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten für Tabelle `mail_mailman_domain`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_redirect`
+-- 
+
+DROP TABLE IF EXISTS `mail_redirect`;
+CREATE TABLE `mail_redirect` (
+  `redirect_id` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_id` int(11) NOT NULL default '0',
+  `email` varchar(255) NOT NULL default '',
+  `destination` varchar(255) NOT NULL default '',
+  `type` enum('alias','forward') NOT NULL default 'alias',
+  `active` enum('0','1') NOT NULL default '1',
+  PRIMARY KEY  (`redirect_id`),
+  KEY `server_id` (`server_id`,`email`)
+) TYPE=MyISAM AUTO_INCREMENT=4 ;
+
+-- 
+-- Daten für Tabelle `mail_redirect`
+-- 
+
+INSERT INTO `mail_redirect` (`redirect_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `email`, `destination`, `type`, `active`) VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tom@test.int', 'till@test.int', 'alias', '1');
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_transport`
+-- 
+
+DROP TABLE IF EXISTS `mail_transport`;
+CREATE TABLE `mail_transport` (
+  `whitelist_id` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_id` int(11) NOT NULL default '0',
+  `domain` varchar(255) NOT NULL default '',
+  `destination` varchar(255) NOT NULL default '',
+  `active` enum('0','1') NOT NULL default '1',
+  PRIMARY KEY  (`whitelist_id`),
+  KEY `server_id` (`server_id`,`destination`),
+  KEY `server_id_2` (`server_id`,`domain`)
+) TYPE=MyISAM AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten für Tabelle `mail_transport`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `mail_whitelist`
+-- 
+
+DROP TABLE IF EXISTS `mail_whitelist`;
+CREATE TABLE `mail_whitelist` (
+  `whitelist_id` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_id` int(11) NOT NULL default '0',
+  `address` varchar(255) NOT NULL default '',
+  `active` enum('0','1') NOT NULL default '1',
+  PRIMARY KEY  (`whitelist_id`),
+  KEY `server_id` (`server_id`,`address`)
+) TYPE=MyISAM AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten für Tabelle `mail_whitelist`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `reseller`
+-- 
+
+DROP TABLE IF EXISTS `reseller`;
+CREATE TABLE `reseller` (
+  `reseller_id` bigint(20) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `company` varchar(255) NOT NULL default '',
+  `title` varchar(255) NOT NULL default '',
+  `firstname` varchar(255) NOT NULL default '',
+  `surname` varchar(255) NOT NULL default '',
+  `street` varchar(255) NOT NULL default '',
+  `zip` varchar(255) NOT NULL default '',
+  `city` varchar(255) NOT NULL default '',
+  `country` varchar(255) NOT NULL default '',
+  `telephone` varchar(255) NOT NULL default '',
+  `mobile` varchar(255) NOT NULL default '',
+  `fax` varchar(255) NOT NULL default '',
+  `email` varchar(255) NOT NULL default '',
+  `internet` varchar(255) NOT NULL default '',
+  `icq` varchar(255) NOT NULL default '',
+  `notes` text NOT NULL,
+  `limit_client` int(11) NOT NULL default '-1',
+  `limit_domain` int(11) NOT NULL default '-1',
+  `limit_subdomain` int(11) NOT NULL default '-1',
+  `limit_mailbox` int(11) NOT NULL default '-1',
+  `limit_mailalias` int(11) NOT NULL default '-1',
+  `limit_webquota` int(11) NOT NULL default '-1',
+  `limit_mailquota` int(11) NOT NULL default '-1',
+  `limit_database` int(11) NOT NULL default '-1',
+  `ip_address` text NOT NULL,
+  PRIMARY KEY  (`reseller_id`)
+) TYPE=MyISAM AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten für Tabelle `reseller`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `server`
+-- 
+
+DROP TABLE IF EXISTS `server`;
+CREATE TABLE `server` (
+  `server_id` bigint(20) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `server_name` varchar(255) NOT NULL default '',
+  `mail_server` int(11) NOT NULL default '0',
+  `web_server` int(11) NOT NULL default '0',
+  `dns_server` int(11) NOT NULL default '0',
+  `file_server` int(11) NOT NULL default '0',
+  `mysql_server` int(11) NOT NULL default '0',
+  `postgresql_server` int(11) NOT NULL default '0',
+  `firebird_server` int(11) NOT NULL default '0',
+  `active` int(11) NOT NULL default '1',
+  PRIMARY KEY  (`server_id`)
+) TYPE=MyISAM AUTO_INCREMENT=2 ;
+
+-- 
+-- Daten für Tabelle `server`
+-- 
+
+INSERT INTO `server` (`server_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_name`, `mail_server`, `web_server`, `dns_server`, `file_server`, `mysql_server`, `postgresql_server`, `firebird_server`, `active`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Server 1', 1, 0, 0, 0, 0, 0, 0, 1);
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `sys_datalog`
+-- 
+
+DROP TABLE IF EXISTS `sys_datalog`;
+CREATE TABLE `sys_datalog` (
+  `datalog_id` bigint(20) NOT NULL auto_increment,
+  `dbtable` varchar(255) NOT NULL default '',
+  `dbidx` varchar(255) NOT NULL default '',
+  `action` char(1) NOT NULL default '',
+  `tstamp` bigint(20) NOT NULL default '0',
+  `user` varchar(255) NOT NULL default '',
+  `data` text NOT NULL,
+  PRIMARY KEY  (`datalog_id`)
+) TYPE=MyISAM AUTO_INCREMENT=48 ;
+
+-- 
+-- Daten für Tabelle `sys_datalog`
+-- 
+
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (1, 'mail_domain', 'domain_id:0', 'i', 1132758298, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:7:"test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:8:"hallo.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"alias";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (2, 'mail_domain', 'domain_id:2', 'u', 1132759303, 'admin', 'a:1:{s:6:"domain";a:2:{s:3:"old";s:7:"test.de";s:3:"new";s:8:"test2.de";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (3, 'mail_domain', 'domain_id:2', 'u', 1132759328, 'admin', 'a:1:{s:11:"destination";a:2:{s:3:"old";s:8:"hallo.de";s:3:"new";s:7:"test.de";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (4, 'mail_box', 'mailbox_id:0', 'i', 1132775402, 'admin', 'a:3:{s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:12:"till@test.de";}s:8:"cryptpwd";a:2:{s:3:"old";N;s:3:"new";s:5:"hallo";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (5, 'mail_box', 'mailbox_id:1', 'u', 1132775575, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (6, 'mail_box', 'mailbox_id:1', 'u', 1132775587, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (7, 'mail_box', 'mailbox_id:1', 'u', 1132775898, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (8, 'mail_box', 'mailbox_id:1', 'u', 1132775901, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (9, 'mail_box', 'mailbox_id:1', 'u', 1132777011, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (10, 'mail_box', 'mailbox_id:1', 'u', 1132777757, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (11, 'mail_box', 'mailbox_id:1', 'u', 1132777760, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (12, 'mail_box', 'mailbox_id:1', 'u', 1132777764, 'admin', 'a:2:{s:5:"email";a:2:{s:3:"old";s:12:"till@test.de";s:3:"new";s:13:"till2@test.de";}s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (13, 'mail_box', 'mailbox_id:1', 'u', 1132777768, 'admin', 'a:2:{s:5:"email";a:2:{s:3:"old";s:13:"till2@test.de";s:3:"new";s:12:"till@test.de";}s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (14, 'mail_box', 'mailbox_id:1', 'u', 1132778380, 'admin', 'a:2:{s:9:"server_id";a:2:{s:3:"old";s:1:"0";s:3:"new";i:1;}s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (15, 'mail_box', 'mailbox_id:1', 'u', 1132784990, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (16, 'mail_box', 'mailbox_id:0', 'i', 1132785424, 'admin', 'a:3:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:8:"@test.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (17, 'mail_box', 'mailbox_id:1', 'u', 1132786068, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (18, 'mail_box', 'mailbox_id:1', 'u', 1132786083, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (19, 'mail_box', 'mailbox_id:1', 'u', 1132786772, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (20, 'mail_box', 'mailbox_id:1', 'u', 1132786777, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:32:"598d4c200461b81522a3328565c25f7c";s:3:"new";s:4:"test";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (21, 'mail_box', 'mailbox_id:1', 'u', 1132786796, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:0:"";s:3:"new";s:4:"test";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (22, 'mail_box', 'mailbox_id:1', 'u', 1132786860, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:0:"";s:3:"new";s:4:"test";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (23, 'mail_box', 'mailbox_id:1', 'u', 1132787252, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:0:"";s:3:"new";s:4:"test";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (24, 'mail_box', 'mailbox_id:1', 'u', 1132787548, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (25, 'mail_box', 'mailbox_id:1', 'u', 1132787761, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (26, 'mail_box', 'mailbox_id:0', 'i', 1132787775, 'admin', 'a:3:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:12:"test@test.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (27, 'mail_box', 'mailbox_id:1', 'u', 1132788121, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (28, 'mail_box', 'mailbox_id:1', 'u', 1132788482, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (29, 'mail_redirect', 'redirect_id:0', 'i', 1132859789, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:11:"tom@test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:12:"till@test.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"alias";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (30, 'mail_redirect', 'redirect_id:0', 'i', 1132868928, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:13:"hallo@test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:17:"t.brehm@ensign.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:7:"forward";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (31, 'mail_domain_catchall', 'domain_catchall_id:0', 'i', 1132930015, 'admin', 'a:3:{s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:7:"test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:14:"info@ensign.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (32, 'mail_domain_catchall', 'domain_catchall_id:0', 'i', 1132930049, 'admin', 'a:3:{s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:7:"test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:14:"info@ensign.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (33, 'mail_domain_catchall', 'domain_catchall_id:1', 'u', 1132930357, 'admin', 'a:1:{s:9:"server_id";a:2:{s:3:"old";s:1:"0";s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (34, 'mail_blacklist', 'blacklist_id:0', 'i', 1132932985, 'admin', 'a:3:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:7:"address";a:2:{s:3:"old";N;s:3:"new";s:11:"test@du.com";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (35, 'mail_domain', 'domain_id:1', 'u', 1129060359, 'admin', 'a:1:{s:6:"domain";a:2:{s:3:"old";s:7:"test.de";s:3:"new";s:8:"test.int";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (36, 'mail_box', 'mailbox_id:1', 'u', 1129060368, 'admin', 'a:2:{s:5:"email";a:2:{s:3:"old";s:12:"till@test.de";s:3:"new";s:13:"till@test.int";}s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:4:"test";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (37, 'mail_domain', 'domain_id:2', 'u', 1129061030, 'admin', 'a:2:{s:6:"domain";a:2:{s:3:"old";s:8:"test2.de";s:3:"new";s:9:"test2.int";}s:11:"destination";a:2:{s:3:"old";s:7:"test.de";s:3:"new";s:8:"test.int";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (38, 'mail_domain', 'domain_id:0', 'i', 1129061071, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:10:"ensign.int";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:9:"ensign.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"alias";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (39, 'mail_domain', 'domain_id:0', 'i', 1129061096, 'admin', 'a:4:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:9:"ensign.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"relay";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (40, 'mail_domain', 'domain_id:3', 'u', 1129061354, 'admin', 'a:1:{s:11:"destination";a:2:{s:3:"old";s:9:"ensign.de";s:3:"new";s:8:"test.int";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (41, 'mail_domain', 'domain_id:0', 'i', 1129061553, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:10:"ensign.int";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:9:"ensign.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"alias";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (42, 'mail_redirect', 'redirect_id:1', 'u', 1129061645, 'admin', 'a:2:{s:5:"email";a:2:{s:3:"old";s:11:"tom@test.de";s:3:"new";s:12:"tom@test.int";}s:11:"destination";a:2:{s:3:"old";s:12:"till@test.de";s:3:"new";s:13:"till@test.int";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (43, 'mail_domain', 'domain_id:0', 'i', 1129061671, 'admin', 'a:4:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:6:"domain";a:2:{s:3:"old";N;s:3:"new";s:9:"ensign.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"relay";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (44, 'mail_redirect', 'redirect_id:2', 'u', 1129061890, 'admin', 'a:1:{s:5:"email";a:2:{s:3:"old";s:13:"hallo@test.de";s:3:"new";s:13:"till@test.int";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (45, 'mail_redirect', 'redirect_id:0', 'i', 1129061918, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:13:"till@test.int";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:13:"till@test.int";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:7:"forward";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (46, 'mail_domain_catchall', 'domain_catchall_id:1', 'u', 1129061999, 'admin', 'a:2:{s:6:"domain";a:2:{s:3:"old";s:7:"test.de";s:3:"new";s:8:"test.int";}s:11:"destination";a:2:{s:3:"old";s:14:"info@ensign.de";s:3:"new";s:13:"till@test.int";}}');
+INSERT INTO `sys_datalog` (`datalog_id`, `dbtable`, `dbidx`, `action`, `tstamp`, `user`, `data`) VALUES (47, 'mail_blacklist', 'blacklist_id:1', 'u', 1132941485, 'admin', 'a:1:{s:7:"address";a:2:{s:3:"old";s:11:"test@du.com";s:3:"new";s:13:"till@test.int";}}');
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `sys_dbsync`
+-- 
+
+DROP TABLE IF EXISTS `sys_dbsync`;
+CREATE TABLE `sys_dbsync` (
+  `id` bigint(20) NOT NULL auto_increment,
+  `jobname` varchar(255) NOT NULL default '',
+  `sync_interval_minutes` int(11) NOT NULL default '0',
+  `db_type` varchar(255) NOT NULL default '',
+  `db_host` varchar(255) NOT NULL default '',
+  `db_name` varchar(255) NOT NULL default '',
+  `db_username` varchar(255) NOT NULL default '',
+  `db_password` varchar(255) NOT NULL default '',
+  `db_tables` varchar(255) NOT NULL default 'admin,forms',
+  `empty_datalog` int(11) NOT NULL default '0',
+  `sync_datalog_external` int(11) NOT NULL default '0',
+  `active` int(11) NOT NULL default '1',
+  `last_datalog_id` bigint(20) NOT NULL default '0',
+  PRIMARY KEY  (`id`),
+  KEY `last_datalog_id` (`last_datalog_id`)
+) TYPE=MyISAM AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten für Tabelle `sys_dbsync`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `sys_filesync`
+-- 
+
+DROP TABLE IF EXISTS `sys_filesync`;
+CREATE TABLE `sys_filesync` (
+  `id` bigint(20) NOT NULL auto_increment,
+  `jobname` varchar(255) NOT NULL default '',
+  `sync_interval_minutes` int(11) NOT NULL default '0',
+  `ftp_host` varchar(255) NOT NULL default '',
+  `ftp_path` varchar(255) NOT NULL default '',
+  `ftp_username` varchar(255) NOT NULL default '',
+  `ftp_password` varchar(255) NOT NULL default '',
+  `local_path` varchar(255) NOT NULL default '',
+  `wput_options` varchar(255) NOT NULL default '--timestamping --reupload --dont-continue',
+  `active` int(11) NOT NULL default '1',
+  PRIMARY KEY  (`id`)
+) TYPE=MyISAM AUTO_INCREMENT=1 ;
+
+-- 
+-- Daten für Tabelle `sys_filesync`
+-- 
+
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `sys_group`
+-- 
+
+DROP TABLE IF EXISTS `sys_group`;
+CREATE TABLE `sys_group` (
+  `groupid` int(11) NOT NULL auto_increment,
+  `name` varchar(255) NOT NULL default '',
+  `description` text NOT NULL,
+  PRIMARY KEY  (`groupid`)
+) TYPE=MyISAM AUTO_INCREMENT=3 ;
+
+-- 
+-- Daten für Tabelle `sys_group`
+-- 
+
+INSERT INTO `sys_group` (`groupid`, `name`, `description`) VALUES (1, 'admin', 'Administrators group');
+INSERT INTO `sys_group` (`groupid`, `name`, `description`) VALUES (2, 'user', 'Users Group');
+
+-- --------------------------------------------------------
+
+-- 
+-- Tabellenstruktur für Tabelle `sys_user`
+-- 
+
+DROP TABLE IF EXISTS `sys_user`;
+CREATE TABLE `sys_user` (
+  `userid` int(11) NOT NULL auto_increment,
+  `sys_userid` int(11) NOT NULL default '0',
+  `sys_groupid` int(11) NOT NULL default '0',
+  `sys_perm_user` varchar(5) NOT NULL default '',
+  `sys_perm_group` varchar(5) NOT NULL default '',
+  `sys_perm_other` varchar(5) NOT NULL default '',
+  `username` varchar(100) NOT NULL default '',
+  `passwort` varchar(100) NOT NULL default '',
+  `modules` varchar(255) NOT NULL default '',
+  `startmodule` varchar(255) NOT NULL default '',
+  `app_theme` varchar(100) NOT NULL default 'default',
+  `typ` varchar(20) NOT NULL default 'user',
+  `active` tinyint(4) NOT NULL default '1',
+  `name` varchar(100) NOT NULL default '',
+  `vorname` varchar(100) NOT NULL default '',
+  `unternehmen` varchar(100) NOT NULL default '',
+  `strasse` varchar(100) NOT NULL default '',
+  `ort` varchar(100) NOT NULL default '',
+  `plz` varchar(10) NOT NULL default '',
+  `land` varchar(50) NOT NULL default '',
+  `email` varchar(100) NOT NULL default '',
+  `url` varchar(255) NOT NULL default '',
+  `telefon` varchar(100) NOT NULL default '',
+  `fax` varchar(100) NOT NULL default '',
+  `language` varchar(10) NOT NULL default 'de',
+  `groups` varchar(255) NOT NULL default '',
+  `default_group` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`userid`)
+) TYPE=MyISAM AUTO_INCREMENT=2 ;
+
+-- 
+-- Daten für Tabelle `sys_user`
+-- 
+
+INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `name`, `vorname`, `unternehmen`, `strasse`, `ort`, `plz`, `land`, `email`, `url`, `telefon`, `fax`, `language`, `groups`, `default_group`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,designer,sites', 'admin', 'default', 'admin', 1, '', 'Administrator', '', '', '', '', '', '', '', '', '', 'en', '1,2', 0);
diff --git a/interface/web/sites/templates/mail_domain_catchall_edit.htm b/interface/web/sites/templates/mail_domain_catchall_edit.htm
index 892da9c31c..e6445f3eb3 100644
--- a/interface/web/sites/templates/mail_domain_catchall_edit.htm
+++ b/interface/web/sites/templates/mail_domain_catchall_edit.htm
@@ -1,7 +1,7 @@
 <table width="500" border="0" cellspacing="0" cellpadding="2">
   <tr>
     <td width="126" class="frmText11">{tmpl_var name='domain_txt'}:</td>
-    <td width="366" class="frmText11">
+    <td width="366" class="frmText11">* @ 
 		<select name="domain" class="text">
 			{tmpl_var name='domain'}
 		</select>
-- 
GitLab