grommunio / grommunio-sync

lib/syncobjects/syncappointment.php

Indentation +4 added lines, -4 removed lines

@@ -147,9 +147,9 @@ 
                                                                                                                         5 => "Meeting canceled",
                                                                                                                         7 => "Meeting canceled and received",
                                                                                                                         9 => "Meeting",
-                                                                                                                       11 => "Meeting received",
-                                                                                                                       13 => "Meeting canceled",
-                                                                                                                       15 => "Meeting canceled and received",)),
+                                                                                                                        11 => "Meeting received",
+                                                                                                                        13 => "Meeting canceled",
+                                                                                                                        15 => "Meeting canceled and received",)),
 
                     SYNC_POOMCAL_ATTENDEES                              => array (  self::STREAMER_VAR      => "attendees",
                                                                                     self::STREAMER_TYPE     => "SyncAttendee",
@@ -178,7 +178,7 @@ 
                                                                                     self::STREAMER_TYPE     => "SyncBaseBody",
                                                                                     self::STREAMER_RONOTIFY => true,
                                                                                     self::STREAMER_PRIVATE  => true
-                                                                          );
+                                                                            );
 
             $mapping[SYNC_AIRSYNCBASE_NATIVEBODYTYPE]                   = array (   self::STREAMER_VAR      => "nativebodytype");
 

lib/core/changesmemorywrapper.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
      * @return boolean
      */
     public function IsDeleted($id) {
-       return !((array_search(array(self::DELETION, $id), $this->changes) === false) && (array_search(array(self::SOFTDELETION, $id), $this->changes) === false));
+        return !((array_search(array(self::DELETION, $id), $this->changes) === false) && (array_search(array(self::SOFTDELETION, $id), $this->changes) === false));
     }
 
     /**

lib/core/syncparameters.php

Indentation +3 added lines, -3 removed lines

@@ -337,8 +337,8 @@ 
      * @return boolean
      * @throws FatalNotImplementedException
      */
-     private function isValidType($options) {
-         if ($options !== self::DEFAULTOPTIONS &&
+        private function isValidType($options) {
+            if ($options !== self::DEFAULTOPTIONS &&
                         $options !== self::EMAILOPTIONS &&
                         $options !== self::CALENDAROPTIONS &&
                         $options !== self::CONTACTOPTIONS &&
@@ -360,7 +360,7 @@ 
      * @return string
      * @throws FatalNotImplementedException
      */
-     private function normalizeType($options) {
+        private function normalizeType($options) {
         // return the requested CPO as it is defined
         if (isset($this->contentParameters[$options]))
             return $options;

lib/core/synccollections.php

Indentation +78 added lines, -78 removed lines

@@ -646,7 +646,7 @@ 
      * @access private
      * @return boolean      indicating if changes were found or not
      */
-     private function CountChange($folderid) {
+        private function CountChange($folderid) {
         $spa = $this->GetCollection($folderid);
 
         if (!$spa) {
@@ -690,62 +690,62 @@ 
         $this->changes[$folderid] = $changecount;
 
         return ($changecount > 0);
-     }
-
-     /**
-      * Checks the hierarchy for changes.
-      *
-      * @param boolean       export changes, default: false
-      *
-      * @access private
-      * @return boolean      indicating if changes were found or not
-      */
-     private function countHierarchyChange($exportChanges = false) {
-         $folderid = false;
-
-         // Check with device manager if the hierarchy should be reloaded.
-         // New additional folders are loaded here.
-         if (ZPush::GetDeviceManager()->IsHierarchySyncRequired()) {
-             ZLog::Write(LOGLEVEL_DEBUG, "SyncCollections->countHierarchyChange(): DeviceManager says HierarchySync is required.");
-             return true;
-         }
-
-         $changecount = false;
-         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.");
-
-
-                 $changesMem = ZPush::GetDeviceManager()->GetHierarchyChangesWrapper();
-                 // the hierarchyCache should now fully be initialized - check for changes in the additional folders
-                 $changesMem->Config(ZPush::GetAdditionalSyncFolders(false));
-
-                 // reset backend to the main store
-                 ZPush::GetBackend()->Setup(false);
-                 $exporter = ZPush::GetBackend()->GetExporter();
-                 if ($exporter !== false && isset($this->addparms[$folderid]["state"])) {
-                     $exporter->Config($this->addparms[$folderid]["state"]);
-                     $ret = $exporter->InitializeExporter($changesMem);
-                     while(is_array($exporter->Synchronize()));
-
-                     if ($ret !== false)
-                         $changecount = $changesMem->GetChangeCount();
-
-                     $this->hierarchyExporterChecked = true;
-                 }
-             }
-             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.");
-         }
-         return ($changecount > 0);
-     }
+        }
+
+        /**
+         * Checks the hierarchy for changes.
+         *
+         * @param boolean       export changes, default: false
+         *
+         * @access private
+         * @return boolean      indicating if changes were found or not
+         */
+        private function countHierarchyChange($exportChanges = false) {
+            $folderid = false;
+
+            // Check with device manager if the hierarchy should be reloaded.
+            // New additional folders are loaded here.
+            if (ZPush::GetDeviceManager()->IsHierarchySyncRequired()) {
+                ZLog::Write(LOGLEVEL_DEBUG, "SyncCollections->countHierarchyChange(): DeviceManager says HierarchySync is required.");
+                return true;
+            }
+
+            $changecount = false;
+            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.");
+
+
+                    $changesMem = ZPush::GetDeviceManager()->GetHierarchyChangesWrapper();
+                    // the hierarchyCache should now fully be initialized - check for changes in the additional folders
+                    $changesMem->Config(ZPush::GetAdditionalSyncFolders(false));
+
+                    // reset backend to the main store
+                    ZPush::GetBackend()->Setup(false);
+                    $exporter = ZPush::GetBackend()->GetExporter();
+                    if ($exporter !== false && isset($this->addparms[$folderid]["state"])) {
+                        $exporter->Config($this->addparms[$folderid]["state"]);
+                        $ret = $exporter->InitializeExporter($changesMem);
+                        while(is_array($exporter->Synchronize()));
+
+                        if ($ret !== false)
+                            $changecount = $changesMem->GetChangeCount();
+
+                        $this->hierarchyExporterChecked = true;
+                    }
+                }
+                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.");
+            }
+            return ($changecount > 0);
+        }
 
     /**
      * Returns an array with all folderid and the amount of changes found
@@ -873,26 +873,26 @@ 
      * @access private
      * @return
      */
-     private function loadStateManager() {
-         if (!isset($this->stateManager))
+        private function loadStateManager() {
+            if (!isset($this->stateManager))
             $this->stateManager = ZPush::GetDeviceManager()->GetStateManager();
-     }
-
-     /**
-      * Remove folder statistics from a SyncParameter object.
-      *
-      * @param SyncParameters $spa
-      *
-      * @access public
-      * @return
-      */
-     private function invalidateFolderStat($spa) {
-         if($spa->HasFolderStat()) {
-             ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->invalidateFolderStat(): removing folder stat '%s' for folderid '%s'", $spa->GetFolderStat(), $spa->GetFolderId()));
-             $spa->DelFolderStat();
-             $this->SaveCollection($spa);
-             return true;
-         }
-         return false;
-     }
+        }
+
+        /**
+         * Remove folder statistics from a SyncParameter object.
+         *
+         * @param SyncParameters $spa
+         *
+         * @access public
+         * @return
+         */
+        private function invalidateFolderStat($spa) {
+            if($spa->HasFolderStat()) {
+                ZLog::Write(LOGLEVEL_DEBUG, sprintf("SyncCollections->invalidateFolderStat(): removing folder stat '%s' for folderid '%s'", $spa->GetFolderStat(), $spa->GetFolderId()));
+                $spa->DelFolderStat();
+                $this->SaveCollection($spa);
+                return true;
+            }
+            return false;
+        }
 }

lib/core/streamer.php

Indentation +2 added lines, -2 removed lines

@@ -257,8 +257,8 @@
                             }
                             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);
-                                      ;
+                                        // Do not output empty items. Not sure if we should output an empty tag with $encoder->startTag($map[self::STREAMER_ARRAY], false, true);
+                                        ;
                                 else {
                                     $encoder->startTag($map[self::STREAMER_ARRAY]);
                                     $encoder->content($element);

lib/core/statemanager.php

Indentation +1 added lines, -1 removed lines

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

lib/core/asdevice.php

Indentation +9 added lines, -9 removed lines

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

lib/core/provisioningmanager.php

Indentation +1 added lines, -1 removed lines

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

lib/core/zpush.php

Indentation +5 added lines, -10 removed lines

@@ -109,31 +109,31 @@ 
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_OTHER, SYNC_FOLDER_TYPE_DRAFTS, SYNC_FOLDER_TYPE_WASTEBASKET,
                                                                         SYNC_FOLDER_TYPE_SENTMAIL, SYNC_FOLDER_TYPE_OUTBOX, SYNC_FOLDER_TYPE_USER_MAIL,
                                                                         SYNC_FOLDER_TYPE_JOURNAL, SYNC_FOLDER_TYPE_USER_JOURNAL),
-                                   ),
+                                    ),
                     "Contacts"  => array(
                                         self::CLASS_NAME => "SyncContact",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => true,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_CONTACT,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_CONTACT, SYNC_FOLDER_TYPE_UNKNOWN),
-                                   ),
+                                    ),
                     "Calendar"  => array(
                                         self::CLASS_NAME => "SyncAppointment",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => false,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_APPOINTMENT,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_APPOINTMENT),
-                                   ),
+                                    ),
                     "Tasks"     => array(
                                         self::CLASS_NAME => "SyncTask",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => false,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_TASK,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_TASK),
-                                   ),
+                                    ),
                     "Notes" => array(
                                         self::CLASS_NAME => "SyncNote",
                                         self::CLASS_REQUIRESPROTOCOLVERSION => false,
                                         self::CLASS_DEFAULTTYPE => SYNC_FOLDER_TYPE_NOTE,
                                         self::CLASS_OTHERTYPES => array(SYNC_FOLDER_TYPE_USER_NOTE),
-                                   ),
+                                    ),
                 );
 
 
@@ -435,7 +435,6 @@ 
      * Loads a backend file
      *
      * @param string $backendname
-
      * @access public
      * @throws FatalNotImplementedException
      * @return boolean
@@ -636,7 +635,6 @@ 
      *
      * @param string $message               (opt) message to be displayed
      * @param string $additionalMessage     (opt) additional message to be displayed
-
      * @access public
      * @return
      *
@@ -786,7 +784,6 @@ 
      * Indicates if the Provisioning check has to be forced on these commands
      *
      * @param string $commandCode
-
      * @access public
      * @return boolean
      */
@@ -814,7 +811,6 @@ 
      * Indicates if the command to be executed operates on the hierarchy
      *
      * @param int $commandCode
-
      * @access public
      * @return boolean
      */
@@ -829,7 +825,6 @@ 
      *
      * @param string $commandCode   a commandCode
      * @param string $option        e.g. self::UNAUTHENTICATED
-
      * @access private
      * @throws FatalNotImplementedException
      * @return object StateMachine