extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

using calendar_zpush not calendar_activesync

Browse Source
This commit is contained in:
Ralf Becker 2015-09-04 15:27:41 +00:00
parent b97024f00e
commit 8b6ba73c79
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/inc/class.mail_zpush.inc.php
View File

@ -1223,7 +1223,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' && if (strtolower($attach['mimeType']) == 'text/calendar' && strtolower($attach['method']) == 'request' &&
isset($GLOBALS['egw_info']['user']['apps']['calendar']) && isset($GLOBALS['egw_info']['user']['apps']['calendar']) &&
($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false,false,$_folderName)) && ($attachment = $this->mail->getAttachment($id, $attach['partID'],0,false,false,$_folderName)) &&
($output->meetingrequest = calendar_activesync::meetingRequest($attachment['attachment']))) ($output->meetingrequest = calendar_zpush::meetingRequest($attachment['attachment'])))
{ {
$output->messageclass = "IPM.Schedule.Meeting.Request"; $output->messageclass = "IPM.Schedule.Meeting.Request";
continue; // do NOT add attachment as attachment continue; // do NOT add attachment as attachment
@ -1292,7 +1292,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
*/ */
function MeetingResponse($folderid, $requestid, $response) function MeetingResponse($folderid, $requestid, $response)
{ {
if (!class_exists('calendar_activesync')) if (!class_exists('calendar_zpush'))
{ {
debugLog(__METHOD__."(...) no EGroupware calendar installed!"); debugLog(__METHOD__."(...) no EGroupware calendar installed!");
return null; return null;
@ -1577,7 +1577,7 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
* [searchrange] => 0-99 * [searchrange] => 0-99
* [bodypref] => Array([1] => BodyPreference Object([unsetdata:protected] => Array([truncationsize] => [allornone] => [preview] => )[SO_internalid:StateObject:private] => [data:protected] => * [bodypref] => Array([1] => BodyPreference Object([unsetdata:protected] => Array([truncationsize] => [allornone] => [preview] => )[SO_internalid:StateObject:private] => [data:protected] =>
* Array([truncationsize] => 2147483647)[changed:protected] => 1)) * Array([truncationsize] => 2147483647)[changed:protected] => 1))
* [mimesupport] => 2) * [mimesupport] => 2)
* @return array(["range"] = $_searchquery->GetSearchRange(), ['searchtotal'] = count of results, * @return array(["range"] = $_searchquery->GetSearchRange(), ['searchtotal'] = count of results,
* array("class" => "Email", * array("class" => "Email",
* "longid" => folderid.':'.uid', * "longid" => folderid.':'.uid',