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

Merge pull request #573 in ZP/z-push from bugfix/ZP-1251-z-push-top-too-much-output-from-ping to develop

* commit 'a053308b':
  ZP-1251 Aggregate Ping announcements about changes.

src/lib/request/ping.php

@@ -216,16 +216,27 @@ class Ping extends RequestProcessor {
                 else
                     $changes = $fakechanges;
 
+                $announceAggregated = false;
+                if (count($changes) > 1) {
+                    $announceAggregated = 0;
+                }
                 foreach ($changes as $folderid => $changecount) {
                     if ($changecount > 0) {
                         self::$encoder->startTag(SYNC_PING_FOLDER);
                         self::$encoder->content($folderid);
                         self::$encoder->endTag();
-                        if (empty($fakechanges))
+                        if ($announceAggregated === false) {
                             self::$topCollector->AnnounceInformation(sprintf("Found change in %s", $sc->GetCollection($folderid)->GetContentClass()), true);
+                        }
+                        else {
+                            $announceAggregated += $changecount;
+                        }
                         self::$deviceManager->AnnounceProcessStatus($folderid, SYNC_PINGSTATUS_CHANGES);
                     }
                 }
+                if ($announceAggregated !== false) {
+                    self::$topCollector->AnnounceInformation(sprintf("Found %d changes in %d folders", $announceAggregated, count($changes)), true);
+                }
                 self::$encoder->endTag();
             }
             elseif($pingstatus == SYNC_PINGSTATUS_HBOUTOFRANGE){