Properly read KMLs from file

This fixes ticket  #1401 - All KML files are being treated as HTTP URLs, even KMLs on disk.

Author: jetherton

application/controllers/json.php

@@ -646,28 +646,31 @@ public function layer($layer_id = 0)
 			$layer_url = $layer->layer_url;
 			$layer_file = $layer->layer_file;
 
+			$content === FALSE;
+			
 			if ($layer_url != '')
 			{
 				// Pull from a URL
 				$layer_link = $layer_url;
+        			$layer_request = new HttpClient($layer_link);
+        			$content = $layer_request->execute();
+        			if ($content === FALSE) 
+				{
+					throw new Kohana_Exception($layer_request->get_error_msg());
+				}
 			}
 			else
 			{
 				// Pull from an uploaded file
 				$layer_link = Kohana::config('upload.directory').'/'.$layer_file;
+				$content = readfile($layer_link);
+				if ($content === FALSE) 
+				{
+					throw new Kohana_Exception("Couldn't read KML file: " . $layer_link);
+				}
 			}
 
-			$layer_request = new HttpClient($layer_link);
-			$content = $layer_request->execute();
-
-			if ($content === FALSE) 
-			{
-				throw new Kohana_Exception($layer_request->get_error_msg());
-			}
-			else
-			{
-				echo $content;
-			}
+			echo $content;
 		}
 		else
 		{