Merge pull request #138 in ZP/z-push from...

Merge pull request #138 in ZP/z-push from bugfix/ZP-824-foldersync-should-cause-ping-to-force to develop

* commit 'd8718bdc':
  ZP-824 Remove local $sc as it is not needed.
  ZP-824 Invalidate all pingable flags on folders when doing a FolderSync (with changes) or FolderChange (Create, Update, Delete) operation.

(cherry picked from commit 6a7a9763)

Conflicts:
	src/lib/request/folderchange.php
	src/lib/request/foldersync.php

src/lib/core/synccollections.php

@@ -72,6 +72,27 @@ class SyncCollections implements Iterator {
     private $waitingTime = 0;
 
 
+    /**
+     * Invalidates all pingable flags for all folders.
+     *
+     * @access public
+     * @return boolean
+     */
+    static public function InvalidatePingableFlags() {
+        ZLog::Write(LOGLEVEL_DEBUG, "SyncCollections::InvalidatePingableFlags(): Invalidating now");
+        try {
+            $sc = new SyncCollections();
+            $sc->LoadAllCollections();
+            foreach ($sc as $folderid => $spa) {
+                $spa->DelPingableFlag();
+                $sc->SaveCollection($spa);
+            }
+            return true;
+        }
+        catch (ZPushException $e) {}
+        return false;
+    }
+
     /**
      * Constructor
      */
@@ -330,11 +351,11 @@ class SyncCollections implements Iterator {
     }
 
     /**
-     * Returns the global window size of items to be exported in total over all 
+     * Returns the global window size of items to be exported in total over all
      * requested collections.
      *
      * @access public
-     * @return int/boolean          returns requested windows size, 512 (max) or the 
+     * @return int/boolean          returns requested windows size, 512 (max) or the
      *                              value of config SYNC_MAX_ITEMS if it is lower
      */
     public function GetGlobalWindowSize() {
@@ -737,4 +758,4 @@ class SyncCollections implements Iterator {
      }
 }
 
-?>
+?>
\ No newline at end of file

src/lib/request/folderchange.php

@@ -238,10 +238,14 @@ class FolderChange extends RequestProcessor {
         self::$topCollector->AnnounceInformation(sprintf("Operation status %d", $status), true);
 
         // Save the sync state for the next time
-        if (isset($importer))
+        if (isset($importer)) {
             self::$deviceManager->GetStateManager()->SetSyncState($newsynckey, $importer->GetState());
 
+            // invalidate all pingable flags
+            SyncCollections::InvalidatePingableFlags();
+        }
+
         return true;
     }
 }
-?>
+?>
\ No newline at end of file

src/lib/request/foldersync.php

@@ -249,8 +249,12 @@ class FolderSync extends RequestProcessor {
                 self::$topCollector->AnnounceInformation(sprintf("Outgoing %d folders",$changeCount), true);
 
                 // everything fine, save the sync state for the next time
-                if ($synckey == $newsynckey)
+                if ($synckey == $newsynckey) {
                     self::$deviceManager->GetStateManager()->SetSyncState($newsynckey, $newsyncstate);
+
+                    // invalidate all pingable flags
+                    SyncCollections::InvalidatePingableFlags();
+                }
             }
         }
         self::$encoder->endTag();