From 286d1bf1b746b49e43fd674bbc47afd25adfbedb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 31 Jan 2010 12:33:18 -0500
Subject: [PATCH] Fixed: FS#1053 - Syntax Error in form_list.php
---
install/sql/ispconfig3.sql | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 84ee263..d2df925 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -82,6 +82,7 @@
`default_webserver` int(11) unsigned NOT NULL default '1',
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL default '-1',
+ `limit_web_quota` int(11) NOT NULL default '-1',
`web_php_options` varchar(255) NOT NULL default 'no,fast-cgi,cgi,mod,suphp',
`limit_web_subdomain` int(11) NOT NULL default '-1',
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
@@ -138,6 +139,7 @@
`limit_spamfilter_policy` int(11) NOT NULL default '0',
`limit_web_ip` text,
`limit_web_domain` int(11) NOT NULL default '-1',
+ `limit_web_quota` int(11) NOT NULL default '-1',
`limit_web_subdomain` int(11) NOT NULL default '-1',
`limit_web_aliasdomain` int(11) NOT NULL default '-1',
`limit_ftp_user` int(11) NOT NULL default '-1',
@@ -231,6 +233,8 @@
`ttl` int(11) unsigned NOT NULL default '86400',
`active` enum('N','Y') NOT NULL,
`xfer` varchar(255) NOT NULL,
+ `also_notify` varchar(255) default NULL,
+ `update_acl` varchar(255) default NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `origin` (`origin`),
KEY `active` (`active`)
@@ -293,12 +297,12 @@
`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',
+ `quota_size` bigint(20) NOT NULL default '-1',
`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',
+ `quota_files` bigint(20) NOT NULL default '-1',
`ul_ratio` int(11) NOT NULL default '-1',
`dl_ratio` int(11) NOT NULL default '-1',
`ul_bandwidth` int(11) NOT NULL default '-1',
@@ -394,7 +398,8 @@
`type` enum('alias','aliasdomain','forward','catchall') NOT NULL default 'alias',
`active` enum('n','y') NOT NULL,
PRIMARY KEY (`forwarding_id`),
- KEY `server_id` (`server_id`,`source`)
+ KEY `server_id` (`server_id`,`source`),
+ KEY `type` (`type`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
-- --------------------------------------------------------
@@ -455,6 +460,26 @@
PRIMARY KEY (`mailman_id`,`server_id`,`domain`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
+-- --------------------------------------------------------
+
+--
+-- Table structure for Table `mail_relay_recipient`
+--
+
+CREATE TABLE IF NOT EXISTS `mail_relay_recipient` (
+ `relay_recipient_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) DEFAULT NULL,
+ `sys_perm_group` varchar(5) DEFAULT NULL,
+ `sys_perm_other` varchar(5) DEFAULT NULL,
+ `server_id` int(11) NOT NULL DEFAULT '0',
+ `source` varchar(255) DEFAULT NULL,
+ `access` varchar(255) NOT NULL DEFAULT 'OK',
+ `active` varchar(255) NOT NULL DEFAULT 'y',
+ PRIMARY KEY (`relay_recipient_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+
-- --------------------------------------------------------
@@ -514,15 +539,20 @@
`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 '-1',
+ `quota` bigint(20) NOT NULL default '-1',
`homedir` varchar(255) NOT NULL,
`autoresponder` enum('n','y') NOT NULL default 'n',
+ `autoresponder_start_date` datetime NOT NULL default '0000-00-00 00:00:00',
+ `autoresponder_end_date` datetime NOT NULL default '0000-00-00 00:00:00',
`autoresponder_text` mediumtext NULL,
+ `move_junk` enum('n','y') NOT NULL default 'n',
`custom_mailfilter` mediumtext,
`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',
+ `disableimap` enum('n','y') NOT NULL default 'n',
+ `disablepop3` enum('n','y') NOT NULL default 'n',
+ `disabledeliver` enum('n','y') NOT NULL default 'n',
+ `disablesmtp` enum('n','y') NOT NULL default 'n',
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`)
@@ -607,6 +637,7 @@
`vserver_server` tinyint(1) NOT NULL default '0',
`config` text NOT NULL,
`updated` bigint(20) unsigned NOT NULL default '0',
+ `mirror_server_id` int(11) unsigned NOT NULL default '0',
`active` tinyint(1) NOT NULL default '1',
PRIMARY KEY (`server_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -643,7 +674,7 @@
`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',
+ `quota_size` bigint(20) NOT NULL default '-1',
`active` enum('n','y') NOT NULL default 'y',
`puser` varchar(255) default NULL,
`pgroup` varchar(255) default NULL,
@@ -1003,8 +1034,8 @@
`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',
+ `hd_quota` bigint(20) NOT NULL default '0',
+ `traffic_quota` bigint(20) 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',
@@ -1020,12 +1051,15 @@
`ssl_organisation` varchar(255) NULL,
`ssl_organisation_unit` varchar(255) NULL,
`ssl_country` varchar(255) NULL,
+ `ssl_domain` varchar(255) NULL,
`ssl_request` mediumtext NULL,
`ssl_cert` mediumtext NULL,
`ssl_bundle` mediumtext NULL,
`ssl_action` varchar(16) NULL,
`stats_password` varchar(255) default NULL,
+ `allow_override` varchar(255) NOT NULL default 'All',
`apache_directives` text,
+ `php_open_basedir` text,
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`domain_id`)
) ENGINE=MyISAM AUTO_INCREMENT=1;
@@ -1203,7 +1237,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.5');
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.1.6');
-- --------------------------------------------------------
--
Gitblit v1.9.1