Commit 947dfb3f authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1027 Add warn messages if a folder can not be resolved or opened on

ACL check.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 702201ff
...@@ -1575,10 +1575,16 @@ class BackendKopano implements IBackend, ISearchProvider { ...@@ -1575,10 +1575,16 @@ class BackendKopano implements IBackend, ISearchProvider {
*/ */
public function HasSecretaryACLs($store, $folderid) { public function HasSecretaryACLs($store, $folderid) {
$entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($folderid)); $entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($folderid));
if (!$entryid) return false; if (!$entryid) {
ZLog::Write(LOGLEVEL_WARN, sprintf("Kopano->HasSecretaryACLs(): error, no entryid resolved for %s on store %s", $folderid, $store));
return false;
}
$folder = mapi_msgstore_openentry($store, $entryid); $folder = mapi_msgstore_openentry($store, $entryid);
if (!$folder) return false; if (!$folder) {
ZLog::Write(LOGLEVEL_WARN, sprintf("Kopano->HasSecretaryACLs(): error, could not open folder with entryid %s on store %s", $entryid, $store));
return false;
}
$props = mapi_getprops($folder, array(PR_RIGHTS)); $props = mapi_getprops($folder, array(PR_RIGHTS));
if (isset($props[PR_RIGHTS]) && if (isset($props[PR_RIGHTS]) &&
...@@ -1605,10 +1611,16 @@ class BackendKopano implements IBackend, ISearchProvider { ...@@ -1605,10 +1611,16 @@ class BackendKopano implements IBackend, ISearchProvider {
*/ */
public function HasReadACLs($store, $folderid) { public function HasReadACLs($store, $folderid) {
$entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($folderid)); $entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($folderid));
if (!$entryid) return false; if (!$entryid) {
ZLog::Write(LOGLEVEL_WARN, sprintf("Kopano->HasReadACLs(): error, no entryid resolved for %s on store %s", $folderid, $store));
return false;
}
$folder = mapi_msgstore_openentry($store, $entryid); $folder = mapi_msgstore_openentry($store, $entryid);
if (!$folder) return false; if (!$folder) {
ZLog::Write(LOGLEVEL_WARN, sprintf("Kopano->HasReadACLs(): error, could not open folder with entryid %s on store %s", $entryid, $store));
return false;
}
$props = mapi_getprops($folder, array(PR_RIGHTS)); $props = mapi_getprops($folder, array(PR_RIGHTS));
if (isset($props[PR_RIGHTS]) && if (isset($props[PR_RIGHTS]) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment