grommunio / grommunio-sync

lib/request/settings.php

Braces +20 added lines, -14 removed lines

@@ -18,8 +18,9 @@ 
      * @return boolean
      */
     public function Handle($commandCode) {
-        if (!self::$decoder->getElementStartTag(SYNC_SETTINGS_SETTINGS))
-            return false;
+        if (!self::$decoder->getElementStartTag(SYNC_SETTINGS_SETTINGS)) {
+                    return false;
+        }
 
         //save the request parameters
         $request = array();
@@ -50,8 +51,9 @@ 
             }
             //TODO - check if it is necessary
             //no property name available - break
-            if (!$propertyName)
-                break;
+            if (!$propertyName) {
+                            break;
+            }
 
             //the property name is followed by either get or set
             if (self::$decoder->getElementStartTag(SYNC_SETTINGS_GET)) {
@@ -60,8 +62,10 @@ 
                     case SYNC_SETTINGS_OOF:
                         $oofGet = new SyncOOF();
                         $oofGet->Decode(self::$decoder);
-                        if(!self::$decoder->getElementEndTag())
-                            return false; // SYNC_SETTINGS_GET
+                        if(!self::$decoder->getElementEndTag()) {
+                                                    return false;
+                        }
+                        // SYNC_SETTINGS_GET
                         break;
 
                     case SYNC_SETTINGS_USERINFORMATION:
@@ -76,8 +80,7 @@ 
                         //TODO: a special status code needed?
                         ZLog::Write(LOGLEVEL_WARN, sprintf ("This property ('%s') is not allowed to use get in request", $propertyName));
                 }
-            }
-            elseif (self::$decoder->getElementStartTag(SYNC_SETTINGS_SET)) {
+            } elseif (self::$decoder->getElementStartTag(SYNC_SETTINGS_SET)) {
                 //set is available for OOF, device password and device information
                 switch ($propertyName) {
                     case SYNC_SETTINGS_OOF:
@@ -104,16 +107,19 @@ 
                         ZLog::Write(LOGLEVEL_WARN, sprintf ("This property ('%s') is not allowed to use set in request", $propertyName));
                 }
 
-                if(!self::$decoder->getElementEndTag())
-                    return false; // SYNC_SETTINGS_SET
-            }
-            else {
+                if(!self::$decoder->getElementEndTag()) {
+                                    return false;
+                }
+                // SYNC_SETTINGS_SET
+            } else {
                 ZLog::Write(LOGLEVEL_WARN, sprintf("Neither get nor set found for property '%s'", $propertyName));
                 return false;
             }
 
-            if(!self::$decoder->getElementEndTag())
-                return false; // SYNC_SETTINGS_OOF or SYNC_SETTINGS_DEVICEPW or SYNC_SETTINGS_DEVICEINFORMATION or SYNC_SETTINGS_USERINFORMATION
+            if(!self::$decoder->getElementEndTag()) {
+                            return false;
+            }
+            // SYNC_SETTINGS_OOF or SYNC_SETTINGS_DEVICEPW or SYNC_SETTINGS_DEVICEINFORMATION or SYNC_SETTINGS_USERINFORMATION
 
             //break if it reached the endtag
             $e = self::$decoder->peek();

lib/syncobjects/synctask.php

Braces +6 added lines, -4 removed lines

@@ -128,11 +128,13 @@
         $ret = parent::Check($logAsDebug);
 
         // semantic checks general "turn off switch"
-        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false)
-            return $ret;
+        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
+                    return $ret;
+        }
 
-        if (!$ret)
-            return false;
+        if (!$ret) {
+                    return false;
+        }
 
         if (isset($this->startdate) && isset($this->duedate) && $this->duedate < $this->startdate) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'startdate' is HIGHER than 'duedate'. Check failed!", get_class($this) ));

lib/syncobjects/syncobject.php

Braces +62 added lines, -56 removed lines

@@ -49,8 +49,7 @@ 
             if (defined('UNSET_UNDEFINED_PROPERTIES') && UNSET_UNDEFINED_PROPERTIES && ($this instanceof SyncContact || $this instanceof SyncAppointment || $this instanceof SyncTask)) {
                 ZLog::Write(LOGLEVEL_INFO, sprintf("%s->emptySupported(): no supported list available, emptying all not set parameters", get_class($this)));
                 $supportedFields = array_keys($this->mapping);
-            }
-            else {
+            } else {
                 return false;
             }
         }
@@ -62,8 +61,9 @@ 
             }
             $var = $this->mapping[$field][self::STREAMER_VAR];
             // add var to $this->unsetVars if $var is not set
-            if (!isset($this->$var))
-                $this->unsetVars[] = $var;
+            if (!isset($this->$var)) {
+                            $this->unsetVars[] = $var;
+            }
         }
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Supported variables to be unset: %s", implode(',', $this->unsetVars)));
         return true;
@@ -81,8 +81,9 @@ 
      * @return boolean
      */
     public function equals($odo, $log = false, $strictTypeCompare = false) {
-        if ($odo === false)
-            return false;
+        if ($odo === false) {
+                    return false;
+        }
 
         // check objecttype
         if (! ($odo instanceof SyncObject)) {
@@ -99,20 +100,17 @@ 
                 if (!isset($this->$val) && !isset($odo->$val)) {
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is NOT SET in either object", $val));
                     continue;
-                }
-                elseif (is_array($this->$val) && is_array($odo->$val)) {
+                } elseif (is_array($this->$val) && is_array($odo->$val)) {
                     // if both arrays exist then seek for differences in the arrays
                     if (count(array_diff($this->$val, $odo->$val)) + count(array_diff($odo->$val, $this->$val)) > 0) {
                         ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() items in array '%s' differ", $val));
                         return false;
                     }
-                }
-                else {
+                } else {
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() array '%s' is set in one but not the other object", $val));
                     return false;
                 }
-            }
-            else {
+            } else {
                 if (isset($this->$val) && isset($odo->$val)) {
                     if ($strictTypeCompare){
                         if ($this->$val !== $odo->$val){
@@ -125,11 +123,9 @@ 
                             return false;
                         }
                     }
-                }
-                else if (!isset($this->$val) && !isset($odo->$val)) {
+                } else if (!isset($this->$val) && !isset($odo->$val)) {
                     continue;
-                }
-                else {
+                } else {
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncObject->equals() false because field '%s' is only defined at one obj: '%s' != '%s'", $val, Utils::PrintAsString(isset($this->$val)), Utils::PrintAsString(isset($odo->$val))));
                     return false;
                 }
@@ -148,27 +144,32 @@ 
         $str = get_class($this) . " (\n";
 
         $streamerVars = array();
-        foreach ($this->mapping as $k=>$v)
-            $streamerVars[$v[self::STREAMER_VAR]] = (isset($v[self::STREAMER_TYPE]))?$v[self::STREAMER_TYPE]:false;
+        foreach ($this->mapping as $k=>$v) {
+                    $streamerVars[$v[self::STREAMER_VAR]] = (isset($v[self::STREAMER_TYPE]))?$v[self::STREAMER_TYPE]:false;
+        }
 
         foreach (get_object_vars($this) as $k=>$v) {
-            if ($k == "mapping") continue;
+            if ($k == "mapping") {
+                continue;
+            }
 
-            if (array_key_exists($k, $streamerVars))
-                $strV = "(S) ";
-            else
-                $strV = "";
+            if (array_key_exists($k, $streamerVars)) {
+                            $strV = "(S) ";
+            } else {
+                            $strV = "";
+            }
 
             // self::STREAMER_ARRAY ?
             if (is_array($v)) {
                 $str .= "\t". $strV . $k ."(Array) size: " . count($v) ."\n";
-                foreach ($v as $value) $str .= "\t\t". Utils::PrintAsString($value) ."\n";
-            }
-            else if ($v instanceof SyncObject) {
+                foreach ($v as $value) {
+                    $str .= "\t\t". Utils::PrintAsString($value) ."\n";
+                }
+            } else if ($v instanceof SyncObject) {
                 $str .= "\t". $strV .$k ." => ". str_replace("\n", "\n\t\t\t", $v->__toString()) . "\n";
+            } else {
+                            $str .= "\t". $strV .$k ." => " . (isset($this->$k)? Utils::PrintAsString($this->$k) :"null") . "\n";
             }
-            else
-                $str .= "\t". $strV .$k ." => " . (isset($this->$k)? Utils::PrintAsString($this->$k) :"null") . "\n";
         }
         $str .= ")";
 
@@ -238,8 +239,9 @@ 
         $defaultLogLevel = LOGLEVEL_WARN;
 
         // in some cases non-false checks should not provoke a WARN log but only a DEBUG log
-        if ($logAsDebug)
-            $defaultLogLevel = LOGLEVEL_DEBUG;
+        if ($logAsDebug) {
+                    $defaultLogLevel = LOGLEVEL_DEBUG;
+        }
 
         $objClass = get_class($this);
         foreach ($this->mapping as $k=>$v) {
@@ -247,13 +249,14 @@ 
             // check sub-objects recursively
             if (isset($v[self::STREAMER_TYPE]) && isset($this->{$v[self::STREAMER_VAR]})) {
                 if ($this->{$v[self::STREAMER_VAR]} instanceof SyncObject) {
-                    if (! $this->{$v[self::STREAMER_VAR]}->Check($logAsDebug))
-                        return false;
-                }
-                else if (is_array($this->{$v[self::STREAMER_VAR]})) {
-                    foreach ($this->{$v[self::STREAMER_VAR]} as $subobj)
-                        if ($subobj instanceof SyncObject && !$subobj->Check($logAsDebug))
+                    if (! $this->{$v[self::STREAMER_VAR]}->Check($logAsDebug)) {
+                                            return false;
+                    }
+                } else if (is_array($this->{$v[self::STREAMER_VAR]})) {
+                    foreach ($this->{$v[self::STREAMER_VAR]} as $subobj) {
+                                            if ($subobj instanceof SyncObject && !$subobj->Check($logAsDebug))
                             return false;
+                    }
                 }
             }
 
@@ -329,11 +332,11 @@ 
                             else if (!isset($this->mapping[$condition])) {
                                 ZLog::Write(LOGLEVEL_ERROR, sprintf("SyncObject->Check(): Can not compare parameter '%s' against the other value '%s' as it is not defined object from type %s. Please report this! Check skipped!", $objClass, $v[self::STREAMER_VAR], $condition));
                                 continue;
-                            }
-                            else {
+                            } else {
                                 $cmpPar = $this->mapping[$condition][self::STREAMER_VAR];
-                                if (isset($this->$cmpPar))
-                                    $cmp = $this->$cmpPar;
+                                if (isset($this->$cmpPar)) {
+                                                                    $cmp = $this->$cmpPar;
+                                }
                             }
 
                             if ($cmp === false) {
@@ -361,9 +364,9 @@ 
                         if (is_array($this->{$v[self::STREAMER_VAR]})) {
                             // implosion takes 2bytes, so we just assume ", " here
                             $chkstr = implode(", ", $this->{$v[self::STREAMER_VAR]});
+                        } else {
+                                                    $chkstr = $this->{$v[self::STREAMER_VAR]};
                         }
-                        else
-                            $chkstr = $this->{$v[self::STREAMER_VAR]};
 
                         if (strlen($chkstr) > $condition) {
                             ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' is longer than %d. Check failed", $objClass, $v[self::STREAMER_VAR], $condition));
@@ -376,16 +379,16 @@ 
                     // if $condition is false then the check really fails. Otherwise invalid emails are removed.
                     // if nothing is left (all emails were false), the parameter is set to condition
                     if ($rule === self::STREAMER_CHECK_EMAIL && isset($this->{$v[self::STREAMER_VAR]})) {
-                        if ($condition === false && ( (is_array($this->{$v[self::STREAMER_VAR]}) && empty($this->{$v[self::STREAMER_VAR]})) || strlen($this->{$v[self::STREAMER_VAR]}) == 0) )
-                            continue;
+                        if ($condition === false && ( (is_array($this->{$v[self::STREAMER_VAR]}) && empty($this->{$v[self::STREAMER_VAR]})) || strlen($this->{$v[self::STREAMER_VAR]}) == 0) ) {
+                                                    continue;
+                        }
 
                         $as_array = false;
 
                         if (is_array($this->{$v[self::STREAMER_VAR]})) {
                             $mails = $this->{$v[self::STREAMER_VAR]};
                             $as_array = true;
-                        }
-                        else {
+                        } else {
                             $mails = array( $this->{$v[self::STREAMER_VAR]} );
                         }
 
@@ -393,23 +396,26 @@ 
                         foreach ($mails as $mail) {
                             if (! Utils::CheckEmail($mail)) {
                                 ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): object from type %s: parameter '%s' contains an invalid email address '%s'. Address is removed.", $objClass, $v[self::STREAMER_VAR], $mail));
+                            } else {
+                                                            $output[] = $mail;
                             }
-                            else
-                                $output[] = $mail;
                         }
                         if (count($mails) != count($output)) {
-                            if ($condition === false)
-                                return false;
+                            if ($condition === false) {
+                                                            return false;
+                            }
 
                             // nothing left, use $condition as new value
-                            if (count($output) == 0)
-                                $output[] = $condition;
+                            if (count($output) == 0) {
+                                                            $output[] = $condition;
+                            }
 
                             // if we are allowed to rewrite the attribute, we do that
-                            if ($as_array)
-                                $this->{$v[self::STREAMER_VAR]} = $output;
-                            else
-                                $this->{$v[self::STREAMER_VAR]} = $output[0];
+                            if ($as_array) {
+                                                            $this->{$v[self::STREAMER_VAR]} = $output;
+                            } else {
+                                                            $this->{$v[self::STREAMER_VAR]} = $output[0];
+                            }
                         }
                     }// end STREAMER_CHECK_EMAIL
 

lib/syncobjects/synctaskrecurrence.php

Braces +6 added lines, -4 removed lines

@@ -137,11 +137,13 @@
         $ret = parent::Check($logAsDebug);
 
         // semantic checks general "turn off switch"
-        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false)
-            return $ret;
+        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
+                    return $ret;
+        }
 
-        if (!$ret)
-            return false;
+        if (!$ret) {
+                    return false;
+        }
 
         if (isset($this->start) && isset($this->until) && $this->until < $this->start) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("SyncObject->Check(): Unmet condition in object from type %s: parameter 'start' is HIGHER than 'until'. Check failed!", get_class($this) ));

lib/syncobjects/syncappointment.php

Braces +6 added lines, -4 removed lines

@@ -260,11 +260,13 @@
         $ret = parent::Check($logAsDebug);
 
         // semantic checks general "turn off switch"
-        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false)
-            return $ret;
+        if (defined("DO_SEMANTIC_CHECKS") && DO_SEMANTIC_CHECKS === false) {
+                    return $ret;
+        }
 
-        if (!$ret)
-            return false;
+        if (!$ret) {
+                    return false;
+        }
 
         if ($this->meetingstatus > 0) {
             if (!isset($this->organizername) || !isset($this->organizeremail)) {

lib/core/changesmemorywrapper.php

Braces +14 added lines, -14 removed lines

@@ -58,8 +58,9 @@ 
                     if (! $hasRights) {
                         // delete the folder only if it was an additional folder before, else ignore it
                         $synchedfolder = $this->GetFolder($addFolder->serverid);
-                        if (isset($synchedfolder->NoBackendFolder) && $synchedfolder->NoBackendFolder == true)
-                            $this->ImportFolderDeletion($addFolder);
+                        if (isset($synchedfolder->NoBackendFolder) && $synchedfolder->NoBackendFolder == true) {
+                                                    $this->ImportFolderDeletion($addFolder);
+                        }
                         continue;
                     }
                 }
@@ -85,8 +86,7 @@ 
                         ZLog::Write(LOGLEVEL_INFO, sprintf("ChangesMemoryWrapper->Config(AdditionalFolders) : previously synchronized folder '%s' is not to be synched anymore. Sending delete to mobile.", $folder->displayname));
                         $this->ImportFolderDeletion($folder);
                     }
-                }
-                else {
+                } else {
                     $folderIdsOnClient[] = $sid;
                 }
             }
@@ -173,8 +173,7 @@ 
     public function ImportMessageDeletion($id, $asSoftDelete = false) {
         if ($asSoftDelete === true) {
             $this->changes[] = array(self::SOFTDELETION, $id);
-        }
-        else {
+        } else {
             $this->changes[] = array(self::DELETION, $id);
         }
         return true;
@@ -303,12 +302,12 @@ 
             $ret = $this->destinationImporter->ImportFolderDeletion($folder);
 
             // if the operation was successful, update the HierarchyCache
-            if ($ret)
-                $this->DelFolder($id);
+            if ($ret) {
+                            $this->DelFolder($id);
+            }
 
             return $ret;
-        }
-        else {
+        } else {
             // if this folder is not in the cache, the change does not need to be streamed to the mobile
             if ($this->GetFolder($id)) {
 
@@ -363,8 +362,9 @@ 
             $change = $this->changes[$this->step];
 
             if ($change[0] == self::CHANGE) {
-                if (! $this->GetFolder($change[1]->serverid, true))
-                    $change[1]->flags = SYNC_NEWMESSAGE;
+                if (! $this->GetFolder($change[1]->serverid, true)) {
+                                    $change[1]->flags = SYNC_NEWMESSAGE;
+                }
 
                 $this->exportImporter->ImportFolderChange($change[1]);
             }
@@ -376,9 +376,9 @@ 
 
             // return progress array
             return array("steps" => count($this->changes), "progress" => $this->step);
+        } else {
+                    return false;
         }
-        else
-            return false;
     }
 
     /**

lib/core/interprocessdata.php

Braces +9 added lines, -14 removed lines

@@ -29,16 +29,16 @@ 
      * @access public
      */
     public function __construct() {
-        if (!isset($this->type) || !isset($this->allocate))
-            throw new FatalNotImplementedException(sprintf("Class InterProcessData can not be initialized. Subclass %s did not initialize type and allocable memory.", get_class($this)));
+        if (!isset($this->type) || !isset($this->allocate)) {
+                    throw new FatalNotImplementedException(sprintf("Class InterProcessData can not be initialized. Subclass %s did not initialize type and allocable memory.", get_class($this)));
+        }
 
         try {
             // ZP-987: use an own mutex + storage key for each device on non-shared-memory IPC
             // this method is not suitable for the TopCollector atm
             $type = Request::GetDeviceID();
             $this->ipcProvider = ZPush::GetRedis();
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             // ipcProvider could not initialise
             ZLog::Write(LOGLEVEL_ERROR, sprintf("%s could not initialise IPC Redis provider: %s", get_class($this), $e->getMessage()));
         }
@@ -204,8 +204,7 @@ 
         elseif ($doCas == "replace") {
             if (!$rawdata) {
                 $ok = ($this->ipcProvider->get()->hset($key, $compKey, json_encode($data)) !== false);
-            }
-            else {
+            } else {
                 $ok = $this->ipcProvider->CASHash($key, $compKey, $rawdata, json_encode($data));
             }
         }
@@ -251,16 +250,13 @@ 
         if ($returnRaw) {
             if ($_rawdata) {
                 return array(json_decode($_rawdata, true), $_rawdata);
-            }
-            else {
+            } else {
                 return array(array(), false);
             }
-        }
-        else {
+        } else {
             if ($_rawdata) {
                 return json_decode($_rawdata, true);
-            }
-            else {
+            } else {
                 return array();
             }
         }
@@ -282,8 +278,7 @@ 
             }
             if (!$subkey) {
                 $_data[$devid][$user] = $_data;
-            }
-            else {
+            } else {
                 if (!isset($_data[$devid][$user])){
                     $_data[$devid][$user] = array();
                 }

lib/core/syncparameters.php

Braces +36 added lines, -30 removed lines

@@ -67,8 +67,9 @@ 
      * @return string/boolean       false if no uuid/counter available
      */
     public function GetSyncKey() {
-        if (isset($this->uuid) && isset($this->uuidCounter))
-            return StateManager::BuildStateKey($this->uuid, $this->uuidCounter);
+        if (isset($this->uuid) && isset($this->uuidCounter)) {
+                    return StateManager::BuildStateKey($this->uuid, $this->uuidCounter);
+        }
 
         return false;
     }
@@ -124,9 +125,9 @@ 
         if (!$this->HasSyncKey()) {
             $this->uuid = $uuid;
             $this->uuidCounter = $uuidNewCounter;
+        } else if ($uuid !== $this->uuid) {
+                    throw new FatalException("SyncParameters->SetNewSyncKey(): new SyncKey must have the same UUID as current SyncKey");
         }
-        else if ($uuid !== $this->uuid)
-            throw new FatalException("SyncParameters->SetNewSyncKey(): new SyncKey must have the same UUID as current SyncKey");
 
         $this->uuidNewCounter = $uuidNewCounter;
         $this->counterconfirmed = false;
@@ -142,8 +143,9 @@ 
      * @return string/boolean       returns false if uuid or counter are not available
      */
     public function GetNewSyncKey() {
-        if (isset($this->uuid) && isset($this->uuidNewCounter))
-            return StateManager::BuildStateKey($this->uuid, $this->uuidNewCounter);
+        if (isset($this->uuid) && isset($this->uuidNewCounter)) {
+                    return StateManager::BuildStateKey($this->uuid, $this->uuidNewCounter);
+        }
 
         return false;
     }
@@ -186,14 +188,17 @@ 
      * @return boolean
      */
     public function RemoveSyncKey() {
-        if (isset($this->uuid))
-            unset($this->uuid);
+        if (isset($this->uuid)) {
+                    unset($this->uuid);
+        }
 
-        if (isset($this->uuidCounter))
-            unset($this->uuidCounter);
+        if (isset($this->uuidCounter)) {
+                    unset($this->uuidCounter);
+        }
 
-        if (isset($this->uuidNewCounter))
-            unset($this->uuidNewCounter);
+        if (isset($this->uuidNewCounter)) {
+                    unset($this->uuidNewCounter);
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, "SyncParameters->RemoveSyncKey(): saved sync key removed");
         return true;
@@ -208,8 +213,7 @@ 
     public function GetBackendFolderId() {
         if ($this->backendfolderid) {
             return $this->backendfolderid;
-        }
-        else {
+        } else {
             return $this->GetFolderId();
         }
     }
@@ -295,8 +299,7 @@ 
         // if the backend returned false as folderstat, we have to run the exporter
         if ($currentFolderStat === false || $this->confirmationChanged)  {
             $run = true;
-        }
-        else {
+        } else {
             // check if the folderstat differs from the saved one or expired
             $run = ! ($this->HasFolderStat() && $currentFolderStat === $this->GetFolderStat() && time() < $this->GetFolderStatTimeout());
         }
@@ -344,8 +347,9 @@ 
                         $options !== self::CONTACTOPTIONS &&
                         $options !== self::NOTEOPTIONS &&
                         $options !== self::TASKOPTIONS &&
-                        $options !== self::SMSOPTIONS)
-            throw new FatalNotImplementedException(sprintf("SyncParameters->isAllowedType('%s') ContentParameters is invalid. Such type is not available.", $options));
+                        $options !== self::SMSOPTIONS) {
+                     throw new FatalNotImplementedException(sprintf("SyncParameters->isAllowedType('%s') ContentParameters is invalid. Such type is not available.", $options));
+         }
 
         return true;
     }
@@ -362,23 +366,25 @@ 
      */
      private function normalizeType($options) {
         // return the requested CPO as it is defined
-        if (isset($this->contentParameters[$options]))
-            return $options;
+        if (isset($this->contentParameters[$options])) {
+                    return $options;
+        }
 
         $returnCPO = $options;
         // return email, calendar, contact or note CPO as default CPO if there no explicit default CPO defined
         if ($options == self::DEFAULTOPTIONS && !isset($this->contentParameters[self::DEFAULTOPTIONS])) {
 
-            if (isset($this->contentParameters[self::EMAILOPTIONS]))
-                $returnCPO = self::EMAILOPTIONS;
-            elseif (isset($this->contentParameters[self::CALENDAROPTIONS]))
-                $returnCPO = self::CALENDAROPTIONS;
-            elseif (isset($this->contentParameters[self::CONTACTOPTIONS]))
-                $returnCPO = self::CONTACTOPTIONS;
-            elseif (isset($this->contentParameters[self::NOTEOPTIONS]))
-                $returnCPO = self::NOTEOPTIONS;
-            elseif (isset($this->contentParameters[self::TASKOPTIONS]))
-                $returnCPO = self::TASKOPTIONS;
+            if (isset($this->contentParameters[self::EMAILOPTIONS])) {
+                            $returnCPO = self::EMAILOPTIONS;
+            } elseif (isset($this->contentParameters[self::CALENDAROPTIONS])) {
+                            $returnCPO = self::CALENDAROPTIONS;
+            } elseif (isset($this->contentParameters[self::CONTACTOPTIONS])) {
+                            $returnCPO = self::CONTACTOPTIONS;
+            } elseif (isset($this->contentParameters[self::NOTEOPTIONS])) {
+                            $returnCPO = self::NOTEOPTIONS;
+            } elseif (isset($this->contentParameters[self::TASKOPTIONS])) {
+                            $returnCPO = self::TASKOPTIONS;
+            }
 
             return $returnCPO;
         }

lib/core/synccollections.php

Braces +122 added lines, -97 removed lines

@@ -60,8 +60,7 @@ 
                 }
             }
             return true;
-        }
-        catch (ZPushException $e) {}
+        } catch (ZPushException $e) {}
         return false;
     }
 
@@ -109,20 +108,24 @@ 
 
         $invalidStates = false;
         foreach($this->stateManager->GetSynchedFolders() as $folderid) {
-            if ($overwriteLoaded === false && isset($this->collections[$folderid]))
-                continue;
+            if ($overwriteLoaded === false && isset($this->collections[$folderid])) {
+                            continue;
+            }
 
             // Load Collection!
-            if (! $this->LoadCollection($folderid, $loadState, $checkPermissions, $confirmedOnly))
-                $invalidStates = true;
+            if (! $this->LoadCollection($folderid, $loadState, $checkPermissions, $confirmedOnly)) {
+                            $invalidStates = true;
+            }
         }
 
         // load the hierarchy data - there are no permissions to verify so we just set it to false
-        if ($loadHierarchy && !$this->LoadCollection(false, $loadState, false, false))
-            throw new StatusException("Invalid states found while loading hierarchy data. Forcing hierarchy sync");
+        if ($loadHierarchy && !$this->LoadCollection(false, $loadState, false, false)) {
+                    throw new StatusException("Invalid states found while loading hierarchy data. Forcing hierarchy sync");
+        }
 
-        if ($invalidStates)
-            throw new StateInvalidException("Invalid states found while loading collections. Forcing sync");
+        if ($invalidStates) {
+                    throw new StateInvalidException("Invalid states found while loading collections. Forcing sync");
+        }
 
         return true;
     }
@@ -159,8 +162,7 @@ 
                 ZLog::Write(LOGLEVEL_DEBUG, "SyncCollections->LoadCollection(): Found collection with move state only, ignoring.");
                 return true;
             }
-        }
-        catch (StateInvalidException $sive) {
+        } catch (StateInvalidException $sive) {
             // in case there is something wrong with the state, just stop here
             // later when trying to retrieve the SyncParameters nothing will be found
 
@@ -175,8 +177,9 @@ 
         }
 
         // if this is an additional folder the backend has to be setup correctly
-        if ($checkPermissions === true && ! ZPush::GetBackend()->Setup(ZPush::GetAdditionalSyncFolderStore($spa->GetBackendFolderId())))
-            throw new StatusException(sprintf("SyncCollections->LoadCollection(): could not Setup() the backend for folder id %s/%s", $spa->GetFolderId(), $spa->GetBackendFolderId()), self::ERROR_WRONG_HIERARCHY);
+        if ($checkPermissions === true && ! ZPush::GetBackend()->Setup(ZPush::GetAdditionalSyncFolderStore($spa->GetBackendFolderId()))) {
+                    throw new StatusException(sprintf("SyncCollections->LoadCollection(): could not Setup() the backend for folder id %s/%s", $spa->GetFolderId(), $spa->GetBackendFolderId()), self::ERROR_WRONG_HIERARCHY);
+        }
 
         // add collection to object
         $addStatus = $this->AddCollection($spa);
@@ -186,8 +189,7 @@ 
             try {
                 // make sure the hierarchy cache is loaded when we are loading hierarchy states
                 $this->addparms[$folderid]["state"] = $this->stateManager->GetSyncState($spa->GetLatestSyncKey($confirmedOnly), ($folderid === false));
-            }
-            catch (StateNotFoundException $snfe) {
+            } catch (StateNotFoundException $snfe) {
                 // if we can't find the state, first we should try a sync of that folder, so
                 // we generate a fake change, so a sync on this folder is triggered
                 $this->changes[$folderid] = 1;
@@ -211,20 +213,23 @@ 
      * @return boolean
      */
     public function SaveCollection($spa) {
-        if (! $this->saveData || !$spa->HasFolderId())
-            return false;
+        if (! $this->saveData || !$spa->HasFolderId()) {
+                    return false;
+        }
 
         if ($spa->IsDataChanged()) {
             $this->loadStateManager();
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->SaveCollection(): Data of folder '%s' changed", $spa->GetFolderId()));
 
             // save new windowsize
-            if (isset($this->globalWindowSize))
-                $spa->SetWindowSize($this->globalWindowSize);
+            if (isset($this->globalWindowSize)) {
+                            $spa->SetWindowSize($this->globalWindowSize);
+            }
 
             // update latest lifetime
-            if (isset($this->refLifetime))
-                $spa->SetReferenceLifetime($this->refLifetime);
+            if (isset($this->refLifetime)) {
+                            $spa->SetReferenceLifetime($this->refLifetime);
+            }
 
             return $this->stateManager->SetSynchedFolderState($spa);
         }
@@ -240,8 +245,9 @@ 
      * @return boolean
      */
     public function AddCollection($spa) {
-        if (! $spa->HasFolderId())
-            return false;
+        if (! $spa->HasFolderId()) {
+                    return false;
+        }
 
         $this->collections[$spa->GetFolderId()] = $spa;
 
@@ -250,12 +256,14 @@ 
             $this->lastSyncTime = $spa->GetLastSyncTime();
 
             // use SyncParameters PolicyKey as reference if available
-            if ($spa->HasReferencePolicyKey())
-                $this->refPolicyKey = $spa->GetReferencePolicyKey();
+            if ($spa->HasReferencePolicyKey()) {
+                            $this->refPolicyKey = $spa->GetReferencePolicyKey();
+            }
 
             // use SyncParameters LifeTime as reference if available
-            if ($spa->HasReferenceLifetime())
-                $this->refLifetime = $spa->GetReferenceLifetime();
+            if ($spa->HasReferenceLifetime()) {
+                            $this->refLifetime = $spa->GetReferenceLifetime();
+            }
 
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->AddCollection(): Updated reference PolicyKey '%s', reference Lifetime '%s', Last sync at '%s'", $this->refPolicyKey, $this->refLifetime, $this->lastSyncTime));
         }
@@ -272,10 +280,11 @@ 
      * @return SyncParameters / boolean      false if no SyncParameters object is found for folderid
      */
     public function GetCollection($folderid) {
-        if (isset($this->collections[$folderid]))
-            return $this->collections[$folderid];
-        else
-            return false;
+        if (isset($this->collections[$folderid])) {
+                    return $this->collections[$folderid];
+        } else {
+                    return false;
+        }
     }
 
     /**
@@ -309,12 +318,14 @@ 
      * @return boolean
      */
     public function AddParameter($spa, $key, $value) {
-        if (!$spa->HasFolderId())
-            return false;
+        if (!$spa->HasFolderId()) {
+                    return false;
+        }
 
         $folderid = $spa->GetFolderId();
-        if (!isset($this->addparms[$folderid]))
-            $this->addparms[$folderid] = array();
+        if (!isset($this->addparms[$folderid])) {
+                    $this->addparms[$folderid] = array();
+        }
 
         $this->addparms[$folderid][$key] = $value;
         return true;
@@ -330,13 +341,15 @@ 
      * @return mixed            returns 'null' if nothing set
      */
     public function GetParameter($spa, $key) {
-        if (!$spa->HasFolderId())
-            return null;
+        if (!$spa->HasFolderId()) {
+                    return null;
+        }
 
-        if (isset($this->addparms[$spa->GetFolderId()]) && isset($this->addparms[$spa->GetFolderId()][$key]))
-            return $this->addparms[$spa->GetFolderId()][$key];
-        else
-            return null;
+        if (isset($this->addparms[$spa->GetFolderId()]) && isset($this->addparms[$spa->GetFolderId()][$key])) {
+                    return $this->addparms[$spa->GetFolderId()][$key];
+        } else {
+                    return null;
+        }
     }
 
     /**
@@ -375,8 +388,7 @@ 
         // take the requested global windowsize or the max 512 if not defined
         if (isset($this->globalWindowSize)) {
             $globalWindowSize = $this->globalWindowSize;
-        }
-        else {
+        } else {
             $globalWindowSize = WINDOW_SIZE_MAX; // 512 by default
         }
 
@@ -452,28 +464,31 @@ 
     public function CheckForChanges($lifetime = 600, $interval = 30, $onlyPingable = false) {
         $classes = array();
         foreach ($this->collections as $folderid => $spa){
-            if ($onlyPingable && $spa->GetPingableFlag() !== true || ! $folderid)
-                continue;
+            if ($onlyPingable && $spa->GetPingableFlag() !== true || ! $folderid) {
+                            continue;
+            }
 
             $class = $this->getPingClass($spa);
 
-            if (!isset($classes[$class]))
-                $classes[$class] = 0;
+            if (!isset($classes[$class])) {
+                            $classes[$class] = 0;
+            }
             $classes[$class] += 1;
         }
-        if (empty($classes))
-            $checkClasses = "policies only";
-        else if (array_sum($classes) > 4) {
+        if (empty($classes)) {
+                    $checkClasses = "policies only";
+        } else if (array_sum($classes) > 4) {
             $checkClasses = "";
             foreach($classes as $class=>$count) {
-                if ($count == 1)
-                    $checkClasses .= sprintf("%s ", $class);
-                else
-                    $checkClasses .= sprintf("%s(%d) ", $class, $count);
+                if ($count == 1) {
+                                    $checkClasses .= sprintf("%s ", $class);
+                } else {
+                                    $checkClasses .= sprintf("%s(%d) ", $class, $count);
+                }
             }
+        } else {
+                    $checkClasses = implode(" ", array_keys($classes));
         }
-        else
-            $checkClasses = implode(" ", array_keys($classes));
 
         $pingTracking = new PingTracking();
         $this->changes = array();
@@ -489,8 +504,9 @@ 
         if (!empty($classes)) {
             // initialize all possible folders
             foreach ($this->collections as $folderid => $spa) {
-                if (($onlyPingable && $spa->GetPingableFlag() !== true) || ! $folderid)
-                    continue;
+                if (($onlyPingable && $spa->GetPingableFlag() !== true) || ! $folderid) {
+                                    continue;
+                }
 
                 $backendFolderId = $spa->GetBackendFolderId();
 
@@ -500,8 +516,9 @@ 
                 // initialize sink if no immediate changes were found so far
                 if ($changesSink && empty($this->changes)) {
                     ZPush::GetBackend()->Setup($store);
-                    if (! ZPush::GetBackend()->ChangesSinkInitialize($backendFolderId))
-                        throw new StatusException(sprintf("Error initializing ChangesSink for folder id %s/%s", $folderid, $backendFolderId), self::ERROR_WRONG_HIERARCHY);
+                    if (! ZPush::GetBackend()->ChangesSinkInitialize($backendFolderId)) {
+                                            throw new StatusException(sprintf("Error initializing ChangesSink for folder id %s/%s", $folderid, $backendFolderId), self::ERROR_WRONG_HIERARCHY);
+                    }
                 }
 
                 // check if the folder stat changed since the last sync, if so generate a change for it (only on first run)
@@ -533,18 +550,21 @@ 
 
             $nextInterval = $interval;
             // we should not block longer than the lifetime
-            if ($endat - $now < $nextInterval)
-                $nextInterval = $endat - $now;
+            if ($endat - $now < $nextInterval) {
+                            $nextInterval = $endat - $now;
+            }
 
             // Check if provisioning is necessary
             // if a PolicyKey was sent use it. If not, compare with the ReferencePolicyKey
-            if (PROVISIONING === true && $policyKey !== false && ZPush::GetProvisioningManager()->ProvisioningRequired($policyKey, true, false))
-                // the hierarchysync forces provisioning
+            if (PROVISIONING === true && $policyKey !== false && ZPush::GetProvisioningManager()->ProvisioningRequired($policyKey, true, false)) {
+                            // the hierarchysync forces provisioning
                 throw new StatusException("SyncCollections->CheckForChanges(): Policies or PolicyKey changed. Provisioning required.", self::ERROR_WRONG_HIERARCHY);
+            }
 
             // Check if a hierarchy sync is necessary
-            if ($this->countHierarchyChange())
-                throw new StatusException("SyncCollections->CheckForChanges(): HierarchySync required.", self::HIERARCHY_CHANGED);
+            if ($this->countHierarchyChange()) {
+                            throw new StatusException("SyncCollections->CheckForChanges(): HierarchySync required.", self::HIERARCHY_CHANGED);
+            }
 
             // Check if there are newer requests
             // If so, this process should be terminated if more than 60 secs to go
@@ -577,8 +597,7 @@ 
                         if ($this->countHierarchyChange(true)) {
                             throw new StatusException("SyncCollections->CheckForChanges(): HierarchySync required.", self::HIERARCHY_CHANGED);
                         }
-                    }
-                    else {
+                    } else {
                         // the backend will notify on the backend folderid
                         $folderid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($backendFolderId);
 
@@ -587,14 +606,14 @@ 
                             ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s'", $folderid));
                             $validNotifications = true;
                             $this->waitingTime = time()-$started;
-                        }
-                        else {
+                        } else {
                             ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Notification received on folder '%s', but it is not relevant", $folderid));
                         }
                     }
                 }
-                if ($validNotifications)
-                    return true;
+                if ($validNotifications) {
+                                    return true;
+                }
             }
             // use polling mechanism
             else {
@@ -602,8 +621,7 @@ 
                 if ($this->CountChanges($onlyPingable)) {
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->CheckForChanges(): Found changes polling"));
                     return true;
-                }
-                else {
+                } else {
                     sleep($nextInterval);
                 }
             } // end polling
@@ -625,14 +643,17 @@ 
     public function CountChanges($onlyPingable = false) {
         $changesAvailable = false;
         foreach ($this->collections as $folderid => $spa) {
-            if ($onlyPingable && $spa->GetPingableFlag() !== true)
-                continue;
+            if ($onlyPingable && $spa->GetPingableFlag() !== true) {
+                            continue;
+            }
 
-            if (isset($this->addparms[$spa->GetFolderId()]["status"]) && $this->addparms[$spa->GetFolderId()]["status"] != SYNC_STATUS_SUCCESS)
-                continue;
+            if (isset($this->addparms[$spa->GetFolderId()]["status"]) && $this->addparms[$spa->GetFolderId()]["status"] != SYNC_STATUS_SUCCESS) {
+                            continue;
+            }
 
-            if ($this->CountChange($folderid))
-                $changesAvailable = true;
+            if ($this->CountChange($folderid)) {
+                            $changesAvailable = true;
+            }
         }
 
         return $changesAvailable;
@@ -667,11 +688,11 @@ 
                 $exporter->ConfigContentParameters($spa->GetCPO());
                 $ret = $exporter->InitializeExporter($importer);
 
-                if ($ret !== false)
-                    $changecount = $exporter->GetChangeCount();
+                if ($ret !== false) {
+                                    $changecount = $exporter->GetChangeCount();
+                }
             }
-        }
-        catch (StatusException $ste) {
+        } catch (StatusException $ste) {
             if ($ste->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) {
                 ZLog::Write(LOGLEVEL_WARN, "SyncCollections->CountChange(): exporter can not be re-configured due to state error, emulating change in folder to force Sync.");
                 $this->changes[$folderid] = 1;
@@ -684,8 +705,9 @@ 
         }
 
         // start over if exporter can not be configured atm
-        if ($changecount === false)
-            ZLog::Write(LOGLEVEL_WARN, "SyncCollections->CountChange(): no changes received from Exporter.");
+        if ($changecount === false) {
+                    ZLog::Write(LOGLEVEL_WARN, "SyncCollections->CountChange(): no changes received from Exporter.");
+        }
 
         $this->changes[$folderid] = $changecount;
 
@@ -714,8 +736,9 @@ 
          if ($exportChanges || $this->hierarchyExporterChecked === false) {
              try {
                  // if this is a validation (not first run), make sure to load the hierarchy data again
-                 if ($this->hierarchyExporterChecked === true && !$this->LoadCollection(false, true, false))
-                     throw new StatusException("Invalid states found while re-loading hierarchy data.");
+                 if ($this->hierarchyExporterChecked === true && !$this->LoadCollection(false, true, false)) {
+                                      throw new StatusException("Invalid states found while re-loading hierarchy data.");
+                 }
 
 
                  $changesMem = ZPush::GetDeviceManager()->GetHierarchyChangesWrapper();
@@ -730,19 +753,20 @@ 
                      $ret = $exporter->InitializeExporter($changesMem);
                      while(is_array($exporter->Synchronize()));
 
-                     if ($ret !== false)
-                         $changecount = $changesMem->GetChangeCount();
+                     if ($ret !== false) {
+                                              $changecount = $changesMem->GetChangeCount();
+                     }
 
                      $this->hierarchyExporterChecked = true;
                  }
-             }
-             catch (StatusException $ste) {
+             } catch (StatusException $ste) {
                  throw new StatusException("SyncCollections->countHierarchyChange(): exporter can not be re-configured.", self::ERROR_WRONG_HIERARCHY, null, LOGLEVEL_WARN);
              }
 
              // start over if exporter can not be configured atm
-             if ($changecount === false )
-                 ZLog::Write(LOGLEVEL_WARN, "SyncCollections->countHierarchyChange(): no changes received from Exporter.");
+             if ($changecount === false ) {
+                              ZLog::Write(LOGLEVEL_WARN, "SyncCollections->countHierarchyChange(): no changes received from Exporter.");
+             }
          }
          return ($changecount > 0);
      }
@@ -874,8 +898,9 @@ 
      * @return
      */
      private function loadStateManager() {
-         if (!isset($this->stateManager))
-            $this->stateManager = ZPush::GetDeviceManager()->GetStateManager();
+         if (!isset($this->stateManager)) {
+                     $this->stateManager = ZPush::GetDeviceManager()->GetStateManager();
+         }
      }
 
      /**