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

Merge pull request #97 in ZP/z-push from bugfix/ZP-775-z-push-admin-a-resync-t-does-not-work to develop

* commit 'dea2b672':
  ZP-775 Allow 48 byte long folderIds.

(cherry picked from commit 5480afc4)

src/z-push-admin.php

@@ -239,7 +239,7 @@ class ZPushAdminCLI {
         elseif (isset($options['type']) && !empty($options['type']))
             self::$type = strtolower(trim($options['type']));
 
-        // if type is set, it must be one of known types or a 44 byte long folder id
+        // if type is set, it must be one of known types or a 44 or 48 byte long folder id
         if (self::$type !== false) {
             if (self::$type !== self::TYPE_OPTION_EMAIL &&
                 self::$type !== self::TYPE_OPTION_CALENDAR &&
@@ -247,10 +247,11 @@ class ZPushAdminCLI {
                 self::$type !== self::TYPE_OPTION_TASK &&
                 self::$type !== self::TYPE_OPTION_NOTE &&
                 self::$type !== self::TYPE_OPTION_HIERARCHY &&
-                strlen(self::$type) !== 44) {
+                strlen(self::$type) !== 44 &&
+                strlen(self::$type) !== 48) {
                     self::$errormessage = "Wrong 'type'. Possible values are: ".
                         "'".self::TYPE_OPTION_EMAIL."', '".self::TYPE_OPTION_CALENDAR."', '".self::TYPE_OPTION_CONTACT."', '".self::TYPE_OPTION_TASK."', '".self::TYPE_OPTION_NOTE."', ".self::TYPE_OPTION_HIERARCHY."' ".
-                        "or a 44 byte long folder id (as hex).";
+                        "or a 44 or 48 byte long folder id (as hex).";
                     return;
                 }
         }