From c6c4cf89f2329ab895bf7e9f87c63ab68c772676 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 12 May 2017 15:48:36 +0200 Subject: [PATCH] Add another pre-configured mail acl rights --- mail/inc/class.mail_acl.inc.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mail/inc/class.mail_acl.inc.php b/mail/inc/class.mail_acl.inc.php index f2afd24d05..fa027df6cf 100644 --- a/mail/inc/class.mail_acl.inc.php +++ b/mail/inc/class.mail_acl.inc.php @@ -86,7 +86,8 @@ class mail_acl 'lrs' => array('label'=>'readable','title'=>'Allows a user to read the contents of the mailbox.'), 'lprs' => array('label'=>'post','title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'), 'ilprs' => array('label'=>'append','title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'), - 'ilprsw' => array('label'=>'write','title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'), + 'ilprsw' => array('label'=>'write','title'=>'Allows a user to read and write the maibox, post to it, append messages to it.'), + 'eilprswtk' => array('label'=>'write & delete','title'=>'Allows a user to read, write and create folders and mails, post to it, append messages to it and delete messages.'), 'aeiklprstwx'=> array('label'=>'all','title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'), 'custom' => array('label'=>'custom','title'=>'User defined combination of rights for the ACL'), ); @@ -155,6 +156,10 @@ class mail_acl { $content['mailbox'] = $mailbox; $acl = (array)$this->retrieve_acl($mailbox, $msg); + if ($acl[0] === FALSE) + { + Api\Framework::window_close($msg); + } $n = 1; foreach ($acl as $key => $value) { @@ -408,6 +413,7 @@ class mail_acl else { $msg = lang('Get ACL rights failed from IMAP server!'); + return false; } }