route4me / route4me-php-sdk

src/Route4Me/Route4Me.php

Braces +19 added lines, -7 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 = realpath($fname);
 		
@@ -110,7 +114,9 @@ 
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) {
+		    	$headers[]=$header;
+		    }
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
@@ -123,7 +129,9 @@ 
         //self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.route4me.com';
+		if (strpos($url,'move_route_destination')>0) {
+			$baseUrl='https://www.route4me.com';
+		}
         $curlOpts = arraY(
             CURLOPT_URL            => $baseUrl. $url,
             CURLOPT_RETURNTRANSFER => true,
@@ -199,14 +207,16 @@ 
         if (200 == $code) {
             if ($isxml) {
                 $json = $jxml;
-            } else $json = json_decode($result, true);
+            } else {
+            	$json = json_decode($result, true);
+            }
             //var_dump($json); die("");
             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 {
@@ -288,7 +298,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		
 		
         if (200 == $code) {

src/Route4Me/Order.php

Braces +29 added lines, -12 removed lines

@@ -189,18 +189,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;
         }
@@ -231,8 +239,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;
                     
@@ -240,8 +249,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']]);
                     
                     
                     
@@ -263,10 +273,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>";
                     
@@ -298,8 +316,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/AddressBookLocation.php

Braces +65 added lines, -40 removed lines

@@ -196,35 +196,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;
             }
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
             return $isValid;
@@ -234,23 +251,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;
@@ -258,18 +284,30 @@ 
         
         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. 
@@ -301,16 +339,13 @@ 
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
                             $schedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
                             $mode=$rows[$locationsFieldsMapping['schedule_mode']];
-                        }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $schedule="";}
-                    }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $schedule="";}
+                        } else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $schedule="";}
+                    } else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $schedule="";}
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
                             $schedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
-                        }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $schedule="";}
+                        } else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $schedule="";}
                     }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
@@ -320,8 +355,7 @@ 
                                 $schedule=trim($schedule,',');
                                 $schedule.='}';
                             }
-                        }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $schedule=""; }
+                        } else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $schedule=""; }
                     }
                     
                     if ($mode!='daily') {
@@ -330,10 +364,8 @@ 
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                          $schedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $schedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $schedule="";}
+                                    } else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $schedule="";}
+                                } else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $schedule="";}
                                 break;
                             case 'monthly':
                                 $monthlyMode="";
@@ -341,10 +373,8 @@ 
                                     if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
                                          $monthlyMode=$rows[$locationsFieldsMapping['monthly_mode']];
                                          $schedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                    }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $schedule="";}
-                                }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $schedule="";}
+                                    } else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $schedule="";}
+                                } else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $schedule="";}
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
@@ -352,27 +382,22 @@ 
                                             if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                 if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
                                                      $schedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $schedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $schedule="";}
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                 if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                                      $schedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $schedule="";}
-                                            }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $schedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $schedule="";}
+                                            } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $schedule="";}
                                             
                                             if ($schedule!="") {
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                          $schedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                    }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $schedule="";}
-                                                }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $schedule="";}
+                                                    } else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $schedule="";}
+                                                } else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $schedule="";}
                                             }
                                             
                                             break;