Commit 40c436b6 authored by tbrehm's avatar tbrehm
Browse files

- Implemented: FS#1339 - Add "disablesieve" to mail_user table

- Added fields for IPv6 support and virtualhost Port Configuration to server_ip table
parent d2e84853
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
......@@ -770,6 +770,8 @@ CREATE TABLE `mail_user` (
`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 @@ CREATE TABLE `server_ip` (
`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 ;
......
......@@ -250,7 +250,7 @@ class page_action extends tform_actions {
$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 @@ class page_action extends tform_actions {
$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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment