route4me / route4me-php-sdk

src/Route4Me/Route4Me.php

Spacing +25 added lines, -25 removed lines

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

Braces +19 added lines, -7 removed lines

@@ -34,13 +34,17 @@ 
 		$query = isset($options['query']) ?
             array_filter($options['query']) : array();
 
-		if (sizeof($query)==0) return null;
+		if (sizeof($query)==0) {
+			return null;
+		}
 
 		$body = isset($options['body']) ?
             array_filter($options['body']) : null;
 			
 		$fname = isset($body['strFilename']) ? $body['strFilename'] : '';
-		if ($fname=='') return null;
+		if ($fname=='') {
+			return null;
+		}
 
 		$rpath = realpath($fname);
 		
@@ -110,7 +114,9 @@ 
         }
 
 		if (isset($options['HTTPHEADERS'])) {
-		    foreach ($options['HTTPHEADERS'] As $header) $headers[]=$header;
+		    foreach ($options['HTTPHEADERS'] As $header) {
+		    	$headers[]=$header;
+		    }
         }
         //self::simplePrint($headers); die("");
         $ch = curl_init();
@@ -123,7 +129,9 @@ 
         //self::simplePrint($headers); die("");
 		$baseUrl=self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://api.route4me.com';
+		if (strpos($url,'move_route_destination')>0) {
+			$baseUrl='https://api.route4me.com';
+		}
         $curlOpts = arraY(
             CURLOPT_URL            => $baseUrl. $url,
             CURLOPT_RETURNTRANSFER => true,
@@ -199,14 +207,16 @@ 
         if (200 == $code) {
             if ($isxml) {
                 $json = $jxml;
-            } else $json = json_decode($result, true);
+            } else {
+            	$json = json_decode($result, true);
+            }
             //var_dump($json); die("");
             if (isset($json['errors'])) {
                 throw new ApiError(implode(', ', $json['errors']));
             } else {
                 return $json;
             }
-        }  elseif (409 == $code) {
+        } elseif (409 == $code) {
             
             //throw new ApiError('Wrong API key');
         } else {
@@ -288,7 +298,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		
 		
         if (200 == $code) {