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

Braces +8 added lines, -8 removed lines

@@ -57,8 +57,9 @@ 
     $user = "SYSTEM";
     $pass = "";
 
-    if (isset($options['h']))
-        $mapi = $options['h'];
+    if (isset($options['h'])) {
+            $mapi = $options['h'];
+    }
 
     // accept a remote user
     if (isset($options['u']) && isset($options['p'])) {
@@ -74,8 +75,7 @@ 
     $zarafaAdmin = listfolders_zarafa_admin_setup($mapi, $user, $pass, $sslcert_file, $sslcert_pass);
     if (isset($zarafaAdmin['adminStore']) && isset($options['l'])) {
         listfolders_getlist($zarafaAdmin['adminStore'], $zarafaAdmin['session'], trim($options['l']));
-    }
-    else {
+    } else {
         echo "Usage:\nlistfolders.php [actions] [options]\n\nActions: [-l username]\n\t-l username\tlist folders of user, for public folder use 'SYSTEM'\n\nGlobal options: [-h path] [[-u remoteuser] [-p password]] [[-c certificate_path] [-p password]]\n\t-h path\t\tconnect through <path>, e.g. file:///var/run/socket or https://10.0.0.1:237/grommunio\n\t-u remoteuser\tlogin as authenticated administration user\n\t-c certificate\tlogin with a ssl certificate located in this location, e.g. /etc/zarafa/ssl/client.pem\n\t-p password\tpassword of the remoteuser or certificate\n\n";
     }
 }
@@ -131,9 +131,9 @@ 
                 }
             }
         }
+    } else {
+            $entryid = @mapi_msgstore_createentryid($adminStore, $user);
     }
-    else
-        $entryid = @mapi_msgstore_createentryid($adminStore, $user);
 
     $userStore = @mapi_openmsgstore($session, $entryid);
     $hresult = mapi_last_hresult();
@@ -196,9 +196,9 @@ 
         if (version_compare(phpversion("mapi"), $version) == -1){
             return false;
         }
+    } else {
+            return false;
     }
-    else
-        return false;
 
     return true;
 }

lib/grommunio/mapistreamwrapper.php

Indentation +3 added lines, -3 removed lines

@@ -119,7 +119,7 @@ 
         return $this->position;
     }
 
-   /**
+    /**
      * Indicates if 'end of file' is reached
      *
      * @access public
@@ -159,7 +159,7 @@ 
         );
     }
 
-   /**
+    /**
      * Instantiates a MAPIStreamWrapper
      *
      * @param mapistream    $mapistream         The stream to be wrapped
@@ -168,7 +168,7 @@ 
      * @access public
      * @return MAPIStreamWrapper
      */
-     static public function Open($mapistream, $truncatehtmlsafe = false) {
+        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);
     }

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

Braces +5 added lines, -6 removed lines

@@ -33,8 +33,9 @@ 
      */
     public function stream_open($path, $mode, $options, &$opened_path) {
         $contextOptions = stream_context_get_options($this->context);
-        if (!isset($contextOptions[self::PROTOCOL]['stream']))
-            return false;
+        if (!isset($contextOptions[self::PROTOCOL]['stream'])) {
+                    return false;
+        }
 
         $this->position = 0;
         $this->toTruncate = false;
@@ -47,8 +48,7 @@ 
         if ($this->mapistream) {
             $stat = mapi_stream_stat($this->mapistream);
             $this->streamlength = $stat["cb"];
-        }
-        else {
+        } else {
             $this->streamlength = 0;
         }
 
@@ -74,8 +74,7 @@ 
         }
         if ($this->mapistream) {
             $data = mapi_stream_read($this->mapistream, $len);
-        }
-        else {
+        } else {
             $data = "";
         }
         $this->position += strlen($data);

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

Braces +152 added lines, -114 removed lines

@@ -63,20 +63,19 @@ 
             if ($folderidForBackendId != $this->folderidHex) {
                 $this->prefix = $folderidForBackendId . ':';
             }
-        }
-        else {
+        } else {
             $storeprops = mapi_getprops($store, array(PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID));
             if (ZPush::GetBackend()->GetImpersonatedUser() == 'system') {
                 $entryid = $storeprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-            }
-            else {
+            } else {
                 $entryid = $storeprops[PR_IPM_SUBTREE_ENTRYID];
             }
         }
 
         $folder = false;
-        if ($entryid)
-            $folder = mapi_msgstore_openentry($store, $entryid);
+        if ($entryid) {
+                    $folder = mapi_msgstore_openentry($store, $entryid);
+        }
 
         if(!$folder) {
             $this->importer = false;
@@ -90,8 +89,7 @@ 
 
         if ($folderid) {
             $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportContentsChanges, 0 , 0);
-        }
-        else {
+        } else {
             $this->importer = mapi_openproperty($folder, PR_COLLECTOR, IID_IExchangeImportHierarchyChanges, 0 , 0);
         }
     }
@@ -110,13 +108,15 @@ 
         $this->flags = $flags;
 
         // this should never happen
-        if ($this->importer === false)
-            throw new StatusException("ImportChangesICS->Config(): Error, importer not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        if ($this->importer === false) {
+                    throw new StatusException("ImportChangesICS->Config(): Error, importer not available", SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_ERROR);
+        }
 
         // Put the state information in a stream that can be used by ICS
         $stream = mapi_stream_create();
-        if(strlen($state) == 0)
-            $state = hex2bin("0000000000000000");
+        if(strlen($state) == 0) {
+                    $state = hex2bin("0000000000000000");
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->Config(): initializing importer with state: 0x%s", bin2hex($state)));
 
@@ -127,12 +127,13 @@ 
             // possible conflicting messages will be cached here
             $this->memChanges = new ChangesMemoryWrapper();
             $stat = mapi_importcontentschanges_config($this->importer, $stream, $flags);
+        } else {
+                    $stat = mapi_importhierarchychanges_config($this->importer, $stream, $flags);
         }
-        else
-            $stat = mapi_importhierarchychanges_config($this->importer, $stream, $flags);
 
-        if (!$stat)
-            throw new StatusException(sprintf("ImportChangesICS->Config(): Error, mapi_import_*_changes_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        if (!$stat) {
+                    throw new StatusException(sprintf("ImportChangesICS->Config(): Error, mapi_import_*_changes_config() failed: 0x%X", mapi_last_hresult()), SYNC_FSSTATUS_CODEUNKNOWN, null, LOGLEVEL_WARN);
+        }
         return $stat;
     }
 
@@ -172,25 +173,29 @@ 
      */
     public function GetState() {
         $error = false;
-        if(!isset($this->statestream) || $this->importer === false)
-            $error = true;
+        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 ($error === false && $this->folderid !== false && function_exists("mapi_importcontentschanges_updatestate")) {
+                    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);
+        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);
+        }
 
         mapi_stream_seek($this->statestream, 0, STREAM_SEEK_SET);
 
         $state = "";
         while(true) {
             $data = mapi_stream_read($this->statestream, 4096);
-            if(strlen($data))
-                $state .= $data;
-            else
-                break;
+            if(strlen($data)) {
+                            $state .= $data;
+            } else {
+                            break;
+            }
         }
 
         return $state;
@@ -265,8 +270,9 @@ 
      * @throws StatusException
      */
     public function LoadConflicts($contentparameters, $state) {
-        if (!isset($this->session) || !isset($this->store) || !isset($this->folderid))
-            throw new StatusException("ImportChangesICS->LoadConflicts(): Error, can not load changes for conflict detection. Session, store or folder information not available", SYNC_STATUS_SERVERERROR);
+        if (!isset($this->session) || !isset($this->store) || !isset($this->folderid)) {
+                    throw new StatusException("ImportChangesICS->LoadConflicts(): Error, can not load changes for conflict detection. Session, store or folder information not available", SYNC_STATUS_SERVERERROR);
+        }
 
         // save data to load changes later if necessary
         $this->conflictsLoaded = false;
@@ -352,8 +358,9 @@ 
             $props[PR_SOURCE_KEY] = hex2bin($sk);
 
             // check if message is in the synchronization interval and/or shared+private
-            if (!$this->isModificationAllowed($sk))
-                throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Message modification is not allowed. Data not saved.", $id, get_class($message)), SYNC_STATUS_SYNCCANNOTBECOMPLETED);
+            if (!$this->isModificationAllowed($sk)) {
+                            throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Message modification is not allowed. Data not saved.", $id, get_class($message)), SYNC_STATUS_SYNCCANNOTBECOMPLETED);
+            }
 
             // check for conflicts
             $this->lazyLoadConflicts();
@@ -362,31 +369,32 @@ 
                     // 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);
                     return false;
+                } 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)));
                 }
-                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)) {
                 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;
             }
+        } else {
+                    $flags = SYNC_NEW_MESSAGE;
         }
-        else
-            $flags = SYNC_NEW_MESSAGE;
 
         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);
+            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));
 
             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);
         }
-        else
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageChange('%s','%s'): Error updating object: 0x%X", $id, get_class($message), mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
     }
 
     /**
@@ -402,22 +410,23 @@ 
         list(,$sk) = Utils::SplitMessageId($id);
 
         // check if message is in the synchronization interval and/or shared+private
-        if (!$this->isModificationAllowed($sk))
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Message deletion is not allowed. Deletion not executed.", $id), SYNC_STATUS_OBJECTNOTFOUND);
+        if (!$this->isModificationAllowed($sk)) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Message deletion is not allowed. Deletion not executed.", $id), SYNC_STATUS_OBJECTNOTFOUND);
+        }
 
         // check for conflicts
         $this->lazyLoadConflicts();
         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))))
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageDeletion('%s'): Error updating object: 0x%X", $sk, mapi_last_hresult()), SYNC_STATUS_OBJECTNOTFOUND);
+        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;
     }
@@ -446,8 +455,9 @@ 
         if ($this->folderidHex == $fsk || empty($fsk)) {
 
             // check if it is in the synchronization interval and/or shared+private
-            if (!$this->isModificationAllowed($sk))
-                throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Flag update is not allowed. Flags not updated.", $id, $flags), SYNC_STATUS_OBJECTNOTFOUND);
+            if (!$this->isModificationAllowed($sk)) {
+                            throw new StatusException(sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): Flag update is not allowed. Flags not updated.", $id, $flags), SYNC_STATUS_OBJECTNOTFOUND);
+            }
 
             // check for conflicts
             /*
@@ -463,8 +473,9 @@ 
 
             $readstate = array ( "sourcekey" => hex2bin($sk), "flags" => $flags);
 
-            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);
+            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
         else {
@@ -475,8 +486,9 @@ 
             $entryid = mapi_msgstore_entryidfromsourcekey($store, hex2bin($fsk), hex2bin($sk));
             $realMessage = mapi_msgstore_openentry($store, $entryid);
             $flag = 0;
-            if ($flags == 0)
-                $flag |= CLEAR_READ_FLAG;
+            if ($flags == 0) {
+                            $flag |= CLEAR_READ_FLAG;
+            }
             $p = mapi_message_setreadflag($realMessage, $flag);
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportMessageReadFlag('%s','%d'): setting readflag on message: 0x%X", $id, $flags, mapi_last_hresult()));
         }
@@ -502,8 +514,9 @@ 
      */
     public function ImportMessageMove($id, $newfolder) {
         list(,$sk) = Utils::SplitMessageId($id);
-        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);
+        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
         $entryid = mapi_msgstore_entryidfromsourcekey($this->store, $this->folderid, hex2bin($sk));
@@ -526,47 +539,57 @@ 
         }
 
         // check if it is in the synchronization interval and/or shared+private
-        if (!$this->isModificationAllowed($sk))
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Source message move is not allowed. Move not performed.", $id, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        if (!$this->isModificationAllowed($sk)) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Source message move is not allowed. Move not performed.", $id, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        }
 
         // get correct mapi store for the destination folder
         $dststore = ZPush::GetBackend()->GetMAPIStoreForFolderId(ZPush::GetAdditionalSyncFolderStore($newfolder), $newfolder);
-        if ($dststore === false)
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open store of destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        if ($dststore === false) {
+                    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)
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        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)
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open destination folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        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);
-        if (!$newmessage)
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to create message in destination folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        if (!$newmessage) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to create message in destination folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDDESTID);
+        }
 
         // Copy message
         mapi_copyto($srcmessage, array(), array(), $newmessage);
-        if (mapi_last_hresult())
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, copy to destination message failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
+        if (mapi_last_hresult()) {
+                    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)
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to resolve source folder", $sk, $newfolder), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        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);
-        if (!$srcfolder)
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open source folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        if (!$srcfolder) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, unable to open source folder: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+        }
 
         // Save changes
         mapi_savechanges($newmessage);
-        if (mapi_last_hresult())
-            throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, mapi_savechanges() failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
+        if (mapi_last_hresult()) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportMessageMove('%s','%s'): Error, mapi_savechanges() failed: 0x%X", $sk, $newfolder, mapi_last_hresult()), SYNC_MOVEITEMSSTATUS_CANNOTMOVE);
+        }
 
         // Delete the old message
-        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);
+        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));
         if (isset($sourcekeyprops[PR_SOURCE_KEY]) && $sourcekeyprops[PR_SOURCE_KEY]) {
@@ -603,8 +626,9 @@ 
         $displayname = u2wi($folder->displayname);
         $type = $folder->type;
 
-        if (Utils::IsSystemFolder($type))
-            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, system folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
+        if (Utils::IsSystemFolder($type)) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, system folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
+        }
 
         // create a new folder if $id is not set
         if (!$id) {
@@ -613,25 +637,27 @@ 
                 $parentprops = mapi_getprops($this->store, array(PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID));
                 if (ZPush::GetBackend()->GetImpersonatedUser() == 'system' && isset($parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID])) {
                     $parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-                }
-                elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
+                } elseif (isset($parentprops[PR_IPM_SUBTREE_ENTRYID])) {
                     $parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
                 }
+            } else {
+                            $parentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
             }
-            else
-                $parentfentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($parent));
 
-            if (!$parentfentryid)
-                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (no entry id)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
+            if (!$parentfentryid) {
+                            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (no entry id)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
+            }
 
             $parentfolder = mapi_msgstore_openentry($this->store, $parentfentryid);
-            if (!$parentfolder)
-                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (open entry)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
+            if (!$parentfolder) {
+                            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open parent folder (open entry)", Utils::PrintAsString(false), $folder->parentid, $displayname), SYNC_FSSTATUS_PARENTNOTFOUND);
+            }
 
             //  mapi_folder_createfolder() fails if a folder with this name already exists -> MAPI_E_COLLISION
             $newfolder = mapi_folder_createfolder($parentfolder, $displayname, "");
-            if (mapi_last_hresult())
-                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_folder_createfolder() failed: 0x%X", Utils::PrintAsString(false), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_FOLDEREXISTS);
+            if (mapi_last_hresult()) {
+                            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_folder_createfolder() failed: 0x%X", Utils::PrintAsString(false), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_FOLDEREXISTS);
+            }
 
             mapi_setprops($newfolder, array(PR_CONTAINER_CLASS => MAPIUtils::GetContainerClassFromFolderType($type)));
 
@@ -645,35 +671,38 @@ 
                 $folder->serverid = ZPush::GetDeviceManager()->GetFolderIdForBackendId($folder->BackendId, true, $folderOrigin, $folder->displayname);
                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderChange(): Created folder '%s' with id: '%s' backendid: '%s'", $displayname, $folder->serverid, $folder->BackendId));
                 return $folder;
+            } else {
+                            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, folder created but PR_SOURCE_KEY not available: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
             }
-            else
-                throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, folder created but PR_SOURCE_KEY not available: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
         }
 
         // open folder for update
         $entryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($id));
-        if (!$entryid)
-            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
+        if (!$entryid) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, unable to open folder (no entry id): 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_PARENTNOTFOUND);
+        }
 
         // check if this is a MAPI default folder
-        if ($this->mapiprovider->IsMAPIDefaultFolder($entryid))
-            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, MAPI default folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
+        if ($this->mapiprovider->IsMAPIDefaultFolder($entryid)) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, MAPI default folder can not be created/modified", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname), SYNC_FSSTATUS_SYSTEMFOLDER);
+        }
 
         $mfolder = mapi_msgstore_openentry($this->store, $entryid);
-        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);
+        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));
-        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);
+        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);
+        }
 
         // get the real parent source key from mapi
         if ($parent == "0") {
             $parentprops = mapi_getprops($this->store, array(PR_IPM_SUBTREE_ENTRYID, PR_IPM_PUBLIC_FOLDERS_ENTRYID));
             if (ZPush::GetBackend()->GetImpersonatedUser() == 'system') {
                 $parentfentryid = $parentprops[PR_IPM_PUBLIC_FOLDERS_ENTRYID];
-            }
-            else {
+            } else {
                 $parentfentryid = $parentprops[PR_IPM_SUBTREE_ENTRYID];
             }
             $mapifolder = mapi_msgstore_openentry($this->store, $parentfentryid);
@@ -686,24 +715,29 @@ 
         // 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)
-                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);
+            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)
-                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);
+            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)
-                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);
+            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)
-                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);
+            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))
-                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);
+            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
             if ($folder->parentid != 0) {
@@ -718,8 +752,9 @@ 
         $props = array(PR_DISPLAY_NAME => $displayname);
         mapi_setprops($mfolder, $props);
         mapi_savechanges($mfolder);
-        if (mapi_last_hresult())
-            throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_savechanges() failed: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        if (mapi_last_hresult()) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportFolderChange('%s','%s','%s'): Error, mapi_savechanges() failed: 0x%X", Utils::PrintAsString($folder->serverid), $folder->parentid, $displayname, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        }
 
         ZLog::Write(LOGLEVEL_DEBUG, "Imported changes for folder: $id");
         return true;
@@ -740,18 +775,21 @@ 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): importing folder deletetion", $id, $parent));
 
         $folderentryid = mapi_msgstore_entryidfromsourcekey($this->store, hex2bin($id));
-        if(!$folderentryid)
-            throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error, unable to resolve folder", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_FOLDERDOESNOTEXIST);
+        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
         $type = $this->mapiprovider->GetFolderType($folderentryid);
 
-        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);
+        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)));
-        if (!$ret)
-            throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting folder: 0x%X", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        if (!$ret) {
+                    throw new StatusException(sprintf("ImportChangesICS->ImportFolderDeletion('%s','%s'): Error deleting folder: 0x%X", $id, $parent, mapi_last_hresult()), SYNC_FSSTATUS_SERVERERROR);
+        }
 
         return $ret;
     }

lib/request/provisioning.php

Indentation +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
                 self::$encoder->endTag();
 
                 self::$encoder->startTag(SYNC_PROVISION_POLICYKEY);
-                       self::$encoder->content($policykey);
+                        self::$encoder->content($policykey);
                 self::$encoder->endTag();
 
                 if ($phase2 && $policystatus === SYNC_PROVISION_POLICYSTATUS_SUCCESS) {

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

Braces +57 added lines, -36 removed lines

@@ -34,8 +34,9 @@ 
 
         $phase2 = true;
 
-        if(!self::$decoder->getElementStartTag(SYNC_PROVISION_PROVISION))
-            return false;
+        if(!self::$decoder->getElementStartTag(SYNC_PROVISION_PROVISION)) {
+                    return false;
+        }
 
         // Loop through Provision request tags. Possible are:
         // - Remote Wipe
@@ -55,22 +56,26 @@ 
                 $requestName = SYNC_SETTINGS_DEVICEINFORMATION;
             }
 
-            if (!$requestName)
-                break;
+            if (!$requestName) {
+                            break;
+            }
 
                 //set is available for OOF, device password and device information
             switch ($requestName) {
                 case SYNC_PROVISION_REMOTEWIPE:
-                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS))
-                        return false;
+                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS)) {
+                                            return false;
+                    }
 
                     $instatus = self::$decoder->getElementContent();
 
-                    if(!self::$decoder->getElementEndTag())
-                        return false;
+                    if(!self::$decoder->getElementEndTag()) {
+                                            return false;
+                    }
 
-                    if(!self::$decoder->getElementEndTag())
-                        return false;
+                    if(!self::$decoder->getElementEndTag()) {
+                                            return false;
+                    }
 
                     $phase2 = false;
                     $rwstatusWiped = true;
@@ -78,47 +83,59 @@ 
                     break;
 
                 case SYNC_PROVISION_POLICIES:
-                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_POLICY))
-                        return false;
+                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_POLICY)) {
+                                            return false;
+                    }
 
-                    if(!self::$decoder->getElementStartTag(SYNC_PROVISION_POLICYTYPE))
-                        return false;
+                    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())
-                            return false;
+                        if(!self::$decoder->getElementEndTag()) {
+                                                    return false;
+                        }
 
-                        if(!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS))
-                            return false;
+                        if(!self::$decoder->getElementStartTag(SYNC_PROVISION_STATUS)) {
+                                                    return false;
+                        }
 
                         $instatus = self::$decoder->getElementContent();
 
-                        if(!self::$decoder->getElementEndTag())
-                            return false;
+                        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;
 
                 case SYNC_SETTINGS_DEVICEINFORMATION:
                     // AS14.1 and later clients pass Device Information on the initial Provision request
-                    if (!self::$decoder->getElementStartTag(SYNC_SETTINGS_SET))
-                        return false;
+                    if (!self::$decoder->getElementStartTag(SYNC_SETTINGS_SET)) {
+                                            return false;
+                    }
                     $deviceInfoSet = true;
                     $deviceinformation = new SyncDeviceInformation();
                     $deviceinformation->Decode(self::$decoder);
@@ -126,14 +143,17 @@ 
                     if (! $wipeRequest) {
                         // for this operation the device manager is available
                         ZPush::GetDeviceManager()->SaveDeviceInformation($deviceinformation);
-                    }
-                    else {
+                    } else {
                         ZLog::Write(LOGLEVEL_DEBUG, "Ignoring incoming device information as WIPE is due.");
                     }
-                    if (!self::$decoder->getElementEndTag())  // SYNC_SETTINGS_SET
+                    if (!self::$decoder->getElementEndTag()) {
+                        // SYNC_SETTINGS_SET
                         return false;
-                    if (!self::$decoder->getElementEndTag())  // SYNC_SETTINGS_DEVICEINFORMATION
+                    }
+                    if (!self::$decoder->getElementEndTag()) {
+                        // SYNC_SETTINGS_DEVICEINFORMATION
                         return false;
+                    }
                     break;
 
                 default:
@@ -143,8 +163,10 @@ 
 
         }
 
-        if(!self::$decoder->getElementEndTag()) //provision
+        if(!self::$decoder->getElementEndTag()) {
+            //provision
             return false;
+        }
 
         if (PROVISIONING !== true) {
             ZLog::Write(LOGLEVEL_INFO, "No policies deployed to device");
@@ -191,20 +213,19 @@ 
                     self::$encoder->startTag(SYNC_PROVISION_DATA);
                     if ($policytype == 'MS-WAP-Provisioning-XML') {
                         self::$encoder->content('<wap-provisioningdoc><characteristic type="SecurityPolicy"><parm name="4131" value="1"/><parm name="4133" value="1"/></characteristic></wap-provisioningdoc>');
-                    }
-                    elseif ($policytype == 'MS-EAS-Provisioning-WBXML') {
+                    } elseif ($policytype == 'MS-EAS-Provisioning-WBXML') {
                         self::$encoder->startTag(SYNC_PROVISION_EASPROVISIONDOC);
 
                             // get the provisioning object and log the loaded policy values
                             $prov = ZPush::GetProvisioningManager()->GetProvisioningObject(true);
-                            if (!$prov->Check())
-                                throw new FatalException("Invalid policies!");
+                            if (!$prov->Check()) {
+                                                            throw new FatalException("Invalid policies!");
+                            }
 
                             ZPush::GetProvisioningManager()->SavePolicyHash($prov);
                             $prov->Encode(self::$encoder);
                         self::$encoder->endTag();
-                    }
-                    else {
+                    } else {
                         ZLog::Write(LOGLEVEL_WARN, "Wrong policy type");
                         self::$topCollector->AnnounceInformation("Policytype not supported", true);
                         return false;

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

Braces +33 added lines, -23 removed lines

@@ -18,35 +18,41 @@ 
      * @return boolean
      */
     public function Handle($commandCode) {
-        if(!self::$decoder->getElementStartTag(SYNC_MOVE_MOVES))
-            return false;
+        if(!self::$decoder->getElementStartTag(SYNC_MOVE_MOVES)) {
+                    return false;
+        }
 
         $moves = array();
         while(self::$decoder->getElementStartTag(SYNC_MOVE_MOVE)) {
             $move = array();
             if(self::$decoder->getElementStartTag(SYNC_MOVE_SRCMSGID)) {
                 $move["srcmsgid"] = self::$decoder->getElementContent();
-                if(!self::$decoder->getElementEndTag())
-                    break;
+                if(!self::$decoder->getElementEndTag()) {
+                                    break;
+                }
             }
             if(self::$decoder->getElementStartTag(SYNC_MOVE_SRCFLDID)) {
                 $move["srcfldid"] = self::$decoder->getElementContent();
-                if(!self::$decoder->getElementEndTag())
-                    break;
+                if(!self::$decoder->getElementEndTag()) {
+                                    break;
+                }
             }
             if(self::$decoder->getElementStartTag(SYNC_MOVE_DSTFLDID)) {
                 $move["dstfldid"] = self::$decoder->getElementContent();
-                if(!self::$decoder->getElementEndTag())
-                    break;
+                if(!self::$decoder->getElementEndTag()) {
+                                    break;
+                }
             }
             array_push($moves, $move);
 
-            if(!self::$decoder->getElementEndTag())
-                return false;
+            if(!self::$decoder->getElementEndTag()) {
+                            return false;
+            }
         }
 
-        if(!self::$decoder->getElementEndTag())
-            return false;
+        if(!self::$decoder->getElementEndTag()) {
+                    return false;
+        }
 
         self::$encoder->StartWBXML();
 
@@ -68,28 +74,32 @@ 
                 $sourceBackendFolderId = self::$deviceManager->GetBackendIdForFolderId($move["srcfldid"]);
 
                 // if the source folder is an additional folder the backend has to be setup correctly
-                if (!self::$backend->Setup(ZPush::GetAdditionalSyncFolderStore($sourceBackendFolderId)))
-                    throw new StatusException(sprintf("HandleMoveItems() could not Setup() the backend for folder id %s/%s", $move["srcfldid"], $sourceBackendFolderId), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+                if (!self::$backend->Setup(ZPush::GetAdditionalSyncFolderStore($sourceBackendFolderId))) {
+                                    throw new StatusException(sprintf("HandleMoveItems() could not Setup() the backend for folder id %s/%s", $move["srcfldid"], $sourceBackendFolderId), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+                }
 
                 $importer = self::$backend->GetImporter($sourceBackendFolderId);
-                if ($importer === false)
-                    throw new StatusException(sprintf("HandleMoveItems() could not get an importer for folder id %s/%s", $move["srcfldid"], $sourceBackendFolderId), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+                if ($importer === false) {
+                                    throw new StatusException(sprintf("HandleMoveItems() could not get an importer for folder id %s/%s", $move["srcfldid"], $sourceBackendFolderId), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+                }
 
                 // get saved SyncParameters of the source folder
                 $spa = self::$deviceManager->GetStateManager()->GetSynchedFolderState($move["srcfldid"]);
-                if (!$spa->HasSyncKey())
-                    throw new StatusException(sprintf("MoveItems(): Source folder id '%s' is not fully synchronized. Unable to perform operation.", $move["srcfldid"]), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+                if (!$spa->HasSyncKey()) {
+                                    throw new StatusException(sprintf("MoveItems(): Source folder id '%s' is not fully synchronized. Unable to perform operation.", $move["srcfldid"]), SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID);
+                }
 
                 $importer->ConfigContentParameters($spa->GetCPO());
 
                 $result = $importer->ImportMessageMove($move["srcmsgid"], self::$deviceManager->GetBackendIdForFolderId($move["dstfldid"]));
                 // We discard the standard importer state for now.
-            }
-            catch (StatusException $stex) {
-                if ($stex->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) // same as SYNC_FSSTATUS_CODEUNKNOWN
+            } catch (StatusException $stex) {
+                if ($stex->getCode() == SYNC_STATUS_FOLDERHIERARCHYCHANGED) {
+                    // same as SYNC_FSSTATUS_CODEUNKNOWN
                     $status = SYNC_MOVEITEMSSTATUS_INVALIDSOURCEID;
-                else
-                    $status = $stex->getCode();
+                } else {
+                                    $status = $stex->getCode();
+                }
             }
 
             if ($operationCounter % 10 == 0) {

lib/request/gethierarchy.php

Braces +4 added lines, -4 removed lines

@@ -21,13 +21,13 @@
     public function Handle($commandCode) {
         try {
             $folders = self::$backend->GetHierarchy();
-            if (!$folders || empty($folders))
-                throw new StatusException("GetHierarchy() did not return any data.");
+            if (!$folders || empty($folders)) {
+                            throw new StatusException("GetHierarchy() did not return any data.");
+            }
 
             // TODO execute $data->Check() to see if SyncObject is valid
 
-        }
-        catch (StatusException $ex) {
+        } catch (StatusException $ex) {
             return false;
         }
 

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

Braces +13 added lines, -9 removed lines

@@ -19,8 +19,9 @@ 
      */
     public function Handle($commandCode) {
         // Parse input
-        if(!self::$decoder->getElementStartTag(SYNC_VALIDATECERT_VALIDATECERT))
-            return false;
+        if(!self::$decoder->getElementStartTag(SYNC_VALIDATECERT_VALIDATECERT)) {
+                    return false;
+        }
 
         $validateCert = new SyncValidateCert();
         $validateCert->Decode(self::$decoder);
@@ -28,13 +29,16 @@ 
         $cert_pem = "-----BEGIN CERTIFICATE-----\n".chunk_split(base64_encode($cert_der), 64, "\n")."-----END CERTIFICATE-----\n";
 
         $checkpurpose = (defined('CAINFO') && CAINFO) ? openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN, array(CAINFO)) : openssl_x509_checkpurpose($cert_pem, X509_PURPOSE_SMIME_SIGN);
-        if ($checkpurpose === true)
-            $status = SYNC_VALIDATECERTSTATUS_SUCCESS;
-        else
-            $status = SYNC_VALIDATECERTSTATUS_CANTVALIDATESIG;
-
-        if(!self::$decoder->getElementEndTag())
-                return false; // SYNC_VALIDATECERT_VALIDATECERT
+        if ($checkpurpose === true) {
+                    $status = SYNC_VALIDATECERTSTATUS_SUCCESS;
+        } else {
+                    $status = SYNC_VALIDATECERTSTATUS_CANTVALIDATESIG;
+        }
+
+        if(!self::$decoder->getElementEndTag()) {
+                        return false;
+        }
+        // SYNC_VALIDATECERT_VALIDATECERT
 
         self::$encoder->startWBXML();
         self::$encoder->startTag(SYNC_VALIDATECERT_VALIDATECERT);

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

Braces +12 added lines, -8 removed lines

@@ -18,17 +18,21 @@
      * @return boolean
      */
     public function Handle($commandCode) {
-        if(!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_NOTIFY))
-            return false;
+        if(!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_NOTIFY)) {
+                    return false;
+        }
 
-        if(!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_DEVICEINFO))
-            return false;
+        if(!self::$decoder->getElementStartTag(SYNC_AIRNOTIFY_DEVICEINFO)) {
+                    return false;
+        }
 
-        if(!self::$decoder->getElementEndTag())
-            return false;
+        if(!self::$decoder->getElementEndTag()) {
+                    return false;
+        }
 
-        if(!self::$decoder->getElementEndTag())
-            return false;
+        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;

Braces +31 added lines, -38 removed lines

@@ -32,27 +32,23 @@ 
         // Load all collections - do load states, check permissions and allow unconfirmed states
         try {
             $sc->LoadAllCollections(true, true, true, true, false);
-        }
-        catch (StateInvalidException $siex) {
+        } catch (StateInvalidException $siex) {
             // if no params are present, indicate to send params, else do hierarchy sync
             if (!$params_present) {
                 $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
                 self::$topCollector->AnnounceInformation("StateInvalidException: require PingParameters", true);
-            }
-            elseif (self::$deviceManager->IsHierarchySyncRequired()) {
+            } elseif (self::$deviceManager->IsHierarchySyncRequired()) {
                 // we could be in a looping  - see LoopDetection->ProcessLoopDetectionIsHierarchySyncAdvised()
                 $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
                 self::$topCollector->AnnounceInformation("Potential loop detection: require HierarchySync", true);
-            }
-            else {
+            } else {
                 // we do not have a ping status for this, but SyncCollections should have generated fake changes for the folders which are broken
                 $fakechanges = $sc->GetChangedFolderIds();
                 $foundchanges = true;
 
                 self::$topCollector->AnnounceInformation("StateInvalidException: force sync", true);
             }
-        }
-        catch (StatusException $stex) {
+        } catch (StatusException $stex) {
             $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
             self::$topCollector->AnnounceInformation("StatusException: require HierarchySync", true);
         }
@@ -103,8 +99,7 @@ 
                                 ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): ignoring folder id '%s' as it's of type UNKNOWN ", $folderid));
                                 continue;
                             }
-                        }
-                        catch (NoHierarchyCacheAvailableException $nhca) {
+                        } catch (NoHierarchyCacheAvailableException $nhca) {
                             ZLog::Write(LOGLEVEL_INFO, sprintf("HandlePing(): unknown collection '%s', triggering HierarchySync", $folderid));
                             $pingstatus = SYNC_PINGSTATUS_FOLDERHIERSYNCREQUIRED;
                         }
@@ -112,36 +107,37 @@ 
                         // Trigger a Sync request because then the device will be forced to resync this folder.
                         $fakechanges[$folderid] = 1;
                         $foundchanges = true;
-                    }
-                    else if ($class == $spa->GetContentClass()) {
+                    } else if ($class == $spa->GetContentClass()) {
                         $pingable[] = $folderid;
                         ZLog::Write(LOGLEVEL_DEBUG, sprintf("HandlePing(): using saved sync state for '%s' id '%s'", $spa->GetContentClass(), $folderid));
                     }
                 }
-                if(!self::$decoder->getElementEndTag())
-                    return false;
+                if(!self::$decoder->getElementEndTag()) {
+                                    return false;
+                }
 
                 // update pingable flags
                 foreach ($sc as $folderid => $spa) {
                     // if the folderid is in $pingable, we should ping it, else remove the flag
                     if (in_array($folderid, $pingable)) {
                         $spa->SetPingableFlag(true);
-                    }
-                    else  {
+                    } else  {
                         $spa->DelPingableFlag();
                     }
                 }
             }
-            if(!self::$decoder->getElementEndTag())
-                return false;
+            if(!self::$decoder->getElementEndTag()) {
+                            return false;
+            }
 
             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()));
             }
             // save changed data
-            foreach ($sc as $folderid => $spa)
-                $sc->SaveCollection($spa);
+            foreach ($sc as $folderid => $spa) {
+                            $sc->SaveCollection($spa);
+            }
         } // END SYNC_PING_PING
         else {
             // if no ping initialization data was sent, we check if we have pingable folders
@@ -149,8 +145,7 @@ 
             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()));
             }
@@ -163,8 +158,7 @@ 
                 self::$deviceManager->DoAutomaticASDeviceSaving(false);
                 $foundchanges = $sc->CheckForChanges($sc->GetLifetime(), $interval, true);
             }
-        }
-        catch (StatusException $ste) {
+        } catch (StatusException $ste) {
             switch($ste->getCode()) {
                 case SyncCollections::ERROR_NO_COLLECTIONS:
                     $pingstatus = SYNC_PINGSTATUS_FAILINGPARAMS;
@@ -186,19 +180,21 @@ 
         self::$encoder->startTag(SYNC_PING_PING);
         {
             self::$encoder->startTag(SYNC_PING_STATUS);
-            if (isset($pingstatus) && $pingstatus)
-                self::$encoder->content($pingstatus);
-            else
-                self::$encoder->content($foundchanges ? SYNC_PINGSTATUS_CHANGES : SYNC_PINGSTATUS_HBEXPIRED);
+            if (isset($pingstatus) && $pingstatus) {
+                            self::$encoder->content($pingstatus);
+            } else {
+                            self::$encoder->content($foundchanges ? SYNC_PINGSTATUS_CHANGES : SYNC_PINGSTATUS_HBEXPIRED);
+            }
             self::$encoder->endTag();
 
             if (! $pingstatus) {
                 self::$encoder->startTag(SYNC_PING_FOLDERS);
 
-                if (empty($fakechanges))
-                    $changes = $sc->GetChangedFolderIds();
-                else
-                    $changes = $fakechanges;
+                if (empty($fakechanges)) {
+                                    $changes = $sc->GetChangedFolderIds();
+                } else {
+                                    $changes = $fakechanges;
+                }
 
                 $announceAggregated = false;
                 if (count($changes) > 1) {
@@ -213,8 +209,7 @@ 
                             if (empty($fakechanges)) {
                                 self::$topCollector->AnnounceInformation(sprintf("Found change in %s", $sc->GetCollection($folderid)->GetContentClass()), true);
                             }
-                        }
-                        else {
+                        } else {
                             $announceAggregated += $changecount;
                         }
                         self::$deviceManager->AnnounceProcessStatus($folderid, SYNC_PINGSTATUS_CHANGES);
@@ -224,13 +219,11 @@ 
                     self::$topCollector->AnnounceInformation(sprintf("Found %d changes in %d folders", $announceAggregated, count($changes)), true);
                 }
                 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){
                     self::$encoder->content(PING_HIGHER_BOUND_LIFETIME);
-                }
-                else{
+                } else{
                     self::$encoder->content(PING_LOWER_BOUND_LIFETIME);
                 }
                 self::$encoder->endTag();