route4me / route4me-php-sdk

src/Route4Me/Route4Me.php

Braces +1 added lines, -1 removed lines

@@ -198,7 +198,7 @@
             } else {
                 return $json;
             }
-        }  elseif (409==$code) {
+        } elseif (409==$code) {
             throw new ApiError('Wrong API key');
         } else {
             throw new ApiError('Something wrong');

src/Route4Me/AddressBookLocation.php

Braces +18 added lines, -6 removed lines

@@ -258,14 +258,18 @@ 
     {
         $weekdays = explode(',', $scheduleWeekDays);
         
-        if (sizeof($weekdays)<1) return FALSE;
+        if (sizeof($weekdays)<1) {
+        	return FALSE;
+        }
         
         $isValid = TRUE;
         
         for ($i=0; $i<sizeof($weekdays); $i++) { 
             if (is_numeric($weekdays[$i])) {
                 $wday = intval($weekdays[$i]);
-                if ($wday<1 || $wday>7) $isValid = FALSE;
+                if ($wday<1 || $wday>7) {
+                	$isValid = FALSE;
+                }
             } else {
                 $isValid = FALSE;
             }
@@ -289,14 +293,18 @@ 
     {
         $monthlyDates = explode(',', $scheduleMonthlyDates);
         
-        if (sizeof($monthlyDates) <1) return FALSE;
+        if (sizeof($monthlyDates) <1) {
+        	return FALSE;
+        }
         
         $isValid = TRUE;
         
         for ($i=0; $i < sizeof($monthlyDates); $i++) { 
             if (is_numeric($monthlyDates[$i])) {
                 $mday = intval($monthlyDates[$i]);
-                if ($mday <1 || $mday > 31) $isValid = FALSE;
+                if ($mday <1 || $mday > 31) {
+                	$isValid = FALSE;
+                }
             } else {
                 $isValid = FALSE;
             }
@@ -307,7 +315,9 @@ 
     
     public static function validateScheduleNthN($scheduleNthN)
     {
-        if (!is_numeric($scheduleNthN)) return FALSE;
+        if (!is_numeric($scheduleNthN)) {
+        	return FALSE;
+        }
         
         $schedNthNs = array(1, 2, 3, 4, 5, -1);
         
@@ -320,7 +330,9 @@ 
     
     public static function validateScheduleNthWhat($scheduleNthWhat)
     {
-        if (!is_numeric($scheduleNthWhat)) return FALSE;
+        if (!is_numeric($scheduleNthWhat)) {
+        	return FALSE;
+        }
         
         $schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         

Switch Indentation +54 added lines, -54 removed lines

@@ -351,70 +351,70 @@
             
             if ($mode!='daily') {
                 switch ($mode) {
-                    case 'weekly':
-                        if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                            if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                 $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                            } else {
-                                array_push($results['fail'], "$iRow --> Wrong weekdays"); 
-                            }
+                case 'weekly':
+                    if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                        if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+                             $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                         } else {
-                            array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
+                            array_push($results['fail'], "$iRow --> Wrong weekdays"); 
                         }
-                        break;
-                    case 'monthly':
-                        $monthlyMode = "";
-                        if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                            if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                 $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
-                                 $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                            } else {
-                                array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
-                            }
+                    } else {
+                        array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
+                    }
+                    break;
+                case 'monthly':
+                    $monthlyMode = "";
+                    if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+                        if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+                             $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
+                             $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                         } else {
-                            array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
+                            array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
                         }
+                    } else {
+                        array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
+                    }
                         
-                        if ($monthlyMode!="") {
-                            switch ($monthlyMode) {
-                                case 'dates':
-                                    if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                        if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                             $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
-                                        }
-                                    }
-                                    break;
-                                case 'nth':
-                                    if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                        if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                             $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
-                                        }
-                                    } else {
-                                        array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
-                                    }
+                    if ($monthlyMode!="") {
+                        switch ($monthlyMode) {
+                        case 'dates':
+                        if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+                        if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+                             $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+                        } else {
+                            array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
+                        }
+                        }
+                        break;
+                        case 'nth':
+                        if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                        if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
+                             $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+                        } else {
+                            array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
+                        }
+                        } else {
+                        array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
+                        }
                                     
-                                    if ($curSchedule!="") {
-                                        if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                            if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                            } else {
-                                                array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
-                                            }
-                                        } else {
-                                            array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
-                                        }
-                                    }
-                                    break;
+                        if ($curSchedule!="") {
+                        if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                            if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+                                 $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+                            } else {
+                                array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
                             }
+                        } else {
+                            array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
+                        }
                         }
                         break;
-                    default:
-                        $curSchedule = "";
+                        }
+                        }
                         break;
+                default:
+                    $curSchedule = "";
+                    break;
                 }
             }
 

src/Route4Me/AvoidanceZone.php

Braces +6 added lines, -2 removed lines

@@ -70,8 +70,12 @@
     {
         $terParams = array();
 
-        if (isset($params->territory['type'])) $terParams['type'] = $params->territory['type'];
-        if (isset($params->territory['data'])) $terParams['data'] = $params->territory['data'];
+        if (isset($params->territory['type'])) {
+        	$terParams['type'] = $params->territory['type'];
+        }
+        if (isset($params->territory['data'])) {
+        	$terParams['data'] = $params->territory['data'];
+        }
 
         $abContacts = Route4Me::makeRequst(array(
             'url'    => Endpoint::AVOIDANCE_ZONE,

src/Route4Me/Order.php

Braces +1 added lines, -2 removed lines

@@ -327,8 +327,7 @@
                 $orderResults = $order->addOrder($orderParameters);
                 
                 array_push($results['success'], "The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
-            }
-            else {
+            } else {
                 array_push($results['fail'], "$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
             }
             

src/Route4Me/Vehicle.php

Braces +9 added lines, -3 removed lines

@@ -98,9 +98,15 @@
         
         $vehicles = $this->getVehicles($params);
 
-        if (is_null($vehicles)) return null;
-        if (!isset($vehicles['data'])) return null;
-        if (sizeof($vehicles['data'])<1) return null;
+        if (is_null($vehicles)) {
+        	return null;
+        }
+        if (!isset($vehicles['data'])) {
+        	return null;
+        }
+        if (sizeof($vehicles['data'])<1) {
+        	return null;
+        }
         
         $randomIndex = rand(0, sizeof($vehicles['data'])-1);
         

src/Route4Me/Member.php

Braces +3 added lines, -1 removed lines

@@ -159,7 +159,9 @@
         
         foreach ($members['results'] as $memb) {
             if (isset($memb['member_id']) && isset($memb['member_type'])) {
-                if ($memberType==$memb['member_type']) $memberIDs[]=$memb['member_id'];
+                if ($memberType==$memb['member_type']) {
+                	$memberIDs[]=$memb['member_id'];
+                }
             }
         }