From 40c436b6e2724e98efb51582d1ad8fad6dcf4a1c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 09 Sep 2011 08:28:25 -0400
Subject: [PATCH] - Implemented: FS#1339 - Add "disablesieve" to mail_user table - Added fields for IPv6 support and virtualhost Port Configuration to server_ip table
---
install/sql/ispconfig3.sql | 5 +++++
interface/web/mail/mail_user_edit.php | 4 ++--
install/sql/incremental/upd_0016.sql | 5 +++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/install/sql/incremental/upd_0016.sql b/install/sql/incremental/upd_0016.sql
new file mode 100644
index 0000000..6937019
--- /dev/null
+++ b/install/sql/incremental/upd_0016.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `server_ip` ADD `ip_type` enum( 'IPv4', 'IPv6' ) NOT NULL DEFAULT 'IPv4' AFTER `server_id`;
+ALTER TABLE `server_ip` ADD `virtualhost_port` VARCHAR( 255 ) NOT NULL DEFAULT '80,443';
+ALTER TABLE `server_ip` ADD `client_id` int(11) unsigned NOT NULL default '0' AFTER `server_id`;
+ALTER TABLE `mail_user` ADD `disablesieve` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n';
+ALTER TABLE `mail_user` ADD `disablelda` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n';
\ No newline at end of file
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 498d86b..1fda3b0 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -770,6 +770,8 @@
`disablepop3` enum('n','y') NOT NULL default 'n',
`disabledeliver` enum('n','y') NOT NULL default 'n',
`disablesmtp` enum('n','y') NOT NULL default 'n',
+ `disablesieve` enum('n','y') NOT NULL default 'n',
+ `disablelda` enum('n','y') NOT NULL default 'n',
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`)
@@ -1085,8 +1087,11 @@
`sys_perm_group` varchar(5) default NULL,
`sys_perm_other` varchar(5) default NULL,
`server_id` int(11) unsigned NOT NULL default '0',
+ `client_id` int(11) unsigned NOT NULL default '0',
+ `ip_type` enum( 'IPv4', 'IPv6' ) NOT NULL DEFAULT 'IPv4',
`ip_address` varchar(39) default NULL,
`virtualhost` enum('n','y') NOT NULL default 'y',
+ `virtualhost_port` varchar(255) default '80,443',
PRIMARY KEY (`server_ip_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 655ef70..814668b 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -250,7 +250,7 @@
$disabledeliver = ($this->dataRecord["postfix"] == 'y')?'n':'y';
$disablesmtp = ($this->dataRecord["postfix"] == 'y')?'n':'y';
- $sql = "UPDATE mail_user SET disableimap = '$disableimap', disablepop3 = '$disablepop3', disablesmtp = '$disablesmtp', disabledeliver = '$disabledeliver' WHERE mailuser_id = ".$this->id;
+ $sql = "UPDATE mail_user SET disableimap = '$disableimap', disablesieve = '$disableimap', disablepop3 = '$disablepop3', disablesmtp = '$disablesmtp', disabledeliver = '$disabledeliver', disablelda = '$disabledeliver' WHERE mailuser_id = ".$this->id;
$app->db->query($sql);
}
}
@@ -291,7 +291,7 @@
$disabledeliver = ($this->dataRecord["postfix"] == 'y')?'n':'y';
$disablesmtp = ($this->dataRecord["postfix"] == 'y')?'n':'y';
- $sql = "UPDATE mail_user SET disableimap = '$disableimap', disablepop3 = '$disablepop3', disablesmtp = '$disablesmtp', disabledeliver = '$disabledeliver' WHERE mailuser_id = ".$this->id;
+ $sql = "UPDATE mail_user SET disableimap = '$disableimap', disablesieve = '$disableimap', disablepop3 = '$disablepop3', disablesmtp = '$disablesmtp', disabledeliver = '$disabledeliver', disablelda = '$disabledeliver' WHERE mailuser_id = ".$this->id;
$app->db->query($sql);
}
--
Gitblit v1.9.1