From a3e69082d045680c6666c48ae6274f5a38bf0467 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 3 Jul 2012 12:16:45 +0000 Subject: [PATCH] finetuning on acl-management --- felamimail/inc/class.ajaxfelamimail.inc.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/felamimail/inc/class.ajaxfelamimail.inc.php b/felamimail/inc/class.ajaxfelamimail.inc.php index e513770825..5d22c2a004 100644 --- a/felamimail/inc/class.ajaxfelamimail.inc.php +++ b/felamimail/inc/class.ajaxfelamimail.inc.php @@ -855,9 +855,14 @@ class ajaxfelamimail $response->addScript("document.getElementById('aMoveSelectFolder').style.visibility = 'hidden';"); } $response->addAssign("folderName", "innerHTML", htmlspecialchars($folderStatus['displayName'], ENT_QUOTES, $this->charset)); + //error_log(__METHOD__.__LINE__.' Folder:'.$folderName.' ACL:'.array2string($this->bofelamimail->getIMAPACL($folderName))); if($folderACL = $this->bofelamimail->getIMAPACL($folderName)) { $response->addAssign("aclTable", "innerHTML", $this->createACLTable($folderACL)); } + else + { + $response->addAssign("aclTable", "innerHTML", ''); + } return $response->getXML(); } else { @@ -871,7 +876,15 @@ class ajaxfelamimail $response->addScript("document.getElementById('mailboxRenameButton').disabled = true;"); $response->addScript("document.getElementById('divDeleteButton').style.visibility = 'hidden';"); $response->addScript("document.getElementById('divRenameButton').style.visibility = 'hidden';"); - $response->addAssign("aclTable", "innerHTML", ''); + // we should not need this, but dovecot does not report the correct folderstatus for all folders that he is listing + //error_log(__METHOD__.__LINE__.' Folder:'.$folderName.' ACL:'.array2string($this->bofelamimail->getIMAPACL($folderName))); + if($folderName != '--topfolder--' && $folderName != 'user' && ($folderACL = $this->bofelamimail->getIMAPACL($folderName))) { + $response->addAssign("aclTable", "innerHTML", $this->createACLTable($folderACL)); + } + else + { + $response->addAssign("aclTable", "innerHTML", ''); + } return $response->getXML(); } }