grommunio / grommunio-sync

mapi/class.baserecurrence.php

Braces +109 added lines, -79 removed lines

@@ -232,8 +232,9 @@ 
 
                 case 0x0d:
                     // Yearly
-                    if (strlen($rdata) < 16)
-                        return $ret;
+                    if (strlen($rdata) < 16) {
+                                            return $ret;
+                    }
 
                     $data = unpack("Vmonth/Veveryn/Vregen/Vmonthday", $rdata);
 
@@ -564,8 +565,9 @@ 
         function saveRecurrence()
         {
             // Only save if a message was passed
-            if(!isset($this->message))
-                return;
+            if(!isset($this->message)) {
+                            return;
+            }
 
             // Abort if no recurrence was set
             if(!isset($this->recur["type"], $this->recur["subtype"], $this->recur["start"], $this->recur["end"], $this->recur["startocc"], $this->recur["endocc"])) {
@@ -622,8 +624,9 @@ 
                         $dayskip = -1;
                         for($j = 0; $j < 7; $j++) {
                             if(((int) $this->recur["weekdays"]) & (1<<( ($dayofweek+$j)%7)) ) {
-                                if($dayskip == -1)
-                                    $dayskip = $j;
+                                if($dayskip == -1) {
+                                                                    $dayskip = $j;
+                                }
 
                                 $daycount++;
                             }
@@ -633,8 +636,9 @@ 
                         // $daycount is the number of days per week that an occurrence occurs
 
                         $weekskip = 0;
-                        if(($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek+$dayskip) > 6)
-                            $weekskip = 1;
+                        if(($dayofweek < $weekstart && $dayskip > 0) || ($dayofweek+$dayskip) > 6) {
+                                                    $weekskip = 1;
+                        }
 
                         // Check if the recurrence ends after a number of occurences, in that case we must calculate the
                         // remaining occurences based on the start of the recurrence.
@@ -662,10 +666,11 @@ 
 
                     $firstocc -= (((int) gmdate("w", (int) $this->recur["start"])) - 1) * 24 * 60;
 
-                    if ($this->recur["regen"])
-                        $rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
-                    else
-                        $rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
+                    if ($this->recur["regen"]) {
+                                            $rdata .= pack("VVV", $firstocc, (int) $this->recur["everyn"], 1);
+                    } else {
+                                            $rdata .= pack("VVVV", $firstocc, (int) $this->recur["everyn"], 0, (int) $this->recur["weekdays"]);
+                    }
                     break;
                 case 0x0C:
                     // Monthly
@@ -680,7 +685,7 @@ 
 
                     if($term == 0x0C /*monthly*/) {
                         $everyn = (int) $this->recur["everyn"];
-                    }else {
+                    } else {
                         $everyn = $this->recur["regen"] ? ((int) $this->recur["everyn"]) * 12 : 12;
                     }
 
@@ -800,17 +805,18 @@ 
                             if($nday == 5) {
                                 // Set date on the last day of the last month
                                 $monthbegindow += (gmdate("t", $monthbegindow ) - gmdate("j", $monthbegindow )) * 24 * 60 * 60;
-                            }else {
+                            } else {
                                 // Set on the first day of the month
                                 $monthbegindow -= ((gmdate("j", $monthbegindow )-1) * 24 * 60 * 60);
                             }
 
                             if($term == 0x0D /*yearly*/) {
                                 // Set on right month
-                                if($selmonth < $curmonth)
-                                    $tmp = 12 - $curmonth + $selmonth;
-                                else
-                                    $tmp = ($selmonth - $curmonth);
+                                if($selmonth < $curmonth) {
+                                                                    $tmp = 12 - $curmonth + $selmonth;
+                                } else {
+                                                                    $tmp = ($selmonth - $curmonth);
+                                }
 
                                 for($i=0; $i < $tmp; $i++) {
                                     $monthbegindow += $this->getMonthInSeconds($curyear, $curmonth);
@@ -822,7 +828,7 @@ 
                                     $curmonth++;
                                 }
 
-                            }else {
+                            } else {
                                 // Check or you exist in the right month
 
                                 $dayofweek = gmdate("w", $monthbegindow);
@@ -830,7 +836,7 @@ 
                                     if($nday == 5 && (($dayofweek-$i)%7 >= 0) && (1<<( ($dayofweek-$i)%7) ) & $weekdays) {
                                         $day = gmdate("j", $monthbegindow) - $i;
                                         break;
-                                    }else if($nday != 5 && (1<<( ($dayofweek+$i)%7) ) & $weekdays) {
+                                    } else if($nday != 5 && (1<<( ($dayofweek+$i)%7) ) & $weekdays) {
                                         $day = (($nday-1)*7) + ($i+1);
                                         break;
                                     }
@@ -872,15 +878,16 @@ 
                                 if($nday == 5 && (($dayofweek-$i)%7) >= 0&& (1<<(($dayofweek-$i)%7) ) & $weekdays) {
                                     $day = $i;
                                     break;
-                                }else if($nday != 5 && (1<<( ($dayofweek+$i)%7) ) & $weekdays) {
+                                } else if($nday != 5 && (1<<( ($dayofweek+$i)%7) ) & $weekdays) {
                                     $day = ($nday - 1) * 7 + ($i+1);
                                     break;
                                 }
                             }
-                            if($nday == 5)
-                                $monthbegindow -= $day * 24 * 60 *60;
-                            else
-                                $monthbegindow += ($day-1) * 24 * 60 *60;
+                            if($nday == 5) {
+                                                            $monthbegindow -= $day * 24 * 60 *60;
+                            } else {
+                                                            $monthbegindow += ($day-1) * 24 * 60 *60;
+                            }
 
                             $firstocc = 0;
 
@@ -955,15 +962,17 @@ 
             // Merge deleted and changed items into one list
             $items = $deleted_items;
 
-            foreach($changed_items as $changed_item)
-                array_push($items, $changed_item["basedate"]);
+            foreach($changed_items as $changed_item) {
+                            array_push($items, $changed_item["basedate"]);
+            }
 
             sort($items);
 
             // Add the merged list in to the rdata
             $rdata .= pack("V", count($items));
-            foreach($items as $item)
-                $rdata .= pack("V", $this->unixDataToRecurData($item));
+            foreach($items as $item) {
+                            $rdata .= pack("V", $this->unixDataToRecurData($item));
+            }
 
             // Loop through the changed exceptions (not deleted)
             $rdata .= pack("V", count($changed_items));
@@ -977,8 +986,9 @@ 
             sort($items);
 
             // Add the changed items list int the rdata
-            foreach($items as $item)
-                $rdata .= pack("V", $this->unixDataToRecurData($item));
+            foreach($items as $item) {
+                            $rdata .= pack("V", $this->unixDataToRecurData($item));
+            }
 
             // Set start date
             $rdata .= pack("V", $this->unixDataToRecurData((int) $this->recur["start"]));
@@ -1014,8 +1024,9 @@ 
 
                                     $j++;
 
-                                    if($restocc <= 0)
-                                        break;
+                                    if($restocc <= 0) {
+                                                                            break;
+                                    }
 
                                     $occenddate += 24*60*60;
                                 }
@@ -1039,8 +1050,9 @@ 
                             for($j = 1; $restocc>0; $j++)
                             {
                                 // Jump to the next week (which may be N weeks away) when going over the week boundary
-                                if((($dayofweek+$j)%7) == $weekstart)
-                                    $occenddate += (((int) $this->recur["everyn"])-1) * 7 * 24*60*60;
+                                if((($dayofweek+$j)%7) == $weekstart) {
+                                                                    $occenddate += (((int) $this->recur["everyn"])-1) * 7 * 24*60*60;
+                                }
 
                                 // If this is a matching day, once less occurrence to process
                                 if(((int) $this->recur["weekdays"]) & (1<<(($dayofweek+$j)%7)) ) {
@@ -1079,10 +1091,11 @@ 
                                     if(((int) $this->recur["monthday"]) >=28 && ((int) $this->recur["monthday"]) <= 31 &&
                                         gmdate("j", $occenddate) < ((int) $this->recur["monthday"]))
                                     {
-                                        if(gmdate("j", $occenddate) < 28)
-                                            $occenddate -= gmdate("j", $occenddate) * 24 * 60 *60;
-                                        else
-                                            $occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 *60;
+                                        if(gmdate("j", $occenddate) < 28) {
+                                                                                    $occenddate -= gmdate("j", $occenddate) * 24 * 60 *60;
+                                        } else {
+                                                                                    $occenddate += (gmdate("t", $occenddate) - gmdate("j", $occenddate)) * 24 * 60 *60;
+                                        }
                                     }
 
 
@@ -1108,7 +1121,7 @@ 
                                     if($nday == 5) {
                                         // Set date on the last day of the last month
                                         $occenddate += (gmdate("t", $occenddate ) - gmdate("j", $occenddate )) * 24 * 60 * 60;
-                                    }else {
+                                    } else {
                                         // Set date on the first day of the last month
                                         $occenddate -= (gmdate("j", $occenddate )-1) * 24 * 60 * 60;
                                     }
@@ -1118,7 +1131,7 @@ 
                                         if($nday == 5 && (($dayofweek-$i)%7) >= 0&& (1<<(($dayofweek-$i)%7) ) & $weekdays) {
                                             $occenddate -= $i * 24 * 60 * 60;
                                             break;
-                                        }else if($nday != 5 && (1<<(($dayofweek+$i)%7) ) & $weekdays) {
+                                        } else if($nday != 5 && (1<<(($dayofweek+$i)%7) ) & $weekdays) {
                                             $occenddate +=  ($i + (($nday-1) *7)) * 24 * 60 * 60;
                                             break;
                                         }
@@ -1131,8 +1144,9 @@ 
 
                     }
 
-                    if (defined("PHP_INT_MAX") && $occenddate > PHP_INT_MAX)
-                        $occenddate = PHP_INT_MAX;
+                    if (defined("PHP_INT_MAX") && $occenddate > PHP_INT_MAX) {
+                                            $occenddate = PHP_INT_MAX;
+                    }
 
                     $this->recur["end"] = $occenddate;
 
@@ -1419,8 +1433,9 @@ 
                 $day = 30;
             } else {
                 $day = 28;
-                if( $this->isLeapYear($year) == 1 )
-                    $day++;
+                if( $this->isLeapYear($year) == 1 ) {
+                                    $day++;
+                }
             }
             return $day * 24 * 60 * 60;
         }
@@ -1453,8 +1468,9 @@ 
             // if we are in the next month, then back up a week, because week '5' means
             // 'last week of month'
 
-            if($gmdate["tm_mon"]+1 != $month)
-                $date -= 7 * 24 * 60 * 60;
+            if($gmdate["tm_mon"]+1 != $month) {
+                            $date -= 7 * 24 * 60 * 60;
+            }
 
             return $date;
         }
@@ -1466,8 +1482,9 @@ 
         function getTimezone($tz, $date)
         {
             // No timezone -> GMT (+0)
-            if(!isset($tz["timezone"]))
-                return 0;
+            if(!isset($tz["timezone"])) {
+                            return 0;
+            }
 
             $dst = false;
             $gmdate = $this->gmtime($date);
@@ -1511,8 +1528,9 @@ 
          */
         function parseTimezone($data)
         {
-            if(strlen($data) < 48)
-                return;
+            if(strlen($data) < 48) {
+                            return;
+            }
 
             $tz = unpack("ltimezone/lunk/ltimezonedst/lunk/ldstendmonth/vdstendweek/vdstendhour/lunk/lunk/vunk/ldststartmonth/vdststartweek/vdststarthour/lunk/vunk", $data);
             return $tz;
@@ -1550,8 +1568,9 @@ 
          * toGMT returns a timestamp in GMT time for the time and timezone given
          */
         function toGMT($tz, $date) {
-            if(!isset($tz['timezone']))
-                return $date;
+            if(!isset($tz['timezone'])) {
+                            return $date;
+            }
             $offset = $this->getTimezone($tz, $date);
 
             return $date + $offset * 60;
@@ -1627,21 +1646,24 @@ 
                     // Loop through all changed exceptions
                     foreach($this->recur["changed_occurences"] as $exception) {
                         // Check reminder set
-                        if(!isset($exception["reminder"]) || $exception["reminder"] == false)
-                            continue;
+                        if(!isset($exception["reminder"]) || $exception["reminder"] == false) {
+                                                    continue;
+                        }
 
                         // Convert to GMT
                         $occstart = $this->toGMT($this->tz, $exception["start"]); // seb changed $tz to $this->tz
                         $occend = $this->toGMT($this->tz, $exception["end"]); // seb changed $tz to $this->tz
 
                         // Check range criterium
-                        if($occstart > $end || $occend < $start)
-                            continue;
+                        if($occstart > $end || $occend < $start) {
+                                                    continue;
+                        }
 
                         // OK, add to items.
                         array_push($items, $this->getExceptionProperties($exception));
-                        if($limit && (count($items) == $limit))
-                            break;
+                        if($limit && (count($items) == $limit)) {
+                                                    break;
+                        }
                     }
 
                     uasort($items, array($this, "sortStarttime"));
@@ -1674,8 +1696,9 @@ 
                 {
                 case 10:
                     // Daily
-                    if($this->recur["everyn"] <= 0)
-                        $this->recur["everyn"] = 1440;
+                    if($this->recur["everyn"] <= 0) {
+                                            $this->recur["everyn"] = 1440;
+                    }
 
                     if($this->recur["subtype"] == 0) {
                         // Every Nth day
@@ -1695,11 +1718,14 @@ 
                     break;
                 case 11:
                     // Weekly
-                    if($this->recur["everyn"] <= 0)
-                        $this->recur["everyn"] = 1;
+                    if($this->recur["everyn"] <= 0) {
+                                            $this->recur["everyn"] = 1;
+                    }
 
                     // If sliding flag is set then move to 'n' weeks
-                    if ($this->recur['regen']) $daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
+                    if ($this->recur['regen']) {
+                        $daystart += (60 * 60 * 24 * 7 * $this->recur["everyn"]);
+                    }
 
                     for($now = $daystart; $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += (60 * 60 * 24 * 7 * $this->recur["everyn"]))
                     {
@@ -1723,8 +1749,9 @@ 
                     break;
                 case 12:
                     // Monthly
-                    if($this->recur["everyn"] <= 0)
-                        $this->recur["everyn"] = 1;
+                    if($this->recur["everyn"] <= 0) {
+                                            $this->recur["everyn"] = 1;
+                    }
 
                     // Loop through all months from start to end of occurrence, starting at beginning of first month
                     for($now = $this->monthStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
@@ -1739,11 +1766,11 @@ 
                             if ($daynow <= $dayend){
                                 $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
                             }
-                        }
-                        else if(isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
+                        } else if(isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] of every N months
                             // Sanitize input
-                            if($this->recur["weekdays"] == 0)
-                                $this->recur["weekdays"] = 1;
+                            if($this->recur["weekdays"] == 0) {
+                                                            $this->recur["weekdays"] = 1;
+                            }
 
                             // If nday is not set to the last day in the month
                             if ($this->recur["nday"] < 5) {
@@ -1766,7 +1793,7 @@ 
                                 }
                                 // $firstday is the day of the month on which the asked pattern of nth weekday matches
                                 $daynow = $now + $firstday * 60 * 60 * 24;
-                            }else{
+                            } else{
                                 // Find last day in the month ($now is the firstday of the month)
                                 $NumDaysInMonth =  $this->daysInMonth($now, 1);
                                 $daynow = $now + (($NumDaysInMonth-1) * 24*60*60);
@@ -1796,8 +1823,9 @@ 
                     break;
                 case 13:
                     // Yearly
-                    if($this->recur["everyn"] <= 0)
-                        $this->recur["everyn"] = 12;
+                    if($this->recur["everyn"] <= 0) {
+                                            $this->recur["everyn"] = 12;
+                    }
 
                     for($now = $this->yearStartOf($daystart); $now <= $dayend && ($limit == 0 || count($items) < $limit); $now += $this->daysInMonth($now, $this->recur["everyn"]) * 24 * 60 * 60 )
                     {
@@ -1806,12 +1834,13 @@ 
                             $month = $this->monthOfYear($this->recur["month"]); // $month is now month of year [0..11]
                             $monthday = $this->recur["monthday"]; // $monthday is day of the month [1..31]
                             $monthstart = $now + $this->daysInMonth($now, $month) * 24 * 60 * 60; // $monthstart is the timestamp of the beginning of the month
-                            if($monthday > $this->daysInMonth($monthstart, 1))
-                                $monthday = $this->daysInMonth($monthstart, 1);    // Cap $monthday on month length (eg 28 feb instead of 29 feb)
+                            if($monthday > $this->daysInMonth($monthstart, 1)) {
+                                                            $monthday = $this->daysInMonth($monthstart, 1);
+                            }
+                            // Cap $monthday on month length (eg 28 feb instead of 29 feb)
                             $daynow = $monthstart + ($monthday-1) * 24 * 60 * 60;
                             $this->processOccurrenceItem($items, $start, $end, $daynow, $this->recur["startocc"], $this->recur["endocc"], $this->tz, $remindersonly);
-                        }
-                        else if(isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
+                        } else if(isset($this->recur["nday"], $this->recur["weekdays"])) { // Nth [weekday] in month X of every N years
 
                             // Go the correct month
                             $monthnow = $now + $this->daysInMonth($now, $this->monthOfYear($this->recur["month"])) * 24 * 60 * 60;
@@ -1848,8 +1877,9 @@ 
                     }
                 }
                 //to get all exception items
-                if (!empty($this->recur['changed_occurences']))
-                    $this->processExceptionItems($items, $start, $end);
+                if (!empty($this->recur['changed_occurences'])) {
+                                    $this->processExceptionItems($items, $start, $end);
+                }
             }
 
             // sort items on starttime

mapi/class.mapiexception.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
          */
         public function getDisplayMessage()
         {
-            if(!empty($this->displayMessage))
-                return $this->displayMessage;
+            if(!empty($this->displayMessage)) {
+                            return $this->displayMessage;
+            }
 
             switch($this->getCode())
             {

mapi/class.taskrecurrence.php

Braces +25 added lines, -13 removed lines

@@ -76,14 +76,20 @@ 
             $this->recur = $recur;
             $this->action =& $recur;
 
-            if(!isset($this->recur["changed_occurences"]))
-                $this->recur["changed_occurences"] = Array();
+            if(!isset($this->recur["changed_occurences"])) {
+                            $this->recur["changed_occurences"] = Array();
+            }
 
-            if(!isset($this->recur["deleted_occurences"]))
-                $this->recur["deleted_occurences"] = Array();
+            if(!isset($this->recur["deleted_occurences"])) {
+                            $this->recur["deleted_occurences"] = Array();
+            }
 
-            if (!isset($this->recur['startocc'])) $this->recur['startocc'] = 0;
-            if (!isset($this->recur['endocc'])) $this->recur['endocc'] = 0;
+            if (!isset($this->recur['startocc'])) {
+                $this->recur['startocc'] = 0;
+            }
+            if (!isset($this->recur['endocc'])) {
+                $this->recur['endocc'] = 0;
+            }
 
             // Save recurrence because we need proper startrecurrdate and endrecurrdate
             $this->saveRecurrence();
@@ -109,7 +115,7 @@ 
             // Check if it is already the first occurrence
             if($this->action['start'] == $this->recur["start"]){
                 return;
-            }else{
+            } else{
                 $items = $this->getNextOccurrence();
 
                 $props = array();
@@ -171,8 +177,9 @@ 
 
                     $props[$this->proptags["dead_occurrence"]] = false;
                 } else {
-                    if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence'])
-                        return false;
+                    if (isset($this->action['deleteOccurrence']) && $this->action['deleteOccurrence']) {
+                                            return false;
+                    }
 
                     // Didn't get next occurrence, probably this is the last one, so recurrence ends here
                     $props[$this->proptags["dead_occurrence"]] = true;
@@ -224,8 +231,12 @@ 
             // Get all properties
             $taskItemProps = mapi_getprops($this->message);
 
-            if (isset($this->action["subject"])) $taskItemProps[$this->proptags["subject"]] = $this->action["subject"];
-            if (isset($this->action["importance"])) $taskItemProps[$this->proptags["importance"]] = $this->action["importance"];
+            if (isset($this->action["subject"])) {
+                $taskItemProps[$this->proptags["subject"]] = $this->action["subject"];
+            }
+            if (isset($this->action["importance"])) {
+                $taskItemProps[$this->proptags["importance"]] = $this->action["importance"];
+            }
             if (isset($this->action["startdate"])) {
                 $taskItemProps[$this->proptags["startdate"]] = $this->action["startdate"];
                 $taskItemProps[$this->proptags["commonstart"]] = $this->action["startdate"];
@@ -380,8 +391,9 @@ 
                 $props[$this->proptags['reset_reminder']] = false;
             }
 
-            if (!empty($props))
-                mapi_setprops($this->message, $props);
+            if (!empty($props)) {
+                            mapi_setprops($this->message, $props);
+            }
         }
 
         /**

index.php

Braces +51 added lines, -39 removed lines

@@ -14,7 +14,9 @@ 
 
 require_once 'vendor/autoload.php';
 
-if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
+if (!defined('ZPUSH_CONFIG')) {
+    define('ZPUSH_CONFIG', 'config.php');
+}
 include_once(ZPUSH_CONFIG);
 
     // Attempt to set maximum execution time
@@ -33,8 +35,9 @@ 
                         Request::GetCommand(), Request::GetDeviceType(), Request::GetDeviceID(), Request::GetGETUser(), Request::GetRemoteAddr(), @constant('GROMMUNIOSYNC_VERSION'), Request::GetMethod() ));
 
         // always request the authorization header
-        if (! Request::HasAuthenticationInfo() || !Request::GetGETUser())
-            throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
+        if (! Request::HasAuthenticationInfo() || !Request::GetGETUser()) {
+                    throw new AuthenticationRequiredException("Access denied. Please send authorisation information");
+        }
 
         ZPush::CheckAdvancedConfig();
 
@@ -48,8 +51,9 @@ 
         }
 
         // Check required GET parameters
-        if(Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType()))
-            throw new FatalException("Requested the grommunio-sync URL without the required GET parameters");
+        if(Request::IsMethodPOST() && (Request::GetCommandCode() === false || !Request::GetDeviceID() || !Request::GetDeviceType())) {
+                    throw new FatalException("Requested the grommunio-sync URL without the required GET parameters");
+        }
 
         // Load the backend
         $backend = ZPush::GetBackend();
@@ -58,17 +62,20 @@ 
         if (PROVISIONING === true && Request::IsMethodPOST() && ZPush::CommandNeedsProvisioning(Request::GetCommandCode()) &&
             ((Request::WasPolicyKeySent() && Request::GetPolicyKey() == 0) || ZPush::GetProvisioningManager()->ProvisioningRequired(Request::GetPolicyKey())) &&
             (LOOSE_PROVISIONING === false ||
-            (LOOSE_PROVISIONING === true && Request::WasPolicyKeySent())))
-            //TODO for AS 14 send a wbxml response
+            (LOOSE_PROVISIONING === true && Request::WasPolicyKeySent()))) {
+                    //TODO for AS 14 send a wbxml response
             throw new ProvisioningRequiredException();
+        }
 
         // most commands require an authenticated user
-        if (ZPush::CommandNeedsAuthentication(Request::GetCommandCode()))
-            RequestProcessor::Authenticate();
+        if (ZPush::CommandNeedsAuthentication(Request::GetCommandCode())) {
+                    RequestProcessor::Authenticate();
+        }
 
         // Do the actual processing of the request
-        if (Request::IsMethodGET())
-            throw new NoPostRequestException("This is the grommunio-sync location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
+        if (Request::IsMethodGET()) {
+                    throw new NoPostRequestException("This is the grommunio-sync location and can only be accessed by Microsoft ActiveSync-capable devices", NoPostRequestException::GET_REQUEST);
+        }
 
         // Do the actual request
         header(ZPush::GetServerHeader());
@@ -110,36 +117,35 @@ 
         // data send as a 'normal' packet. If the output packet exceeds 1MB (see ob_start)
         // then it will be sent as a chunked packet anyway because PHP will have to flush
         // the buffer.
-        if(!headers_sent())
-            header("Content-Length: $len");
+        if(!headers_sent()) {
+                    header("Content-Length: $len");
+        }
 
         // send vnd.ms-sync.wbxml content type header if there is no content
         // otherwise text/html content type is added which might break some devices
-        if (!headers_sent() && $len == 0)
-            header("Content-Type: application/vnd.ms-sync.wbxml");
+        if (!headers_sent() && $len == 0) {
+                    header("Content-Type: application/vnd.ms-sync.wbxml");
+        }
 
         print $data;
 
         // destruct backend after all data is on the stream
         $backend->Logoff();
-    }
-
-    catch (NoPostRequestException $nopostex) {
+    } catch (NoPostRequestException $nopostex) {
         if ($nopostex->getCode() == NoPostRequestException::OPTIONS_REQUEST) {
             header(ZPush::GetServerHeader());
             header(ZPush::GetSupportedProtocolVersions());
             header(ZPush::GetSupportedCommands());
             ZLog::Write(LOGLEVEL_INFO, $nopostex->getMessage());
+        } else if ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
+            if (Request::GetUserAgent()) {
+                            ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+            }
+            if (!headers_sent() && $nopostex->showLegalNotice()) {
+                            ZPush::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
+            }
         }
-        else if ($nopostex->getCode() == NoPostRequestException::GET_REQUEST) {
-            if (Request::GetUserAgent())
-                ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
-            if (!headers_sent() && $nopostex->showLegalNotice())
-                ZPush::PrintGrommunioSyncLegal('GET not supported', $nopostex->getMessage());
-        }
-    }
-
-    catch (Exception $ex) {
+    } catch (Exception $ex) {
         // Extract any previous exception message for logging purpose.
         $exclass = get_class($ex);
         $exception_message = $ex->getMessage();
@@ -150,20 +156,23 @@ 
             } while($current_exception->getPrevious());
         }
 
-        if (Request::GetUserAgent())
-            ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+        if (Request::GetUserAgent()) {
+                    ZLog::Write(LOGLEVEL_INFO, sprintf("User-agent: '%s'", Request::GetUserAgent()));
+        }
 
         ZLog::Write(LOGLEVEL_FATAL, sprintf('Exception: (%s) - %s', $exclass, $exception_message));
 
         if(!headers_sent()) {
             if ($ex instanceof ZPushException) {
                 header('HTTP/1.1 '. $ex->getHTTPCodeString());
-                foreach ($ex->getHTTPHeaders() as $h)
-                    header($h);
+                foreach ($ex->getHTTPHeaders() as $h) {
+                                    header($h);
+                }
             }
             // something really unexpected happened!
-            else
-                header('HTTP/1.1 500 Internal Server Error');
+            else {
+                            header('HTTP/1.1 500 Internal Server Error');
+            }
         }
 
         if ($ex instanceof AuthenticationRequiredException) {
@@ -175,8 +184,9 @@ 
             }
 
             // log the failed login attempt e.g. for fail2ban
-            if (defined('LOGAUTHFAIL') && LOGAUTHFAIL != false)
-                ZLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'",  Request::GetRemoteAddr(), Request::GetAuthUser()? Request::GetAuthUser(): Request::GetGETUser() ));
+            if (defined('LOGAUTHFAIL') && LOGAUTHFAIL != false) {
+                            ZLog::Write(LOGLEVEL_WARN, sprintf("IP: %s failed to authenticate user '%s'",  Request::GetRemoteAddr(), Request::GetAuthUser()? Request::GetAuthUser(): Request::GetGETUser() ));
+            }
         }
 
         // This could be a WBXML problem.. try to get the complete request
@@ -195,16 +205,18 @@ 
         }
 
         // Announce exception to process loop detection
-        if (ZPush::GetDeviceManager(false))
-            ZPush::GetDeviceManager()->AnnounceProcessException($ex);
+        if (ZPush::GetDeviceManager(false)) {
+                    ZPush::GetDeviceManager()->AnnounceProcessException($ex);
+        }
 
         // Announce exception if the TopCollector if available
         ZPush::GetTopCollector()->AnnounceInformation(get_class($ex), true);
     }
 
     // save device data if the DeviceManager is available
-    if (ZPush::GetDeviceManager(false))
-        ZPush::GetDeviceManager()->Save();
+    if (ZPush::GetDeviceManager(false)) {
+            ZPush::GetDeviceManager()->Save();
+    }
 
     // end gracefully
     ZLog::Write(LOGLEVEL_INFO,