grommunio / grommunio-sync

lib/core/streamer.php

Braces +97 added lines, -94 removed lines

@@ -77,14 +77,11 @@ 
                     $map = $this->mapping[$entity[EN_TAG]];
                     if (isset($map[self::STREAMER_ARRAY])) {
                         $this->{$map[self::STREAMER_VAR]} = array();
-                    }
-                    else if (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
+                    } else if (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
                         $this->{$map[self::STREAMER_VAR]} = "1";
-                    }
-                    else if(!isset($map[self::STREAMER_TYPE])) {
+                    } else if(!isset($map[self::STREAMER_TYPE])) {
                         $this->{$map[self::STREAMER_VAR]} = "";
-                    }
-                    else if ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES ) {
+                    } else if ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES ) {
                         $this->{$map[self::STREAMER_VAR]} = "";
                     }
                     continue;
@@ -94,8 +91,7 @@ 
                     // This tag shouldn't be here, abort
                     ZLog::Write(LOGLEVEL_WBXMLSTACK, sprintf("Tag '%s' unexpected in type XML type '%s'", $entity[EN_TAG], get_class($this)));
                     return false;
-                }
-                else {
+                } else {
                     $map = $this->mapping[$entity[EN_TAG]];
 
                     // Handle an array
@@ -104,25 +100,28 @@ 
                         while(WBXMLDecoder::InWhile("decodeArray")) {
                             //do not get start tag for an array without a container
                             if (!(isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_NO_CONTAINER)) {
-                                if(!$decoder->getElementStartTag($map[self::STREAMER_ARRAY]))
-                                    break;
+                                if(!$decoder->getElementStartTag($map[self::STREAMER_ARRAY])) {
+                                                                    break;
+                                }
                             }
                             if(isset($map[self::STREAMER_TYPE])) {
                                 $decoded = new $map[self::STREAMER_TYPE];
 
                                 $decoded->Decode($decoder);
-                            }
-                            else {
+                            } else {
                                 $decoded = $decoder->getElementContent();
                             }
 
-                            if(!isset($this->{$map[self::STREAMER_VAR]}))
-                                $this->{$map[self::STREAMER_VAR]} = array($decoded);
-                            else
-                                array_push($this->{$map[self::STREAMER_VAR]}, $decoded);
+                            if(!isset($this->{$map[self::STREAMER_VAR]})) {
+                                                            $this->{$map[self::STREAMER_VAR]} = array($decoded);
+                            } else {
+                                                            array_push($this->{$map[self::STREAMER_VAR]}, $decoded);
+                            }
 
-                            if(!$decoder->getElementEndTag()) //end tag of a container element
+                            if(!$decoder->getElementEndTag()) {
+                                //end tag of a container element
                                 return false;
+                            }
 
                             if (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_NO_CONTAINER) {
                                 $e = $decoder->peek();
@@ -131,47 +130,52 @@ 
                                     continue 2;
                                 }
                                 //break on end tag because no container elements block end is reached
-                                if ($e[EN_TYPE] == EN_TYPE_ENDTAG)
-                                    break;
-                                if (empty($e))
-                                    break;
+                                if ($e[EN_TYPE] == EN_TYPE_ENDTAG) {
+                                                                    break;
+                                }
+                                if (empty($e)) {
+                                                                    break;
+                                }
                             }
                         }
                         //do not get end tag for an array without a container
                         if (!(isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_NO_CONTAINER)) {
-                            if(!$decoder->getElementEndTag()) //end tag of container
+                            if(!$decoder->getElementEndTag()) {
+                                //end tag of container
                                 return false;
+                            }
                         }
-                    }
-                    else { // Handle single value
+                    } else { // Handle single value
                         if(isset($map[self::STREAMER_TYPE])) {
                             // Complex type, decode recursively
                             if($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES) {
                                 $decoded = $this->parseDate($decoder->getElementContent());
-                                if(!$decoder->getElementEndTag())
-                                    return false;
-                            }
-                            else if($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
+                                if(!$decoder->getElementEndTag()) {
+                                                                    return false;
+                                }
+                            } else if($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
                                 $decoded = hex2bin($decoder->getElementContent());
-                                if(!$decoder->getElementEndTag())
-                                    return false;
+                                if(!$decoder->getElementEndTag()) {
+                                                                    return false;
+                                }
                             }
                             // explode comma or semicolon strings into arrays
                             else if($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_COMMA_SEPARATED || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_SEMICOLON_SEPARATED) {
                                 $glue = ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_COMMA_SEPARATED)?", ":"; ";
                                 $decoded = explode($glue, $decoder->getElementContent());
-                                if(!$decoder->getElementEndTag())
-                                    return false;
-                            }
-                            else if($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
+                                if(!$decoder->getElementEndTag()) {
+                                                                    return false;
+                                }
+                            } else if($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
                                 $decoded = StringStreamWrapper::Open($decoder->getElementContent());
-                                if(!$decoder->getElementEndTag())
-                                    return false;
-                            }
-                            else {
+                                if(!$decoder->getElementEndTag()) {
+                                                                    return false;
+                                }
+                            } else {
                                 $subdecoder = new $map[self::STREAMER_TYPE]();
-                                if($subdecoder->Decode($decoder) === false)
-                                    return false;
+                                if($subdecoder->Decode($decoder) === false) {
+                                                                    return false;
+                                }
 
                                 $decoded = $subdecoder;
 
@@ -180,8 +184,7 @@ 
                                     return false;
                                 }
                             }
-                        }
-                        else {
+                        } else {
                             // Simple type, just get content
                             $decoded = $decoder->getElementContent();
 
@@ -200,12 +203,10 @@ 
                         $this->{$map[self::STREAMER_VAR]} = $decoded;
                     }
                 }
-            }
-            else if($entity[EN_TYPE] == EN_TYPE_ENDTAG) {
+            } else if($entity[EN_TYPE] == EN_TYPE_ENDTAG) {
                 $decoder->ungetElement($entity);
                 break;
-            }
-            else {
+            } else {
                 ZLog::Write(LOGLEVEL_WBXMLSTACK, "Unexpected content in type");
                 break;
             }
@@ -232,30 +233,30 @@ 
                         $res = $this->{$map[self::STREAMER_VAR]}->Encode($encoder);
                         $encoder->endTag();
                         // nothing was streamed in previous encode but it should be streamed empty anyway
-                        if (!$res && isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY)
-                            $encoder->startTag($tag, false, true);
+                        if (!$res && isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
+                                                    $encoder->startTag($tag, false, true);
+                        }
+                    } else {
+                                            ZLog::Write(LOGLEVEL_ERROR, sprintf("Streamer->Encode(): parameter '%s' of object %s is not of type Streamer", $map[self::STREAMER_VAR], get_class($this)));
                     }
-                    else
-                        ZLog::Write(LOGLEVEL_ERROR, sprintf("Streamer->Encode(): parameter '%s' of object %s is not of type Streamer", $map[self::STREAMER_VAR], get_class($this)));
                 }
                 // Array of objects
                 else if(isset($map[self::STREAMER_ARRAY])) {
                     if (empty($this->{$map[self::STREAMER_VAR]}) && isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
                         $encoder->startTag($tag, false, true);
-                    }
-                    else {
+                    } else {
                         // Outputs array container (eg Attachments)
                         // Do not output start and end tag when type is STREAMER_TYPE_NO_CONTAINER
-                        if (!isset($map[self::STREAMER_PROP]) || $map[self::STREAMER_PROP] != self::STREAMER_TYPE_NO_CONTAINER)
-                            $encoder->startTag($tag);
+                        if (!isset($map[self::STREAMER_PROP]) || $map[self::STREAMER_PROP] != self::STREAMER_TYPE_NO_CONTAINER) {
+                                                    $encoder->startTag($tag);
+                        }
 
                         foreach ($this->{$map[self::STREAMER_VAR]} as $element) {
                             if(is_object($element)) {
                                 $encoder->startTag($map[self::STREAMER_ARRAY]); // Outputs object container (eg Attachment)
                                 $element->Encode($encoder);
                                 $encoder->endTag();
-                            }
-                            else {
+                            } else {
                                 if(strlen($element) == 0)
                                       // Do not output empty items. Not sure if we should output an empty tag with $encoder->startTag($map[self::STREAMER_ARRAY], false, true);
                                       ;
@@ -268,11 +269,11 @@ 
                             }
                         }
 
-                        if  (!isset($map[self::STREAMER_PROP]) || $map[self::STREAMER_PROP] != self::STREAMER_TYPE_NO_CONTAINER)
-                            $encoder->endTag();
+                        if  (!isset($map[self::STREAMER_PROP]) || $map[self::STREAMER_PROP] != self::STREAMER_TYPE_NO_CONTAINER) {
+                                                    $encoder->endTag();
+                        }
                     }
-                }
-                else {
+                } else {
                     if(isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_IGNORE) {
                         continue;
                     }
@@ -288,25 +289,26 @@ 
                     // Simple type
                     if(!isset($map[self::STREAMER_TYPE]) && strlen($this->{$map[self::STREAMER_VAR]}) == 0) {
                         // send empty tags
-                        if (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY)
-                            $encoder->startTag($tag, false, true);
+                        if (isset($map[self::STREAMER_PROP]) && $map[self::STREAMER_PROP] == self::STREAMER_TYPE_SEND_EMPTY) {
+                                                    $encoder->startTag($tag, false, true);
+                        }
 
                         // Do not output empty items. See above: $encoder->startTag($tag, false, true);
                         continue;
-                    } else
-                        $encoder->startTag($tag);
+                    } else {
+                                            $encoder->startTag($tag);
+                    }
 
                     if(isset($map[self::STREAMER_TYPE]) && ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES)) {
-                        if($this->{$map[self::STREAMER_VAR]} != 0) // don't output 1-1-1970
+                        if($this->{$map[self::STREAMER_VAR]} != 0) {
+                            // don't output 1-1-1970
                             $encoder->content($this->formatDate($this->{$map[self::STREAMER_VAR]}, $map[self::STREAMER_TYPE]));
-                    }
-                    else if(isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
+                        }
+                    } else if(isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_HEX) {
                         $encoder->content(strtoupper(bin2hex($this->{$map[self::STREAMER_VAR]})));
-                    }
-                    else if(isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
+                    } else if(isset($map[self::STREAMER_TYPE]) && $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
                         $encoder->contentStream($this->{$map[self::STREAMER_VAR]}, false);
-                    }
-                    else if(isset($map[self::STREAMER_TYPE]) && ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASBASE64 || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM)) {
+                    } else if(isset($map[self::STREAMER_TYPE]) && ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASBASE64 || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM)) {
                         $encoder->contentStream($this->{$map[self::STREAMER_VAR]}, true);
                     }
                     // implode comma or semicolon arrays into a string
@@ -314,8 +316,7 @@ 
                         ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_COMMA_SEPARATED || $map[self::STREAMER_TYPE] == self::STREAMER_TYPE_SEMICOLON_SEPARATED)) {
                         $glue = ($map[self::STREAMER_TYPE] == self::STREAMER_TYPE_COMMA_SEPARATED)?", ":"; ";
                         $encoder->content(implode($glue, $this->{$map[self::STREAMER_VAR]}));
-                    }
-                    else {
+                    } else {
                         $encoder->content($this->{$map[self::STREAMER_VAR]});
                     }
                     $encoder->endTag();
@@ -324,8 +325,9 @@ 
             }
         }
         // Output our own content
-        if(isset($this->content))
-            $encoder->content($this->content);
+        if(isset($this->content)) {
+                    $encoder->content($this->content);
+        }
 
         return $streamed;
     }
@@ -341,27 +343,22 @@ 
             if (isset($this->{$v[self::STREAMER_VAR]})) {
                 if (is_object($this->{$v[self::STREAMER_VAR]}) && method_exists($this->{$v[self::STREAMER_VAR]}, "StripData") ) {
                     $this->{$v[self::STREAMER_VAR]}->StripData($flags);
-                }
-                else if (isset($v[self::STREAMER_ARRAY]) && !empty($this->{$v[self::STREAMER_VAR]})) {
+                } else if (isset($v[self::STREAMER_ARRAY]) && !empty($this->{$v[self::STREAMER_VAR]})) {
                     foreach ($this->{$v[self::STREAMER_VAR]} as $element) {
                         if (is_object($element) && method_exists($element, "StripData") ) {
                             $element->StripData($flags);
-                        }
-                        elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
+                        } elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
                             if ($v[self::STREAMER_PRIVATE] !== true) {
                                 $this->{$v[self::STREAMER_VAR]} = $v[self::STREAMER_PRIVATE];
-                            }
-                            else {
+                            } else {
                                 unset($this->{$v[self::STREAMER_VAR]});
                             }
                         }
                     }
-                }
-                elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
+                } elseif ($flags === Streamer::STRIP_PRIVATE_DATA && isset($v[self::STREAMER_PRIVATE])) {
                     if ($v[self::STREAMER_PRIVATE] !== true) {
                         $this->{$v[self::STREAMER_VAR]} = $v[self::STREAMER_PRIVATE];
-                    }
-                    else {
+                    } else {
                         unset($this->{$v[self::STREAMER_VAR]});
                     }
                 }
@@ -423,8 +420,7 @@ 
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("Streamer->jsonDeserialize(): top class '%s'", $v->gsSyncStateClass));
                 $this->$k = new $v->gsSyncStateClass;
                 $this->$k->jsonDeserialize($v);
-            }
-            else {
+            } else {
                 $this->$k = $v;
             }
         }
@@ -448,10 +444,11 @@ 
      * @return string
      */
     private function formatDate($ts, $type) {
-        if($type == self::STREAMER_TYPE_DATE)
-            return gmstrftime("%Y%m%dT%H%M%SZ", $ts);
-        else if($type == self::STREAMER_TYPE_DATE_DASHES)
-            return gmstrftime("%Y-%m-%dT%H:%M:%S.000Z", $ts);
+        if($type == self::STREAMER_TYPE_DATE) {
+                    return gmstrftime("%Y%m%dT%H%M%SZ", $ts);
+        } else if($type == self::STREAMER_TYPE_DATE_DASHES) {
+                    return gmstrftime("%Y-%m-%dT%H:%M:%S.000Z", $ts);
+        }
         // fallback to dashes (should never be reached)
         return gmstrftime("%Y-%m-%dT%H:%M:%S.000Z", $ts);
     }
@@ -473,9 +470,15 @@ 
                 $matches[5] = $matches[6] = $matches[7] = 0;
             }
 
-            if (!isset($matches[5])) $matches[5] = 0;
-            if (!isset($matches[6])) $matches[6] = 0;
-            if (!isset($matches[7])) $matches[7] = 0;
+            if (!isset($matches[5])) {
+                $matches[5] = 0;
+            }
+            if (!isset($matches[6])) {
+                $matches[6] = 0;
+            }
+            if (!isset($matches[7])) {
+                $matches[7] = 0;
+            }
 
             return gmmktime($matches[5], $matches[6], $matches[7], $matches[2], $matches[3], $matches[1]);
         }

lib/core/loopdetection.php

Braces +77 added lines, -67 removed lines

@@ -71,8 +71,9 @@ 
      * @return string
      */
     public static function GetProcessIdentifier() {
-        if (!isset(self::$processident))
-            self::$processident = sprintf('%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+        if (!isset(self::$processident)) {
+                    self::$processident = sprintf('%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+        }
 
         return self::$processident;
     }
@@ -107,8 +108,9 @@ 
         // generate entry if not already there
         self::GetProcessEntry();
 
-        if (!isset(self::$processentry['stat']))
-            self::$processentry['stat'] = array();
+        if (!isset(self::$processentry['stat'])) {
+                    self::$processentry['stat'] = array();
+        }
 
         self::$processentry['stat'][get_class($exception)] = $exception->getCode();
 
@@ -130,11 +132,13 @@ 
         // generate entry if not already there
         self::GetProcessEntry();
 
-        if ($folderid === false)
-            $folderid = "hierarchy";
+        if ($folderid === false) {
+                    $folderid = "hierarchy";
+        }
 
-        if (!isset(self::$processentry['stat']))
-            self::$processentry['stat'] = array();
+        if (!isset(self::$processentry['stat'])) {
+                    self::$processentry['stat'] = array();
+        }
 
         self::$processentry['stat'][$folderid] = $status;
 
@@ -257,8 +261,9 @@ 
                             ($se['cc'] == ZPush::COMMAND_SYNC && $value == SYNC_STATUS_SUCCESS) ) {
                             continue;
                         }
-                        if (!isset($seenFailed[$key]))
-                            $seenFailed[$key] = 0;
+                        if (!isset($seenFailed[$key])) {
+                                                    $seenFailed[$key] = 0;
+                        }
                         $seenFailed[$key]++;
                         ZLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->ProcessLoopDetectionIsHierarchyResyncRequired(): seen command with Exception or folderid '%s' and code '%s'", $key, $value ));
                     }
@@ -269,11 +274,11 @@ 
                     if (isset($se['stat']) && isset($se['stat']['hierarchy']) && $se['stat']['hierarchy'] == SYNC_FSSTATUS_SYNCKEYERROR) {
                         ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->ProcessLoopDetectionIsHierarchyResyncRequired(): a full FolderReSync was already requested. Resetting fail counter.");
                         $seenFailed = array();
-                    }
-                    else {
+                    } else {
                         $seenFolderSync = true;
-                        if (!empty($seenFailed))
-                            ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->ProcessLoopDetectionIsHierarchyResyncRequired(): seen FolderSync after other failing command");
+                        if (!empty($seenFailed)) {
+                                                    ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->ProcessLoopDetectionIsHierarchyResyncRequired(): seen FolderSync after other failing command");
+                        }
                     }
                 }
             }
@@ -281,8 +286,9 @@ 
 
         $filtered = array();
         foreach ($seenFailed as $k => $count) {
-            if ($count>1)
-                $filtered[] = $k;
+            if ($count>1) {
+                            $filtered[] = $k;
+            }
         }
 
         if ($seenFolderSync && !empty($filtered)) {
@@ -360,18 +366,19 @@ 
             foreach ($stack as $entry) {
                 if ($entry['id'] != $updateentry['id']) {
                     $nstack[] = $entry;
-                }
-                else {
+                } else {
                     $nstack[] = $updateentry;
                     $found = true;
                 }
             }
 
-            if (!$found)
-                $nstack[] = $updateentry;
+            if (!$found) {
+                            $nstack[] = $updateentry;
+            }
 
-            if (count($nstack) > 10)
-                $nstack = array_slice($nstack, -10, 10);
+            if (count($nstack) > 10) {
+                            $nstack = array_slice($nstack, -10, 10);
+            }
 
             // update loop data
             $ok = $this->setDeviceUserData($this->type, $nstack, parent::$devid, parent::$user, self::INTERPROCESSLD, $doCas="replace", $stackRaw);
@@ -418,8 +425,9 @@ 
      * @return boolean
      */
     public function SetBrokenMessage($folderid, $id) {
-        if ($folderid == false || !isset($this->broken_message_uuid) || !isset($this->broken_message_counter) || $this->broken_message_uuid == false || $this->broken_message_counter == false)
-            return false;
+        if ($folderid == false || !isset($this->broken_message_uuid) || !isset($this->broken_message_counter) || $this->broken_message_uuid == false || $this->broken_message_counter == false) {
+                    return false;
+        }
 
         $ok = false;
         $brokenkey = self::BROKENMSGS ."-". $folderid;
@@ -456,8 +464,9 @@ 
      * @return array
      */
     public function GetSyncedButBeforeIgnoredMessages($folderid) {
-        if ($folderid == false || !isset($this->broken_message_uuid) || !isset($this->broken_message_counter) || $this->broken_message_uuid == false || $this->broken_message_counter == false)
-            return array();
+        if ($folderid == false || !isset($this->broken_message_uuid) || !isset($this->broken_message_counter) || $this->broken_message_uuid == false || $this->broken_message_counter == false) {
+                    return array();
+        }
 
         $brokenkey = self::BROKENMSGS ."-". $folderid;
         $removeIds = array();
@@ -473,8 +482,7 @@ 
 
             if (empty($brokenmsgs)) {
                 break;
-            }
-            else {
+            } else {
                 foreach ($brokenmsgs as $id => $data) {
                     // previously broken message was successfully synced!
                     if ($data['uuid'] == $this->broken_message_uuid && $data['counter'] < $this->broken_message_counter) {
@@ -498,8 +506,7 @@ 
                     $this->delDeviceUserData($this->type, parent::$devid, parent::$user, $brokenkey);
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->GetSyncedButBeforeIgnoredMessages('%s'): removed folder from tracking of ignored messages", $folderid));
                     break;
-                }
-                else {
+                } else {
                     // update data
                     $ok = $this->setDeviceUserData($this->type, $brokenmsgs, parent::$devid, parent::$user, $brokenkey, $doCas="replace", $brokenmsgsRaw);
                     if (!$ok) {
@@ -585,8 +592,7 @@ 
             if (!isset($current["uuid"]) || $current["uuid"] != $uuid) {
                 ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->IsSyncStateObsolete(): yes, uuid changed or not set");
                 $obsolete = true;
-            }
-            else {
+            } else {
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->IsSyncStateObsolete(): check folderid: '%s' uuid '%s' counter: %d - last counter: %d with %d queued",
                         $folderid, $uuid, $counter, $current["count"], $current["queued"]));
 
@@ -600,8 +606,7 @@ 
                     $obsolete = true;
                 }
             }
-        }
-        else {
+        } else {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->IsSyncStateObsolete(): check folderid: '%s' uuid '%s' counter: %d - no data found: not obsolete", $folderid, $uuid, $counter));
         }
 
@@ -661,8 +666,9 @@ 
             list($current, $currentRaw) = $this->getDeviceUserData($this->type, parent::$devid, parent::$user, $folderid, true);
 
             // completely new/unknown UUID
-            if (empty($current))
-                $current = array("uuid" => $uuid, "count" => $counter-1, "queued" => $queuedMessages);
+            if (empty($current)) {
+                            $current = array("uuid" => $uuid, "count" => $counter-1, "queued" => $queuedMessages);
+            }
 
             // old UUID in cache - the device requested a new state!!
             if (isset($current['uuid']) && $current['uuid'] != $uuid ) {
@@ -675,8 +681,7 @@ 
                     ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): UUID changed and while items where sent to device - forcing loop mode");
                     $loop = true; // force loop mode
                     $current['queued'] = $queuedMessages;
-                }
-                else {
+                } else {
                     $current['queued'] = 0;
                 }
 
@@ -700,8 +705,9 @@ 
                     // case 1.1
                     $current['count'] = $counter;
                     $current['queued'] = $queuedMessages;
-                    if (isset($current["usage"]) && $current["usage"] < $current['count'])
-                        unset($current["usage"]);
+                    if (isset($current["usage"]) && $current["usage"] < $current['count']) {
+                                            unset($current["usage"]);
+                    }
 
                     // case 1.2
                     if (isset($current['maxCount'])) {
@@ -729,8 +735,9 @@ 
                 // case 2 - same counter, but there were no changes before and are there now
                 else if ($current['count'] == $counter && $current['queued'] == 0 && $queuedMessages > 0) {
                     $current['queued'] = $queuedMessages;
-                    if (isset($current["usage"]) && $current["usage"] < $current['count'])
-                        unset($current["usage"]);
+                    if (isset($current["usage"]) && $current["usage"] < $current['count']) {
+                                            unset($current["usage"]);
+                    }
                 }
 
                 // case 3 - same counter, changes sent before, hanging loop and ignoring
@@ -746,8 +753,7 @@ 
                             // return suggested new window size
                             $current['windowLimit'] = 25;
                             $loop = $current['windowLimit'];
-                        }
-                        else {
+                        } else {
                             // case 3.1) we have just encountered a loop!
                             ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): case 3.1 detected - loop detected, init loop mode");
                             if (isset($current['windowLimit'])) {
@@ -759,8 +765,7 @@ 
                             $current['maxCount'] = $counter + (($maxItems < $queuedMessages) ? $maxItems : $queuedMessages);
                             $loop = true;   // loop mode!!
                         }
-                    }
-                    else if ($queuedMessages == 0) {
+                    } else if ($queuedMessages == 0) {
                         // case 3.2) there was a loop before but now the changes are GONE
                         ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): case 3.2 detected - changes gone - clearing loop data");
                         $current['queued'] = 0;
@@ -769,8 +774,7 @@ 
                         unset($current['maxCount']);
                         unset($current['potential']);
                         unset($current['windowLimit']);
-                    }
-                    else {
+                    } else {
                         // case 3.3) still looping the same message! Increase counter
                         ZLog::Write(LOGLEVEL_DEBUG, "LoopDetection->Detect(): case 3.3 detected - in loop mode, increase loop counter");
                         $current['loopcount']++;
@@ -786,8 +790,9 @@ 
                 }
 
             }
-            if (isset($current['loopcount']))
-                ZLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->Detect(): loop data: loopcount(%d), maxCount(%d), queued(%d), ignored(%s)", $current['loopcount'], $current['maxCount'], $current['queued'], (isset($current['ignored'])?$current['ignored']:'false')));
+            if (isset($current['loopcount'])) {
+                            ZLog::Write(LOGLEVEL_DEBUG, sprintf("LoopDetection->Detect(): loop data: loopcount(%d), maxCount(%d), queued(%d), ignored(%s)", $current['loopcount'], $current['maxCount'], $current['queued'], (isset($current['ignored'])?$current['ignored']:'false')));
+            }
 
             // update loop data
             $ok = $this->setDeviceUserData($this->type, $current, parent::$devid, parent::$user, $folderid, $doCas="replace", $currentRaw);
@@ -824,11 +829,13 @@ 
 
         $potentialBroken = false;
         $realBroken = false;
-        if (Request::GetCommandCode() == ZPush::COMMAND_SYNC && $this->ignore_messageid !== false)
-            $potentialBroken = true;
+        if (Request::GetCommandCode() == ZPush::COMMAND_SYNC && $this->ignore_messageid !== false) {
+                    $potentialBroken = true;
+        }
 
-        if ($messageid !== false && $this->ignore_messageid == $messageid)
-            $realBroken = true;
+        if ($messageid !== false && $this->ignore_messageid == $messageid) {
+                    $realBroken = true;
+        }
 
         // this call is just to know what should be happening
         // no further actions necessary
@@ -892,8 +899,9 @@ 
             }
         }
 
-        if ($realBroken)
-            ZPush::GetTopCollector()->AnnounceInformation("Broken message ignored", true);
+        if ($realBroken) {
+                    ZPush::GetTopCollector()->AnnounceInformation("Broken message ignored", true);
+        }
 
         return $realBroken;
     }
@@ -915,19 +923,20 @@ 
         if ($this->blockMutex()) {
             $loopdata = ($this->hasData()) ? $this->getData() : array();
 
-            if ($user == false && $devid == false)
-                $loopdata = array();
-            elseif ($user == false && $devid != false)
-                $loopdata[$devid] = array();
-            elseif ($user != false && $devid != false)
-                $loopdata[$devid][$user] = array();
-            elseif ($user != false && $devid == false) {
+            if ($user == false && $devid == false) {
+                            $loopdata = array();
+            } elseif ($user == false && $devid != false) {
+                            $loopdata[$devid] = array();
+            } elseif ($user != false && $devid != false) {
+                            $loopdata[$devid][$user] = array();
+            } elseif ($user != false && $devid == false) {
                 ZLog::Write(LOGLEVEL_WARN, sprintf("Not possible to reset loop detection data for user '%s' without a specifying a device id", $user));
                 $stat = false;
             }
 
-            if ($stat)
-                $ok = $this->setData($loopdata);
+            if ($stat) {
+                            $ok = $this->setData($loopdata);
+            }
 
             $this->releaseMutex();
         }
@@ -955,8 +964,9 @@ 
             $this->releaseMutex();
         }
         // end exclusive block
-        if (isset($loopdata) && isset($loopdata[$devid]) && isset($loopdata[$devid][$user]))
-            return $loopdata[$devid][$user];
+        if (isset($loopdata) && isset($loopdata[$devid]) && isset($loopdata[$devid][$user])) {
+                    return $loopdata[$devid][$user];
+        }
 
         return false;
     }

lib/core/topcollector.php

Braces +16 added lines, -11 removed lines

@@ -76,10 +76,13 @@ 
         $wasEnabled = ($this->hasData(self::ENABLEDAT)) ? $this->getData(self::ENABLEDAT) : false;
 
         $time = time();
-        if ($stop === true) $time = 0;
+        if ($stop === true) {
+            $time = 0;
+        }
 
-        if (! $this->setData($time, self::ENABLEDAT))
-            return false;
+        if (! $this->setData($time, self::ENABLEDAT)) {
+                    return false;
+        }
 
         return $wasEnabled;
     }
@@ -104,12 +107,14 @@ 
 
         if ($terminating) {
             $this->latest["ended"] = time();
-            foreach ($this->preserved as $p)
-                $this->latest["addinfo"] .= " : ".$p;
+            foreach ($this->preserved as $p) {
+                            $this->latest["addinfo"] .= " : ".$p;
+            }
         }
 
-        if ($preserve)
-            $this->preserved[] = $addinfo;
+        if ($preserve) {
+                    $this->preserved[] = $addinfo;
+        }
 
         if ($this->isEnabled()) {
             // use the pid as subkey
@@ -142,13 +147,13 @@ 
      */
     public function ClearLatest($all = false) {
         // it's ok when doing this every 10 sec
-        if ($all == false && time() % 10 != 0 )
-            return true;
+        if ($all == false && time() % 10 != 0 ) {
+                    return true;
+        }
 
         if ($all == true) {
             $this->getRedis()->delKey(self::TOPDATA);
-        }
-        else {
+        } else {
             foreach ($this->getRawDeviceUserData(self::TOPDATA) as $compKey => $rawline) {
                 $line = json_decode($rawline, true);
                 // remove everything which terminated for 20 secs or is not updated for more than 120 secs

lib/core/contentparameters.php

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

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

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/statemanager.php

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

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

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));
                     }
             }