extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 12:41:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make mail ACL account owner row readonly as the owner should not be able to delete/change his rights, he always has full-rights

Browse Source
This commit is contained in:
Hadi Nategh 2014-08-22 13:18:47 +00:00
parent 80285b76ad
commit 9e749e516d
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mail/inc/class.mail_acl.inc.php
View File

@ -143,24 +143,20 @@ class mail_acl
$tmpl->set_validation_error('grid['.$row.']'.'[acc_id]', "You must fill this field!"); $tmpl->set_validation_error('grid['.$row.']'.'[acc_id]', "You must fill this field!");
} }
} }
else
{
$msg .= lang("The Folder %1 's ACLs saved!", $content['mailbox']);
}
//Add new row at the end //Add new row at the end
if ($content['grid'][count($content['grid'])]['acc_id']) if ($content['grid'][count($content['grid'])]['acc_id'])
array_push($content['grid'], array('acc_id'=>'')); array_push($content['grid'], array('acc_id'=>''));
} }
else else
{ {
$msg .= "\n".lang("Error: Could not save ACL").' '.lang("reason!"); $msg .= "\n".lang("Error: Could not save ACL").' '.lang("reason!");
} }
//Send message //Send message
egw_framework::refresh_opener($msg, 'mail',null, 'update'); egw_framework::message($msg);
if ($button == "apply") break; if ($button == "apply") break;
//Fall through
case 'cancel': case 'cancel':
egw_framework::window_close(); egw_framework::window_close();
common::egw_exit(); common::egw_exit();
@ -175,21 +171,29 @@ class mail_acl
{ {
error_log(__METHOD__.__LINE__. "()" . "The remove_acl suppose to return an array back, something is wrong there"); error_log(__METHOD__.__LINE__. "()" . "The remove_acl suppose to return an array back, something is wrong there");
} }
egw_framework::refresh_opener($msg, 'mail', null,'update'); egw_framework::message($msg);
} }
} }
$readonlys = $sel_options = array(); $readonlys = $sel_options = array();
$sel_options['acl'] = $this->aclRightsAbbrvs; $sel_options['acl'] = $this->aclRightsAbbrvs;
//Make the delete buttons readonly for entry filed and account owner //Make the account owner's fields all readonly as owner has all rights and should not be able to change them
foreach($content['grid'] as $key => $field) foreach($content['grid'] as $key => $fields)
{ {
if ($field['acc_id'] == $this->mail_bo->icServer->acc_imap_username || if ($fields['acc_id'] == $this->mail_bo->icServer->acc_imap_username ||
$field['acc_id'][0] == $this->mail_bo->icServer->acc_imap_username) $fields['acc_id'][0] == $this->mail_bo->icServer->acc_imap_username)
{ {
foreach ($fields as $index => $val)
{
$readonlys['grid'][$key][$index] = true;
}
$readonlys['grid']['delete['.$key.']'] = true; $readonlys['grid']['delete['.$key.']'] = true;
$readonlys['grid'][$key]['acl_recursive'] = true;
$preserv ['grid'][$key] = $fields;
$preserv['grid'][$key]['acl_recursive'] = false;
} }
} }
//Make entry row's delete button readonly
$readonlys['grid']['delete['.count($content['grid']).']'] = true; $readonlys['grid']['delete['.count($content['grid']).']'] = true;
$preserv ['mailbox'] = $content['mailbox']; $preserv ['mailbox'] = $content['mailbox'];
@ -229,7 +233,8 @@ class mail_acl
$options['rights'] .= $right[1]; $options['rights'] .= $right[1];
} }
} }
$username = $content['grid'][$keys]['acc_id'][0]; $username = $content['grid'][$keys]['acc_id'] == $this->mail_bo->icServer->acc_imap_username
?$content['grid'][$keys]['acc_id']:$content['grid'][$keys]['acc_id'][0];
//error_log(__METHOD__."(".__LINE__.") setACL($content[mailbox], $username, ".array2string($options).", $recursive)"); //error_log(__METHOD__."(".__LINE__.") setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
if (is_numeric($username) && ($u = $this->mail_bo->icServer->getMailBoxUserName($username))) if (is_numeric($username) && ($u = $this->mail_bo->icServer->getMailBoxUserName($username)))
{ {
@ -238,7 +243,15 @@ class mail_acl
if (!empty($username)) if (!empty($username))
{ {
//error_log(__METHOD__."() setACL($content[mailbox], $username, ".array2string($options).", $recursive)"); //error_log(__METHOD__."() setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
$this->setACL($content['mailbox'], $username, $options, $recursive); if (($ret=$this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
{
$msg = lang("The Folder %1 's ACLs saved!", $content['mailbox']);
}
else
{
$msg = lang('Error while setting folder '.$content['mailbox']. $msg);
}
} }
else else
{ {
@ -376,7 +389,7 @@ class mail_acl
/** /**
* Set ACL rights of a folder or including subfolders to an account * Set ACL rights of a folder or including subfolders to an account
* @param String $mailbox folder name that needs to be edited * @param String $mailbox folder name that needs to be edited
* @param String $Identifier The identifier to set. * @param String $identifier The identifier to set.
* @param Array $options Additional options: * @param Array $options Additional options:
* - rights: (string) The rights to alter or set. * - rights: (string) The rights to alter or set.
* - action: (string, optional) If 'add' or 'remove', adds or removes the * - action: (string, optional) If 'add' or 'remove', adds or removes the
@ -387,7 +400,7 @@ class mail_acl
* @return Boolean FALSE in case of any exceptions and TRUE in case of success, * @return Boolean FALSE in case of any exceptions and TRUE in case of success,
* *
*/ */
function setACL($mailbox, $identifier,$options, $recursive) function setACL($mailbox, $identifier,$options, $recursive, &$msg)
{ {
if ($recursive) if ($recursive)
{ {
@ -405,6 +418,7 @@ class mail_acl
} }
catch (Exception $e) catch (Exception $e)
{ {
$msg = $e->getMessage();
error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . " because of " .$e->getMessage()); error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . " because of " .$e->getMessage());
return false; return false;
} }