Merge pull request #414 in ZP/z-push from bugfix/ZP-1091-fix-phpwarning-and-clean-code to develop

* commit '357a7acf':
  ZP-1091 Fix phpwarnings and clean code. Released under the Affero GNU General Public License (AGPL) version 3.

src/lib/core/synccollections.php

@@ -736,7 +736,6 @@ class SyncCollections implements Iterator {
       */
      private function countHierarchyChange($exportChanges = false) {
          $folderid = false;
-         $spa = $this->GetCollection($folderid);
 
          // Check with device manager if the hierarchy should be reloaded.
          // New additional folders are loaded here.

src/lib/request/search.php

@@ -308,7 +308,7 @@ class Search extends RequestProcessor {
         }
         $searchprovider->Disconnect();
 
-        self::$topCollector->AnnounceInformation(sprintf("'%s' search found %d results", $searchname, $rows['searchtotal']), true);
+        self::$topCollector->AnnounceInformation(sprintf("'%s' search found %d results", $searchname, (isset($rows['searchtotal']) ? $rows['searchtotal'] : 0) ), true);
 
         self::$encoder->startWBXML();
         self::$encoder->startTag(SYNC_SEARCH_SEARCH);

src/lib/request/sendmail.php

@@ -52,7 +52,6 @@ class SendMail extends RequestProcessor {
      * @return boolean
      */
     public function Handle($commandCode) {
-        $status = SYNC_COMMONSTATUS_SUCCESS;
         $sm = new SyncSendMail();
 
         $reply = $forward = $parent = $sendmail = $smartreply = $smartforward = false;
@@ -141,6 +140,7 @@ class SendMail extends RequestProcessor {
 
         self::$topCollector->AnnounceInformation(sprintf("SendMail(): Sending email with %d bytes", strlen($sm->mime)), true);
 
+        $statusMessage = '';
         try {
             $status = self::$backend->SendMail($sm);
         }

src/lib/utils/zpushadmin.php

@@ -133,9 +133,10 @@ class ZPushAdmin {
 
                     if ($fstatus !== false && isset($fstatus[ASDevice::FOLDERSYNCSTATUS])) {
                         $spa = $sc->GetCollection($folderid);
+                        if ($spa) {
                             $total = $spa->GetFolderSyncTotal();
                             $todo = $spa->GetFolderSyncRemaining();
-                        $fstatus['status'] = ($fstatus[ASDevice::FOLDERSYNCSTATUS] == 1)?'Initialized':'Synchronizing';
+                            $fstatus['status'] = ($fstatus[ASDevice::FOLDERSYNCSTATUS] == 1) ? 'Initialized' : 'Synchronizing';
                             $fstatus['total'] = $total;
                             $fstatus['done'] = $total - $todo;
                             $fstatus['todo'] = $todo;
@@ -144,6 +145,7 @@ class ZPushAdmin {
                         }
                     }
                 }
+            }
             return $device;
         }
         catch (StateNotFoundException $e) {