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

Merge pull request #370 in ZP/z-push from bugfix/ZP-1049-koe-gab-sync-doesn-t-switch-stores to develop

* commit '25542eb9':
  ZP-1049 Cache store ressource correctly.

tools/gab-sync/lib/kopano.php

@@ -257,7 +257,7 @@ class Kopano extends SyncWorker {
         $companies = mapi_zarafa_getcompanylist($this->store);
         if (is_array($companies)) {
             foreach($companies as $c) {
-                $names[$c['companyname']] = bin2hex($c['companyid']);
+                $names[trim($c['companyname'])] = bin2hex($c['companyid']);
             }
         }
         return $names;
@@ -636,7 +636,8 @@ class Kopano extends SyncWorker {
      * @return ressource
      */
     private function getRootFolder($store) {
-        $rootId = "root";
+        // stringify the store ressource
+        $rootId = bin2hex($store."!");
         if (!isset($this->folderCache[$rootId])) {
             $parentfentryid = false;