route4me / route4me-php-sdk

src/Route4Me/Common.php

Indentation +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@
 
 class Common
 {
-    public static function getValue($array, $item, $default = null)
-    {
-        return (isset($array[$item])) ? $array[$item] : $default;
-    }
+	public static function getValue($array, $item, $default = null)
+	{
+		return (isset($array[$item])) ? $array[$item] : $default;
+	}
 
-    public function toArray()
-    {
-        $params = array_filter(get_object_vars($this), function($item) {
-            return ($item !== null) && !(is_array($item) && !count($item));
-        });
+	public function toArray()
+	{
+		$params = array_filter(get_object_vars($this), function($item) {
+			return ($item !== null) && !(is_array($item) && !count($item));
+		});
 
-        return $params;
-    }
+		return $params;
+	}
 }

src/Route4Me/AddressBookLocation.php

Indentation +470 added lines, -470 removed lines

@@ -6,549 +6,549 @@
 
 class AddressBookLocation extends Common
 {
-    public $address_id;
-    public $address_group;
-    public $address_alias;
-    public $address_1;
-    public $address_2;
-    public $first_name;
-    public $last_name;
-    public $address_email;
-    public $address_phone_number;
-    public $address_city;
-    public $address_state_id;
-    public $address_country_id;
-    public $address_zip;
-    public $cached_lat;
-    public $cached_lng;
-    public $curbside_lat;
-    public $curbside_lng;
-    public $color;
-    public $address_custom_data;
-    public $schedule;
+	public $address_id;
+	public $address_group;
+	public $address_alias;
+	public $address_1;
+	public $address_2;
+	public $first_name;
+	public $last_name;
+	public $address_email;
+	public $address_phone_number;
+	public $address_city;
+	public $address_state_id;
+	public $address_country_id;
+	public $address_zip;
+	public $cached_lat;
+	public $cached_lng;
+	public $curbside_lat;
+	public $curbside_lng;
+	public $color;
+	public $address_custom_data;
+	public $schedule;
     
-    public $created_timestamp;
-    public $member_id;
-    public $schedule_blacklist;
-    public $in_route_count;
-    public $last_visited_timestamp;
-    public $last_routed_timestamp;
-    public $local_time_window_start;
-    public $local_time_window_end;
-    public $local_time_window_start_2;
-    public $local_time_window_end_2;
-    public $service_time;
-    public $local_timezone_string;
-    public $address_icon;
-    public $address_stop_type;
-    public $address_cube;
-    public $address_pieces;
-    public $address_reference_no;
-    public $address_revenue;
-    public $address_weight;
-    public $address_priority;
-    public $address_customer_po;
+	public $created_timestamp;
+	public $member_id;
+	public $schedule_blacklist;
+	public $in_route_count;
+	public $last_visited_timestamp;
+	public $last_routed_timestamp;
+	public $local_time_window_start;
+	public $local_time_window_end;
+	public $local_time_window_start_2;
+	public $local_time_window_end_2;
+	public $service_time;
+	public $local_timezone_string;
+	public $address_icon;
+	public $address_stop_type;
+	public $address_cube;
+	public $address_pieces;
+	public $address_reference_no;
+	public $address_revenue;
+	public $address_weight;
+	public $address_priority;
+	public $address_customer_po;
     
-    public static function fromArray(array $params)
-    {
-        $addressbooklocation = new AddressBookLocation();
+	public static function fromArray(array $params)
+	{
+		$addressbooklocation = new AddressBookLocation();
         
-        foreach($params as $key => $value) {
-            if (property_exists($addressbooklocation, $key)) {
-                $addressbooklocation->{$key} = $value;
-            }
-        }
+		foreach($params as $key => $value) {
+			if (property_exists($addressbooklocation, $key)) {
+				$addressbooklocation->{$key} = $value;
+			}
+		}
         
-        return $addressbooklocation;
-    }
+		return $addressbooklocation;
+	}
     
-    public static function getAddressBookLocation($addressId)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'query' => $addressId,
-                'limit' => 30
-            )
-        ));
+	public static function getAddressBookLocation($addressId)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'query' => $addressId,
+				'limit' => 30
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function searchRoutedLocation($params)
-    {
-        $result= Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            '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,
-                'offset'  => isset($params['offset']) ? $params['offset'] : null,
-            )
-        ));
+	public static function searchRoutedLocation($params)
+	{
+		$result= Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'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,
+				'offset'  => isset($params['offset']) ? $params['offset'] : null,
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public static function getAddressBookLocations($params)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'limit'  => isset($params['limit']) ? $params['limit'] : null,
-                'offset' => isset($params['offset']) ? $params['offset'] : null,
-            )
-        ));
+	public static function getAddressBookLocations($params)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'limit'  => isset($params['limit']) ? $params['limit'] : null,
+				'offset' => isset($params['offset']) ? $params['offset'] : null,
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function getAddressBookLocationsByIDs($ids)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'address_id' => $ids
-            )
-        ));
+	public static function getAddressBookLocationsByIDs($ids)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'address_id' => $ids
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function getRandomAddressBookLocation($params)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'limit'  => isset($params['limit']) ? $params['limit'] : 0,
-                'offset' => isset($params['offset']) ? $params['offset'] : 10,
-            )
-        ));
+	public static function getRandomAddressBookLocation($params)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'limit'  => isset($params['limit']) ? $params['limit'] : 0,
+				'offset' => isset($params['offset']) ? $params['offset'] : 10,
+			)
+		));
         
-        if (isset($ablocations["results"])) {
-            $locationsSize = sizeof($ablocations["results"]);
+		if (isset($ablocations["results"])) {
+			$locationsSize = sizeof($ablocations["results"]);
             
-            if ($locationsSize > 0) {
-                $randomLocationIndex = rand(0, $locationsSize - 1);
-                return $ablocations["results"][$randomLocationIndex];
-            } 
-        } 
+			if ($locationsSize > 0) {
+				$randomLocationIndex = rand(0, $locationsSize - 1);
+				return $ablocations["results"][$randomLocationIndex];
+			} 
+		} 
 
-        return null;
-    }
+		return null;
+	}
     
-    public static function addAdressBookLocation($params)
-    {
-        $body = array();
-        $abLocations = new AddressBookLocation();
+	public static function addAdressBookLocation($params)
+	{
+		$body = array();
+		$abLocations = new AddressBookLocation();
         
-        foreach($params as $key => $value) {
-            if ($key == "address_id") continue; 
-            if (property_exists($abLocations, $key)) {
-                if (isset($params->{$key})) {
-                    $body[$key] = $params->{$key};
-                } 
-            }
-        }
+		foreach($params as $key => $value) {
+			if ($key == "address_id") continue; 
+			if (property_exists($abLocations, $key)) {
+				if (isset($params->{$key})) {
+					$body[$key] = $params->{$key};
+				} 
+			}
+		}
         
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'POST',
-            'body'   => $body
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'POST',
+			'body'   => $body
+		));
 
-        return $response;
-    }
+		return $response;
+	}
     
-    public function deleteAdressBookLocation($address_ids)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'DELETEARRAY',
-            'query'  => array(
-                'address_ids' => $address_ids
-            )
-        ));
+	public function deleteAdressBookLocation($address_ids)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'DELETEARRAY',
+			'query'  => array(
+				'address_ids' => $address_ids
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function updateAdressBookLocation($params)
-    {
-        $body = array();
-        $abLocations = new AddressBookLocation();
+	public function updateAdressBookLocation($params)
+	{
+		$body = array();
+		$abLocations = new AddressBookLocation();
         
-        foreach($params as $key => $value) {
-            if (property_exists($abLocations, $key)) {
-                if (isset($params->{$key})) {
-                    $body[$key] = $params->{$key};
-                } 
-            }
-        }
+		foreach($params as $key => $value) {
+			if (property_exists($abLocations, $key)) {
+				if (isset($params->{$key})) {
+					$body[$key] = $params->{$key};
+				} 
+			}
+		}
 
-        $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'PUT',
-            'body'   => $body,
-        ));
+		$response = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'PUT',
+			'body'   => $body,
+		));
 
-        return $response;
-    }
+		return $response;
+	}
         
-    public static function get($params)
-    {
-        $ablocations = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_BOOK_V4,
-            'method' => 'ADD',
-            'query'  => array(
-                'first_name' => isset($params->first_name) ? $params->first_name : 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,
-            )
-        ));
+	public static function get($params)
+	{
+		$ablocations = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_BOOK_V4,
+			'method' => 'ADD',
+			'query'  => array(
+				'first_name' => isset($params->first_name) ? $params->first_name : 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,
+			)
+		));
 
-        return $ablocations;
-    }
+		return $ablocations;
+	}
     
-    public static function validateScheduleMode($scheduleMode)
-    {
-        $schedMmodes = array("daily","weekly","monthly","annually");
+	public static function validateScheduleMode($scheduleMode)
+	{
+		$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);
+	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;
-    }
+	public static function validateScheduleEvery($scheduleEvery)
+	{
+		if (is_numeric($scheduleEvery))
+			return TRUE;
+		else
+			return FALSE;
+	}
     
-    public static function validateScheduleWeekDays($scheduleWeekDays)
-    {
-        $weekdays = explode(',', $scheduleWeekDays);
+	public static function validateScheduleWeekDays($scheduleWeekDays)
+	{
+		$weekdays = explode(',', $scheduleWeekDays);
         
-        if (sizeof($weekdays) < 1) return FALSE;
+		if (sizeof($weekdays) < 1) return FALSE;
         
-        $isValid = TRUE;
+		$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;
-            }
-            else $isValid = FALSE;
-        }
+		for ($i=0; $i < sizeof($weekdays); $i++) { 
+			if (is_numeric($weekdays[$i])) {
+				$wday = intval($weekdays[$i]);
+				if ($wday < 1 || $wday > 7) $isValid = FALSE;
+			}
+			else $isValid = FALSE;
+		}
         
-        return $isValid;
-    }
+		return $isValid;
+	}
     
-    public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
-    {
-        $schedMonthlyMmodes = array("dates","nth");
+	public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
+	{
+		$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);
+	public static function validateScheduleMonthlyDates($scheduleMonthlyDates)
+	{
+		$monthlyDates = explode(',', $scheduleMonthlyDates);
         
-        if (sizeof($monthlyDates) <1) return FALSE;
+		if (sizeof($monthlyDates) <1) return FALSE;
         
-        $isValid = TRUE;
+		$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;
-            }
-            else $isValid = FALSE;
-        }
+		for ($i=0; $i < sizeof($monthlyDates); $i++) { 
+			if (is_numeric($monthlyDates[$i])) {
+				$mday = intval($monthlyDates[$i]);
+				if ($mday <1 || $mday > 31) $isValid = FALSE;
+			}
+			else $isValid = FALSE;
+		}
 
-        return $isValid;
-    }
+		return $isValid;
+	}
     
-    public static function validateScheduleNthN($scheduleNthN)
-    {
-        if (!is_numeric($scheduleNthN)) return FALSE;
+	public static function validateScheduleNthN($scheduleNthN)
+	{
+		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;
-    }
+		if (in_array($scheduleNthN, $schedNthNs))
+			return TRUE;
+		else
+			return FALSE;
+	}
     
-    public static function validateScheduleNthWhat($scheduleNthWhat)
-    {
-        if (!is_numeric($scheduleNthWhat)) return FALSE;
+	public static function validateScheduleNthWhat($scheduleNthWhat)
+	{
+		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;
-    }
+		if (in_array($scheduleNthWhat, $schedNthWhats))
+			return TRUE;
+		else
+			return FALSE;
+	}
     
-    /* Function adds the locations (with/without schedule) from the CSV file. 
+	/* Function adds the locations (with/without schedule) from the CSV file. 
      * $csvFileHandle - a file handler.
      * Returns array $results which contains two arrays: fail and succes.
      */
-    public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
-    {
-        $max_line_length = 512;
-        $delemietr = ',';
+	public function addLocationsFromCsvFile($csvFileHandle, $locationsFieldsMapping)
+	{
+		$max_line_length = 512;
+		$delemietr = ',';
         
-        $results = array();
-        $results['fail'] = array();
-        $results['success'] = array();
+		$results = array();
+		$results['fail'] = array();
+		$results['success'] = array();
         
-        $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
+		$columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
 
-        if (empty($columns)) {
-            array_push($results['fail'],'Empty CSV table');
-            return ($results);
-        }
+		if (empty($columns)) {
+			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']];
-                    } 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 = "";
-                }
+				if (isset($rows[$locationsFieldsMapping['schedule_mode']])) {
+					if ($this->validateScheduleMode($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 --> 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']].',';
-                    } else {
-                        array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  
-                        $curSchedule = "";
-                    }
-                }
+				if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
+					if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
+						$curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+					} 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']].','; 
-                        if ($mode == 'daily') {
-                            $curSchedule = trim($curSchedule,',');
-                            $curSchedule.='}';
-                        }
-                    } else {
-                        array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); 
-                        $curSchedule = ""; 
-                    }
-                }
+				if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
+					if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
+						$curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+						if ($mode == 'daily') {
+							$curSchedule = trim($curSchedule,',');
+							$curSchedule.='}';
+						}
+					} else {
+						array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); 
+						$curSchedule = ""; 
+					}
+				}
                 
-                if ($mode!='daily') {
-                    switch ($mode) {
-                        case 'weekly':
-                            if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                     $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
-                                } else {
-                                    array_push($results['fail'],"$iRow --> Wrong weekdays"); 
-                                    $curSchedule = "";
-                                }
-                            } else {
-                                array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); 
-                                $curSchedule = "";
-                            }
-                            break;
-                        case 'monthly':
-                            $monthlyMode = "";
-                            if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
-                                     $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
-                                     $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
-                                } else {
-                                    array_push($results['fail'],"$iRow --> Wrong monthly mode"); 
-                                    $curSchedule = "";
-                                }
-                            } else {
-                                array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); 
-                                $curSchedule = "";
-                            }
+				if ($mode!='daily') {
+					switch ($mode) {
+						case 'weekly':
+							if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+								if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
+									 $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+								} else {
+									array_push($results['fail'],"$iRow --> Wrong weekdays"); 
+									$curSchedule = "";
+								}
+							} else {
+								array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); 
+								$curSchedule = "";
+							}
+							break;
+						case 'monthly':
+							$monthlyMode = "";
+							if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
+								if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
+									 $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
+									 $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
+								} else {
+									array_push($results['fail'],"$iRow --> Wrong monthly mode"); 
+									$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']].']}';
-                                            } 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']].',';
-                                            } 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 = "";
-                                        }
+							if ($monthlyMode != "") {
+								switch ($monthlyMode) {
+									case 'dates':
+										if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
+											if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
+												 $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+											} else {
+												array_push($results['fail'],"$iRow --> Wrong monthly dates"); 
+												$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']].',';
+											} 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 = "";
+										}
                                         
-                                        if ($curSchedule != "") {
-                                            if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                     $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
-                                                } else {
-                                                    array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); 
-                                                    $curSchedule = "";
-                                                }
-                                            } else {
-                                                array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); 
-                                                $curSchedule = "";
-                                            }
-                                        }
-                                        break;
-                                }
-                            }
-                            break;
-                        default:
-                            $curSchedule = "";
-                            break;
-                    }
-                }
+										if ($curSchedule != "") {
+											if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+												if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
+													 $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+												} else {
+													array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); 
+													$curSchedule = "";
+												}
+											} else {
+												array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); 
+												$curSchedule = "";
+											}
+										}
+										break;
+								}
+							}
+							break;
+						default:
+							$curSchedule = "";
+							break;
+					}
+				}
 
-                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(
-                    "cached_lat"                 => $rows[$locationsFieldsMapping['cached_lat']],
-                    "cached_lng"                 => $rows[$locationsFieldsMapping['cached_lng']],
-                    "curbside_lat"               => isset($locationsFieldsMapping['curbside_lat'])
-                                                     ? $rows[$locationsFieldsMapping['curbside_lat']] : null,
-                    "curbside_lng"               => isset($locationsFieldsMapping['curbside_lng'])
-                                                     ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
-                    "address_alias"              => isset($locationsFieldsMapping['address_alias'])
-                                                     ? $rows[$locationsFieldsMapping['address_alias']] : null,
-                    "address_1"                  => $rows[$locationsFieldsMapping['address_1']],
-                    "address_2"                  => isset($locationsFieldsMapping['address_2'])
-                                                     ? $rows[$locationsFieldsMapping['address_2']] : null,
-                    "address_city"               => isset($locationsFieldsMapping['address_city'])
-                                                      ? $rows[$locationsFieldsMapping['address_city']] : null,
-                    "address_state_id"           => isset($locationsFieldsMapping['address_state_id'])
-                                                      ? $rows[$locationsFieldsMapping['address_state_id']] : null,
-                    "address_zip"                => isset($locationsFieldsMapping['address_zip'])
-                                                      ? $rows[$locationsFieldsMapping['address_zip']] : null,
-                    "address_phone_number"       => isset($locationsFieldsMapping['address_phone_number'])
-                                                      ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
-                    "schedule"                   => isset($oSchedule) ? $oSchedule : null,
-                    "address_group"              => isset($locationsFieldsMapping['address_group']) 
-                                                      ? $rows[$locationsFieldsMapping['address_group']] : null,
-                    "first_name"                 => isset($locationsFieldsMapping['first_name']) 
-                                                      ? $rows[$locationsFieldsMapping['first_name']] : null,
-                    "last_name"                  => isset($locationsFieldsMapping['last_name']) 
-                                                      ? $rows[$locationsFieldsMapping['last_name']] : null,
-                    "local_time_window_start"    => isset($locationsFieldsMapping['local_time_window_start'])
-                                                      ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
-                    "local_time_window_end"      => isset($locationsFieldsMapping['local_time_window_end'])
-                                                      ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
-                    "local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2'])
-                                                      ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
-                    "local_time_window_end_2"    => isset($locationsFieldsMapping['local_time_window_end_2'])
-                                                      ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
-                    "address_email"              => isset($locationsFieldsMapping['address_email'])
-                                                      ? $rows[$locationsFieldsMapping['address_email']] : null,
-                    "address_country_id"         => isset($locationsFieldsMapping['address_country_id'])
-                                                      ? $rows[$locationsFieldsMapping['address_country_id']] : null,
-                    "address_custom_data"        => isset($locationsFieldsMapping['address_custom_data'])
-                                                      ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
-                    "schedule_blacklist"         => isset($locationsFieldsMapping['schedule_blacklist'])
-                                                      ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
-                    "service_time"               => isset($locationsFieldsMapping['service_time'])
-                                                      ? $rows[$locationsFieldsMapping['service_time']] : null,
-                    "local_timezone_string"      => isset($locationsFieldsMapping['local_timezone_string'])
-                                                      ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
-                    "color"                      => isset($locationsFieldsMapping['color'])
-                                                      ? $rows[$locationsFieldsMapping['color']] : null,
-                    "address_icon"               => isset($locationsFieldsMapping['address_icon'])
-                                                      ? $rows[$locationsFieldsMapping['address_icon']] : null,
-                    "address_stop_type"          => isset($locationsFieldsMapping['address_stop_type'])
-                                                      ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
-                    "address_cube"               => isset($locationsFieldsMapping['address_cube'])
-                                                      ? $rows[$locationsFieldsMapping['address_cube']] : null,
-                    "address_pieces"             => isset($locationsFieldsMapping['address_pieces'])
-                                                      ? $rows[$locationsFieldsMapping['address_pieces']] : null,
-                    "address_reference_no"       => isset($locationsFieldsMapping['address_reference_no'])
-                                                      ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
-                    "address_revenue"            => isset($locationsFieldsMapping['address_revenue'])
-                                                      ? $rows[$locationsFieldsMapping['address_revenue']] : null,
-                    "address_weight"             => isset($locationsFieldsMapping['address_weight'])
-                                                      ? $rows[$locationsFieldsMapping['address_weight']] : null,
-                    "address_priority"           => isset($locationsFieldsMapping['address_priority'])
-                                                      ? $rows[$locationsFieldsMapping['address_priority']] : null,
-                    "address_customer_po"        => isset($locationsFieldsMapping['address_customer_po'])
-                                                      ? $rows[$locationsFieldsMapping['address_customer_po']] : null,
-                ));
+				$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,
+					"curbside_lng"               => isset($locationsFieldsMapping['curbside_lng'])
+													 ? $rows[$locationsFieldsMapping['curbside_lng']] : null,
+					"address_alias"              => isset($locationsFieldsMapping['address_alias'])
+													 ? $rows[$locationsFieldsMapping['address_alias']] : null,
+					"address_1"                  => $rows[$locationsFieldsMapping['address_1']],
+					"address_2"                  => isset($locationsFieldsMapping['address_2'])
+													 ? $rows[$locationsFieldsMapping['address_2']] : null,
+					"address_city"               => isset($locationsFieldsMapping['address_city'])
+													  ? $rows[$locationsFieldsMapping['address_city']] : null,
+					"address_state_id"           => isset($locationsFieldsMapping['address_state_id'])
+													  ? $rows[$locationsFieldsMapping['address_state_id']] : null,
+					"address_zip"                => isset($locationsFieldsMapping['address_zip'])
+													  ? $rows[$locationsFieldsMapping['address_zip']] : null,
+					"address_phone_number"       => isset($locationsFieldsMapping['address_phone_number'])
+													  ? $rows[$locationsFieldsMapping['address_phone_number']] : null,
+					"schedule"                   => isset($oSchedule) ? $oSchedule : null,
+					"address_group"              => isset($locationsFieldsMapping['address_group']) 
+													  ? $rows[$locationsFieldsMapping['address_group']] : null,
+					"first_name"                 => isset($locationsFieldsMapping['first_name']) 
+													  ? $rows[$locationsFieldsMapping['first_name']] : null,
+					"last_name"                  => isset($locationsFieldsMapping['last_name']) 
+													  ? $rows[$locationsFieldsMapping['last_name']] : null,
+					"local_time_window_start"    => isset($locationsFieldsMapping['local_time_window_start'])
+													  ? $rows[$locationsFieldsMapping['local_time_window_start']] : null,
+					"local_time_window_end"      => isset($locationsFieldsMapping['local_time_window_end'])
+													  ? $rows[$locationsFieldsMapping['local_time_window_end']] : null,
+					"local_time_window_start_2"  => isset($locationsFieldsMapping['local_time_window_start_2'])
+													  ? $rows[$locationsFieldsMapping['local_time_window_start_2']] : null,
+					"local_time_window_end_2"    => isset($locationsFieldsMapping['local_time_window_end_2'])
+													  ? $rows[$locationsFieldsMapping['local_time_window_end_2']] : null,
+					"address_email"              => isset($locationsFieldsMapping['address_email'])
+													  ? $rows[$locationsFieldsMapping['address_email']] : null,
+					"address_country_id"         => isset($locationsFieldsMapping['address_country_id'])
+													  ? $rows[$locationsFieldsMapping['address_country_id']] : null,
+					"address_custom_data"        => isset($locationsFieldsMapping['address_custom_data'])
+													  ? $rows[$locationsFieldsMapping['address_custom_data']] : null,
+					"schedule_blacklist"         => isset($locationsFieldsMapping['schedule_blacklist'])
+													  ? $rows[$locationsFieldsMapping['schedule_blacklist']] : null,
+					"service_time"               => isset($locationsFieldsMapping['service_time'])
+													  ? $rows[$locationsFieldsMapping['service_time']] : null,
+					"local_timezone_string"      => isset($locationsFieldsMapping['local_timezone_string'])
+													  ? $rows[$locationsFieldsMapping['local_timezone_string']] : null,
+					"color"                      => isset($locationsFieldsMapping['color'])
+													  ? $rows[$locationsFieldsMapping['color']] : null,
+					"address_icon"               => isset($locationsFieldsMapping['address_icon'])
+													  ? $rows[$locationsFieldsMapping['address_icon']] : null,
+					"address_stop_type"          => isset($locationsFieldsMapping['address_stop_type'])
+													  ? $rows[$locationsFieldsMapping['address_stop_type']] : null,
+					"address_cube"               => isset($locationsFieldsMapping['address_cube'])
+													  ? $rows[$locationsFieldsMapping['address_cube']] : null,
+					"address_pieces"             => isset($locationsFieldsMapping['address_pieces'])
+													  ? $rows[$locationsFieldsMapping['address_pieces']] : null,
+					"address_reference_no"       => isset($locationsFieldsMapping['address_reference_no'])
+													  ? $rows[$locationsFieldsMapping['address_reference_no']] : null,
+					"address_revenue"            => isset($locationsFieldsMapping['address_revenue'])
+													  ? $rows[$locationsFieldsMapping['address_revenue']] : null,
+					"address_weight"             => isset($locationsFieldsMapping['address_weight'])
+													  ? $rows[$locationsFieldsMapping['address_weight']] : null,
+					"address_priority"           => isset($locationsFieldsMapping['address_priority'])
+													  ? $rows[$locationsFieldsMapping['address_priority']] : null,
+					"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.");
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
  }
-    
\ No newline at end of file
+	
\ No newline at end of file

src/Route4Me/OptimizationProblemParams.php

Indentation +72 added lines, -72 removed lines

@@ -7,94 +7,94 @@
 
 class OptimizationProblemParams extends Common
 {
-    public $optimization_problem_id;
-    public $reoptimize;
-    public $addresses = array();
-    public $parameters;
-    public $directions;
-    public $format;
-    public $route_path_output;
-    public $optimized_callback_url;
-    public $redirect = true;
+	public $optimization_problem_id;
+	public $reoptimize;
+	public $addresses = array();
+	public $parameters;
+	public $directions;
+	public $format;
+	public $route_path_output;
+	public $optimized_callback_url;
+	public $redirect = true;
 
-    public static function fromArray($params)
-    {
-        $param = new OptimizationProblemParams;
-        if (!isset($params['addresses'])) {
-            throw new BadParam('addresses must be provided.');
-        }
+	public static function fromArray($params)
+	{
+		$param = new OptimizationProblemParams;
+		if (!isset($params['addresses'])) {
+			throw new BadParam('addresses must be provided.');
+		}
 
-        if (!isset($params['parameters'])) {
-            throw new BadParam('parameters must be provided.');
-        }
+		if (!isset($params['parameters'])) {
+			throw new BadParam('parameters must be provided.');
+		}
 
-        if ($params['parameters'] instanceof RouteParameters) {
-            $param->setParameters($params['parameters']);
-        } else {
-            $param->setParameters(RouteParameters::fromArray($params['parameters']));
-        }
+		if ($params['parameters'] instanceof RouteParameters) {
+			$param->setParameters($params['parameters']);
+		} else {
+			$param->setParameters(RouteParameters::fromArray($params['parameters']));
+		}
 
-        foreach($params['addresses'] as $address) {
-            if (!($address instanceof Address)) {
-                $address = Address::fromArray($address);
-            }
+		foreach($params['addresses'] as $address) {
+			if (!($address instanceof Address)) {
+				$address = Address::fromArray($address);
+			}
             
-            $param->addAddress($address);
-        }
+			$param->addAddress($address);
+		}
 
-        $param->directions = self::getValue($params, 'directions');
-        $param->format = self::getValue($params, 'format');
-        $param->route_path_output = self::getValue($params, 'route_path_output');
-        $param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
-        $param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
-        $param->reoptimize = self::getValue($params, 'reoptimize');
-        $param->redirect = filter_var(
-            self::getValue($params, 'redirect', true), FILTER_VALIDATE_BOOLEAN);
+		$param->directions = self::getValue($params, 'directions');
+		$param->format = self::getValue($params, 'format');
+		$param->route_path_output = self::getValue($params, 'route_path_output');
+		$param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
+		$param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
+		$param->reoptimize = self::getValue($params, 'reoptimize');
+		$param->redirect = filter_var(
+			self::getValue($params, 'redirect', true), FILTER_VALIDATE_BOOLEAN);
 
-        return $param;
-    }
+		return $param;
+	}
 
-    public function __construct()
-    {
-        $this->parameters = new RouteParameters;
-    }
+	public function __construct()
+	{
+		$this->parameters = new RouteParameters;
+	}
 
-    public function setParameters(RouteParameters $params)
-    {
-        $this->parameters = $params;
+	public function setParameters(RouteParameters $params)
+	{
+		$this->parameters = $params;
         
-        return $this;
-    }
+		return $this;
+	}
 
-    public function addAddress(Address $address)
-    {
-        $this->addresses[] = $address;
+	public function addAddress(Address $address)
+	{
+		$this->addresses[] = $address;
         
-        return $this;
-    }
+		return $this;
+	}
     
-    public function getAddressesArray()
-    {
-        $addresses = array();
+	public function getAddressesArray()
+	{
+		$addresses = array();
         
-        foreach($this->addresses as $address) {
-            $addresses[] = $address->toArray();
-        }
+		foreach($this->addresses as $address) {
+			$addresses[] = $address->toArray();
+		}
         
-        return $addresses;
-    }
+		return $addresses;
+	}
 
-    public function getParametersArray()
-    {
-        return $this->parameters->toArray();
-    }
+	public function getParametersArray()
+	{
+		return $this->parameters->toArray();
+	}
 
-    public function setAddresses(array $addresses)
-    {
-        foreach ($addresses as $address) {
-            $this->addAddress($address);
-        }
+	public function setAddresses(array $addresses)
+	{
+		foreach ($addresses as $address) {
+			$this->addAddress($address);
+		}
         
-        return $this;
-    }
+		return $this;
+	}
 }

src/Route4Me/MyQ.php

Indentation +191 added lines, -191 removed lines

@@ -11,213 +11,213 @@
 class MyQException extends \Exception {}
 
 class MyQ {
-    /** @var string|null $username contains the username used to authenticate with the MyQ API */
-    protected $username = null;
-    /** @var string|null $password contains the password used to authenticate with the MyQ API */
-    protected $password = null;
-    /** @var string|null $appId is the application ID used to register with the MyQ API */
-    protected $appId = 'NWknvuBd7LoFHfXmKNMBcgajXtZEgKUh4V7WNzMidrpUUluDpVYVZx+xT4PCM5Kx';
-    //protected $appId = 'Vj8pQggXLhLy0WHahglCD4N1nAkkXQtGYpq2HrHD7H1nvmbT55KqtN6RSF4ILB%2fi';
-    /** @var string|null $securityToken is the auth token returned after a successful login */
-    protected $securityToken = null;
-    /** @var string|null $userAgent is the User-Agent header value sent with each API request */
-    protected $userAgent = 'Chamberlain/3.4.1';
-    /** @var string|null $culture is the API culture code for the API */
-    protected $culture = 'en';
-    /** @var string|null $contentType is the content type used for all cURL requests */
-    protected $contentType = 'application/json';
-    /** @var array $headers contain HTTP headers for cURL requests */
-    protected $_headers = array();
-    protected $_deviceId = null;
-    protected $_locationName = null;
-    protected $_doorName = null;
-    protected $_loginUrl = 'https://myqexternal.myqdevice.com/api/v4/User/Validate';
-    protected $_getDeviceDetailUrl = 'https://myqexternal.myqdevice.com/api/v4/userdevicedetails/get?&filterOn=true';
-    protected $_putDeviceStateUrl = '/api/v4/DeviceAttribute/PutDeviceAttribute';
-    /** @var resource|null $_conn is the web connection to the MyQ API */
-    protected $_conn = null;
+	/** @var string|null $username contains the username used to authenticate with the MyQ API */
+	protected $username = null;
+	/** @var string|null $password contains the password used to authenticate with the MyQ API */
+	protected $password = null;
+	/** @var string|null $appId is the application ID used to register with the MyQ API */
+	protected $appId = 'NWknvuBd7LoFHfXmKNMBcgajXtZEgKUh4V7WNzMidrpUUluDpVYVZx+xT4PCM5Kx';
+	//protected $appId = 'Vj8pQggXLhLy0WHahglCD4N1nAkkXQtGYpq2HrHD7H1nvmbT55KqtN6RSF4ILB%2fi';
+	/** @var string|null $securityToken is the auth token returned after a successful login */
+	protected $securityToken = null;
+	/** @var string|null $userAgent is the User-Agent header value sent with each API request */
+	protected $userAgent = 'Chamberlain/3.4.1';
+	/** @var string|null $culture is the API culture code for the API */
+	protected $culture = 'en';
+	/** @var string|null $contentType is the content type used for all cURL requests */
+	protected $contentType = 'application/json';
+	/** @var array $headers contain HTTP headers for cURL requests */
+	protected $_headers = array();
+	protected $_deviceId = null;
+	protected $_locationName = null;
+	protected $_doorName = null;
+	protected $_loginUrl = 'https://myqexternal.myqdevice.com/api/v4/User/Validate';
+	protected $_getDeviceDetailUrl = 'https://myqexternal.myqdevice.com/api/v4/userdevicedetails/get?&filterOn=true';
+	protected $_putDeviceStateUrl = '/api/v4/DeviceAttribute/PutDeviceAttribute';
+	/** @var resource|null $_conn is the web connection to the MyQ API */
+	protected $_conn = null;
     
-    /**
-     * Initializes class. Optionally allows user to override variables
-     *
-     * @param array $params A associative array for overwriting class variables
-     *
-     * @return MyQ
-     */
-    public function __construct ($params = array())
-    {
-        // Overwrite class variables
-        foreach ($params as $k => $v) {
-            $this->$k = $v;
-        }
-        
-        // Initialize cURL request headers
-        if (sizeof($this->_headers) == 0) {
-            $this->_headers = array (
-                'MyQApplicationId' => $this->appId,
-                'Culture' => $this->culture,
-                'Content-Type' => $this->contentType,
-                'User-Agent' => $this->userAgent,
-            );
-        }
-        
-        // Initialize cURL connection
-        $this->_init();
-        
-        return $this;
-    }
+	/**
+	 * Initializes class. Optionally allows user to override variables
+	 *
+	 * @param array $params A associative array for overwriting class variables
+	 *
+	 * @return MyQ
+	 */
+	public function __construct ($params = array())
+	{
+		// Overwrite class variables
+		foreach ($params as $k => $v) {
+			$this->$k = $v;
+		}
+        
+		// Initialize cURL request headers
+		if (sizeof($this->_headers) == 0) {
+			$this->_headers = array (
+				'MyQApplicationId' => $this->appId,
+				'Culture' => $this->culture,
+				'Content-Type' => $this->contentType,
+				'User-Agent' => $this->userAgent,
+			);
+		}
+        
+		// Initialize cURL connection
+		$this->_init();
+        
+		return $this;
+	}
     
-    /**
-     * Perform a login request
-     *
-     * @param string|null $username Username to use when logging in
-     * @param string|null $password Password to use for logging in
-     *
-     * @return MyQ
-     */
-    public function login ($username = null, $password = null)
-    {
-        // Set username/password if not null
-        if (!is_null($username)) {
-            $this->username = $username;
-        }
-        
-        if (!is_null($password)) {
-            $this->password = $password;
-        }
-        
-        // confirm that we have a valid username/password
-        $error = array();
-        if (is_null($this->username)) {
-            $error[] = 'username';
-        }
-        
-        if (is_null($this->password)) {
-            $error[] = 'password';
-        }
-        
-        if (sizeof($error) > 0) {
-            throw new MyQException('Missing required auth credential: ' . implode(',', $error));
-        }
-        
-        $this->_login();
-    }
+	/**
+	 * Perform a login request
+	 *
+	 * @param string|null $username Username to use when logging in
+	 * @param string|null $password Password to use for logging in
+	 *
+	 * @return MyQ
+	 */
+	public function login ($username = null, $password = null)
+	{
+		// Set username/password if not null
+		if (!is_null($username)) {
+			$this->username = $username;
+		}
+        
+		if (!is_null($password)) {
+			$this->password = $password;
+		}
+        
+		// confirm that we have a valid username/password
+		$error = array();
+		if (is_null($this->username)) {
+			$error[] = 'username';
+		}
+        
+		if (is_null($this->password)) {
+			$error[] = 'password';
+		}
+        
+		if (sizeof($error) > 0) {
+			throw new MyQException('Missing required auth credential: ' . implode(',', $error));
+		}
+        
+		$this->_login();
+	}
     
-    public function getState()
-    {
-        $this->_getDetails();
-        $timeInState = time() - $this->_doorStateTime;
-        echo implode(',', array (
-            $this->_locationName,
-            $this->_doorName,
-            $this->_doorState,
-            (int)$timeInState,
-        ));
-    }
+	public function getState()
+	{
+		$this->_getDetails();
+		$timeInState = time() - $this->_doorStateTime;
+		echo implode(',', array (
+			$this->_locationName,
+			$this->_doorName,
+			$this->_doorState,
+			(int)$timeInState,
+		));
+	}
     
-    public function getDetails()
-    {
-        return $this->_getDetails();
-    }
+	public function getDetails()
+	{
+		return $this->_getDetails();
+	}
     
-    private function _init()
-    {
-        if (!isset($this->_conn)) {
-            $this->_conn = curl_init();
+	private function _init()
+	{
+		if (!isset($this->_conn)) {
+			$this->_conn = curl_init();
             
-            curl_setopt_array($this->_conn, array (
-                CURLOPT_RETURNTRANSFER => true,
-                CURLOPT_ENCODING       => "",
-                CURLOPT_MAXREDIRS      => 10,
-                CURLOPT_TIMEOUT        => 30,
-                CURLOPT_HTTP_VERSION   => CURL_HTTP_VERSION_1_1,
-                CURLOPT_FAILONERROR    => true,
-                CURLOPT_FOLLOWLOCATION => true,
-                CURLOPT_FRESH_CONNECT  => true,
-                CURLOPT_FORBID_REUSE   => true,
-                CURLOPT_USERAGENT      => $this->userAgent,
-            ));
-        }
-        
-        $this->_setHeaders();
-    }
-    private function _setHeaders()
-    {
-        $headers = array();
-        
-        foreach ($this->_headers as $k => $v) {
-            $headers[] = "$k: $v";
-        }
-        
-        curl_setopt($this->_conn, CURLOPT_HTTPHEADER, $headers);
-    }
+			curl_setopt_array($this->_conn, array (
+				CURLOPT_RETURNTRANSFER => true,
+				CURLOPT_ENCODING       => "",
+				CURLOPT_MAXREDIRS      => 10,
+				CURLOPT_TIMEOUT        => 30,
+				CURLOPT_HTTP_VERSION   => CURL_HTTP_VERSION_1_1,
+				CURLOPT_FAILONERROR    => true,
+				CURLOPT_FOLLOWLOCATION => true,
+				CURLOPT_FRESH_CONNECT  => true,
+				CURLOPT_FORBID_REUSE   => true,
+				CURLOPT_USERAGENT      => $this->userAgent,
+			));
+		}
+        
+		$this->_setHeaders();
+	}
+	private function _setHeaders()
+	{
+		$headers = array();
+        
+		foreach ($this->_headers as $k => $v) {
+			$headers[] = "$k: $v";
+		}
+        
+		curl_setopt($this->_conn, CURLOPT_HTTPHEADER, $headers);
+	}
     
-    private function _login()
-    {
-        $this->_init();
+	private function _login()
+	{
+		$this->_init();
         
-        curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'POST');
-        curl_setopt($this->_conn, CURLOPT_URL, $this->_loginUrl);
+		curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'POST');
+		curl_setopt($this->_conn, CURLOPT_URL, $this->_loginUrl);
         
-        $post = json_encode(array('username' => $this->username, 'password' => $this->password));
+		$post = json_encode(array('username' => $this->username, 'password' => $this->password));
         
-        curl_setopt($this->_conn, CURLOPT_POSTFIELDS, $post);
+		curl_setopt($this->_conn, CURLOPT_POSTFIELDS, $post);
         
-        $output = curl_exec($this->_conn);
+		$output = curl_exec($this->_conn);
         
-        $data = json_decode($output);
+		$data = json_decode($output);
         
-        if ($data == false || !isset($data->SecurityToken)) {
-            throw new MyQException("Error processing login request: $output");
-        }
+		if ($data == false || !isset($data->SecurityToken)) {
+			throw new MyQException("Error processing login request: $output");
+		}
         
-        $this->_headers['SecurityToken'] = $data->SecurityToken;
+		$this->_headers['SecurityToken'] = $data->SecurityToken;
         
-        return $this;
-    }
+		return $this;
+	}
     
-    private function _getDetails()
-    {
-        $this->_init();
-        
-        curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'GET');
-        curl_setopt($this->_conn, CURLOPT_URL, $this->_getDeviceDetailUrl);
-        
-        $output = curl_exec($this->_conn);
-        
-        $data = json_decode($output);
-        
-        if ($data == false || !isset($data->Devices)) {
-            throw new MyQException("Error fetching device details: $output");
-        }
-        
-        // Find our door device ID
-        foreach ($data->Devices as $device) {
-            if (stripos($device->MyQDeviceTypeName, "Gateway") !== false) {
-                // Find location name
-                foreach ($device->Attributes as $attr) {
-                    if ($attr->AttributeDisplayName == 'desc') {
-                        $this->_locationName = $attr->Value;
-                    }
-                }
-            }
+	private function _getDetails()
+	{
+		$this->_init();
+        
+		curl_setopt($this->_conn, CURLOPT_CUSTOMREQUEST, 'GET');
+		curl_setopt($this->_conn, CURLOPT_URL, $this->_getDeviceDetailUrl);
+        
+		$output = curl_exec($this->_conn);
+        
+		$data = json_decode($output);
+        
+		if ($data == false || !isset($data->Devices)) {
+			throw new MyQException("Error fetching device details: $output");
+		}
+        
+		// Find our door device ID
+		foreach ($data->Devices as $device) {
+			if (stripos($device->MyQDeviceTypeName, "Gateway") !== false) {
+				// Find location name
+				foreach ($device->Attributes as $attr) {
+					if ($attr->AttributeDisplayName == 'desc') {
+						$this->_locationName = $attr->Value;
+					}
+				}
+			}
             
-            $this->_deviceId = $device->MyQDeviceId;
+			$this->_deviceId = $device->MyQDeviceId;
             
-            foreach ($device->Attributes as $attr) {
-                switch ($attr->AttributeDisplayName) {
-                    case 'desc':
-                        $this->_doorName = $attr->Value;
-                        break;
-                    case 'doorstate':
-                        $this->_doorState = $attr->Value;
-                        // UpdatedTime is a timestamp in ms, so we truncate
-                        $this->_doorStateTime = (int)$attr->UpdatedTime / 1000;
-                        break;
-                    default:
-                        continue;
-                }
-            }
-        }
-    }
+			foreach ($device->Attributes as $attr) {
+				switch ($attr->AttributeDisplayName) {
+					case 'desc':
+						$this->_doorName = $attr->Value;
+						break;
+					case 'doorstate':
+						$this->_doorState = $attr->Value;
+						// UpdatedTime is a timestamp in ms, so we truncate
+						$this->_doorStateTime = (int)$attr->UpdatedTime / 1000;
+						break;
+					default:
+						continue;
+				}
+			}
+		}
+	}
 }

src/Route4Me/Address.php

Indentation +275 added lines, -275 removed lines

@@ -9,63 +9,63 @@ 
 
 class Address extends Common
 {
-    public $route_destination_id;
-    public $alias;
-    public $member_id;
-    public $address;
-    public $addressUpdate;
-    public $is_depot = false;
-    public $lat;
-    public $lng;
-    public $route_id;
-    public $original_route_id;
-    public $optimization_problem_id;
-    public $sequence_no;
-    public $geocoded;
-    public $preferred_geocoding;
-    public $failed_geocoding;
-    public $geocodings = array();
-    public $contact_id;
-    public $is_visited;
-    public $customer_po;
-    public $invoice_no;
-    public $reference_no;
-    public $order_no;
-    public $weight;
-    public $cost;
-    public $revenue;
-    public $cube;
-    public $pieces;
-    public $email;
-    public $phone;
-    public $tracking_number;
-    public $destination_note_count;
-    public $drive_time_to_next_destination;
-    public $distance_to_next_destination;
-    public $generated_time_window_start;
-    public $generated_time_window_end;
-    public $time_window_start;
-    public $time_window_end;
-    public $time;
-    public $notes;
-    public $timestamp_last_visited;
-    public $custom_fields = array();
-    public $manifest = array();
+	public $route_destination_id;
+	public $alias;
+	public $member_id;
+	public $address;
+	public $addressUpdate;
+	public $is_depot = false;
+	public $lat;
+	public $lng;
+	public $route_id;
+	public $original_route_id;
+	public $optimization_problem_id;
+	public $sequence_no;
+	public $geocoded;
+	public $preferred_geocoding;
+	public $failed_geocoding;
+	public $geocodings = array();
+	public $contact_id;
+	public $is_visited;
+	public $customer_po;
+	public $invoice_no;
+	public $reference_no;
+	public $order_no;
+	public $weight;
+	public $cost;
+	public $revenue;
+	public $cube;
+	public $pieces;
+	public $email;
+	public $phone;
+	public $tracking_number;
+	public $destination_note_count;
+	public $drive_time_to_next_destination;
+	public $distance_to_next_destination;
+	public $generated_time_window_start;
+	public $generated_time_window_end;
+	public $time_window_start;
+	public $time_window_end;
+	public $time;
+	public $notes;
+	public $timestamp_last_visited;
+	public $custom_fields = array();
+	public $manifest = array();
     
-    public $first_name;
-    public $last_name;
-    public $is_departed;
-    public $timestamp_last_departed;
-    public $order_id;
-    public $priority;
-    public $curbside_lat;
-    public $curbside_lng;
-    public $time_window_start_2;
-    public $time_window_end_2;
+	public $first_name;
+	public $last_name;
+	public $is_departed;
+	public $timestamp_last_departed;
+	public $order_id;
+	public $priority;
+	public $curbside_lat;
+	public $curbside_lng;
+	public $time_window_start_2;
+	public $time_window_end_2;
 
-    public static function fromArray(array $params)
-    {
-        /*if (!isset($params['address'])) {
+	public static function fromArray(array $params)
+	{
+		/*if (!isset($params['address'])) {
             throw new BadParam('address must be provided');
         }
 
@@ -77,260 +77,260 @@ 
             throw new BadParam('lng must be provided');
         }*/
 
-        $address = new Address();
-        foreach($params as $key => $value) {
-            if (property_exists($address, $key)) {
-                $address->{$key} = $value;
-            }
-        }
+		$address = new Address();
+		foreach($params as $key => $value) {
+			if (property_exists($address, $key)) {
+				$address->{$key} = $value;
+			}
+		}
 
-        return $address;
-    }
+		return $address;
+	}
 
-    public static function getAddress($routeId, $addressId)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'             => $routeId,
-                'route_destination_id' => $addressId,
-            )
-        ));
+	public static function getAddress($routeId, $addressId)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'             => $routeId,
+				'route_destination_id' => $addressId,
+			)
+		));
 
-        return Address::fromArray($address);
-    }
+		return Address::fromArray($address);
+	}
     
-    /*Get notes from the specified route destination
+	/*Get notes from the specified route destination
      * Returns an address object with notes, if an address exists, otherwise - return null.
      */
-    public static function GetAddressesNotes($noteParams)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'GET',
-            'query'  => array(
-                '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,
-            )
-        ));
+	public static function GetAddressesNotes($noteParams)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'GET',
+			'query'  => array(
+				'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,
+			)
+		));
 
-        return $address;
-    }
+		return $address;
+	}
 
-    public function update()
-    {
-        $addressUpdate = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'body'   => $this->toArray(),
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            ),
-        ));
+	public function update()
+	{
+		$addressUpdate = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'body'   => $this->toArray(),
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			),
+		));
 
-        return Address::fromArray($addressUpdate);
-    }
+		return Address::fromArray($addressUpdate);
+	}
     
-    public function markAddress($params, $body)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'PUT',
-            'query'  => array(
-                '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
-        ));
+	public function markAddress($params, $body)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'PUT',
+			'query'  => array(
+				'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
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function markAsDeparted($params)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::MARK_ADDRESS_DEPARTED,
-            '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,
-            ),
-        ));
+	public function markAsDeparted($params)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::MARK_ADDRESS_DEPARTED,
+			'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,
+			),
+		));
 
-        return $address;
-    }
+		return $address;
+	}
     
-    public function markAsVisited($params)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::UPDATE_ADDRESS_VISITED,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
-                'address_id' => isset($params['address_id']) ? $params['address_id'] : null,
-                'member_id'  => isset($params['member_id']) ? $params['member_id'] : null,
-            ),
-            'body'  =>  array(
-                'is_visited' => isset($params['is_visited']) ? $params['is_visited'] : null
-            )
-        ));
+	public function markAsVisited($params)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::UPDATE_ADDRESS_VISITED,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
+				'address_id' => isset($params['address_id']) ? $params['address_id'] : null,
+				'member_id'  => isset($params['member_id']) ? $params['member_id'] : null,
+			),
+			'body'  =>  array(
+				'is_visited' => isset($params['is_visited']) ? $params['is_visited'] : null
+			)
+		));
 
-        return $address;
-    }
+		return $address;
+	}
 
-    public function delete()
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ADDRESS_V4,
-            'method' => 'DELETE',
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            )
-        ));
+	public function delete()
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ADDRESS_V4,
+			'method' => 'DELETE',
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			)
+		));
 
-        return (bool)$address['deleted'];
-    }
+		return (bool)$address['deleted'];
+	}
     
-    public function moveDestinationToRoute($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::MOVE_ROUTE_DESTINATION,
-            'method' => 'POST',
-            'body'  => array(
-                'to_route_id'          => isset($params['to_route_id']) ? $params['to_route_id'] : null,
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-                'after_destination_id' => isset($params['after_destination_id']) ? $params['after_destination_id'] : null
-            ),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+	public function moveDestinationToRoute($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::MOVE_ROUTE_DESTINATION,
+			'method' => 'POST',
+			'body'  => array(
+				'to_route_id'          => isset($params['to_route_id']) ? $params['to_route_id'] : null,
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+				'after_destination_id' => isset($params['after_destination_id']) ? $params['after_destination_id'] : null
+			),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
+		return $result;
         
-    }
+	}
     
-    public function AddAddressNote($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => array(
-                'route_id'     =>  isset($params['route_id']) ? $params['route_id'] : null,
-                'address_id'   =>  isset($params['address_id']) ? $params['address_id'] : null,
-                'dev_lat'      =>  isset($params['dev_lat']) ? $params['dev_lat'] : null,
-                'dev_lng'      =>  isset($params['dev_lng']) ? $params['dev_lng'] : null,
-                'device_type'  =>  isset($params['device_type']) ? $params['device_type'] : null
-            ),
-            'body'  => array(
-                'strNoteContents' => isset($params['strNoteContents']) ? $params['strNoteContents'] : null,
-                'strUpdateType'   => isset($params['strUpdateType']) ? $params['strUpdateType'] : null
-            ),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+	public function AddAddressNote($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => array(
+				'route_id'     =>  isset($params['route_id']) ? $params['route_id'] : null,
+				'address_id'   =>  isset($params['address_id']) ? $params['address_id'] : null,
+				'dev_lat'      =>  isset($params['dev_lat']) ? $params['dev_lat'] : null,
+				'dev_lng'      =>  isset($params['dev_lng']) ? $params['dev_lng'] : null,
+				'device_type'  =>  isset($params['device_type']) ? $params['device_type'] : null
+			),
+			'body'  => array(
+				'strNoteContents' => isset($params['strNoteContents']) ? $params['strNoteContents'] : null,
+				'strUpdateType'   => isset($params['strUpdateType']) ? $params['strUpdateType'] : null
+			),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function AddNoteFile($params)
-    {
-        $result = Route4Me::fileUploadRequest(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => array(
-                'route_id'      =>  isset($params['route_id']) ? $params['route_id'] : null,
-                'address_id'    =>  isset($params['address_id']) ? $params['address_id'] : null,
-                'dev_lat'       =>  isset($params['dev_lat']) ? $params['dev_lat'] : null,
-                'dev_lng'       =>  isset($params['dev_lng']) ? $params['dev_lng'] : null,
-                'device_type'   =>  isset($params['device_type']) ? $params['device_type'] : null,
-                'strUpdateType' =>  isset($params['strUpdateType']) ? $params['strUpdateType'] : null
-            ),
-            'body'  => array(
-                'strFilename' => isset($params['strFilename']) ? $params['strFilename'] : null
-            ),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+	public function AddNoteFile($params)
+	{
+		$result = Route4Me::fileUploadRequest(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => array(
+				'route_id'      =>  isset($params['route_id']) ? $params['route_id'] : null,
+				'address_id'    =>  isset($params['address_id']) ? $params['address_id'] : null,
+				'dev_lat'       =>  isset($params['dev_lat']) ? $params['dev_lat'] : null,
+				'dev_lng'       =>  isset($params['dev_lng']) ? $params['dev_lng'] : null,
+				'device_type'   =>  isset($params['device_type']) ? $params['device_type'] : null,
+				'strUpdateType' =>  isset($params['strUpdateType']) ? $params['strUpdateType'] : null
+			),
+			'body'  => array(
+				'strFilename' => isset($params['strFilename']) ? $params['strFilename'] : null
+			),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    public function createCustomNoteType($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
-            'method' => 'POST',
-            'body'   => array(
-                'type'   => isset($params['type']) ? $params['type'] : null,
-                'values' => isset($params['values']) ? $params['values'] : null
-            )
-        ));
+	public function createCustomNoteType($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
+			'method' => 'POST',
+			'body'   => array(
+				'type'   => isset($params['type']) ? $params['type'] : null,
+				'values' => isset($params['values']) ? $params['values'] : null
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function removeCustomNoteType($params)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
-            'method' => 'DELETE',
-            'body'   => array(
-                'id' => isset($params['id']) ? $params['id'] : null
-            )
-        ));
+	public function removeCustomNoteType($params)
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
+			'method' => 'DELETE',
+			'body'   => array(
+				'id' => isset($params['id']) ? $params['id'] : null
+			)
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function getAllCustomNoteTypes()
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
-            'method' => 'GET'
-        ));
+	public function getAllCustomNoteTypes()
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::NOTE_CUSTOM_TYPES_V4,
+			'method' => 'GET'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
     
-    public function addCustomNoteToRoute($params)
-    {
-        $customArray = array();
+	public function addCustomNoteToRoute($params)
+	{
+		$customArray = array();
         
-        foreach ($params as $key => $value) {
-            $kpos = strpos($key, "custom_note_type");
+		foreach ($params as $key => $value) {
+			$kpos = strpos($key, "custom_note_type");
             
-            if ($kpos !== false) {
-                $customArray[$key]=$value;
-            }
-        }
+			if ($kpos !== false) {
+				$customArray[$key]=$value;
+			}
+		}
         
-        $result = Route4Me::makeRequst(array(
-            'url'    => Endpoint::ROUTE_NOTES_ADD,
-            'method' => 'POST',
-            'query'  => array(
-                'route_id'      =>  isset($params['route_id']) ? $params['route_id'] : null,
-                'address_id'    =>  isset($params['address_id']) ? $params['address_id'] : null,
-                'format'        =>  isset($params['format']) ? $params['format'] : null,
-                'dev_lat'       =>  isset($params['dev_lat']) ? $params['dev_lat'] : null,
-                'dev_lng'       =>  isset($params['dev_lng']) ? $params['dev_lng'] : null
-            ),
-            'body'  => array_merge(array(
-                'strUpdateType'   =>  isset($params['strUpdateType']) ? $params['strUpdateType'] : null,
-                'strUpdateType'   =>  isset($params['strUpdateType']) ? $params['strUpdateType'] : null,
-                'strNoteContents' =>  isset($params['strNoteContents']) ? $params['strNoteContents'] : null
-            ), $customArray),
-            'HTTPHEADER'  => 'Content-Type: multipart/form-data'
-        ));
+		$result = Route4Me::makeRequst(array(
+			'url'    => Endpoint::ROUTE_NOTES_ADD,
+			'method' => 'POST',
+			'query'  => array(
+				'route_id'      =>  isset($params['route_id']) ? $params['route_id'] : null,
+				'address_id'    =>  isset($params['address_id']) ? $params['address_id'] : null,
+				'format'        =>  isset($params['format']) ? $params['format'] : null,
+				'dev_lat'       =>  isset($params['dev_lat']) ? $params['dev_lat'] : null,
+				'dev_lng'       =>  isset($params['dev_lng']) ? $params['dev_lng'] : null
+			),
+			'body'  => array_merge(array(
+				'strUpdateType'   =>  isset($params['strUpdateType']) ? $params['strUpdateType'] : null,
+				'strUpdateType'   =>  isset($params['strUpdateType']) ? $params['strUpdateType'] : null,
+				'strNoteContents' =>  isset($params['strNoteContents']) ? $params['strNoteContents'] : null
+			), $customArray),
+			'HTTPHEADER'  => 'Content-Type: multipart/form-data'
+		));
 
-        return $result;
-    }
+		return $result;
+	}
 
-    function getAddressId()
-    {
-        return $this->route_destination_id;
-    }
+	function getAddressId()
+	{
+		return $this->route_destination_id;
+	}
 }

src/Route4Me/Exception/myErrorHandler.php

Indentation +4 added lines, -4 removed lines

@@ -3,9 +3,9 @@
 
 class myErrorHandler extends \Exception
 {
-    public function proc_error($errno, $errstr, $errfile, $errline) 
-    {
-        echo "line: $errline --- ".$errstr."<br>";
+	public function proc_error($errno, $errstr, $errfile, $errline) 
+	{
+		echo "line: $errline --- ".$errstr."<br>";
     
-    }
+	}
 }

src/Route4Me/curl_http_client.php

Indentation +369 added lines, -369 removed lines

@@ -3,373 +3,373 @@ 
 
 class CurlHttpClient
 {
-    var $ch ;
-    var $debug = false;
-    var $error_msg;
+	var $ch ;
+	var $debug = false;
+	var $error_msg;
 
-    function CurlHttpClient($debug = false)
-    {
-        $this->debug = $debug;
-        $this->init();
-    }
+	function CurlHttpClient($debug = false)
+	{
+		$this->debug = $debug;
+		$this->init();
+	}
     
-    function init()
-    {
-        // initialize curl handle
-        $this->ch = curl_init();
-        //set various options
-        //set error in case http return code bigger than 300
-        curl_setopt($this->ch, CURLOPT_FAILONERROR, true);
-        // use gzip if possible
-        curl_setopt($this->ch,CURLOPT_ENCODING , 'gzip, deflate');
-        // do not veryfy ssl
-        // this is important for windows
-        // as well for being able to access pages with non valid cert
-        curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, 0);
-    }
+	function init()
+	{
+		// initialize curl handle
+		$this->ch = curl_init();
+		//set various options
+		//set error in case http return code bigger than 300
+		curl_setopt($this->ch, CURLOPT_FAILONERROR, true);
+		// use gzip if possible
+		curl_setopt($this->ch,CURLOPT_ENCODING , 'gzip, deflate');
+		// do not veryfy ssl
+		// this is important for windows
+		// as well for being able to access pages with non valid cert
+		curl_setopt($this->ch, CURLOPT_SSL_VERIFYPEER, 0);
+	}
     
-    /**
-     * Set username/pass for basic http auth
-     * @param string user
-     * @param string pass
-     * @access public
-     */
-    function setCredentials($username,$password)
-    {
-        curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
-    }
+	/**
+	 * Set username/pass for basic http auth
+	 * @param string user
+	 * @param string pass
+	 * @access public
+	 */
+	function setCredentials($username,$password)
+	{
+		curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
+	}
     
-    /**
-     * Set referrer
-     * @param string referrer url 
-     * @access public
-     */
-    function setReferrer($referrer_url)
-    {
-        curl_setopt($this->ch, CURLOPT_REFERER, $referrer_url);
-    }
+	/**
+	 * Set referrer
+	 * @param string referrer url 
+	 * @access public
+	 */
+	function setReferrer($referrer_url)
+	{
+		curl_setopt($this->ch, CURLOPT_REFERER, $referrer_url);
+	}
     
-    /**
-     * Set client's userAgent
-     * @param string user agent
-     * @access public
-     */
-    function setUserAgent($userAgent)
-    {
-        curl_setopt($this->ch, CURLOPT_USERAGENT, $userAgent);
-    }
+	/**
+	 * Set client's userAgent
+	 * @param string user agent
+	 * @access public
+	 */
+	function setUserAgent($userAgent)
+	{
+		curl_setopt($this->ch, CURLOPT_USERAGENT, $userAgent);
+	}
     
-    /**
-     * Set to receive output headers in all output functions
-     * @param boolean true to include all response headers with output, false otherwise
-     * @access public
-     */
-    function includeResponseHeaders($value)
-    {
-        curl_setopt($this->ch, CURLOPT_HEADER, $value);
-    }
+	/**
+	 * Set to receive output headers in all output functions
+	 * @param boolean true to include all response headers with output, false otherwise
+	 * @access public
+	 */
+	function includeResponseHeaders($value)
+	{
+		curl_setopt($this->ch, CURLOPT_HEADER, $value);
+	}
     
-    /**
-     * Set proxy to use for each curl request
-     * @param string proxy
-     * @access public
-     */
-    function setProxy($proxy)
-    {
-        curl_setopt($this->ch, CURLOPT_PROXY, $proxy);
-    }
+	/**
+	 * Set proxy to use for each curl request
+	 * @param string proxy
+	 * @access public
+	 */
+	function setProxy($proxy)
+	{
+		curl_setopt($this->ch, CURLOPT_PROXY, $proxy);
+	}
     
-    /**
-     * Send post data to target URL     
-     * return data returned from url or false if error occured
-     * @param string url
-     * @param mixed post data (assoc array ie. $foo['post_var_name'] = $value or as string like var=val1&var2=val2)
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 10)
-     * @return string data
-     * @access public
-     */
-    function sendPostData($url, $postdata, $ip=null, $timeout=10)
-    {
-        //set various curl options first
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
-        // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+	/**
+	 * Send post data to target URL     
+	 * return data returned from url or false if error occured
+	 * @param string url
+	 * @param mixed post data (assoc array ie. $foo['post_var_name'] = $value or as string like var=val1&var2=val2)
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 10)
+	 * @return string data
+	 * @access public
+	 */
+	function sendPostData($url, $postdata, $ip=null, $timeout=10)
+	{
+		//set various curl options first
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL,$url);
+		// return into a variable rather than displaying it
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug)
-            {
-                echo "Binding to ip $ip\n";
-            }
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
-        }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug)
+			{
+				echo "Binding to ip $ip\n";
+			}
+			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
         
-        //set method to post
-        curl_setopt($this->ch, CURLOPT_POST, true);
-        // set post string
-        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $postdata);
+		//set method to post
+		curl_setopt($this->ch, CURLOPT_POST, true);
+		// set post string
+		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $postdata);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
-            return false;
-        } else {
-            return $result;
-        }
-    }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
+			return false;
+		} else {
+			return $result;
+		}
+	}
     
-    /**
-     * fetch data from target URL     
-     * return data returned from url or false if error occured
-     * @param string url     
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 5)
-     * @return string data
-     * @access public
-     */
-    function fetchUrl($url, $ip=null, $timeout=5)
-    {
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
+	/**
+	 * fetch data from target URL     
+	 * return data returned from url or false if error occured
+	 * @param string url     
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 5)
+	 * @return string data
+	 * @access public
+	 */
+	function fetchUrl($url, $ip=null, $timeout=5)
+	{
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL,$url);
         
-        //set method to get
-        curl_setopt($this->ch, CURLOPT_HTTPGET,true);
-        // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		//set method to get
+		curl_setopt($this->ch, CURLOPT_HTTPGET,true);
+		// return into a variable rather than displaying it
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
-                echo "Binding to ip $ip\n";
-            }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug) {
+				echo "Binding to ip $ip\n";
+			}
             
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
-        }
+			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
-            return false;
-        } else {
-            return $result;
-        }
-    }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
+			return false;
+		} else {
+			return $result;
+		}
+	}
     
-    /**
-     * Fetch data from target URL
-     * and store it directly to file          
-     * @param string url     
-     * @param resource value stream resource(ie. fopen)
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 5)
-     * @return boolean true on success false othervise
-     * @access public
-     */
-    function fetchIntoFile($url, $fp, $ip=null, $timeout=5)
-    {
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL,$url);
-        //set method to get
-        curl_setopt($this->ch, CURLOPT_HTTPGET, true);
-        // store data into file rather than displaying it
-        curl_setopt($this->ch, CURLOPT_FILE, $fp);
+	/**
+	 * Fetch data from target URL
+	 * and store it directly to file          
+	 * @param string url     
+	 * @param resource value stream resource(ie. fopen)
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 5)
+	 * @return boolean true on success false othervise
+	 * @access public
+	 */
+	function fetchIntoFile($url, $fp, $ip=null, $timeout=5)
+	{
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL,$url);
+		//set method to get
+		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
+		// store data into file rather than displaying it
+		curl_setopt($this->ch, CURLOPT_FILE, $fp);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
-                echo "Binding to ip $ip\n";
-            }
-            curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
-        }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug) {
+				echo "Binding to ip $ip\n";
+			}
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
             
-            return false;
-        } else  {
-            return true;
-        }
-    }
+			return false;
+		} else  {
+			return true;
+		}
+	}
     
-    /**
-     * Send multipart post data to the target URL     
-     * return data returned from url or false if error occured
-     * (contribution by vule nikolic, vule@dinke.net)
-     * @param string url
-     * @param array assoc post data array ie. $foo['post_var_name'] = $value
-     * @param array assoc $file_field_array, contains file_field name = value - path pairs
-     * @param string ip address to bind (default null)
-     * @param int timeout in sec for complete curl operation (default 30 sec)
-     * @return string data
-     * @access public
-     */
-    function sendMultipartPostData($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
-    {
-        //set various curl options first
-        // set url to post to
-        curl_setopt($this->ch, CURLOPT_URL, $url);
-        // return into a variable rather than displaying it
-        curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
+	/**
+	 * Send multipart post data to the target URL     
+	 * return data returned from url or false if error occured
+	 * (contribution by vule nikolic, vule@dinke.net)
+	 * @param string url
+	 * @param array assoc post data array ie. $foo['post_var_name'] = $value
+	 * @param array assoc $file_field_array, contains file_field name = value - path pairs
+	 * @param string ip address to bind (default null)
+	 * @param int timeout in sec for complete curl operation (default 30 sec)
+	 * @return string data
+	 * @access public
+	 */
+	function sendMultipartPostData($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
+	{
+		//set various curl options first
+		// set url to post to
+		curl_setopt($this->ch, CURLOPT_URL, $url);
+		// return into a variable rather than displaying it
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
         
-        //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
-                echo "Binding to ip $ip\n";
-            }
+		//bind to specific ip address if it is sent trough arguments
+		if($ip) {
+			if($this->debug) {
+				echo "Binding to ip $ip\n";
+			}
             
-            curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
-        }
+			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+		}
         
-        //set curl function timeout to $timeout
-        curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
-        //set method to post
-        curl_setopt($this->ch, CURLOPT_POST, true);
-        // disable Expect header
-        // hack to make it working
-        $headers = array("Expect: ");
-        curl_setopt($this->ch, CURLOPT_HTTPHEADER, $headers);
-        // initialize result post array
-        $result_post = array();
-        //generate post string
-        $post_array = array();
-        $post_string_array = array();
+		//set curl function timeout to $timeout
+		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
+		//set method to post
+		curl_setopt($this->ch, CURLOPT_POST, true);
+		// disable Expect header
+		// hack to make it working
+		$headers = array("Expect: ");
+		curl_setopt($this->ch, CURLOPT_HTTPHEADER, $headers);
+		// initialize result post array
+		$result_post = array();
+		//generate post string
+		$post_array = array();
+		$post_string_array = array();
         
-        if(!is_array($postdata)) {
-            return false;
-        }
+		if(!is_array($postdata)) {
+			return false;
+		}
         
-        foreach($postdata as $key=>$value) {
-            $post_array[$key] = $value;
-            $post_string_array[] = urlencode($key)."=".urlencode($value);
-        }
+		foreach($postdata as $key=>$value) {
+			$post_array[$key] = $value;
+			$post_string_array[] = urlencode($key)."=".urlencode($value);
+		}
         
-        $post_string = implode("&",$post_string_array);
-        if($this->debug) {
-            echo "Post String: $post_string\n";
-        }
+		$post_string = implode("&",$post_string_array);
+		if($this->debug) {
+			echo "Post String: $post_string\n";
+		}
         
-        // set post string
-        //curl_setopt($this->ch, CURLOPT_POSTFIELDS, $post_string);
-        // set multipart form data - file array field-value pairs
-        if(!empty($file_field_array)) {
-            foreach($file_field_array as $var_name => $var_value) {
-                if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
-                $file_field_array[$var_name] = "@".$var_value;
-            }
-        }
+		// set post string
+		//curl_setopt($this->ch, CURLOPT_POSTFIELDS, $post_string);
+		// set multipart form data - file array field-value pairs
+		if(!empty($file_field_array)) {
+			foreach($file_field_array as $var_name => $var_value) {
+				if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+				$file_field_array[$var_name] = "@".$var_value;
+			}
+		}
         
-        // set post data
-        $result_post = array_merge($post_array, $file_field_array);
-        curl_setopt($this->ch, CURLOPT_POSTFIELDS, $result_post);
+		// set post data
+		$result_post = array_merge($post_array, $file_field_array);
+		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $result_post);
         
-        //and finally send curl request
-        $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
-                echo "Error Occured in Curl\n";
-                echo "Error number: " .curl_errno($this->ch) ."\n";
-                echo "Error message: " .curl_error($this->ch)."\n";
-            }
+		//and finally send curl request
+		$result = curl_exec_redir($this->ch);
+		if(curl_errno($this->ch)) {
+			if($this->debug) {
+				echo "Error Occured in Curl\n";
+				echo "Error number: " .curl_errno($this->ch) ."\n";
+				echo "Error message: " .curl_error($this->ch)."\n";
+			}
             
-            return false;
-        } else {
-            return $result;
-        }
-    }
+			return false;
+		} else {
+			return $result;
+		}
+	}
     
-    /**
-     * Set file location where cookie data will be stored and send on each new request
-     * @param string absolute path to cookie file (must be in writable dir)
-     * @access public
-     */
-    function storeCookies($cookie_file)
-    {
-        // use cookies on each request (cookies stored in $cookie_file)
-        curl_setopt ($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
-        curl_setopt ($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
-    }
+	/**
+	 * Set file location where cookie data will be stored and send on each new request
+	 * @param string absolute path to cookie file (must be in writable dir)
+	 * @access public
+	 */
+	function storeCookies($cookie_file)
+	{
+		// use cookies on each request (cookies stored in $cookie_file)
+		curl_setopt ($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
+		curl_setopt ($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
+	}
     
-    /**
-     * Set custom cookie
-     * @param string cookie
-     * @access public
-     */
-    function setCookie($cookie)
-    {        
-        curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
-    }
+	/**
+	 * Set custom cookie
+	 * @param string cookie
+	 * @access public
+	 */
+	function setCookie($cookie)
+	{        
+		curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
+	}
     
-    /**
-     * Get last URL info 
-     * usefull when original url was redirected to other location    
-     * @access public
-     * @return string url
-     */
-    function getEffectiveUrl()
-    {
-        return curl_getinfo($this->ch, CURLINFO_EFFECTIVE_URL);
-    }
+	/**
+	 * Get last URL info 
+	 * usefull when original url was redirected to other location    
+	 * @access public
+	 * @return string url
+	 */
+	function getEffectiveUrl()
+	{
+		return curl_getinfo($this->ch, CURLINFO_EFFECTIVE_URL);
+	}
     
-    /**
-     * Get http response code     
-     * @access public
-     * @return int
-     */
-    function getHttpResponseCode()
-    {
-        return curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
-    }
+	/**
+	 * Get http response code     
+	 * @access public
+	 * @return int
+	 */
+	function getHttpResponseCode()
+	{
+		return curl_getinfo($this->ch, CURLINFO_HTTP_CODE);
+	}
     
-    /**
-     * Return last error message and error number
-     * @return string error msg
-     * @access public
-     */
-    function getErrorMsg()
-    {
-        $err = "Error number: " .curl_errno($this->ch) ."\n";
-        $err .="Error message: " .curl_error($this->ch)."\n";
-        return $err;
-    }
+	/**
+	 * Return last error message and error number
+	 * @return string error msg
+	 * @access public
+	 */
+	function getErrorMsg()
+	{
+		$err = "Error number: " .curl_errno($this->ch) ."\n";
+		$err .="Error message: " .curl_error($this->ch)."\n";
+		return $err;
+	}
     
-    /**
-     * Close curl session and free resource
-     * Usually no need to call this function directly
-     * in case you do you have to call init() to recreate curl
-     * @access public
-     */
-    function close()
-    {
-        //close curl session and free up resources
-        curl_close($this->ch);
-    }
+	/**
+	 * Close curl session and free resource
+	 * Usually no need to call this function directly
+	 * in case you do you have to call init() to recreate curl
+	 * @access public
+	 */
+	function close()
+	{
+		//close curl session and free up resources
+		curl_close($this->ch);
+	}
 }
 
 /**
@@ -378,58 +378,58 @@ 
  */
 function curlExecRedir($ch)
 {
-    static $curl_loops = 0;
-    static $curl_max_loops = 20;
+	static $curl_loops = 0;
+	static $curl_max_loops = 20;
     
-    if ($curl_loops++ >= $curl_max_loops) {
-        $curl_loops = 0;
-        return FALSE;
-    }
+	if ($curl_loops++ >= $curl_max_loops) {
+		$curl_loops = 0;
+		return FALSE;
+	}
     
-    curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
-    curl_setopt($ch, CURLOPT_HEADER, true);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_VERBOSE, false);
-    $data = curl_exec($ch);
-    $data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
-    list($header, $data) = explode("\n\n", $data, 2);
-    $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
+	curl_setopt($ch, CURLOPT_HEADER, true);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_VERBOSE, false);
+	$data = curl_exec($ch);
+	$data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
+	list($header, $data) = explode("\n\n", $data, 2);
+	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     
-    //echo "*** Got HTTP code: $http_code ***\n";
-    //echo "**  Got headers: \n$header\n\n";
+	//echo "*** Got HTTP code: $http_code ***\n";
+	//echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 ) {
-        // If we're redirected, we should revert to GET
-        curl_setopt($ch, CURLOPT_HTTPGET,true);
+	if ( $http_code == 301 || $http_code == 302 ) {
+		// If we're redirected, we should revert to GET
+		curl_setopt($ch, CURLOPT_HTTPGET,true);
         
-        $matches = array();
-        preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
-        $url = @parse_url(trim($matches[1]));
+		$matches = array();
+		preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
+		$url = @parse_url(trim($matches[1]));
         
-        if (!$url) {
-            //couldn't process the url to redirect to
-            $curl_loops = 0;
-            return $data;
-        }
+		if (!$url) {
+			//couldn't process the url to redirect to
+			$curl_loops = 0;
+			return $data;
+		}
         
-        $last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-        if (empty($url['scheme']))
-            $url['scheme'] = $last_url['scheme'];
+		$last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+		if (empty($url['scheme']))
+			$url['scheme'] = $last_url['scheme'];
         
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
+		if (empty($url['host']))
+			$url['host'] = $last_url['host'];
         
-        if (empty($url['path']))
-            $url['path'] = $last_url['path'];
+		if (empty($url['path']))
+			$url['path'] = $last_url['path'];
         
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
-        //echo "Being redirected to $new_url\n";
-        curl_setopt($ch, CURLOPT_URL, $new_url);
+		$new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+		//echo "Being redirected to $new_url\n";
+		curl_setopt($ch, CURLOPT_URL, $new_url);
         
-        return curl_exec_redir($ch);
-    } else {
-        $curl_loops=0;
-        return $data;
-    }
+		return curl_exec_redir($ch);
+	} else {
+		$curl_loops=0;
+		return $data;
+	}
 }
 ?>

src/Route4Me/RouteParameters.php

Indentation +66 added lines, -66 removed lines

@@ -5,74 +5,74 @@
 
 class RouteParameters extends Common
 {
-    public $is_upload;
-    public $rt;
-    public $route_name;
-    public $route_date;
-    public $route_time;
-    public $shared_publicly;
-    public $disable_optimization;
-    public $optimize;
-    public $lock_last;
-    public $vehicle_capacity;
-    public $vehicle_max_distance_mi;
-    public $distance_unit;
-    public $travel_mode;
-    public $avoid;
-    public $vehicle_id;
-    public $dev_lat;
-    public $dev_lng;
-    public $route_max_duration;
-    public $route_email;
-    public $route_type = "api";
-    public $store_route = true;
-    public $metric;
-    public $algorithm_type;
-    public $member_id;
-    public $ip;
-    public $dm;
-    public $dirm;
-    public $parts;
-    public $device_id;
-    public $device_type;
-    public $has_trailer;
-    public $trailer_weight_t;
-    public $limited_weight_t;
-    public $weight_per_axle_t;
-    public $truck_height_meters;
-    public $truck_width_meters;
-    public $truck_length_meters;
-    public $truck_hazardous_goods;
+	public $is_upload;
+	public $rt;
+	public $route_name;
+	public $route_date;
+	public $route_time;
+	public $shared_publicly;
+	public $disable_optimization;
+	public $optimize;
+	public $lock_last;
+	public $vehicle_capacity;
+	public $vehicle_max_distance_mi;
+	public $distance_unit;
+	public $travel_mode;
+	public $avoid;
+	public $vehicle_id;
+	public $dev_lat;
+	public $dev_lng;
+	public $route_max_duration;
+	public $route_email;
+	public $route_type = "api";
+	public $store_route = true;
+	public $metric;
+	public $algorithm_type;
+	public $member_id;
+	public $ip;
+	public $dm;
+	public $dirm;
+	public $parts;
+	public $device_id;
+	public $device_type;
+	public $has_trailer;
+	public $trailer_weight_t;
+	public $limited_weight_t;
+	public $weight_per_axle_t;
+	public $truck_height_meters;
+	public $truck_width_meters;
+	public $truck_length_meters;
+	public $truck_hazardous_goods;
     
-    public $vehicle_max_cargo_weight;
-    public $vehicle_max_cargo_volume;
-    public $subtour_max_revenue;
-    public $avoidance_zones;
-    public $driver_id;
-    public $parts_min;
-    public $first_drive_then_wait_between_stops;
-    public $truck_height;
-    public $truck_width;
-    public $truck_length;
-    public $optimization_quality;
-    public $override_addresses;
-    public $max_tour_size;
-    public $min_tour_size;
-    public $uturn;
-    public $leftturn;
-    public $rightturn;
+	public $vehicle_max_cargo_weight;
+	public $vehicle_max_cargo_volume;
+	public $subtour_max_revenue;
+	public $avoidance_zones;
+	public $driver_id;
+	public $parts_min;
+	public $first_drive_then_wait_between_stops;
+	public $truck_height;
+	public $truck_width;
+	public $truck_length;
+	public $optimization_quality;
+	public $override_addresses;
+	public $max_tour_size;
+	public $min_tour_size;
+	public $uturn;
+	public $leftturn;
+	public $rightturn;
     
-    public $optimized_callback_url;
+	public $optimized_callback_url;
 
-    public static function fromArray(array $params)
-    {
-        $routeParams = new RouteParameters();
-        foreach($params as $key => $value) {
-            if (property_exists($routeParams, $key)) {
-                $routeParams->{$key} = $value;
-            }
-        }
+	public static function fromArray(array $params)
+	{
+		$routeParams = new RouteParameters();
+		foreach($params as $key => $value) {
+			if (property_exists($routeParams, $key)) {
+				$routeParams->{$key} = $value;
+			}
+		}
 
-        return $routeParams;
-    }
+		return $routeParams;
+	}
 }

src/Route4Me/Enum/Metric.php

Indentation +5 added lines, -5 removed lines

@@ -3,9 +3,9 @@
 
 class Metric
 {
-    const EUCLIDEAN = 1; //measures point to point distance as a straight line
-    const MANHATTAN = 2; //measures point to point distance as taxicab geometry line
-    const GEODESIC  = 3; //measures point to point distance approximating curvature of the earth
-    const MATRIX    = 4; //measures point to point distance by traversing the actual road network
-    const EXACT_2D  = 5; //measures point to point distance using 2d rectilinear distance
+	const EUCLIDEAN = 1; //measures point to point distance as a straight line
+	const MANHATTAN = 2; //measures point to point distance as taxicab geometry line
+	const GEODESIC  = 3; //measures point to point distance approximating curvature of the earth
+	const MATRIX    = 4; //measures point to point distance by traversing the actual road network
+	const EXACT_2D  = 5; //measures point to point distance using 2d rectilinear distance
 }