diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 90274d239b747aab3995666fd8491b02cb412180..b294605f50cd34baf0c0c4a366ad86960e79d9c3 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1,6 +1,6 @@
 
 /*
-Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2009, Till Brehm, projektfarm Gmbh
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -29,39 +29,160 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -- 
 -- ISPConfig 3
--- DB-Version: 3.0.0.8
+-- DB-Version: 3.0.0.9
 -- 
 
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- --------------------------------------------------------
+-- --------------------------------------------------------
+-- DB-STRUCTURE
+-- --------------------------------------------------------
 -- --------------------------------------------------------
 
 -- 
--- Table structure for table  `client`
+-- Table structure for table  `billing_invoice`
 -- 
 
-SET FOREIGN_KEY_CHECKS = 0;
+CREATE TABLE `billing_invoice` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_all` varchar(5) default NULL,
+  `invoice_number` varchar(32) NOT NULL default '',
+  `invoice_date` date default NULL,
+  `xml` longtext NOT NULL,
+  `total_fee` decimal(10,2) NOT NULL default '0.00',
+  `total_fee_taxed` decimal(10,2) NOT NULL default '0.00',
+  `currency` char(3) default 'EUR',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `billing_product`
+-- 
+
+CREATE TABLE `billing_product` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_all` varchar(5) default NULL,
+  `parent_id` int(11) unsigned NOT NULL default '0',
+  `product_name` varchar(64) default NULL,
+  `product_details` varchar(255) default NULL,
+  `template_id` int(11) unsigned NOT NULL default '0',
+  `service_class_id` int(11) unsigned NOT NULL default '0',
+  `taxclass` int(11) unsigned NOT NULL default '0',
+  `setup_fee` decimal(10,2) NOT NULL default '0.00',
+  `interval_fee` decimal(10,2) NOT NULL default '0.00',
+  `interval_length` tinyint(3) NOT NULL default '0',
+  `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
+  `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
+  `clearing_period` tinyint(3) unsigned default '1',
+  `currency` char(3) default 'EUR',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `billing_service`
+-- 
+
+CREATE TABLE `billing_service` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_all` varchar(5) default NULL,
+  `product_id` int(11) unsigned default NULL,
+  `product_parent_id` int(11) unsigned default NULL,
+  `product_name` varchar(64) default NULL,
+  `product_details` varchar(255) default NULL,
+  `service_class_id` int(11) unsigned default '0',
+  `service_template_id` int(11) unsigned default NULL,
+  `service_id` int(11) unsigned default NULL,
+  `taxclass` int(11) unsigned NOT NULL default '1',
+  `quantity` smallint(5) unsigned NOT NULL default '1',
+  `setup_fee` decimal(10,2) NOT NULL default '0.00',
+  `interval_fee` decimal(10,2) default '0.00',
+  `interval_fee_is_individual` tinyint(1) default '0',
+  `interval_length` int(11) NOT NULL default '1',
+  `interval_type` enum('non-recurring','hour','day','week','month','quarter','year') NOT NULL default 'non-recurring',
+  `interval_payment` enum('prepaid','postpaid') NOT NULL default 'prepaid',
+  `clearing_period` tinyint(3) unsigned default '1',
+  `currency` char(3) default 'EUR',
+  `is_active` tinyint(1) NOT NULL default '0',
+  `servicestart_at` date default NULL,
+  `serviceend_at` date default NULL,
+  `invoiced_upto` date default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `billing_service_class`
+-- 
+
+CREATE TABLE `billing_service_class` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `name` varchar(64) NOT NULL default '',
+  `sort_order` int(11) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `billing_tax_class`
+-- 
+
+CREATE TABLE `billing_tax_class` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `name` varchar(64) NOT NULL default '',
+  `taxrate` decimal(10,2) default NULL,
+  `is_default` tinyint(1) NOT NULL default '0',
+  `valid_from` date default NULL,
+  `valid_till` date default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `client`
+-- 
 
 CREATE TABLE `client` (
-  `client_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `client_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `company_name` varchar(255) default NULL,
-  `contact_name` varchar(255) default NULL,
+  `company_name` varchar(64) default NULL,
+  `contact_name` varchar(64) default NULL,
   `street` varchar(255) default NULL,
-  `zip` varchar(255) default NULL,
-  `city` varchar(255) default NULL,
-  `state` varchar(255) default NULL,
-  `country` varchar(255) default NULL,
-  `telephone` varchar(255) default NULL,
-  `mobile` varchar(255) default NULL,
-  `fax` varchar(255) default NULL,
+  `zip` varchar(32) default NULL,
+  `city` varchar(64) default NULL,
+  `state` varchar(32) default NULL,
+  `country` char(2) default NULL,
+  `telephone` varchar(32) default NULL,
+  `mobile` varchar(32) default NULL,
+  `fax` varchar(32) default NULL,
   `email` varchar(255) default NULL,
   `internet` varchar(255) NOT NULL,
-  `icq` varchar(255) default NULL,
+  `icq` varchar(16) default NULL,
   `notes` text,
-  `default_mailserver` int(11) NOT NULL default '1',
+  `default_mailserver` int(11) unsigned NOT NULL default '1',
   `limit_maildomain` int(11) NOT NULL default '-1',
   `limit_mailbox` int(11) NOT NULL default '-1',
   `limit_mailalias` int(11) NOT NULL default '-1',
@@ -74,7 +195,7 @@ CREATE TABLE `client` (
   `limit_spamfilter_wblist` int(11) NOT NULL default '0',
   `limit_spamfilter_user` int(11) NOT NULL default '0',
   `limit_spamfilter_policy` int(11) NOT NULL default '0',
-  `default_webserver` int(11) NOT NULL default '1',
+  `default_webserver` int(11) unsigned NOT NULL default '1',
   `limit_web_ip` text,
   `limit_web_domain` int(11) NOT NULL default '-1',
   `web_php_options` varchar(255) NOT NULL default 'no,fast-cgi,cgi,mod,suphp',
@@ -83,21 +204,54 @@ CREATE TABLE `client` (
   `limit_ftp_user` int(11) NOT NULL default '-1',
   `limit_shell_user` int(11) NOT NULL default '0',
   `ssh_chroot` varchar(255) NOT NULL DEFAULT 'no,jailkit,ssh-chroot',
-  `default_dnsserver` int(10) unsigned NOT NULL default '1',
+  `default_dnsserver` int(11) unsigned NOT NULL default '1',
   `limit_dns_zone` int(11) NOT NULL default '-1',
   `limit_dns_record` int(11) NOT NULL default '-1',
-  `default_dbserver` int(10) unsigned NOT NULL default '1',
+  `default_dbserver` int(11) NOT NULL default '1',
   `limit_database` int(11) NOT NULL default '-1',
   `limit_client` int(11) NOT NULL default '0',
-  `parent_client_id` int(10) unsigned NOT NULL default '0',
-  `username` varchar(255) default NULL,
-  `password` varchar(255) default NULL,
-  `language` varchar(255) NOT NULL default 'en',
-  `usertheme` varchar(255) NOT NULL default 'default',
-  `template_master` bigint(20) NOT NULL default '0',
+  `parent_client_id` int(11) unsigned NOT NULL default '0',
+  `username` varchar(64) default NULL,
+  `password` varchar(64) default NULL,
+  `language` char(2) NOT NULL default 'en',
+  `usertheme` varchar(32) NOT NULL default 'default',
+  `template_master` int(11) unsigned NOT NULL default '0',
   `template_additional` varchar(255) NOT NULL default '',
+  `created_at` datetime default NULL,
   PRIMARY KEY  (`client_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `client_address_book`
+-- 
+
+CREATE TABLE `client_address_book` (
+  `address_book_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_other` varchar(5) default NULL,
+  `role` enum('Standard','Other','Administrator','Abuse','Accounting','Owner','Emergency','Technician','Signatory') default 'Standard',
+  `entry_company` varchar(64) default NULL,
+  `entry_gender` enum('m','f') default NULL,
+  `entry_title` varchar(16) default NULL,
+  `entry_firstname` varchar(32) NOT NULL,
+  `entry_lastname` varchar(32) NOT NULL,
+  `entry_address1` varchar(64) default NULL,
+  `entry_address2` varchar(64) default NULL,
+  `entry_postcode` varchar(32) NOT NULL,
+  `entry_city` varchar(64) NOT NULL,
+  `entry_state` varchar(32) default NULL,
+  `entry_country` char(2) default NULL,
+  `entry_phone` varchar(32) default NULL,
+  `entry_fax` varchar(32) default NULL,
+  `entry_mobile` varchar(32) default NULL,
+  `entry_email` varchar(255) default NULL,
+  PRIMARY KEY  (`address_book_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -106,8 +260,13 @@ CREATE TABLE `client` (
 -- 
 
 CREATE TABLE `client_template` (
-  `template_id` bigint(20) NOT NULL auto_increment,
-  `template_name` varchar(50) NOT NULL,
+  `template_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_other` varchar(5) default NULL,  
+  `template_name` varchar(64) NOT NULL,
   `template_type` varchar(1) NOT NULL default 'm',
   `limit_maildomain` int(11) NOT NULL default '-1',
   `limit_mailbox` int(11) NOT NULL default '-1',
@@ -131,13 +290,8 @@ CREATE TABLE `client_template` (
   `limit_dns_record` int(11) NOT NULL default '-1',
   `limit_database` int(11) NOT NULL default '-1',
   `limit_client` int(11) NOT NULL default '0',
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
-  `sys_perm_user` varchar(5) default NULL,
-  `sys_perm_group` varchar(5) default NULL,
-  `sys_perm_other` varchar(5) default NULL,  
   PRIMARY KEY  (`template_id`)
-) ENGINE=MyISAM  AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -146,23 +300,23 @@ CREATE TABLE `client_template` (
 -- 
 
 CREATE TABLE `dns_rr` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL,
-  `sys_groupid` int(11) NOT NULL,
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL,
+  `sys_groupid` int(11) unsigned NOT NULL,
   `sys_perm_user` varchar(5) NOT NULL,
   `sys_perm_group` varchar(5) NOT NULL,
   `sys_perm_other` varchar(5) NOT NULL,
   `server_id` int(11) NOT NULL default '1',
-  `zone` int(10) unsigned NOT NULL,
-  `name` char(64) NOT NULL,
+  `zone` int(11) unsigned NOT NULL,
+  `name` varchar(64) NOT NULL,
   `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
-  `data` char(128) NOT NULL,
-  `aux` int(10) unsigned NOT NULL default '0',
-  `ttl` int(10) unsigned NOT NULL default '86400',
+  `data` varchar(128) NOT NULL,
+  `aux` int(11) unsigned NOT NULL default '0',
+  `ttl` int(11) unsigned NOT NULL default '86400',
   `active` enum('N','Y') NOT NULL default 'Y',
   PRIMARY KEY  (`id`),
   UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -172,27 +326,27 @@ CREATE TABLE `dns_rr` (
 
 CREATE TABLE `dns_soa` (
   `id` int(10) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL,
-  `sys_groupid` int(11) NOT NULL,
+  `sys_userid` int(11) unsigned NOT NULL,
+  `sys_groupid` int(11) unsigned NOT NULL,
   `sys_perm_user` varchar(5) NOT NULL,
   `sys_perm_group` varchar(5) NOT NULL,
   `sys_perm_other` varchar(5) NOT NULL,
   `server_id` int(11) NOT NULL default '1',
-  `origin` char(255) NOT NULL,
-  `ns` char(255) NOT NULL,
-  `mbox` char(255) NOT NULL,
-  `serial` int(10) unsigned NOT NULL default '1',
-  `refresh` int(10) unsigned NOT NULL default '28800',
-  `retry` int(10) unsigned NOT NULL default '7200',
-  `expire` int(10) unsigned NOT NULL default '604800',
-  `minimum` int(10) unsigned NOT NULL default '86400',
-  `ttl` int(10) unsigned NOT NULL default '86400',
-  `active` enum('Y','N') NOT NULL,
-  `xfer` char(255) NOT NULL,
+  `origin` varchar(255) NOT NULL,
+  `ns` varchar(255) NOT NULL,
+  `mbox` varchar(255) NOT NULL,
+  `serial` int(11) unsigned NOT NULL default '1',
+  `refresh` int(11) unsigned NOT NULL default '28800',
+  `retry` int(11) unsigned NOT NULL default '7200',
+  `expire` int(11) unsigned NOT NULL default '604800',
+  `minimum` int(11) unsigned NOT NULL default '86400',
+  `ttl` int(11) unsigned NOT NULL default '86400',
+  `active` enum('N','Y') NOT NULL,
+  `xfer` varchar(255) NOT NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `origin` (`origin`),
   KEY `active` (`active`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -201,24 +355,102 @@ CREATE TABLE `dns_soa` (
 -- 
 
 CREATE TABLE `dns_template` (
-  `template_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `template_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `name` varchar(255) default NULL,
+  `name` varchar(64) default NULL,
   `fields` varchar(255) default NULL,
   `template` text,
-  `visible` varchar(255) NOT NULL default 'Y',
+  `visible` enum('N','Y') NOT NULL default 'Y',
   PRIMARY KEY  (`template_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
 
 -- 
--- Dumping data for table `dns_template`
+-- Table structure for table  `domain`
 -- 
 
-INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=28800\nretry=7200\nexpire=604800\nminimum=86400\nttl=86400\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|86400\nA|www|{IP}|0|86400\nA|mail|{IP}|0|86400\nNS|{DOMAIN}.|{NS1}.|0|86400\nNS|{DOMAIN}.|{NS2}.|0|86400\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|86400', 'y');
+CREATE TABLE `domain` (
+  `domain_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_all` varchar(5) default NULL,
+  `domain_provider_id` int(11) unsigned NOT NULL default '0',
+  `provider_domain_id` int(11) unsigned default NULL,
+  `domain` varchar(255) NOT NULL default '',
+  `tld` varchar(32) NOT NULL default '',
+  `handle_desc` varchar(32) default NULL,
+  `handle_adminc` varchar(32) default NULL,
+  `handle_techc` varchar(32) default NULL,
+  `handle_zonec` varchar(32) default NULL,
+  `added_at` timestamp NULL default NULL,
+  `connected_at` date default NULL,
+  `disconnected_at` date default NULL,
+  `status` varchar(64) NOT NULL default '0',
+  PRIMARY KEY  (`domain_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `domain_handle`
+-- 
+
+CREATE TABLE `domain_handle` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_all` varchar(5) default NULL,
+  `domain_registrar` varchar(64) default NULL,
+  `handle` varchar(32) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `domain_provider`
+-- 
+
+CREATE TABLE `domain_provider` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_all` varchar(5) default NULL,
+  `provider` varchar(255) default NULL,
+  `is_extern` tinyint(1) NOT NULL default '0',
+  `domainrobot_interface` varchar(16) default '',
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
+-- --------------------------------------------------------
+
+-- 
+-- Table structure for table  `domain_tld`
+-- 
+
+CREATE TABLE `domain_tld` (
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
+  `sys_perm_user` varchar(5) default NULL,
+  `sys_perm_group` varchar(5) default NULL,
+  `sys_perm_all` varchar(5) default NULL,
+  `tld` varchar(32) default NULL,
+  `domain_provider_id` int(11) unsigned NOT NULL default '0',
+  `domain_registrar` varchar(64) default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -227,18 +459,18 @@ INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_per
 -- 
 
 CREATE TABLE `firewall` (
-  `firewall_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `firewall_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `server_id` int(11) NOT NULL default '0',
+  `server_id` int(11) unsigned NOT NULL default '0',
   `tcp_port` varchar(255) default NULL,
   `udp_port` varchar(255) default NULL,
-  `active` varchar(255) NOT NULL default 'y',
+  `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`firewall_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -247,20 +479,20 @@ CREATE TABLE `firewall` (
 -- 
 
 CREATE TABLE `ftp_user` (
-  `ftp_user_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `ftp_user_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `server_id` int(11) NOT NULL default '0',
-  `parent_domain_id` int(11) NOT NULL default '0',
-  `username` varchar(255) default NULL,
-  `password` varchar(255) default NULL,
+  `server_id` int(11) unsigned NOT NULL default '0',
+  `parent_domain_id` int(11) unsigned NOT NULL default '0',
+  `username` varchar(64) default NULL,
+  `password` varchar(64) default NULL,
   `quota_size` int(11) NOT NULL default '-1',
-  `active` varchar(255) NOT NULL default 'y',
-  `uid` varchar(255) default NULL,
-  `gid` varchar(255) default NULL,
+  `active` enum('n','y') NOT NULL default 'y',
+  `uid` varchar(64) default NULL,
+  `gid` varchar(64) default NULL,
   `dir` varchar(255) default NULL,
   `quota_files` int(11) NOT NULL default '-1',
   `ul_ratio` int(11) NOT NULL default '-1',
@@ -272,7 +504,7 @@ CREATE TABLE `ftp_user` (
   KEY `server_id` (`server_id`),
   KEY `username` (`username`),
   KEY `quota_files` (`quota_files`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -281,9 +513,9 @@ CREATE TABLE `ftp_user` (
 -- 
 
 CREATE TABLE `mail_access` (
-  `access_id` int(11) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `access_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned 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 '',
@@ -294,7 +526,7 @@ CREATE TABLE `mail_access` (
   `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`access_id`),
   KEY `server_id` (`server_id`,`source`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -303,9 +535,9 @@ CREATE TABLE `mail_access` (
 -- 
 
 CREATE TABLE `mail_content_filter` (
-  `content_filter_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `content_filter_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
@@ -316,7 +548,7 @@ CREATE TABLE `mail_content_filter` (
   `action` varchar(255) default NULL,
   `active` varchar(255) NOT NULL default 'y',
   PRIMARY KEY  (`content_filter_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -325,19 +557,19 @@ CREATE TABLE `mail_content_filter` (
 -- 
 
 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',
+  `domain_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned 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',
+  `server_id` int(11) unsigned NOT NULL default '0',
   `domain` varchar(255) NOT NULL default '',
-  `active` enum('y','n') NOT NULL,
+  `active` enum('n','y') NOT NULL,
   PRIMARY KEY  (`domain_id`),
   KEY `server_id` (`server_id`,`domain`),
   KEY `domain_active` (`domain`,`active`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -346,20 +578,20 @@ CREATE TABLE `mail_domain` (
 -- 
 
 CREATE TABLE `mail_forwarding` (
-  `forwarding_id` int(11) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `forwarding_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned 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',
+  `server_id` int(11) unsigned NOT NULL default '0',
   `source` varchar(255) NOT NULL,
   `destination` varchar(255) NOT NULL default '',
   `type` enum('alias','forward','catchall') NOT NULL default 'alias',
-  `active` enum('y','n') NOT NULL,
+  `active` enum('n','y') NOT NULL,
   PRIMARY KEY  (`forwarding_id`),
   KEY `server_id` (`server_id`,`source`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -368,22 +600,22 @@ CREATE TABLE `mail_forwarding` (
 -- 
 
 CREATE TABLE `mail_get` (
-  `mailget_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `mailget_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `server_id` int(11) NOT NULL default '0',
+  `server_id` int(11) unsigned NOT NULL default '0',
   `type` varchar(255) default NULL,
   `source_server` varchar(255) default NULL,
   `source_username` varchar(255) default NULL,
-  `source_password` varchar(255) default NULL,
+  `source_password` varchar(64) default NULL,
   `source_delete` varchar(255) NOT NULL default 'y',
   `destination` varchar(255) default NULL,
   `active` varchar(255) NOT NULL default 'y',
   PRIMARY KEY  (`mailget_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -392,15 +624,15 @@ CREATE TABLE `mail_get` (
 -- 
 
 CREATE TABLE `mail_greylist` (
-  `greylist_id` int(11) NOT NULL auto_increment,
-  `relay_ip` varchar(64) default NULL,
+  `greylist_id` int(11) unsigned NOT NULL auto_increment,
+  `relay_ip` varchar(39) 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`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -409,15 +641,15 @@ CREATE TABLE `mail_greylist` (
 -- 
 
 CREATE TABLE `mail_mailman_domain` (
-  `mailman_id` int(11) NOT NULL auto_increment,
-  `server_id` int(11) NOT NULL default '0',
+  `mailman_id` int(11) unsigned NOT NULL auto_increment,
+  `server_id` int(11) unsigned 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`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 
 -- --------------------------------------------------------
@@ -427,13 +659,13 @@ CREATE TABLE `mail_mailman_domain` (
 -- 
 
 CREATE TABLE `mail_traffic` (
-  `traffic_id` int(10) unsigned NOT NULL auto_increment,
-  `mailuser_id` int(10) unsigned NOT NULL,
+  `traffic_id` int(11) unsigned NOT NULL auto_increment,
+  `mailuser_id` int(11) unsigned NOT NULL,
   `month` char(7) NOT NULL,
   `traffic` bigint(20) unsigned NOT NULL,
   PRIMARY KEY  (`traffic_id`),
   KEY `mailuser_id` (`mailuser_id`,`month`)
-) ENGINE=MyISAM AUTO_INCREMENT=2 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -442,21 +674,21 @@ CREATE TABLE `mail_traffic` (
 -- 
 
 CREATE TABLE `mail_transport` (
-  `transport_id` int(11) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `transport_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned 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',
+  `server_id` int(11) unsigned NOT NULL default '0',
   `domain` varchar(255) NOT NULL default '',
   `transport` varchar(255) NOT NULL,
-  `sort_order` int(11) NOT NULL default '5',
-  `active` enum('y','n') NOT NULL,
+  `sort_order` int(11) unsigned NOT NULL default '5',
+  `active` enum('n','y') NOT NULL,
   PRIMARY KEY  (`transport_id`),
   KEY `server_id` (`server_id`,`transport`),
   KEY `server_id_2` (`server_id`,`domain`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -465,32 +697,32 @@ CREATE TABLE `mail_transport` (
 -- 
 
 CREATE TABLE `mail_user` (
-  `mailuser_id` int(11) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `mailuser_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned 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',
+  `server_id` int(11) unsigned NOT NULL default '0',
   `email` varchar(255) NOT NULL default '',
   `password` varchar(255) NOT NULL,
-  `name` varchar(128) NOT NULL default '',
-  `uid` int(10) unsigned NOT NULL default '5000',
-  `gid` int(10) unsigned NOT NULL default '5000',
+  `name` varchar(255) NOT NULL default '',
+  `uid` int(11) unsigned NOT NULL default '5000',
+  `gid` int(11) unsigned NOT NULL default '5000',
   `maildir` varchar(255) NOT NULL default '',
   `quota` int(11) NOT NULL default '0',
   `homedir` varchar(255) NOT NULL,
   `autoresponder` enum('n','y') NOT NULL default 'n',
   `autoresponder_text` tinytext NULL,
   `custom_mailfilter` text,
-  `postfix` enum('y','n') NOT NULL,
-  `access` enum('y','n') NOT NULL,
+  `postfix` enum('n','y') NOT NULL,
+  `access` enum('n','y') NOT NULL,
   `disableimap` enum('0','1') NOT NULL default '0',
   `disablepop3` enum('0','1') NOT NULL default '0',
   PRIMARY KEY  (`mailuser_id`),
   KEY `server_id` (`server_id`,`email`),
   KEY `email_access` (`email`,`access`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -499,22 +731,22 @@ CREATE TABLE `mail_user` (
 -- 
 
 CREATE TABLE `mail_user_filter` (
-  `filter_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `filter_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `mailuser_id` int(11) NOT NULL default '0',
-  `rulename` varchar(255) default NULL,
+  `mailuser_id` int(11) unsigned NOT NULL default '0',
+  `rulename` varchar(64) default NULL,
   `source` varchar(255) default NULL,
   `searchterm` varchar(255) default NULL,
   `op` varchar(255) default NULL,
   `action` varchar(255) default NULL,
   `target` varchar(255) default NULL,
-  `active` varchar(255) NOT NULL default 'y',
+  `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`filter_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -523,8 +755,8 @@ CREATE TABLE `mail_user_filter` (
 -- 
 
 CREATE TABLE `remote_session` (
-  `remote_session` varchar(50) NOT NULL,
-  `remote_userid` int(11) NOT NULL,
+  `remote_session` varchar(64) NOT NULL,
+  `remote_userid` int(11) unsigned NOT NULL,
   `remote_functions` text NOT NULL,
   `tstamp` int(10) unsigned NOT NULL,
   PRIMARY KEY  (`remote_session`)
@@ -537,12 +769,12 @@ CREATE TABLE `remote_session` (
 -- 
 
 CREATE TABLE `remote_user` (
-  `remote_userid` int(11) NOT NULL auto_increment,
-  `remote_username` varchar(255) NOT NULL,
-  `remote_password` varchar(255) NOT NULL,
+  `remote_userid` int(11) unsigned NOT NULL auto_increment,
+  `remote_username` varchar(64) NOT NULL,
+  `remote_password` varchar(64) NOT NULL,
   `remote_functions` text NOT NULL,
   PRIMARY KEY  (`remote_userid`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -551,24 +783,24 @@ CREATE TABLE `remote_user` (
 -- 
 
 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',
+  `server_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned 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` tinyint(4) NOT NULL default '0',
-  `web_server` tinyint(4) NOT NULL default '0',
-  `dns_server` tinyint(4) NOT NULL default '0',
-  `file_server` tinyint(4) NOT NULL default '0',
-  `db_server` tinyint(4) NOT NULL default '0',
-  `vserver_server` tinyint(4) NOT NULL default '0',
+  `mail_server` tinyint(1) NOT NULL default '0',
+  `web_server` tinyint(1) NOT NULL default '0',
+  `dns_server` tinyint(1) NOT NULL default '0',
+  `file_server` tinyint(1) NOT NULL default '0',
+  `db_server` tinyint(1) NOT NULL default '0',
+  `vserver_server` tinyint(1) NOT NULL default '0',
   `config` text NOT NULL,
   `updated` bigint(20) unsigned NOT NULL default '0',
-  `active` tinyint(4) NOT NULL default '1',
+  `active` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`server_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -577,33 +809,33 @@ CREATE TABLE `server` (
 -- 
 
 CREATE TABLE `server_ip` (
-  `server_ip_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `server_ip_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `server_id` int(10) unsigned NOT NULL default '0',
-  `ip_address` varchar(15) default NULL,
-  `virtualhost` char(1) NOT NULL default 'y',
+  `server_id` int(11) unsigned NOT NULL default '0',
+  `ip_address` varchar(39) default NULL,
+  `virtualhost` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`server_ip_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
 CREATE TABLE `shell_user` (
-  `shell_user_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `shell_user_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `server_id` int(11) NOT NULL default '0',
-  `parent_domain_id` int(11) NOT NULL default '0',
-  `username` varchar(255) default NULL,
-  `password` varchar(255) default NULL,
+  `server_id` int(11) unsigned NOT NULL default '0',
+  `parent_domain_id` int(11) unsigned NOT NULL default '0',
+  `username` varchar(64) default NULL,
+  `password` varchar(64) default NULL,
   `quota_size` int(11) NOT NULL default '-1',
-  `active` varchar(255) NOT NULL default 'y',
+  `active` enum('n','y') NOT NULL default 'y',
   `puser` varchar(255) default NULL,
   `pgroup` varchar(255) default NULL,
   `shell` varchar(255) NOT NULL default '/bin/bash',
@@ -619,15 +851,15 @@ CREATE TABLE `shell_user` (
 -- 
 
 CREATE TABLE `software_package` (
-  `package_id` int(11) NOT NULL auto_increment,
-  `software_repo_id` int(11) NOT NULL,
-  `package_name` varchar(100) NOT NULL,
-  `package_title` varchar(255) NOT NULL,
+  `package_id` int(11) unsigned NOT NULL auto_increment,
+  `software_repo_id` int(11) unsigned NOT NULL,
+  `package_name` varchar(64) NOT NULL,
+  `package_title` varchar(64) NOT NULL,
   `package_description` text,
-  `package_version` varchar(255) default NULL,
+  `package_version` varchar(8) default NULL,
   PRIMARY KEY  (`package_id`),
   UNIQUE KEY `package_name` (`package_name`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -636,25 +868,19 @@ CREATE TABLE `software_package` (
 -- 
 
 CREATE TABLE `software_repo` (
-  `software_repo_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `software_repo_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `repo_name` varchar(40) default NULL,
-  `repo_url` varchar(40) default NULL,
-  `repo_username` varchar(30) default NULL,
-  `repo_password` varchar(30) default NULL,
-  `active` varchar(255) NOT NULL default 'y',
+  `repo_name` varchar(64) default NULL,
+  `repo_url` varchar(255) default NULL,
+  `repo_username` varchar(64) default NULL,
+  `repo_password` varchar(64) default NULL,
+  `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`software_repo_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-
--- 
--- Dumping data for table `software_repo`
--- 
-
-INSERT INTO `software_repo` (`software_repo_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `repo_name`, `repo_url`, `repo_username`, `repo_password`, `active`) VALUES (1, 1, 1, 'riud', 'riud', '', 'ISPConfig Addons', 'http://repo.ispconfig.org/addons/', '', '', 'n');
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -663,20 +889,20 @@ INSERT INTO `software_repo` (`software_repo_id`, `sys_userid`, `sys_groupid`, `s
 -- 
 
 CREATE TABLE `software_update` (
-  `software_update_id` int(11) NOT NULL auto_increment,
-  `software_repo_id` int(11) NOT NULL,
-  `package_name` varchar(255) NOT NULL,
+  `software_update_id` int(11) unsigned NOT NULL auto_increment,
+  `software_repo_id` int(11) unsigned NOT NULL,
+  `package_name` varchar(64) NOT NULL,
   `update_url` varchar(255) NOT NULL,
   `update_md5` varchar(255) NOT NULL,
   `update_dependencies` varchar(255) NOT NULL,
-  `update_title` varchar(255) NOT NULL,
-  `v1` tinyint(4) NOT NULL default '0',
-  `v2` tinyint(4) NOT NULL default '0',
-  `v3` tinyint(4) NOT NULL default '0',
-  `v4` tinyint(4) NOT NULL default '0',
+  `update_title` varchar(64) NOT NULL,
+  `v1` tinyint(1) NOT NULL default '0',
+  `v2` tinyint(1) NOT NULL default '0',
+  `v3` tinyint(1) NOT NULL default '0',
+  `v4` tinyint(1) NOT NULL default '0',
   `type` enum('full','update') NOT NULL default 'full',
   PRIMARY KEY  (`software_update_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -685,14 +911,14 @@ CREATE TABLE `software_update` (
 -- 
 
 CREATE TABLE `software_update_inst` (
-  `software_update_inst_id` int(10) unsigned NOT NULL auto_increment,
-  `software_update_id` int(11) NOT NULL default '0',
-  `package_name` varchar(255) NOT NULL,
-  `server_id` int(11) NOT NULL,
-  `status` enum('none','installing','installed','deleting') NOT NULL default 'none',
+  `software_update_inst_id` int(11) unsigned NOT NULL auto_increment,
+  `software_update_id` int(11) unsigned NOT NULL default '0',
+  `package_name` varchar(64) NOT NULL,
+  `server_id` int(11) unsigned NOT NULL,
+  `status` enum('none','installing','installed','deleting','deleted') NOT NULL default 'none',
   PRIMARY KEY  (`software_update_inst_id`),
   UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -701,28 +927,28 @@ CREATE TABLE `software_update_inst` (
 -- 
 
 CREATE TABLE `spamfilter_policy` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL,
-  `sys_groupid` int(11) NOT NULL,
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL,
+  `sys_groupid` int(11) unsigned NOT NULL,
   `sys_perm_user` varchar(5) NOT NULL,
   `sys_perm_group` varchar(5) NOT NULL,
   `sys_perm_other` varchar(5) NOT NULL,
-  `policy_name` varchar(32) default NULL,
-  `virus_lover` char(1) default NULL,
-  `spam_lover` char(1) default NULL,
-  `banned_files_lover` char(1) default NULL,
-  `bad_header_lover` char(1) default NULL,
-  `bypass_virus_checks` char(1) default NULL,
-  `bypass_spam_checks` char(1) default NULL,
-  `bypass_banned_checks` char(1) default NULL,
-  `bypass_header_checks` char(1) default NULL,
-  `spam_modifies_subj` char(1) default NULL,
-  `virus_quarantine_to` varchar(64) default NULL,
-  `spam_quarantine_to` varchar(64) default NULL,
-  `banned_quarantine_to` varchar(64) default NULL,
-  `bad_header_quarantine_to` varchar(64) default NULL,
-  `clean_quarantine_to` varchar(64) default NULL,
-  `other_quarantine_to` varchar(64) default NULL,
+  `policy_name` varchar(64) default NULL,
+  `virus_lover` enum('N','Y') default NULL,
+  `spam_lover` enum('N','Y') default NULL,
+  `banned_files_lover` enum('N','Y') default NULL,
+  `bad_header_lover` enum('N','Y') default NULL,
+  `bypass_virus_checks` enum('N','Y') default NULL,
+  `bypass_spam_checks` enum('N','Y') default NULL,
+  `bypass_banned_checks` enum('N','Y') default NULL,
+  `bypass_header_checks` enum('N','Y') default NULL,
+  `spam_modifies_subj` enum('N','Y') default NULL,
+  `virus_quarantine_to` varchar(255) default NULL,
+  `spam_quarantine_to` varchar(255) default NULL,
+  `banned_quarantine_to` varchar(255) default NULL,
+  `bad_header_quarantine_to` varchar(255) default NULL,
+  `clean_quarantine_to` varchar(255) default NULL,
+  `other_quarantine_to` varchar(255) default NULL,
   `spam_tag_level` float default NULL,
   `spam_tag2_level` float default NULL,
   `spam_kill_level` float default NULL,
@@ -732,9 +958,9 @@ CREATE TABLE `spamfilter_policy` (
   `addr_extension_spam` varchar(64) default NULL,
   `addr_extension_banned` varchar(64) default NULL,
   `addr_extension_bad_header` varchar(64) default NULL,
-  `warnvirusrecip` char(1) default NULL,
-  `warnbannedrecip` char(1) default NULL,
-  `warnbadhrecip` char(1) default NULL,
+  `warnvirusrecip` enum('N','Y') default NULL,
+  `warnbannedrecip` enum('N','Y') default NULL,
+  `warnbadhrecip` enum('N','Y') default NULL,
   `newvirus_admin` varchar(64) default NULL,
   `virus_admin` varchar(64) default NULL,
   `banned_admin` varchar(64) default NULL,
@@ -742,22 +968,10 @@ CREATE TABLE `spamfilter_policy` (
   `spam_admin` varchar(64) default NULL,
   `spam_subject_tag` varchar(64) default NULL,
   `spam_subject_tag2` varchar(64) default NULL,
-  `message_size_limit` int(11) default NULL,
+  `message_size_limit` int(11) unsigned default NULL,
   `banned_rulenames` varchar(64) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=13 ;
-
--- 
--- Dumping data for table `spamfilter_policy`
--- 
-
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (1, 1, 0, 'riud', 'riud', 'r', 'Non-paying', 'N', 'N', 'N', 'N', 'Y', 'Y', 'Y', 'N', 'Y', '', '', '', '', '', '', 3, 7, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (2, 1, 0, 'riud', 'riud', 'r', 'Uncensored', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, 3, 999, 999, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (3, 1, 0, 'riud', 'riud', 'r', 'Wants all spam', 'N', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 999, 999, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (4, 1, 0, 'riud', 'riud', 'r', 'Wants viruses', 'Y', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.9, 6.9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (5, 1, 0, 'riud', 'riud', 'r', 'Normal', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.9, 6.9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (6, 1, 0, 'riud', 'riud', 'r', 'Trigger happy', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 5, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (7, 1, 0, 'riud', 'riud', 'r', 'Permissive', 'N', 'N', 'N', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 10, 20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -766,21 +980,21 @@ INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_us
 -- 
 
 CREATE TABLE `spamfilter_users` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL,
-  `sys_groupid` int(11) NOT NULL,
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL,
+  `sys_groupid` int(11) unsigned NOT NULL,
   `sys_perm_user` varchar(5) NOT NULL,
   `sys_perm_group` varchar(5) NOT NULL,
   `sys_perm_other` varchar(5) NOT NULL,
-  `server_id` int(10) unsigned NOT NULL,
-  `priority` int(11) NOT NULL default '7',
-  `policy_id` int(10) unsigned NOT NULL default '1',
+  `server_id` int(11) unsigned NOT NULL,
+  `priority` tinyint(3) unsigned NOT NULL default '7',
+  `policy_id` int(11) unsigned NOT NULL default '1',
   `email` varchar(255) NOT NULL,
-  `fullname` varchar(255) default NULL,
-  `local` char(1) default NULL,
+  `fullname` varchar(64) default NULL,
+  `local` varchar(1) default NULL,
   PRIMARY KEY  (`id`),
   UNIQUE KEY `email` (`email`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -789,20 +1003,20 @@ CREATE TABLE `spamfilter_users` (
 -- 
 
 CREATE TABLE `spamfilter_wblist` (
-  `wblist_id` int(10) unsigned NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL,
-  `sys_groupid` int(11) NOT NULL,
+  `wblist_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL,
+  `sys_groupid` int(11) unsigned NOT NULL,
   `sys_perm_user` varchar(5) NOT NULL,
   `sys_perm_group` varchar(5) NOT NULL,
   `sys_perm_other` varchar(5) NOT NULL,
-  `server_id` int(10) unsigned NOT NULL,
+  `server_id` int(11) unsigned NOT NULL,
   `wb` enum('W','B') NOT NULL default 'W',
-  `rid` int(10) unsigned NOT NULL,
+  `rid` int(11) unsigned NOT NULL,
   `email` varchar(255) NOT NULL,
-  `priority` int(11) NOT NULL,
+  `priority` tinyint(3) unsigned NOT NULL,
   `active` enum('y','n') NOT NULL default 'y',
   PRIMARY KEY  (`wblist_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -811,19 +1025,19 @@ CREATE TABLE `spamfilter_wblist` (
 -- 
 
 CREATE TABLE `support_message` (
-  `support_message_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `support_message_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `recipient_id` int(11) NOT NULL default '0',
-  `sender_id` int(11) NOT NULL default '0',
+  `recipient_id` int(11) unsigned NOT NULL default '0',
+  `sender_id` int(11) unsigned NOT NULL default '0',
   `subject` varchar(255) default NULL,
-  `message` varchar(255) default NULL,
-  `tstamp` int(11) NOT NULL default '1187707778',
+  `message` text default NULL,
+  `tstamp` int(11) NOT NULL default '0',
   PRIMARY KEY  (`support_message_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -832,18 +1046,18 @@ CREATE TABLE `support_message` (
 -- 
 
 CREATE TABLE `sys_datalog` (
-  `datalog_id` bigint(20) NOT NULL auto_increment,
-  `server_id` int(11) NOT NULL,
+  `datalog_id` int(11) unsigned NOT NULL auto_increment,
+  `server_id` int(11) unsigned NOT NULL,
   `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',
+  `tstamp` int(11) NOT NULL default '0',
   `user` varchar(255) NOT NULL default '',
   `data` text NOT NULL,
   `status` set('pending','ok','warning','error') NOT NULL default 'pending',
   PRIMARY KEY  (`datalog_id`),
   KEY `server_id` (`server_id`,`status`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -852,22 +1066,22 @@ CREATE TABLE `sys_datalog` (
 -- 
 
 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 '',
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `jobname` varchar(64) NOT NULL default '',
+  `sync_interval_minutes` int(11) unsigned NOT NULL default '0',
+  `db_type` varchar(16) 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_name` varchar(64) NOT NULL default '',
+  `db_username` varchar(64) NOT NULL default '',
+  `db_password` varchar(64) 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',
+  `empty_datalog` int(11) unsigned NOT NULL default '0',
+  `sync_datalog_external` int(11) unsigned NOT NULL default '0',
+  `active` tinyint(1) NOT NULL default '1',
+  `last_datalog_id` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`id`),
   KEY `last_datalog_id` (`last_datalog_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 -- --------------------------------------------------------
 
 -- 
@@ -875,18 +1089,18 @@ CREATE TABLE `sys_dbsync` (
 -- 
 
 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',
+  `id` int(11) unsigned NOT NULL auto_increment,
+  `jobname` varchar(64) NOT NULL default '',
+  `sync_interval_minutes` int(11) unsigned 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 '',
+  `ftp_username` varchar(64) NOT NULL default '',
+  `ftp_password` varchar(64) 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',
+  `active` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -895,18 +1109,12 @@ CREATE TABLE `sys_filesync` (
 -- 
 
 CREATE TABLE `sys_group` (
-  `groupid` int(11) NOT NULL auto_increment,
-  `name` varchar(255) NOT NULL default '',
+  `groupid` int(11) unsigned NOT NULL auto_increment,
+  `name` varchar(64) NOT NULL default '',
   `description` text NOT NULL,
-  `client_id` int(11) NOT NULL default '0',
+  `client_id` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`groupid`)
-) ENGINE=MyISAM AUTO_INCREMENT=4 ;
-
--- 
--- Dumping data for table `sys_group`
--- 
-
-INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (1, 'admin', 'Administrators group', 0);
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
 -- --------------------------------------------------------
 
@@ -915,16 +1123,10 @@ INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (
 -- 
 
 CREATE TABLE `sys_ini` (
-  `sysini_id` int(11) NOT NULL auto_increment,
+  `sysini_id` int(11) unsigned NOT NULL auto_increment,
   `config` longtext NOT NULL,
   PRIMARY KEY  (`sysini_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-
--- 
--- Dumping data for table `sys_ini`
--- 
-
-INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, '');
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -933,14 +1135,14 @@ INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, '');
 -- 
 
 CREATE TABLE `sys_log` (
-  `syslog_id` int(10) unsigned NOT NULL auto_increment,
-  `server_id` int(10) unsigned NOT NULL default '0',
-  `datalog_id` bigint(20) unsigned NOT NULL default '0',
+  `syslog_id` int(11) unsigned NOT NULL auto_increment,
+  `server_id` int(11) unsigned NOT NULL default '0',
+  `datalog_id` int(11) unsigned NOT NULL default '0',
   `loglevel` tinyint(4) NOT NULL default '0',
-  `tstamp` int(10) unsigned NOT NULL,
+  `tstamp` int(11) unsigned NOT NULL,
   `message` text,
   PRIMARY KEY  (`syslog_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 
 -- --------------------------------------------------------
@@ -950,31 +1152,25 @@ CREATE TABLE `sys_log` (
 -- 
 
 CREATE TABLE `sys_user` (
-  `userid` int(11) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '1',
-  `sys_groupid` int(11) NOT NULL default '1',
+  `userid` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '1',
+  `sys_groupid` int(11) unsigned NOT NULL default '1',
   `sys_perm_user` varchar(5) NOT NULL default 'riud',
   `sys_perm_group` varchar(5) NOT NULL default 'riud',
   `sys_perm_other` varchar(5) NOT NULL default '',
-  `username` varchar(100) NOT NULL default '',
-  `passwort` varchar(100) NOT NULL default '',
+  `username` varchar(64) NOT NULL default '',
+  `passwort` varchar(64) 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',
-  `language` varchar(10) NOT NULL default 'de',
+  `app_theme` varchar(32) NOT NULL default 'default',
+  `typ` varchar(16) NOT NULL default 'user',
+  `active` tinyint(1) NOT NULL default '1',
+  `language` varchar(2) NOT NULL default 'de',
   `groups` varchar(255) NOT NULL default '',
-  `default_group` int(11) NOT NULL default '0',
-  `client_id` int(11) NOT NULL default '0',
+  `default_group` int(11) unsigned NOT NULL default '0',
+  `client_id` int(11) unsigned NOT NULL default '0',
   PRIMARY KEY  (`userid`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 ;
-
--- 
--- Dumping data for table `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`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites,dns,tools,help', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -983,30 +1179,30 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 -- 
 
 CREATE TABLE `web_domain` (
-  `domain_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `domain_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `server_id` int(11) NOT NULL default '0',
-  `ip_address` varchar(15) default NULL,
+  `server_id` int(11) unsigned NOT NULL default '0',
+  `ip_address` varchar(39) default NULL,
   `domain` varchar(255) default NULL,
-  `type` varchar(255) NOT NULL default 'y',
-  `parent_domain_id` int(11) NOT NULL default '0',
-  `vhost_type` varchar(255) default NULL,
+  `type` varchar(32) default NULL,
+  `parent_domain_id` int(11) unsigned NOT NULL default '0',
+  `vhost_type` varchar(32) default NULL,
   `document_root` varchar(255) default NULL,
   `system_user` varchar(255) default NULL,
   `system_group` varchar(255) default NULL,
-  `hd_quota` int(11) NOT NULL default '0',
-  `traffic_quota` int(11) NOT NULL default '0',
-  `cgi` char(1) NOT NULL default 'y',
-  `ssi` char(1) NOT NULL default 'y',
-  `suexec` char(1) NOT NULL default 'y',
+  `hd_quota` int(11) unsigned NOT NULL default '0',
+  `traffic_quota` int(11) unsigned NOT NULL default '0',
+  `cgi` enum('n','y') NOT NULL default 'y',
+  `ssi` enum('n','y') NOT NULL default 'y',
+  `suexec` enum('n','y') NOT NULL default 'y',
   `errordocs` tinyint(1) NOT NULL default '1',
   `is_subdomainwww` tinyint(1) NOT NULL default '1',
   `subdomain` enum('none','www','*') NOT NULL default 'www',
-  `php` varchar(255) NOT NULL default 'y',
+  `php` varchar(32) NOT NULL default 'y',
   `redirect_type` varchar(255) default NULL,
   `redirect_path` varchar(255) default NULL,
   `ssl` enum('n','y') NOT NULL default 'n',
@@ -1018,11 +1214,11 @@ CREATE TABLE `web_domain` (
   `ssl_request` mediumtext NULL,
   `ssl_cert` mediumtext NULL,
   `ssl_bundle` mediumtext NULL,
-  `ssl_action` varchar(10) NULL,
+  `ssl_action` varchar(16) NULL,
   `apache_directives` text,
-  `active` varchar(255) NOT NULL default 'y',
+  `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`domain_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 -- --------------------------------------------------------
 
@@ -1031,22 +1227,22 @@ CREATE TABLE `web_domain` (
 -- 
 
 CREATE TABLE `web_database` (
-  `database_id` bigint(20) NOT NULL auto_increment,
-  `sys_userid` int(11) NOT NULL default '0',
-  `sys_groupid` int(11) NOT NULL default '0',
+  `database_id` int(11) unsigned NOT NULL auto_increment,
+  `sys_userid` int(11) unsigned NOT NULL default '0',
+  `sys_groupid` int(11) unsigned NOT NULL default '0',
   `sys_perm_user` varchar(5) default NULL,
   `sys_perm_group` varchar(5) default NULL,
   `sys_perm_other` varchar(5) default NULL,
-  `server_id` int(11) NOT NULL default '0',
-  `type` varchar(255) NOT NULL default 'y',
-  `database_name` varchar(255) default NULL,
-  `database_user` varchar(255) default NULL,
-  `database_password` varchar(255) default NULL,
+  `server_id` int(11) unsigned NOT NULL default '0',
+  `type` varchar(16) NOT NULL default 'y',
+  `database_name` varchar(64) default NULL,
+  `database_user` varchar(64) default NULL,
+  `database_password` varchar(64) default NULL,
   `database_charset` varchar(64) default NULL,
-  `remote_access` varchar(255) NOT NULL default 'y',
-  `active` varchar(255) NOT NULL default 'y',
+  `remote_access` enum('n','y') NOT NULL default 'y',
+  `active` enum('n','y') NOT NULL default 'y',
   PRIMARY KEY  (`database_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
 
 
 -- --------------------------------------------------------
@@ -1056,9 +1252,9 @@ CREATE TABLE `web_database` (
 --
 
 CREATE TABLE `attempts_login` (
-  `ip` varchar(12) NOT NULL,
-  `times` tinyint(1) NOT NULL default '1',
-  `login_time` timestamp NOT NULL default '0000-00-00 00:00:00'
+  `ip` varchar(39) NOT NULL,
+  `times` int(11) default NULL,
+  `login_time` timestamp
 ) ENGINE=MyISAM;
 
 -- --------------------------------------------------------
@@ -1068,9 +1264,9 @@ CREATE TABLE `attempts_login` (
 -- 
 
 CREATE TABLE `monitor_data` (
-  `server_id` int(11) NOT NULL,
+  `server_id` int(11) unsigned NOT NULL,
   `type` varchar(255) NOT NULL,
-  `created` int(11) NOT NULL,
+  `created` int(11) unsigned NOT NULL,
   `data` mediumtext NOT NULL,
   `state` enum('no_state', 'unknown', 'ok', 'info', 'warning', 'critical', 'error') NOT NULL default 'unknown',
   PRIMARY KEY  (`server_id`,`type`,`created`)
@@ -1083,18 +1279,12 @@ CREATE TABLE `monitor_data` (
 -- 
 
 CREATE TABLE `sys_config` (
-  `config_id` int(11) NOT NULL,
-  `group` varchar(255) NOT NULL,
-  `name` varchar(255) NOT NULL,
+  `config_id` int(11) unsigned NOT NULL,
+  `group` varchar(64) NOT NULL,
+  `name` varchar(64) NOT NULL,
   `value` varchar(255) NOT NULL
 ) ENGINE=MyISAM;
 
---
--- Dumping data for table `sys_config`
---
-
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.8 beta');
-
 -- --------------------------------------------------------
 
 -- 
@@ -1115,13 +1305,96 @@ INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.8 beta');
 --
 
 CREATE TABLE `country` (
-  `iso` CHAR(2) NOT NULL PRIMARY KEY,
-  `name` VARCHAR(80) NOT NULL,
-  `printable_name` VARCHAR(80) NOT NULL,
-  `iso3` CHAR(3),
+  `iso` char(2) NOT NULL PRIMARY KEY,
+  `name` varchar(64) NOT NULL,
+  `printable_name` varchar(64) NOT NULL,
+  `iso3` char(3),
   `numcode` SMALLINT
 ) ENGINE=MyISAM;
 
+
+
+-- --------------------------------------------------------
+-- --------------------------------------------------------
+-- DB-DATA
+-- --------------------------------------------------------
+-- --------------------------------------------------------
+
+-- 
+-- Dumping data for table `dns_template`
+-- 
+
+INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=28800\nretry=7200\nexpire=604800\nminimum=86400\nttl=86400\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|86400\nA|www|{IP}|0|86400\nA|mail|{IP}|0|86400\nNS|{DOMAIN}.|{NS1}.|0|86400\nNS|{DOMAIN}.|{NS2}.|0|86400\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|86400', 'y');
+
+-- --------------------------------------------------------
+
+-- 
+-- Dumping data for table `software_repo`
+-- 
+
+INSERT INTO `software_repo` (`software_repo_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `repo_name`, `repo_url`, `repo_username`, `repo_password`, `active`) VALUES (1, 1, 1, 'riud', 'riud', '', 'ISPConfig Addons', 'http://repo.ispconfig.org/addons/', '', '', 'n');
+
+-- --------------------------------------------------------
+
+-- 
+-- Dumping data for table `spamfilter_policy`
+-- 
+
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (1, 1, 0, 'riud', 'riud', 'r', 'Non-paying', 'N', 'N', 'N', 'N', 'Y', 'Y', 'Y', 'N', 'Y', '', '', '', '', '', '', 3, 7, 10, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (2, 1, 0, 'riud', 'riud', 'r', 'Uncensored', 'Y', 'Y', 'Y', 'Y', 'N', 'N', 'N', 'N', 'N', NULL, NULL, NULL, NULL, NULL, NULL, 3, 999, 999, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (3, 1, 0, 'riud', 'riud', 'r', 'Wants all spam', 'N', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 999, 999, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (4, 1, 0, 'riud', 'riud', 'r', 'Wants viruses', 'Y', 'N', 'Y', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.9, 6.9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (5, 1, 0, 'riud', 'riud', 'r', 'Normal', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 6.9, 6.9, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (6, 1, 0, 'riud', 'riud', 'r', 'Trigger happy', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 5, 5, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `spamfilter_policy` (`id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `policy_name`, `virus_lover`, `spam_lover`, `banned_files_lover`, `bad_header_lover`, `bypass_virus_checks`, `bypass_spam_checks`, `bypass_banned_checks`, `bypass_header_checks`, `spam_modifies_subj`, `virus_quarantine_to`, `spam_quarantine_to`, `banned_quarantine_to`, `bad_header_quarantine_to`, `clean_quarantine_to`, `other_quarantine_to`, `spam_tag_level`, `spam_tag2_level`, `spam_kill_level`, `spam_dsn_cutoff_level`, `spam_quarantine_cutoff_level`, `addr_extension_virus`, `addr_extension_spam`, `addr_extension_banned`, `addr_extension_bad_header`, `warnvirusrecip`, `warnbannedrecip`, `warnbadhrecip`, `newvirus_admin`, `virus_admin`, `banned_admin`, `bad_header_admin`, `spam_admin`, `spam_subject_tag`, `spam_subject_tag2`, `message_size_limit`, `banned_rulenames`) VALUES (7, 1, 0, 'riud', 'riud', 'r', 'Permissive', 'N', 'N', 'N', 'Y', 'N', 'N', 'N', 'N', 'Y', NULL, NULL, NULL, NULL, NULL, NULL, 3, 10, 20, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+-- --------------------------------------------------------
+
+-- 
+-- Dumping data for table `sys_group`
+-- 
+
+INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (1, 'admin', 'Administrators group', 0);
+
+-- --------------------------------------------------------
+
+-- 
+-- Dumping data for table `sys_ini`
+-- 
+
+INSERT INTO `sys_ini` (`sysini_id`, `config`) VALUES (1, '');
+
+-- --------------------------------------------------------
+
+-- 
+-- Dumping data for table `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`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites,dns,tools,help', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
+
+-- --------------------------------------------------------
+
+--
+-- Dumping data for table `sys_config`
+--
+
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.9');
+
+-- --------------------------------------------------------
+
+-- 
+-- iso_country_list.sql
+-- 
+-- This will create and then populate a MySQL table with a list of the names and
+-- ISO 3166 codes for countries in existence as of the date below.
+-- 
+-- For updates to this file, see http://27.org/isocountrylist/
+-- For more about ISO 3166, see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html
+-- 
+-- Created by getisocountrylist.pl on Sun Nov  2 14:59:20 2003.
+-- Wm. Rhodes <iso_country_list@27.org>
+-- 
+
 --
 -- Dumping data for table `country`
 --
@@ -1367,6 +1640,7 @@ INSERT INTO `country` (`iso`, `name`, `printable_name`, `iso3`, `numcode`) VALUE
 ('ZM', 'ZAMBIA', 'Zambia', 'ZMB', 894),
 ('ZW', 'ZIMBABWE', 'Zimbabwe', 'ZWE', 716);
 
+-- --------------------------------------------------------
 -- --------------------------------------------------------
 
 SET FOREIGN_KEY_CHECKS = 1;