From 965795bebb334fa311724ad6542b8f7f0c624bcf Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 24 May 2007 13:35:14 +0000 Subject: [PATCH] Added mail module permissions. --- interface/lib/classes/tform_actions.inc.php | 2 +- interface/web/client/form/client.tform.php | 69 +++++++++++++- interface/web/client/lib/lang/en_client.lng | 89 ++++++++++--------- .../client/templates/client_edit_limits.htm | 33 ++++++- interface/web/mail/lib/lang/en_mail_alias.lng | 1 + .../web/mail/lib/lang/en_mail_blacklist.lng | 1 + .../web/mail/lib/lang/en_mail_domain.lng | 1 + .../mail/lib/lang/en_mail_domain_catchall.lng | 1 + .../web/mail/lib/lang/en_mail_forward.lng | 13 +-- .../web/mail/lib/lang/en_mail_transport.lng | 1 + .../web/mail/lib/lang/en_mail_whitelist.lng | 1 + interface/web/mail/mail_alias_edit.php | 39 ++++++++ interface/web/mail/mail_blacklist_edit.php | 44 +++++++++ .../web/mail/mail_domain_catchall_edit.php | 38 ++++++++ interface/web/mail/mail_domain_edit.php | 56 +++++++++++- interface/web/mail/mail_forward_edit.php | 38 ++++++++ interface/web/mail/mail_transport_edit.php | 54 ++++++++++- interface/web/mail/mail_user_edit.php | 55 ++++++------ interface/web/mail/mail_whitelist_edit.php | 44 +++++++++ .../web/mail/spamfilter_blacklist_edit.php | 42 +++++++++ interface/web/mail/spamfilter_policy_edit.php | 42 +++++++++ interface/web/mail/spamfilter_users_edit.php | 42 +++++++++ .../web/mail/spamfilter_whitelist_edit.php | 42 +++++++++ .../web/mail/templates/mail_domain_list.htm | 2 +- 24 files changed, 667 insertions(+), 83 deletions(-) diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php index da4ad76e30..3612193232 100644 --- a/interface/lib/classes/tform_actions.inc.php +++ b/interface/lib/classes/tform_actions.inc.php @@ -253,7 +253,7 @@ class tform_actions { if($this->id > 0) { // checking permissions - if($app->tform->formDef['auth'] == 'yes') { + if($app->tform->formDef['auth'] == 'yes' && $_SESSION["s"]["user"]["typ"] != 'admin') { if($app->tform->checkPerm($this->id,'d') == false) $app->error($app->lng('error_no_delete_permission')); } diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index d783d2ff68..2d2920ecd1 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -280,6 +280,17 @@ $form["tabs"]['limits'] = array ( ################################## # Begin Datatable fields ################################## + 'default_mailserver' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'SELECT', + 'default' => '1', + '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' => '' + ), 'limit_maildomain' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -322,6 +333,20 @@ $form["tabs"]['limits'] = array ( 'rows' => '', 'cols' => '' ), + 'limit_mailforward' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_mailforward_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), 'limit_mailcatchall' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', @@ -342,7 +367,7 @@ $form["tabs"]['limits'] = array ( 'validators' => array ( 0 => array ( 'type' => 'ISINT', 'errmsg'=> 'limit_mailrouting_error_notint'), ), - 'default' => '-1', + 'default' => '0', 'value' => '', 'separator' => '', 'width' => '10', @@ -392,6 +417,48 @@ $form["tabs"]['limits'] = array ( 'rows' => '', 'cols' => '' ), + 'limit_spamfilter_wblist' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_spamfilter_wblist_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), + 'limit_spamfilter_user' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_spamfilter_user_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), + 'limit_spamfilter_policy' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_spamfilter_policy_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), ################################## # END Datatable fields ################################## diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index a4717854cf..39cd44b543 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -1,43 +1,48 @@ - \ No newline at end of file diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 11ded7394d..21c9690f57 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -1,4 +1,15 @@ + + + + + + + @@ -11,6 +22,10 @@ + + + + @@ -30,7 +45,23 @@ - + + + + + + + + + + + + + + + + + diff --git a/interface/web/mail/lib/lang/en_mail_alias.lng b/interface/web/mail/lib/lang/en_mail_alias.lng index 4023eb61c9..5a803daf0a 100644 --- a/interface/web/mail/lib/lang/en_mail_alias.lng +++ b/interface/web/mail/lib/lang/en_mail_alias.lng @@ -8,4 +8,5 @@ $wb["email_error_isemail"] = 'Email address is invalid.'; $wb["email_error_unique"] = 'Duplicate Emailaddress.'; $wb["no_domain_perm"] = "You have no permission for this domain."; $wb["destination_error_isemail"] = 'Destination Emailaddress is invalid.'; +$wb["limit_mailalias_txt"] = 'The max. number of email aliases for your account is reached.'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_blacklist.lng b/interface/web/mail/lib/lang/en_mail_blacklist.lng index b967c3e30e..c5c1467f46 100644 --- a/interface/web/mail/lib/lang/en_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/en_mail_blacklist.lng @@ -7,4 +7,5 @@ $wb["btn_save_txt"] = 'Save'; $wb["btn_cancel_txt"] = 'Cancel'; $wb["source_error_notempty"] = 'Address is empty.'; $wb["type_txt"] = 'Type'; +$wb["limit_mailfilter_txt"] = 'The max. number of email filters for your account is reached.'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_domain.lng b/interface/web/mail/lib/lang/en_mail_domain.lng index c8e79c1cc9..49f823604c 100644 --- a/interface/web/mail/lib/lang/en_mail_domain.lng +++ b/interface/web/mail/lib/lang/en_mail_domain.lng @@ -9,5 +9,6 @@ $wb["domain_error_empty"] = 'Domain is empty.'; $wb["domain_error_unique"] = 'Duplicate Domain.'; $wb["domain_error_regex"] = 'Invalid domain name.'; $wb["client_txt"] = 'Client'; +$wb["limit_maildomain_txt"] = 'The max. number of email domains for your account is reached.'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_domain_catchall.lng b/interface/web/mail/lib/lang/en_mail_domain_catchall.lng index f93073b702..d758301a20 100644 --- a/interface/web/mail/lib/lang/en_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/en_mail_domain_catchall.lng @@ -7,4 +7,5 @@ $wb["btn_cancel_txt"] = 'Cancel'; $wb["domain_error_unique"] = "There is already a Catchall record for this domain."; $wb["no_domain_perm"] = "You have no permission for this domain."; $wb["domain_error_regex"] = 'Invalid domain name od domain contains invalid characters.'; +$wb["limit_mailcatchall_txt"] = 'The max. number of email catchall accounts for your account is reached.'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_forward.lng b/interface/web/mail/lib/lang/en_mail_forward.lng index 4f927b3591..e387f1bb31 100644 --- a/interface/web/mail/lib/lang/en_mail_forward.lng +++ b/interface/web/mail/lib/lang/en_mail_forward.lng @@ -1,7 +1,8 @@ - \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_transport.lng b/interface/web/mail/lib/lang/en_mail_transport.lng index e454c00f4d..530d1e20bf 100644 --- a/interface/web/mail/lib/lang/en_mail_transport.lng +++ b/interface/web/mail/lib/lang/en_mail_transport.lng @@ -6,4 +6,5 @@ $wb["sort_order_txt"] = 'Sort by'; $wb["active_txt"] = 'Active'; $wb["btn_save_txt"] = 'Save'; $wb["btn_cancel_txt"] = 'Cancel'; +$wb["limit_mailrouting_txt"] = 'The max. number of routes for your account is reached.'; ?> \ No newline at end of file diff --git a/interface/web/mail/lib/lang/en_mail_whitelist.lng b/interface/web/mail/lib/lang/en_mail_whitelist.lng index 4cf2fb59db..1dbe361497 100644 --- a/interface/web/mail/lib/lang/en_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/en_mail_whitelist.lng @@ -7,4 +7,5 @@ $wb["btn_save_txt"] = 'Save'; $wb["btn_cancel_txt"] = 'Cancel'; $wb["source_error_notempty"] = 'Address is empty.'; $wb["type_txt"] = 'Type'; +$wb["limit_mailfilter_txt"] = 'The max. number of email filters for your account is reached.'; ?> \ No newline at end of file diff --git a/interface/web/mail/mail_alias_edit.php b/interface/web/mail/mail_alias_edit.php index a769062147..01fa4e0ff6 100644 --- a/interface/web/mail/mail_alias_edit.php +++ b/interface/web/mail/mail_alias_edit.php @@ -53,6 +53,28 @@ $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailalias FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_mailalias"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id and type = 'alias'"); + if($tmp["number"] >= $client["limit_mailalias"]) { + $app->error($app->tform->wordbook["limit_mailalias_txt"]); + } + } + } + + parent::onShowNew(); + } + function onShowEnd() { global $app, $conf; @@ -81,6 +103,23 @@ class page_action extends tform_actions { // Check if Domain belongs to user $domain = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r')); if($domain["domain"] != $_POST["email_domain"]) $app->tform->errorMessage .= $app->tform->wordbook["no_domain_perm"]; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailalias FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_mailalias"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id AND type = 'alias'"); + if($tmp["number"] >= $client["limit_mailalias"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_mailalias_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + // compose the email field $this->dataRecord["source"] = $_POST["email_local_part"]."@".$_POST["email_domain"]; diff --git a/interface/web/mail/mail_blacklist_edit.php b/interface/web/mail/mail_blacklist_edit.php index 5c74198241..31dded5623 100644 --- a/interface/web/mail/mail_blacklist_edit.php +++ b/interface/web/mail/mail_blacklist_edit.php @@ -53,6 +53,50 @@ $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailfilter FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_mailfilter"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(access_id) as number FROM mail_access WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_mailfilter"]) { + $app->error($app->tform->wordbook["limit_mailfilter_txt"]); + } + } + } + + parent::onShowNew(); + } + + function onSubmit() { + global $app, $conf; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailfilter FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_mailfilter"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(access_id) as number FROM mail_access WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_mailfilter"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_mailfilter_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + + parent::onSubmit(); + } + } $app->tform_actions = new page_action; diff --git a/interface/web/mail/mail_domain_catchall_edit.php b/interface/web/mail/mail_domain_catchall_edit.php index a40c5dcbfe..5cded1ae70 100644 --- a/interface/web/mail/mail_domain_catchall_edit.php +++ b/interface/web/mail/mail_domain_catchall_edit.php @@ -53,6 +53,28 @@ $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailcatchall FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_mailforward"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id and type = 'catchall'"); + if($tmp["number"] >= $client["limit_mailcatchall"]) { + $app->error($app->tform->wordbook["limit_mailcatchall_txt"]); + } + } + } + + parent::onShowNew(); + } + function onShowEnd() { global $app, $conf; @@ -81,6 +103,22 @@ class page_action extends tform_actions { // Check if Domain belongs to user $domain = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r')); if($domain["domain"] != $_POST["email_domain"]) $app->tform->errorMessage .= $app->tform->wordbook["no_domain_perm"]; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailcatchall FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_mailcatchall"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id AND type = 'catchall'"); + if($tmp["number"] >= $client["limit_mailcatchall"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_mailcatchall_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin // compose the email field $this->dataRecord["source"] = "@".$_POST["email_domain"]; diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index f2709b593d..74481d5d58 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -52,7 +52,29 @@ $app->uses('tpl,tform,tform_actions'); $app->load('tform_actions'); class page_action extends tform_actions { - + + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_maildomain FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another maildomain. + if($client["limit_maildomain"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM mail_domain WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_maildomain"]) { + $app->error($app->tform->wordbook["limit_maildomain_txt"]); + } + } + } + + parent::onShowNew(); + } + function onShowEnd() { global $app, $conf; @@ -74,13 +96,43 @@ class page_action extends tform_actions { } function onSubmit() { - if($_SESSION["s"]["user"]["typ"] != 'admin') unset($this->dataRecord["client_group_id"]); + global $app, $conf; + if($_SESSION["s"]["user"]["typ"] != 'admin') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_maildomain, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // When the record is updated + if($this->id > 0) { + // restore the server ID if the user is not admin and record is edited + $tmp = $app->db->queryOneRecord("SELECT server_id FROM mail_domain WHERE domain_id = ".intval($this->id)); + $this->dataRecord["server_id"] = $tmp["server_id"]; + unset($tmp); + // When the record is inserted + } else { + // set the server ID to the default mailserver of the client + $this->dataRecord["server_id"] = $client["default_mailserver"]; + + // Check if the user may add another mail_domain + if($client["limit_maildomain"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(domain_id) as number FROM mail_domain WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_maildomain"]) { + $app->error($app->tform->wordbook["limit_maildomain_txt"]); + } + } + } + + // Clients may not set the client_group_id, so we unset them if user is not a admin + unset($this->dataRecord["client_group_id"]); + } parent::onSubmit(); } function onAfterInsert() { global $app, $conf; + // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) { $client_group_id = intval($this->dataRecord["client_group_id"]); $app->db->query("UPDATE mail_domain SET sys_groupid = $client_group_id WHERE domain_id = ".$this->id); diff --git a/interface/web/mail/mail_forward_edit.php b/interface/web/mail/mail_forward_edit.php index 5d6b8a7522..9a7b2e9a7c 100644 --- a/interface/web/mail/mail_forward_edit.php +++ b/interface/web/mail/mail_forward_edit.php @@ -53,6 +53,28 @@ $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailforward FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_mailforward"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id and type = 'forward'"); + if($tmp["number"] >= $client["limit_mailforward"]) { + $app->error($app->tform->wordbook["limit_mailforward_txt"]); + } + } + } + + parent::onShowNew(); + } + function onShowEnd() { global $app, $conf; @@ -79,6 +101,22 @@ class page_action extends tform_actions { // Check if Domain belongs to user $domain = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r')); if($domain["domain"] != $_POST["email_domain"]) $app->tform->errorMessage .= $app->tform->wordbook["no_domain_perm"]; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailforward FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_mailforward"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(forwarding_id) as number FROM mail_forwarding WHERE sys_groupid = $client_group_id AND type = 'forward'"); + if($tmp["number"] >= $client["limit_mailforward"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_mailforward_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin // compose the email field $this->dataRecord["source"] = $_POST["email_local_part"]."@".$_POST["email_domain"]; diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php index 8bf03f3aa0..161321d31e 100644 --- a/interface/web/mail/mail_transport_edit.php +++ b/interface/web/mail/mail_transport_edit.php @@ -47,10 +47,60 @@ if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) exit; } + // Loading classes $app->uses('tpl,tform,tform_actions'); +$app->load('tform_actions'); + +class page_action extends tform_actions { + + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailrouting FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_mailrouting"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(transport_id) as number FROM mail_transport WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_mailrouting"]) { + $app->error($app->tform->wordbook["limit_mailrouting_txt"]); + } + } + } + + parent::onShowNew(); + } + + function onSubmit() { + global $app, $conf; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailrouting FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_mailrouting"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(transport_id) as number FROM mail_transport WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_mailrouting"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_mailrouting_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + + parent::onSubmit(); + } + +} -// let tform_actions handle the page -$app->tform_actions->onLoad(); +$page = new page_action; +$page->onLoad(); ?> \ No newline at end of file diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index 2427dc34f8..d611e23acc 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -104,46 +104,47 @@ class page_action extends tform_actions { function onSubmit() { global $app, $conf; - // Get the limits of the client - $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT limit_mailbox, limit_mailquota FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); - // Check if Domain belongs to user $domain = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r')); if($domain["domain"] != $_POST["email_domain"]) $app->tform->errorMessage .= $app->tform->wordbook["no_domain_perm"]; - // if its an insert - if($this->id == 0) { - - // check for password - if($_POST["password"] == '') { - $app->tform->errorMessage .= $app->tform->wordbook["error_no_pwd"]."
"; - } + + // if its an insert, check that the password is not empty + if($this->id == 0 && $_POST["password"] == '') { + $app->tform->errorMessage .= $app->tform->wordbook["error_no_pwd"]."
"; + } + + // Ccheck the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailbox, limit_mailquota FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + // Check if the user may add another mailbox. - if($client["limit_mailbox"] >= 0) { + if($this->id == 0 && $client["limit_mailbox"] >= 0) { $tmp = $app->db->queryOneRecord("SELECT count(mailuser_id) as number FROM mail_user WHERE sys_groupid = $client_group_id"); if($tmp["number"] >= $client["limit_mailbox"]) { $app->tform->errorMessage .= $app->tform->wordbook["limit_mailbox_txt"]."
"; } unset($tmp); } - } // end if insert - - // Check the quota and adjust - if($client["limit_mailquota"] >= 0) { - $tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".intval($this->id)." AND sys_groupid = $client_group_id"); - $mailquota = $tmp["mailquota"] / 1024; - $new_mailbox_quota = intval($this->dataRecord["quota"]); - if($mailquota + $new_mailbox_quota > $client["limit_mailquota"]) { - $max_free_quota = $client["limit_mailquota"] - $mailquota; - $app->tform->errorMessage .= $app->tform->wordbook["limit_mailquota_txt"].": ".$max_free_quota."
"; - // Set the quota field to the max free space - $this->dataRecord["quota"] = $max_free_quota; + + // Check the quota and adjust + if($client["limit_mailquota"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT sum(quota) as mailquota FROM mail_user WHERE mailuser_id != ".intval($this->id)." AND sys_groupid = $client_group_id"); + $mailquota = $tmp["mailquota"] / 1024; + $new_mailbox_quota = intval($this->dataRecord["quota"]); + if($mailquota + $new_mailbox_quota > $client["limit_mailquota"]) { + $max_free_quota = $client["limit_mailquota"] - $mailquota; + $app->tform->errorMessage .= $app->tform->wordbook["limit_mailquota_txt"].": ".$max_free_quota."
"; + // Set the quota field to the max free space + $this->dataRecord["quota"] = $max_free_quota; + } + unset($tmp); + unset($tmp_quota); } - unset($tmp); - unset($tmp_quota); - } + } // end if user is not admin // compose the email field diff --git a/interface/web/mail/mail_whitelist_edit.php b/interface/web/mail/mail_whitelist_edit.php index 97ec9d44e3..32518e8aa5 100644 --- a/interface/web/mail/mail_whitelist_edit.php +++ b/interface/web/mail/mail_whitelist_edit.php @@ -52,6 +52,50 @@ $app->uses('tpl,tform,tform_actions'); $app->load('tform_actions'); class page_action extends tform_actions { + + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailfilter FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_mailfilter"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(access_id) as number FROM mail_access WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_mailfilter"]) { + $app->error($app->tform->wordbook["limit_mailfilter_txt"]); + } + } + } + + parent::onShowNew(); + } + + function onSubmit() { + global $app, $conf; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_mailfilter FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_mailfilter"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(access_id) as number FROM mail_access WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_mailfilter"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_mailfilter_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + + parent::onSubmit(); + } } diff --git a/interface/web/mail/spamfilter_blacklist_edit.php b/interface/web/mail/spamfilter_blacklist_edit.php index 9c7661aec7..99c098fe53 100644 --- a/interface/web/mail/spamfilter_blacklist_edit.php +++ b/interface/web/mail/spamfilter_blacklist_edit.php @@ -52,7 +52,49 @@ $app->uses('tpl,tform,tform_actions'); $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_limit_spamfilter_wblist"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_wblist"]) { + $app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]); + } + } + } + + parent::onShowNew(); + } + function onSubmit() { + global $app, $conf; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_spamfilter_wblist"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_wblist"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_spamfilter_wblist_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + + parent::onSubmit(); + } } $app->tform_actions = new page_action; diff --git a/interface/web/mail/spamfilter_policy_edit.php b/interface/web/mail/spamfilter_policy_edit.php index 01324d2287..d5d52d5fc7 100644 --- a/interface/web/mail/spamfilter_policy_edit.php +++ b/interface/web/mail/spamfilter_policy_edit.php @@ -52,7 +52,49 @@ $app->uses('tpl,tform,tform_actions'); $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_policy FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_limit_spamfilter_policy"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM spamfilter_policy WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_policy"]) { + $app->error($app->tform->wordbook["limit_spamfilter_policy_txt"]); + } + } + } + + parent::onShowNew(); + } + function onSubmit() { + global $app, $conf; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_policy FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_spamfilter_policy"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM spamfilter_policy WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_policy"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_spamfilter_policy_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + + parent::onSubmit(); + } } $app->tform_actions = new page_action; diff --git a/interface/web/mail/spamfilter_users_edit.php b/interface/web/mail/spamfilter_users_edit.php index c53f37283b..77050b5de2 100644 --- a/interface/web/mail/spamfilter_users_edit.php +++ b/interface/web/mail/spamfilter_users_edit.php @@ -52,7 +52,49 @@ $app->uses('tpl,tform,tform_actions'); $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_user FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_limit_spamfilter_user"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM spamfilter_users WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_user"]) { + $app->error($app->tform->wordbook["limit_spamfilter_user_txt"]); + } + } + } + + parent::onShowNew(); + } + function onSubmit() { + global $app, $conf; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_user FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_spamfilter_user"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(id) as number FROM spamfilter_users WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_user"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_spamfilter_user_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + + parent::onSubmit(); + } } $app->tform_actions = new page_action; diff --git a/interface/web/mail/spamfilter_whitelist_edit.php b/interface/web/mail/spamfilter_whitelist_edit.php index b8c8bfa022..b1f249651f 100644 --- a/interface/web/mail/spamfilter_whitelist_edit.php +++ b/interface/web/mail/spamfilter_whitelist_edit.php @@ -52,7 +52,49 @@ $app->uses('tpl,tform,tform_actions'); $app->load('tform_actions'); class page_action extends tform_actions { + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($client["limit_limit_spamfilter_wblist"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_wblist"]) { + $app->error($app->tform->wordbook["limit_spamfilter_wblist_txt"]); + } + } + } + + parent::onShowNew(); + } + function onSubmit() { + global $app, $conf; + + // Check the client limits, if user is not the admin + if($_SESSION["s"]["user"]["typ"] != 'admin') { // if user is not admin + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_spamfilter_wblist FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another mailbox. + if($this->id == 0 && $client["limit_spamfilter_wblist"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(wblist_id) as number FROM spamfilter_wblist WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_spamfilter_wblist"]) { + $app->tform->errorMessage .= $app->tform->wordbook["limit_spamfilter_wblist_txt"]."
"; + } + unset($tmp); + } + } // end if user is not admin + + parent::onSubmit(); + } } $app->tform_actions = new page_action; diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm index d734e10eb1..b4c0b6e25d 100644 --- a/interface/web/mail/templates/mail_domain_list.htm +++ b/interface/web/mail/templates/mail_domain_list.htm @@ -18,7 +18,7 @@ - + -- GitLab

Email

{tmpl_var name='default_mailserver_txt'}: + +
{tmpl_var name='limit_maildomain_txt'}: {tmpl_var name='limit_mailalias_txt'}:
{tmpl_var name='limit_mailforward_txt'}:
{tmpl_var name='limit_mailcatchall_txt'}:
{tmpl_var name='limit_mailquota_txt'}: MB

Spamfilter

{tmpl_var name='limit_spamfilter_wblist_txt'}:
{tmpl_var name='limit_spamfilter_user_txt'}:
{tmpl_var name='limit_spamfilter_policy_txt'}:
   
{tmpl_var name="active"} {tmpl_var name="server_id"} {tmpl_var name="domain"}[{tmpl_var name='delete_txt'}][{tmpl_var name='delete_txt'}]