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

Make the delete button in mail folder's acl popup window a bit more functional

Browse Source
This commit is contained in:
Hadi Nategh 2013-12-02 17:09:35 +00:00
parent 9d929dac60
commit 7e2b648590
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,6 +129,9 @@ class mail_acl
{
$msg .= lang("The Folder %1 's ACLs saved!", $content['mailbox']);
}
//Add new row at the end
if ($content['grid'][count($content['grid'])]['acc_id'])
array_push($content['grid'], array('acc_id'=>''));
$preserv ['mailbox'] = $content['mailbox'];
@ -147,16 +150,13 @@ class mail_acl
common::egw_exit();
break;
case 'delete':
if ($content)
{
//$content['grid'] = $this->remove_acl($content,$msg);
$msg = "delete";
$content['grid'] = $this->remove_acl($content,$msg);
egw_framework::refresh_opener($msg, 'mail', 'update');
}
}
}
$sel_options['acl'] = $this->aclRightsAbbrvs;
$content['msg'] = $msg;
$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv,2);
}
@ -235,11 +235,12 @@ class mail_acl
function remove_acl($content,$msg)
{
$row_num = array_keys($content['grid']['delete'],"pressed");
$row_num = $row_num[0];
$identifier = $content['grid'][$row_num]['acc_id'][0];
//$this->deleteACL($content['mailbox'], $identifier,$content['grid'][$row_num]['recursively'] );
unset($content['grid'][$row_num]);
unset($content['grid']['delete']);
return array_values($content['grid']);
return array_combine(range(1, count($content['grid'])), array_values($content['grid']));
}
/**