extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 10:51:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing/handling problem for setting (possible obsolet) ACL rights D and C

Browse Source
This commit is contained in:
Klaus Leithoff 2013-02-21 14:13:08 +00:00
parent 8d5a2967e6
commit acfb3cce70
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -4102,18 +4102,26 @@ class felamimail_bo
function updateSingleACL($_folderName, $_accountName, $_aclType, $_aclStatus,$_recursive=false)
{
//error_log(__METHOD__.__LINE__." $_folderName, $_accountName, $_aclType, $_aclStatus,$_recursive");
//error_log(__METHOD__.__LINE__." $_folderName, $_accountName, $_aclType, $_aclStatus, $_recursive");
$userACL = $this->getIMAPACL($_folderName, $_accountName);
$aclType = $_aclType;
if ($_aclType=='c') $aclType ='ckx'; // rfc4314 obsolet c is union of k (create mailbox) and x (delete mailbox (aka rename))
if ($_aclType=='d') $aclType ='det'; // rfc4314 obsolet d is union of e(xpunge) and t (delete)
//error_log(__METHOD__.__LINE__.' UserACL:'.$userACL);
if($_aclStatus == 'true' || $_aclStatus == 1) {
if(strpos($userACL, $_aclType) === false) {
$userACL .= $_aclType;
$userACL .= $aclType;
$this->setACL($_folderName, $_accountName, $userACL, $_recursive);
}
} elseif($_aclStatus == 'false' || empty($_aclStatus)) {
if(strpos($userACL, $_aclType) !== false) {
$userACL = str_replace($_aclType,'',$userACL);
$this->setACL($_folderName, $_accountName, $userACL, $_recursive);
$userACL = str_replace(str_split($aclType,1),'',$userACL);
$rv = $this->setACL($_folderName, $_accountName, $userACL, $_recursive);
if ($rv === true && $userACL != ($newACL = $this->getIMAPACL($_folderName, $_accountName)))
{
error_log(__METHOD__.__LINE__." failed; IN: $userACL removing $aclType returned ".array2string($rv).'-> BUT retrieved:'.$newACL);
return $newACL;
}
}
}

2
felamimail/inc/class.uifelamimail.inc.php
View File

@ -299,7 +299,7 @@ class uifelamimail
//_debug_array($icServer);
//error_log(__METHOD__.__LINE__.' Userdefined Profiles ImapServerId:'.$icServer->ImapServerId);
if (empty($icServer->host)) continue;
$identities[$identity->id]=$identity->realName.' '.$identity->organization.' <'.$identity->emailAddress.'&gt';
$identities[$identity->id]=$identity->realName.' '.$identity->organization.' <'.$identity->emailAddress.'>';
if (!empty($identity->default)) $identities[$identity->id] = $identities[$identity->id].'<b>('.lang('selected').')</b>';
}
}