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

Merge pull request #293 in ZP/z-push from feature/ZP-974-koe-add-capability-flag-for-shared to develop

* commit '0683d1d0':
  ZP-974 Set KOE_CAPABILITY_SHAREDFOLDER default to false.
  ZP-974 Added KOE_CAPABILITY_SHAREDFOLDER config parameter.

src/config.php

@@ -313,6 +313,8 @@
     define('KOE_CAPABILITY_OOFTIMES', true);
     // Notes support
     define('KOE_CAPABILITY_NOTES', true);
+    // Shared folder support
+    define('KOE_CAPABILITY_SHAREDFOLDER', 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/core/zpush.php

@@ -368,6 +368,9 @@ class ZPush {
         if (!defined('KOE_CAPABILITY_NOTES')) {
             define('KOE_CAPABILITY_NOTES', false);
         }
+        if (!defined('KOE_CAPABILITY_SHAREDFOLDER')) {
+            define('KOE_CAPABILITY_SHAREDFOLDER', false);
+        }
         if (!defined('KOE_GAB_FOLDERID')) {
             define('KOE_GAB_FOLDERID', '');
         }

src/lib/request/settings.php

@@ -63,8 +63,9 @@ class Settings extends RequestProcessor {
             if(KOE_CAPABILITY_RECEIVEFLAGS)  $cap[] = "receiveflags";
             if(KOE_CAPABILITY_SENDFLAGS)     $cap[] = "sendflags";
             if(KOE_CAPABILITY_OOFTIMES)      $cap[] = "ooftime";
-            else if(KOE_CAPABILITY_OOF)      $cap[] = "oof";        // 'ooftime' superseeds 'oof'. If 'ooftime' is set, 'oof' should not be defined.
+            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";
 
             self::$specialHeaders = array();
             self::$specialHeaders[] = "X-Push-Capabilities: ". implode(",",$cap);