Commit 20376ff5 authored by mku's avatar mku

ZP-164 #comment Multiple PHP warnings found while editing a meeting request...

ZP-164 #comment Multiple PHP warnings found while editing a meeting request with android 4.0.3 #time 1h

git-svn-id: https://z-push.org/svn/z-push/trunk@1377 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5
parent 433ec73c
...@@ -852,6 +852,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -852,6 +852,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
// F/B will be updated on logoff // F/B will be updated on logoff
// We have to return the ID of the new calendar item, so do that here // We have to return the ID of the new calendar item, so do that here
$calendarid = "";
if (isset($entryid)) { if (isset($entryid)) {
$newitem = mapi_msgstore_openentry($this->store, $entryid); $newitem = mapi_msgstore_openentry($this->store, $entryid);
$newprops = mapi_getprops($newitem, array(PR_SOURCE_KEY)); $newprops = mapi_getprops($newitem, array(PR_SOURCE_KEY));
...@@ -860,7 +861,7 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -860,7 +861,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
// on recurring items, the MeetingRequest class responds with a wrong entryid // on recurring items, the MeetingRequest class responds with a wrong entryid
if ($requestid == $calendarid) { if ($requestid == $calendarid) {
ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendZarafa->MeetingResponse('%s','%s', '%s'): returned calender id is the same as the requestid - re-searching", $requestid, $folderid, $response)); ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendZarafa->MeetingResponse('%s','%s', '%s'): returned calender id is the same as the requestid - re-searching", $requestid, $folderid, $response));
$props = MAPIMapping::GetMeetingRequestProperties(); $props = MAPIMapping::GetMeetingRequestProperties();
$props = getPropIdsFromStrings($this->store, $props); $props = getPropIdsFromStrings($this->store, $props);
...@@ -876,10 +877,10 @@ class BackendZarafa implements IBackend, ISearchProvider { ...@@ -876,10 +877,10 @@ class BackendZarafa implements IBackend, ISearchProvider {
$calendarid = bin2hex($newprops[PR_SOURCE_KEY]); $calendarid = bin2hex($newprops[PR_SOURCE_KEY]);
ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendZarafa->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response)); ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendZarafa->MeetingResponse('%s','%s', '%s'): found other calendar entryid", $requestid, $folderid, $response));
} }
}
if ($calendarid == "" || $requestid == $calendarid) if ($requestid == $calendarid)
throw new StatusException(sprintf("BackendZarafa->MeetingResponse('%s','%s', '%s'): Error finding the accepted meeting response in the calendar", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ); throw new StatusException(sprintf("BackendZarafa->MeetingResponse('%s','%s', '%s'): Error finding the accepted meeting response in the calendar", $requestid, $folderid, $response), SYNC_MEETRESPSTATUS_INVALIDMEETREQ);
}
// delete meeting request from Inbox // delete meeting request from Inbox
$folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid)); $folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($folderid));
......
...@@ -113,7 +113,7 @@ class MeetingResponse extends RequestProcessor { ...@@ -113,7 +113,7 @@ class MeetingResponse extends RequestProcessor {
self::$encoder->content($status); self::$encoder->content($status);
self::$encoder->endTag(); self::$encoder->endTag();
if($status == SYNC_MEETRESPSTATUS_SUCCESS) { if($status == SYNC_MEETRESPSTATUS_SUCCESS && !empty($calendarid)) {
self::$encoder->startTag(SYNC_MEETINGRESPONSE_CALENDARID); self::$encoder->startTag(SYNC_MEETINGRESPONSE_CALENDARID);
self::$encoder->content($calendarid); self::$encoder->content($calendarid);
self::$encoder->endTag(); self::$encoder->endTag();
......
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