route4me / route4me-php-sdk

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,
 				)
 	        ));
 

src/Route4Me/Geocoding.php

Indentation +20 added lines, -20 removed lines

@@ -23,10 +23,10 @@ 
 		
 		public static function fromArray(array $params) {
 			$geocoding = new Geocoding();
-	        foreach($params as $key => $value) {
-	            if (property_exists($geocoding, $key)) {
-	                $geocoding->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($geocoding, $key)) {
+					$geocoding->{$key} = $value;
+				}
 			}
 			return $geocoding;
 		}
@@ -35,15 +35,15 @@ 
 		{
 			//Route4Me::simplePrint($params);
 			$query = array(
-	                'format' => isset($params['format']) ? $params['format']: null,
-	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
-	            );
+					'format' => isset($params['format']) ? $params['format']: null,
+					'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
+				);
 			//var_dump($query);
 			$fgcoding = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'query'  => $query
-	        ));
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'query'  => $query
+			));
 			
 			return $fgcoding;
 		}
@@ -64,9 +64,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}
@@ -87,9 +87,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}
@@ -113,9 +113,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}

Spacing +13 added lines, -13 removed lines

@@ -19,11 +19,11 @@ 
 		public $housenumber;
 		public $zipcode;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
 			$geocoding = new Geocoding();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($geocoding, $key)) {
 	                $geocoding->{$key} = $value;
 	            }
@@ -35,7 +35,7 @@ 
 		{
 			//Route4Me::simplePrint($params);
 			$query = array(
-	                'format' => isset($params['format']) ? $params['format']: null,
+	                'format' => isset($params['format']) ? $params['format'] : null,
 	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
 	            );
 			//var_dump($query);
@@ -52,13 +52,13 @@ 
 		{
 			$url_query = self::$api_street;
 			if (isset($params['pk'])) {
-				$url_query.=$params['pk'].'/';
+				$url_query .= $params['pk'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();
@@ -75,13 +75,13 @@ 
 		{
 			$url_query = self::$api_zipcode;
 			if (isset($params['zipcode'])) {
-				$url_query.=$params['zipcode'].'/';
+				$url_query .= $params['zipcode'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();
@@ -98,16 +98,16 @@ 
 		{
 			$url_query = self::$api_service;
 			if (isset($params['zipcode'])) {
-				$url_query.=$params['zipcode'].'/';
+				$url_query .= $params['zipcode'].'/';
 			}
 			if (isset($params['housenumber'])) {
-				$url_query.=$params['housenumber'].'/';
+				$url_query .= $params['housenumber'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();

src/Route4Me/Common.php

Indentation +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@
 
 class Common
 {
-    static public function getValue($array, $item, $default = null)
-    {
-        return (isset($array[$item])) ? $array[$item] : $default;
-    }
+	static public 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;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     public function toArray()
     {
         $params = array_filter(get_object_vars($this), function($item) {
-            return ($item !== null) && !(is_array($item) && !count($item));
+            return ($item!==null) && !(is_array($item) && !count($item));
         });
 
         return $params;

src/Route4Me/AvoidanceZone.php

Indentation +59 added lines, -59 removed lines

@@ -20,93 +20,93 @@
 		
 		public static function fromArray(array $params) {
 			if (!isset($params['territory_name'])) {
-	            throw new BadParam('Territory name must be provided');
-	        }
+				throw new BadParam('Territory name must be provided');
+			}
 			
 			if (!isset($params['territory_color'])) {
-	            throw new BadParam('Territory color must be provided');
-	        }
+				throw new BadParam('Territory color must be provided');
+			}
 			
 			if (!isset($params['territory'])) {
-	            throw new BadParam('Territory must be provided');
-	        }
+				throw new BadParam('Territory must be provided');
+			}
 			
 			$avoidancezoneparameters = new AvoidanceZone();
-	        foreach($params as $key => $value) {
-	            if (property_exists($avoidancezoneparameters, $key)) {
-	                $avoidancezoneparameters->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($avoidancezoneparameters, $key)) {
+					$avoidancezoneparameters->{$key} = $value;
+				}
 			}
 			
 			return $avoidancezoneparameters;
 		}
 		
 		public static function getAvoidanceZone($territory_id)
-	    {
-	        $avoidancezone = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'territory_id'             => $territory_id
-	            )
-	        ));
+		{
+			$avoidancezone = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'territory_id'             => $territory_id
+				)
+			));
 	
-	        return $avoidancezone;
-	    }
+			return $avoidancezone;
+		}
 		
 		public static function getAvoidanceZones($params)
-	    {
-	        $avoidancezones = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
-	            )
-	        ));
+		{
+			$avoidancezones = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'offset'  => isset($params->offset) ? $params->offset: null,
+					'limit'   => isset($params->limit) ? $params->limit: null,
+				)
+			));
 	
-	        return $avoidancezones;
-	    }
+			return $avoidancezones;
+		}
 
 		public static function addAvoidanceZone($params)
-	    {
-	    	$abcontacts = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'ADD',
-	            'query'  => array(
-	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
-	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
-	                'territory' => isset($params->territory) ? $params->territory : null,
-	            )
-	        ));
+		{
+			$abcontacts = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'ADD',
+				'query'  => array(
+					'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
+					'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
+					'territory' => isset($params->territory) ? $params->territory : null,
+				)
+			));
 
 			return $abcontacts;
 		}
 		
 		public function deleteAvoidanceZone($territory_id)
-	    {
-	        $result = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETEARRAY',
-	            'query'  => array(
-	                'territory_id'     => $territory_id
-	            )
-	        ));
+		{
+			$result = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETEARRAY',
+				'query'  => array(
+					'territory_id'     => $territory_id
+				)
+			));
 	
-	        return $result;
-	    }
+			return $result;
+		}
 		
 		public function updateAvoidanceZone($params)
-	    {
-	        $avoidancezone = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'query'   => (array)$params,
+		{
+			$avoidancezone = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'query'   => (array)$params,
 
-	        ));
+			));
 	
-	        return $avoidancezone;
-	    }
+			return $avoidancezone;
+		}
 	}
 	
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -8,13 +8,13 @@ 
 	{
 		static public $apiUrl = '/api.v4/avoidance.php';
 	
-		public $territory_id;  // Avoidance zone id
+		public $territory_id; // Avoidance zone id
 		public $territory_name; 
 		public $territory_color;
 		public $member_id;
 		public $territory; // Territory parameters
 		
-		public function __construct () {
+		public function __construct() {
 			
 		}
 		
@@ -32,7 +32,7 @@ 
 	        }
 			
 			$avoidancezoneparameters = new AvoidanceZone();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($avoidancezoneparameters, $key)) {
 	                $avoidancezoneparameters->{$key} = $value;
 	            }
@@ -60,8 +60,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
+	                'offset'  => isset($params->offset) ? $params->offset : null,
+	                'limit'   => isset($params->limit) ? $params->limit : null,
 	            )
 	        ));
 	
@@ -74,7 +74,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'ADD',
 	            'query'  => array(
-	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
+	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name : null,
 	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
 	                'territory' => isset($params->territory) ? $params->territory : null,
 	            )

src/Route4Me/TrackSetParams.php

Indentation +98 added lines, -98 removed lines

@@ -9,102 +9,102 @@
 
 class TrackSetParams extends Common
 {
-    public $format;
-    public $member_id;
-    public $route_id;
-    public $tx_id;
-    public $vehicle_id;
-    public $course;
-    public $speed;
-    public $lat;
-    public $lng;
-    public $altitude;
-    public $device_type;
-    public $device_guid;
-    public $device_timestamp;
-    public $app_version;
-
-    public static function fromArray(array $params)
-    {
-        $param = new TrackSetParams;
-
-        if (!isset($params['format'])) {
-            throw new BadParam("format must be provided.");
-        }
-
-        $types = array(
-            Format::SERIALIZED,
-            Format::CSV,
-            Format::XML
-        );
-        if (!in_array($params['format'], $types)) {
-            throw new BadParam("format is invalid.");
-        }
-
-        if (!isset($params['route_id'])) {
-            throw new BadParam("route_id must be provided.");
-        }
-
-        if (!isset($params['member_id'])) {
-            throw new BadParam("member_id must be provided.");
-        }
-
-        if (!isset($params['course'])) {
-            throw new BadParam("course must be provided.");
-        }
-
-        if (!isset($params['speed'])) {
-            throw new BadParam("speed must be provided.");
-        }
-
-        if (!isset($params['lat'])) {
-            throw new BadParam("lat must be provided.");
-        }
-
-        if (!isset($params['lng'])) {
-            throw new BadParam("lng must be provided.");
-        }
-
-        if (!isset($params['device_type'])) {
-            throw new BadParam("device_type must be provided.");
-        }
-
-        $deviceTypes = array(
-            DeviceType::IPHONE,
-            DeviceType::IPAD,
-            DeviceType::ANDROID_PHONE,
-            DeviceType::ANDROID_TABLET
-        );
-        if (!in_array($params['device_type'], $deviceTypes)) {
-            throw new BadParam("device_type is invalid.");
-        }
-
-        if (!isset($params['device_guid'])) {
-            throw new BadParam("device_guid must be provided.");
-        }
-
-        if (isset($params['device_timestamp'])) {
-            $template = '/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/i';
-            if (!preg_match($template, $params['device_timestamp'])) {
-                throw new BadParam("device_timestamp is invalid.");
-            }
-        }
-
-        $param->format = self::getValue($params, 'format');
-        $param->route_id = self::getValue($params, 'route_id');
-        $param->member_id = self::getValue($params, 'member_id');
-        $param->course = self::getValue($params, 'course');
-        $param->speed = self::getValue($params, 'speed');
-        $param->lat = self::getValue($params, 'lat');
-        $param->lng = self::getValue($params, 'lng');
-        $param->device_type = self::getValue($params, 'device_type');
-        $param->device_guid = self::getValue($params, 'device_guid');
-        $param->device_timestamp = self::getValue($params, 'device_timestamp');
-        $param->vehicle_id = self::getValue($params, 'vehicle_id');
-        $param->altitude = self::getValue($params, 'altitude');
-        $param->app_version = self::getValue($params, 'app_version');
-        $param->tx_id = self::getValue($params, 'tx_id');
-
-        return $param;
-    }
+	public $format;
+	public $member_id;
+	public $route_id;
+	public $tx_id;
+	public $vehicle_id;
+	public $course;
+	public $speed;
+	public $lat;
+	public $lng;
+	public $altitude;
+	public $device_type;
+	public $device_guid;
+	public $device_timestamp;
+	public $app_version;
+
+	public static function fromArray(array $params)
+	{
+		$param = new TrackSetParams;
+
+		if (!isset($params['format'])) {
+			throw new BadParam("format must be provided.");
+		}
+
+		$types = array(
+			Format::SERIALIZED,
+			Format::CSV,
+			Format::XML
+		);
+		if (!in_array($params['format'], $types)) {
+			throw new BadParam("format is invalid.");
+		}
+
+		if (!isset($params['route_id'])) {
+			throw new BadParam("route_id must be provided.");
+		}
+
+		if (!isset($params['member_id'])) {
+			throw new BadParam("member_id must be provided.");
+		}
+
+		if (!isset($params['course'])) {
+			throw new BadParam("course must be provided.");
+		}
+
+		if (!isset($params['speed'])) {
+			throw new BadParam("speed must be provided.");
+		}
+
+		if (!isset($params['lat'])) {
+			throw new BadParam("lat must be provided.");
+		}
+
+		if (!isset($params['lng'])) {
+			throw new BadParam("lng must be provided.");
+		}
+
+		if (!isset($params['device_type'])) {
+			throw new BadParam("device_type must be provided.");
+		}
+
+		$deviceTypes = array(
+			DeviceType::IPHONE,
+			DeviceType::IPAD,
+			DeviceType::ANDROID_PHONE,
+			DeviceType::ANDROID_TABLET
+		);
+		if (!in_array($params['device_type'], $deviceTypes)) {
+			throw new BadParam("device_type is invalid.");
+		}
+
+		if (!isset($params['device_guid'])) {
+			throw new BadParam("device_guid must be provided.");
+		}
+
+		if (isset($params['device_timestamp'])) {
+			$template = '/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/i';
+			if (!preg_match($template, $params['device_timestamp'])) {
+				throw new BadParam("device_timestamp is invalid.");
+			}
+		}
+
+		$param->format = self::getValue($params, 'format');
+		$param->route_id = self::getValue($params, 'route_id');
+		$param->member_id = self::getValue($params, 'member_id');
+		$param->course = self::getValue($params, 'course');
+		$param->speed = self::getValue($params, 'speed');
+		$param->lat = self::getValue($params, 'lat');
+		$param->lng = self::getValue($params, 'lng');
+		$param->device_type = self::getValue($params, 'device_type');
+		$param->device_guid = self::getValue($params, 'device_guid');
+		$param->device_timestamp = self::getValue($params, 'device_timestamp');
+		$param->vehicle_id = self::getValue($params, 'vehicle_id');
+		$param->altitude = self::getValue($params, 'altitude');
+		$param->app_version = self::getValue($params, 'app_version');
+		$param->tx_id = self::getValue($params, 'tx_id');
+
+		return $param;
+	}
 }

src/Route4Me/Vehicle.php

Indentation +9 added lines, -9 removed lines

@@ -11,21 +11,21 @@
 		
 		public static function fromArray(array $params) {
 			$vehicle= new Vehicle();
-	        foreach($params as $key => $value) {
-	            if (property_exists($vehicle, $key)) {
-	                $vehicle->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($vehicle, $key)) {
+					$vehicle->{$key} = $value;
+				}
 			}
 			
 			return $order;
 		}
 		
 		public static function getVehicles()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 
 			return $response;
 		}

Spacing +3 added lines, -3 removed lines

@@ -7,11 +7,11 @@
 	{
 		static public $apiUrl = '/api/vehicles/view_vehicles.php';
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$vehicle= new Vehicle();
-	        foreach($params as $key => $value) {
+			$vehicle = new Vehicle();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($vehicle, $key)) {
 	                $vehicle->{$key} = $value;
 	            }

src/Route4Me/Territory.php

Indentation +60 added lines, -60 removed lines

@@ -21,94 +21,94 @@
 		
 		public static function fromArray(array $params) {
 			if (!isset($params['territory_name'])) {
-	            throw new BadParam('Territory name must be provided');
-	        }
+				throw new BadParam('Territory name must be provided');
+			}
 			
 			if (!isset($params['territory_color'])) {
-	            throw new BadParam('Territory color must be provided');
-	        }
+				throw new BadParam('Territory color must be provided');
+			}
 			
 			if (!isset($params['territory'])) {
-	            throw new BadParam('Territory must be provided');
-	        }
+				throw new BadParam('Territory must be provided');
+			}
 			
 			$territoryparameters = new Territory();
-	        foreach($params as $key => $value) {
-	            if (property_exists($territoryparameters, $key)) {
-	                $territoryparameters->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($territoryparameters, $key)) {
+					$territoryparameters->{$key} = $value;
+				}
 			}
 			
 			return $territoryparameters;
 		}
 		
 		public static function getTerritory($params)
-	    {
-	        $territory = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'territory_id' => isset($params['territory_id']) ? $params['territory_id']: null,
-	                'addresses' => isset($params['addresses']) ? $params['addresses']: null,
-	            )
-	        ));
+		{
+			$territory = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'territory_id' => isset($params['territory_id']) ? $params['territory_id']: null,
+					'addresses' => isset($params['addresses']) ? $params['addresses']: null,
+				)
+			));
 	
-	        return $territory;
-	    }
+			return $territory;
+		}
 		
 		public static function getTerritories($params)
-	    {
-	        $response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
-	            )
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'offset'  => isset($params->offset) ? $params->offset: null,
+					'limit'   => isset($params->limit) ? $params->limit: null,
+				)
+			));
 	
-	        return $response;
-	    }
+			return $response;
+		}
 
 		public static function addTerritory($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'ADD',
-	            'query'  => array(
-	            	'territory_name' => isset($params->territory_name) ? $params->territory_name: null,
-	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
-	                'territory' => isset($params->territory) ? $params->territory : null,
-	            )
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'ADD',
+				'query'  => array(
+					'territory_name' => isset($params->territory_name) ? $params->territory_name: null,
+					'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
+					'territory' => isset($params->territory) ? $params->territory : null,
+				)
+			));
 
 			return $response;
 		}
 		
 		public function deleteTerritory($territory_id)
-	    {
-	        $result = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETEARRAY',
-	            'query'  => array(
-	                'territory_id'  => $territory_id
-	            )
-	        ));
+		{
+			$result = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETEARRAY',
+				'query'  => array(
+					'territory_id'  => $territory_id
+				)
+			));
 	
-	        return $result;
-	    }
+			return $result;
+		}
 		
 		public function updateTerritory($params)
-	    {
-	        $response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'query'   => (array)$params,
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'query'   => (array)$params,
 
-	        ));
+			));
 	
-	        return $response;
-	    }
+			return $response;
+		}
 	}
 	
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -8,14 +8,14 @@ 
 	{
 		static public $apiUrl = '/api.v4/territory.php';
 	
-		public $territory_id;  // Territory id
+		public $territory_id; // Territory id
 		public $territory_name; 
 		public $territory_color;
 		public $addresses;
 		public $member_id;
 		public $territory; // Territory parameters
 		
-		public function __construct () {
+		public function __construct() {
 			
 		}
 		
@@ -33,7 +33,7 @@ 
 	        }
 			
 			$territoryparameters = new Territory();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($territoryparameters, $key)) {
 	                $territoryparameters->{$key} = $value;
 	            }
@@ -48,8 +48,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'territory_id' => isset($params['territory_id']) ? $params['territory_id']: null,
-	                'addresses' => isset($params['addresses']) ? $params['addresses']: null,
+	                'territory_id' => isset($params['territory_id']) ? $params['territory_id'] : null,
+	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
 	            )
 	        ));
 	
@@ -62,8 +62,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
+	                'offset'  => isset($params->offset) ? $params->offset : null,
+	                'limit'   => isset($params->limit) ? $params->limit : null,
 	            )
 	        ));
 	
@@ -76,7 +76,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'ADD',
 	            'query'  => array(
-	            	'territory_name' => isset($params->territory_name) ? $params->territory_name: null,
+	            	'territory_name' => isset($params->territory_name) ? $params->territory_name : null,
 	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
 	                'territory' => isset($params->territory) ? $params->territory : null,
 	            )

src/Route4Me/ActivityParameters.php

Indentation +34 added lines, -34 removed lines

@@ -25,43 +25,43 @@ 
 		
 		public static function fromArray(array $params) {
 			$activityparameters = new ActivityParameters();
-	        foreach($params as $key => $value) {
-	            if (property_exists($activityparameters, $key)) {
-	                $activityparameters->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($activityparameters, $key)) {
+					$activityparameters->{$key} = $value;
+				}
 			}
 			
 			return $activityparameters;
 		}
 		
 		public static function get($params)
-	    {
-	    	$activity = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'route_id' => isset($params->route_id) ? $params->route_id : null,
-	                'team' => isset($params->team) ? $params->team: null,
-	                'limit' => isset($params->limit) ? $params->limit: null,
-	                'offset' => isset($params->offset) ? $params->offset : null,
-	            )
-	        ));
+		{
+			$activity = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'route_id' => isset($params->route_id) ? $params->route_id : null,
+					'team' => isset($params->team) ? $params->team: null,
+					'limit' => isset($params->limit) ? $params->limit: null,
+					'offset' => isset($params->offset) ? $params->offset : null,
+				)
+			));
 
 			return $activity;
 		}
 
 		public static function searcActivities($params)
-	    {
-	    	$activity = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'route_id' => isset($params->route_id) ? $params->route_id : null,
-	                'limit' => isset($params->limit) ? $params->limit: null,
-	                'offset' => isset($params->offset) ? $params->offset : null,
-	                'activity_type' => isset($params->activity_type) ? $params->activity_type : null,
-	            )
-	        ));
+		{
+			$activity = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'route_id' => isset($params->route_id) ? $params->route_id : null,
+					'limit' => isset($params->limit) ? $params->limit: null,
+					'offset' => isset($params->offset) ? $params->offset : null,
+					'activity_type' => isset($params->activity_type) ? $params->activity_type : null,
+				)
+			));
 
 			return $activity;
 		}
@@ -69,14 +69,14 @@ 
 		public static function sendUserMessage($postParameters)
 		{
 			$result = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlv4,
-	            'method' => 'POST',
-	            'body'  => array(
-	            	'activity_type' => isset($postParameters->activity_type) ? $postParameters->activity_type : null,
-	            	'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message: null,
-	                'route_id' => isset($postParameters->route_id) ? $postParameters->route_id : null,
-	            )
-	        ));
+				'url'    => self::$apiUrlv4,
+				'method' => 'POST',
+				'body'  => array(
+					'activity_type' => isset($postParameters->activity_type) ? $postParameters->activity_type : null,
+					'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message: null,
+					'route_id' => isset($postParameters->route_id) ? $postParameters->route_id : null,
+				)
+			));
 			
 			return $result;
 		}

Spacing +6 added lines, -6 removed lines

@@ -19,13 +19,13 @@ 
 		public $activity_type;
 		public $activity_message;
 		
-		public function __construct () {
+		public function __construct() {
 			
 		}
 		
 		public static function fromArray(array $params) {
 			$activityparameters = new ActivityParameters();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($activityparameters, $key)) {
 	                $activityparameters->{$key} = $value;
 	            }
@@ -41,8 +41,8 @@ 
 	            'method' => 'GET',
 	            'query'  => array(
 	                'route_id' => isset($params->route_id) ? $params->route_id : null,
-	                'team' => isset($params->team) ? $params->team: null,
-	                'limit' => isset($params->limit) ? $params->limit: null,
+	                'team' => isset($params->team) ? $params->team : null,
+	                'limit' => isset($params->limit) ? $params->limit : null,
 	                'offset' => isset($params->offset) ? $params->offset : null,
 	            )
 	        ));
@@ -57,7 +57,7 @@ 
 	            'method' => 'GET',
 	            'query'  => array(
 	                'route_id' => isset($params->route_id) ? $params->route_id : null,
-	                'limit' => isset($params->limit) ? $params->limit: null,
+	                'limit' => isset($params->limit) ? $params->limit : null,
 	                'offset' => isset($params->offset) ? $params->offset : null,
 	                'activity_type' => isset($params->activity_type) ? $params->activity_type : null,
 	            )
@@ -73,7 +73,7 @@ 
 	            'method' => 'POST',
 	            'body'  => array(
 	            	'activity_type' => isset($postParameters->activity_type) ? $postParameters->activity_type : null,
-	            	'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message: null,
+	            	'activity_message' => isset($postParameters->activity_message) ? $postParameters->activity_message : null,
 	                'route_id' => isset($postParameters->route_id) ? $postParameters->route_id : null,
 	            )
 	        ));