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

Merge pull request #364 in ZP/z-push from bugfix/ZP-1042-add-send-as-capability-and-enable to develop

* commit '867e5ed7':
  ZP-1042 Add KOE_CAPABILITY_SENDAS (sendas) to the output of the settings command.

src/lib/request/settings.php

@@ -59,13 +59,14 @@ class Settings extends RequestProcessor {
         if(self::$deviceManager->IsKoe()) {
             // define the supported capabilites
             $cap = array();
-            if(KOE_CAPABILITY_GAB)           $cap[] = "gab";
-            if(KOE_CAPABILITY_RECEIVEFLAGS)  $cap[] = "receiveflags";
-            if(KOE_CAPABILITY_SENDFLAGS)     $cap[] = "sendflags";
-            if(KOE_CAPABILITY_OOFTIMES)      $cap[] = "ooftime";
-            elseif(KOE_CAPABILITY_OOF)       $cap[] = "oof";        // 'ooftime' superseeds 'oof'. If 'ooftime' is set, 'oof' should not be defined.
-            if(KOE_CAPABILITY_NOTES)         $cap[] = "notes";
-            if(KOE_CAPABILITY_SHAREDFOLDER)  $cap[] = "sharedfolder";
+            if (defined('KOE_CAPABILITY_GAB') && KOE_CAPABILITY_GAB)                    $cap[] = "gab";
+            if (defined('KOE_CAPABILITY_RECEIVEFLAGS') && KOE_CAPABILITY_RECEIVEFLAGS)  $cap[] = "receiveflags";
+            if (defined('KOE_CAPABILITY_SENDFLAGS') && KOE_CAPABILITY_SENDFLAGS)        $cap[] = "sendflags";
+            if (defined('KOE_CAPABILITY_OOFTIMES') && KOE_CAPABILITY_OOFTIMES)          $cap[] = "ooftime";
+            elseif(defined('KOE_CAPABILITY_OOF') && KOE_CAPABILITY_OOF)                 $cap[] = "oof";        // 'ooftime' superseeds 'oof'. If 'ooftime' is set, 'oof' should not be defined.
+            if (defined('KOE_CAPABILITY_NOTES') && KOE_CAPABILITY_NOTES)                $cap[] = "notes";
+            if (defined('KOE_CAPABILITY_SHAREDFOLDER') && KOE_CAPABILITY_SHAREDFOLDER)  $cap[] = "sharedfolder";
+            if (defined('KOE_CAPABILITY_SENDAS') && KOE_CAPABILITY_SENDAS)              $cap[] = "sendas";
 
             self::$specialHeaders = array();
             self::$specialHeaders[] = "X-Push-Capabilities: ". implode(",",$cap);