route4me / route4me-php-sdk

examples/Routes/GetRoutePathPointsCompressed.php

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
     foreach ($routeResults['addresses'] as $key => $address) {
         $araddress = (array)$address;
 
-        if (isset($araddress['route_destination_id'])) echo "route_destination_id=".$araddress['route_destination_id']."<br>";
+        if (isset($araddress['route_destination_id'])) {
+        	echo "route_destination_id=".$araddress['route_destination_id']."<br>";
+        }
         
         if (isset($araddress['path_to_next'])) {
             echo "path_to_next:<br>";

src/Route4Me/OptimizationProblem.php

Braces +6 added lines, -2 removed lines

@@ -164,7 +164,9 @@ 
         
         $optimizations = array();
             foreach($json as $optimization) {
-                if (gettype($optimization)!="array") continue;
+                if (gettype($optimization)!="array") {
+                	continue;
+                }
                 
                 foreach ($optimization as $otp1) {
                     $optimizations[] = $otp1;
@@ -180,7 +182,9 @@ 
     
     public function getAddresses($opt_id)
     {
-        if ($opt_id == null) return null;
+        if ($opt_id == null) {
+        	return null;
+        }
         
         $params = array( "optimization_problem_id" => $opt_id );
         

src/Route4Me/Order.php

Braces +41 added lines, -16 removed lines

@@ -185,8 +185,12 @@ 
         
         $orders = self::getOrders($params);
         
-        if (is_null($orders)) return null;
-        if (!isset($orders['results'])) return null;
+        if (is_null($orders)) {
+        	return null;
+        }
+        if (!isset($orders['results'])) {
+        	return null;
+        }
         
         $randomIndex = rand(0, sizeof($orders['results'])-1);
         
@@ -201,8 +205,12 @@ 
         
         $orders = self::getOrders($params);
         
-        if (is_null($orders)) return null;
-        if (!isset($orders['results'])) return null;
+        if (is_null($orders)) {
+        	return null;
+        }
+        if (!isset($orders['results'])) {
+        	return null;
+        }
         
         $randomIndex = rand(0, sizeof($orders['results'])-1);
         
@@ -255,18 +263,26 @@ 
     
     public static function validateLatitude($lat)
     {
-        if (!is_numeric($lat)) return false;
+        if (!is_numeric($lat)) {
+        	return false;
+        }
         
-        if ($lat>90 || $lat<-90) return false;
+        if ($lat>90 || $lat<-90) {
+        	return false;
+        }
         
         return true;
     }
     
     public static function validateLongitude($lng)
     {
-        if (!is_numeric($lng)) return false;
+        if (!is_numeric($lng)) {
+        	return false;
+        }
         
-        if ($lng>180 || $lng<-180) return false;
+        if ($lng>180 || $lng<-180) {
+        	return false;
+        }
         
         return true;
     }
@@ -298,8 +314,9 @@ 
                     array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
                     $iRow++;
                     continue;
+                } else {
+                	$cached_lat = doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                 }
-                else $cached_lat = doubleval($rows[$ordersFieldsMapping['cached_lat']]);
                 
                 $cached_lng = 0.000;
                 
@@ -307,8 +324,9 @@ 
                     array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
                     $iRow++;
                     continue;
+                } else {
+                	$cached_lng = doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                 }
-                else $cached_lng = doubleval($rows[$ordersFieldsMapping['cached_lng']]);
                 
                 if (isset($ordersFieldsMapping['curbside_lat'])) {
                     if (!$this->validateLatitude($rows[$ordersFieldsMapping['curbside_lat']])) {
@@ -328,10 +346,18 @@ 
                 
                 $address = $rows[$ordersFieldsMapping['address_1']];
                 
-                if (isset($ordersFieldsMapping['order_city'])) $address.=', '.$rows[$ordersFieldsMapping['order_city']];
-                if (isset($ordersFieldsMapping['order_state_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
-                if (isset($ordersFieldsMapping['order_zip_code'])) $address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
-                if (isset($ordersFieldsMapping['order_country_id'])) $address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                if (isset($ordersFieldsMapping['order_city'])) {
+                	$address.=', '.$rows[$ordersFieldsMapping['order_city']];
+                }
+                if (isset($ordersFieldsMapping['order_state_id'])) {
+                	$address.=', '.$rows[$ordersFieldsMapping['order_state_id']];
+                }
+                if (isset($ordersFieldsMapping['order_zip_code'])) {
+                	$address.=', '.$rows[$ordersFieldsMapping['order_zip_code']];
+                }
+                if (isset($ordersFieldsMapping['order_country_id'])) {
+                	$address.=', '.$rows[$ordersFieldsMapping['order_country_id']];
+                }
                 
                 echo "$iRow --> ".$ordersFieldsMapping['day_scheduled_for_YYMMDD'].", ".$rows[$ordersFieldsMapping['day_scheduled_for_YYMMDD']]."<br>";
                 
@@ -374,8 +400,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/Route4Me.php

Braces +25 added lines, -9 removed lines

@@ -34,13 +34,17 @@ 
         $query = isset($options['query']) ?
             array_filter($options['query']) : array();
 
-        if (sizeof($query)==0) return null;
+        if (sizeof($query)==0) {
+        	return null;
+        }
 
         $body = isset($options['body']) ?
             array_filter($options['body']) : null;
             
         $fname = isset($body['strFilename']) ? $body['strFilename'] : '';
-        if ($fname=='') return null;
+        if ($fname=='') {
+        	return null;
+        }
 
         $rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fname)) : '@'.realpath($fname);
         
@@ -105,7 +109,9 @@ 
         }
          
         if (isset($options['HTTPHEADERS'])) {
-            foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+            foreach ($options['HTTPHEADERS'] As $header) {
+            	$headers[]=$header;
+            }
         }
 
         $ch = curl_init();
@@ -158,7 +164,9 @@ 
            if (isset($body)) {
                 $bodyData = json_encode($body);
                if (isset($options['HTTPHEADER'])) {
-                  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) $bodyData = $body;
+                  if (strpos($options['HTTPHEADER'], "multipart/form-data")>0) {
+                  	$bodyData = $body;
+                  }
                }
                
                curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData); 
@@ -186,14 +194,16 @@ 
         if (200 == $code) {
             if ($isxml) {
                 $json = $jxml;
-            } else $json = json_decode($result, true);
+            } else {
+            	$json = json_decode($result, true);
+            }
             
             if (isset($json['errors'])) {
                 throw new ApiError(implode(', ', $json['errors']));
             } else {
                 return $json;
             }
-        }  elseif (409 == $code) {
+        } elseif (409 == $code) {
             throw new ApiError('Wrong API key');
         } else {
             throw new ApiError('Something wrong');
@@ -278,7 +288,9 @@ 
         
         if ($isxml) {
             $json = $jxml;
-        } else $json = json_decode($result, true);
+        } else {
+        	$json = json_decode($result, true);
+        }
         
         if (200 == $code) {
             return $json;
@@ -319,7 +331,9 @@ 
                                         echo $key1." --> "."Object <br>";
                                     } 
                                 } else {
-                                    if (!is_null($result1)) echo $key1." --> ".$result1."<br>";    
+                                    if (!is_null($result1)) {
+                                    	echo $key1." --> ".$result1."<br>";
+                                    }
                                 }
                             }
                         }
@@ -334,7 +348,9 @@ 
                                 echo $key." --> "."Object <br>";
                             } 
                         } else {
-                            if (!is_null($result)) echo $key." --> ".$result."<br>";
+                            if (!is_null($result)) {
+                            	echo $key." --> ".$result."<br>";
+                            }
                         }
                         
                     }

src/Route4Me/AddressBookLocation.php

Braces +55 added lines, -33 removed lines

@@ -149,7 +149,9 @@ 
         $abLocations = new AddressBookLocation();
         
         foreach($params as $key => $value) {
-            if ($key == "address_id") continue; 
+            if ($key == "address_id") {
+            	continue;
+            }
             if (property_exists($abLocations, $key)) {
                 if (isset($params->{$key})) {
                     $body[$key] = $params->{$key};
@@ -221,44 +223,52 @@ 
     {
         $schedMmodes = array("daily","weekly","monthly","annually");
         
-        if (in_array($scheduleMode, $schedMmodes)) 
-            return TRUE; 
-        else 
-            return FALSE;
+        if (in_array($scheduleMode, $schedMmodes)) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
     
     public static function validateScheduleEnable($scheduleEnabled)
     {
         $schedEnambles = array(TRUE,FALSE);
         
-        if (in_array($scheduleEnabled, $schedEnambles))
-            return TRUE;
-        else
-            return FALSE;
+        if (in_array($scheduleEnabled, $schedEnambles)) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
     
     public static function validateScheduleEvery($scheduleEvery)
     {
-        if (is_numeric($scheduleEvery))
-            return TRUE;
-        else
-            return FALSE;
+        if (is_numeric($scheduleEvery)) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
     
     public static function validateScheduleWeekDays($scheduleWeekDays)
     {
         $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;
             }
-            else $isValid = FALSE;
         }
         
         return $isValid;
@@ -268,26 +278,32 @@ 
     {
         $schedMonthlyMmodes = array("dates","nth");
         
-        if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes))
-            return TRUE;
-        else
-            return FALSE;
+        if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
     
     public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
     {
         $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;
             }
-            else $isValid = FALSE;
         }
 
         return $isValid;
@@ -295,26 +311,32 @@ 
     
     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);
         
-        if (in_array($scheduleNthN, $schedNthNs))
-            return TRUE;
-        else
-            return FALSE;
+        if (in_array($scheduleNthN, $schedNthNs)) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
     
     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);
         
-        if (in_array($scheduleNthWhat, $schedNthWhats))
-            return TRUE;
-        else
-            return FALSE;
+        if (in_array($scheduleNthWhat, $schedNthWhats)) {
+                    return TRUE;
+        } else {
+                    return FALSE;
+        }
     }
     
     /* Function adds the locations (with/without schedule) from the CSV file. 

src/Route4Me/curl_http_client.php

Braces +13 added lines, -7 removed lines

@@ -280,7 +280,10 @@ 
         // set multipart form data - file array field-value pairs
         if(!empty($file_field_array)) {
             foreach($file_field_array as $var_name => $var_value) {
-                if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+                if(strpos(PHP_OS, "WIN") !== false) {
+                	$var_value = str_replace("/", "\\", $var_value);
+                }
+                // win hack
                 $file_field_array[$var_name] = "@".$var_value;
             }
         }
@@ -413,14 +416,17 @@ 
         }
         
         $last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-        if (empty($url['scheme']))
-            $url['scheme'] = $last_url['scheme'];
+        if (empty($url['scheme'])) {
+                    $url['scheme'] = $last_url['scheme'];
+        }
         
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
+        if (empty($url['host'])) {
+                    $url['host'] = $last_url['host'];
+        }
         
-        if (empty($url['path']))
-            $url['path'] = $last_url['path'];
+        if (empty($url['path'])) {
+                    $url['path'] = $last_url['path'];
+        }
         
         $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
         //echo "Being redirected to $new_url\n";

src/Route4Me/Vehicle.php

Braces +15 added lines, -5 removed lines

@@ -98,9 +98,15 @@ 
         
         $vehicles = $this->getVehicles($query);
 
-        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);
         
@@ -126,7 +132,9 @@ 
         $vehicle= new Vehicle();
         
         foreach($params as $key => $value) {
-            if ($key=="vehicle_id") continue; 
+            if ($key=="vehicle_id") {
+            	continue;
+            }
             if (property_exists($vehicle, $key)) {
                 if (isset($params->{$key})) {
                     $body[$key] = $params->{$key};
@@ -151,7 +159,9 @@ 
         $vehicle= new Vehicle();
         
         foreach($params as $key => $value) {
-            if ($key=="vehicle_id") continue; 
+            if ($key=="vehicle_id") {
+            	continue;
+            }
             if (property_exists($vehicle, $key)) {
                 if (isset($params->{$key})) {
                     $body[$key] = $params->{$key};

src/Route4Me/Member.php

Braces +12 added lines, -4 removed lines

@@ -163,18 +163,26 @@
     {
         $members = self::getUsers();
         
-        if (is_null($members)) return null;
-        if (!isset($members['results'])) return null;
+        if (is_null($members)) {
+        	return null;
+        }
+        if (!isset($members['results'])) {
+        	return null;
+        }
         
         $memberIDs = array();
         
         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'];
+                }
             }
         }
         
-        if (sizeof($memberIDs)<1) return null;
+        if (sizeof($memberIDs)<1) {
+        	return null;
+        }
         
         $randomIndex = rand(0, sizeof($memberIDs)-1);