route4me / route4me-php-sdk

src/Route4Me/Enum/Metric.php

Indentation +5 added lines, -5 removed lines

@@ -4,9 +4,9 @@
 
 class Metric
 {
-    const EUCLIDEAN = 1;
-    const MANHATTAN = 2;
-    const GEODESIC = 3;
-    const MATRIX = 4;
-    const EXACT_2D = 5;
+	const EUCLIDEAN = 1;
+	const MANHATTAN = 2;
+	const GEODESIC = 3;
+	const MATRIX = 4;
+	const EXACT_2D = 5;
 }

src/Route4Me/Enum/DistanceUnit.php

Indentation +2 added lines, -2 removed lines

@@ -4,6 +4,6 @@
 
 class DistanceUnit
 {
-    const MILES = 'mi';
-    const KILOMETERS = 'km';
+	const MILES = 'mi';
+	const KILOMETERS = 'km';
 }

src/Route4Me/Enum/TerritoryTypes.php

Indentation +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
 
 class TerritoryTypes
 {
-    const CIRCLE = 'circle';
-    const POLY = 'poly';
-    const RECT = 'rect';
+	const CIRCLE = 'circle';
+	const POLY = 'poly';
+	const RECT = 'rect';
 }
 
 ?>
\ No newline at end of file

src/Route4Me/Enum/Format.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class Format
 {
-    const SERIALIZED = 'serialized';
-    const CSV = 'csv';
-    const XML = 'xml';
-    const JSON = 'json';
+	const SERIALIZED = 'serialized';
+	const CSV = 'csv';
+	const XML = 'xml';
+	const JSON = 'json';
 }

src/Route4Me/Enum/TravelMode.php

Indentation +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@
 
 class TravelMode
 {
-    const DRIVING = 'Driving';
-    const WALKING = 'Walking';
-    const TRUCKING = 'Trucking';
+	const DRIVING = 'Driving';
+	const WALKING = 'Walking';
+	const TRUCKING = 'Trucking';
 }

src/Route4Me/Enum/AlgorithmType.php

Indentation +7 added lines, -7 removed lines

@@ -4,11 +4,11 @@
 
 class AlgorithmType
 {
-    const TSP = 1;
-    const VRP = 2;
-    const CVRP_TW_SD = 3;
-    const CVRP_TW_MD = 4;
-    const TSP_TW = 5;
-    const TSP_TW_CR = 6;
-    const BBCVRP = 7;
+	const TSP = 1;
+	const VRP = 2;
+	const CVRP_TW_SD = 3;
+	const CVRP_TW_MD = 4;
+	const TSP_TW = 5;
+	const TSP_TW_CR = 6;
+	const BBCVRP = 7;
 }

src/Route4Me/OptimizationProblemParams.php

Indentation +69 added lines, -69 removed lines

@@ -8,85 +8,85 @@
 
 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 $optimization_problem_id;
+	public $reoptimize;
+	public $addresses = array();
+	public $parameters;
+	public $directions;
+	public $format;
+	public $route_path_output;
+	public $optimized_callback_url;
 
-    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);
-            }
-            $param->addAddress($address);
-        }
+		foreach($params['addresses'] as $address) {
+			if (!($address instanceof Address)) {
+				$address = Address::fromArray($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->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');
 
-        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;
-        return $this;
-    }
+	public function setParameters(RouteParameters $params)
+	{
+		$this->parameters = $params;
+		return $this;
+	}
 
-    public function addAddress(Address $address)
-    {
-        $this->addresses[] = $address;
-        return $this;
-    }
+	public function addAddress(Address $address)
+	{
+		$this->addresses[] = $address;
+		return $this;
+	}
     
-    public function getAddressesArray()
-    {
-        $addresses = array();
-        foreach($this->addresses as $address) {
-            $addresses[] = $address->toArray();
-        }
-        return $addresses;
-    }
+	public function getAddressesArray()
+	{
+		$addresses = array();
+		foreach($this->addresses as $address) {
+			$addresses[] = $address->toArray();
+		}
+		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);
-        }
-        return $this;
-    }
+	public function setAddresses(array $addresses)
+	{
+		foreach ($addresses as $address) {
+			$this->addAddress($address);
+		}
+		return $this;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
             $param->setParameters(RouteParameters::fromArray($params['parameters']));
         }
 
-        foreach($params['addresses'] as $address) {
+        foreach ($params['addresses'] as $address) {
             if (!($address instanceof Address)) {
                 $address = Address::fromArray($address);
             }
@@ -71,7 +71,7 @@ 
     public function getAddressesArray()
     {
         $addresses = array();
-        foreach($this->addresses as $address) {
+        foreach ($this->addresses as $address) {
             $addresses[] = $address->toArray();
         }
         return $addresses;

src/Route4Me/curl_http_client.php

Indentation +46 added lines, -46 removed lines

@@ -110,7 +110,7 @@ 
 		//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";
@@ -120,7 +120,7 @@ 
 			return false;
 		}
 		else
-        {
+		{
 			return $result;
 		}
 	}
@@ -372,53 +372,53 @@ 
  */
 function curl_exec_redir($ch)
 {
-    static $curl_loops = 0;
-    static $curl_max_loops = 20;
-    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);
+	static $curl_loops = 0;
+	static $curl_max_loops = 20;
+	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);
     
-    //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
+	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]));
-        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'];
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
-        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);
-        return curl_exec_redir($ch);
-    } else {
-        $curl_loops=0;
-        return $data;
-    }
+		$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;
+		}
+		$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['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);
+		return curl_exec_redir($ch);
+	} else {
+		$curl_loops=0;
+		return $data;
+	}
 }
 ?>

Spacing +57 added lines, -57 removed lines

@@ -3,7 +3,7 @@ 
 
 class Curl_HTTP_Client
 {
-	var $ch ;
+	var $ch;
 	var $debug = false;
 	var $error_msg;
 
@@ -21,7 +21,7 @@ 
 		//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');
+		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
@@ -33,7 +33,7 @@ 
 	 * @param string pass
 	 * @access public
 	 */
-	function set_credentials($username,$password)
+	function set_credentials($username, $password)
 	{
 		curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
 	}
@@ -83,22 +83,22 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function send_post_data($url, $postdata, $ip=null, $timeout=10)
+	function send_post_data($url, $postdata, $ip = null, $timeout = 10)
 	{
     
 		//set various curl options first
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
 		// return into a variable rather than displaying it
-		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			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);
@@ -109,13 +109,13 @@ 
 		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $postdata);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
         {
-			if($this->debug)
+			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";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -133,35 +133,35 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function fetch_url($url, $ip=null, $timeout=5)
+	function fetch_url($url, $ip = null, $timeout = 5)
 	{
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
         
 		//set method to get
-		curl_setopt($this->ch, CURLOPT_HTTPGET,true);
+		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
 		// return into a variable rather than displaying it
-		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			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);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			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";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -180,18 +180,18 @@ 
 	 * @return boolean true on success false othervise
 	 * @access public
 	 */
-	function fetch_into_file($url, $fp, $ip=null, $timeout=5)
+	function fetch_into_file($url, $fp, $ip = null, $timeout = 5)
 	{
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		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 ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
@@ -201,13 +201,13 @@ 
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			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";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -228,7 +228,7 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function send_multipart_post_data($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
+	function send_multipart_post_data($url, $postdata, $file_field_array = array(), $ip = null, $timeout = 30)
 	{
 		//set various curl options first
 		// set url to post to
@@ -236,13 +236,13 @@ 
 		// 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 ($ip)
 		{
-			if($this->debug)
+			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);
@@ -257,28 +257,28 @@ 
 		//generate post string
 		$post_array = array();
 		$post_string_array = array();
-		if(!is_array($postdata))
+		if (!is_array($postdata))
 		{
 			return false;
 		}
-		foreach($postdata as $key=>$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)
+		$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))
+		if (!empty($file_field_array))
 		{
-			foreach($file_field_array as $var_name => $var_value)
+			foreach ($file_field_array as $var_name => $var_value)
 			{
-				if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+				if (strpos(PHP_OS, "WIN")!==false) $var_value = str_replace("/", "\\", $var_value); // win hack
 				$file_field_array[$var_name] = "@".$var_value;
 			}
 		}
@@ -287,13 +287,13 @@ 
 		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 (curl_errno($this->ch))
 		{
-			if($this->debug)
+			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";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -310,8 +310,8 @@ 
 	function store_cookies($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);
+		curl_setopt($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
+		curl_setopt($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
 	}
 	
 	/**
@@ -321,7 +321,7 @@ 
 	 */
 	function set_cookie($cookie)
 	{		
-		curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
+		curl_setopt($this->ch, CURLOPT_COOKIE, $cookie);
 	}
 	/**
 	 * Get last URL info 
@@ -349,8 +349,8 @@ 
 	 */
 	function get_error_msg()
 	{
-		$err = "Error number: " .curl_errno($this->ch) ."\n";
-		$err .="Error message: " .curl_error($this->ch)."\n";
+		$err = "Error number: ".curl_errno($this->ch)."\n";
+		$err .= "Error message: ".curl_error($this->ch)."\n";
 		return $err;
 	}
 	
@@ -374,7 +374,7 @@ 
 {
     static $curl_loops = 0;
     static $curl_max_loops = 20;
-    if ($curl_loops++ >= $curl_max_loops)
+    if ($curl_loops++>=$curl_max_loops)
     {
         $curl_loops = 0;
         return FALSE;
@@ -391,10 +391,10 @@ 
     //echo "*** Got HTTP code: $http_code ***\n";
     //echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 )
+    if ($http_code==301 || $http_code==302)
     {
         // If we're redirected, we should revert to GET
-		curl_setopt($ch, CURLOPT_HTTPGET,true);
+		curl_setopt($ch, CURLOPT_HTTPGET, true);
         
         $matches = array();
         preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
@@ -412,12 +412,12 @@ 
             $url['host'] = $last_url['host'];
         if (empty($url['path']))
             $url['path'] = $last_url['path'];
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+        $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;
+        $curl_loops = 0;
         return $data;
     }
 }

Braces +17 added lines, -15 removed lines

@@ -118,8 +118,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
         {
 			return $result;
 		}
@@ -164,8 +163,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
 		{
 			return $result;
 		}
@@ -210,8 +208,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -278,7 +275,10 @@ 
 		{
 			foreach($file_field_array as $var_name => $var_value)
 			{
-				if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+				if(strpos(PHP_OS, "WIN") !== false) {
+					$var_value = str_replace("/", "\\", $var_value);
+				}
+				// win hack
 				$file_field_array[$var_name] = "@".$var_value;
 			}
 		}
@@ -296,8 +296,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
 		{
 			return $result;
 		}
@@ -406,12 +405,15 @@ 
             return $data;
         }
         $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['path']))
-            $url['path'] = $last_url['path'];
+        if (empty($url['scheme'])) {
+                    $url['scheme'] = $last_url['scheme'];
+        }
+        if (empty($url['host'])) {
+                    $url['host'] = $last_url['host'];
+        }
+        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);

src/Route4Me/Order.php

Indentation +60 added lines, -60 removed lines

@@ -37,45 +37,45 @@ 
 		
 		public static function fromArray(array $params) {
 			$order= new Order();
-	        foreach($params as $key => $value) {
-	            if (property_exists($order, $key)) {
-	                $order->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($order, $key)) {
+					$order->{$key} = $value;
+				}
 			}
 			
 			return $order;
 		}
 		
 		public static function addOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
 					'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,
-	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_1) ? $params->address_city: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+					'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
+					'address_city' => 	isset($params->address_1) ? $params->address_city: null,
+					'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
+					'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
+					'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
+					'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
+					'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 
 		public static function addOrder2Route($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlRoute,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlRoute,
+				'method' => 'PUT',
+				'query'  => array(
 					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -84,13 +84,13 @@ 
 		}
 		
 		public static function addOrder2Destination($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlOpt,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlOpt,
+				'method' => 'PUT',
+				'query'  => array(
 					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -99,58 +99,58 @@ 
 		}
 		
 		public static function getOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function getOrders()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 
 			return $response;
 		}
 		
 		public static function removeOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETE',
+				'body'  => array(
 					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function updateOrder($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'body'  => (array)$body
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'body'  => (array)$body
+			));
 
 			return $response;
 		}
 		
 		public static function searchOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
 					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
 					'fields' => 	isset($params->fields) ? $params->fields: null,
@@ -158,7 +158,7 @@ 
 					'limit' => 	isset($params->limit) ? $params->limit: null,
 					'query' => 	isset($params->query) ? $params->query: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}

Spacing +22 added lines, -22 removed lines

@@ -33,11 +33,11 @@ 
 		public $limit;
 		public $query;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$order= new Order();
-	        foreach($params as $key => $value) {
+			$order = new Order();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($order, $key)) {
 	                $order->{$key} = $value;
 	            }
@@ -52,29 +52,29 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
+					'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_1) ? $params->address_city: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+	                'address_city' => 	isset($params->address_1) ? $params->address_city : null,
+	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name : null,
+	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name : null,
+	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email : null,
+	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone : null,
+	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data : null,
 				)
 	        ));
 
 			return $response;
 		}
 
-		public static function addOrder2Route($params,$body)
+		public static function addOrder2Route($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlRoute,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
+					'route_id' => 	isset($params->route_id) ? $params->route_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -83,13 +83,13 @@ 
 			return $response;
 		}
 		
-		public static function addOrder2Destination($params,$body)
+		public static function addOrder2Destination($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlOpt,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
+					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -104,7 +104,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
+					'order_id' => 	isset($params->order_id) ? $params->order_id : null,
 				)
 	        ));
 
@@ -127,7 +127,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
+					'order_ids' => 	isset($params->order_ids) ? $params->order_ids : null
 				)
 	        ));
 
@@ -151,12 +151,12 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
-					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
-					'fields' => 	isset($params->fields) ? $params->fields: null,
-					'offset' => 	isset($params->offset) ? $params->offset: null,
-					'limit' => 	isset($params->limit) ? $params->limit: null,
-					'query' => 	isset($params->query) ? $params->query: null,
+					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD : null,
+					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD : null,
+					'fields' => 	isset($params->fields) ? $params->fields : null,
+					'offset' => 	isset($params->offset) ? $params->offset : null,
+					'limit' => 	isset($params->limit) ? $params->limit : null,
+					'query' => 	isset($params->query) ? $params->query : null,
 				)
 	        ));