diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 09bf5885864ced8dfe15d629346cc6dfc8c3c904..aa65b545a8508d8c8c1ae6d676c6f1bd94fb022a 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -66,6 +66,9 @@ class installer_dist extends installer_base { //* mysql-virtual_relaydomains.cf $this->process_postfix_config('mysql-virtual_relaydomains.cf'); + + //* mysql-virtual_relayrecipientmaps.cf + $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf'); //* Changing mode and group of the new created config files. caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null', @@ -101,6 +104,7 @@ class installer_dist extends installer_base { 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', + 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', 'virtual_create_maildirsize = yes', 'virtual_maildir_extended = yes', 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index c8d0f9bd6a59186c251d64c10d0992e45be890e2..a7c04a68e41caa5829194716e852c9aa07bea4cc 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -66,6 +66,9 @@ class installer_dist extends installer_base { //* mysql-virtual_relaydomains.cf $this->process_postfix_config('mysql-virtual_relaydomains.cf'); + + //* mysql-virtual_relayrecipientmaps.cf + $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf'); //* Changing mode and group of the new created config files. caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null', @@ -101,6 +104,7 @@ class installer_dist extends installer_base { 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', + 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', 'virtual_create_maildirsize = yes', 'virtual_maildir_extended = yes', 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 9e79b5501ec393bb6fe0faf3e5415216899776a4..b95a5bfbb9043aa78464365f7c6c222f6a8fa4f6 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -425,6 +425,9 @@ class installer_base { //* mysql-virtual_relaydomains.cf $this->process_postfix_config('mysql-virtual_relaydomains.cf'); + + //* mysql-virtual_relayrecipientmaps.cf + $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf'); //* Changing mode and group of the new created config files. caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null', @@ -460,6 +463,7 @@ class installer_base { 'smtpd_tls_key_file = '.$config_dir.'/smtpd.key', 'transport_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_transports.cf', 'relay_domains = mysql:'.$config_dir.'/mysql-virtual_relaydomains.cf', + 'relay_recipient_maps = mysql:'.$config_dir.'/mysql-virtual_relayrecipientmaps.cf', 'virtual_create_maildirsize = yes', 'virtual_maildir_extended = yes', 'virtual_mailbox_limit_maps = proxy:mysql:'.$config_dir.'/mysql-virtual_mailbox_limit_maps.cf', diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index 0b201152a61ded0edf93b998419233f81eda52c5..a7d3d6af2142bc847716f2e5b5d93b9c5f3fc79d 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -459,6 +459,26 @@ CREATE TABLE `mail_mailman_domain` ( 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 ; + -- -------------------------------------------------------- diff --git a/install/tpl/mysql-virtual_relayrecipientmaps.cf.master b/install/tpl/mysql-virtual_relayrecipientmaps.cf.master new file mode 100644 index 0000000000000000000000000000000000000000..a0c0fdb6ee9c6713581ef5d25099729095e44729 --- /dev/null +++ b/install/tpl/mysql-virtual_relayrecipientmaps.cf.master @@ -0,0 +1,8 @@ +user = {mysql_server_ispconfig_user} +password = {mysql_server_ispconfig_password} +dbname = {mysql_server_database} +table = mail_relay_recipients +select_field = access +where_field = source +additional_conditions = and active = 'y' and server_id = {server_id} +hosts = {mysql_server_ip} \ No newline at end of file diff --git a/interface/web/mail/form/mail_relay_recipient.tform.php b/interface/web/mail/form/mail_relay_recipient.tform.php new file mode 100644 index 0000000000000000000000000000000000000000..69dfe2825064df3a8733a2c88923c44fd27c686e --- /dev/null +++ b/interface/web/mail/form/mail_relay_recipient.tform.php @@ -0,0 +1,104 @@ + 0 id must match with id of current user +$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user +$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete +$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete +$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete + +$form["tabs"]['relay_recipient'] = array ( + 'title' => "Relay recipient", + 'width' => 100, + 'template' => "templates/mail_relay_recipient_edit.htm", + 'fields' => array ( + ################################## + # Begin Datatable fields + ################################## + 'server_id' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'SELECT', + 'default' => '', + 'datasource' => array ( 'type' => 'SQL', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'keyfield'=> 'server_id', + 'valuefield'=> 'server_name' + ), + 'value' => '' + ), + 'source' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'source_error_notempty'), + ), + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'access' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => 'OK', + 'value' => 'OK', + 'width' => '30', + 'maxlength' => '255' + ), + 'active' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n',1 => 'y') + ), + ################################## + # ENDE Datatable fields + ################################## + ) +); + + +?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_relay_recipient.lng b/interface/web/mail/lib/lang/en_mail_relay_recipient.lng new file mode 100644 index 0000000000000000000000000000000000000000..fdec9ab0a4407dff4051f577b8d28fc71a1ce114 --- /dev/null +++ b/interface/web/mail/lib/lang/en_mail_relay_recipient.lng @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/en_mail_relay_recipient_list.lng new file mode 100644 index 0000000000000000000000000000000000000000..44cd894ac2c426dea1d8adb1add200370e81806d --- /dev/null +++ b/interface/web/mail/lib/lang/en_mail_relay_recipient_list.lng @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/interface/web/mail/lib/module.conf.php b/interface/web/mail/lib/module.conf.php index 82e7a39b97c9c61426019164b7ac0eeb44465b99..fb31299539c9f77ed13c2a579799115d4eaa4b4a 100644 --- a/interface/web/mail/lib/module.conf.php +++ b/interface/web/mail/lib/module.conf.php @@ -112,6 +112,10 @@ if($_SESSION['s']['user']['typ'] == 'admin') { $items[] = array( 'title' => 'Content Filter', 'target' => 'content', 'link' => 'mail/mail_content_filter_list.php'); + + $items[] = array( 'title' => 'Relay Recipients', + 'target' => 'content', + 'link' => 'mail/mail_relay_recipient_list.php'); $module['nav'][] = array( 'title' => 'Global Filters', 'open' => 1, diff --git a/interface/web/mail/list/mail_relay_recipient.list.php b/interface/web/mail/list/mail_relay_recipient.list.php new file mode 100644 index 0000000000000000000000000000000000000000..032223efcf493d4e4dd904041c1cd9209c8ca10b --- /dev/null +++ b/interface/web/mail/list/mail_relay_recipient.list.php @@ -0,0 +1,85 @@ + "active", + 'datatype' => "VARCHAR", + 'formtype' => "SELECT", + 'op' => "=", + 'prefix' => "", + 'suffix' => "", + 'width' => "", + 'value' => array('y' => "
Yes
", 'n' => "
No
")); + + +$liste["item"][] = array( 'field' => "server_id", + 'datatype' => "VARCHAR", + 'formtype' => "SELECT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'datasource' => array ( 'type' => 'SQL', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name', + 'keyfield'=> 'server_id', + 'valuefield'=> 'server_name' + ), + 'width' => "", + 'value' => ""); + + +$liste["item"][] = array( 'field' => "source", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); + + +?> \ No newline at end of file diff --git a/interface/web/mail/mail_relay_recipient_del.php b/interface/web/mail/mail_relay_recipient_del.php new file mode 100644 index 0000000000000000000000000000000000000000..62972ec1750a645a46eff6d9b961fdafa46336c4 --- /dev/null +++ b/interface/web/mail/mail_relay_recipient_del.php @@ -0,0 +1,51 @@ +auth->check_module_permissions('mail'); + +$app->uses("tform_actions"); +$app->tform_actions->onDelete(); + +?> \ No newline at end of file diff --git a/interface/web/mail/mail_relay_recipient_edit.php b/interface/web/mail/mail_relay_recipient_edit.php new file mode 100644 index 0000000000000000000000000000000000000000..46a5d4cbb77cd56743bde212aef62f42ce236eaf --- /dev/null +++ b/interface/web/mail/mail_relay_recipient_edit.php @@ -0,0 +1,59 @@ +auth->check_module_permissions('mail'); + +// Loading classes +$app->uses('tpl,tform,tform_actions'); +$app->load('tform_actions'); + +class page_action extends tform_actions { + +} + +$app->tform_actions = new page_action; +$app->tform_actions->onLoad(); + + +?> \ No newline at end of file diff --git a/interface/web/mail/mail_relay_recipient_list.php b/interface/web/mail/mail_relay_recipient_list.php new file mode 100644 index 0000000000000000000000000000000000000000..5e6963c7bac01e5981df21500e6840d2bf15335f --- /dev/null +++ b/interface/web/mail/mail_relay_recipient_list.php @@ -0,0 +1,24 @@ +auth->check_module_permissions('mail'); + +$app->uses('listform_actions'); +# $app->listform_actions->SQLExtWhere = "access = 'OK'"; + +$app->listform_actions->onLoad(); + + +?> \ No newline at end of file diff --git a/interface/web/mail/templates/mail_relay_recipient_edit.htm b/interface/web/mail/templates/mail_relay_recipient_edit.htm new file mode 100644 index 0000000000000000000000000000000000000000..5befa6eb47e72269d7e971ed3c0378f4cb668a79 --- /dev/null +++ b/interface/web/mail/templates/mail_relay_recipient_edit.htm @@ -0,0 +1,35 @@ +

+

+ +
+ +
+
Relay recipient +
+ + +
+
+ + +
+
+

{tmpl_var name='active_txt'}

+
+ {tmpl_var name='active'} +
+
+
+ + + + +
+ + +
+
+ +
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm new file mode 100644 index 0000000000000000000000000000000000000000..331aa5e2b890af1169defdb7f4971420eaea2cfa --- /dev/null +++ b/interface/web/mail/templates/mail_relay_recipient_list.htm @@ -0,0 +1,55 @@ +

+ +
+ +
+
{tmpl_var name="toolsarea_head_txt"} +
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="active"}{tmpl_var name="server_id"}{tmpl_var name="source"} +
+ {tmpl_var name='delete_txt'} +
+
+
+
+ +