Commit a8b37615 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-896 initialize as empty array by default, remove first

mapi_getprops() as it's redundant.

Released under the Affero GNU General Public License (AGPL) version 3.
parent d5829271
...@@ -2741,8 +2741,8 @@ class MAPIProvider { ...@@ -2741,8 +2741,8 @@ class MAPIProvider {
private function getInboxProps() { private function getInboxProps() {
if (!isset($this->inboxProps) || empty($this->inboxProps)) { if (!isset($this->inboxProps) || empty($this->inboxProps)) {
ZLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->getInboxProps(): Getting inbox properties."); ZLog::Write(LOGLEVEL_DEBUG, "MAPIProvider->getInboxProps(): Getting inbox properties.");
$this->inboxProps = array();
$inbox = mapi_msgstore_getreceivefolder($this->store); $inbox = mapi_msgstore_getreceivefolder($this->store);
$this->inboxProps = mapi_getprops($inbox, array(PR_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_TASK_ENTRYID, PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_JOURNAL_ENTRYID));
if ($inbox) { if ($inbox) {
$this->inboxProps = mapi_getprops($inbox, array(PR_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_TASK_ENTRYID, PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_JOURNAL_ENTRYID)); $this->inboxProps = mapi_getprops($inbox, array(PR_ENTRYID, PR_IPM_DRAFTS_ENTRYID, PR_IPM_TASK_ENTRYID, PR_IPM_APPOINTMENT_ENTRYID, PR_IPM_CONTACT_ENTRYID, PR_IPM_NOTE_ENTRYID, PR_IPM_JOURNAL_ENTRYID));
// make sure all properties are set // make sure all properties are set
...@@ -2768,9 +2768,6 @@ class MAPIProvider { ...@@ -2768,9 +2768,6 @@ class MAPIProvider {
$this->inboxProps[PR_IPM_JOURNAL_ENTRYID] = false; $this->inboxProps[PR_IPM_JOURNAL_ENTRYID] = false;
} }
} }
else {
$this->inboxProps = array();
}
} }
return $this->inboxProps; return $this->inboxProps;
} }
......
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