ZP-623 #comment if exporting more than 1000 delete requests throw...

ZP-623 #comment if exporting more than 1000 delete requests throw StatusException, remove folder states if statusexception is received during export, reset status to success only after saving the folder states, do no throw hierarchy-changed in ping when a state can not be found and no ping parameters were sent

git-svn-id: https://z-push.org/svn/z-push/trunk@1963 b7dd7b3b-3a3c-0410-9da9-bee62a6cc5b5

src/backend/zarafa/mapiphpwrapper.php

@@ -157,6 +157,9 @@ class PHPWrapper {
      * @return
      */
     public function ImportMessageDeletion($flags, $sourcekeys) {
+        if (count($sourcekeys) > 1000) {
+            throw new StatusException("ImportChangesICS->ImportMessageDeletion(): Detected more than 1000 remove requests from ICS. Triggering folder re-sync.", SYNC_STATUS_INVALIDSYNCKEY, null, LOGLEVEL_ERROR);
+        }
         foreach($sourcekeys as $sourcekey) {
             $this->importer->ImportMessageDeletion(bin2hex($sourcekey));
         }

src/lib/request/ping.php

@@ -60,13 +60,23 @@ class Ping extends RequestProcessor {
         // Contains all requested folders (containers)
         $sc = new SyncCollections();
 
+        // read from stream to see if the symc params are being sent
+        $params_present = self::$decoder->getElementStartTag(SYNC_PING_PING);
+
         // Load all collections - do load states and check permissions
         try {
             $sc->LoadAllCollections(true, true, true);
         }
         catch (StateNotFoundException $snfex) {
-            $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
-            self::$topCollector->AnnounceInformation("StateNotFoundException: require HierarchySync", true);
+            // if no params are present, indicate to send params, else do hierarchy sync
+            if (!$params_present) {
+                $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
+                self::$topCollector->AnnounceInformation("StateNotFoundException: require PingParameters", true);
+            }
+            else {
+                $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
+                self::$topCollector->AnnounceInformation("StateNotFoundException: require HierarchySync", true);
+            }
         }
         catch (StateInvalidException $snfex) {
             // we do not have a ping status for this, but SyncCollections should have generated fake changes for the folders which are broken
@@ -83,7 +93,7 @@ class Ping extends RequestProcessor {
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): reference PolicyKey for PING: %s", $sc->GetReferencePolicyKey()));
 
         // receive PING initialization data
-        if(self::$decoder->getElementStartTag(SYNC_PING_PING)) {
+        if($params_present) {
             self::$topCollector->AnnounceInformation("Processing PING data");
             ZLog::Write(LOGLEVEL_DEBUG, "HandlePing(): initialization data received");
 

src/lib/request/sync.php

@@ -925,6 +925,15 @@ class Sync extends RequestProcessor {
                                         self::$deviceManager->AnnounceIgnoredMessage($spa->GetFolderId(), $brokenSO->id, $brokenSO);
                                     }
                                 }
+                                // something really bad happened while exporting changes
+                                catch (StatusException $stex) {
+                                    $status = $stex->getCode();
+                                    // during export we found out that the states should be thrown away (ZP-623)
+                                    if ($status == SYNC_STATUS_INVALIDSYNCKEY) {
+                                        self::$deviceManager->ForceFolderResync($spa->GetFolderId());
+                                        break;
+                                    }
+                                }
 
                                 if($n >= $windowSize) {
                                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandleSync(): Exported maxItems of messages: %d / %d", $n, $changecount));
@@ -981,13 +990,14 @@ class Sync extends RequestProcessor {
                                 ZLog::Write(LOGLEVEL_ERROR, sprintf("HandleSync(): error saving '%s' - no state information available", $spa->GetNewSyncKey()));
                         }
 
-                        // reset status for the next folder
-                        $status = SYNC_STATUS_SUCCESS;
-
                         // save SyncParameters
                         if ($status == SYNC_STATUS_SUCCESS && empty($actiondata["fetchids"]))
                             $sc->SaveCollection($spa);
 
+                        // reset status for the next folder
+                        $status = SYNC_STATUS_SUCCESS;
+
+
                     } // END foreach collection
                 }
                 self::$encoder->endTag(); //SYNC_FOLDERS