UPgraded to z-push 2.6.1

Author: mschering

CHANGELOG.md

@@ -2,6 +2,8 @@
 - Multi instance: Only create studio package folder if module is enabled for the instance.
 - Core: Fixed custom fields not displaying in grid when an entity field was present
 - Core: Smaller core_search.keywords key length to fix too large index error.
+- Core: Z-push upgraded to 2.6.1
+- Core: Fixed stringstreamwrapper error with z-push
 
 15-12-2020 6.4.201
 - Core: Fixed permission denied error when linking

www/go/base/mail/MimeDecode.php

@@ -318,8 +318,9 @@ function _decode($headers, $body, $default_ctype = 'text/plain')
                     for ($i = 0; $i < count($parts); $i++) {
                         list($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]);
                         $part = $this->_decode($part_header, $part_body, $default_ctype);
-                        if($part === false)
-                            $part = $this->raiseError($this->_error);
+                        if($part === false) {
+	                        throw new \Exception($this->_error);
+                        }
                         $return->parts[] = $part;
                     }
                     break;

www/modules/z-push/config.php

@@ -25,7 +25,7 @@
 define("GO_NO_SESSION", true);
 //require Group-Office framework
 if(!class_exists('GO'))
-	require_once("../../GO.php");
+	require_once(dirname(dirname(__DIR__)) . "/GO.php");
 
 /**********************************************************************************
  *  Default settings

www/modules/z-push/index.php

@@ -1,5 +1,5 @@
 <?php
-define("ZPUSH_VERSION", "2.5.2");
+define("ZPUSH_VERSION", "2.6.1");
 define("ZPUSH_DIR", __DIR__ . "/vendor/z-push/");
 
 require(ZPUSH_DIR . 'vendor/autoload.php');

www/modules/z-push/vendor/z-push/.gitignore

@@ -174,7 +174,7 @@ private function getIncomingXml() {
         }
 
         if (strcasecmp($xml->Request->AcceptableResponseSchema, ZPushAutodiscover::ACCEPTABLERESPONSESCHEMAMOBILESYNC) != 0) {
-            throw new FatalException(sprintf('Request for a responseschema that is not supported (only mobilesync is supported): %s', $xml->Request->AcceptableResponseSchema));
+            throw new BadRequestException(sprintf('Request for a responseschema that is not supported (only mobilesync is supported): %s', $xml->Request->AcceptableResponseSchema));
         }
 
         return $xml;

www/modules/z-push/vendor/z-push/autodiscover/autodiscover.php

@@ -219,10 +219,10 @@ public function GetMessageList($folderid, $cutoffdate) {
 
         $path = $this->_caldav_path . substr($folderid, 1) . "/";
         if ($folderid[0] == "C") {
-            $msgs = $this->_caldav->GetEvents($begin, $finish, $path);
+            $msgs = $this->_caldav->GetEventsList($begin, $finish, $path);
         }
         else {
-            $msgs = $this->_caldav->GetTodos($begin, $finish, false, false, $path);
+            $msgs = $this->_caldav->GetTodosList($begin, $finish, false, false, $path);
         }
 
         $messages = array();
@@ -240,8 +240,16 @@ public function GetMessageList($folderid, $cutoffdate) {
      */
     public function GetMessage($folderid, $id, $contentparameters) {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendCalDAV->GetMessage('%s','%s')", $folderid,  $id));
-        $data = $this->_collection[$id]['data'];
-
+        $path = $this->_caldav_path . substr($folderid, 1) . "/";
+        $href = $path . $id;
+        ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendCalDAV->GetMessage Querying server for message with href '%s' in folder '%s'", $href, $path));
+        $messages = $this->_caldav->CalendarMultiget( array( $href ), $path );
+        if (!isset($messages[$href]) || $messages[$href] == '') {
+            //we don't have any ical information, return false so that the diff backend raises an exception
+            return false;
+        }
+        $data = $messages[ $href ];
+        unset ($messages, $href);
         if ($folderid[0] == "C") {
             return $this->_ParseVEventToAS($data, $contentparameters);
         }
@@ -267,9 +275,12 @@ public function StatMessage($folderid, $id) {
         }
         else {
             $path = $this->_caldav_path . substr($folderid, 1) . "/";
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendCalDAV->StatMessage Data doesn't exist for this item, querying caldav server for uid '%s' in folder '%s'", substr($id, 0, strlen($id)-4), $path));
             $e = $this->_caldav->GetEntryByUid(substr($id, 0, strlen($id)-4), $path, $type);
-            if ($e == null && count($e) <= 0)
+            if ($e == null && count($e) <= 0) {
+                ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendCalDAV->StatMessage No item on server with uid '%s' in folder '%s'", substr($id, 0, strlen($id)-4), $path));
                 return;
+            }
             $data = $e[0];
         }
         $message = array();
@@ -739,7 +750,10 @@ private function _ParseVEventToSyncObject($event, $message, $truncsize) {
                 case "DESCRIPTION":
                     if (Request::GetProtocolVersion() >= 12.0) {
                         $message->asbody = new SyncBaseBody();
+
+                        // the DESCRIPTION component is specified to be plain text (RFC5545), for HTML use X-ALT-DESC
                         $data = str_replace("\n","\r\n", str_replace("\r","",Utils::ConvertHtmlToText($property->Value())));
+
                         // truncate body, if requested
                         if (strlen($data) > $truncsize) {
                             $message->asbody->truncated = 1;
@@ -751,6 +765,9 @@ private function _ParseVEventToSyncObject($event, $message, $truncsize) {
                         $message->asbody->data = StringStreamWrapper::Open($data);
                         $message->asbody->estimatedDataSize = strlen($data);
                         unset($data);
+
+                        // set body type accordingly
+                        $message->asbody->type = SYNC_BODYPREFERENCE_PLAIN;
                         $message->nativebodytype = SYNC_BODYPREFERENCE_PLAIN;
                     }
                     else {
@@ -1829,4 +1846,4 @@ private static function phpOffsetToIcalOffset($phpoffset) {
         return sprintf("$prefix%'.02d%'.02d", $hours, ($offset - ($hours * 3600)) / 60);
     }
 
-}
+};

www/modules/z-push/vendor/z-push/backend/caldav/caldav.php

@@ -797,7 +797,7 @@ public function GetGALSearchResults($searchquery, $searchrange, $searchpicture)
             // TODO the limiting of the searchresults could be refactored into Utils as it's probably used more than once
             $querycnt = $xml_vcards->count();
             //do not return more results as requested in range
-            $querylimit = (($rangeend + 1) < $querycnt) ? ($rangeend + 1) : $querycnt == 0 ? 1 : $querycnt;
+            $querylimit = (($rangeend + 1) < $querycnt) ? ($rangeend + 1) : ($querycnt == 0 ? 1 : $querycnt);
             $items['range'] = $rangestart.'-'.($querylimit - 1);
             $items['searchtotal'] = $querycnt;
 

www/modules/z-push/vendor/z-push/backend/carddav/carddav.php

@@ -143,15 +143,13 @@
 define('IMAP_FROM_SQL_FROM', '#first_name #last_name <#mail_address>');
 define('IMAP_FROM_SQL_FULLNAME', '#first_name #last_name');
 
-// SERVER: ldap server
-// SERVER_PORT: ldap port
+// SERVER_URI: ldap server
 // USER: dn to use for connecting
 // PASSWORD: password
 // QUERY: query to execute
 // FIELDS: columns in the query
 // FROM: string that will be the from, replacing the field names with the values
-define('IMAP_FROM_LDAP_SERVER', 'localhost');
-define('IMAP_FROM_LDAP_SERVER_PORT', '389');
+define('IMAP_FROM_LDAP_SERVER_URI', 'ldap://127.0.0.1:389/');
 define('IMAP_FROM_LDAP_USER', 'cn=zpush,ou=servers,dc=zpush,dc=org');
 define('IMAP_FROM_LDAP_PASSWORD', 'password');
 define('IMAP_FROM_LDAP_BASE', 'dc=zpush,dc=org');
@@ -216,3 +214,6 @@
 // methods and you will be unable to log in. Uncomment the following line to disable that authentication method.
 // Multiple methods can be specified as a comma-separated string.
 // define('IMAP_DISABLE_AUTHENTICATOR', 'GSSAPI');
+
+// Specify Which Charset the IMAP Search is going to use, Default is 'UTF-8' but you could use 'US-ASCII'
+define('IMAP_SEARCH_CHARSET', 'UTF-8');