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

Merge pull request #627 in ZP/z-push from feature/ZP-1327-add-open-shared-store-feature-flag to develop

* commit 'd6671b1b':
  ZP-1327 Added KOE_CAPABILITY_IMPERSONATE config parameter.
  ZP-1326 Added KOE_CAPABILITY_IMPERSONATE config parameter.

src/backend/kopano/kopano.php

@@ -145,7 +145,7 @@ class BackendKopano implements IBackend, ISearchProvider {
 
         // check if we are impersonating someone
         // $defaultUser will be used for $this->defaultStore
-        if (stripos($user, self::IMPERSONATE_DELIM) !== false) {
+        if (defined('KOE_CAPABILITY_IMPERSONATE') && KOE_CAPABILITY_IMPERSONATE && stripos($user, self::IMPERSONATE_DELIM) !== false) {
             list($this->mainUser, $this->impersonateUser) = explode(self::IMPERSONATE_DELIM, strtolower($user));
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("KopanoBackend->Logon(): Impersonation active - authenticating: '%s' - impersonating '%s'", $this->mainUser, $this->impersonateUser));
             $defaultUser = $this->impersonateUser;

src/config.php

@@ -313,6 +313,8 @@
     define('KOE_CAPABILITY_SIGNATURES', true);
     // Delivery receipt requests
     define('KOE_CAPABILITY_RECEIPTS', true);
+    // Impersonate other users
+    define('KOE_CAPABILITY_IMPERSONATE', true);
 
     // To synchronize the GAB KOE, the GAB store and folderid need to be specified.
     // Use the gab-sync script to generate this data. The name needs to

src/lib/request/settings.php

@@ -50,6 +50,7 @@ class Settings extends RequestProcessor {
         if (defined('KOE_CAPABILITY_SECONDARYCONTACTS') && KOE_CAPABILITY_SECONDARYCONTACTS)    $cap[] = "secondarycontacts";
         if (defined('KOE_CAPABILITY_SIGNATURES') && KOE_CAPABILITY_SIGNATURES)                  $cap[] = "signatures";
         if (defined('KOE_CAPABILITY_RECEIPTS') && KOE_CAPABILITY_RECEIPTS)                      $cap[] = "receipts";
+        if (defined('KOE_CAPABILITY_IMPERSONATE') && KOE_CAPABILITY_IMPERSONATE)                $cap[] = "impersonate";
 
         self::$specialHeaders = array();
         self::$specialHeaders[] = "X-Push-Capabilities: ". implode(",", $cap);