ZP-1083 Fixed sending error message to STD_ERROR and exiting with 1 (as

ZP-1022).

Released under the Affero GNU General Public License (AGPL) version 3.

tools/gab2contacts/gab2contacts.php

@@ -76,7 +76,8 @@ define('PATH_TO_ZPUSH', '../../src/');
         GAB2ContactsCLI::RunCommand();
     }
     catch (Exception $ex) {
-        die(get_class($ex) . ": ". $ex->getMessage() . PHP_EOL);
+        fwrite(STDERR, get_class($ex) . ": ". $ex->getMessage() . PHP_EOL);
+        exit(1);
     }
 
 

tools/gab2contacts/lib/kopano.php

@@ -107,7 +107,7 @@ class Kopano extends ContactWorker {
         $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;