grommunio / grommunio-sync

lib/grommunio/listfolders.php

Spacing +16 added lines, -16 removed lines

@@ -13,7 +13,7 @@ 
 define('SSLCERT_FILE', null);
 define('SSLCERT_PASS', null);
 
-$supported_classes = array (
+$supported_classes = array(
     "IPF.Note"          => "SYNC_FOLDER_TYPE_USER_MAIL",
     "IPF.Task"          => "SYNC_FOLDER_TYPE_USER_TASK",
     "IPF.Appointment"   => "SYNC_FOLDER_TYPE_USER_APPOINTMENT",
@@ -80,11 +80,11 @@ 
     }
 }
 
-function listfolders_zarafa_admin_setup ($mapi, $user, $pass, $sslcert_file, $sslcert_pass) {
+function listfolders_zarafa_admin_setup($mapi, $user, $pass, $sslcert_file, $sslcert_pass) {
     $session = @mapi_logon_zarafa($user, $pass, $mapi, $sslcert_file, $sslcert_pass, 0, 'script', 'script');
 
     if (!$session) {
-        echo "User '$user' could not login. The script will exit. Errorcode: 0x". sprintf("%x", mapi_last_hresult()) . "\n";
+        echo "User '$user' could not login. The script will exit. Errorcode: 0x".sprintf("%x", mapi_last_hresult())."\n";
         exit(1);
     }
 
@@ -98,7 +98,7 @@ 
             }
     }
     $zarafauserinfo['admin'] = 1;
-    $admin = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin'])?true:false;
+    $admin = (isset($zarafauserinfo['admin']) && $zarafauserinfo['admin']) ?true:false;
 
     if (!$stores || !$storeslist || !$adminStore || !$admin) {
         echo "There was error trying to log in as admin or retrieving admin info. The script will exit.\n";
@@ -109,7 +109,7 @@ 
 }
 
 
-function listfolders_getlist ($adminStore, $session, $user) {
+function listfolders_getlist($adminStore, $session, $user) {
     global $supported_classes;
 
     if (strtoupper($user) == 'SYSTEM') {
@@ -117,10 +117,10 @@ 
         $storestables = @mapi_getmsgstorestable($session);
         $result = @mapi_last_hresult();
 
-        if ($result == NOERROR){
+        if ($result == NOERROR) {
             $rows = @mapi_table_queryallrows($storestables, array(PR_ENTRYID, PR_MDB_PROVIDER));
 
-            foreach($rows as $row) {
+            foreach ($rows as $row) {
                 if (isset($row[PR_MDB_PROVIDER]) && $row[PR_MDB_PROVIDER] == ZARAFA_STORE_PUBLIC_GUID) {
                     if (!isset($row[PR_ENTRYID])) {
                         echo "Public folder are not available.\nIf this is a multi-tenancy system, use -u and -p and login with an admin user of the company.\nThe script will exit.\n";
@@ -139,14 +139,14 @@ 
     $hresult = mapi_last_hresult();
 
     // Cache the store for later use
-    if($hresult != NOERROR) {
+    if ($hresult != NOERROR) {
         echo "Could not open store for '$user'. The script will exit.\n";
         exit (1);
     }
 
     if (strtoupper($user) != 'SYSTEM') {
         $inbox = mapi_msgstore_getreceivefolder($userStore);
-        if(mapi_last_hresult() != NOERROR) {
+        if (mapi_last_hresult() != NOERROR) {
             printf("Could not open inbox for %s (0x%08X). The script will exit.\n", $user, mapi_last_hresult());
             exit (1);
         }
@@ -158,8 +158,8 @@ 
     $h_table = @mapi_folder_gethierarchytable($root, CONVENIENT_DEPTH);
     $subfolders = @mapi_table_queryallrows($h_table, array(PR_ENTRYID, PR_DISPLAY_NAME, PR_CONTAINER_CLASS, PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_FOLDER_TYPE, PR_ATTR_HIDDEN));
 
-    echo "Available folders in store '$user':\n" . str_repeat("-", 50) . "\n";
-    foreach($subfolders as $folder) {
+    echo "Available folders in store '$user':\n".str_repeat("-", 50)."\n";
+    foreach ($subfolders as $folder) {
         // do not display hidden and search folders
         if ((isset($folder[PR_ATTR_HIDDEN]) && $folder[PR_ATTR_HIDDEN]) ||
             (isset($folder[PR_FOLDER_TYPE]) && $folder[PR_FOLDER_TYPE] == FOLDER_SEARCH)) {
@@ -177,9 +177,9 @@ 
         }
 
         if (isset($folder[PR_CONTAINER_CLASS]) && array_key_exists($folder[PR_CONTAINER_CLASS], $supported_classes)) {
-            echo "Folder name:\t". $folder[PR_DISPLAY_NAME] . "\n";
-            echo "Folder ID:\t". bin2hex($folder[PR_SOURCE_KEY]) . "\n";
-            echo "Type:\t\t". $supported_classes[$folder[PR_CONTAINER_CLASS]] . "\n";
+            echo "Folder name:\t".$folder[PR_DISPLAY_NAME]."\n";
+            echo "Folder ID:\t".bin2hex($folder[PR_SOURCE_KEY])."\n";
+            echo "Type:\t\t".$supported_classes[$folder[PR_CONTAINER_CLASS]]."\n";
             echo "\n";
         }
     }
@@ -192,8 +192,8 @@ 
         return ($version <= $vs[1]);
     }
 
-    if (extension_loaded("mapi")){
-        if (version_compare(phpversion("mapi"), $version) == -1){
+    if (extension_loaded("mapi")) {
+        if (version_compare(phpversion("mapi"), $version) == -1) {
             return false;
         }
     }

lib/grommunio/mapistreamwrapper.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
         $len = ($this->position + $len > $this->streamlength) ? ($this->streamlength - $this->position) : $len;
 
         // read 4 additional bytes from the stream so we can always truncate correctly
-        if ($this->toTruncate && $this->position+$len >= $this->streamlength) {
+        if ($this->toTruncate && $this->position + $len >= $this->streamlength) {
             $len += 4;
         }
         if ($this->mapistream) {
@@ -96,7 +96,7 @@ 
      * @return boolean
      */
     public function stream_seek($offset, $whence = SEEK_SET) {
-        switch($whence) {
+        switch ($whence) {
             case SEEK_SET:
                 $mapiWhence = STREAM_SEEK_SET;
                 break;
@@ -170,7 +170,7 @@ 
      */
      static public function Open($mapistream, $truncatehtmlsafe = false) {
         $context = stream_context_create(array(self::PROTOCOL => array('stream' => &$mapistream, 'truncatehtmlsafe' => $truncatehtmlsafe)));
-        return fopen(self::PROTOCOL . "://",'r', false, $context);
+        return fopen(self::PROTOCOL."://", 'r', false, $context);
     }
 }
 

lib/grommunio/importer.php

Spacing +49 added lines, -49 removed lines

@@ -61,7 +61,7 @@ 
             $folderidForBackendId = ZPush::GetDeviceManager()->GetFolderIdForBackendId($this->folderidHex);
             // Only append backend id if the mapping backendid<->folderid is available.
             if ($folderidForBackendId != $this->folderidHex) {
-                $this->prefix = $folderidForBackendId . ':';
+                $this->prefix = $folderidForBackendId.':';
             }
         }
         else {
@@ -78,7 +78,7 @@ 
         if ($entryid)
             $folder = mapi_msgstore_openentry($store, $entryid);
 
-        if(!$folder) {
+        if (!$folder) {
             $this->importer = false;
 
             // We throw an general error SYNC_FSSTATUS_CODEUNKNOWN (12) which is also SYNC_STATUS_FOLDERHIERARCHYCHANGED (12)
@@ -89,10 +89,10 @@ 
         $this->mapiprovider = new MAPIProvider($this->session, $this->store);
 
         if ($folderid) {
-            $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportContentsChanges, 0 , 0);
+            $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportContentsChanges, 0, 0);
         }
         else {
-            $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportHierarchyChanges, 0 , 0);
+            $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportHierarchyChanges, 0, 0);
         }
     }
 
@@ -115,7 +115,7 @@ 
 
         // Put the state information in a stream that can be used by ICS
         $stream = mapi_stream_create();
-        if(strlen($state) == 0)
+        if (strlen($state) == 0)
             $state = hex2bin("0000000000000000");
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->Config(): initializing importer with state: 0x%s", bin2hex($state)));
@@ -147,7 +147,7 @@ 
      */
     public function ConfigContentParameters($contentparameters) {
         $filtertype = $contentparameters->GetFilterType();
-        switch($contentparameters->GetContentClass()) {
+        switch ($contentparameters->GetContentClass()) {
             case "Email":
                 $this->cutoffdate = ($filtertype) ? Utils::GetCutOffDate($filtertype) : false;
                 break;
@@ -172,22 +172,22 @@ 
      */
     public function GetState() {
         $error = false;
-        if(!isset($this->statestream) || $this->importer === false)
+        if (!isset($this->statestream) || $this->importer === false)
             $error = true;
 
         if ($error === false && $this->folderid !== false && function_exists("mapi_importcontentschanges_updatestate"))
-            if(mapi_importcontentschanges_updatestate($this->importer, $this->statestream) != true)
+            if (mapi_importcontentschanges_updatestate($this->importer, $this->statestream) != true)
                 $error = true;
 
         if ($error == true)
-            throw new StatusException(sprintf("ImportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid)?SYNC_STATUS_FOLDERHIERARCHYCHANGED:SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
+            throw new StatusException(sprintf("ImportChangesICS->GetState(): Error, state not available or unable to update: 0x%X", mapi_last_hresult()), (($this->folderid) ?SYNC_STATUS_FOLDERHIERARCHYCHANGED:SYNC_FSSTATUS_CODEUNKNOWN), null, LOGLEVEL_WARN);
 
         mapi_stream_seek($this->statestream, 0, STREAM_SEEK_SET);
 
         $state = "";
-        while(true) {
+        while (true) {
             $data = mapi_stream_read($this->statestream, 4096);
-            if(strlen($data))
+            if (strlen($data))
                 $state .= $data;
             else
                 break;
@@ -217,13 +217,13 @@ 
 
         // open the existing object
         $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid, hex2bin($messageid));
-        if(!$entryid) {
+        if (!$entryid) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Error, unable to resolve message id: 0x%X", $messageid, mapi_last_hresult()));
             return false;
         }
 
         $mapimessage = mapi_msgstore_openentry($this->store, $entryid);
-        if(!$mapimessage) {
+        if (!$mapimessage) {
             ZLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Error, unable to open entry id: 0x%X", $messageid, mapi_last_hresult()));
             return false;
         }
@@ -231,8 +231,8 @@ 
         // check the sync interval
         if ($this->cutoffdate !== false) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->isModificationAllowed('%s'): cut off date is: %s", $messageid, $this->cutoffdate));
-            if (  ($this->contentClass == "Email"    && !MAPIUtils::IsInEmailSyncInterval($this->store, $mapimessage, $this->cutoffdate)) ||
-                  ($this->contentClass == "Calendar" && !MAPIUtils::IsInCalendarSyncInterval($this->store, $mapimessage, $this->cutoffdate)) ) {
+            if (($this->contentClass == "Email" && !MAPIUtils::IsInEmailSyncInterval($this->store, $mapimessage, $this->cutoffdate)) ||
+                  ($this->contentClass == "Calendar" && !MAPIUtils::IsInCalendarSyncInterval($this->store, $mapimessage, $this->cutoffdate))) {
 
                 ZLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->isModificationAllowed('%s'): Message in %s is outside the sync interval. Data not saved.", $messageid, $this->contentClass));
                 return false;
@@ -311,13 +311,13 @@ 
             $started = time();
             $exported = 0;
             try {
-                while(is_array($exporter->Synchronize())) {
+                while (is_array($exporter->Synchronize())) {
                     $exported++;
 
                     // stop if this takes more than 15 seconds and there are more than 5 changes still to be exported
                     // within 20 seconds this should be finished or it will not be performed
-                    if ((time() - $started) > 15 && ($potConflicts - $exported) > 5 ) {
-                        ZLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): conflict detection cancelled as operation is too slow. In %d seconds only %d from %d changes were processed.",(time() - $started), $exported, $potConflicts));
+                    if ((time() - $started) > 15 && ($potConflicts - $exported) > 5) {
+                        ZLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): conflict detection cancelled as operation is too slow. In %d seconds only %d from %d changes were processed.", (time() - $started), $exported, $potConflicts));
                         $this->conflictsLoaded = true;
                         return;
                     }
@@ -325,7 +325,7 @@ 
             }
             // something really bad happened while exporting changes
             catch (StatusException $stex) {
-                ZLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): got StatusException code %d while exporting changes. Ignore and mark conflicts as loaded.",$stex->getCode()));
+                ZLog::Write(LOGLEVEL_WARN, sprintf("ImportChangesICS->lazyLoadConflicts(): got StatusException code %d while exporting changes. Ignore and mark conflicts as loaded.", $stex->getCode()));
             }
             $this->conflictsLoaded = true;
         }
@@ -347,7 +347,7 @@ 
         $props[PR_PARENT_SOURCE_KEY] = $this->folderid;
 
         // set the PR_SOURCE_KEY if available or mark it as new message
-        if($id) {
+        if ($id) {
             list(, $sk) = Utils::SplitMessageId($id);
             $props[PR_SOURCE_KEY] = hex2bin($sk);
 
@@ -357,7 +357,7 @@ 
 
             // check for conflicts
             $this->lazyLoadConflicts();
-            if($this->memChanges->IsChanged($id)) {
+            if ($this->memChanges->IsChanged($id)) {
                 if ($this->flags & SYNC_CONFLICT_OVERWRITE_PIM) {
                     // in these cases the status SYNC_STATUS_CONFLICTCLIENTSERVEROBJECT should be returned, so the mobile client can inform the end user
                     throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from PIM will be dropped! Server overwrites PIM. User is informed.", $id, get_class($message)), SYNC_STATUS_CONFLICTCLIENTSERVEROBJECT, null, LOGLEVEL_INFO);
@@ -366,7 +366,7 @@ 
                 else
                     ZLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from Server will be dropped! PIM overwrites server.", $id, get_class($message)));
             }
-            if($this->memChanges->IsDeleted($id)) {
+            if ($this->memChanges->IsDeleted($id)) {
                 ZLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Conflict detected. Data from PIM will be dropped! Object was deleted on server.", $id, get_class($message)));
                 return false;
             }
@@ -374,16 +374,16 @@ 
         else
             $flags = SYNC_NEW_MESSAGE;
 
-        if(mapi_importcontentschanges_importmessagechange($this->importer, $props, $flags, $mapimessage)) {
+        if (mapi_importcontentschanges_importmessagechange($this->importer, $props, $flags, $mapimessage)) {
             $this->mapiprovider->SetMessage($mapimessage, $message);
             mapi_savechanges($mapimessage);
 
             if (mapi_last_hresult())
                 throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error, mapi_savechanges() failed: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_SYNCCANNOTBECOMPLETED);
 
-            $sourcekeyprops = mapi_getprops($mapimessage, array (PR_SOURCE_KEY));
+            $sourcekeyprops = mapi_getprops($mapimessage, array(PR_SOURCE_KEY));
 
-            return $this->prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+            return $this->prefix.bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
         }
         else
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error updating object: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
@@ -407,16 +407,16 @@ 
 
         // check for conflicts
         $this->lazyLoadConflicts();
-        if($this->memChanges->IsChanged($id)) {
+        if ($this->memChanges->IsChanged($id)) {
             ZLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data from Server will be dropped! PIM deleted object.", $id));
         }
-        elseif($this->memChanges->IsDeleted($id)) {
+        elseif ($this->memChanges->IsDeleted($id)) {
             ZLog::Write(LOGLEVEL_INFO, sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Conflict detected. Data is already deleted. Request will be ignored.", $id));
             return true;
         }
 
         // do a 'soft' delete so people can un-delete if necessary
-        if(mapi_importcontentschanges_importmessagedeletion($this->importer, 1, array(hex2bin($sk))))
+        if (mapi_importcontentschanges_importmessagedeletion($this->importer, 1, array(hex2bin($sk))))
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Error updating object: 0x%X", $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
 
         return true;
@@ -435,7 +435,7 @@ 
      * @throws StatusException
      */
     public function ImportMessageReadFlag($id, $flags, $categories = array()) {
-        list($fsk,$sk) = Utils::SplitMessageId($id);
+        list($fsk, $sk) = Utils::SplitMessageId($id);
 
         // if $fsk is set, we convert it into a backend id.
         if ($fsk) {
@@ -461,9 +461,9 @@ 
             }
              */
 
-            $readstate = array ( "sourcekey" => hex2bin($sk), "flags" => $flags);
+            $readstate = array("sourcekey" => hex2bin($sk), "flags" => $flags);
 
-            if(!mapi_importcontentschanges_importperuserreadstatechange($this->importer, array($readstate) ))
+            if (!mapi_importcontentschanges_importperuserreadstatechange($this->importer, array($readstate)))
                 throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Error setting read state: 0x%X", $id, $flags, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
         }
         // yeah OL sucks - ZP-779
@@ -502,7 +502,7 @@ 
      */
     public function ImportMessageMove($id, $newfolder) {
         list(,$sk) = Utils::SplitMessageId($id);
-        if (strtolower($newfolder) == strtolower(bin2hex($this->folderid)) )
+        if (strtolower($newfolder) == strtolower(bin2hex($this->folderid)))
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, source and destination are equal", $id, $newfolder), SYNC_MOVEITEMSSTATUS_SAMESOURCEANDDEST);
 
         // Get the entryid of the message we're moving
@@ -514,7 +514,7 @@ 
             $srcmessage = mapi_msgstore_openentry($this->store, $entryid);
         }
 
-        if(!$entryid || !$srcmessage) {
+        if (!$entryid || !$srcmessage) {
             $code = SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID;
             $mapiLastHresult = mapi_last_hresult();
             // if we move to the trash and the source message is not found, we can also just tell the mobile that we successfully moved to avoid errors (ZP-624)
@@ -535,11 +535,11 @@ 
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open store of destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
 
         $dstentryid = mapi_msgstore_entryidfromsourcekey($dststore, hex2bin($newfolder));
-        if(!$dstentryid)
+        if (!$dstentryid)
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
 
         $dstfolder = mapi_msgstore_openentry($dststore, $dstentryid);
-        if(!$dstfolder)
+        if (!$dstfolder)
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
 
         $newmessage = mapi_folder_createmessage($dstfolder);
@@ -552,7 +552,7 @@ 
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, copy to destination message failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
 
         $srcfolderentryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid);
-        if(!$srcfolderentryid)
+        if (!$srcfolderentryid)
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve source folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
 
         $srcfolder = mapi_msgstore_openentry($this->store, $srcfolderentryid);
@@ -568,15 +568,15 @@ 
         if (!mapi_folder_deletemessages($srcfolder, array($entryid)))
             throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, delete of source message failed: 0x%X. Possible duplicates.", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_SOURCEORDESTLOCKED);
 
-        $sourcekeyprops = mapi_getprops($newmessage, array (PR_SOURCE_KEY));
+        $sourcekeyprops = mapi_getprops($newmessage, array(PR_SOURCE_KEY));
         if (isset($sourcekeyprops[PR_SOURCE_KEY]) && $sourcekeyprops[PR_SOURCE_KEY]) {
             $prefix = "";
             // prepend the destination short folderid, if it exists
             $destShortId = ZPush::GetDeviceManager()->GetFolderIdForBackendId($newfolder);
             if ($destShortId !== $newfolder) {
-                $prefix = $destShortId .":";
+                $prefix = $destShortId.":";
             }
-            return $prefix . bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
+            return $prefix.bin2hex($sourcekeyprops[PR_SOURCE_KEY]);
         }
 
         return false;
@@ -597,7 +597,7 @@ 
      * @throws StatusException
      */
     public function ImportFolderChange($folder) {
-        $id = isset($folder->BackendId)?$folder->BackendId : false;
+        $id = isset($folder->BackendId) ? $folder->BackendId : false;
         $parent = $folder->parentid;
         $parent_org = $folder->parentid;
         $displayname = u2wi($folder->displayname);
@@ -635,7 +635,7 @@ 
 
             mapi_setprops($newfolder, array(PR_CONTAINER_CLASS => MAPIUtils::GetContainerClassFromFolderType($type)));
 
-            $props =  mapi_getprops($newfolder, array(PR_SOURCE_KEY));
+            $props = mapi_getprops($newfolder, array(PR_SOURCE_KEY));
             if (isset($props[PR_SOURCE_KEY])) {
                 $folder->BackendId = bin2hex($props[PR_SOURCE_KEY]);
                 $folderOrigin = DeviceManager::FLD_ORIGIN_USER;
@@ -663,7 +663,7 @@ 
         if (!$mfolder)
             throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
 
-        $props =  mapi_getprops($mfolder, array(PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_DISPLAY_NAME, PR_CONTAINER_CLASS));
+        $props = mapi_getprops($mfolder, array(PR_SOURCE_KEY, PR_PARENT_SOURCE_KEY, PR_DISPLAY_NAME, PR_CONTAINER_CLASS));
         if (!isset($props[PR_SOURCE_KEY]) || !isset($props[PR_PARENT_SOURCE_KEY]) || !isset($props[PR_DISPLAY_NAME]) || !isset($props[PR_CONTAINER_CLASS]))
             throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, folder data not available: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
 
@@ -686,23 +686,23 @@ 
         // a changed parent id means that the folder should be moved
         if (bin2hex($props[PR_PARENT_SOURCE_KEY]) !== $parent) {
             $sourceparentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, $props[PR_PARENT_SOURCE_KEY]);
-            if(!$sourceparentfentryid)
+            if (!$sourceparentfentryid)
                 throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent source folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
 
             $sourceparentfolder = mapi_msgstore_openentry($this->store, $sourceparentfentryid);
-            if(!$sourceparentfolder)
+            if (!$sourceparentfolder)
                 throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent source folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
 
             $destparentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
-            if(!$sourceparentfentryid)
+            if (!$sourceparentfentryid)
                 throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open destination folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
 
             $destfolder = mapi_msgstore_openentry($this->store, $destparentfentryid);
-            if(!$destfolder)
+            if (!$destfolder)
                 throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open destination folder (open entry): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
 
             // mapi_folder_copyfolder() fails if a folder with this name already exists -> MAPI_E_COLLISION
-            if(! mapi_folder_copyfolder($sourceparentfolder, $entryid, $destfolder, $displayname, FOLDER_MOVE))
+            if (!mapi_folder_copyfolder($sourceparentfolder, $entryid, $destfolder, $displayname, FOLDER_MOVE))
                 throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to move folder: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_FOLDEREXISTS);
 
             // the parent changed, but we got a backendID as parent and have to return an AS folderid - the parent-backendId must be mapped at this point already
@@ -740,7 +740,7 @@ 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): importing folder deletetion", $id, $parent));
 
         $folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($id));
-        if(!$folderentryid)
+        if (!$folderentryid)
             throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error, unable to resolve folder", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_FOLDERDOESNOTEXIST);
 
         // get the folder type from the MAPIProvider
@@ -749,7 +749,7 @@ 
         if (Utils::IsSystemFolder($type) || $this->mapiprovider->IsMAPIDefaultFolder($folderentryid))
             throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting system/default folder", $id, $parent), SYNC_FSSTATUS_SYSTEMFOLDER);
 
-        $ret = mapi_importhierarchychanges_importfolderdeletion ($this->importer, 0, array(PR_SOURCE_KEY => hex2bin($id)));
+        $ret = mapi_importhierarchychanges_importfolderdeletion($this->importer, 0, array(PR_SOURCE_KEY => hex2bin($id)));
         if (!$ret)
             throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting folder: 0x%X", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
 

lib/request/provisioning.php

Spacing +25 added lines, -25 removed lines

@@ -24,17 +24,17 @@ 
         $rwstatus = ZPush::GetProvisioningManager()->GetProvisioningWipeStatus();
         $rwstatusWiped = false;
         $deviceInfoSet = false;
-        $wipeRequest = ! ($rwstatus < SYNC_PROVISION_RWSTATUS_PENDING);
+        $wipeRequest = !($rwstatus < SYNC_PROVISION_RWSTATUS_PENDING);
 
         // if this is a regular provisioning require that an authenticated remote user
-        if (! $wipeRequest) {
+        if (!$wipeRequest) {
             ZLog::Write(LOGLEVEL_DEBUG, "RequestProcessor::HandleProvision(): Forcing delayed Authentication");
             self::Authenticate();
         }
 
         $phase2 = true;
 
-        if(!self::$decoder->getElementStartTag(SYNC_PROVISION_PROVISION))
+        if (!self::$decoder->getElementStartTag(SYNC_PROVISION_PROVISION))
             return false;
 
         // Loop through Provision request tags. Possible are:
@@ -43,7 +43,7 @@ 
         // - Policies
         // Each of them should only be once per request.
         WBXMLDecoder::ResetInWhile("provisioningMain");
-        while(WBXMLDecoder::InWhile("provisioningMain")) {
+        while (WBXMLDecoder::InWhile("provisioningMain")) {
             $requestName = "";
             if (self::$decoder->getElementStartTag(SYNC_PROVISION_REMOTEWIPE)) {
                 $requestName = SYNC_PROVISION_REMOTEWIPE;
@@ -61,15 +61,15 @@ 
                 //set is available for OOF, device password and device information
             switch ($requestName) {
                 case SYNC_PROVISION_REMOTEWIPE:
-                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS))
+                    if (!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS))
                         return false;
 
                     $instatus = self::$decoder->getElementContent();
 
-                    if(!self::$decoder->getElementEndTag())
+                    if (!self::$decoder->getElementEndTag())
                         return false;
 
-                    if(!self::$decoder->getElementEndTag())
+                    if (!self::$decoder->getElementEndTag())
                         return false;
 
                     $phase2 = false;
@@ -78,40 +78,40 @@ 
                     break;
 
                 case SYNC_PROVISION_POLICIES:
-                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_POLICY))
+                    if (!self::$decoder->getElementStartTag(SYNC_PROVISION_POLICY))
                         return false;
 
-                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_POLICYTYPE))
+                    if (!self::$decoder->getElementStartTag(SYNC_PROVISION_POLICYTYPE))
                         return false;
 
                     $policytype = self::$decoder->getElementContent();
                     if ($policytype != 'MS-WAP-Provisioning-XML' && $policytype != 'MS-EAS-Provisioning-WBXML') {
                         $status = SYNC_PROVISION_STATUS_SERVERERROR;
                     }
-                    if(!self::$decoder->getElementEndTag()) //policytype
+                    if (!self::$decoder->getElementEndTag()) //policytype
                         return false;
 
                     if (self::$decoder->getElementStartTag(SYNC_PROVISION_POLICYKEY)) {
                         $devpolicykey = self::$decoder->getElementContent();
 
-                        if(!self::$decoder->getElementEndTag())
+                        if (!self::$decoder->getElementEndTag())
                             return false;
 
-                        if(!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS))
+                        if (!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS))
                             return false;
 
                         $instatus = self::$decoder->getElementContent();
 
-                        if(!self::$decoder->getElementEndTag())
+                        if (!self::$decoder->getElementEndTag())
                             return false;
 
                         $phase2 = false;
                     }
 
-                    if(!self::$decoder->getElementEndTag()) //policy
+                    if (!self::$decoder->getElementEndTag()) //policy
                         return false;
 
-                    if(!self::$decoder->getElementEndTag()) //policies
+                    if (!self::$decoder->getElementEndTag()) //policies
                         return false;
                     break;
 
@@ -123,7 +123,7 @@ 
                     $deviceinformation = new SyncDeviceInformation();
                     $deviceinformation->Decode(self::$decoder);
                     $deviceinformation->Status = SYNC_SETTINGSSTATUS_SUCCESS;
-                    if (! $wipeRequest) {
+                    if (!$wipeRequest) {
                         // for this operation the device manager is available
                         ZPush::GetDeviceManager()->SaveDeviceInformation($deviceinformation);
                     }
@@ -138,12 +138,12 @@ 
 
                 default:
                     //TODO: a special status code needed?
-                    ZLog::Write(LOGLEVEL_WARN, sprintf ("This property ('%s') is not allowed to be used in a provision request", $requestName));
+                    ZLog::Write(LOGLEVEL_WARN, sprintf("This property ('%s') is not allowed to be used in a provision request", $requestName));
             }
 
         }
 
-        if(!self::$decoder->getElementEndTag()) //provision
+        if (!self::$decoder->getElementEndTag()) //provision
             return false;
 
         if (PROVISIONING !== true) {
@@ -173,7 +173,7 @@ 
             self::$encoder->startTag(SYNC_PROVISION_POLICIES);
                 self::$encoder->startTag(SYNC_PROVISION_POLICY);
 
-                if(isset($policytype)) {
+                if (isset($policytype)) {
                     self::$encoder->startTag(SYNC_PROVISION_POLICYTYPE);
                         self::$encoder->content($policytype);
                     self::$encoder->endTag();
@@ -211,14 +211,14 @@ 
                     }
                     self::$topCollector->AnnounceInformation("Updated provisioning", true);
 
-                    self::$encoder->endTag();//data
+                    self::$encoder->endTag(); //data
                 }
-                self::$encoder->endTag();//policy
+                self::$encoder->endTag(); //policy
             self::$encoder->endTag(); //policies
         }
 
         //set the new final policy key in the provisioning manager
-        if (!$phase2 && ! $wipeRequest) {
+        if (!$phase2 && !$wipeRequest) {
             ZPush::GetProvisioningManager()->SetProvisioningPolicyKey($policykey);
             self::$topCollector->AnnounceInformation("Policies deployed", true);
         }
@@ -226,11 +226,11 @@ 
         //wipe data if a higher RWSTATUS is requested
         if ($rwstatus > SYNC_PROVISION_RWSTATUS_OK && $policystatus === SYNC_PROVISION_POLICYSTATUS_SUCCESS) {
             self::$encoder->startTag(SYNC_PROVISION_REMOTEWIPE, false, true);
-            ZPush::GetProvisioningManager()->SetProvisioningWipeStatus(($rwstatusWiped)?SYNC_PROVISION_RWSTATUS_WIPED:SYNC_PROVISION_RWSTATUS_REQUESTED);
-            self::$topCollector->AnnounceInformation(sprintf("Remote wipe %s", ($rwstatusWiped)?"executed":"requested"), true);
+            ZPush::GetProvisioningManager()->SetProvisioningWipeStatus(($rwstatusWiped) ?SYNC_PROVISION_RWSTATUS_WIPED:SYNC_PROVISION_RWSTATUS_REQUESTED);
+            self::$topCollector->AnnounceInformation(sprintf("Remote wipe %s", ($rwstatusWiped) ? "executed" : "requested"), true);
         }
 
-        self::$encoder->endTag();//provision
+        self::$encoder->endTag(); //provision
 
         return true;
     }

lib/request/moveitems.php

Spacing +12 added lines, -12 removed lines

@@ -18,34 +18,34 @@ 
      * @return boolean
      */
     public function Handle($commandCode) {
-        if(!self::$decoder->getElementStartTag(SYNC_MOVE_MOVES))
+        if (!self::$decoder->getElementStartTag(SYNC_MOVE_MOVES))
             return false;
 
         $moves = array();
-        while(self::$decoder->getElementStartTag(SYNC_MOVE_MOVE)) {
+        while (self::$decoder->getElementStartTag(SYNC_MOVE_MOVE)) {
             $move = array();
-            if(self::$decoder->getElementStartTag(SYNC_MOVE_SRCMSGID)) {
+            if (self::$decoder->getElementStartTag(SYNC_MOVE_SRCMSGID)) {
                 $move["srcmsgid"] = self::$decoder->getElementContent();
-                if(!self::$decoder->getElementEndTag())
+                if (!self::$decoder->getElementEndTag())
                     break;
             }
-            if(self::$decoder->getElementStartTag(SYNC_MOVE_SRCFLDID)) {
+            if (self::$decoder->getElementStartTag(SYNC_MOVE_SRCFLDID)) {
                 $move["srcfldid"] = self::$decoder->getElementContent();
-                if(!self::$decoder->getElementEndTag())
+                if (!self::$decoder->getElementEndTag())
                     break;
             }
-            if(self::$decoder->getElementStartTag(SYNC_MOVE_DSTFLDID)) {
+            if (self::$decoder->getElementStartTag(SYNC_MOVE_DSTFLDID)) {
                 $move["dstfldid"] = self::$decoder->getElementContent();
-                if(!self::$decoder->getElementEndTag())
+                if (!self::$decoder->getElementEndTag())
                     break;
             }
             array_push($moves, $move);
 
-            if(!self::$decoder->getElementEndTag())
+            if (!self::$decoder->getElementEndTag())
                 return false;
         }
 
-        if(!self::$decoder->getElementEndTag())
+        if (!self::$decoder->getElementEndTag())
             return false;
 
         self::$encoder->StartWBXML();
@@ -55,7 +55,7 @@ 
         $operationResults = array();
         $operationCounter = 0;
         $operationTotal = count($moves);
-        foreach($moves as $move) {
+        foreach ($moves as $move) {
             $operationCounter++;
             self::$encoder->startTag(SYNC_MOVE_RESPONSE);
             self::$encoder->startTag(SYNC_MOVE_SRCMSGID);
@@ -107,7 +107,7 @@ 
             self::$encoder->endTag();
 
             self::$encoder->startTag(SYNC_MOVE_DSTMSGID);
-            self::$encoder->content( (($result !== false ) ? $result : $move["srcmsgid"]));
+            self::$encoder->content((($result !== false) ? $result : $move["srcmsgid"]));
             self::$encoder->endTag();
             self::$encoder->endTag();
         }

lib/request/validatecert.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
      */
     public function Handle($commandCode) {
         // Parse input
-        if(!self::$decoder->getElementStartTag(SYNC_VALIDATECERT_VALIDATECERT))
+        if (!self::$decoder->getElementStartTag(SYNC_VALIDATECERT_VALIDATECERT))
             return false;
 
         $validateCert = new SyncValidateCert();
@@ -33,7 +33,7 @@ 
         else
             $status = SYNC_VALIDATECERTSTATUS_CANTVALIDATESIG;
 
-        if(!self::$decoder->getElementEndTag())
+        if (!self::$decoder->getElementEndTag())
                 return false; // SYNC_VALIDATECERT_VALIDATECERT
 
         self::$encoder->startWBXML();

lib/request/notify.php

Spacing +4 added lines, -4 removed lines

@@ -18,16 +18,16 @@
      * @return boolean
      */
     public function Handle($commandCode) {
-        if(!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_NOTIFY))
+        if (!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_NOTIFY))
             return false;
 
-        if(!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_DEVICEINFO))
+        if (!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_DEVICEINFO))
             return false;
 
-        if(!self::$decoder->getElementEndTag())
+        if (!self::$decoder->getElementEndTag())
             return false;
 
-        if(!self::$decoder->getElementEndTag())
+        if (!self::$decoder->getElementEndTag())
             return false;
 
         self::$encoder->StartWBXML();

lib/request/ping.php

Spacing +24 added lines, -24 removed lines

@@ -60,40 +60,40 @@ 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): reference PolicyKey for PING: %s", $sc->GetReferencePolicyKey()));
 
         // receive PING initialization data
-        if($params_present) {
+        if ($params_present) {
             self::$topCollector->AnnounceInformation("Processing PING data");
             ZLog::Write(LOGLEVEL_DEBUG, "HandlePing(): initialization data received");
 
-            if(self::$decoder->getElementStartTag(SYNC_PING_LIFETIME)) {
+            if (self::$decoder->getElementStartTag(SYNC_PING_LIFETIME)) {
                 $sc->SetLifetime(self::$decoder->getElementContent());
                 self::$decoder->getElementEndTag();
             }
 
-            if(($el = self::$decoder->getElementStartTag(SYNC_PING_FOLDERS)) && $el[EN_FLAGS] & EN_FLAGS_CONTENT) {
+            if (($el = self::$decoder->getElementStartTag(SYNC_PING_FOLDERS)) && $el[EN_FLAGS] & EN_FLAGS_CONTENT) {
                 // cache requested (pingable) folderids
                 $pingable = array();
 
-                while(self::$decoder->getElementStartTag(SYNC_PING_FOLDER)) {
+                while (self::$decoder->getElementStartTag(SYNC_PING_FOLDER)) {
                     WBXMLDecoder::ResetInWhile("pingFolder");
-                    while(WBXMLDecoder::InWhile("pingFolder")) {
-                        if(self::$decoder->getElementStartTag(SYNC_PING_SERVERENTRYID)) {
+                    while (WBXMLDecoder::InWhile("pingFolder")) {
+                        if (self::$decoder->getElementStartTag(SYNC_PING_SERVERENTRYID)) {
                             $folderid = self::$decoder->getElementContent();
                             self::$decoder->getElementEndTag();
                         }
-                        if(self::$decoder->getElementStartTag(SYNC_PING_FOLDERTYPE)) {
+                        if (self::$decoder->getElementStartTag(SYNC_PING_FOLDERTYPE)) {
                             $class = self::$decoder->getElementContent();
                             self::$decoder->getElementEndTag();
                         }
 
                         $e = self::$decoder->peek();
-                        if($e[EN_TYPE] == EN_TYPE_ENDTAG) {
+                        if ($e[EN_TYPE] == EN_TYPE_ENDTAG) {
                             self::$decoder->getElementEndTag();
                             break;
                         }
                     }
 
                     $spa = $sc->GetCollection($folderid);
-                    if (! $spa) {
+                    if (!$spa) {
                         // The requested collection is not synchronized.
                         // check if the HierarchyCache is available, if not, trigger a HierarchySync
                         try {
@@ -118,7 +118,7 @@ 
                         ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): using saved sync state for '%s' id '%s'", $spa->GetContentClass(), $folderid));
                     }
                 }
-                if(!self::$decoder->getElementEndTag())
+                if (!self::$decoder->getElementEndTag())
                     return false;
 
                 // update pingable flags
@@ -127,15 +127,15 @@ 
                     if (in_array($folderid, $pingable)) {
                         $spa->SetPingableFlag(true);
                     }
-                    else  {
+                    else {
                         $spa->DelPingableFlag();
                     }
                 }
             }
-            if(!self::$decoder->getElementEndTag())
+            if (!self::$decoder->getElementEndTag())
                 return false;
 
-            if(!$this->lifetimeBetweenBound($sc->GetLifetime())){
+            if (!$this->lifetimeBetweenBound($sc->GetLifetime())) {
                 $pingstatus = SYNC_PINGSTATUS_HBOUTOFRANGE;
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): ping lifetime not between bound (higher bound:'%d' lower bound:'%d' current lifetime:'%d'. Returning SYNC_PINGSTATUS_HBOUTOFRANGE.", PING_HIGHER_BOUND_LIFETIME, PING_LOWER_BOUND_LIFETIME, $sc->GetLifetime()));
             }
@@ -146,11 +146,11 @@ 
         else {
             // if no ping initialization data was sent, we check if we have pingable folders
             // if not, we indicate that there is nothing to do.
-            if (! $sc->PingableFolders()) {
+            if (!$sc->PingableFolders()) {
                 $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
                 ZLog::Write(LOGLEVEL_DEBUG, "HandlePing(): no pingable folders found and no initialization data sent. Returning SYNC_PINGSTATUS_FAILINGPARAMS.");
             }
-            elseif(!$this->lifetimeBetweenBound($sc->GetLifetime())){
+            elseif (!$this->lifetimeBetweenBound($sc->GetLifetime())) {
                 $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): ping lifetime not between bound (higher bound:'%d' lower bound:'%d' current lifetime:'%d'. Returning SYNC_PINGSTATUS_FAILINGPARAMS.", PING_HIGHER_BOUND_LIFETIME, PING_LOWER_BOUND_LIFETIME, $sc->GetLifetime()));
             }
@@ -165,7 +165,7 @@ 
             }
         }
         catch (StatusException $ste) {
-            switch($ste->getCode()) {
+            switch ($ste->getCode()) {
                 case SyncCollections::ERROR_NO_COLLECTIONS:
                     $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
                     break;
@@ -192,7 +192,7 @@ 
                 self::$encoder->content($foundchanges ? SYNC_PINGSTATUS_CHANGES : SYNC_PINGSTATUS_HBEXPIRED);
             self::$encoder->endTag();
 
-            if (! $pingstatus) {
+            if (!$pingstatus) {
                 self::$encoder->startTag(SYNC_PING_FOLDERS);
 
                 if (empty($fakechanges))
@@ -225,12 +225,12 @@ 
                 }
                 self::$encoder->endTag();
             }
-            elseif($pingstatus == SYNC_PINGSTATUS_HBOUTOFRANGE){
+            elseif ($pingstatus == SYNC_PINGSTATUS_HBOUTOFRANGE) {
                 self::$encoder->startTag(SYNC_PING_LIFETIME);
-                if($sc->GetLifetime() > PING_HIGHER_BOUND_LIFETIME){
+                if ($sc->GetLifetime() > PING_HIGHER_BOUND_LIFETIME) {
                     self::$encoder->content(PING_HIGHER_BOUND_LIFETIME);
                 }
-                else{
+                else {
                     self::$encoder->content(PING_LOWER_BOUND_LIFETIME);
                 }
                 self::$encoder->endTag();
@@ -253,14 +253,14 @@ 
      * @access private
      * @return boolean
      */
-    private function lifetimeBetweenBound($lifetime){
-        if(PING_HIGHER_BOUND_LIFETIME !== false && PING_LOWER_BOUND_LIFETIME !== false){
+    private function lifetimeBetweenBound($lifetime) {
+        if (PING_HIGHER_BOUND_LIFETIME !== false && PING_LOWER_BOUND_LIFETIME !== false) {
             return ($lifetime <= PING_HIGHER_BOUND_LIFETIME && $lifetime >= PING_LOWER_BOUND_LIFETIME);
         }
-        if(PING_HIGHER_BOUND_LIFETIME !== false){
+        if (PING_HIGHER_BOUND_LIFETIME !== false) {
             return $lifetime <= PING_HIGHER_BOUND_LIFETIME;
         }
-        if(PING_LOWER_BOUND_LIFETIME !== false){
+        if (PING_LOWER_BOUND_LIFETIME !== false) {
             return $lifetime >= PING_LOWER_BOUND_LIFETIME;
         }
         return true;

lib/request/meetingresponse.php

Spacing +13 added lines, -13 removed lines

@@ -20,33 +20,33 @@ 
     public function Handle($commandCode) {
         $requests = Array();
 
-        if(!self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_MEETINGRESPONSE))
+        if (!self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_MEETINGRESPONSE))
             return false;
 
-        while(self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_REQUEST)) {
+        while (self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_REQUEST)) {
             $req = Array();
             WBXMLDecoder::ResetInWhile("meetingResponseRequest");
-            while(WBXMLDecoder::InWhile("meetingResponseRequest")) {
-                if(self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_USERRESPONSE)) {
+            while (WBXMLDecoder::InWhile("meetingResponseRequest")) {
+                if (self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_USERRESPONSE)) {
                     $req["response"] = self::$decoder->getElementContent();
-                    if(!self::$decoder->getElementEndTag())
+                    if (!self::$decoder->getElementEndTag())
                         return false;
                 }
 
-                if(self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_FOLDERID)) {
+                if (self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_FOLDERID)) {
                     $req["folderid"] = self::$decoder->getElementContent();
-                    if(!self::$decoder->getElementEndTag())
+                    if (!self::$decoder->getElementEndTag())
                         return false;
                 }
 
-                if(self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_REQUESTID)) {
+                if (self::$decoder->getElementStartTag(SYNC_MEETINGRESPONSE_REQUESTID)) {
                     $req["requestid"] = self::$decoder->getElementContent();
-                    if(!self::$decoder->getElementEndTag())
+                    if (!self::$decoder->getElementEndTag())
                         return false;
                 }
 
                 $e = self::$decoder->peek();
-                if($e[EN_TYPE] == EN_TYPE_ENDTAG) {
+                if ($e[EN_TYPE] == EN_TYPE_ENDTAG) {
                     self::$decoder->getElementEndTag();
                     break;
                 }
@@ -54,7 +54,7 @@ 
             array_push($requests, $req);
         }
 
-        if(!self::$decoder->getElementEndTag())
+        if (!self::$decoder->getElementEndTag())
             return false;
 
         // output the error code, plus the ID of the calendar item that was generated by the
@@ -62,7 +62,7 @@ 
         self::$encoder->StartWBXML();
         self::$encoder->startTag(SYNC_MEETINGRESPONSE_MEETINGRESPONSE);
 
-        foreach($requests as $req) {
+        foreach ($requests as $req) {
             $status = SYNC_MEETRESPSTATUS_SUCCESS;
 
             try {
@@ -89,7 +89,7 @@ 
                     self::$encoder->content($status);
                 self::$encoder->endTag();
 
-                if($status == SYNC_MEETRESPSTATUS_SUCCESS && !empty($calendarid)) {
+                if ($status == SYNC_MEETRESPSTATUS_SUCCESS && !empty($calendarid)) {
                     self::$encoder->startTag(SYNC_MEETINGRESPONSE_CALENDARID);
                         self::$encoder->content($calendarid);
                     self::$encoder->endTag();