grommunio / grommunio-sync

lib/core/contentparameters.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  */
 
 class ContentParameters extends StateObject {
-    protected $unsetdata = array(   'contentclass' => false,
+    protected $unsetdata = array('contentclass' => false,
                                     'foldertype' => '',
                                     'conflict' => false,
                                     'deletesasmoves' => true,

Braces +6 added lines, -5 removed lines

@@ -64,12 +64,13 @@
      * @return int/boolean          returns false if value is not defined
      */
     public function BodyPreference($type) {
-        if (!isset($this->bodypref))
-            $this->bodypref = array();
+        if (!isset($this->bodypref)) {
+                    $this->bodypref = array();
+        }
 
-        if (isset($this->bodypref[$type]))
-            return $this->bodypref[$type];
-        else {
+        if (isset($this->bodypref[$type])) {
+                    return $this->bodypref[$type];
+        } else {
             $asb = new BodyPreference();
             $arr = (array)$this->bodypref;
             $arr[$type] = $asb;

lib/core/redisconnection.php

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
      *
      * @access public
      */
-    public function __construct($host=REDIS_HOST, $port=REDIS_PORT, $auth=REDIS_AUTH) {
+    public function __construct($host = REDIS_HOST, $port = REDIS_PORT, $auth = REDIS_AUTH) {
         $this->redisObj = new Redis();
         // Opening a redis connection
         $this->redisObj->connect($host, $port);
@@ -47,11 +47,11 @@ 
         try {
             return $this->redisObj->get($key);
         }
-        catch(Exception $e) {
+        catch (Exception $e) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("%s->getKey(): %s", get_class($this), $e->getMessage()));
         }
     }
-    function setKey($key, $value, $ttl=-1) {
+    function setKey($key, $value, $ttl = -1) {
         try {
             if ($ttl > 0) {
                 return $this->redisObj->setEx($key, $ttl, $value);
@@ -60,7 +60,7 @@ 
                 return $this->redisObj->set($key, $value);
             }
         }
-        catch(Exception $e) {
+        catch (Exception $e) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("%s->setKey(): %s", get_class($this), $e->getMessage()));
         }
     }
@@ -68,7 +68,7 @@ 
         try {
             return $this->redisObj->del($key);
         }
-        catch(Exception $e) {
+        catch (Exception $e) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("%s->delKey(): %s", get_class($this), $e->getMessage()));
         }
     }

Braces +4 added lines, -8 removed lines

@@ -46,8 +46,7 @@ 
     function getKey($key) {
         try {
             return $this->redisObj->get($key);
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("%s->getKey(): %s", get_class($this), $e->getMessage()));
         }
     }
@@ -55,20 +54,17 @@ 
         try {
             if ($ttl > 0) {
                 return $this->redisObj->setEx($key, $ttl, $value);
-            }
-            else {
+            } else {
                 return $this->redisObj->set($key, $value);
             }
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("%s->setKey(): %s", get_class($this), $e->getMessage()));
         }
     }
     function delKey($key) {
         try {
             return $this->redisObj->del($key);
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             ZLog::Write(LOGLEVEL_ERROR, sprintf("%s->delKey(): %s", get_class($this), $e->getMessage()));
         }
     }

lib/core/stateobject.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
     public function __set($name, $value) {
         $lname = strtolower($name);
         if (isset($this->data[$lname]) &&
-                ( (is_scalar($value) && !is_array($value) && $this->data[$lname] === $value) ||
+                ((is_scalar($value) && !is_array($value) && $this->data[$lname] === $value) ||
                   (is_array($value) && is_array($this->data[$lname]) && $this->data[$lname] === $value)
                 ))
             return false;
@@ -107,19 +107,19 @@ 
      */
     public function __call($name, $arguments) {
         $name = strtolower($name);
-        $operator = substr($name, 0,3);
-        $var = substr($name,3);
+        $operator = substr($name, 0, 3);
+        $var = substr($name, 3);
 
         if ($name == "postunserialize") {
             return $this->postUnserialize();
         }
 
-        if ($operator == "set" && count($arguments) == 1){
+        if ($operator == "set" && count($arguments) == 1) {
             $this->$var = $arguments[0];
             return true;
         }
 
-        if ($operator == "set" && count($arguments) == 2 && $arguments[1] === false){
+        if ($operator == "set" && count($arguments) == 2 && $arguments[1] === false) {
             $this->data[$var] = $arguments[0];
             return true;
         }
@@ -195,7 +195,7 @@ 
      * @return void
      */
     public function jsonDeserialize($stdObj) {
-        foreach($stdObj->data as $prop => $val) {
+        foreach ($stdObj->data as $prop => $val) {
             if (is_object($val) && isset($val->gsSyncStateClass)) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("StateObject->jsonDeserialize(): top class '%s'", $val->gsSyncStateClass));
                 $this->data[$prop] = new $val->gsSyncStateClass;

Braces +21 added lines, -20 removed lines

@@ -20,8 +20,9 @@ 
      * @return array
      */
     public function GetID() {
-        if (!isset($this->SO_internalid))
-            $this->SO_internalid = sprintf('%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+        if (!isset($this->SO_internalid)) {
+                    $this->SO_internalid = sprintf('%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+        }
 
         return $this->SO_internalid;
     }
@@ -47,8 +48,9 @@ 
         if (isset($this->data[$lname]) &&
                 ( (is_scalar($value) && !is_array($value) && $this->data[$lname] === $value) ||
                   (is_array($value) && is_array($this->data[$lname]) && $this->data[$lname] === $value)
-                ))
-            return false;
+                )) {
+                    return false;
+        }
 
         $this->data[$lname] = $value;
         $this->changed = true;
@@ -65,11 +67,13 @@ 
     public function __get($name) {
         $lname = strtolower($name);
 
-        if (array_key_exists($lname, $this->data))
-            return $this->data[$lname];
+        if (array_key_exists($lname, $this->data)) {
+                    return $this->data[$lname];
+        }
 
-        if (isset($this->unsetdata) && is_array($this->unsetdata) && array_key_exists($lname, $this->unsetdata))
-            return $this->unsetdata[$lname];
+        if (isset($this->unsetdata) && is_array($this->unsetdata) && array_key_exists($lname, $this->unsetdata)) {
+                    return $this->unsetdata[$lname];
+        }
 
         return null;
     }
@@ -133,13 +137,14 @@ 
         else if ($operator == "get" && count($arguments) == 1) {
             if (isset($this->$var)) {
                 return $this->$var;
+            } else {
+                            return $arguments[0];
             }
-            else
-                return $arguments[0];
         }
 
-        if ($operator == "has" && count($arguments) == 0)
-            return isset($this->$var);
+        if ($operator == "has" && count($arguments) == 0) {
+                    return isset($this->$var);
+        }
 
         if ($operator == "del" && count($arguments) == 0) {
             unset($this->$var);
@@ -201,8 +206,7 @@ 
                 $this->data[$prop] = new $val->gsSyncStateClass;
                 $this->data[$prop]->jsonDeserialize($val);
                 $this->data[$prop]->postUnserialize();
-            }
-            else if (is_object($val)) {
+            } else if (is_object($val)) {
                 // json_decode converts arrays into objects, convert them back to arrays
                 $this->data[$prop] = [];
                 foreach ($val as $k => $v) {
@@ -211,19 +215,16 @@ 
                         // TODO: case should be removed when removing ASDevice backwards compatibility
                         if (strcasecmp($v->gsSyncStateClass, "ASDevice") == 0) {
                             $this->data[$prop][$k] = new ASDevice(Request::GetDeviceID(), Request::GetDeviceType(), Request::GetGETUser(), Request::GetUserAgent());
-                        }
-                        else {
+                        } else {
                             $this->data[$prop][$k] = new $v->gsSyncStateClass;
                         }
                         $this->data[$prop][$k]->jsonDeserialize($v);
                         $this->data[$prop][$k]->postUnserialize();
-                    }
-                    else {
+                    } else {
                         $this->data[$prop][$k] = $v;
                     }
                 }
-            }
-            else {
+            } else {
                 $this->data[$prop] = $val;
             }
         }

lib/core/bodypartpreference.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  */
 
 class BodyPartPreference extends StateObject {
-    protected $unsetdata = array(   'truncationsize' => false,
+    protected $unsetdata = array('truncationsize' => false,
                                     'allornone' => false,
                                     'preview' => false,
                                 );

lib/core/statemanager.php

Indentation +1 added lines, -1 removed lines

@@ -276,7 +276,7 @@
         }
     }
 
-   /**
+    /**
      * Writes the backendstorage data
      *
      * @param mixed $data

Spacing +16 added lines, -16 removed lines

@@ -145,7 +145,7 @@ 
      * @return string
      */
     function GetNewSyncKey($synckey) {
-        if(!isset($synckey) || $synckey == "0" || $synckey == false) {
+        if (!isset($synckey) || $synckey == "0" || $synckey == false) {
             $this->uuid = $this->getNewUuid();
             $this->newStateCounter = 1;
         }
@@ -180,7 +180,7 @@ 
      */
     public function GetSyncState($synckey, $forceHierarchyLoading = false) {
         // No sync state for sync key '0'
-        if($synckey == "0") {
+        if ($synckey == "0") {
             $this->oldStateCounter = 0;
             return "";
         }
@@ -355,7 +355,7 @@ 
             // remove states but no need to notify device
             self::UnLinkState($device, $folderid, false);
 
-            ZLog::Write(LOGLEVEL_DEBUG, sprintf("StateManager::linkState(#ASDevice, '%s','%s'): linked to uuid '%s'.", $newUuid, (($folderid === false)?'HierarchyCache':$folderid), $newUuid));
+            ZLog::Write(LOGLEVEL_DEBUG, sprintf("StateManager::linkState(#ASDevice, '%s','%s'): linked to uuid '%s'.", $newUuid, (($folderid === false) ? 'HierarchyCache' : $folderid), $newUuid));
             return $device->SetFolderUUID($newUuid, $folderid);
         }
         return true;
@@ -384,16 +384,16 @@ 
 
         if ($savedUuid) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("StateManager::UnLinkState('%s'): saved state '%s' will be deleted.", $folderid, $savedUuid));
-            ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::DEFTYPE, $savedUuid, self::FIXEDHIERARCHYCOUNTER *2);
+            ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::DEFTYPE, $savedUuid, self::FIXEDHIERARCHYCOUNTER * 2);
             ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::FOLDERDATA, $savedUuid, false, true); // CPO
-            ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::FAILSAVE, $savedUuid, self::FIXEDHIERARCHYCOUNTER *2);
-            ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::BACKENDSTORAGE, $savedUuid, self::FIXEDHIERARCHYCOUNTER *2);
+            ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::FAILSAVE, $savedUuid, self::FIXEDHIERARCHYCOUNTER * 2);
+            ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::BACKENDSTORAGE, $savedUuid, self::FIXEDHIERARCHYCOUNTER * 2);
 
             // remove all messages which could not be synched before
             $device->RemoveIgnoredMessage($folderid, false);
 
             if ($folderid === false && $savedUuid !== false)
-                ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::HIERARCHY, $savedUuid, self::FIXEDHIERARCHYCOUNTER *2);
+                ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::HIERARCHY, $savedUuid, self::FIXEDHIERARCHYCOUNTER * 2);
         }
         // delete this id from the uuid cache
         if ($removeFromDevice)
@@ -413,7 +413,7 @@ 
      */
     static public function ParseStateKey($synckey) {
         $matches = array();
-        if(!preg_match('/^\{([0-9A-Za-z-]+)\}([0-9]+)$/', $synckey, $matches))
+        if (!preg_match('/^\{([0-9A-Za-z-]+)\}([0-9]+)$/', $synckey, $matches))
             throw new StateInvalidException(sprintf("SyncKey '%s' is invalid", $synckey));
 
         return array($matches[1], (int)$matches[2]);
@@ -430,10 +430,10 @@ 
      * @throws StateInvalidException
      */
     static public function BuildStateKey($uuid, $counter) {
-        if(!preg_match('/^([0-9A-Za-z-]+)$/', $uuid, $matches))
+        if (!preg_match('/^([0-9A-Za-z-]+)$/', $uuid, $matches))
             throw new StateInvalidException(sprintf("UUID '%s' is invalid", $uuid));
 
-        return "{" . $uuid . "}" . $counter;
+        return "{".$uuid."}".$counter;
     }
 
 
@@ -463,7 +463,7 @@ 
             throw new StateNotFoundException("No hierarchy UUID linked to device. Requesting folder resync.");
         }
 
-        $hierarchydata = $this->statemachine->GetState($this->device->GetDeviceId(), IStateMachine::HIERARCHY, $this->uuid , $this->oldStateCounter, $this->deleteOldStates);
+        $hierarchydata = $this->statemachine->GetState($this->device->GetDeviceId(), IStateMachine::HIERARCHY, $this->uuid, $this->oldStateCounter, $this->deleteOldStates);
         $this->device->SetHierarchyCache($hierarchydata);
         return true;
     }
@@ -483,7 +483,7 @@ 
             return false;
 
         // link the hierarchy cache again, if the UUID does not match the UUID saved in the devicedata
-        if (($this->uuid != $this->device->GetFolderUUID() || $forceSaving) )
+        if (($this->uuid != $this->device->GetFolderUUID() || $forceSaving))
             self::LinkState($this->device, $this->uuid);
 
         // check all folders and deleted folders to update data of ASDevice and delete old states
@@ -507,9 +507,9 @@ 
      */
     private function getNewUuid() {
         return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-                    mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-                    mt_rand( 0, 0x0fff ) | 0x4000,
-                    mt_rand( 0, 0x3fff ) | 0x8000,
-                    mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ) );
+                    mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+                    mt_rand(0, 0x0fff)|0x4000,
+                    mt_rand(0, 0x3fff)|0x8000,
+                    mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
     }
 }

Braces +69 added lines, -54 removed lines

@@ -79,8 +79,9 @@ 
         $synched = array();
         foreach ($this->device->GetAllFolderIds() as $folderid) {
             $uuid = $this->device->GetFolderUUID($folderid);
-            if ($uuid)
-                $synched[] = $folderid;
+            if ($uuid) {
+                            $synched[] = $folderid;
+            }
         }
         return $synched;
     }
@@ -107,12 +108,12 @@ 
                 if ($data !== false) {
                     $this->synchedFolders[$folderid] = $data;
                 }
-            }
-            catch (StateNotFoundException $ex) { }
+            } catch (StateNotFoundException $ex) { }
         }
 
-        if (!isset($this->synchedFolders[$folderid]))
-            $this->synchedFolders[$folderid] = new SyncParameters();
+        if (!isset($this->synchedFolders[$folderid])) {
+                    $this->synchedFolders[$folderid] = new SyncParameters();
+        }
 
         return $this->synchedFolders[$folderid];
     }
@@ -148,8 +149,7 @@ 
         if(!isset($synckey) || $synckey == "0" || $synckey == false) {
             $this->uuid = $this->getNewUuid();
             $this->newStateCounter = 1;
-        }
-        else {
+        } else {
             list($uuid, $counter) = self::ParseStateKey($synckey);
             $this->uuid = $uuid;
             $this->newStateCounter = $counter + 1;
@@ -189,8 +189,9 @@ 
         list($this->uuid, $this->oldStateCounter) = self::ParseStateKey($synckey);
 
         // make sure the hierarchy cache is in place
-        if ($this->hierarchyOperation || $forceHierarchyLoading)
-            $this->loadHierarchyCache($forceHierarchyLoading);
+        if ($this->hierarchyOperation || $forceHierarchyLoading) {
+                    $this->loadHierarchyCache($forceHierarchyLoading);
+        }
 
         // the state machine will discard any sync states before this one, as they are no longer required
         return $this->statemachine->GetState($this->device->GetDeviceId(), IStateMachine::DEFTYPE, $this->uuid, $this->oldStateCounter, $this->deleteOldStates);
@@ -209,12 +210,14 @@ 
      */
     public function SetSyncState($synckey, $syncstate, $folderid = false) {
         $internalkey = self::BuildStateKey($this->uuid, $this->newStateCounter);
-        if ($this->oldStateCounter != 0 && $synckey != $internalkey)
-            throw new StateInvalidException(sprintf("Unexpected synckey value oldcounter: '%s' synckey: '%s' internal key: '%s'", $this->oldStateCounter, $synckey, $internalkey));
+        if ($this->oldStateCounter != 0 && $synckey != $internalkey) {
+                    throw new StateInvalidException(sprintf("Unexpected synckey value oldcounter: '%s' synckey: '%s' internal key: '%s'", $this->oldStateCounter, $synckey, $internalkey));
+        }
 
         // make sure the hierarchy cache is also saved
-        if ($this->hierarchyOperation)
-            $this->saveHierarchyCache();
+        if ($this->hierarchyOperation) {
+                    $this->saveHierarchyCache();
+        }
 
         // announce this uuid to the device, while old uuid/states should be deleted
         self::LinkState($this->device, $this->uuid, $folderid);
@@ -229,13 +232,13 @@ 
      * @return array/boolean    false if not available
      */
     public function GetSyncFailState() {
-        if (!$this->uuid)
-            return false;
+        if (!$this->uuid) {
+                    return false;
+        }
 
         try {
             return $this->statemachine->GetState($this->device->GetDeviceId(), IStateMachine::FAILSAVE, $this->uuid, $this->oldStateCounter, $this->deleteOldStates);
-        }
-        catch (StateNotFoundException $snfex) {
+        } catch (StateNotFoundException $snfex) {
             return false;
         }
     }
@@ -249,8 +252,9 @@ 
      * @return boolean
      */
     public function SetSyncFailState($syncstate) {
-        if ($this->oldStateCounter == 0)
-            return false;
+        if ($this->oldStateCounter == 0) {
+                    return false;
+        }
 
         return $this->statemachine->SetState($syncstate, $this->device->GetDeviceId(), IStateMachine::FAILSAVE, $this->uuid, $this->oldStateCounter);
     }
@@ -266,12 +270,12 @@ 
      */
     public function GetBackendStorage($type = self::BACKENDSTORAGE_PERMANENT) {
         if ($type == self::BACKENDSTORAGE_STATE) {
-            if (!$this->uuid)
-                throw new StateNotYetAvailableException();
+            if (!$this->uuid) {
+                            throw new StateNotYetAvailableException();
+            }
 
             return $this->statemachine->GetState($this->device->GetDeviceId(), IStateMachine::BACKENDSTORAGE, $this->uuid, $this->oldStateCounter, $this->deleteOldStates);
-        }
-        else {
+        } else {
             return $this->statemachine->GetState($this->device->GetDeviceId(), IStateMachine::BACKENDSTORAGE, false, $this->device->GetFirstSyncTime(), false);
         }
     }
@@ -288,13 +292,13 @@ 
      */
     public function SetBackendStorage($data, $type = self::BACKENDSTORAGE_PERMANENT) {
         if ($type == self::BACKENDSTORAGE_STATE) {
-            if (!$this->uuid)
-                throw new StateNotYetAvailableException();
+            if (!$this->uuid) {
+                            throw new StateNotYetAvailableException();
+            }
 
             // TODO serialization should be done in the StateMachine
             return $this->statemachine->SetState($data, $this->device->GetDeviceId(), IStateMachine::BACKENDSTORAGE, $this->uuid, $this->newStateCounter);
-        }
-        else {
+        } else {
             return $this->statemachine->SetState($data, $this->device->GetDeviceId(), IStateMachine::BACKENDSTORAGE, false, $this->device->GetFirstSyncTime());
         }
     }
@@ -311,11 +315,13 @@ 
      * @return boolean
      */
     public function InitializeFolderCache($folders) {
-        if (!is_array($folders))
-            return false;
+        if (!is_array($folders)) {
+                    return false;
+        }
 
-        if (!isset($this->device))
-            throw new FatalException("ASDevice not initialized");
+        if (!isset($this->device)) {
+                    throw new FatalException("ASDevice not initialized");
+        }
 
         // redeclare this operation as hierarchyOperation
         $this->hierarchyOperation = true;
@@ -377,10 +383,11 @@ 
      * @return boolean
      */
     static public function UnLinkState(&$device, $folderid, $removeFromDevice = true, $retrieveUUIDFromDevice = true) {
-        if ($retrieveUUIDFromDevice === true)
-            $savedUuid = $device->GetFolderUUID($folderid);
-        else
-            $savedUuid = $retrieveUUIDFromDevice;
+        if ($retrieveUUIDFromDevice === true) {
+                    $savedUuid = $device->GetFolderUUID($folderid);
+        } else {
+                    $savedUuid = $retrieveUUIDFromDevice;
+        }
 
         if ($savedUuid) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("StateManager::UnLinkState('%s'): saved state '%s' will be deleted.", $folderid, $savedUuid));
@@ -392,14 +399,16 @@ 
             // remove all messages which could not be synched before
             $device->RemoveIgnoredMessage($folderid, false);
 
-            if ($folderid === false && $savedUuid !== false)
-                ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::HIERARCHY, $savedUuid, self::FIXEDHIERARCHYCOUNTER *2);
+            if ($folderid === false && $savedUuid !== false) {
+                            ZPush::GetStateMachine()->CleanStates($device->GetDeviceId(), IStateMachine::HIERARCHY, $savedUuid, self::FIXEDHIERARCHYCOUNTER *2);
+            }
         }
         // delete this id from the uuid cache
-        if ($removeFromDevice)
-            return $device->SetFolderUUID(false, $folderid);
-        else
-            return true;
+        if ($removeFromDevice) {
+                    return $device->SetFolderUUID(false, $folderid);
+        } else {
+                    return true;
+        }
     }
 
     /**
@@ -413,8 +422,9 @@ 
      */
     static public function ParseStateKey($synckey) {
         $matches = array();
-        if(!preg_match('/^\{([0-9A-Za-z-]+)\}([0-9]+)$/', $synckey, $matches))
-            throw new StateInvalidException(sprintf("SyncKey '%s' is invalid", $synckey));
+        if(!preg_match('/^\{([0-9A-Za-z-]+)\}([0-9]+)$/', $synckey, $matches)) {
+                    throw new StateInvalidException(sprintf("SyncKey '%s' is invalid", $synckey));
+        }
 
         return array($matches[1], (int)$matches[2]);
     }
@@ -430,8 +440,9 @@ 
      * @throws StateInvalidException
      */
     static public function BuildStateKey($uuid, $counter) {
-        if(!preg_match('/^([0-9A-Za-z-]+)$/', $uuid, $matches))
-            throw new StateInvalidException(sprintf("UUID '%s' is invalid", $uuid));
+        if(!preg_match('/^([0-9A-Za-z-]+)$/', $uuid, $matches)) {
+                    throw new StateInvalidException(sprintf("UUID '%s' is invalid", $uuid));
+        }
 
         return "{" . $uuid . "}" . $counter;
     }
@@ -452,8 +463,9 @@ 
      * @throws StateNotFoundException
      */
     private function loadHierarchyCache($forceLoading = false) {
-        if (!$this->hierarchyOperation && $forceLoading == false)
-            return false;
+        if (!$this->hierarchyOperation && $forceLoading == false) {
+                    return false;
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("StateManager->loadHierarchyCache(): '%s-%s-%s-%d'", $this->device->GetDeviceId(), $this->uuid, IStateMachine::HIERARCHY, $this->oldStateCounter));
 
@@ -479,17 +491,20 @@ 
      * @throws StateInvalidException
      */
     private function saveHierarchyCache($forceSaving = false) {
-        if (!$this->hierarchyOperation && !$forceSaving)
-            return false;
+        if (!$this->hierarchyOperation && !$forceSaving) {
+                    return false;
+        }
 
         // link the hierarchy cache again, if the UUID does not match the UUID saved in the devicedata
-        if (($this->uuid != $this->device->GetFolderUUID() || $forceSaving) )
-            self::LinkState($this->device, $this->uuid);
+        if (($this->uuid != $this->device->GetFolderUUID() || $forceSaving) ) {
+                    self::LinkState($this->device, $this->uuid);
+        }
 
         // check all folders and deleted folders to update data of ASDevice and delete old states
         $hc = $this->device->getHierarchyCache();
-        foreach ($hc->GetDeletedFolders() as $delfolder)
-            self::UnLinkState($this->device, $delfolder->serverid);
+        foreach ($hc->GetDeletedFolders() as $delfolder) {
+                    self::UnLinkState($this->device, $delfolder->serverid);
+        }
 
         foreach ($hc->ExportFolders() as $folder) {
             $this->device->SetFolderType($folder->serverid, $folder->type);

lib/core/asdevice.php

Indentation +9 added lines, -9 removed lines

@@ -64,7 +64,7 @@ 
         $this->useragent = $useragent;
     }
 
-   /**
+    /**
      * Removes internal data from the object, so this data can not be exposed.
      *
      * @param boolean $stripHierarchyCache  (opt) strips the hierarchy cache - default: true
@@ -90,7 +90,7 @@ 
         return true;
     }
 
-   /**
+    /**
      * Indicates if the object was just created
      *
      * @access public
@@ -335,7 +335,7 @@ 
         return false;
     }
 
-   /**
+    /**
      * Returns the HierarchyCache Object
      *
      * @access public
@@ -349,7 +349,7 @@ 
         return $this->hierarchyCache;
     }
 
-   /**
+    /**
      * Returns all known folderids
      *
      * @access public
@@ -361,7 +361,7 @@ 
         return array();
     }
 
-   /**
+    /**
      * Returns a linked UUID for a folder id
      *
      * @param string        $folderid       (opt) if not set, Hierarchy UUID is returned
@@ -379,7 +379,7 @@ 
         return false;
     }
 
-   /**
+    /**
      * Link a UUID to a folder id
      * If a boolean false UUID is sent, the relation is removed
      *
@@ -426,7 +426,7 @@ 
         return true;
     }
 
-   /**
+    /**
      * Returns a foldertype for a folder already known to the mobile
      *
      * @param string        $folderid
@@ -441,7 +441,7 @@ 
         return false;
     }
 
-   /**
+    /**
      * Sets the foldertype of a folder id
      *
      * @param string        $folderid
@@ -799,7 +799,7 @@ 
                             'name'      => $name,
                             'type'      => $type,
                             'flags'     => $flags,
-                         );
+                            );
         $this->additionalfolders = $af;
         $this->changed = true;
 

Spacing +22 added lines, -22 removed lines

@@ -60,7 +60,7 @@ 
     public function Initialize($devid, $devicetype, $getuser, $useragent) {
         $this->deviceid = $devid;
         $this->devicetype = $devicetype;
-        list ($this->deviceuser, $this->domain) =  Utils::SplitDomainUser($getuser);
+        list ($this->deviceuser, $this->domain) = Utils::SplitDomainUser($getuser);
         $this->useragent = $useragent;
     }
 
@@ -157,7 +157,7 @@ 
             $a = $this->useragentHistory;
 
             // only add if this agent was not seen before
-            if (! in_array(array(true, $this->useragent), $a)) {
+            if (!in_array(array(true, $this->useragent), $a)) {
                 $a[] = array(time(), $this->useragent);
                 $this->useragentHistory = $a;
                 $this->changed = true;
@@ -178,7 +178,7 @@ 
     public function AddIgnoredMessage($ignoredMessage) {
         // we should have all previousily ignored messages in an id array
         if (count($this->ignoredMessages) != count($this->ignoredMessageIds)) {
-            foreach($this->ignoredMessages as $oldMessage) {
+            foreach ($this->ignoredMessages as $oldMessage) {
                 if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid]))
                     $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
                 $this->ignoredMessageIds[$oldMessage->data->folderid][] = $oldMessage->id;
@@ -223,7 +223,7 @@ 
     public function RemoveIgnoredMessage($folderid, $id) {
         // we should have all previousily ignored messages in an id array
         if (count($this->ignoredMessages) != count($this->ignoredMessageIds)) {
-            foreach($this->ignoredMessages as $oldMessage) {
+            foreach ($this->ignoredMessages as $oldMessage) {
                 if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid]))
                     $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
                 $this->ignoredMessageIds[$oldMessage->data->folderid][] = $oldMessage->data->id;
@@ -273,7 +273,7 @@ 
     public function HasIgnoredMessage($folderid, $id) {
         // we should have all previousily ignored messages in an id array
         if (count($this->ignoredMessages) != count($this->ignoredMessageIds)) {
-            foreach($this->ignoredMessages as $oldMessage) {
+            foreach ($this->ignoredMessages as $oldMessage) {
                 if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid]))
                     $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
                 $this->ignoredMessageIds[$oldMessage->data->folderid][] = $oldMessage->data->id;
@@ -345,7 +345,7 @@ 
         if (!isset($this->hierarchyCache))
             $this->SetHierarchyCache();
 
-        ZLog::Write(LOGLEVEL_DEBUG, "ASDevice->GetHierarchyCache(): ". $this->hierarchyCache->GetStat());
+        ZLog::Write(LOGLEVEL_DEBUG, "ASDevice->GetHierarchyCache(): ".$this->hierarchyCache->GetStat());
         return $this->hierarchyCache;
     }
 
@@ -456,7 +456,7 @@ 
         if (!isset($contentData[$folderid])) {
             $contentData[$folderid] = new stdClass();
         }
-        if (!isset($contentData[$folderid]->{self::FOLDERTYPE}) || $contentData[$folderid]->{self::FOLDERTYPE} != $foldertype ) {
+        if (!isset($contentData[$folderid]->{self::FOLDERTYPE}) || $contentData[$folderid]->{self::FOLDERTYPE} != $foldertype) {
             $contentData[$folderid]->{self::FOLDERTYPE} = $foldertype;
             $this->contentData = $contentData;
             $this->changed = true;
@@ -490,7 +490,7 @@ 
      * @return boolean      true if the type was set or updated
      */
     public function SetFolderBackendId($folderid, $backendfolderid) {
-        if($folderid === $backendfolderid || $folderid === false || $backendfolderid === false) {
+        if ($folderid === $backendfolderid || $folderid === false || $backendfolderid === false) {
             return false;
         }
 
@@ -498,7 +498,7 @@ 
         if (!isset($contentData[$folderid])) {
             $contentData[$folderid] = new stdClass();
         }
-        if (!isset($contentData[$folderid]->{self::FOLDERBACKENDID}) || $contentData[$folderid]->{self::FOLDERBACKENDID} != $backendfolderid ) {
+        if (!isset($contentData[$folderid]->{self::FOLDERBACKENDID}) || $contentData[$folderid]->{self::FOLDERBACKENDID} != $backendfolderid) {
             $contentData[$folderid]->{self::FOLDERBACKENDID} = $backendfolderid;
             $this->contentData = $contentData;
             $this->changed = true;
@@ -610,7 +610,7 @@ 
     public function GetSupportedFields($folderid) {
         if (isset($this->contentData) && isset($this->contentData[$folderid]) &&
             isset($this->contentData[$folderid]->{self::FOLDERUUID}) && $this->contentData[$folderid]->{self::FOLDERUUID} !== false &&
-            isset($this->contentData[$folderid]->{self::FOLDERSUPPORTEDFIELDS}) )
+            isset($this->contentData[$folderid]->{self::FOLDERSUPPORTEDFIELDS}))
 
             return $this->contentData[$folderid]->{self::FOLDERSUPPORTEDFIELDS};
 
@@ -776,7 +776,7 @@ 
         if ($checkDups) {
             // in order to check for the parent-ids we need a shortid
             $parentShortId = $this->GetFolderIdForBackendId($parentid, false, null, null);
-            foreach($this->GetHierarchyCache()->ExportFolders() as $syncedFolderid => $folder) {
+            foreach ($this->GetHierarchyCache()->ExportFolders() as $syncedFolderid => $folder) {
                 if ($syncedFolderid === $folderid || $folder->BackendId === $folderid) {
                     ZLog::Write(LOGLEVEL_ERROR, sprintf("ASDevice->AddAdditionalFolder(): folder can not be added because there is already a folder with the same folder id synchronized: '%s'", $folderid));
                     return false;
@@ -837,7 +837,7 @@ 
 
         // check if a folder with the new name is already in the list
         foreach ($this->additionalfolders as $existingFolderid => $folder) {
-            if ($folder['name'] == $name &&  $folderid !== $existingFolderid) {
+            if ($folder['name'] == $name && $folderid !== $existingFolderid) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("ASDevice->EditAdditionalFolder(): folder can not be edited because there is already an additional folder with the same name: '%s'", $name));
                 return false;
             }
@@ -847,7 +847,7 @@ 
         if ($checkDups) {
             // in order to check for the parent-ids we need a shortid
             $parentShortId = $this->GetFolderIdForBackendId($parentid, false, null, null);
-            foreach($this->GetHierarchyCache()->ExportFolders() as $syncedFolderid => $folder) {
+            foreach ($this->GetHierarchyCache()->ExportFolders() as $syncedFolderid => $folder) {
                 // $folder is a SyncFolder object here
                 if ($folder->displayname == $name && $folderid !== $folder->BackendId && $folderid !== $syncedFolderid && ($folder->parentid == $parentid || $folder->parentid == $parentShortId)) {
                     ZLog::Write(LOGLEVEL_ERROR, sprintf("ASDevice->EditAdditionalFolder(): folder can not be edited because there is already a folder with the same name synchronized: '%s'", $folderid));
@@ -916,7 +916,7 @@ 
         // remove all folders already shared for this store
         $newAF = array();
         $noDupsCheck = array();
-        foreach($this->additionalfolders as $keepFolder) {
+        foreach ($this->additionalfolders as $keepFolder) {
             if ($keepFolder['store'] !== $store) {
                 $newAF[$keepFolder['folderid']] = $keepFolder;
             }
@@ -933,7 +933,7 @@ 
         $toOrder = array();
         $ordered = array();
         $validTypes = array(SYNC_FOLDER_TYPE_USER_CONTACT, SYNC_FOLDER_TYPE_USER_APPOINTMENT, SYNC_FOLDER_TYPE_USER_TASK, SYNC_FOLDER_TYPE_USER_MAIL, SYNC_FOLDER_TYPE_USER_NOTE, SYNC_FOLDER_TYPE_USER_JOURNAL, SYNC_FOLDER_TYPE_OTHER);
-        foreach($folders as $f) {
+        foreach ($folders as $f) {
             // fail early
             if (!$f['folderid'] || !$f['name']) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("ASDevice->SetAdditionalFolderList(): No valid folderid ('%s') or name ('%s') sent. Aborting. ", $f['folderid'], $f['name']));
@@ -954,14 +954,14 @@ 
         // if there are folders that are not be positioned in the tree, we can't add them!
         if (!empty($toOrder)) {
             $s = "";
-            foreach($toOrder as $f) {
+            foreach ($toOrder as $f) {
                 $s .= sprintf("'%s'('%s') ", $f['name'], $f['folderid']);
             }
-            ZLog::Write(LOGLEVEL_ERROR, "ASDevice->SetAdditionalFolderList(): cannot proceed as these folders have invalid parentids (not found): ". $s);
+            ZLog::Write(LOGLEVEL_ERROR, "ASDevice->SetAdditionalFolderList(): cannot proceed as these folders have invalid parentids (not found): ".$s);
             return false;
         }
 
-        foreach($ordered as $f) {
+        foreach ($ordered as $f) {
             $status = $this->AddAdditionalFolder($store, $f['folderid'], $f['name'], $f['type'], $f['flags'], $f['parentid'], !isset($noDupsCheck[$f['folderid']]));
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("ASDevice->SetAdditionalFolderList(): set folder '%s' in additional folders list with status: %s", $f['name'], Utils::PrintAsString($status)));
             // break if a folder can not be added
@@ -983,7 +983,7 @@ 
     private function orderAdditionalFoldersHierarchically(&$toOrderFolders, &$orderedFolders, $parentid = '0') {
         $stepInto = array();
         // loop through the remaining folders that need to be ordered
-        foreach($toOrderFolders as $folder) {
+        foreach ($toOrderFolders as $folder) {
             // move folders with the matching parentid to the ordered array
             if ($folder['parentid'] == $parentid) {
                 $fid = $folder['folderid'];
@@ -993,7 +993,7 @@ 
             }
         }
         // call recursively to move/order the leaves as well
-        foreach($stepInto as $fid) {
+        foreach ($stepInto as $fid) {
             $this->orderAdditionalFoldersHierarchically($toOrderFolders, $orderedFolders, $fid);
         }
     }
@@ -1019,12 +1019,12 @@ 
     private function generateFolderHash($backendid, $folderOrigin, $folderName) {
         // Hash backendid with crc32 and get the hex representation of it.
         // 5 chars of hash + $folderOrigin should still be enough to avoid collisions.
-        $folderId = substr($folderOrigin . dechex(crc32($backendid)), 0, 6);
+        $folderId = substr($folderOrigin.dechex(crc32($backendid)), 0, 6);
         $cnt = 0;
         // Collision avoiding. Append an increasing number to the string to hash
         // until there aren't any collisions. Probably a smaller number is also sufficient.
         while ((isset($this->contentData[$folderId]) || (is_array($this->backend2folderidCache) && in_array($folderId, $this->backend2folderidCache, true))) && $cnt < 10000) {
-            $folderId = substr($folderOrigin . dechex(crc32($backendid . $folderName . $cnt++)), 0, 6);
+            $folderId = substr($folderOrigin.dechex(crc32($backendid.$folderName.$cnt++)), 0, 6);
             ZLog::Write(LOGLEVEL_WARN, sprintf("ASDevice->generateFolderHash(): collision avoiding nr %05d. Generated hash: '%s'", $cnt, $folderId));
         }
         if ($cnt >= 10000) {

Braces +51 added lines, -45 removed lines

@@ -82,8 +82,7 @@ 
 
         if (!$stripHierarchyCache && $this->hierarchyCache !== false && $this->hierarchyCache instanceof ChangesMemoryWrapper) {
             $this->hierarchyCache->StripData();
-        }
-        else {
+        } else {
             unset($this->hierarchyCache);
         }
 
@@ -122,8 +121,9 @@ 
      * @return string
      */
     public function GetDeviceUserAgent() {
-        if (!isset($this->useragent) || !$this->useragent)
-            return "unknown";
+        if (!isset($this->useragent) || !$this->useragent) {
+                    return "unknown";
+        }
 
         return $this->useragent;
     }
@@ -148,8 +148,9 @@ 
      * @return boolean
      */
     public function SetUserAgent($useragent) {
-        if ($useragent == $this->useragent || $useragent === false || $useragent === Request::UNKNOWN)
-            return true;
+        if ($useragent == $this->useragent || $useragent === false || $useragent === Request::UNKNOWN) {
+                    return true;
+        }
 
         // save the old user agent, if available
         if ($this->useragent != "") {
@@ -179,19 +180,22 @@ 
         // we should have all previousily ignored messages in an id array
         if (count($this->ignoredMessages) != count($this->ignoredMessageIds)) {
             foreach($this->ignoredMessages as $oldMessage) {
-                if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid]))
-                    $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
+                if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid])) {
+                                    $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
+                }
                 $this->ignoredMessageIds[$oldMessage->data->folderid][] = $oldMessage->id;
             }
         }
 
         // try not to add the same message several times
         if (isset($ignoredMessage->folderid) && isset($ignoredMessage->id)) {
-            if (!isset($this->ignoredMessageIds[$ignoredMessage->folderid]))
-                $this->ignoredMessageIds[$ignoredMessage->folderid] = array();
+            if (!isset($this->ignoredMessageIds[$ignoredMessage->folderid])) {
+                            $this->ignoredMessageIds[$ignoredMessage->folderid] = array();
+            }
 
-            if (in_array($ignoredMessage->id, $this->ignoredMessageIds[$ignoredMessage->folderid]))
-                $this->RemoveIgnoredMessage($ignoredMessage->folderid, $ignoredMessage->id);
+            if (in_array($ignoredMessage->id, $this->ignoredMessageIds[$ignoredMessage->folderid])) {
+                            $this->RemoveIgnoredMessage($ignoredMessage->folderid, $ignoredMessage->id);
+            }
 
             $this->ignoredMessageIds[$ignoredMessage->folderid][] = $ignoredMessage->id;
             $msges = $this->ignoredMessages;
@@ -200,8 +204,7 @@ 
             $this->changed = true;
 
             return true;
-        }
-        else {
+        } else {
             $msges = $this->ignoredMessages;
             $msges[] = $ignoredMessage;
             $this->ignoredMessages = $msges;
@@ -224,8 +227,9 @@ 
         // we should have all previousily ignored messages in an id array
         if (count($this->ignoredMessages) != count($this->ignoredMessageIds)) {
             foreach($this->ignoredMessages as $oldMessage) {
-                if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid]))
-                    $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
+                if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid])) {
+                                    $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
+                }
                 $this->ignoredMessageIds[$oldMessage->data->folderid][] = $oldMessage->data->id;
             }
         }
@@ -243,14 +247,13 @@ 
                             $foundMessage = true;
                             if (count($this->ignoredMessageIds[$folderid]) == 1) {
                                 unset($this->ignoredMessageIds[$folderid]);
-                            }
-                            else {
+                            } else {
                                 unset($this->ignoredMessageIds[$folderid][array_search($id, $this->ignoredMessageIds[$folderid])]);
                             }
                             continue;
+                        } else {
+                                                    $newMessages[] = $im;
                         }
-                        else
-                            $newMessages[] = $im;
                     }
                 }
                 $this->ignoredMessages = $newMessages;
@@ -274,8 +277,9 @@ 
         // we should have all previousily ignored messages in an id array
         if (count($this->ignoredMessages) != count($this->ignoredMessageIds)) {
             foreach($this->ignoredMessages as $oldMessage) {
-                if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid]))
-                    $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
+                if (!isset($this->ignoredMessageIds[$oldMessage->data->folderid])) {
+                                    $this->ignoredMessageIds[$oldMessage->data->folderid] = array();
+                }
                 $this->ignoredMessageIds[$oldMessage->data->folderid][] = $oldMessage->data->id;
             }
         }
@@ -312,12 +316,13 @@ 
         if ($hierarchydata !== false && $hierarchydata instanceof ChangesMemoryWrapper) {
             $this->hierarchyCache = $hierarchydata;
             $this->hierarchyCache->CopyOldState();
+        } else {
+                    $this->hierarchyCache = new ChangesMemoryWrapper();
         }
-        else
-            $this->hierarchyCache = new ChangesMemoryWrapper();
 
-        if (is_array($hierarchydata))
-            return $this->hierarchyCache->ImportFolders($hierarchydata);
+        if (is_array($hierarchydata)) {
+                    return $this->hierarchyCache->ImportFolders($hierarchydata);
+        }
         return true;
     }
 
@@ -328,8 +333,9 @@ 
      * @return string
      */
     public function GetHierarchyCacheData() {
-        if (isset($this->hierarchyCache))
-            return $this->hierarchyCache;
+        if (isset($this->hierarchyCache)) {
+                    return $this->hierarchyCache;
+        }
 
         ZLog::Write(LOGLEVEL_WARN, "ASDevice->GetHierarchyCacheData() has no data! HierarchyCache probably never initialized.");
         return false;
@@ -342,8 +348,9 @@ 
      * @return object   HierarchyCache
      */
     public function GetHierarchyCache() {
-        if (!isset($this->hierarchyCache))
-            $this->SetHierarchyCache();
+        if (!isset($this->hierarchyCache)) {
+                    $this->SetHierarchyCache();
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, "ASDevice->GetHierarchyCache(): ". $this->hierarchyCache->GetStat());
         return $this->hierarchyCache;
@@ -356,8 +363,9 @@ 
      * @return array
      */
     public function GetAllFolderIds() {
-        if (isset($this->contentData) && is_array($this->contentData))
-            return array_keys($this->contentData);
+        if (isset($this->contentData) && is_array($this->contentData)) {
+                    return array_keys($this->contentData);
+        }
         return array();
     }
 
@@ -372,8 +380,7 @@ 
     public function GetFolderUUID($folderid = false) {
         if ($folderid === false) {
             return (isset($this->hierarchyUuid) && $this->hierarchyUuid !== self::UNDEFINED) ? $this->hierarchyUuid : false;
-        }
-        else if (isset($this->contentData[$folderid]->{self::FOLDERUUID})) {
+        } else if (isset($this->contentData[$folderid]->{self::FOLDERUUID})) {
             return $this->contentData[$folderid]->{self::FOLDERUUID};
         }
         return false;
@@ -400,8 +407,7 @@ 
                 $this->backend2folderidCache = false;
             }
             $this->changed = true;
-        }
-        else {
+        } else {
             $contentData = $this->contentData;
 
             if (!isset($contentData[$folderid])) {
@@ -415,8 +421,7 @@ 
 
             if ($uuid) {
                 $contentData[$folderid]->{self::FOLDERUUID} = $uuid;
-            }
-            else {
+            } else {
                 $contentData[$folderid]->{self::FOLDERUUID} = false;
             }
 
@@ -610,9 +615,10 @@ 
     public function GetSupportedFields($folderid) {
         if (isset($this->contentData) && isset($this->contentData[$folderid]) &&
             isset($this->contentData[$folderid]->{self::FOLDERUUID}) && $this->contentData[$folderid]->{self::FOLDERUUID} !== false &&
-            isset($this->contentData[$folderid]->{self::FOLDERSUPPORTEDFIELDS}) )
-
+            isset($this->contentData[$folderid]->{self::FOLDERSUPPORTEDFIELDS}) ) {
+        
             return $this->contentData[$folderid]->{self::FOLDERSUPPORTEDFIELDS};
+        }
 
         return false;
     }
@@ -671,8 +677,7 @@ 
         }
         if ($status !== false) {
             $contentData[$folderid]->{self::FOLDERSYNCSTATUS} = $status;
-        }
-        else if (isset($contentData[$folderid]->{self::FOLDERSYNCSTATUS})) {
+        } else if (isset($contentData[$folderid]->{self::FOLDERSYNCSTATUS})) {
             unset($contentData[$folderid]->{self::FOLDERSYNCSTATUS});
         }
 
@@ -757,7 +762,9 @@ 
         foreach ($this->additionalfolders as $k => $folder) {
             // This is fixed in fixstates, but we could keep this here a while longer.
             // TODO: remove line at a later point.
-            if (!isset($folder['parentid'])) $folder['parentid'] = "0";
+            if (!isset($folder['parentid'])) {
+                $folder['parentid'] = "0";
+            }
 
             if ($folder['name'] == $name && $folder['parentid'] == $parentid) {
                 ZLog::Write(LOGLEVEL_ERROR, sprintf("ASDevice->AddAdditionalFolder(): folder can not be added because there is already an additional folder with the same name in the same folder: '%s'", $name));
@@ -919,8 +926,7 @@ 
         foreach($this->additionalfolders as $keepFolder) {
             if ($keepFolder['store'] !== $store) {
                 $newAF[$keepFolder['folderid']] = $keepFolder;
-            }
-            else {
+            } else {
                 $noDupsCheck[$keepFolder['folderid']] = true;
             }
         }

lib/core/provisioningmanager.php

Indentation +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
     }
 
 
-   /**
+    /**
      * Generates a new Policykey
      *
      * @access public

Spacing +9 added lines, -9 removed lines

@@ -41,13 +41,13 @@ 
 
         // get provisioning data from redis
         $p = $this->getData($this->typePolicyCacheId);
-        if (! empty($p)) {
+        if (!empty($p)) {
             $this->policies = $p;
         }
         // no policies cached in redis, get policies from admin API
         else {
             $policies = false;
-            $api_response = file_get_contents(ADMIN_API_POLICY_ENDPOINT . self::$user);
+            $api_response = file_get_contents(ADMIN_API_POLICY_ENDPOINT.self::$user);
             if ($api_response) {
                 $data = json_decode($api_response);
                 if (isset($data->data)) {
@@ -62,7 +62,7 @@ 
             }
             $this->policies = $policies;
             // cache policies for 24h
-            $this->setData($this->policies, $this->typePolicyCacheId, 3600*24);
+            $this->setData($this->policies, $this->typePolicyCacheId, 3600 * 24);
         }
 
         // get policykey and hash
@@ -70,12 +70,12 @@ 
     }
 
     private function loadPolicyCache() {
-        if ($this->loadtime+29 > time()) {
+        if ($this->loadtime + 29 > time()) {
             return;
         }
         // get provisioning data from redis
         $d = $this->getDeviceUserData($this->type, self::$devid, self::$user);
-        if (! empty($d)) {
+        if (!empty($d)) {
             $this->policyKey = $d[self::KEY_POLICYKEY];
             $this->policyHash = $d[self::KEY_POLICYHASH];
             $this->updatetime = $d[self::KEY_UPDATETIME];
@@ -113,7 +113,7 @@ 
         $this->loadPolicyCache();
 
         // check if policiykey matches
-        $p = ( ($policykey !== ASDevice::UNDEFINED && $policykey != $this->policyKey) || $this->policyKey == ASDevice::UNDEFINED );
+        $p = (($policykey !== ASDevice::UNDEFINED && $policykey != $this->policyKey) || $this->policyKey == ASDevice::UNDEFINED);
 
         if (!$noDebug || $p)
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("ProvisioningManager->ProvisioningRequired('%s') saved device key '%s': %s", $policykey, $this->policyKey, Utils::PrintAsString($p)));
@@ -182,14 +182,14 @@ 
         $status = SYNC_PROVISION_RWSTATUS_NA;
 
         // retrieve the WIPE STATUS from the Admin API
-        $api_response = file_get_contents(ADMIN_API_WIPE_ENDPOINT . self::$user ."?devices=". self::$devid);
+        $api_response = file_get_contents(ADMIN_API_WIPE_ENDPOINT.self::$user."?devices=".self::$devid);
         if ($api_response) {
             $data = json_decode($api_response, true);
             if (isset($data['data'][self::$devid]["status"])) {
                     $status = $data['data'][self::$devid]["status"];
                     // reset status to pending if it was already executed
                     if ($status >= SYNC_PROVISION_RWSTATUS_PENDING) {
-                        ZLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->GetProvisioningWipeStatus(): REMOTE WIPE due for user '%s' on device '%s' - status: '%s'",  self::$user, self::$devid, $status));
+                        ZLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->GetProvisioningWipeStatus(): REMOTE WIPE due for user '%s' on device '%s' - status: '%s'", self::$user, self::$devid, $status));
                         $status = SYNC_PROVISION_RWSTATUS_PENDING;
                     }
                     else {
@@ -224,7 +224,7 @@ 
                 )
             )
         );
-        $ret = file_get_contents(ADMIN_API_WIPE_ENDPOINT . self::$user ."?devices=". self::$devid, false, stream_context_create($opts));
+        $ret = file_get_contents(ADMIN_API_WIPE_ENDPOINT.self::$user."?devices=".self::$devid, false, stream_context_create($opts));
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ProvisioningManager->SetProvisioningWipeStatus() admin API response: %s", trim(Utils::PrintAsString($ret))));
         return strpos($http_response_header[0], "201") !== false;
     }

Braces +6 added lines, -8 removed lines

@@ -80,8 +80,7 @@ 
             $this->policyHash = $d[self::KEY_POLICYHASH];
             $this->updatetime = $d[self::KEY_UPDATETIME];
             $this->loadtime = time();
-        }
-        else {
+        } else {
             $this->policyKey = ASDevice::UNDEFINED;
             $this->policyHash = ASDevice::UNDEFINED;
             $this->updatetime = 0;
@@ -115,16 +114,16 @@ 
         // check if policiykey matches
         $p = ( ($policykey !== ASDevice::UNDEFINED && $policykey != $this->policyKey) || $this->policyKey == ASDevice::UNDEFINED );
 
-        if (!$noDebug || $p)
-            ZLog::Write(LOGLEVEL_DEBUG, sprintf("ProvisioningManager->ProvisioningRequired('%s') saved device key '%s': %s", $policykey, $this->policyKey, Utils::PrintAsString($p)));
+        if (!$noDebug || $p) {
+                    ZLog::Write(LOGLEVEL_DEBUG, sprintf("ProvisioningManager->ProvisioningRequired('%s') saved device key '%s': %s", $policykey, $this->policyKey, Utils::PrintAsString($p)));
+        }
 
         if ($checkPolicies) {
             $policyHash = $this->GetProvisioningObject()->GetPolicyHash();
             if ($this->policyHash !== ASDevice::UNDEFINED && $this->policyHash != $policyHash) {
                 $p = true;
                 ZLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->ProvisioningRequired(): saved policy hash '%s' changed to '%s'. Provisioning required.", $this->policyHash, $policyHash));
-            }
-            elseif (!$noDebug) {
+            } elseif (!$noDebug) {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("ProvisioningManager->ProvisioningRequired() saved policy hash '%s' matches", $policyHash));
             }
         }
@@ -191,8 +190,7 @@ 
                     if ($status >= SYNC_PROVISION_RWSTATUS_PENDING) {
                         ZLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->GetProvisioningWipeStatus(): REMOTE WIPE due for user '%s' on device '%s' - status: '%s'",  self::$user, self::$devid, $status));
                         $status = SYNC_PROVISION_RWSTATUS_PENDING;
-                    }
-                    else {
+                    } else {
                         ZLog::Write(LOGLEVEL_INFO, sprintf("ProvisioningManager->GetProvisioningWipeStatus(): no remote wipe pending - status: '%s'", $status));
                     }
             }

lib/core/zpushdefs.php

Spacing +365 added lines, -365 removed lines

@@ -8,159 +8,159 @@ 
  */
 
 // Code Page 0: AirSync, all AS versions
-define("SYNC_SYNCHRONIZE","Synchronize");
-define("SYNC_REPLIES","Replies");
-define("SYNC_ADD","Add");
-define("SYNC_MODIFY","Modify");
-define("SYNC_REMOVE","Remove");
-define("SYNC_FETCH","Fetch");
-define("SYNC_SYNCKEY","SyncKey");
-define("SYNC_CLIENTENTRYID","ClientEntryId");
-define("SYNC_SERVERENTRYID","ServerEntryId");
-define("SYNC_STATUS","Status");
-define("SYNC_FOLDER","Folder");
-define("SYNC_FOLDERTYPE","FolderType");
-define("SYNC_VERSION","Version"); // deprecated
-define("SYNC_FOLDERID","FolderId");
-define("SYNC_GETCHANGES","GetChanges");
-define("SYNC_MOREAVAILABLE","MoreAvailable");
-define("SYNC_WINDOWSIZE","WindowSize"); //MaxItems before version 2
-define("SYNC_PERFORM","Perform");
-define("SYNC_OPTIONS","Options");
-define("SYNC_FILTERTYPE","FilterType");
-define("SYNC_TRUNCATION","Truncation"); // 2.5
-define("SYNC_RTFTRUNCATION","RtfTruncation"); // 2.5
-define("SYNC_CONFLICT","Conflict");
-define("SYNC_FOLDERS","Folders");
-define("SYNC_DATA","Data");
-define("SYNC_DELETESASMOVES","DeletesAsMoves");
-define("SYNC_NOTIFYGUID","NotifyGUID");
-define("SYNC_SUPPORTED","Supported");
-define("SYNC_SOFTDELETE","SoftDelete");
-define("SYNC_MIMESUPPORT","MIMESupport");
-define("SYNC_MIMETRUNCATION","MIMETruncation");
-define("SYNC_NEWMESSAGE","NewMessage");
-define("SYNC_WAIT","Wait"); // Since 12.1
-define("SYNC_LIMIT","Limit"); // Since 12.1
-define("SYNC_PARTIAL","Partial"); // Since 12.1
-define("SYNC_CONVERSATIONMODE","ConversationMode"); // Since 14.0
-define("SYNC_MAXITEMS","MaxItems"); // Since 14.0
-define("SYNC_HEARTBEATINTERVAL","HeartbeatInterval"); // Since 14.0
+define("SYNC_SYNCHRONIZE", "Synchronize");
+define("SYNC_REPLIES", "Replies");
+define("SYNC_ADD", "Add");
+define("SYNC_MODIFY", "Modify");
+define("SYNC_REMOVE", "Remove");
+define("SYNC_FETCH", "Fetch");
+define("SYNC_SYNCKEY", "SyncKey");
+define("SYNC_CLIENTENTRYID", "ClientEntryId");
+define("SYNC_SERVERENTRYID", "ServerEntryId");
+define("SYNC_STATUS", "Status");
+define("SYNC_FOLDER", "Folder");
+define("SYNC_FOLDERTYPE", "FolderType");
+define("SYNC_VERSION", "Version"); // deprecated
+define("SYNC_FOLDERID", "FolderId");
+define("SYNC_GETCHANGES", "GetChanges");
+define("SYNC_MOREAVAILABLE", "MoreAvailable");
+define("SYNC_WINDOWSIZE", "WindowSize"); //MaxItems before version 2
+define("SYNC_PERFORM", "Perform");
+define("SYNC_OPTIONS", "Options");
+define("SYNC_FILTERTYPE", "FilterType");
+define("SYNC_TRUNCATION", "Truncation"); // 2.5
+define("SYNC_RTFTRUNCATION", "RtfTruncation"); // 2.5
+define("SYNC_CONFLICT", "Conflict");
+define("SYNC_FOLDERS", "Folders");
+define("SYNC_DATA", "Data");
+define("SYNC_DELETESASMOVES", "DeletesAsMoves");
+define("SYNC_NOTIFYGUID", "NotifyGUID");
+define("SYNC_SUPPORTED", "Supported");
+define("SYNC_SOFTDELETE", "SoftDelete");
+define("SYNC_MIMESUPPORT", "MIMESupport");
+define("SYNC_MIMETRUNCATION", "MIMETruncation");
+define("SYNC_NEWMESSAGE", "NewMessage");
+define("SYNC_WAIT", "Wait"); // Since 12.1
+define("SYNC_LIMIT", "Limit"); // Since 12.1
+define("SYNC_PARTIAL", "Partial"); // Since 12.1
+define("SYNC_CONVERSATIONMODE", "ConversationMode"); // Since 14.0
+define("SYNC_MAXITEMS", "MaxItems"); // Since 14.0
+define("SYNC_HEARTBEATINTERVAL", "HeartbeatInterval"); // Since 14.0
 
 // Code Page 1: Contacts - POOMCONTACTS, all AS versions
-define("SYNC_POOMCONTACTS_ANNIVERSARY","POOMCONTACTS:Anniversary");
-define("SYNC_POOMCONTACTS_ASSISTANTNAME","POOMCONTACTS:AssistantName");
-define("SYNC_POOMCONTACTS_ASSISTNAMEPHONENUMBER","POOMCONTACTS:AssistnamePhoneNumber");
-define("SYNC_POOMCONTACTS_BIRTHDAY","POOMCONTACTS:Birthday");
-define("SYNC_POOMCONTACTS_BODY","POOMCONTACTS:Body"); // 2.5, AirSyncBase Body is used since 12.0
-define("SYNC_POOMCONTACTS_BODYSIZE","POOMCONTACTS:BodySize"); // 2.5, AirSyncBase is used since version 12.0
-define("SYNC_POOMCONTACTS_BODYTRUNCATED","POOMCONTACTS:BodyTruncated"); // 2.5, AirSyncBase is used since version 12.0
-define("SYNC_POOMCONTACTS_BUSINESS2PHONENUMBER","POOMCONTACTS:Business2PhoneNumber");
-define("SYNC_POOMCONTACTS_BUSINESSCITY","POOMCONTACTS:BusinessCity");
-define("SYNC_POOMCONTACTS_BUSINESSCOUNTRY","POOMCONTACTS:BusinessCountry");
-define("SYNC_POOMCONTACTS_BUSINESSPOSTALCODE","POOMCONTACTS:BusinessPostalCode");
-define("SYNC_POOMCONTACTS_BUSINESSSTATE","POOMCONTACTS:BusinessState");
-define("SYNC_POOMCONTACTS_BUSINESSSTREET","POOMCONTACTS:BusinessStreet");
-define("SYNC_POOMCONTACTS_BUSINESSFAXNUMBER","POOMCONTACTS:BusinessFaxNumber");
-define("SYNC_POOMCONTACTS_BUSINESSPHONENUMBER","POOMCONTACTS:BusinessPhoneNumber");
-define("SYNC_POOMCONTACTS_CARPHONENUMBER","POOMCONTACTS:CarPhoneNumber");
-define("SYNC_POOMCONTACTS_CATEGORIES","POOMCONTACTS:Categories");
-define("SYNC_POOMCONTACTS_CATEGORY","POOMCONTACTS:Category");
-define("SYNC_POOMCONTACTS_CHILDREN","POOMCONTACTS:Children");
-define("SYNC_POOMCONTACTS_CHILD","POOMCONTACTS:Child");
-define("SYNC_POOMCONTACTS_COMPANYNAME","POOMCONTACTS:CompanyName");
-define("SYNC_POOMCONTACTS_DEPARTMENT","POOMCONTACTS:Department");
-define("SYNC_POOMCONTACTS_EMAIL1ADDRESS","POOMCONTACTS:Email1Address");
-define("SYNC_POOMCONTACTS_EMAIL2ADDRESS","POOMCONTACTS:Email2Address");
-define("SYNC_POOMCONTACTS_EMAIL3ADDRESS","POOMCONTACTS:Email3Address");
-define("SYNC_POOMCONTACTS_FILEAS","POOMCONTACTS:FileAs");
-define("SYNC_POOMCONTACTS_FIRSTNAME","POOMCONTACTS:FirstName");
-define("SYNC_POOMCONTACTS_HOME2PHONENUMBER","POOMCONTACTS:Home2PhoneNumber");
-define("SYNC_POOMCONTACTS_HOMECITY","POOMCONTACTS:HomeCity");
-define("SYNC_POOMCONTACTS_HOMECOUNTRY","POOMCONTACTS:HomeCountry");
-define("SYNC_POOMCONTACTS_HOMEPOSTALCODE","POOMCONTACTS:HomePostalCode");
-define("SYNC_POOMCONTACTS_HOMESTATE","POOMCONTACTS:HomeState");
-define("SYNC_POOMCONTACTS_HOMESTREET","POOMCONTACTS:HomeStreet");
-define("SYNC_POOMCONTACTS_HOMEFAXNUMBER","POOMCONTACTS:HomeFaxNumber");
-define("SYNC_POOMCONTACTS_HOMEPHONENUMBER","POOMCONTACTS:HomePhoneNumber");
-define("SYNC_POOMCONTACTS_JOBTITLE","POOMCONTACTS:JobTitle");
-define("SYNC_POOMCONTACTS_LASTNAME","POOMCONTACTS:LastName");
-define("SYNC_POOMCONTACTS_MIDDLENAME","POOMCONTACTS:MiddleName");
-define("SYNC_POOMCONTACTS_MOBILEPHONENUMBER","POOMCONTACTS:MobilePhoneNumber");
-define("SYNC_POOMCONTACTS_OFFICELOCATION","POOMCONTACTS:OfficeLocation");
-define("SYNC_POOMCONTACTS_OTHERCITY","POOMCONTACTS:OtherCity");
-define("SYNC_POOMCONTACTS_OTHERCOUNTRY","POOMCONTACTS:OtherCountry");
-define("SYNC_POOMCONTACTS_OTHERPOSTALCODE","POOMCONTACTS:OtherPostalCode");
-define("SYNC_POOMCONTACTS_OTHERSTATE","POOMCONTACTS:OtherState");
-define("SYNC_POOMCONTACTS_OTHERSTREET","POOMCONTACTS:OtherStreet");
-define("SYNC_POOMCONTACTS_PAGERNUMBER","POOMCONTACTS:PagerNumber");
-define("SYNC_POOMCONTACTS_RADIOPHONENUMBER","POOMCONTACTS:RadioPhoneNumber");
-define("SYNC_POOMCONTACTS_SPOUSE","POOMCONTACTS:Spouse");
-define("SYNC_POOMCONTACTS_SUFFIX","POOMCONTACTS:Suffix");
-define("SYNC_POOMCONTACTS_TITLE","POOMCONTACTS:Title");
-define("SYNC_POOMCONTACTS_WEBPAGE","POOMCONTACTS:WebPage");
-define("SYNC_POOMCONTACTS_YOMICOMPANYNAME","POOMCONTACTS:YomiCompanyName");
-define("SYNC_POOMCONTACTS_YOMIFIRSTNAME","POOMCONTACTS:YomiFirstName");
-define("SYNC_POOMCONTACTS_YOMILASTNAME","POOMCONTACTS:YomiLastName");
-define("SYNC_POOMCONTACTS_RTF","POOMCONTACTS:Rtf"); // deprecated
-define("SYNC_POOMCONTACTS_PICTURE","POOMCONTACTS:Picture");
-define("SYNC_POOMCONTACTS_ALIAS","POOMCONTACTS:Alias"); // Since 14.0
-define("SYNC_POOMCONTACTS_WEIGHEDRANK","POOMCONTACTS:WeightedRank"); // Since 14.0
+define("SYNC_POOMCONTACTS_ANNIVERSARY", "POOMCONTACTS:Anniversary");
+define("SYNC_POOMCONTACTS_ASSISTANTNAME", "POOMCONTACTS:AssistantName");
+define("SYNC_POOMCONTACTS_ASSISTNAMEPHONENUMBER", "POOMCONTACTS:AssistnamePhoneNumber");
+define("SYNC_POOMCONTACTS_BIRTHDAY", "POOMCONTACTS:Birthday");
+define("SYNC_POOMCONTACTS_BODY", "POOMCONTACTS:Body"); // 2.5, AirSyncBase Body is used since 12.0
+define("SYNC_POOMCONTACTS_BODYSIZE", "POOMCONTACTS:BodySize"); // 2.5, AirSyncBase is used since version 12.0
+define("SYNC_POOMCONTACTS_BODYTRUNCATED", "POOMCONTACTS:BodyTruncated"); // 2.5, AirSyncBase is used since version 12.0
+define("SYNC_POOMCONTACTS_BUSINESS2PHONENUMBER", "POOMCONTACTS:Business2PhoneNumber");
+define("SYNC_POOMCONTACTS_BUSINESSCITY", "POOMCONTACTS:BusinessCity");
+define("SYNC_POOMCONTACTS_BUSINESSCOUNTRY", "POOMCONTACTS:BusinessCountry");
+define("SYNC_POOMCONTACTS_BUSINESSPOSTALCODE", "POOMCONTACTS:BusinessPostalCode");
+define("SYNC_POOMCONTACTS_BUSINESSSTATE", "POOMCONTACTS:BusinessState");
+define("SYNC_POOMCONTACTS_BUSINESSSTREET", "POOMCONTACTS:BusinessStreet");
+define("SYNC_POOMCONTACTS_BUSINESSFAXNUMBER", "POOMCONTACTS:BusinessFaxNumber");
+define("SYNC_POOMCONTACTS_BUSINESSPHONENUMBER", "POOMCONTACTS:BusinessPhoneNumber");
+define("SYNC_POOMCONTACTS_CARPHONENUMBER", "POOMCONTACTS:CarPhoneNumber");
+define("SYNC_POOMCONTACTS_CATEGORIES", "POOMCONTACTS:Categories");
+define("SYNC_POOMCONTACTS_CATEGORY", "POOMCONTACTS:Category");
+define("SYNC_POOMCONTACTS_CHILDREN", "POOMCONTACTS:Children");
+define("SYNC_POOMCONTACTS_CHILD", "POOMCONTACTS:Child");
+define("SYNC_POOMCONTACTS_COMPANYNAME", "POOMCONTACTS:CompanyName");
+define("SYNC_POOMCONTACTS_DEPARTMENT", "POOMCONTACTS:Department");
+define("SYNC_POOMCONTACTS_EMAIL1ADDRESS", "POOMCONTACTS:Email1Address");
+define("SYNC_POOMCONTACTS_EMAIL2ADDRESS", "POOMCONTACTS:Email2Address");
+define("SYNC_POOMCONTACTS_EMAIL3ADDRESS", "POOMCONTACTS:Email3Address");
+define("SYNC_POOMCONTACTS_FILEAS", "POOMCONTACTS:FileAs");
+define("SYNC_POOMCONTACTS_FIRSTNAME", "POOMCONTACTS:FirstName");
+define("SYNC_POOMCONTACTS_HOME2PHONENUMBER", "POOMCONTACTS:Home2PhoneNumber");
+define("SYNC_POOMCONTACTS_HOMECITY", "POOMCONTACTS:HomeCity");
+define("SYNC_POOMCONTACTS_HOMECOUNTRY", "POOMCONTACTS:HomeCountry");
+define("SYNC_POOMCONTACTS_HOMEPOSTALCODE", "POOMCONTACTS:HomePostalCode");
+define("SYNC_POOMCONTACTS_HOMESTATE", "POOMCONTACTS:HomeState");
+define("SYNC_POOMCONTACTS_HOMESTREET", "POOMCONTACTS:HomeStreet");
+define("SYNC_POOMCONTACTS_HOMEFAXNUMBER", "POOMCONTACTS:HomeFaxNumber");
+define("SYNC_POOMCONTACTS_HOMEPHONENUMBER", "POOMCONTACTS:HomePhoneNumber");
+define("SYNC_POOMCONTACTS_JOBTITLE", "POOMCONTACTS:JobTitle");
+define("SYNC_POOMCONTACTS_LASTNAME", "POOMCONTACTS:LastName");
+define("SYNC_POOMCONTACTS_MIDDLENAME", "POOMCONTACTS:MiddleName");
+define("SYNC_POOMCONTACTS_MOBILEPHONENUMBER", "POOMCONTACTS:MobilePhoneNumber");
+define("SYNC_POOMCONTACTS_OFFICELOCATION", "POOMCONTACTS:OfficeLocation");
+define("SYNC_POOMCONTACTS_OTHERCITY", "POOMCONTACTS:OtherCity");
+define("SYNC_POOMCONTACTS_OTHERCOUNTRY", "POOMCONTACTS:OtherCountry");
+define("SYNC_POOMCONTACTS_OTHERPOSTALCODE", "POOMCONTACTS:OtherPostalCode");
+define("SYNC_POOMCONTACTS_OTHERSTATE", "POOMCONTACTS:OtherState");
+define("SYNC_POOMCONTACTS_OTHERSTREET", "POOMCONTACTS:OtherStreet");
+define("SYNC_POOMCONTACTS_PAGERNUMBER", "POOMCONTACTS:PagerNumber");
+define("SYNC_POOMCONTACTS_RADIOPHONENUMBER", "POOMCONTACTS:RadioPhoneNumber");
+define("SYNC_POOMCONTACTS_SPOUSE", "POOMCONTACTS:Spouse");
+define("SYNC_POOMCONTACTS_SUFFIX", "POOMCONTACTS:Suffix");
+define("SYNC_POOMCONTACTS_TITLE", "POOMCONTACTS:Title");
+define("SYNC_POOMCONTACTS_WEBPAGE", "POOMCONTACTS:WebPage");
+define("SYNC_POOMCONTACTS_YOMICOMPANYNAME", "POOMCONTACTS:YomiCompanyName");
+define("SYNC_POOMCONTACTS_YOMIFIRSTNAME", "POOMCONTACTS:YomiFirstName");
+define("SYNC_POOMCONTACTS_YOMILASTNAME", "POOMCONTACTS:YomiLastName");
+define("SYNC_POOMCONTACTS_RTF", "POOMCONTACTS:Rtf"); // deprecated
+define("SYNC_POOMCONTACTS_PICTURE", "POOMCONTACTS:Picture");
+define("SYNC_POOMCONTACTS_ALIAS", "POOMCONTACTS:Alias"); // Since 14.0
+define("SYNC_POOMCONTACTS_WEIGHEDRANK", "POOMCONTACTS:WeightedRank"); // Since 14.0
 
 // Code Page 2: Email - POOMMAIL, all AS versions
-define("SYNC_POOMMAIL_ATTACHMENT","POOMMAIL:Attachment"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_ATTACHMENTS","POOMMAIL:Attachments"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_ATTNAME","POOMMAIL:AttName"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_ATTSIZE","POOMMAIL:AttSize"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_ATTOID","POOMMAIL:AttOid"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_ATTMETHOD","POOMMAIL:AttMethod"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_ATTREMOVED","POOMMAIL:AttRemoved"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_BODY","POOMMAIL:Body"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMMAIL_BODYSIZE","POOMMAIL:BodySize"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMMAIL_BODYTRUNCATED","POOMMAIL:BodyTruncated"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMMAIL_DATERECEIVED","POOMMAIL:DateReceived");
-define("SYNC_POOMMAIL_DISPLAYNAME","POOMMAIL:DisplayName"); // AirSyncBase Attachments is used since 12.0
-define("SYNC_POOMMAIL_DISPLAYTO","POOMMAIL:DisplayTo");
-define("SYNC_POOMMAIL_IMPORTANCE","POOMMAIL:Importance");
-define("SYNC_POOMMAIL_MESSAGECLASS","POOMMAIL:MessageClass");
-define("SYNC_POOMMAIL_SUBJECT","POOMMAIL:Subject");
-define("SYNC_POOMMAIL_READ","POOMMAIL:Read");
-define("SYNC_POOMMAIL_TO","POOMMAIL:To");
-define("SYNC_POOMMAIL_CC","POOMMAIL:Cc");
-define("SYNC_POOMMAIL_FROM","POOMMAIL:From");
-define("SYNC_POOMMAIL_REPLY_TO","POOMMAIL:Reply-To");
-define("SYNC_POOMMAIL_ALLDAYEVENT","POOMMAIL:AllDayEvent");
-define("SYNC_POOMMAIL_CATEGORIES","POOMMAIL:Categories"); // Since 14.0
-define("SYNC_POOMMAIL_CATEGORY","POOMMAIL:Category"); // Since 14.0
-define("SYNC_POOMMAIL_DTSTAMP","POOMMAIL:DtStamp");
-define("SYNC_POOMMAIL_ENDTIME","POOMMAIL:EndTime");
-define("SYNC_POOMMAIL_INSTANCETYPE","POOMMAIL:InstanceType");
-define("SYNC_POOMMAIL_BUSYSTATUS","POOMMAIL:BusyStatus");
-define("SYNC_POOMMAIL_LOCATION","POOMMAIL:Location"); // 2.5, 12.0, 12.1, 14.0 and 14.1. Since 16.0 AirSyncBase Location is used.
-define("SYNC_POOMMAIL_MEETINGREQUEST","POOMMAIL:MeetingRequest");
-define("SYNC_POOMMAIL_ORGANIZER","POOMMAIL:Organizer");
-define("SYNC_POOMMAIL_RECURRENCEID","POOMMAIL:RecurrenceId");
-define("SYNC_POOMMAIL_REMINDER","POOMMAIL:Reminder");
-define("SYNC_POOMMAIL_RESPONSEREQUESTED","POOMMAIL:ResponseRequested");
-define("SYNC_POOMMAIL_RECURRENCES","POOMMAIL:Recurrences");
-define("SYNC_POOMMAIL_RECURRENCE","POOMMAIL:Recurrence");
-define("SYNC_POOMMAIL_TYPE","POOMMAIL:Type");
-define("SYNC_POOMMAIL_UNTIL","POOMMAIL:Until");
-define("SYNC_POOMMAIL_OCCURRENCES","POOMMAIL:Occurrences");
-define("SYNC_POOMMAIL_INTERVAL","POOMMAIL:Interval");
-define("SYNC_POOMMAIL_DAYOFWEEK","POOMMAIL:DayOfWeek");
-define("SYNC_POOMMAIL_DAYOFMONTH","POOMMAIL:DayOfMonth");
-define("SYNC_POOMMAIL_WEEKOFMONTH","POOMMAIL:WeekOfMonth");
-define("SYNC_POOMMAIL_MONTHOFYEAR","POOMMAIL:MonthOfYear");
-define("SYNC_POOMMAIL_STARTTIME","POOMMAIL:StartTime");
-define("SYNC_POOMMAIL_SENSITIVITY","POOMMAIL:Sensitivity");
-define("SYNC_POOMMAIL_TIMEZONE","POOMMAIL:TimeZone");
-define("SYNC_POOMMAIL_GLOBALOBJID","POOMMAIL:GlobalObjId"); // 2.5, 12.0, 12.1, 14.0 and 14.1. UID of Calendar (Code page 4) is used since 16.0
-define("SYNC_POOMMAIL_THREADTOPIC","POOMMAIL:ThreadTopic");
-define("SYNC_POOMMAIL_MIMEDATA","POOMMAIL:MIMEData"); // 2.5
-define("SYNC_POOMMAIL_MIMETRUNCATED","POOMMAIL:MIMETruncated"); // 2.5
-define("SYNC_POOMMAIL_MIMESIZE","POOMMAIL:MIMESize");
-define("SYNC_POOMMAIL_INTERNETCPID","POOMMAIL:InternetCPID");
+define("SYNC_POOMMAIL_ATTACHMENT", "POOMMAIL:Attachment"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_ATTACHMENTS", "POOMMAIL:Attachments"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_ATTNAME", "POOMMAIL:AttName"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_ATTSIZE", "POOMMAIL:AttSize"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_ATTOID", "POOMMAIL:AttOid"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_ATTMETHOD", "POOMMAIL:AttMethod"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_ATTREMOVED", "POOMMAIL:AttRemoved"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_BODY", "POOMMAIL:Body"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMMAIL_BODYSIZE", "POOMMAIL:BodySize"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMMAIL_BODYTRUNCATED", "POOMMAIL:BodyTruncated"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMMAIL_DATERECEIVED", "POOMMAIL:DateReceived");
+define("SYNC_POOMMAIL_DISPLAYNAME", "POOMMAIL:DisplayName"); // AirSyncBase Attachments is used since 12.0
+define("SYNC_POOMMAIL_DISPLAYTO", "POOMMAIL:DisplayTo");
+define("SYNC_POOMMAIL_IMPORTANCE", "POOMMAIL:Importance");
+define("SYNC_POOMMAIL_MESSAGECLASS", "POOMMAIL:MessageClass");
+define("SYNC_POOMMAIL_SUBJECT", "POOMMAIL:Subject");
+define("SYNC_POOMMAIL_READ", "POOMMAIL:Read");
+define("SYNC_POOMMAIL_TO", "POOMMAIL:To");
+define("SYNC_POOMMAIL_CC", "POOMMAIL:Cc");
+define("SYNC_POOMMAIL_FROM", "POOMMAIL:From");
+define("SYNC_POOMMAIL_REPLY_TO", "POOMMAIL:Reply-To");
+define("SYNC_POOMMAIL_ALLDAYEVENT", "POOMMAIL:AllDayEvent");
+define("SYNC_POOMMAIL_CATEGORIES", "POOMMAIL:Categories"); // Since 14.0
+define("SYNC_POOMMAIL_CATEGORY", "POOMMAIL:Category"); // Since 14.0
+define("SYNC_POOMMAIL_DTSTAMP", "POOMMAIL:DtStamp");
+define("SYNC_POOMMAIL_ENDTIME", "POOMMAIL:EndTime");
+define("SYNC_POOMMAIL_INSTANCETYPE", "POOMMAIL:InstanceType");
+define("SYNC_POOMMAIL_BUSYSTATUS", "POOMMAIL:BusyStatus");
+define("SYNC_POOMMAIL_LOCATION", "POOMMAIL:Location"); // 2.5, 12.0, 12.1, 14.0 and 14.1. Since 16.0 AirSyncBase Location is used.
+define("SYNC_POOMMAIL_MEETINGREQUEST", "POOMMAIL:MeetingRequest");
+define("SYNC_POOMMAIL_ORGANIZER", "POOMMAIL:Organizer");
+define("SYNC_POOMMAIL_RECURRENCEID", "POOMMAIL:RecurrenceId");
+define("SYNC_POOMMAIL_REMINDER", "POOMMAIL:Reminder");
+define("SYNC_POOMMAIL_RESPONSEREQUESTED", "POOMMAIL:ResponseRequested");
+define("SYNC_POOMMAIL_RECURRENCES", "POOMMAIL:Recurrences");
+define("SYNC_POOMMAIL_RECURRENCE", "POOMMAIL:Recurrence");
+define("SYNC_POOMMAIL_TYPE", "POOMMAIL:Type");
+define("SYNC_POOMMAIL_UNTIL", "POOMMAIL:Until");
+define("SYNC_POOMMAIL_OCCURRENCES", "POOMMAIL:Occurrences");
+define("SYNC_POOMMAIL_INTERVAL", "POOMMAIL:Interval");
+define("SYNC_POOMMAIL_DAYOFWEEK", "POOMMAIL:DayOfWeek");
+define("SYNC_POOMMAIL_DAYOFMONTH", "POOMMAIL:DayOfMonth");
+define("SYNC_POOMMAIL_WEEKOFMONTH", "POOMMAIL:WeekOfMonth");
+define("SYNC_POOMMAIL_MONTHOFYEAR", "POOMMAIL:MonthOfYear");
+define("SYNC_POOMMAIL_STARTTIME", "POOMMAIL:StartTime");
+define("SYNC_POOMMAIL_SENSITIVITY", "POOMMAIL:Sensitivity");
+define("SYNC_POOMMAIL_TIMEZONE", "POOMMAIL:TimeZone");
+define("SYNC_POOMMAIL_GLOBALOBJID", "POOMMAIL:GlobalObjId"); // 2.5, 12.0, 12.1, 14.0 and 14.1. UID of Calendar (Code page 4) is used since 16.0
+define("SYNC_POOMMAIL_THREADTOPIC", "POOMMAIL:ThreadTopic");
+define("SYNC_POOMMAIL_MIMEDATA", "POOMMAIL:MIMEData"); // 2.5
+define("SYNC_POOMMAIL_MIMETRUNCATED", "POOMMAIL:MIMETruncated"); // 2.5
+define("SYNC_POOMMAIL_MIMESIZE", "POOMMAIL:MIMESize");
+define("SYNC_POOMMAIL_INTERNETCPID", "POOMMAIL:InternetCPID");
 define("SYNC_POOMMAIL_FLAG", "POOMMAIL:Flag"); // Since 12.0
 define("SYNC_POOMMAIL_FLAGSTATUS", "POOMMAIL:FlagStatus"); // Since 12.0
 define("SYNC_POOMMAIL_CONTENTCLASS", "POOMMAIL:ContentClass"); // Since 12.0
@@ -169,231 +169,231 @@ 
 define("SYNC_POOMMAIL_DISALLOWNEWTIMEPROPOSAL", "POOMMAIL:DisallowNewTimeProposal"); // Since 14.0
 
 // Code Page 3: AirNotify - AIRNOTIFY, no longer in use
-define("SYNC_AIRNOTIFY_NOTIFY","AirNotify:Notify");
-define("SYNC_AIRNOTIFY_NOTIFICATION","AirNotify:Notification");
-define("SYNC_AIRNOTIFY_VERSION","AirNotify:Version");
-define("SYNC_AIRNOTIFY_LIFETIME","AirNotify:Lifetime");
-define("SYNC_AIRNOTIFY_DEVICEINFO","AirNotify:DeviceInfo");
-define("SYNC_AIRNOTIFY_ENABLE","AirNotify:Enable");
-define("SYNC_AIRNOTIFY_FOLDER","AirNotify:Folder");
-define("SYNC_AIRNOTIFY_SERVERENTRYID","AirNotify:ServerEntryId");
-define("SYNC_AIRNOTIFY_DEVICEADDRESS","AirNotify:DeviceAddress");
-define("SYNC_AIRNOTIFY_VALIDCARRIERPROFILES","AirNotify:ValidCarrierProfiles");
-define("SYNC_AIRNOTIFY_CARRIERPROFILE","AirNotify:CarrierProfile");
-define("SYNC_AIRNOTIFY_STATUS","AirNotify:Status");
-define("SYNC_AIRNOTIFY_REPLIES","AirNotify:Replies");
-define("SYNC_AIRNOTIFY_VERSION='1.1'","AirNotify:Version='1.1'");
-define("SYNC_AIRNOTIFY_DEVICES","AirNotify:Devices");
-define("SYNC_AIRNOTIFY_DEVICE","AirNotify:Device");
-define("SYNC_AIRNOTIFY_ID","AirNotify:Id");
-define("SYNC_AIRNOTIFY_EXPIRY","AirNotify:Expiry");
-define("SYNC_AIRNOTIFY_NOTIFYGUID","AirNotify:NotifyGUID");
+define("SYNC_AIRNOTIFY_NOTIFY", "AirNotify:Notify");
+define("SYNC_AIRNOTIFY_NOTIFICATION", "AirNotify:Notification");
+define("SYNC_AIRNOTIFY_VERSION", "AirNotify:Version");
+define("SYNC_AIRNOTIFY_LIFETIME", "AirNotify:Lifetime");
+define("SYNC_AIRNOTIFY_DEVICEINFO", "AirNotify:DeviceInfo");
+define("SYNC_AIRNOTIFY_ENABLE", "AirNotify:Enable");
+define("SYNC_AIRNOTIFY_FOLDER", "AirNotify:Folder");
+define("SYNC_AIRNOTIFY_SERVERENTRYID", "AirNotify:ServerEntryId");
+define("SYNC_AIRNOTIFY_DEVICEADDRESS", "AirNotify:DeviceAddress");
+define("SYNC_AIRNOTIFY_VALIDCARRIERPROFILES", "AirNotify:ValidCarrierProfiles");
+define("SYNC_AIRNOTIFY_CARRIERPROFILE", "AirNotify:CarrierProfile");
+define("SYNC_AIRNOTIFY_STATUS", "AirNotify:Status");
+define("SYNC_AIRNOTIFY_REPLIES", "AirNotify:Replies");
+define("SYNC_AIRNOTIFY_VERSION='1.1'", "AirNotify:Version='1.1'");
+define("SYNC_AIRNOTIFY_DEVICES", "AirNotify:Devices");
+define("SYNC_AIRNOTIFY_DEVICE", "AirNotify:Device");
+define("SYNC_AIRNOTIFY_ID", "AirNotify:Id");
+define("SYNC_AIRNOTIFY_EXPIRY", "AirNotify:Expiry");
+define("SYNC_AIRNOTIFY_NOTIFYGUID", "AirNotify:NotifyGUID");
 
 // Code Page 4: Calendar - POOMCAL, all AS versions
-define("SYNC_POOMCAL_TIMEZONE","POOMCAL:Timezone");
-define("SYNC_POOMCAL_ALLDAYEVENT","POOMCAL:AllDayEvent");
-define("SYNC_POOMCAL_ATTENDEES","POOMCAL:Attendees");
-define("SYNC_POOMCAL_ATTENDEE","POOMCAL:Attendee");
-define("SYNC_POOMCAL_EMAIL","POOMCAL:Email");
-define("SYNC_POOMCAL_NAME","POOMCAL:Name");
-define("SYNC_POOMCAL_BODY","POOMCAL:Body"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMCAL_BODYTRUNCATED","POOMCAL:BodyTruncated"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMCAL_BUSYSTATUS","POOMCAL:BusyStatus");
-define("SYNC_POOMCAL_CATEGORIES","POOMCAL:Categories");
-define("SYNC_POOMCAL_CATEGORY","POOMCAL:Category");
-define("SYNC_POOMCAL_RTF","POOMCAL:Rtf"); // deprecated
-define("SYNC_POOMCAL_DTSTAMP","POOMCAL:DtStamp");
-define("SYNC_POOMCAL_ENDTIME","POOMCAL:EndTime");
-define("SYNC_POOMCAL_EXCEPTION","POOMCAL:Exception");
-define("SYNC_POOMCAL_EXCEPTIONS","POOMCAL:Exceptions");
-define("SYNC_POOMCAL_DELETED","POOMCAL:Deleted");
-define("SYNC_POOMCAL_EXCEPTIONSTARTTIME","POOMCAL:ExceptionStartTime"); // 2.5, 12.0, 12.1, 14.0 and 14.1.
-define("SYNC_POOMCAL_LOCATION","POOMCAL:Location"); // 2.5, 12.0, 12.1, 14.0 and 14.1. Since 16.0 AirSyncBase Location is used.
-define("SYNC_POOMCAL_MEETINGSTATUS","POOMCAL:MeetingStatus");
-define("SYNC_POOMCAL_ORGANIZEREMAIL","POOMCAL:OrganizerEmail");
-define("SYNC_POOMCAL_ORGANIZERNAME","POOMCAL:OrganizerName");
-define("SYNC_POOMCAL_RECURRENCE","POOMCAL:Recurrence");
-define("SYNC_POOMCAL_TYPE","POOMCAL:Type");
-define("SYNC_POOMCAL_UNTIL","POOMCAL:Until");
-define("SYNC_POOMCAL_OCCURRENCES","POOMCAL:Occurrences");
-define("SYNC_POOMCAL_INTERVAL","POOMCAL:Interval");
-define("SYNC_POOMCAL_DAYOFWEEK","POOMCAL:DayOfWeek");
-define("SYNC_POOMCAL_DAYOFMONTH","POOMCAL:DayOfMonth");
-define("SYNC_POOMCAL_WEEKOFMONTH","POOMCAL:WeekOfMonth");
-define("SYNC_POOMCAL_MONTHOFYEAR","POOMCAL:MonthOfYear");
-define("SYNC_POOMCAL_REMINDER","POOMCAL:Reminder");
-define("SYNC_POOMCAL_SENSITIVITY","POOMCAL:Sensitivity");
-define("SYNC_POOMCAL_SUBJECT","POOMCAL:Subject");
-define("SYNC_POOMCAL_STARTTIME","POOMCAL:StartTime");
-define("SYNC_POOMCAL_UID","POOMCAL:UID");
-define("SYNC_POOMCAL_ATTENDEESTATUS","POOMCAL:Attendee_Status"); // Since 12.0
-define("SYNC_POOMCAL_ATTENDEETYPE","POOMCAL:Attendee_Type"); // Since 12.0
-define("SYNC_POOMCAL_ATTACHMENT","POOMCAL:Attachment"); // Not defined / deprecated
-define("SYNC_POOMCAL_ATTACHMENTS","POOMCAL:Attachments"); // Not defined / deprecated
-define("SYNC_POOMCAL_ATTNAME","POOMCAL:AttName"); // Not defined / deprecated
-define("SYNC_POOMCAL_ATTSIZE","POOMCAL:AttSize"); // Not defined / deprecated
-define("SYNC_POOMCAL_ATTOID","POOMCAL:AttOid"); // Not defined / deprecated
-define("SYNC_POOMCAL_ATTMETHOD","POOMCAL:AttMethod"); // Not defined / deprecated
-define("SYNC_POOMCAL_ATTREMOVED","POOMCAL:AttRemoved"); // Not defined / deprecated
-define("SYNC_POOMCAL_DISPLAYNAME","POOMCAL:DisplayName"); // Not defined / deprecated
-define("SYNC_POOMCAL_DISALLOWNEWTIMEPROPOSAL","POOMCAL:DisallowNewTimeProposal"); // Since 14.0
-define("SYNC_POOMCAL_RESPONSEREQUESTED","POOMCAL:ResponseRequested"); // Since 14.0
-define("SYNC_POOMCAL_APPOINTMENTREPLYTIME","POOMCAL:AppointmentReplyTime"); // Since 14.0
-define("SYNC_POOMCAL_RESPONSETYPE","POOMCAL:ResponseType"); // Since 14.0
-define("SYNC_POOMCAL_CALENDARTYPE","POOMCAL:CalendarType"); // Since 14.0
-define("SYNC_POOMCAL_ISLEAPMONTH","POOMCAL:IsLeapMonth"); // Since 14.0
-define("SYNC_POOMCAL_FIRSTDAYOFWEEK","POOMCAL:FirstDayOfWeek"); // Since 14.1
-define("SYNC_POOMCAL_ONLINEMEETINGCONFLINK","POOMCAL:OnlineMeetingConfLink"); // Since 14.1
-define("SYNC_POOMCAL_ONLINEMEETINGEXTERNALLINK","POOMCAL:OnlineMeetingExternalLink"); // Since 14.0
+define("SYNC_POOMCAL_TIMEZONE", "POOMCAL:Timezone");
+define("SYNC_POOMCAL_ALLDAYEVENT", "POOMCAL:AllDayEvent");
+define("SYNC_POOMCAL_ATTENDEES", "POOMCAL:Attendees");
+define("SYNC_POOMCAL_ATTENDEE", "POOMCAL:Attendee");
+define("SYNC_POOMCAL_EMAIL", "POOMCAL:Email");
+define("SYNC_POOMCAL_NAME", "POOMCAL:Name");
+define("SYNC_POOMCAL_BODY", "POOMCAL:Body"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMCAL_BODYTRUNCATED", "POOMCAL:BodyTruncated"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMCAL_BUSYSTATUS", "POOMCAL:BusyStatus");
+define("SYNC_POOMCAL_CATEGORIES", "POOMCAL:Categories");
+define("SYNC_POOMCAL_CATEGORY", "POOMCAL:Category");
+define("SYNC_POOMCAL_RTF", "POOMCAL:Rtf"); // deprecated
+define("SYNC_POOMCAL_DTSTAMP", "POOMCAL:DtStamp");
+define("SYNC_POOMCAL_ENDTIME", "POOMCAL:EndTime");
+define("SYNC_POOMCAL_EXCEPTION", "POOMCAL:Exception");
+define("SYNC_POOMCAL_EXCEPTIONS", "POOMCAL:Exceptions");
+define("SYNC_POOMCAL_DELETED", "POOMCAL:Deleted");
+define("SYNC_POOMCAL_EXCEPTIONSTARTTIME", "POOMCAL:ExceptionStartTime"); // 2.5, 12.0, 12.1, 14.0 and 14.1.
+define("SYNC_POOMCAL_LOCATION", "POOMCAL:Location"); // 2.5, 12.0, 12.1, 14.0 and 14.1. Since 16.0 AirSyncBase Location is used.
+define("SYNC_POOMCAL_MEETINGSTATUS", "POOMCAL:MeetingStatus");
+define("SYNC_POOMCAL_ORGANIZEREMAIL", "POOMCAL:OrganizerEmail");
+define("SYNC_POOMCAL_ORGANIZERNAME", "POOMCAL:OrganizerName");
+define("SYNC_POOMCAL_RECURRENCE", "POOMCAL:Recurrence");
+define("SYNC_POOMCAL_TYPE", "POOMCAL:Type");
+define("SYNC_POOMCAL_UNTIL", "POOMCAL:Until");
+define("SYNC_POOMCAL_OCCURRENCES", "POOMCAL:Occurrences");
+define("SYNC_POOMCAL_INTERVAL", "POOMCAL:Interval");
+define("SYNC_POOMCAL_DAYOFWEEK", "POOMCAL:DayOfWeek");
+define("SYNC_POOMCAL_DAYOFMONTH", "POOMCAL:DayOfMonth");
+define("SYNC_POOMCAL_WEEKOFMONTH", "POOMCAL:WeekOfMonth");
+define("SYNC_POOMCAL_MONTHOFYEAR", "POOMCAL:MonthOfYear");
+define("SYNC_POOMCAL_REMINDER", "POOMCAL:Reminder");
+define("SYNC_POOMCAL_SENSITIVITY", "POOMCAL:Sensitivity");
+define("SYNC_POOMCAL_SUBJECT", "POOMCAL:Subject");
+define("SYNC_POOMCAL_STARTTIME", "POOMCAL:StartTime");
+define("SYNC_POOMCAL_UID", "POOMCAL:UID");
+define("SYNC_POOMCAL_ATTENDEESTATUS", "POOMCAL:Attendee_Status"); // Since 12.0
+define("SYNC_POOMCAL_ATTENDEETYPE", "POOMCAL:Attendee_Type"); // Since 12.0
+define("SYNC_POOMCAL_ATTACHMENT", "POOMCAL:Attachment"); // Not defined / deprecated
+define("SYNC_POOMCAL_ATTACHMENTS", "POOMCAL:Attachments"); // Not defined / deprecated
+define("SYNC_POOMCAL_ATTNAME", "POOMCAL:AttName"); // Not defined / deprecated
+define("SYNC_POOMCAL_ATTSIZE", "POOMCAL:AttSize"); // Not defined / deprecated
+define("SYNC_POOMCAL_ATTOID", "POOMCAL:AttOid"); // Not defined / deprecated
+define("SYNC_POOMCAL_ATTMETHOD", "POOMCAL:AttMethod"); // Not defined / deprecated
+define("SYNC_POOMCAL_ATTREMOVED", "POOMCAL:AttRemoved"); // Not defined / deprecated
+define("SYNC_POOMCAL_DISPLAYNAME", "POOMCAL:DisplayName"); // Not defined / deprecated
+define("SYNC_POOMCAL_DISALLOWNEWTIMEPROPOSAL", "POOMCAL:DisallowNewTimeProposal"); // Since 14.0
+define("SYNC_POOMCAL_RESPONSEREQUESTED", "POOMCAL:ResponseRequested"); // Since 14.0
+define("SYNC_POOMCAL_APPOINTMENTREPLYTIME", "POOMCAL:AppointmentReplyTime"); // Since 14.0
+define("SYNC_POOMCAL_RESPONSETYPE", "POOMCAL:ResponseType"); // Since 14.0
+define("SYNC_POOMCAL_CALENDARTYPE", "POOMCAL:CalendarType"); // Since 14.0
+define("SYNC_POOMCAL_ISLEAPMONTH", "POOMCAL:IsLeapMonth"); // Since 14.0
+define("SYNC_POOMCAL_FIRSTDAYOFWEEK", "POOMCAL:FirstDayOfWeek"); // Since 14.1
+define("SYNC_POOMCAL_ONLINEMEETINGCONFLINK", "POOMCAL:OnlineMeetingConfLink"); // Since 14.1
+define("SYNC_POOMCAL_ONLINEMEETINGEXTERNALLINK", "POOMCAL:OnlineMeetingExternalLink"); // Since 14.0
 
 // Code Page 5: Move, all AS versions
-define("SYNC_MOVE_MOVES","Move:Moves");
-define("SYNC_MOVE_MOVE","Move:Move");
-define("SYNC_MOVE_SRCMSGID","Move:SrcMsgId");
-define("SYNC_MOVE_SRCFLDID","Move:SrcFldId");
-define("SYNC_MOVE_DSTFLDID","Move:DstFldId");
-define("SYNC_MOVE_RESPONSE","Move:Response");
-define("SYNC_MOVE_STATUS","Move:Status");
-define("SYNC_MOVE_DSTMSGID","Move:DstMsgId");
+define("SYNC_MOVE_MOVES", "Move:Moves");
+define("SYNC_MOVE_MOVE", "Move:Move");
+define("SYNC_MOVE_SRCMSGID", "Move:SrcMsgId");
+define("SYNC_MOVE_SRCFLDID", "Move:SrcFldId");
+define("SYNC_MOVE_DSTFLDID", "Move:DstFldId");
+define("SYNC_MOVE_RESPONSE", "Move:Response");
+define("SYNC_MOVE_STATUS", "Move:Status");
+define("SYNC_MOVE_DSTMSGID", "Move:DstMsgId");
 
 // Code Page 6: GetItemEstimate, all AS versions
-define("SYNC_GETITEMESTIMATE_GETITEMESTIMATE","GetItemEstimate:GetItemEstimate");
-define("SYNC_GETITEMESTIMATE_VERSION","GetItemEstimate:Version"); // deprecated
-define("SYNC_GETITEMESTIMATE_FOLDERS","GetItemEstimate:Folders");
-define("SYNC_GETITEMESTIMATE_FOLDER","GetItemEstimate:Folder");
-define("SYNC_GETITEMESTIMATE_FOLDERTYPE","GetItemEstimate:FolderType"); // AirSync Class(SYNC_FOLDERTYPE) is used since AS 14.0
-define("SYNC_GETITEMESTIMATE_FOLDERID","GetItemEstimate:FolderId");
-define("SYNC_GETITEMESTIMATE_DATETIME","GetItemEstimate:DateTime"); // deprecated
-define("SYNC_GETITEMESTIMATE_ESTIMATE","GetItemEstimate:Estimate");
-define("SYNC_GETITEMESTIMATE_RESPONSE","GetItemEstimate:Response");
-define("SYNC_GETITEMESTIMATE_STATUS","GetItemEstimate:Status");
+define("SYNC_GETITEMESTIMATE_GETITEMESTIMATE", "GetItemEstimate:GetItemEstimate");
+define("SYNC_GETITEMESTIMATE_VERSION", "GetItemEstimate:Version"); // deprecated
+define("SYNC_GETITEMESTIMATE_FOLDERS", "GetItemEstimate:Folders");
+define("SYNC_GETITEMESTIMATE_FOLDER", "GetItemEstimate:Folder");
+define("SYNC_GETITEMESTIMATE_FOLDERTYPE", "GetItemEstimate:FolderType"); // AirSync Class(SYNC_FOLDERTYPE) is used since AS 14.0
+define("SYNC_GETITEMESTIMATE_FOLDERID", "GetItemEstimate:FolderId");
+define("SYNC_GETITEMESTIMATE_DATETIME", "GetItemEstimate:DateTime"); // deprecated
+define("SYNC_GETITEMESTIMATE_ESTIMATE", "GetItemEstimate:Estimate");
+define("SYNC_GETITEMESTIMATE_RESPONSE", "GetItemEstimate:Response");
+define("SYNC_GETITEMESTIMATE_STATUS", "GetItemEstimate:Status");
 
 // Code Page 7: FolderHierarchy, all AS versions
-define("SYNC_FOLDERHIERARCHY_FOLDERS","FolderHierarchy:Folders"); // 2.5, 12.0 and 12.1
-define("SYNC_FOLDERHIERARCHY_FOLDER","FolderHierarchy:Folder"); // 2.5, 12.0 and 12.1
-define("SYNC_FOLDERHIERARCHY_DISPLAYNAME","FolderHierarchy:DisplayName");
-define("SYNC_FOLDERHIERARCHY_SERVERENTRYID","FolderHierarchy:ServerEntryId");
-define("SYNC_FOLDERHIERARCHY_PARENTID","FolderHierarchy:ParentId");
-define("SYNC_FOLDERHIERARCHY_TYPE","FolderHierarchy:Type");
-define("SYNC_FOLDERHIERARCHY_RESPONSE","FolderHierarchy:Response"); // deprecated
-define("SYNC_FOLDERHIERARCHY_STATUS","FolderHierarchy:Status");
-define("SYNC_FOLDERHIERARCHY_CONTENTCLASS","FolderHierarchy:ContentClass"); // deprecated
-define("SYNC_FOLDERHIERARCHY_CHANGES","FolderHierarchy:Changes");
-define("SYNC_FOLDERHIERARCHY_ADD","FolderHierarchy:Add");
-define("SYNC_FOLDERHIERARCHY_REMOVE","FolderHierarchy:Remove");
-define("SYNC_FOLDERHIERARCHY_UPDATE","FolderHierarchy:Update");
-define("SYNC_FOLDERHIERARCHY_SYNCKEY","FolderHierarchy:SyncKey");
-define("SYNC_FOLDERHIERARCHY_FOLDERCREATE","FolderHierarchy:FolderCreate");
-define("SYNC_FOLDERHIERARCHY_FOLDERDELETE","FolderHierarchy:FolderDelete");
-define("SYNC_FOLDERHIERARCHY_FOLDERUPDATE","FolderHierarchy:FolderUpdate");
-define("SYNC_FOLDERHIERARCHY_FOLDERSYNC","FolderHierarchy:FolderSync");
-define("SYNC_FOLDERHIERARCHY_COUNT","FolderHierarchy:Count");
-define("SYNC_FOLDERHIERARCHY_VERSION","FolderHierarchy:Version"); // Not defined / deprecated
+define("SYNC_FOLDERHIERARCHY_FOLDERS", "FolderHierarchy:Folders"); // 2.5, 12.0 and 12.1
+define("SYNC_FOLDERHIERARCHY_FOLDER", "FolderHierarchy:Folder"); // 2.5, 12.0 and 12.1
+define("SYNC_FOLDERHIERARCHY_DISPLAYNAME", "FolderHierarchy:DisplayName");
+define("SYNC_FOLDERHIERARCHY_SERVERENTRYID", "FolderHierarchy:ServerEntryId");
+define("SYNC_FOLDERHIERARCHY_PARENTID", "FolderHierarchy:ParentId");
+define("SYNC_FOLDERHIERARCHY_TYPE", "FolderHierarchy:Type");
+define("SYNC_FOLDERHIERARCHY_RESPONSE", "FolderHierarchy:Response"); // deprecated
+define("SYNC_FOLDERHIERARCHY_STATUS", "FolderHierarchy:Status");
+define("SYNC_FOLDERHIERARCHY_CONTENTCLASS", "FolderHierarchy:ContentClass"); // deprecated
+define("SYNC_FOLDERHIERARCHY_CHANGES", "FolderHierarchy:Changes");
+define("SYNC_FOLDERHIERARCHY_ADD", "FolderHierarchy:Add");
+define("SYNC_FOLDERHIERARCHY_REMOVE", "FolderHierarchy:Remove");
+define("SYNC_FOLDERHIERARCHY_UPDATE", "FolderHierarchy:Update");
+define("SYNC_FOLDERHIERARCHY_SYNCKEY", "FolderHierarchy:SyncKey");
+define("SYNC_FOLDERHIERARCHY_FOLDERCREATE", "FolderHierarchy:FolderCreate");
+define("SYNC_FOLDERHIERARCHY_FOLDERDELETE", "FolderHierarchy:FolderDelete");
+define("SYNC_FOLDERHIERARCHY_FOLDERUPDATE", "FolderHierarchy:FolderUpdate");
+define("SYNC_FOLDERHIERARCHY_FOLDERSYNC", "FolderHierarchy:FolderSync");
+define("SYNC_FOLDERHIERARCHY_COUNT", "FolderHierarchy:Count");
+define("SYNC_FOLDERHIERARCHY_VERSION", "FolderHierarchy:Version"); // Not defined / deprecated
 // only for internal use - never to be streamed to the mobile
-define("SYNC_FOLDERHIERARCHY_IGNORE_STORE","FolderHierarchy:IgnoreStore");
-define("SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD","FolderHierarchy:IgnoreNoBackendFolder");
-define("SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID","FolderHierarchy:IgnoreBackendId");
-define("SYNC_FOLDERHIERARCHY_IGNORE_FLAGS","FolderHierarchy:IgnoreFlags");
-define("SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL","FolderHierarchy:TypeReal");
+define("SYNC_FOLDERHIERARCHY_IGNORE_STORE", "FolderHierarchy:IgnoreStore");
+define("SYNC_FOLDERHIERARCHY_IGNORE_NOBCKENDFLD", "FolderHierarchy:IgnoreNoBackendFolder");
+define("SYNC_FOLDERHIERARCHY_IGNORE_BACKENDID", "FolderHierarchy:IgnoreBackendId");
+define("SYNC_FOLDERHIERARCHY_IGNORE_FLAGS", "FolderHierarchy:IgnoreFlags");
+define("SYNC_FOLDERHIERARCHY_IGNORE_TYPEREAL", "FolderHierarchy:TypeReal");
 
 // Code Page 8: MeetingResponse, all AS versions
-define("SYNC_MEETINGRESPONSE_CALENDARID","MeetingResponse:CalendarId");
-define("SYNC_MEETINGRESPONSE_FOLDERID","MeetingResponse:FolderId");
-define("SYNC_MEETINGRESPONSE_MEETINGRESPONSE","MeetingResponse:MeetingResponse");
-define("SYNC_MEETINGRESPONSE_REQUESTID","MeetingResponse:RequestId");
-define("SYNC_MEETINGRESPONSE_REQUEST","MeetingResponse:Request");
-define("SYNC_MEETINGRESPONSE_RESULT","MeetingResponse:Result");
-define("SYNC_MEETINGRESPONSE_STATUS","MeetingResponse:Status");
-define("SYNC_MEETINGRESPONSE_USERRESPONSE","MeetingResponse:UserResponse");
-define("SYNC_MEETINGRESPONSE_VERSION","MeetingResponse:Version"); // Not defined / deprecated
-define("SYNC_MEETINGRESPONSE_INSTANCEID","MeetingResponse:InstanceId"); // Since AS 14.1
+define("SYNC_MEETINGRESPONSE_CALENDARID", "MeetingResponse:CalendarId");
+define("SYNC_MEETINGRESPONSE_FOLDERID", "MeetingResponse:FolderId");
+define("SYNC_MEETINGRESPONSE_MEETINGRESPONSE", "MeetingResponse:MeetingResponse");
+define("SYNC_MEETINGRESPONSE_REQUESTID", "MeetingResponse:RequestId");
+define("SYNC_MEETINGRESPONSE_REQUEST", "MeetingResponse:Request");
+define("SYNC_MEETINGRESPONSE_RESULT", "MeetingResponse:Result");
+define("SYNC_MEETINGRESPONSE_STATUS", "MeetingResponse:Status");
+define("SYNC_MEETINGRESPONSE_USERRESPONSE", "MeetingResponse:UserResponse");
+define("SYNC_MEETINGRESPONSE_VERSION", "MeetingResponse:Version"); // Not defined / deprecated
+define("SYNC_MEETINGRESPONSE_INSTANCEID", "MeetingResponse:InstanceId"); // Since AS 14.1
 
 // Code Page 9: Tasks - POOMTASKS, all AS versions
-define("SYNC_POOMTASKS_BODY","POOMTASKS:Body"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMTASKS_BODYSIZE","POOMTASKS:BodySize"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMTASKS_BODYTRUNCATED","POOMTASKS:BodyTruncated"); // AirSyncBase Body is used since 12.0
-define("SYNC_POOMTASKS_CATEGORIES","POOMTASKS:Categories");
-define("SYNC_POOMTASKS_CATEGORY","POOMTASKS:Category");
-define("SYNC_POOMTASKS_COMPLETE","POOMTASKS:Complete");
-define("SYNC_POOMTASKS_DATECOMPLETED","POOMTASKS:DateCompleted");
-define("SYNC_POOMTASKS_DUEDATE","POOMTASKS:DueDate");
-define("SYNC_POOMTASKS_UTCDUEDATE","POOMTASKS:UtcDueDate");
-define("SYNC_POOMTASKS_IMPORTANCE","POOMTASKS:Importance");
-define("SYNC_POOMTASKS_RECURRENCE","POOMTASKS:Recurrence");
-define("SYNC_POOMTASKS_TYPE","POOMTASKS:Type");
-define("SYNC_POOMTASKS_START","POOMTASKS:Start");
-define("SYNC_POOMTASKS_UNTIL","POOMTASKS:Until");
-define("SYNC_POOMTASKS_OCCURRENCES","POOMTASKS:Occurrences");
-define("SYNC_POOMTASKS_INTERVAL","POOMTASKS:Interval");
-define("SYNC_POOMTASKS_DAYOFWEEK","POOMTASKS:DayOfWeek");
-define("SYNC_POOMTASKS_DAYOFMONTH","POOMTASKS:DayOfMonth");
-define("SYNC_POOMTASKS_WEEKOFMONTH","POOMTASKS:WeekOfMonth");
-define("SYNC_POOMTASKS_MONTHOFYEAR","POOMTASKS:MonthOfYear");
-define("SYNC_POOMTASKS_REGENERATE","POOMTASKS:Regenerate");
-define("SYNC_POOMTASKS_DEADOCCUR","POOMTASKS:DeadOccur");
-define("SYNC_POOMTASKS_REMINDERSET","POOMTASKS:ReminderSet");
-define("SYNC_POOMTASKS_REMINDERTIME","POOMTASKS:ReminderTime");
-define("SYNC_POOMTASKS_SENSITIVITY","POOMTASKS:Sensitivity");
-define("SYNC_POOMTASKS_STARTDATE","POOMTASKS:StartDate");
-define("SYNC_POOMTASKS_UTCSTARTDATE","POOMTASKS:UtcStartDate");
-define("SYNC_POOMTASKS_SUBJECT","POOMTASKS:Subject");
-define("SYNC_POOMTASKS_RTF","POOMTASKS:Rtf");
-define("SYNC_POOMTASKS_ORDINALDATE","POOMTASKS:OrdinalDate"); // Since 12.0
-define("SYNC_POOMTASKS_SUBORDINALDATE","POOMTASKS:SubOrdinalDate"); // Since 12.0
-define("SYNC_POOMTASKS_CALENDARTYPE","POOMTASKS:CalendarType"); // Since 14.0
-define("SYNC_POOMTASKS_ISLEAPMONTH","POOMTASKS:IsLeapMonth"); // Since 14.0
-define("SYNC_POOMTASKS_FIRSTDAYOFWEEK","POOMTASKS:FirstDayOfWeek"); // Since 14.0
+define("SYNC_POOMTASKS_BODY", "POOMTASKS:Body"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMTASKS_BODYSIZE", "POOMTASKS:BodySize"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMTASKS_BODYTRUNCATED", "POOMTASKS:BodyTruncated"); // AirSyncBase Body is used since 12.0
+define("SYNC_POOMTASKS_CATEGORIES", "POOMTASKS:Categories");
+define("SYNC_POOMTASKS_CATEGORY", "POOMTASKS:Category");
+define("SYNC_POOMTASKS_COMPLETE", "POOMTASKS:Complete");
+define("SYNC_POOMTASKS_DATECOMPLETED", "POOMTASKS:DateCompleted");
+define("SYNC_POOMTASKS_DUEDATE", "POOMTASKS:DueDate");
+define("SYNC_POOMTASKS_UTCDUEDATE", "POOMTASKS:UtcDueDate");
+define("SYNC_POOMTASKS_IMPORTANCE", "POOMTASKS:Importance");
+define("SYNC_POOMTASKS_RECURRENCE", "POOMTASKS:Recurrence");
+define("SYNC_POOMTASKS_TYPE", "POOMTASKS:Type");
+define("SYNC_POOMTASKS_START", "POOMTASKS:Start");
+define("SYNC_POOMTASKS_UNTIL", "POOMTASKS:Until");
+define("SYNC_POOMTASKS_OCCURRENCES", "POOMTASKS:Occurrences");
+define("SYNC_POOMTASKS_INTERVAL", "POOMTASKS:Interval");
+define("SYNC_POOMTASKS_DAYOFWEEK", "POOMTASKS:DayOfWeek");
+define("SYNC_POOMTASKS_DAYOFMONTH", "POOMTASKS:DayOfMonth");
+define("SYNC_POOMTASKS_WEEKOFMONTH", "POOMTASKS:WeekOfMonth");
+define("SYNC_POOMTASKS_MONTHOFYEAR", "POOMTASKS:MonthOfYear");
+define("SYNC_POOMTASKS_REGENERATE", "POOMTASKS:Regenerate");
+define("SYNC_POOMTASKS_DEADOCCUR", "POOMTASKS:DeadOccur");
+define("SYNC_POOMTASKS_REMINDERSET", "POOMTASKS:ReminderSet");
+define("SYNC_POOMTASKS_REMINDERTIME", "POOMTASKS:ReminderTime");
+define("SYNC_POOMTASKS_SENSITIVITY", "POOMTASKS:Sensitivity");
+define("SYNC_POOMTASKS_STARTDATE", "POOMTASKS:StartDate");
+define("SYNC_POOMTASKS_UTCSTARTDATE", "POOMTASKS:UtcStartDate");
+define("SYNC_POOMTASKS_SUBJECT", "POOMTASKS:Subject");
+define("SYNC_POOMTASKS_RTF", "POOMTASKS:Rtf");
+define("SYNC_POOMTASKS_ORDINALDATE", "POOMTASKS:OrdinalDate"); // Since 12.0
+define("SYNC_POOMTASKS_SUBORDINALDATE", "POOMTASKS:SubOrdinalDate"); // Since 12.0
+define("SYNC_POOMTASKS_CALENDARTYPE", "POOMTASKS:CalendarType"); // Since 14.0
+define("SYNC_POOMTASKS_ISLEAPMONTH", "POOMTASKS:IsLeapMonth"); // Since 14.0
+define("SYNC_POOMTASKS_FIRSTDAYOFWEEK", "POOMTASKS:FirstDayOfWeek"); // Since 14.0
 
 // Code Page 10: ResolveRecipients, all AS versions
-define("SYNC_RESOLVERECIPIENTS_RESOLVERECIPIENTS","ResolveRecipients:ResolveRecipients");
-define("SYNC_RESOLVERECIPIENTS_RESPONSE","ResolveRecipients:Response");
-define("SYNC_RESOLVERECIPIENTS_STATUS","ResolveRecipients:Status");
-define("SYNC_RESOLVERECIPIENTS_TYPE","ResolveRecipients:Type");
-define("SYNC_RESOLVERECIPIENTS_RECIPIENT","ResolveRecipients:Recipient");
-define("SYNC_RESOLVERECIPIENTS_DISPLAYNAME","ResolveRecipients:DisplayName");
-define("SYNC_RESOLVERECIPIENTS_EMAILADDRESS","ResolveRecipients:EmailAddress");
-define("SYNC_RESOLVERECIPIENTS_CERTIFICATES","ResolveRecipients:Certificates");
-define("SYNC_RESOLVERECIPIENTS_CERTIFICATE","ResolveRecipients:Certificate");
-define("SYNC_RESOLVERECIPIENTS_MINICERTIFICATE","ResolveRecipients:MiniCertificate");
-define("SYNC_RESOLVERECIPIENTS_OPTIONS","ResolveRecipients:Options");
-define("SYNC_RESOLVERECIPIENTS_TO","ResolveRecipients:To");
-define("SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL","ResolveRecipients:CertificateRetrieval");
-define("SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT","ResolveRecipients:RecipientCount");
-define("SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES","ResolveRecipients:MaxCertificates");
-define("SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS","ResolveRecipients:MaxAmbiguousRecipients");
-define("SYNC_RESOLVERECIPIENTS_CERTIFICATECOUNT","ResolveRecipients:CertificateCount");
-define("SYNC_RESOLVERECIPIENTS_AVAILABILITY","ResolveRecipients:Availability"); // Since 14.0
-define("SYNC_RESOLVERECIPIENTS_STARTTIME","ResolveRecipients:StartTime"); // Since 14.0
-define("SYNC_RESOLVERECIPIENTS_ENDTIME","ResolveRecipients:EndTime"); // Since 14.0
-define("SYNC_RESOLVERECIPIENTS_MERGEDFREEBUSY","ResolveRecipients:MergedFreeBusy"); // Since 14.0
-define("SYNC_RESOLVERECIPIENTS_PICTURE","ResolveRecipients:Picture"); // Since 14.1
-define("SYNC_RESOLVERECIPIENTS_MAXSIZE","ResolveRecipients:MaxSize"); // Since 14.1
-define("SYNC_RESOLVERECIPIENTS_DATA","ResolveRecipients:Data"); // Since 14.1
-define("SYNC_RESOLVERECIPIENTS_MAXPICTURES","ResolveRecipients:MaxPictures"); // Since 14.1
+define("SYNC_RESOLVERECIPIENTS_RESOLVERECIPIENTS", "ResolveRecipients:ResolveRecipients");
+define("SYNC_RESOLVERECIPIENTS_RESPONSE", "ResolveRecipients:Response");
+define("SYNC_RESOLVERECIPIENTS_STATUS", "ResolveRecipients:Status");
+define("SYNC_RESOLVERECIPIENTS_TYPE", "ResolveRecipients:Type");
+define("SYNC_RESOLVERECIPIENTS_RECIPIENT", "ResolveRecipients:Recipient");
+define("SYNC_RESOLVERECIPIENTS_DISPLAYNAME", "ResolveRecipients:DisplayName");
+define("SYNC_RESOLVERECIPIENTS_EMAILADDRESS", "ResolveRecipients:EmailAddress");
+define("SYNC_RESOLVERECIPIENTS_CERTIFICATES", "ResolveRecipients:Certificates");
+define("SYNC_RESOLVERECIPIENTS_CERTIFICATE", "ResolveRecipients:Certificate");
+define("SYNC_RESOLVERECIPIENTS_MINICERTIFICATE", "ResolveRecipients:MiniCertificate");
+define("SYNC_RESOLVERECIPIENTS_OPTIONS", "ResolveRecipients:Options");
+define("SYNC_RESOLVERECIPIENTS_TO", "ResolveRecipients:To");
+define("SYNC_RESOLVERECIPIENTS_CERTIFICATERETRIEVAL", "ResolveRecipients:CertificateRetrieval");
+define("SYNC_RESOLVERECIPIENTS_RECIPIENTCOUNT", "ResolveRecipients:RecipientCount");
+define("SYNC_RESOLVERECIPIENTS_MAXCERTIFICATES", "ResolveRecipients:MaxCertificates");
+define("SYNC_RESOLVERECIPIENTS_MAXAMBIGUOUSRECIPIENTS", "ResolveRecipients:MaxAmbiguousRecipients");
+define("SYNC_RESOLVERECIPIENTS_CERTIFICATECOUNT", "ResolveRecipients:CertificateCount");
+define("SYNC_RESOLVERECIPIENTS_AVAILABILITY", "ResolveRecipients:Availability"); // Since 14.0
+define("SYNC_RESOLVERECIPIENTS_STARTTIME", "ResolveRecipients:StartTime"); // Since 14.0
+define("SYNC_RESOLVERECIPIENTS_ENDTIME", "ResolveRecipients:EndTime"); // Since 14.0
+define("SYNC_RESOLVERECIPIENTS_MERGEDFREEBUSY", "ResolveRecipients:MergedFreeBusy"); // Since 14.0
+define("SYNC_RESOLVERECIPIENTS_PICTURE", "ResolveRecipients:Picture"); // Since 14.1
+define("SYNC_RESOLVERECIPIENTS_MAXSIZE", "ResolveRecipients:MaxSize"); // Since 14.1
+define("SYNC_RESOLVERECIPIENTS_DATA", "ResolveRecipients:Data"); // Since 14.1
+define("SYNC_RESOLVERECIPIENTS_MAXPICTURES", "ResolveRecipients:MaxPictures"); // Since 14.1
 
 // Code Page 11: ValidateCert, all AS versions
-define("SYNC_VALIDATECERT_VALIDATECERT","ValidateCert:ValidateCert");
-define("SYNC_VALIDATECERT_CERTIFICATES","ValidateCert:Certificates");
-define("SYNC_VALIDATECERT_CERTIFICATE","ValidateCert:Certificate");
-define("SYNC_VALIDATECERT_CERTIFICATECHAIN","ValidateCert:CertificateChain");
-define("SYNC_VALIDATECERT_CHECKCRL","ValidateCert:CheckCRL");
-define("SYNC_VALIDATECERT_STATUS","ValidateCert:Status");
+define("SYNC_VALIDATECERT_VALIDATECERT", "ValidateCert:ValidateCert");
+define("SYNC_VALIDATECERT_CERTIFICATES", "ValidateCert:Certificates");
+define("SYNC_VALIDATECERT_CERTIFICATE", "ValidateCert:Certificate");
+define("SYNC_VALIDATECERT_CERTIFICATECHAIN", "ValidateCert:CertificateChain");
+define("SYNC_VALIDATECERT_CHECKCRL", "ValidateCert:CheckCRL");
+define("SYNC_VALIDATECERT_STATUS", "ValidateCert:Status");
 
 // Code Page 12: Contacts2 - POOMCONTACTS2, all AS versions
-define("SYNC_POOMCONTACTS2_CUSTOMERID","POOMCONTACTS2:CustomerId");
-define("SYNC_POOMCONTACTS2_GOVERNMENTID","POOMCONTACTS2:GovernmentId");
-define("SYNC_POOMCONTACTS2_IMADDRESS","POOMCONTACTS2:IMAddress");
-define("SYNC_POOMCONTACTS2_IMADDRESS2","POOMCONTACTS2:IMAddress2");
-define("SYNC_POOMCONTACTS2_IMADDRESS3","POOMCONTACTS2:IMAddress3");
-define("SYNC_POOMCONTACTS2_MANAGERNAME","POOMCONTACTS2:ManagerName");
-define("SYNC_POOMCONTACTS2_COMPANYMAINPHONE","POOMCONTACTS2:CompanyMainPhone");
-define("SYNC_POOMCONTACTS2_ACCOUNTNAME","POOMCONTACTS2:AccountName");
-define("SYNC_POOMCONTACTS2_NICKNAME","POOMCONTACTS2:NickName");
-define("SYNC_POOMCONTACTS2_MMS","POOMCONTACTS2:MMS");
+define("SYNC_POOMCONTACTS2_CUSTOMERID", "POOMCONTACTS2:CustomerId");
+define("SYNC_POOMCONTACTS2_GOVERNMENTID", "POOMCONTACTS2:GovernmentId");
+define("SYNC_POOMCONTACTS2_IMADDRESS", "POOMCONTACTS2:IMAddress");
+define("SYNC_POOMCONTACTS2_IMADDRESS2", "POOMCONTACTS2:IMAddress2");
+define("SYNC_POOMCONTACTS2_IMADDRESS3", "POOMCONTACTS2:IMAddress3");
+define("SYNC_POOMCONTACTS2_MANAGERNAME", "POOMCONTACTS2:ManagerName");
+define("SYNC_POOMCONTACTS2_COMPANYMAINPHONE", "POOMCONTACTS2:CompanyMainPhone");
+define("SYNC_POOMCONTACTS2_ACCOUNTNAME", "POOMCONTACTS2:AccountName");
+define("SYNC_POOMCONTACTS2_NICKNAME", "POOMCONTACTS2:NickName");
+define("SYNC_POOMCONTACTS2_MMS", "POOMCONTACTS2:MMS");
 
 // Code Page 13: Ping, all AS versions
-define("SYNC_PING_PING","Ping:Ping");
-define("SYNC_PING_STATUS","Ping:Status");
+define("SYNC_PING_PING", "Ping:Ping");
+define("SYNC_PING_STATUS", "Ping:Status");
 define("SYNC_PING_LIFETIME", "Ping:LifeTime");
 define("SYNC_PING_FOLDERS", "Ping:Folders");
 define("SYNC_PING_FOLDER", "Ping:Folder");
@@ -486,9 +486,9 @@ 
 define("SYNC_SEARCH_USERNAME", "Search:UserName"); // Since 12.1
 define("SYNC_SEARCH_PASSWORD", "Search:Password"); // Since 12.1
 define("SYNC_SEARCH_CONVERSATIONID", "Search:ConversationId"); // Since 14.0
-define("SYNC_SEARCH_PICTURE","Search:Picture"); // Since 14.1
-define("SYNC_SEARCH_MAXSIZE","Search:MaxSize"); // Since 14.1
-define("SYNC_SEARCH_MAXPICTURES","Search:MaxPictures"); // Since 14.1
+define("SYNC_SEARCH_PICTURE", "Search:Picture"); // Since 14.1
+define("SYNC_SEARCH_MAXSIZE", "Search:MaxSize"); // Since 14.1
+define("SYNC_SEARCH_MAXPICTURES", "Search:MaxPictures"); // Since 14.1
 
 // Code Page 16: GAL, all AS versions
 define("SYNC_GAL_DISPLAYNAME", "GAL:DisplayName");
@@ -502,9 +502,9 @@ 
 define("SYNC_GAL_HOMEPHONE", "GAL:HomePhone");
 define("SYNC_GAL_MOBILEPHONE", "GAL:MobilePhone");
 define("SYNC_GAL_EMAILADDRESS", "GAL:EmailAddress");
-define("SYNC_GAL_PICTURE","GAL:Picture"); // Since 14.1
-define("SYNC_GAL_STATUS","GAL:Status"); // Since 14.1
-define("SYNC_GAL_DATA","GAL:Data"); // Since 14.1
+define("SYNC_GAL_PICTURE", "GAL:Picture"); // Since 14.1
+define("SYNC_GAL_STATUS", "GAL:Status"); // Since 14.1
+define("SYNC_GAL_DATA", "GAL:Data"); // Since 14.1
 
 // Code Page 17: AirSyncBase, Since 12.0
 define("SYNC_AIRSYNCBASE_BODYPREFERENCE", "AirSyncBase:BodyPreference");
@@ -622,8 +622,8 @@ 
 define("SYNC_COMPOSEMAIL_STATUS", "ComposeMail:Status");
 define("SYNC_COMPOSEMAIL_ACCOUNTID", "ComposeMail:AccountId"); // Since 14.1
 // only for internal use - never to be streamed to the mobile
-define("SYNC_COMPOSEMAIL_REPLYFLAG","ComposeMail:ReplyFlag");
-define("SYNC_COMPOSEMAIL_FORWARDFLAG","ComposeMail:ForwardFlag");
+define("SYNC_COMPOSEMAIL_REPLYFLAG", "ComposeMail:ReplyFlag");
+define("SYNC_COMPOSEMAIL_FORWARDFLAG", "ComposeMail:ForwardFlag");
 
 // Code Page 22: Email2 - POOMMAIL2, Since 14.0
 define("SYNC_POOMMAIL2_UMCALLERID", "POOMMAIL2:UmCallerId");
@@ -649,7 +649,7 @@ 
 define("SYNC_NOTES_CATEGORIES", "Notes:Categories");
 define("SYNC_NOTES_CATEGORY", "Notes:Category");
 // only for internal use - never to be streamed to the mobile
-define("SYNC_NOTES_IGNORE_COLOR","Notes:IgnoreColor");
+define("SYNC_NOTES_IGNORE_COLOR", "Notes:IgnoreColor");
 
 // Code Page 24: RightsManagement, Since 14.1
 define("SYNC_RIGHTSMANAGEMENT_SUPPORT", "RightsManagement:RightsManagementSupport");
@@ -984,7 +984,7 @@ 
 define("LOGLEVEL_DEVICEID", 64);
 define("LOGLEVEL_WBXMLSTACK", 128);
 
-define("LOGLEVEL_ALL", LOGLEVEL_FATAL | LOGLEVEL_ERROR | LOGLEVEL_WARN | LOGLEVEL_INFO | LOGLEVEL_DEBUG | LOGLEVEL_WBXML);
+define("LOGLEVEL_ALL", LOGLEVEL_FATAL|LOGLEVEL_ERROR|LOGLEVEL_WARN|LOGLEVEL_INFO|LOGLEVEL_DEBUG|LOGLEVEL_WBXML);
 
 define("BACKEND_DISCARD_DATA", 1);
 
@@ -1023,8 +1023,8 @@ 
 define("SYNC_FILEAS_LASTCOMPANY", 6);
 define("SYNC_FILEAS_FIRSTCOMPANY", 7);
 
-define ("SYNC_RESOLVERECIPIENTS_TYPE_GAL", 1);
-define ("SYNC_RESOLVERECIPIENTS_TYPE_CONTACT", 2);
+define("SYNC_RESOLVERECIPIENTS_TYPE_GAL", 1);
+define("SYNC_RESOLVERECIPIENTS_TYPE_CONTACT", 2);
 
 define("SYNC_RESOLVERECIPIENTS_CERTRETRIEVE_NO", 1);
 define("SYNC_RESOLVERECIPIENTS_CERTRETRIEVE_FULL", 2);

lib/core/bodypreference.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  */
 
 class BodyPreference extends StateObject {
-    protected $unsetdata = array(   'truncationsize' => false,
+    protected $unsetdata = array('truncationsize' => false,
                                     'allornone' => false,
                                     'preview' => false,
                                 );