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

Merge pull request #643 in ZP/z-push from bugfix/ZP-1347-imap-creating-folder-on-mobile-fails to develop

* commit '02012bd2':
  ZP-1347 Fix folder creation on mobile for imap backend.

src/backend/combined/importer.php

@@ -163,7 +163,7 @@ class ImportChangesCombined implements IImportChanges {
         }
         else {
             $backendid = $this->backend->GetBackendId($parent);
-            $parent = $this->backend->GetBackendFolder($parent);
+            $folder->parentid = $this->backend->GetBackendFolder($parent);
         }
 
         if(!empty($this->backend->config['backends'][$backendid]['subfolder']) && $id == $backendid.$this->backend->config['delimiter'].'0') {
@@ -178,8 +178,7 @@ class ImportChangesCombined implements IImportChanges {
             }
             $id = $this->backend->GetBackendFolder($id);
         }
-
-        $this->icc = $this->backend->getBackend($backendid)->GetImporter();
+        $this->icc = $this->backend->getBackend($backendid.$this->backend->config['delimiter'].$id)->GetImporter();
         $resFolder = $this->icc->ImportFolderChange($folder);
         ZLog::Write(LOGLEVEL_DEBUG, 'ImportChangesCombined->ImportFolderChange() success');
         $folder->serverid = $backendid . $this->backend->config['delimiter'] . $resFolder->serverid;

src/backend/imap/imap.php

@@ -882,9 +882,11 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
             }
 
             $csts = imap_createmailbox($this->mbox, $this->server . $newimapid);
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->ChangeFolder() createmailbox: '%s'", $newimapid));
             if ($csts) {
                 imap_subscribe($this->mbox, $this->server . $newimapid);
-                return $this->StatFolder($folderid . $this->getServerDelimiter() . $displayname);
+                $newid = $this->convertImapId($newimapid);
+                return $this->StatFolder($newid);
             }
             else {
                 ZLog::Write(LOGLEVEL_WARN, "BackendIMAP->ChangeFolder() : mailbox creation failed");