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

Merge pull request #164 in ZP/z-push from bugfix/ZP-622-ping-should-notify-on-hierarchy-changes to develop

* commit '4223ada1':
  ZP-622 ZPushAdmin and Sync-without-heartbeat should not load the hierarchy folderdata states.

src/lib/core/synccollections.php

@@ -119,17 +119,18 @@ class SyncCollections implements Iterator {
      * Loads all collections known for the current device
      *
      * @param boolean $overwriteLoaded          (opt) overwrites Collection with saved state if set to true
-     * @param boolean $loadState                (opt) indicates if the collection sync state should be loaded, default true
+     * @param boolean $loadState                (opt) indicates if the collection sync state should be loaded, default false
      * @param boolean $checkPermissions         (opt) if set to true each folder will pass
      *                                          through a backend->Setup() to check permissions.
      *                                          If this fails a StatusException will be thrown.
+     * @param boolean $loadHierarchy            (opt) if the hierarchy sync states should be loaded, default false
      *
      * @access public
      * @throws StatusException                  with SyncCollections::ERROR_WRONG_HIERARCHY if permission check fails
      * @throws StateInvalidException            if the sync state can not be found or relation between states is invalid ($loadState = true)
      * @return boolean
      */
-    public function LoadAllCollections($overwriteLoaded = false, $loadState = false, $checkPermissions = false) {
+    public function LoadAllCollections($overwriteLoaded = false, $loadState = false, $checkPermissions = false, $loadHierarchy = false) {
         $this->loadStateManager();
 
         // this operation should not remove old state counters
@@ -146,7 +147,7 @@ class SyncCollections implements Iterator {
         }
 
         // load the hierarchy data - there are no permissions to verify so we just set it to false
-        if (! $this->LoadCollection(false, $loadState, false))
+        if ($loadHierarchy && !$this->LoadCollection(false, $loadState, false))
             throw new StatusException("Invalid states found while loading hierarchy data. Forcing hierarchy sync");
 
         if ($invalidStates)

src/lib/request/ping.php

@@ -65,7 +65,7 @@ class Ping extends RequestProcessor {
 
         // Load all collections - do load states and check permissions
         try {
-            $sc->LoadAllCollections(true, true, true);
+            $sc->LoadAllCollections(true, true, true, true);
         }
         catch (StateInvalidException $siex) {
             // if no params are present, indicate to send params, else do hierarchy sync

src/lib/request/sync.php

@@ -579,7 +579,7 @@ class Sync extends RequestProcessor {
 
             // Load all collections - do not overwrite existing (received!), load states and check permissions
             try {
-                $sc->LoadAllCollections(false, true, true);
+                $sc->LoadAllCollections(false, true, true, true);
             }
             catch (StateInvalidException $siex) {
                 $status = SYNC_STATUS_INVALIDSYNCKEY;
@@ -605,7 +605,7 @@ class Sync extends RequestProcessor {
             if (!$sc->HasCollections())
                 $status = SYNC_STATUS_SYNCREQUESTINCOMPLETE;
         }
-        else {
+        else if (isset($hbinterval)) {
             // load the hierarchy data - there are no permissions to verify so we just set it to false
             if (!$sc->LoadCollection(false, true, false)) {
                 $status = SYNC_STATUS_FOLDERHIERARCHYCHANGED;

src/lib/utils/zpushadmin.php

@@ -106,8 +106,8 @@ class ZPushAdmin {
                 $sc = new SyncCollections();
                 $sc->SetStateManager($stateManager);
 
-                // load all collections of device without loading states or checking permissions
-                $sc->LoadAllCollections(true, false, false);
+                // load all collections of device without loading states, checking permissions or loading the hierarchy
+                $sc->LoadAllCollections(true, false, false, false);
 
                 if ($sc->GetLastSyncTime())
                     $device->SetLastSyncTime($sc->GetLastSyncTime());