route4me / route4me-php-sdk

src/Route4Me/AddressBookLocation.php

Braces +52 added lines, -14 removed lines

@@ -197,35 +197,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;
@@ -235,23 +252,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;
             }
             //echo $scheduleMonthlyDates.' --- '. $isValid."<br>";
             return $isValid;
@@ -259,18 +285,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;
+            }
         }
 	}
 	

examples/Optimizations/hybridOptimization.php

Braces +15 added lines, -27 removed lines

@@ -46,18 +46,15 @@ 
                         if (AddressBookLocation::validateScheduleMode($rows[8])) {
                             $schedule='"mode":"'.$rows[8].'",'; 
                             $mode=$rows[8];
-                        }
-                        else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule="";}
-                    }
-                    else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule="";}
+                        } else {echo "$iRow --> Wrong schedule mode parameter <br>"; $schedule="";}
+                    } else {echo "$iRow --> The schedule mode parameter is not set <br>"; $schedule="";}
                     
                     if ($schedule=="") {$iRow++; continue;}
                     
                     if (isset($rows[9])) {
                         if (AddressBookLocation::validateScheduleEnable($rows[9])) { 
                             $schedule.='"enabled":'.$rows[9].',';
-                        }
-                        else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule="";}
+                        } else {echo "$iRow --> The schedule enabled parameter is not set <br>"; $schedule="";}
                     }
                     
                     if ($schedule=="") {$iRow++; continue;}
@@ -69,8 +66,7 @@ 
                                 $schedule=trim($schedule,',');
                                 $schedule.='}';
                             }
-                        }
-                        else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule=""; }
+                        } else {echo "$iRow --> The parameter sched_every is not set <br>"; $schedule=""; }
                     }
                     
                     if ($schedule=="") {$iRow++; continue;}
@@ -81,10 +77,8 @@ 
                                 if (isset($rows[11])) {
                                     if (AddressBookLocation::validateScheduleWeekDays($rows[11])) {
                                          $schedule.='"weekdays":['.$rows[11].']}';
-                                    }
-                                    else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
-                                }
-                                else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
+                                    } else {echo "$iRow --> Wrong weekdays <br>";$schedule="";}
+                                } else {echo "$iRow --> The parameters sched_weekdays is not set <br>"; $schedule="";}
                                 break;
                             case 'monthly':
                                 $monthlyMode="";
@@ -92,10 +86,8 @@ 
                                     if (AddressBookLocation::validateScheduleMonthlyMode($rows[12])) {
                                          $monthlyMode=$rows[12];
                                          $schedule.='"mode": "'.$rows[12].'",';
-                                    }
-                                    else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
-                                }
-                                else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
+                                    } else {echo "$iRow --> Wrong monthly mode <br>"; $schedule="";}
+                                } else {echo "$iRow --> The parameter sched_monthly_mode is not set <br>"; $schedule="";}
                                 
                                 if ($monthlyMode!="") {
                                     switch ($monthlyMode) {
@@ -103,27 +95,22 @@ 
                                             if (isset($rows[13])) {
                                                 if (AddressBookLocation::validateScheduleMonthlyDates($rows[13])) {
                                                      $schedule.='"dates":['.$rows[13].']}';
-                                                }
-                                                else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
+                                                } else {echo "$iRow --> Wrong monthly dates <br>"; $schedule="";}
                                             }
                                             break;
                                         case 'nth':
                                             if (isset($rows[16])) {
                                                 if (AddressBookLocation::validateScheduleNthN($rows[16])) {
                                                      $schedule.='"nth":{"n":'.$rows[16].',';
-                                                }
-                                                else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
-                                            }
-                                            else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
+                                                } else {echo "$iRow --> Wrong parameter sched_nth_n <br>"; $schedule="";}
+                                            } else {echo "$iRow --> The parameter sched_nth_n is not set <br>"; $schedule="";}
                                             
                                             if ($schedule!="") {
                                                 if (isset($rows[17])) {
                                                     if (AddressBookLocation::validateScheduleNthWhat($rows[17])) {
                                                          $schedule.='"what":'.$rows[17].'}}';
-                                                    }
-                                                    else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
-                                                }
-                                                else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
+                                                    } else {echo "$iRow --> Wrong parameter sched_nth_what <br>"; $schedule="";}
+                                                } else {echo "$iRow --> The parameter sched_nth_what is not set <br>"; $schedule="";}
                                             }
                                             
                                             break;
@@ -165,8 +152,9 @@ 
                     $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
                     echo "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly <br>"; //temporarry
+              } else {
+              	echo "$iRow --> Wrong Address or latitude or longitude <br>";
               }
-              else echo "$iRow --> Wrong Address or latitude or longitude <br>";
               $iRow++;
             }
     }