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

Merge pull request #227 in ZP/z-push from bugfix/ZP-922-subfolders-don-t-show-up-in-the-synchronized to develop

* commit '03bbbdf8':
  ZP-922 Always declare prefix.
  ZP-922 Try to determine folderid only if it's set, put newly generated folderid hashes in the cache for this request only, log warning if we reach end of method without result, make "if" clearer with additional parenthesis.

src/backend/kopano/mapiphpwrapper.php

@@ -79,13 +79,15 @@ class PHPWrapper {
         $this->store = $store;
         $this->mapiprovider = new MAPIProvider($session, $this->store);
         $this->folderid = $folderid;
+        $this->prefix = '';
 
+        if ($folderid) {
             $folderidHex = bin2hex($folderid);
-        $this->prefix = '';
             $folderid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folderidHex);
             if ($folderid != $folderidHex) {
                 $this->prefix = $folderid . ':';
             }
+        }
         // TODO remove this log output in 2.3.X
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("PHPWrapper: prefix:'%s'", $this->prefix));
     }

src/lib/core/asdevice.php

@@ -707,8 +707,11 @@ class ASDevice extends StateObject {
             }
             $newHash = $this->generateFolderHash($backendid, $folderOrigin, $folderName);
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("ASDevice->GetFolderIdForBackendId(): generated new folderid '%s' for backend-folderid '%s'", $newHash, $backendid));
+            // temporarily save the new hash also in the cache (new folders will only be saved at the end of request and could be requested before that
+            $this->backend2folderidCache[$backendid] = $newHash;
             return $newHash;
         }
+        ZLog::Write(LOGLEVEL_WARN, sprintf("ASDevice->GetFolderIdForBackendId(): no valid condition found for determining folderid for backendid '%s'. Returning as is!", Utils::PrintAsString($backendid)));
         return $backendid;
     }
 

src/lib/core/changesmemorywrapper.php

@@ -258,7 +258,7 @@ class ChangesMemoryWrapper extends HierarchyCache implements IImportChanges, IEx
                 }
 
                 // check if the parent ID is known on the device
-                if (!isset($folder->parentid) || $folder->parentid != "0" &&  !$this->GetFolder($folder->parentid)) {
+                if (!isset($folder->parentid) || ($folder->parentid != "0" && !$this->GetFolder($folder->parentid))) {
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("ChangesMemoryWrapper->ImportFolderChange(): Change for folder '%s' will not be sent as parent folder is not set or not known on mobile.", $folder->displayname));
                     return false;
                 }