route4me / route4me-php-sdk

src/Route4Me/Member.php

Spacing +25 added lines, -25 removed lines

@@ -64,11 +64,11 @@ 
 		public $config_key;
 		public $config_value;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$member= new Member();
-	        foreach($params as $key => $value) {
+			$member = new Member();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($member, $key)) {
 	                $member->{$key} = $value;
 	            }
@@ -119,7 +119,7 @@ 
 	            'url'    => self::$apiUrlDevice,
 	            'method' => 'POST',
 	            'body'  => array(
-					'device_id' => 	isset($body->device_id) ? $body->device_id: null,
+					'device_id' => 	isset($body->device_id) ? $body->device_id : null,
 	                'device_type' => isset($body->device_type) ? $body->device_type : null,
 	                'format' => isset($body->format) ? $body->format : null
 				)
@@ -134,7 +134,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+					'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES : null,
 	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
 	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
 	                'route_count' => isset($body->route_count) ? $body->route_count : null,
@@ -160,9 +160,9 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'PUT',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null,
 	                'member_phone' => isset($body->member_phone) ? $body->member_phone : null,
-	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES: null,
+	                'HIDE_ROUTED_ADDRESSES' => 	isset($body->HIDE_ROUTED_ADDRESSES) ? $body->HIDE_ROUTED_ADDRESSES : null,
 	                'member_zipcode' => isset($body->member_zipcode) ? $body->member_zipcode : null,
 	                'route_count' => isset($body->route_count) ? $body->route_count : null,
 	                'member_email' => isset($body->member_email) ? $body->member_email : null,
@@ -187,7 +187,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null
 				)
 
 			));
@@ -200,17 +200,17 @@ 
 	            'url'    => self::$apiUrlRegistr,
 	            'method' => 'POST',
 	            'body'  => array(
-					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
+					'strEmail' => 	isset($body->strEmail) ? $body->strEmail : null,
 	                'strPassword_1' => isset($body->strPassword_1) ? $body->strPassword_1 : null,
 	                'strPassword_2' => isset($body->strPassword_2) ? $body->strPassword_2 : null,
-	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName: null,
-	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName: null,
-	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry: null,
-	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms: null,
-	                'plan' => 	isset($body->plan) ? $body->plan: null,
-	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType: null,
-	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing: false,
-	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail: false
+	                'strFirstName' => 	isset($body->strFirstName) ? $body->strFirstName : null,
+	                'strLastName' => 	isset($body->strLastName) ? $body->strLastName : null,
+	                'strIndustry' => 	isset($body->strIndustry) ? $body->strIndustry : null,
+	                'chkTerms' => 	isset($body->chkTerms) ? $body->chkTerms : null,
+	                'plan' => 	isset($body->plan) ? $body->plan : null,
+	                'strSubAccountType' =>  isset($body->strSubAccountType) ? $body->strSubAccountType : null,
+	                'blDisableMarketing' => isset($body->blDisableMarketing) ? $body->blDisableMarketing : false,
+	                'blDisableAccountActivationEmail' => isset($body->blDisableAccountActivationEmail) ? $body->blDisableAccountActivationEmail : false
 				)
 			));
 			return $response;
@@ -222,7 +222,7 @@ 
 	            'url'    => self::$apiUrlSessValid,
 	            'method' => 'GET',
 	            'query'  => array(
-					'session_guid' => 	isset($params->session_guid) ? $params->session_guid: null,
+					'session_guid' => 	isset($params->session_guid) ? $params->session_guid : null,
 	                'member_id' => isset($params->member_id) ? $params->member_id : null,
 	                'format' => isset($params->format) ? $params->format : null
 				)
@@ -236,7 +236,7 @@ 
 	            'url'    => self::$apiUrlAuthen,
 	            'method' => 'POST',
 	            'body'  => array(
-					'strEmail' => 	isset($body->strEmail) ? $body->strEmail: null,
+					'strEmail' => 	isset($body->strEmail) ? $body->strEmail : null,
 	                'strPassword' => isset($body->strPassword) ? $body->strPassword : null,
 	                'format' => isset($body->format) ? $body->format : null
 				)
@@ -251,7 +251,7 @@ 
 	            'url'    => self::$apiUrlWebinar,
 	            'method' => 'POST',
 	            'body'  => array(
-					'email_address' => 	isset($body->email_address) ? $body->email_address: null,
+					'email_address' => 	isset($body->email_address) ? $body->email_address : null,
 	                'first_name' => isset($body->first_name) ? $body->first_name : null,
 	                'last_name' => isset($body->last_name) ? $body->last_name : null,
 	                'phone_number' => isset($body->phone_number) ? $body->phone_number : null,
@@ -270,7 +270,7 @@ 
 	            'url'    => self::$apiUrlLicense,
 	            'method' => 'POST',
 	            'body'  => array(
-					'member_id' => 	isset($body->member_id) ? $body->member_id: null,
+					'member_id' => 	isset($body->member_id) ? $body->member_id : null,
 	                'session_guid' => isset($body->session_guid) ? $body->session_guid : null,
 	                'device_id' => isset($body->device_id) ? $body->device_id : null,
 	                'device_type' => isset($body->device_type) ? $body->device_type : null,
@@ -290,7 +290,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'POST',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null,
 	                'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));
@@ -303,7 +303,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null
 				)
 			));
 			return $response;
@@ -315,7 +315,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'GET',
 	            'query'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null
 				)
 			));
 			return $response;
@@ -327,7 +327,7 @@ 
 	            'url'    => self::$apiMemberConfig,
 	            'method' => 'PUT',
 	            'body'  => array(
-					'config_key' => 	isset($body->config_key) ? $body->config_key: null,
+					'config_key' => 	isset($body->config_key) ? $body->config_key : null,
 	                'config_value' => isset($body->config_value) ? $body->config_value : null
 				)
 			));

examples/Optimizations/hybridOptimization.php

Spacing +44 added lines, -44 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace Route4Me;
 
-$vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+$vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
 require $vdir.'/../vendor/autoload.php';
 
@@ -17,35 +17,35 @@ 
 
 Route4Me::setApiKey('bd48828717021141485a701453273458');
 
-$source_file="addresses_1000.csv";
+$source_file = "addresses_1000.csv";
 $max_line_length = 512;
-$delemietr=',';
+$delemietr = ',';
 
 
 /* Add Address Book Locations with schedules from a CSV file */
 
 /* Mapping of a CSV file with the address book locations - which of the CSV table column is corresponding to which of the Address Book's field*/
-$locationsFieldsMapping['cached_lat']=0;
-$locationsFieldsMapping['cached_lng']=1;
-$locationsFieldsMapping['address_alias']=2;
-$locationsFieldsMapping['address_1']=3;
-$locationsFieldsMapping['address_city']=4;
-$locationsFieldsMapping['address_state_id']=5;
-$locationsFieldsMapping['address_zip']=6;
-$locationsFieldsMapping['address_phone_number']=7;
-$locationsFieldsMapping['schedule_mode']=8;
-$locationsFieldsMapping['schedule_enabled']=9;
-$locationsFieldsMapping['schedule_every']=10;
-$locationsFieldsMapping['schedule_weekdays']=11;
-$locationsFieldsMapping['monthly_mode']=12;
-$locationsFieldsMapping['monthly_dates']=13;
-$locationsFieldsMapping['monthly_nth_n']=16;
-$locationsFieldsMapping['monthly_nth_wwhat']=17;
-
-if (($handle = fopen("$source_file", "r")) !== FALSE) {
+$locationsFieldsMapping['cached_lat'] = 0;
+$locationsFieldsMapping['cached_lng'] = 1;
+$locationsFieldsMapping['address_alias'] = 2;
+$locationsFieldsMapping['address_1'] = 3;
+$locationsFieldsMapping['address_city'] = 4;
+$locationsFieldsMapping['address_state_id'] = 5;
+$locationsFieldsMapping['address_zip'] = 6;
+$locationsFieldsMapping['address_phone_number'] = 7;
+$locationsFieldsMapping['schedule_mode'] = 8;
+$locationsFieldsMapping['schedule_enabled'] = 9;
+$locationsFieldsMapping['schedule_every'] = 10;
+$locationsFieldsMapping['schedule_weekdays'] = 11;
+$locationsFieldsMapping['monthly_mode'] = 12;
+$locationsFieldsMapping['monthly_dates'] = 13;
+$locationsFieldsMapping['monthly_nth_n'] = 16;
+$locationsFieldsMapping['monthly_nth_wwhat'] = 17;
+
+if (($handle = fopen("$source_file", "r"))!==FALSE) {
         $oAbook = new AddressBookLocation();
 
-        $results=$oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
+        $results = $oAbook->addLocationsFromCsvFile($handle, $locationsFieldsMapping); //Temporarry
         
         echo "Errors: <br><br>";
         foreach ($results['fail'] as $evalue) {
@@ -61,23 +61,23 @@ 
 
 /* Add orders with schedules from a CSV file  */
 
-$orders_file="orders_baton.csv";
+$orders_file = "orders_baton.csv";
 
 /* Mapping of a CSV file with the orders - which of the CSV table column is corresponding to which of the Order's field */
 
-$ordersFieldsMapping['cached_lat']=1;
-$ordersFieldsMapping['cached_lng']=0;
-$ordersFieldsMapping['address_alias']=2;
-$ordersFieldsMapping['address_1']=3;
-$ordersFieldsMapping['order_city']=4;
-$ordersFieldsMapping['order_state_id']=5;
-$ordersFieldsMapping['order_zip_code']=6;
-$ordersFieldsMapping['EXT_FIELD_phone']=7;
-$ordersFieldsMapping['day_scheduled_for_YYMMDD']=8;
-
-if (($handle = fopen("$orders_file", "r")) !== FALSE) {
+$ordersFieldsMapping['cached_lat'] = 1;
+$ordersFieldsMapping['cached_lng'] = 0;
+$ordersFieldsMapping['address_alias'] = 2;
+$ordersFieldsMapping['address_1'] = 3;
+$ordersFieldsMapping['order_city'] = 4;
+$ordersFieldsMapping['order_state_id'] = 5;
+$ordersFieldsMapping['order_zip_code'] = 6;
+$ordersFieldsMapping['EXT_FIELD_phone'] = 7;
+$ordersFieldsMapping['day_scheduled_for_YYMMDD'] = 8;
+
+if (($handle = fopen("$orders_file", "r"))!==FALSE) {
         $order = new Order();
-        $results=$order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
+        $results = $order->addOrdersFromCsvFile($handle, $ordersFieldsMapping);
         
         echo "Errors: <br><br>";
         foreach ($results['fail'] as $evalue) {
@@ -93,7 +93,7 @@ 
 
 /* Get Hybrid Optimization */
 
-    $ep = time()+604800;
+    $ep = time() + 604800;
     $sched_date = date("Y-m-d", $ep);
 
     $hybridParams = array(
@@ -114,7 +114,7 @@ 
             /* Add depots to the Hybrid Optimization */
             $depotfile = "depots.csv";
             
-            if (($handle = fopen("$depotfile", "r")) !== FALSE) {
+            if (($handle = fopen("$depotfile", "r"))!==FALSE) {
                 
                 $columns = fgetcsv($handle, $max_line_length, $delemietr);
                 
@@ -128,15 +128,15 @@ 
                     'delete_old_depots'  => true,
                 );
                 
-                $iRow=1;
+                $iRow = 1;
                 $depotAddresses = array();
                 
-                while (($rows = fgetcsv($handle, $max_line_length, $delemietr)) !== false) {
-                    if ($rows[0] && $rows[1] && $rows[3] && array(null) !== $rows) {
-                        $depotAddress['lat']= $rows[0];
-                        $depotAddress['lng']= $rows[1];
-                        $depotAddress['address']= $rows[3];   
-                        array_push($depotAddresses,$depotAddress);
+                while (($rows = fgetcsv($handle, $max_line_length, $delemietr))!==false) {
+                    if ($rows[0] && $rows[1] && $rows[3] && array(null)!==$rows) {
+                        $depotAddress['lat'] = $rows[0];
+                        $depotAddress['lng'] = $rows[1];
+                        $depotAddress['address'] = $rows[3];   
+                        array_push($depotAddresses, $depotAddress);
                     }
                 }
                 

src/Route4Me/Order.php

Spacing +51 added lines, -51 removed lines

@@ -46,11 +46,11 @@ 
 		public $limit;
 		public $query;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$order= new Order();
-	        foreach($params as $key => $value) {
+			$order = new Order();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($order, $key)) {
 	                $order->{$key} = $value;
 	            }
@@ -65,8 +65,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-					'address_2' =>     isset($params->address_2) ? $params->address_2: null,
+					'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
+					'address_2' =>     isset($params->address_2) ? $params->address_2 : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
@@ -75,30 +75,30 @@ 
 	                'order_icon' => isset($params->order_icon) ? $params->order_icon : null,
 	                'day_scheduled_for_YYMMDD' => isset($params->day_scheduled_for_YYMMDD) ? $params->day_scheduled_for_YYMMDD : null,
 	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_city) ? $params->address_city: null,
-	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'service_time' =>  isset($params->service_time) ? $params->service_time: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+	                'address_city' => 	isset($params->address_city) ? $params->address_city : null,
+	                'local_time_window_start' =>  isset($params->local_time_window_start) ? $params->local_time_window_start : null,
+	                'local_time_window_end' =>  isset($params->local_time_window_end) ? $params->local_time_window_end : null,
+	                'local_time_window_start_2' =>  isset($params->local_time_window_start_2) ? $params->local_time_window_start_2 : null,
+	                'local_time_window_end_2' =>  isset($params->local_time_window_end_2) ? $params->local_time_window_end_2 : null,
+	                'service_time' =>  isset($params->service_time) ? $params->service_time : null,
+	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name : null,
+	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name : null,
+	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email : null,
+	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone : null,
+	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data : null,
 				)
 	        ));
 
 			return $response;
 		}
 
-		public static function addOrder2Route($params,$body)
+		public static function addOrder2Route($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlRoute,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
+					'route_id' => 	isset($params->route_id) ? $params->route_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -107,13 +107,13 @@ 
 			return $response;
 		}
 		
-		public static function addOrder2Destination($params,$body)
+		public static function addOrder2Destination($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlOpt,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
+					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -128,7 +128,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
+					'order_id' => 	isset($params->order_id) ? $params->order_id : null,
 				)
 	        ));
 
@@ -151,7 +151,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
+					'order_ids' => 	isset($params->order_ids) ? $params->order_ids : null
 				)
 	        ));
 
@@ -175,12 +175,12 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
-					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
-					'fields' => 	isset($params->fields) ? $params->fields: null,
-					'offset' => 	isset($params->offset) ? $params->offset: null,
-					'limit' => 	isset($params->limit) ? $params->limit: null,
-					'query' => 	isset($params->query) ? $params->query: null,
+					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD : null,
+					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD : null,
+					'fields' => 	isset($params->fields) ? $params->fields : null,
+					'offset' => 	isset($params->offset) ? $params->offset : null,
+					'limit' => 	isset($params->limit) ? $params->limit : null,
+					'query' => 	isset($params->query) ? $params->query : null,
 				)
 	        ));
 
@@ -208,45 +208,45 @@ 
         public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping)
         {
             $max_line_length = 512;
-            $delemietr=',';
+            $delemietr = ',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+            $results = array();
+            $results['fail'] = array();
+            $results['success'] = array();
             
             $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
             
             if (!empty($columns)) {
-                 array_push($results['fail'],'Empty CSV table');
+                 array_push($results['fail'], 'Empty CSV table');
                  return ($results);
             }
                      
-            $iRow=1;
+            $iRow = 1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null) !== $rows) {
+            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+                if ($rows[$ordersFieldsMapping['cached_lat']] && $rows[$ordersFieldsMapping['cached_lng']] && $rows[$ordersFieldsMapping['address_1']] && array(null)!==$rows) {
                     
-                    $cached_lat=0.000;
+                    $cached_lat = 0.000;
                     
                     if (!$this->validateLatitude($rows[$ordersFieldsMapping['cached_lat']])) {
-                        array_push($results['fail'],"$iRow --> Wrong cached_lat"); 
+                        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;
+                    $cached_lng = 0.000;
                     
                     if (!$this->validateLongitude($rows[$ordersFieldsMapping['cached_lng']])) {
-                        array_push($results['fail'],"$iRow --> Wrong cached_lng"); 
+                        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']])) {
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lat"); 
+                            array_push($results['fail'], "$iRow --> Wrong curbside_lat"); 
                             $iRow++;
                             continue;
                         }
@@ -254,18 +254,18 @@ 
                     
                     if (isset($ordersFieldsMapping['curbside_lng'])) {
                         if (!$this->validateLongitude($rows[$ordersFieldsMapping['curbside_lng']])) {
-                            array_push($results['fail'],"$iRow --> Wrong curbside_lng"); 
+                            array_push($results['fail'], "$iRow --> Wrong curbside_lng"); 
                             $iRow++;
                             continue;
                         }
                     }
                     
-                    $address=$rows[$ordersFieldsMapping['address_1']];
+                    $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>";
                     
@@ -296,10 +296,10 @@ 
                     
                     $orderResults = $order->addOrder($orderParameters);
                     
-                    array_push($results['success'],"The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
+                    array_push($results['success'], "The order with order_id = ".strval($orderResults["order_id"])." added successfuly.");
                 }
                 else {
-                    array_push($results['fail'],"$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
+                    array_push($results['fail'], "$iRow --> one of the parameters cached_lat, cached_lng, address_1 is not set"); 
                 }
                 
                 $iRow++;

examples/Order/AddScheduledOrder.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
     namespace Route4Me;
 
-    $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+    $vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
 
@@ -11,7 +11,7 @@ 
     // Set the api key in the Route4me class
     Route4Me::setApiKey('11111111111111111111111111111111');
 
-    $orderParameters=Order::fromArray(array(
+    $orderParameters = Order::fromArray(array(
         "address_1" => "318 S 39th St, Louisville, KY 40212, USA",
         "cached_lat" => 38.259326,
         "cached_lng" => -85.814979,

examples/AddressBook/AddScheduledAddressBookLocation.php

Spacing +19 added lines, -19 removed lines

@@ -1,7 +1,7 @@ 
 <?php
     namespace Route4Me;
     
-    $vdir=$_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
+    $vdir = $_SERVER['DOCUMENT_ROOT'].'/route4me/examples/';
 
     require $vdir.'/../vendor/autoload.php';
     
@@ -12,7 +12,7 @@ 
     Route4Me::setApiKey('11111111111111111111111111111111');
     
     #region // Add a location, scheduled daily with custom data.
-    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
         "address_1"     => "1604 PARKRIDGE PKWY, Louisville, KY, 40214",
         "address_alias" => "1604 PARKRIDGE PKWY 40214",
         "address_group" => "Scheduled daily",
@@ -32,9 +32,9 @@ 
         "service_time" => 900
     ));
     
-    $abContacts1=new AddressBookLocation();
+    $abContacts1 = new AddressBookLocation();
     
-    $abcResults1=$abContacts1->addAdressBookLocation($AdressBookLocationParameters);
+    $abcResults1 = $abContacts1->addAdressBookLocation($AdressBookLocationParameters);
     
     echo "address_id = ".strval($abcResults1["address_id"])."<br>";
     
@@ -42,7 +42,7 @@ 
     #endregion
 
     #region // Add a location, scheduled weekly.
-    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
         "address_1" => "1407 MCCOY, Louisville, KY, 40215",
 	    "address_alias" => "1407 MCCOY 40215",
 	    "address_group" => "Scheduled weekly",
@@ -60,15 +60,15 @@ 
 		    "mode" => "weekly",
             "weekly" => array(
                 "every" => 1,
-			    "weekdays" => array(1,2,3,4,5)
+			    "weekdays" => array(1, 2, 3, 4, 5)
             )
         )),
 	    "service_time" => 600
     ));
 
-    $abContacts2=new AddressBookLocation();
+    $abContacts2 = new AddressBookLocation();
 
-    $abcResults2=$abContacts2->addAdressBookLocation($AdressBookLocationParameters);
+    $abcResults2 = $abContacts2->addAdressBookLocation($AdressBookLocationParameters);
 
     echo "address_id = ".strval($abcResults2["address_id"])."<br>";
 
@@ -76,7 +76,7 @@ 
     #endregion
 
     #region // Add a location, scheduled monthly (dates mode).
-    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
         "address_1" => "4805 BELLEVUE AVE, Louisville, KY, 40215",
         "address_2" => "4806 BELLEVUE AVE, Louisville, KY, 40215",
         "address_alias" => "4805 BELLEVUE AVE 40215",
@@ -99,16 +99,16 @@ 
             "monthly" => array(
                 "every" => 1,
                 "mode" => "dates",
-                "dates" => array(20,22,23,24,25)
+                "dates" => array(20, 22, 23, 24, 25)
             )
         )),
         "service_time" => 750,
         "color" => "red"
     ));
 
-    $abContacts3=new AddressBookLocation();
+    $abContacts3 = new AddressBookLocation();
 
-    $abcResults3=$abContacts3->addAdressBookLocation($AdressBookLocationParameters);
+    $abcResults3 = $abContacts3->addAdressBookLocation($AdressBookLocationParameters);
 
     echo "address_id = ".strval($abcResults3["address_id"])."<br>";
 
@@ -117,7 +117,7 @@ 
     #endregion
 
     #region // AAdd a location, scheduled monthly (nth mode).
-    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
         "address_1" => "730 CECIL AVENUE, Louisville, KY, 40211",
         "address_alias" => "730 CECIL AVENUE 40211",
         "address_group" => "Scheduled monthly",
@@ -150,9 +150,9 @@ 
         "address_icon" => "emoji/emoji-bus"
     ));
 
-    $abContacts4=new AddressBookLocation();
+    $abContacts4 = new AddressBookLocation();
 
-    $abcResults4=$abContacts4->addAdressBookLocation($AdressBookLocationParameters);
+    $abcResults4 = $abContacts4->addAdressBookLocation($AdressBookLocationParameters);
 
     echo "address_id = ".strval($abcResults4["address_id"])."<br>";
 
@@ -160,7 +160,7 @@ 
     #endregion
 
     #region // Add a location with the daily scheduling and blacklist.
-    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
 
         "address_1" => "4629 HILLSIDE DRIVE, Louisville, KY, 40216",
         "address_alias" => "4629 HILLSIDE DRIVE 40216",
@@ -183,13 +183,13 @@ 
             "mode" => "daily",
             "daily" => array("every" => 1)
         ),
-        "schedule_blacklist" => array("2017-02-24","2017-02-25"),
+        "schedule_blacklist" => array("2017-02-24", "2017-02-25"),
         "service_time" => 300
     ));
 
-    $abContacts5=new AddressBookLocation();
+    $abContacts5 = new AddressBookLocation();
 
-    $abcResults5=$abContacts5->addAdressBookLocation($AdressBookLocationParameters);
+    $abcResults5 = $abContacts5->addAdressBookLocation($AdressBookLocationParameters);
 
     echo "address_id = ".strval($abcResults5["address_id"])."<br>";
 

src/Route4Me/AddressBookLocation.php

Spacing +99 added lines, -99 removed lines

@@ -32,11 +32,11 @@ 
 		//public $offset;
 		//public $limit;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
 			$addressbooklocation = new AddressBookLocation();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($addressbooklocation, $key)) {
 	                $addressbooklocation->{$key} = $value;
 	            }
@@ -61,14 +61,14 @@ 
 		
 		public static function searchRoutedLocation($params)
 	    {
-	    	$result= Route4Me::makeRequst(array(
+	    	$result = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'display' => isset($params['display']) ? $params['display']: null,
-	                'query' => isset($params['query']) ? $params['query']: null,
-	                'fields' => isset($params['fields']) ? $params['fields']: null,
-	                'limit' => isset($params['limit']) ? $params['limit']: null,
+	                'display' => isset($params['display']) ? $params['display'] : null,
+	                'query' => isset($params['query']) ? $params['query'] : null,
+	                'fields' => isset($params['fields']) ? $params['fields'] : null,
+	                'limit' => isset($params['limit']) ? $params['limit'] : null,
 	                'offset' => isset($params['offset']) ? $params['offset'] : null,
 	            )
 	        ));
@@ -82,7 +82,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'limit' => isset($params->limit) ? $params->limit: null,
+	                'limit' => isset($params->limit) ? $params->limit : null,
 	                'offset' => isset($params->offset) ? $params->offset : null,
 	            )
 	        ));
@@ -109,41 +109,41 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-	            	'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-	            	'address_2' =>    isset($params->address_2) ? $params->address_2: null,
-	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias: null,
+	            	'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
+	            	'address_2' =>    isset($params->address_2) ? $params->address_2 : null,
+	            	'address_alias' =>    isset($params->address_alias) ? $params->address_alias : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	                'curbside_lat' => isset($params->curbside_lat) ? $params->curbside_lat : null,
                     'curbside_lng' => isset($params->curbside_lng) ? $params->curbside_lng : null,
-	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number: null,
-	                'address_group' =>    isset($params->address_group) ? $params->address_group: null,
-	                'first_name' =>    isset($params->first_name) ? $params->first_name: null,
-	                'last_name' =>    isset($params->last_name) ? $params->last_name: null,
-                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start: null,
-                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end: null,
-                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2: null,
-                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2: null,
-	                'address_email' =>    isset($params->address_email) ? $params->address_email: null,
-	                'address_city' =>    isset($params->address_city) ? $params->address_city: null,
-	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id: null,
-	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id: null,
-	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip: null,
-	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data: null,
-	                'schedule' =>    isset($params->schedule) ? $params->schedule: null,
-	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist: null,
-	                'service_time' =>    isset($params->service_time) ? $params->service_time: null,
-	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string: null,
-	                'color' =>    isset($params->color) ? $params->color: null,
-	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon: null,
-	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type: null,
-	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube: null,
-	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces: null,
-	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no: null,
-	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue: null,
-	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight: null,
-	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority: null,
-	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po: null,
+	                'address_phone_number' =>    isset($params->address_phone_number) ? $params->address_phone_number : null,
+	                'address_group' =>    isset($params->address_group) ? $params->address_group : null,
+	                'first_name' =>    isset($params->first_name) ? $params->first_name : null,
+	                'last_name' =>    isset($params->last_name) ? $params->last_name : null,
+                    'local_time_window_start' =>    isset($params->local_time_window_start) ? $params->local_time_window_start : null,
+                    'local_time_window_end' =>    isset($params->local_time_window_end) ? $params->local_time_window_end : null,
+                    'local_time_window_start_2' =>    isset($params->local_time_window_start_2) ? $params->local_time_window_start_2 : null,
+                    'local_time_window_end_2' =>    isset($params->local_time_window_end_2) ? $params->local_time_window_end_2 : null,
+	                'address_email' =>    isset($params->address_email) ? $params->address_email : null,
+	                'address_city' =>    isset($params->address_city) ? $params->address_city : null,
+	                'address_state_id' =>    isset($params->address_state_id) ? $params->address_state_id : null,
+	                'address_country_id' =>    isset($params->address_country_id) ? $params->address_country_id : null,
+	                'address_zip' =>    isset($params->address_zip) ? $params->address_zip : null,
+	                'address_custom_data' =>    isset($params->address_custom_data) ? $params->address_custom_data : null,
+	                'schedule' =>    isset($params->schedule) ? $params->schedule : null,
+	                'schedule_blacklist' =>    isset($params->schedule_blacklist) ? $params->schedule_blacklist : null,
+	                'service_time' =>    isset($params->service_time) ? $params->service_time : null,
+	                'local_timezone_string' =>    isset($params->local_timezone_string) ? $params->local_timezone_string : null,
+	                'color' =>    isset($params->color) ? $params->color : null,
+	                'address_icon' =>    isset($params->address_icon) ? $params->address_icon : null,
+	                'address_stop_type' =>    isset($params->address_stop_type) ? $params->address_stop_type : null,
+	                'address_cube' =>    isset($params->address_cube) ? $params->address_cube : null,
+	                'address_pieces' =>    isset($params->address_pieces) ? $params->address_pieces : null,
+	                'address_reference_no' =>    isset($params->address_reference_no) ? $params->address_reference_no : null,
+	                'address_revenue' =>    isset($params->address_revenue) ? $params->address_revenue : null,
+	                'address_weight' =>    isset($params->address_weight) ? $params->address_weight : null,
+	                'address_priority' =>    isset($params->address_priority) ? $params->address_priority : null,
+	                'address_customer_po' =>    isset($params->address_customer_po) ? $params->address_customer_po : null,
 	            )
 	        ));
 
@@ -183,7 +183,7 @@ 
 	            'method' => 'ADD',
 	            'query'  => array(
 	                'first_name' => isset($params->first_name) ? $params->first_name : null,
-	                'address_1' => isset($params->address_1) ? $params->address_1: null,
+	                'address_1' => isset($params->address_1) ? $params->address_1 : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	            )
@@ -194,14 +194,14 @@ 
         
         public static function validateScheduleMode($scheduleMode)
         {
-            $schedMmodes=array("daily","weekly","monthly","annually");
+            $schedMmodes = array("daily", "weekly", "monthly", "annually");
             
             if (in_array($scheduleMode, $schedMmodes)) return TRUE; else return FALSE;
         }
         
         public static function validateScheduleEnable($scheduleEnabled)
         {
-            $schedEnambles=array(TRUE,FALSE);
+            $schedEnambles = array(TRUE, FALSE);
             
             if (in_array($scheduleEnabled, $schedEnambles)) return TRUE; else return FALSE;
         }
@@ -217,14 +217,14 @@ 
             
             if (sizeof($weekdays)<1) return FALSE;
             
-            $isValid=TRUE;
+            $isValid = TRUE;
             
-            for ($i=0; $i < sizeof($weekdays); $i++) { 
+            for ($i = 0; $i<sizeof($weekdays); $i++) { 
                 if (is_numeric($weekdays[$i])) {
-                    $wday=intval($weekdays[$i]);
-                    if ($wday<1 || $wday>7) $isValid=FALSE;
+                    $wday = intval($weekdays[$i]);
+                    if ($wday<1 || $wday>7) $isValid = FALSE;
                 }
-                else $isValid=FALSE;
+                else $isValid = FALSE;
             }
             //echo $scheduleWeekDays.' --- '. $isValid."<br>";
             return $isValid;
@@ -232,7 +232,7 @@ 
         
         public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
         {
-            $schedMonthlyMmodes=array("dates","nth");
+            $schedMonthlyMmodes = array("dates", "nth");
             
             if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes)) return TRUE; else return FALSE;
         }
@@ -243,14 +243,14 @@ 
             
             if (sizeof($monthlyDates)<1) return FALSE;
             
-            $isValid=TRUE;
+            $isValid = TRUE;
             
-            for ($i=0; $i < sizeof($monthlyDates); $i++) { 
+            for ($i = 0; $i<sizeof($monthlyDates); $i++) { 
                 if (is_numeric($monthlyDates[$i])) {
-                    $mday=intval($monthlyDates[$i]);
-                    if ($mday<1 || $mday>31) $isValid=FALSE;
+                    $mday = intval($monthlyDates[$i]);
+                    if ($mday<1 || $mday>31) $isValid = FALSE;
                 }
-                else $isValid=FALSE;
+                else $isValid = FALSE;
             }
 
             return $isValid;
@@ -260,7 +260,7 @@ 
         {
             if (!is_numeric($scheduleNthN)) return FALSE;
             
-            $schedNthNs=array(1,2,3,4,5,-1);
+            $schedNthNs = array(1, 2, 3, 4, 5, -1);
             if (in_array($scheduleNthN, $schedNthNs)) return TRUE; else return FALSE;
         }
         
@@ -268,7 +268,7 @@ 
         {
             if (!is_numeric($scheduleNthWhat)) return FALSE;
             
-            $schedNthWhats=array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+            $schedNthWhats = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
             if (in_array($scheduleNthWhat, $schedNthWhats)) return TRUE; else return FALSE;
         }
         
@@ -279,50 +279,50 @@ 
         public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
         {
             $max_line_length = 512;
-            $delemietr=',';
+            $delemietr = ',';
             
-            $results=array();
-            $results['fail']=array();
-            $results['success']=array();
+            $results = array();
+            $results['fail'] = array();
+            $results['success'] = array();
             
             $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
             if (!empty($columns)) {
-                array_push($results['fail'],'Empty CSV table');
+                array_push($results['fail'], 'Empty CSV table');
                 return ($results);
             }
                      
-            $iRow=1;
+            $iRow = 1;
             
-            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
-                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null) !== $rows) {
-                    $curSchedule="";
-                    $mode="";
+            while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
+                if ($rows[$locationsFieldsMapping['cached_lat']] && $rows[$locationsFieldsMapping['cached_lng']] && $rows[$locationsFieldsMapping['address_1']] && array(null)!==$rows) {
+                    $curSchedule = "";
+                    $mode = "";
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
                         if ($this->validateScheduleMode($rows[$locationsFieldsMapping['schedule_mode']])) {
-                            $curSchedule='"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
-                            $mode=$rows[$locationsFieldsMapping['schedule_mode']];
+                            $curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
+                            $mode = $rows[$locationsFieldsMapping['schedule_mode']];
                         }
-                        else {array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); $curSchedule="";}
+                        else {array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); $curSchedule = ""; }
                     }
-                    else {array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); $curSchedule="";}
+                    else {array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); $curSchedule = ""; }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
                         if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
-                            $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+                            $curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
                         }
-                        else {array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  $curSchedule="";}
+                        else {array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set "); $curSchedule = ""; }
                     }
                     
                     if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
                         if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
-                            $curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+                            $curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
                             if ($mode=='daily') {
-                                $curSchedule=trim($curSchedule,',');
-                                $curSchedule.='}';
+                                $curSchedule = trim($curSchedule, ',');
+                                $curSchedule .= '}';
                             }
                         }
-                        else {array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); $curSchedule=""; }
+                        else {array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); $curSchedule = ""; }
                     }
                     
                     if ($mode!='daily') {
@@ -330,50 +330,50 @@ 
                             case 'weekly':
                                 if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                     if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                         $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+                                         $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                                     }
-                                    else {array_push($results['fail'],"$iRow --> Wrong weekdays"); $curSchedule="";}
+                                    else {array_push($results['fail'], "$iRow --> Wrong weekdays"); $curSchedule = ""; }
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); $curSchedule="";}
+                                else {array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); $curSchedule = ""; }
                                 break;
                             case 'monthly':
-                                $monthlyMode="";
+                                $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']].'",';
+                                         $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
+                                         $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                                     }
-                                    else {array_push($results['fail'],"$iRow --> Wrong monthly mode"); $curSchedule="";}
+                                    else {array_push($results['fail'], "$iRow --> Wrong monthly mode"); $curSchedule = ""; }
                                 }
-                                else {array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule="";}
+                                else {array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); $curSchedule = ""; }
                                 
                                 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']].']}';
+                                                     $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> Wrong monthly dates"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> Wrong monthly dates"); $curSchedule = ""; }
                                             }
                                             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']].',';
+                                                     $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); $curSchedule = ""; }
                                             }
-                                            else {array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); $curSchedule="";}
+                                            else {array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); $curSchedule = ""; }
                                             
                                             if ($curSchedule!="") {
                                                 if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                     if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                         $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+                                                         $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
                                                     }
-                                                    else {array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); $curSchedule="";}
+                                                    else {array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); $curSchedule = ""; }
                                                 }
-                                                else {array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); $curSchedule="";}
+                                                else {array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); $curSchedule = ""; }
                                             }
                                             
                                             break;
@@ -387,15 +387,15 @@ 
                         
                     }
 
-                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue;}
+                    if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {$iRow++; continue; }
                     
-                    $curSchedule=strtolower($curSchedule);
+                    $curSchedule = strtolower($curSchedule);
                     
-                    $curSchedule='[{'.$curSchedule.'}]';
+                    $curSchedule = '[{'.$curSchedule.'}]';
 
-                    $oSchedule= json_decode($curSchedule,TRUE);
+                    $oSchedule = json_decode($curSchedule, TRUE);
                     
-                    $AdressBookLocationParameters=AddressBookLocation::fromArray(array(
+                    $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
                         "cached_lat"    => $rows[$locationsFieldsMapping['cached_lat']],
                         "cached_lng"    => $rows[$locationsFieldsMapping['cached_lng']],
                         "curbside_lat"     => isset($locationsFieldsMapping['curbside_lat']) ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
@@ -433,11 +433,11 @@ 
                         "address_customer_po"  => isset($locationsFieldsMapping['address_customer_po']) ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
                     ));
                     
-                    $abContacts=new AddressBookLocation();
+                    $abContacts = new AddressBookLocation();
     
-                    $abcResults=$abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
+                    $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                     
-                    array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
+                    array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
 
                 }
                 

src/Route4Me/Address.php

Spacing +14 added lines, -14 removed lines

@@ -10,9 +10,9 @@ 
 class Address extends Common
 {
     static public $apiUrl = '/api.v4/address.php';
-	static public $apiUrlMove='/actions/route/move_route_destination.php';
-	static public $apiUrDeparted='/api/route/mark_address_departed.php';
-	static public $apiUrVisited='/actions/address/update_address_visited.php';
+	static public $apiUrlMove = '/actions/route/move_route_destination.php';
+	static public $apiUrDeparted = '/api/route/mark_address_departed.php';
+	static public $apiUrVisited = '/actions/address/update_address_visited.php';
 
     public $route_destination_id;
     public $alias;
@@ -70,7 +70,7 @@ 
         }*/
 
         $address = new Address();
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if (property_exists($address, $key)) {
                 $address->{$key} = $value;
             }
@@ -102,7 +102,7 @@ 
             'url'    => self::$apiUrl,
             'method' => 'GET',
             'query'  => array(
-                'route_id'             => isset($noteParams['route_id']) ? $noteParams['route_id']: null, 
+                'route_id'             => isset($noteParams['route_id']) ? $noteParams['route_id'] : null, 
                 'route_destination_id' => isset($noteParams['route_destination_id']) ? $noteParams['route_destination_id'] : null,
                 'notes' => 1,
             )
@@ -132,7 +132,7 @@ 
             'url'    => self::$apiUrl,
             'method' => 'PUT',
             'query'  => array(
-                'route_id'  => isset($params['route_id']) ? $params['route_id']: null, 
+                'route_id'  => isset($params['route_id']) ? $params['route_id'] : null, 
                 'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
             ),
             'body'   => $body
@@ -147,10 +147,10 @@ 
             'url'    => self::$apiUrDeparted,
             'method' => 'GET',
             'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_departed'   => isset($params['is_departed']) ? $params['is_departed']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+                'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
+                'address_id'   => isset($params['address_id']) ? $params['address_id'] : null,
+                'is_departed'   => isset($params['is_departed']) ? $params['is_departed'] : null,
+                'member_id'   => isset($params['member_id']) ? $params['member_id'] : null,
             ),
         ));
 
@@ -163,10 +163,10 @@ 
             'url'    => self::$apiUrVisited,
             'method' => 'GET',
             'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_visited'   => isset($params['is_visited']) ? $params['is_visited']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+                'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
+                'address_id'   => isset($params['address_id']) ? $params['address_id'] : null,
+                'is_visited'   => isset($params['is_visited']) ? $params['is_visited'] : null,
+                'member_id'   => isset($params['member_id']) ? $params['member_id'] : null,
             ),
         ));
 

src/Route4Me/Route4Me.php

Spacing +25 added lines, -25 removed lines

@@ -44,10 +44,10 @@ 
 
 		$rpath = realpath($fname);
 		
-		$fp=fopen(realpath($fname),"r");
+		$fp = fopen(realpath($fname), "r");
 		
-		$url = self::$baseUrl.$options['url'] . '?' . http_build_query(array_merge(
-            array( 'api_key' => self::getApiKey()), $query)
+		$url = self::$baseUrl.$options['url'].'?'.http_build_query(array_merge(
+            array('api_key' => self::getApiKey()), $query)
         );
 		
 		//self::simplePrint($body);die("");
@@ -81,7 +81,7 @@ 
 		//echo "code = $code <br>";
 		$json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));
@@ -93,7 +93,7 @@ 
     public static function makeRequst($options) {
         $errorHandler = new myErrorHandler();
     
-        $old_error_handler = set_error_handler(array( $errorHandler, "proc_error"));
+        $old_error_handler = set_error_handler(array($errorHandler, "proc_error"));
         $method = isset($options['method']) ? $options['method'] : 'GET';
         $query = isset($options['query']) ?
             array_filter($options['query'], function($x) { return !is_null($x); } ) : array();
@@ -105,26 +105,26 @@ 
         );
         
         if (isset($options['HTTPHEADER'])) {
-            $headers[]=$options['HTTPHEADER'];
+            $headers[] = $options['HTTPHEADER'];
         }
 
 		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();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
+        $url = $options['url'].'?'.http_build_query(array_merge(
+            $query, array('api_key' => self::getApiKey())
         ));
 		//var_dump($body); echo "<br><br>";
 		//$jfile=json_encode($body); echo "<br><br>".$jfile; die("STOPPPP");
 
         //self::simplePrint($headers); die("");
-		$baseUrl=self::getBaseUrl();
+		$baseUrl = self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
+		if (strpos($url, 'move_route_destination')>0) $baseUrl = 'https://api.route4me.com';
         $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
+            CURLOPT_URL            => $baseUrl.$url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT        => 60,
             CURLOPT_FOLLOWLOCATION => true,
@@ -136,14 +136,14 @@ 
 		//echo "url=".$baseUrl.$url."<br>";die("");
         curl_setopt_array($ch, $curlOpts);
 		
-		if ($file !=null) {
+		if ($file!=null) {
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-			$fp=fopen($file,'r');
-			curl_setopt($ch, CURLOPT_INFILE , $fp);
+			$fp = fopen($file, 'r');
+			curl_setopt($ch, CURLOPT_INFILE, $fp);
 			curl_setopt($ch, CURLOPT_INFILESIZE, filesize($file));
 		}
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -168,7 +168,7 @@ 
 			break;
         case 'POST':
 			if (isset($query)) {
-            	curl_setopt($ch,  CURLOPT_POSTFIELDS, json_encode($query)); 
+            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
             
 			//echo "<br><br>". json_encode($body); 
@@ -182,8 +182,8 @@ 
 
         $result = curl_exec($ch);
 		//var_dump($result); die("");
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -195,7 +195,7 @@ 
         curl_close($ch);
 		//echo "code -> $code <br>";
 		
-        if (200 == $code) {
+        if (200==$code) {
             if ($isxml) {
                 $json = $jxml;
             } else $json = json_decode($result, true);
@@ -205,7 +205,7 @@ 
             } else {
                 return $json;
             }
-        }  elseif (409 == $code) {
+        }  elseif (409==$code) {
             throw new ApiError('Wrong API key');
         } else {
             throw new ApiError('Something wrong');
@@ -233,7 +233,7 @@ 
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -271,8 +271,8 @@ 
 
 		$result = curl_exec($ch);
         
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -288,7 +288,7 @@ 
 		} else $json = json_decode($result, true);
 		
 		
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));

src/Route4Me/OptimizationProblem.php

Spacing +13 added lines, -13 removed lines

@@ -70,10 +70,10 @@ 
             'method' => 'POST',
             'query'  => array(
                 'redirect'               => isset($params->redirect) ? $params->redirect : null,
-                'directions'             => isset($params->directions) ? $params->directions: null, 
-                'format'                 => isset($params->format) ? $params->format: null,
-                'route_path_output'      => isset($params->route_path_output) ? $params->route_path_output: null,
-                'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url: null
+                'directions'             => isset($params->directions) ? $params->directions : null, 
+                'format'                 => isset($params->format) ? $params->format : null,
+                'route_path_output'      => isset($params->route_path_output) ? $params->route_path_output : null,
+                'optimized_callback_url' => isset($params->optimized_callback_url) ? $params->optimized_callback_url : null
             ),
             'body'   => array(
                 'addresses'  => $params->getAddressesArray(),
@@ -102,7 +102,7 @@ 
 
         if (isset($optimize['optimizations'])) {
             $problems = array();
-            foreach($optimize['optimizations'] as $problem) {
+            foreach ($optimize['optimizations'] as $problem) {
                 $problems[] = OptimizationProblem::fromArray($problem);
             }
             return $problems;
@@ -145,7 +145,7 @@ 
         return $this->routes;
     }
 	
-	public function getRandomOptimizationId($offset,$limit)
+	public function getRandomOptimizationId($offset, $limit)
 	{
 		$query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
         $query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
@@ -157,16 +157,16 @@ 
         ));
 		
 		$optimizations = array();
-            foreach($json as $optimization) {
+            foreach ($json as $optimization) {
 				if (gettype($optimization)!="array") continue;
 				foreach ($optimization as $otp1) {
 					$optimizations[] = $otp1;
 				}
             }
 			
-			$num=rand(0,sizeof($optimizations)-1);
+			$num = rand(0, sizeof($optimizations) - 1);
 			//echo "num=$num.<br>".sizeof($optimizations)."<br>";
-			$rOptimization=$optimizations[$num];
+			$rOptimization = $optimizations[$num];
 			return $rOptimization;
 	}
 	
@@ -174,7 +174,7 @@ 
 	{
 		if ($opt_id==null) return null;
 		
-		$params = array( "optimization_problem_id" => $opt_id );
+		$params = array("optimization_problem_id" => $opt_id);
 		
 		$optimization = (array)$this->get($params);
 		
@@ -188,13 +188,13 @@ 
 	{
 		$addresses = (array)$this->getAddresses($opt_id);
 		
-		if ($addresses == null) {
+		if ($addresses==null) {
 			echo "There are no addresses in this optimization!.. Try again.";
 			return null;
 		}
 		
-		$num=rand(0,sizeof($addresses)-1);
-		$rAddress=$addresses[$num];
+		$num = rand(0, sizeof($addresses) - 1);
+		$rAddress = $addresses[$num];
 		
 		return $rAddress;
 	}