Ysurac / FlightAirMap

date-statistics-aircraft.php

Spacing +6 added lines, -6 removed lines

@@ -3,13 +3,13 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], "0,1", $sort);
 else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Aircraft on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/date" method="post">';
@@ -20,13 +20,13 @@ 
 	print '</div>';
 
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftTypesByDate($_GET['date']);
 	if (!empty($aircraft_array))
@@ -41,7 +41,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Braces +5 added lines, -2 removed lines

@@ -4,8 +4,11 @@
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
-else $spotter_array = array();
+if (isset($_GET['date'])) {
+	$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

search-wkt.php

Indentation +40 added lines, -40 removed lines

@@ -4,55 +4,55 @@
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);

Spacing +27 added lines, -27 removed lines

@@ -5,14 +5,14 @@ 
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
         //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
         } else $sql_date = '';
@@ -20,21 +20,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
         } else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
         if (!isset($_GET['number_results']))
         {
@@ -42,14 +42,14 @@ 
                 $limit_end = 25;
                 $absolute_difference = 25;
         } else {
-                if ($_GET['number_results'] > 1000){
+                if ($_GET['number_results'] > 1000) {
                         $_GET['number_results'] = 1000;
                 }
                 $limit_start = 0;
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -69,30 +69,30 @@ 
 
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
 else $sort = '';
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
        
 $i = 1;      
 //$output .= "oid;Line\n";
 $output = '';
 if (!empty($spotter_array))
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		if ($spotter_item['waypoints'] != '') {
 			$waypoint_pieces = explode(' ', $spotter_item['waypoints']);

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
-        } else $sql_date = '';
-} else $sql_date = '';
+        } else {
+        	$sql_date = '';
+        }
+        } else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
@@ -30,8 +34,12 @@ 
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
-} else $sql_altitude = '';
+        } else {
+        	$sql_altitude = '';
+        }
+        } else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@ 
 
 header("Content-type: text/yaml");
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

airport-statistics-route.php

Spacing +9 added lines, -9 removed lines

@@ -6,14 +6,14 @@ 
         header('Location: '.$globalURL.'/airport');
         die();
 }
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", "");
 $airport_array = $Spotter->getAllAirportInfo($airport);
 
 if (!empty($airport_array))
 {
-	$title = sprintf(_("Most Common Routes to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Routes to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -22,9 +22,9 @@ 
 	print '<option></option>';
 	$airport_names = $Spotter->getAllAirportNames();
 	ksort($airport_names);
-	foreach($airport_names as $airport_name)
+	foreach ($airport_names as $airport_name)
 	{
-		if($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -46,7 +46,7 @@ 
 		print '<div><span class="label">'._("ICAO").'</span>'.$airport_array[0]['icao'].'</div>';
 		print '<div><span class="label">'._("IATA").'</span>'.$airport_array[0]['iata'].'</div>';
 		print '<div><span class="label">'._("Altitude").'</span>'.$airport_array[0]['altitude'].'</div>';
-		print '<div><span class="label">'._("Coordinates");'</span><a href="http://maps.google.ca/maps?z=10&t=k&q='.$airport_array[0]['latitude'].','.$airport_array[0]['longitude'].'" target="_blank">Google Map<i class="fa fa-angle-double-right"></i></a></div>';
+		print '<div><span class="label">'._("Coordinates"); '</span><a href="http://maps.google.ca/maps?z=10&t=k&q='.$airport_array[0]['latitude'].','.$airport_array[0]['longitude'].'" target="_blank">Google Map<i class="fa fa-angle-double-right"></i></a></div>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special airport profile shows all flights that do <u>not</u> have a departure and/or arrival airport associated with them.").'</div>';
@@ -54,8 +54,8 @@ 
 
 	include('airport-sub-menu.php');
 	print '<div class="column">';
-	print '<h2>'._("Most Common Routes");'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+	print '<h2>'._("Most Common Routes"); '</h2>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByAirport($airport);
 	if (!empty($route_array))
@@ -71,7 +71,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airport'])) {
-        header('Location: '.$globalURL.'/airport');
-        die();
+		header('Location: '.$globalURL.'/airport');
+		die();
 }
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

manufacturer-statistics-departure-airport.php

Spacing +9 added lines, -9 removed lines

@@ -7,13 +7,13 @@ 
         die();
 }
 $Spotter = new Spotter();
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports from %s"),$manufacturer);
+	$title = sprintf(_("Most Common Departure Airports from %s"), $manufacturer);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -21,9 +21,9 @@ 
 	print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_manufacturers = $Spotter->getAllManufacturers();
-	foreach($all_manufacturers as $all_manufacturer)
+	foreach ($all_manufacturers as $all_manufacturer)
 	{
-		if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
+		if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
 		} else {
@@ -42,7 +42,7 @@ 
 	include('manufacturer-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), $manufacturer).'</p>';
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByManufacturer($manufacturer);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -57,7 +57,7 @@ 
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_departure_city'].', '.$airport_item['airport_departure_country'].' ('.$airport_item['airport_departure_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -96,7 +96,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['aircraft_manufacturer'])) {
-        header('Location: '.$globalURL.'/manufacturer');
-        die();
+		header('Location: '.$globalURL.'/manufacturer');
+		die();
 }
 $Spotter = new Spotter();
 $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));

require/settings.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
 $globalLongitudeMin = '1.0'; //the minimum longitude (east)
 
 $globalCenterLatitude = '46.38'; //the latitude center of your coverage area
-$globalCenterLongitude = '5.29';//the longitude center of your coverage area
+$globalCenterLongitude = '5.29'; //the longitude center of your coverage area
 
 $globalLiveZoom = '9'; //default zoom on Live Map
 
@@ -126,7 +126,7 @@ 
 $globalACARS = FALSE;
 $globalACARSHost = '0.0.0.0'; // Local IP to listen
 $globalACARSPort = '9999';
-$globalACARSArchive = array('10','80','81','82','3F'); // labels of messages to archive
+$globalACARSArchive = array('10', '80', '81', '82', '3F'); // labels of messages to archive
 $globalACARSArchiveKeepMonths = '0';
 
 //APRS configuration (for glidernet)
@@ -201,7 +201,7 @@ 
 //Retrieve Image from externals sources
 $globalAircraftImageFetch = TRUE;
 //Sources for Aircraft image
-$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters','customsources');
+$globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters', 'customsources');
 // Custom source configuration {registration} will be replaced by aircraft registration (exif get copyright from exif data for each pic)
 // example of config : $globalAircraftImageCustomSources = array('thumbnail' => 'http://pics.myurl.com/thumbnail/{registration}.jpg','original' => 'http://myurl/original/{registration}.jpg','source_website' => 'https://www.myurl.com', 'source' => 'customsite', 'exif' => true);
 // ************************
@@ -209,7 +209,7 @@ 
 //Retrieve schedules from externals sources (set to FALSE for IVAO or if $globalFork = FALSE)
 $globalSchedulesFetch = TRUE;
 //Sources for airline schedule if not official airline site
-$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+$globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
 
 //Retrieve translation from external sources (set to FALSE for IVAO)
 $globalTranslationFetch = TRUE;

require/class.METAR.php

Spacing +44 added lines, -44 removed lines

@@ -54,7 +54,7 @@ 
                         $Connection = new Connection();
                         $sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -69,7 +69,7 @@ 
                         $Connection = new Connection();
                         $sth = $Connection->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -79,34 +79,34 @@ 
         public function parse($data) {
     		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
     		$codes = implode('|', array_keys($this->texts));
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+    		$regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#';
     		//$pieces = explode(' ',$data);
-    		$pieces = preg_split('/\s/',$data);
+    		$pieces = preg_split('/\s/', $data);
     		$pos = 0;
     		if ($pieces[0] == 'METAR') $pos++;
     		elseif ($pieces[0] == 'SPECI') $pos++;
     		if (strlen($pieces[$pos]) != 4) $pos++;
     		$result['location'] = $pieces[$pos];
     		$pos++;
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-    		$result['time'] = substr($pieces[$pos],2,4);
+    		$result['dayofmonth'] = substr($pieces[$pos], 0, 2);
+    		$result['time'] = substr($pieces[$pos], 2, 4);
     		$c = count($pieces);
-    		for($pos++; $pos < $c; $pos++) {
+    		for ($pos++; $pos < $c; $pos++) {
     			$piece = $pieces[$pos];
     			if ($piece == 'RMK') break;
     			if ($piece == 'AUTO') $result['auto'] = true;
     			if ($piece == 'COR') $result['correction'] = true;
     			// Wind Speed
     			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-    				$result['wind']['direction'] = (float)$matches[1];
+    				$result['wind']['direction'] = (float) $matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
-				$result['wind']['gust'] = (float)$matches[3];
+    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2);
+    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2);
+    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2);
+				$result['wind']['gust'] = (float) $matches[3];
 				$result['wind']['unit'] = $matches[4];
-				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
-				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
+				$result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0;
+				$result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0;
     			}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
@@ -126,14 +126,14 @@ 
     			*/
     			// Temperature
     			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-    				$temp = (float)$matches[1];
+    				$temp = (float) $matches[1];
 				if ($matches[1]{0} == 'M') {
-					$temp = ((float)substr($matches[1], 1)) * -1;
+					$temp = ((float) substr($matches[1], 1))*-1;
 				}
     				$result['temperature'] = $temp;
-    				$dew = (float)$matches[2];
+    				$dew = (float) $matches[2];
 				if ($matches[2]{0} == 'M') {
-					$dew = ((float)substr($matches[2], 1)) * -1;
+					$dew = ((float) substr($matches[2], 1))*-1;
 				}
 				$result['dew'] = $dew;
     			}
@@ -145,7 +145,7 @@ 
     					$result['QNH'] = $matches[2];
     				} else {
     					// inHg
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+    					$result['QNH'] = round(($matches[2]/100)*33.86389, 2);
 				}
     				/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
@@ -166,12 +166,12 @@ 
     			// Visibility
     			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
     				if (isset($matches[3]) && strlen($matches[3]) > 0) {
-					$result['visibility'] = (float)$matches[3] * 1609.34;
+					$result['visibility'] = (float) $matches[3]*1609.34;
 				} else {
 					if ($matches[1] == '9999') {
 						$result['visibility'] = '> 10000';
 					} else {
-						$result['visibility'] = (float)$matches[1];
+						$result['visibility'] = (float) $matches[1];
 					}
 				}
 				if (preg_match('#^CAVOK$#', $piece, $matches)) {
@@ -192,7 +192,7 @@ 
     				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
     				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
     				$cloud['type_code'] = $type;
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+    				$cloud['level'] = round(((float) $matches[2])*100*0.3048);
     				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
     				$result['cloud'][] = $cloud;
     			}
@@ -201,8 +201,8 @@ 
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
-				$rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0;
-				$rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : '';
+				$rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0;
+				$rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : '';
 				$result['RVR'] = $rvr;
 			}
     			
@@ -219,12 +219,12 @@ 
     			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
     				//echo $piece;
     				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+    				else $range = array('exact' => (float) $matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
+					    'from' => (float) $matches[2],
+					    'to'   => (float) $matches[4],
 					    'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
@@ -273,7 +273,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -283,19 +283,19 @@ 
                 return $all;
         }
 
-       public function addMETAR($location,$metar,$date) {
+       public function addMETAR($location, $metar, $date) {
 		global $globalDBdriver;
-		$date = date('Y-m-d H:i:s',strtotime($date));
+		$date = date('Y-m-d H:i:s', strtotime($date));
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar";
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-                $query_values = array(':location' => $location,':date' => $date,':metar' => $metar);
+                $query_values = array(':location' => $location, ':date' => $date, ':metar' => $metar);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -306,7 +306,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -315,7 +315,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -332,8 +332,8 @@ 
     		}
     		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
     		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+    		foreach (explode("\n", $cycle) as $line) {
+    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
     				//echo "date : ".$line."\n";
     				$date = $line;
     			} elseif ($line != '') {
@@ -341,11 +341,11 @@ 
     			    //echo $line;
     			    if ($date == '') $date = date('Y/m/d H:m');
     			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
+    			    $pieces = preg_split('/\s/', $line);
     			    if ($pieces[0] == 'METAR') $pos++;
     			    if (strlen($pieces[$pos]) != 4) $pos++;
 	        	    $location = $pieces[$pos];
-	        	    echo $this->addMETAR($location,$line,$date);
+	        	    echo $this->addMETAR($location, $line, $date);
     			}
     			//echo $line."\n";
     		}
@@ -357,11 +357,11 @@ 
     		if ($globalMETARurl == '') return array();
     		date_default_timezone_set("UTC");
     		$Common = new Common();
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
+    		$url = str_replace('{icao}', $icao, $globalMETARurl);
     		$cycle = $Common->getData($url);
     		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+    		foreach (explode("\n", $cycle) as $line) {
+    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
     				echo "date : ".$line."\n";
     				$date = $line;
     			} elseif ($line != '') {
@@ -369,12 +369,12 @@ 
     			    //echo $line;
     			    if ($date == '') $date = date('Y/m/d H:m');
     			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
+    			    $pieces = preg_split('/\s/', $line);
     			    if ($pieces[0] == 'METAR') $pos++;
     			    if (strlen($pieces[$pos]) != 4) $pos++;
 	        	    $location = $pieces[$pos];
 	        	    if (strlen($location == 4)) {
-	        		$this->addMETAR($location,$line,$date);
+	        		$this->addMETAR($location, $line, $date);
 	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
 	        	    } else return array();
     			}

Braces +94 added lines, -36 removed lines

@@ -58,8 +58,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
         }
 
         public static function insert_last_update() {
@@ -83,9 +86,14 @@ 
     		//$pieces = explode(' ',$data);
     		$pieces = preg_split('/\s/',$data);
     		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
+    		if ($pieces[0] == 'METAR') {
+    			$pos++;
+    		} elseif ($pieces[0] == 'SPECI') {
+    			$pos++;
+    		}
+    		if (strlen($pieces[$pos]) != 4) {
+    			$pos++;
+    		}
     		$result = array();
     		$result['location'] = $pieces[$pos];
     		$pos++;
@@ -94,16 +102,26 @@ 
     		$c = count($pieces);
     		for($pos++; $pos < $c; $pos++) {
     			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
+    			if ($piece == 'RMK') {
+    				break;
+    			}
+    			if ($piece == 'AUTO') {
+    				$result['auto'] = true;
+    			}
+    			if ($piece == 'COR') {
+    				$result['correction'] = true;
+    			}
     			// Wind Speed
     			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
     				$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+    				if ($result['wind']['unit'] == 'KT') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+    				} elseif ($result['wind']['unit'] == 'KPH') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+    				} elseif ($result['wind']['unit'] == 'MPS') {
+    					$result['wind']['speed'] = round(((float)$matches[2]),2);
+    				}
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -185,14 +203,23 @@ 
     				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
     				$type = $matches[1];
     				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+    				if ($type == 'SKC') {
+    					$cloud['type'] = 'No cloud/Sky clear';
+    				} elseif ($type == 'CLR') {
+    					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
+    				} elseif ($type == 'NSC') {
+    					$cloud['type'] = 'No significant cloud';
+    				} elseif ($type == 'FEW') {
+    					$cloud['type'] = 'Few';
+    				} elseif ($type == 'SCT') {
+    					$cloud['type'] = 'Scattered';
+    				} elseif ($type == 'BKN') {
+    					$cloud['type'] = 'Broken';
+    				} elseif ($type == 'OVC') {
+    					$cloud['type'] = 'Overcast/Full cloud coverage';
+    				} elseif ($type == 'VV') {
+    					$cloud['type'] = 'Vertical visibility';
+    				}
     				$cloud['type_code'] = $type;
     				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
     				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
@@ -222,8 +249,11 @@ 
     			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
     				//echo $piece;
     				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				if (isset($matches[5])) {
+    					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+    				} else {
+    					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				}
 				if (isset($matches[3])) {
 					$range = Array(
 					    'from' => (float)$matches[2],
@@ -256,8 +286,11 @@ 
 				if (isset($matches[3])) {
 					$text[] = $this->texts[$matches[3]];
 				}
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				if (!isset($result['weather'])) {
+					$result['weather'] = implode(' ', $text);
+				} else {
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				}
     			}
     		}
     		return $result;
@@ -269,8 +302,11 @@ 
     		if (isset($globalMETARcycle) && $globalMETARcycle) {
             		$query = "SELECT * FROM metar WHERE metar_location = :icao";
                 } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		if ($globalDBdriver == 'mysql') {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+            		} else {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		}
                 }
                 $query_values = array(':icao' => $icao);
                  try {
@@ -325,7 +361,9 @@ 
         
         public function addMETARCycle() {
     		global $globalDebug, $globalIVAO;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Downloading METAR cycle...";
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		if (isset($globalIVAO) && $globalIVAO) {
@@ -333,7 +371,9 @@ 
     		} else {
 			$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
     		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Done - Updating DB...";
+    		}
     		$date = '';
     		foreach(explode("\n",$cycle) as $line) {
     			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
@@ -342,22 +382,32 @@ 
     			} elseif ($line != '') {
     			    //$this->parse($line);
     			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
+    			    if ($date == '') {
+    			    	$date = date('Y/m/d H:m');
+    			    }
     			    $pos = 0;
     			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
+    			    if ($pieces[0] == 'METAR') {
+    			    	$pos++;
+    			    }
+    			    if (strlen($pieces[$pos]) != 4) {
+    			    	$pos++;
+    			    }
 	        	    $location = $pieces[$pos];
 	        	    echo $this->addMETAR($location,$line,$date);
     			}
     			//echo $line."\n";
     		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Done\n";
+    		}
         
         }
         public function downloadMETAR($icao) {
     		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
+    		if ($globalMETARurl == '') {
+    			return array();
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -370,16 +420,24 @@ 
     			} elseif ($line != '') {
     			    //$this->parse($line);
     			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
+    			    if ($date == '') {
+    			    	$date = date('Y/m/d H:m');
+    			    }
     			    $pos = 0;
     			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
+    			    if ($pieces[0] == 'METAR') {
+    			    	$pos++;
+    			    }
+    			    if (strlen($pieces[$pos]) != 4) {
+    			    	$pos++;
+    			    }
 	        	    $location = $pieces[$pos];
 	        	    if (strlen($location == 4)) {
 	        		$this->addMETAR($location,$line,$date);
 	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
+	        	    } else {
+	        	    	return array();
+	        	    }
     			}
     			//echo $line."\n";
     		}

Indentation +262 added lines, -262 removed lines

@@ -7,108 +7,108 @@ 
 	public $db;
 	
 	protected $texts = Array(
-	    'MI' => 'Shallow',
-	    'PR' => 'Partial',
-	    'BC' => 'Low drifting',
-	    'BL' => 'Blowing',
-	    'SH' => 'Showers',
-	    'TS' => 'Thunderstorm',
-	    'FZ' => 'Freezing',
-	    'DZ' => 'Drizzle',
-	    'RA' => 'Rain',
-	    'SN' => 'Snow',
-	    'SG' => 'Snow Grains',
-	    'IC' => 'Ice crystals',
-	    'PL' => 'Ice pellets',
-	    'GR' => 'Hail',
-	    'GS' => 'Small hail',
-	    'UP' => 'Unknown',
-	    'BR' => 'Mist',
-	    'FG' => 'Fog',
-	    'FU' => 'Smoke',
-	    'VA' => 'Volcanic ash',
-	    'DU' => 'Widespread dust',
-	    'SA' => 'Sand',
-	    'HZ' => 'Haze',
-	    'PY' => 'Spray',
-	    'PO' => 'Well developed dust / sand whirls',
-	    'SQ' => 'Squalls',
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
-	    'SS' => 'Sandstorm',
-	    'DS' => 'Duststorm'
+		'MI' => 'Shallow',
+		'PR' => 'Partial',
+		'BC' => 'Low drifting',
+		'BL' => 'Blowing',
+		'SH' => 'Showers',
+		'TS' => 'Thunderstorm',
+		'FZ' => 'Freezing',
+		'DZ' => 'Drizzle',
+		'RA' => 'Rain',
+		'SN' => 'Snow',
+		'SG' => 'Snow Grains',
+		'IC' => 'Ice crystals',
+		'PL' => 'Ice pellets',
+		'GR' => 'Hail',
+		'GS' => 'Small hail',
+		'UP' => 'Unknown',
+		'BR' => 'Mist',
+		'FG' => 'Fog',
+		'FU' => 'Smoke',
+		'VA' => 'Volcanic ash',
+		'DU' => 'Widespread dust',
+		'SA' => 'Sand',
+		'HZ' => 'Haze',
+		'PY' => 'Spray',
+		'PO' => 'Well developed dust / sand whirls',
+		'SQ' => 'Squalls',
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
+		'SS' => 'Sandstorm',
+		'DS' => 'Duststorm'
 	);
 	
 	public function __construct($dbc = null) {
-                $Connection = new Connection($dbc);
-                $this->db = $Connection->db;
-        }
+				$Connection = new Connection($dbc);
+				$this->db = $Connection->db;
+		}
 
-       public static function check_last_update() {
-    		global $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+	   public static function check_last_update() {
+			global $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value > DATE_SUB(DATE(NOW()), INTERVAL 1 HOUR)";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value::timestamp > CURRENT_TIMESTAMP - INTERVAL '1 HOURS'";
 		}
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
+		}
 
-        public static function insert_last_update() {
-                $query = "DELETE FROM config WHERE name = 'last_update_metar';
+		public static function insert_last_update() {
+				$query = "DELETE FROM config WHERE name = 'last_update_metar';
                         INSERT INTO config (name,value) VALUES ('last_update_metar',NOW());";
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 
         
-        public function parse($data) {
-    		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
-    		$codes = implode('|', array_keys($this->texts));
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
-    		//$pieces = explode(' ',$data);
-    		$pieces = preg_split('/\s/',$data);
-    		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
-    		$result = array();
-    		$result['location'] = $pieces[$pos];
-    		$pos++;
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-    		$result['time'] = substr($pieces[$pos],2,4);
-    		$c = count($pieces);
-    		for($pos++; $pos < $c; $pos++) {
-    			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
-    			// Wind Speed
-    			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-    				$result['wind']['direction'] = (float)$matches[1];
+		public function parse($data) {
+			//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
+			$codes = implode('|', array_keys($this->texts));
+			$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+			//$pieces = explode(' ',$data);
+			$pieces = preg_split('/\s/',$data);
+			$pos = 0;
+			if ($pieces[0] == 'METAR') $pos++;
+			elseif ($pieces[0] == 'SPECI') $pos++;
+			if (strlen($pieces[$pos]) != 4) $pos++;
+			$result = array();
+			$result['location'] = $pieces[$pos];
+			$pos++;
+			$result['dayofmonth'] = substr($pieces[$pos],0,2);
+			$result['time'] = substr($pieces[$pos],2,4);
+			$c = count($pieces);
+			for($pos++; $pos < $c; $pos++) {
+				$piece = $pieces[$pos];
+				if ($piece == 'RMK') break;
+				if ($piece == 'AUTO') $result['auto'] = true;
+				if ($piece == 'COR') $result['correction'] = true;
+				// Wind Speed
+				if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
+					$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+					if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+					elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+					elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
 				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
-    			}
+				}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
     				$result['wind_direction'] = (float)$matches[1];
@@ -125,35 +125,35 @@ 
     				}
     			}
     			*/
-    			// Temperature
-    			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-    				$temp = (float)$matches[1];
+				// Temperature
+				if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
+					$temp = (float)$matches[1];
 				if ($matches[1]{0} == 'M') {
 					$temp = ((float)substr($matches[1], 1)) * -1;
 				}
-    				$result['temperature'] = $temp;
-    				$dew = (float)$matches[2];
+					$result['temperature'] = $temp;
+					$dew = (float)$matches[2];
 				if ($matches[2]{0} == 'M') {
 					$dew = ((float)substr($matches[2], 1)) * -1;
 				}
 				$result['dew'] = $dew;
-    			}
-    			// QNH
-    			if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
-    			// #^(Q|A)(////|[0-9]{4})( )#
-    				if ($matches[1] == 'Q') {
-    					// hPa
-    					$result['QNH'] = $matches[2];
-    				} else {
-    					// inHg
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
 				}
-    				/*
+				// QNH
+				if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
+				// #^(Q|A)(////|[0-9]{4})( )#
+					if ($matches[1] == 'Q') {
+						// hPa
+						$result['QNH'] = $matches[2];
+					} else {
+						// inHg
+						$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+				}
+					/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
     				*/
-    			}
-                     /*
+				}
+					 /*
     			// Wind Direction
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
     				$result['wind_direction'] = $matches[1];
@@ -164,9 +164,9 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
-    			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
-    				if (isset($matches[3]) && strlen($matches[3]) > 0) {
+				// Visibility
+				if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
+					if (isset($matches[3]) && strlen($matches[3]) > 0) {
 					$result['visibility'] = (float)$matches[3] * 1609.34;
 				} else {
 					if ($matches[1] == '9999') {
@@ -179,28 +179,28 @@ 
 					$result['visibility'] = '> 10000';
 					$result['weather'] = "CAVOK";
 				}
-    			}
-    			// Cloud Coverage
-    			if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
-    				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
-    				$type = $matches[1];
-    				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
-    				$cloud['type_code'] = $type;
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
-    				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
-    				$result['cloud'][] = $cloud;
-    			}
-    			// RVR
-    			 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
-    				$rvr = array();
+				}
+				// Cloud Coverage
+				if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
+					//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
+					$type = $matches[1];
+					$cloud = array();
+					if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
+					elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
+					elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
+					elseif ($type == 'FEW') $cloud['type'] = 'Few';
+					elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
+					elseif ($type == 'BKN') $cloud['type'] = 'Broken';
+					elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
+					elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+					$cloud['type_code'] = $type;
+					$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+					$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
+					$result['cloud'][] = $cloud;
+				}
+				// RVR
+				 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
+					$rvr = array();
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
@@ -209,33 +209,33 @@ 
 				$result['RVR'] = $rvr;
 			}
     			
-    			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    			if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
-    				//print_r($matches);
-    				// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
-    				$result['RVR']['runway'] = $matches[1];
-        			$result['RVR']['deposits'] = $matches[2];
-        			$result['RVR']['extent'] = $matches[3];
-        			$result['RVR']['depth'] = $matches[4];
-        			$result['RVR']['friction'] = $matches[5];
-    			}
-    			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    				//echo $piece;
-    				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+				if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
+					//print_r($matches);
+					// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
+					$result['RVR']['runway'] = $matches[1];
+					$result['RVR']['deposits'] = $matches[2];
+					$result['RVR']['extent'] = $matches[3];
+					$result['RVR']['depth'] = $matches[4];
+					$result['RVR']['friction'] = $matches[5];
+				}
+				if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+					//echo $piece;
+					//print_r($matches);
+					if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+					else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
-					    'unit' => $matches[5] ? 'FT' : 'M'
+						'from' => (float)$matches[2],
+						'to'   => (float)$matches[4],
+						'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
 				$result['RVR'] = $matches[1];
 				$result['RVR_range'] = $range;
-    			}
-    			// Weather
-    			if (preg_match($regWeather, $piece, $matches)) {
+				}
+				// Weather
+				if (preg_match($regWeather, $piece, $matches)) {
 				$text = Array();
 				switch ($matches[1]) {
 					case '+':
@@ -258,35 +258,35 @@ 
 				}
 				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
 				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
-    			}
-    		}
-    		return $result;
+				}
+			}
+			return $result;
         
-        }
+		}
         
 	public function getMETAR($icao) {
-    		global $globalMETARcycle, $globalDBdriver;
-    		if (isset($globalMETARcycle) && $globalMETARcycle) {
-            		$query = "SELECT * FROM metar WHERE metar_location = :icao";
-                } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
-                }
-                $query_values = array(':icao' => $icao);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
-            		$all = $this->downloadMETAR($icao);
-                }
-                return $all;
-        }
+			global $globalMETARcycle, $globalDBdriver;
+			if (isset($globalMETARcycle) && $globalMETARcycle) {
+					$query = "SELECT * FROM metar WHERE metar_location = :icao";
+				} else {
+					if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+					else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+				}
+				$query_values = array(':icao' => $icao);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if ((!isset($globalMETARcycle) || $globalMETARcycle === false) && count($all) == 0) {
+					$all = $this->downloadMETAR($icao);
+				}
+				return $all;
+		}
 
-       public function addMETAR($location,$metar,$date) {
+	   public function addMETAR($location,$metar,$date) {
 		global $globalDBdriver;
 		$date = date('Y-m-d H:i:s',strtotime($date));
 		if ($globalDBdriver == 'mysql') {
@@ -294,100 +294,100 @@ 
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-                $query_values = array(':location' => $location,':date' => $date,':metar' => $metar);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':location' => $location,':date' => $date,':metar' => $metar);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteMETAR($id) {
-                $query = "DELETE FROM metar WHERE id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-       public function deleteAllMETARLocation() {
-                $query = "DELETE FROM metar";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteMETAR($id) {
+				$query = "DELETE FROM metar WHERE id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+	   public function deleteAllMETARLocation() {
+				$query = "DELETE FROM metar";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addMETARCycle() {
-    		global $globalDebug, $globalIVAO;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		if (isset($globalIVAO) && $globalIVAO) {
-        		$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
-    		} else {
+		public function addMETARCycle() {
+			global $globalDebug, $globalIVAO;
+			if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			if (isset($globalIVAO) && $globalIVAO) {
+				$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
+			} else {
 			$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				//echo "date : ".$line."\n";
-    				$date = $line;
-    			} 
-    			if ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    echo $this->addMETAR($location,$line,$date);
-    			}
-    			//echo $line."\n";
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					//echo "date : ".$line."\n";
+					$date = $line;
+				} 
+				if ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					echo $this->addMETAR($location,$line,$date);
+				}
+				//echo $line."\n";
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done\n";
         
-        }
-        public function downloadMETAR($icao) {
-    		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
-    		$cycle = $Common->getData($url);
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				//echo "date : ".$line."\n";
-    				$date = $line;
-    			} 
-    			if ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    if (strlen($location == 4)) {
-	        		$this->addMETAR($location,$line,$date);
-	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
-    			}
-    			//echo $line."\n";
-    		}
-    		return array();
+		}
+		public function downloadMETAR($icao) {
+			global $globalMETARurl;
+			if ($globalMETARurl == '') return array();
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			$url = str_replace('{icao}',$icao,$globalMETARurl);
+			$cycle = $Common->getData($url);
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					//echo "date : ".$line."\n";
+					$date = $line;
+				} 
+				if ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					if (strlen($location == 4)) {
+					$this->addMETAR($location,$line,$date);
+					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
+					} else return array();
+				}
+				//echo $line."\n";
+			}
+			return array();
         
-        }
+		}
 }
 /*
 $METAR = new METAR();

require/class.Source.php

Indentation +66 added lines, -66 removed lines

@@ -7,73 +7,73 @@
 	function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-        }
-       public function getAllLocationInfo() {
-                $query = "SELECT * FROM source_location";
-                $query_values = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
-       public function getLocationInfobyName($name) {
-                $query = "SELECT * FROM source_location WHERE name = :name";
-                $query_values = array(':name' => $name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
-       public function getLocationInfobySourceName($name) {
-                $query = "SELECT * FROM source_location WHERE source = :name";
-                $query_values = array(':name' => $name);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+		}
+	   public function getAllLocationInfo() {
+				$query = "SELECT * FROM source_location";
+				$query_values = array();
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
+	   public function getLocationInfobyName($name) {
+				$query = "SELECT * FROM source_location WHERE name = :name";
+				$query_values = array(':name' => $name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
+	   public function getLocationInfobySourceName($name) {
+				$query = "SELECT * FROM source_location WHERE source = :name";
+				$query_values = array(':name' => $name);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
   
-       public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
-                $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
-                $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
+				$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
+				$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteLocation($id) {
-                $query = "DELETE FROM source_location WHERE id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-       public function deleteAllLocation() {
-                $query = "DELETE FROM source_location";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteLocation($id) {
+				$query = "DELETE FROM source_location WHERE id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+	   public function deleteAllLocation() {
+				$query = "DELETE FROM source_location";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 }
 ?>
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -26,7 +26,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -38,20 +38,20 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
   
-       public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
+       public function addLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png') {
                 $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
-                $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
+                $query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -62,7 +62,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -71,7 +71,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }

require/libs/simple_html_dom.php

Indentation +5 added lines, -5 removed lines

@@ -824,11 +824,11 @@
 	}
 
 	/**
-	* Returns true if $string is valid UTF-8 and false otherwise.
-	*
-	* @param mixed $str String to be tested
-	* @return boolean
-	*/
+	 * Returns true if $string is valid UTF-8 and false otherwise.
+	 *
+	 * @param mixed $str String to be tested
+	 * @return boolean
+	 */
 	static function is_utf8($str)
 	{
 		$c=0; $b=0;

Spacing +238 added lines, -238 removed lines

@@ -45,21 +45,21 @@ 
  */
 define('HDOM_TYPE_ELEMENT', 1);
 define('HDOM_TYPE_COMMENT', 2);
-define('HDOM_TYPE_TEXT',	3);
-define('HDOM_TYPE_ENDTAG',  4);
-define('HDOM_TYPE_ROOT',	5);
+define('HDOM_TYPE_TEXT', 3);
+define('HDOM_TYPE_ENDTAG', 4);
+define('HDOM_TYPE_ROOT', 5);
 define('HDOM_TYPE_UNKNOWN', 6);
 define('HDOM_QUOTE_DOUBLE', 0);
 define('HDOM_QUOTE_SINGLE', 1);
-define('HDOM_QUOTE_NO',	 3);
-define('HDOM_INFO_BEGIN',   0);
-define('HDOM_INFO_END',	 1);
-define('HDOM_INFO_QUOTE',   2);
-define('HDOM_INFO_SPACE',   3);
-define('HDOM_INFO_TEXT',	4);
-define('HDOM_INFO_INNER',   5);
-define('HDOM_INFO_OUTER',   6);
-define('HDOM_INFO_ENDSPACE',7);
+define('HDOM_QUOTE_NO', 3);
+define('HDOM_INFO_BEGIN', 0);
+define('HDOM_INFO_END', 1);
+define('HDOM_INFO_QUOTE', 2);
+define('HDOM_INFO_SPACE', 3);
+define('HDOM_INFO_TEXT', 4);
+define('HDOM_INFO_INNER', 5);
+define('HDOM_INFO_OUTER', 6);
+define('HDOM_INFO_ENDSPACE', 7);
 define('DEFAULT_TARGET_CHARSET', 'UTF-8');
 define('DEFAULT_BR_TEXT', "\r\n");
 define('DEFAULT_SPAN_TEXT', " ");
@@ -68,7 +68,7 @@ 
 // -----------------------------------------------------------------------------
 // get html dom from file
 // $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1.
-function file_get_html($url, $use_include_path = false, $context=null, $offset = -1, $maxLen=-1, $lowercase = true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function file_get_html($url, $use_include_path = false, $context = null, $offset = -1, $maxLen = -1, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
 	// We DO force the tags to be terminated.
 	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
@@ -86,7 +86,7 @@ 
 }
 
 // get html dom from string
-function str_get_html($str, $lowercase=true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+function str_get_html($str, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 {
 	$dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText);
 	if (empty($str) || strlen($str) > MAX_FILE_SIZE)
@@ -99,7 +99,7 @@ 
 }
 
 // dump html dom tree
-function dump_html_tree($node, $show_attr=true, $deep=0)
+function dump_html_tree($node, $show_attr = true, $deep = 0)
 {
 	$node->dump($node);
 }
@@ -151,12 +151,12 @@ 
 	}
 
 	// dump node's tree
-	function dump($show_attr=true, $deep=0)
+	function dump($show_attr = true, $deep = 0)
 	{
 		$lead = str_repeat('	', $deep);
 
 		echo $lead.$this->tag;
-		if ($show_attr && count($this->attr)>0)
+		if ($show_attr && count($this->attr) > 0)
 		{
 			echo '(';
 			foreach ($this->attr as $k=>$v)
@@ -169,18 +169,18 @@ 
 		{
 			foreach ($this->nodes as $c)
 			{
-				$c->dump($show_attr, $deep+1);
+				$c->dump($show_attr, $deep + 1);
 			}
 		}
 	}
 
 
 	// Debugging function to dump a single dom node with a bunch of information about it.
-	function dump_node($echo=true)
+	function dump_node($echo = true)
 	{
 
 		$string = $this->tag;
-		if (count($this->attr)>0)
+		if (count($this->attr) > 0)
 		{
 			$string .= '(';
 			foreach ($this->attr as $k=>$v)
@@ -189,7 +189,7 @@ 
 			}
 			$string .= ')';
 		}
-		if (count($this->_)>0)
+		if (count($this->_) > 0)
 		{
 			$string .= ' $_ (';
 			foreach ($this->_ as $k=>$v)
@@ -211,22 +211,22 @@ 
 
 		if (isset($this->text))
 		{
-			$string .= " text: (" . $this->text . ")";
+			$string .= " text: (".$this->text.")";
 		}
 
 		$string .= " HDOM_INNER_INFO: '";
 		if (isset($node->_[HDOM_INFO_INNER]))
 		{
-			$string .= $node->_[HDOM_INFO_INNER] . "'";
+			$string .= $node->_[HDOM_INFO_INNER]."'";
 		}
 		else
 		{
 			$string .= ' NULL ';
 		}
 
-		$string .= " children: " . count($this->children);
-		$string .= " nodes: " . count($this->nodes);
-		$string .= " tag_start: " . $this->tag_start;
+		$string .= " children: ".count($this->children);
+		$string .= " nodes: ".count($this->nodes);
+		$string .= " tag_start: ".$this->tag_start;
 		$string .= "\n";
 
 		if ($echo)
@@ -242,7 +242,7 @@ 
 
 	// returns the parent of node
 	// If a node is passed in, it will reset the parent of the current node to that one.
-	function parent($parent=null)
+	function parent($parent = null)
 	{
 		// I am SURE that this doesn't work properly.
 		// It fails to unset the current node from it's current parents nodes or children list first.
@@ -263,9 +263,9 @@ 
 	}
 
 	// returns children of node
-	function children($idx=-1)
+	function children($idx = -1)
 	{
-		if ($idx===-1)
+		if ($idx === -1)
 		{
 			return $this->children;
 		}
@@ -279,7 +279,7 @@ 
 	// returns the first child of node
 	function first_child()
 	{
-		if (count($this->children)>0)
+		if (count($this->children) > 0)
 		{
 			return $this->children[0];
 		}
@@ -289,9 +289,9 @@ 
 	// returns the last child of node
 	function last_child()
 	{
-		if (($count=count($this->children))>0)
+		if (($count = count($this->children)) > 0)
 		{
-			return $this->children[$count-1];
+			return $this->children[$count - 1];
 		}
 		return null;
 	}
@@ -299,18 +299,18 @@ 
 	// returns the next sibling of node
 	function next_sibling()
 	{
-		if ($this->parent===null)
+		if ($this->parent === null)
 		{
 			return null;
 		}
 
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
+		while ($idx < $count && $this !== $this->parent->children[$idx])
 		{
 			++$idx;
 		}
-		if (++$idx>=$count)
+		if (++$idx >= $count)
 		{
 			return null;
 		}
@@ -320,12 +320,12 @@ 
 	// returns the previous sibling of node
 	function prev_sibling()
 	{
-		if ($this->parent===null) return null;
+		if ($this->parent === null) return null;
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
+		while ($idx < $count && $this !== $this->parent->children[$idx])
 			++$idx;
-		if (--$idx<0) return null;
+		if (--$idx < 0) return null;
 		return $this->parent->children[$idx];
 	}
 
@@ -340,7 +340,7 @@ 
 
 		while (!is_null($returnDom))
 		{
-			if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: " . $returnDom->tag); }
+			if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: ".$returnDom->tag); }
 
 			if ($returnDom->tag == $tag)
 			{
@@ -374,16 +374,16 @@ 
 			{
 				if (!empty($this->text))
 				{
-					$text = " with text: " . $this->text;
+					$text = " with text: ".$this->text;
 				}
 			}
-			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
+			$debug_object->debug_log(1, 'Innertext of tag: '.$this->tag.$text);
 		}
 
-		if ($this->tag==='root') return $this->innertext();
+		if ($this->tag === 'root') return $this->innertext();
 
 		// trigger callback
-		if ($this->dom && $this->dom->callback!==null)
+		if ($this->dom && $this->dom->callback !== null)
 		{
 			call_user_func_array($this->dom->callback, array($this));
 		}
@@ -418,7 +418,7 @@ 
 		}
 
 		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0)
 			$ret .= '</'.$this->tag.'>';
 		return $ret;
 	}
@@ -433,8 +433,8 @@ 
 			case HDOM_TYPE_COMMENT: return '';
 			case HDOM_TYPE_UNKNOWN: return '';
 		}
-		if (strcasecmp($this->tag, 'script')===0) return '';
-		if (strcasecmp($this->tag, 'style')===0) return '';
+		if (strcasecmp($this->tag, 'script') === 0) return '';
+		if (strcasecmp($this->tag, 'style') === 0) return '';
 
 		$ret = '';
 		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -480,12 +480,12 @@ 
 			++$i;
 
 			// skip removed attribute
-			if ($val===null || $val===false)
+			if ($val === null || $val === false)
 				continue;
 
 			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 			//no value attr: nowrap, checked selected...
-			if ($val===true)
+			if ($val === true)
 				$ret .= $key;
 			else {
 				switch ($this->_[HDOM_INFO_QUOTE][$i])
@@ -498,34 +498,34 @@ 
 			}
 		}
 		$ret = $this->dom->restore_noise($ret);
-		return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
+		return $ret.$this->_[HDOM_INFO_ENDSPACE].'>';
 	}
 
 	// find elements by css selector
 	//PaperG - added ability for find to lowercase the value of the selector.
-	function find($selector, $idx=null, $lowercase=false)
+	function find($selector, $idx = null, $lowercase = false)
 	{
 		$selectors = $this->parse_selector($selector);
-		if (($count=count($selectors))===0) return array();
+		if (($count = count($selectors)) === 0) return array();
 		$found_keys = array();
 
 		// find each selector
-		for ($c=0; $c<$count; ++$c)
+		for ($c = 0; $c < $count; ++$c)
 		{
 			// The change on the below line was documented on the sourceforge code tracker id 2788009
 			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle=count($selectors[$c]))===0) return array();
+			if (($levle = count($selectors[$c])) === 0) return array();
 			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
 
 			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
 			// handle descendant selectors, no recursive!
-			for ($l=0; $l<$levle; ++$l)
+			for ($l = 0; $l < $levle; ++$l)
 			{
 				$ret = array();
 				foreach ($head as $k=>$v)
 				{
-					$n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k];
+					$n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k];
 					//PaperG - Pass this optional parameter on to the seek function.
 					$n->seek($selectors[$c][$l], $ret, $lowercase);
 				}
@@ -550,13 +550,13 @@ 
 
 		// return nth-element or array
 		if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
+		else if ($idx < 0) $idx = count($found) + $idx;
 		return (isset($found[$idx])) ? $found[$idx] : null;
 	}
 
 	// seek for given conditions
 	// PaperG - added parameter to allow for case insensitive testing of the value of a selector.
-	protected function seek($selector, &$ret, $lowercase=false)
+	protected function seek($selector, &$ret, $lowercase = false)
 	{
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
@@ -569,8 +569,8 @@ 
 			$count = 0;
 			foreach ($this->children as $c)
 			{
-				if ($tag==='*' || $tag===$c->tag) {
-					if (++$count==$key) {
+				if ($tag === '*' || $tag === $c->tag) {
+					if (++$count == $key) {
 						$ret[$c->_[HDOM_INFO_BEGIN]] = 1;
 						return;
 					}
@@ -580,38 +580,38 @@ 
 		}
 
 		$end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
-		if ($end==0) {
+		if ($end == 0) {
 			$parent = $this->parent;
-			while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) {
+			while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) {
 				$end -= 1;
 				$parent = $parent->parent;
 			}
 			$end += $parent->_[HDOM_INFO_END];
 		}
 
-		for ($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) {
+		for ($i = $this->_[HDOM_INFO_BEGIN] + 1; $i < $end; ++$i) {
 			$node = $this->dom->nodes[$i];
 
 			$pass = true;
 
-			if ($tag==='*' && !$key) {
+			if ($tag === '*' && !$key) {
 				if (in_array($node, $this->children, true))
 					$ret[$i] = 1;
 				continue;
 			}
 
 			// compare tag
-			if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;}
+			if ($tag && $tag != $node->tag && $tag !== '*') {$pass = false; }
 			// compare key
 			if ($pass && $key) {
 				if ($no_key) {
-					if (isset($node->attr[$key])) $pass=false;
+					if (isset($node->attr[$key])) $pass = false;
 				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+					if (($key != "plaintext") && !isset($node->attr[$key])) $pass = false;
 				}
 			}
 			// compare value
-			if ($pass && $key && $val  && $val!=='*') {
+			if ($pass && $key && $val && $val !== '*') {
 				// If they have told us that this is a "plaintext" search then we want the plaintext of the node - right?
 				if ($key == "plaintext") {
 					// $node->plaintext actually returns $node->text();
@@ -620,7 +620,7 @@ 
 					// this is a normal search, we want the value of that attribute of the tag.
 					$nodeKeyValue = $node->attr[$key];
 				}
-				if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: ".$node->tag." for attribute: ".$key.$exp.$val." where nodes value is: ".$nodeKeyValue); }
 
 				//PaperG - If lowercase is set, do a case insensitive test of the value of the selector.
 				if ($lowercase) {
@@ -628,11 +628,11 @@ 
 				} else {
 					$check = $this->match($exp, $val, $nodeKeyValue);
 				}
-				if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: " . ($check ? "true" : "false"));}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: ".($check ? "true" : "false")); }
 
 				// handle multiple class
-				if (!$check && strcasecmp($key, 'class')===0) {
-					foreach (explode(' ',$node->attr[$key]) as $k) {
+				if (!$check && strcasecmp($key, 'class') === 0) {
+					foreach (explode(' ', $node->attr[$key]) as $k) {
 						// Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form.
 						if (!empty($k)) {
 							if ($lowercase) {
@@ -650,24 +650,24 @@ 
 			unset($node);
 		}
 		// It's passed by reference so this is actually what this function returns.
-		if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret);}
+		if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret); }
 	}
 
 	protected function match($exp, $pattern, $value) {
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		switch ($exp) {
 			case '=':
-				return ($value===$pattern);
+				return ($value === $pattern);
 			case '!=':
-				return ($value!==$pattern);
+				return ($value !== $pattern);
 			case '^=':
-				return preg_match("/^".preg_quote($pattern,'/')."/", $value);
+				return preg_match("/^".preg_quote($pattern, '/')."/", $value);
 			case '$=':
-				return preg_match("/".preg_quote($pattern,'/')."$/", $value);
+				return preg_match("/".preg_quote($pattern, '/')."$/", $value);
 			case '*=':
-				if ($pattern[0]=='/') {
+				if ($pattern[0] == '/') {
 					return preg_match($pattern, $value);
 				}
 				return preg_match("/".$pattern."/i", $value);
@@ -677,7 +677,7 @@ 
 
 	protected function parse_selector($selector_string) {
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		// pattern of CSS selectors, modified from mootools
 		// Paperg: Add the colon to the attrbute, so that it properly finds <tag attr:ibute="something" > like google does.
@@ -688,7 +688,7 @@ 
 //		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 		$pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
 		preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER);
-		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);}
+		if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches); }
 
 		$selectors = array();
 		$result = array();
@@ -696,29 +696,29 @@ 
 
 		foreach ($matches as $m) {
 			$m[0] = trim($m[0]);
-			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') continue;
 			// for browser generated xpath
-			if ($m[1]==='tbody') continue;
+			if ($m[1] === 'tbody') continue;
 
 			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
-			if (!empty($m[2])) {$key='id'; $val=$m[2];}
-			if (!empty($m[3])) {$key='class'; $val=$m[3];}
-			if (!empty($m[4])) {$key=$m[4];}
-			if (!empty($m[5])) {$exp=$m[5];}
-			if (!empty($m[6])) {$val=$m[6];}
+			if (!empty($m[2])) {$key = 'id'; $val = $m[2]; }
+			if (!empty($m[3])) {$key = 'class'; $val = $m[3]; }
+			if (!empty($m[4])) {$key = $m[4]; }
+			if (!empty($m[5])) {$exp = $m[5]; }
+			if (!empty($m[6])) {$val = $m[6]; }
 
 			// convert to lowercase
-			if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);}
+			if ($this->dom->lowercase) {$tag = strtolower($tag); $key = strtolower($key); }
 			//elements that do NOT have the specified attribute
-			if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;}
+			if (isset($key[0]) && $key[0] === '!') {$key = substr($key, 1); $no_key = true; }
 
 			$result[] = array($tag, $key, $val, $exp, $no_key);
-			if (trim($m[7])===',') {
+			if (trim($m[7]) === ',') {
 				$selectors[] = $result;
 				$result = array();
 			}
 		}
-		if (count($result)>0)
+		if (count($result) > 0)
 			$selectors[] = $result;
 		return $selectors;
 	}
@@ -742,7 +742,7 @@ 
 	function __set($name, $value)
 	{
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		switch ($name)
 		{
@@ -780,7 +780,7 @@ 
 	function convert_text($text)
 	{
 		global $debug_object;
-		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1); }
 
 		$converted_text = $text;
 
@@ -792,7 +792,7 @@ 
 			$sourceCharset = strtoupper($this->dom->_charset);
 			$targetCharset = strtoupper($this->dom->_target_charset);
 		}
-		if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);}
+		if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: ".$sourceCharset." target charaset: ".$targetCharset); }
 
 		if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0))
 		{
@@ -831,27 +831,27 @@ 
 	*/
 	static function is_utf8($str)
 	{
-		$c=0; $b=0;
-		$bits=0;
-		$len=strlen($str);
-		for($i=0; $i<$len; $i++)
+		$c = 0; $b = 0;
+		$bits = 0;
+		$len = strlen($str);
+		for ($i = 0; $i < $len; $i++)
 		{
-			$c=ord($str[$i]);
-			if($c > 128)
+			$c = ord($str[$i]);
+			if ($c > 128)
 			{
-				if(($c >= 254)) return false;
-				elseif($c >= 252) $bits=6;
-				elseif($c >= 248) $bits=5;
-				elseif($c >= 240) $bits=4;
-				elseif($c >= 224) $bits=3;
-				elseif($c >= 192) $bits=2;
+				if (($c >= 254)) return false;
+				elseif ($c >= 252) $bits = 6;
+				elseif ($c >= 248) $bits = 5;
+				elseif ($c >= 240) $bits = 4;
+				elseif ($c >= 224) $bits = 3;
+				elseif ($c >= 192) $bits = 2;
 				else return false;
-				if(($i+$bits) > $len) return false;
-				while($bits > 1)
+				if (($i + $bits) > $len) return false;
+				while ($bits > 1)
 				{
 					$i++;
-					$b=ord($str[$i]);
-					if($b < 128 || $b > 191) return false;
+					$b = ord($str[$i]);
+					if ($b < 128 || $b > 191) return false;
 					$bits--;
 				}
 			}
@@ -955,24 +955,24 @@ 
 	}
 
 	// camel naming conventions
-	function getAllAttributes() {return $this->attr;}
-	function getAttribute($name) {return $this->__get($name);}
-	function setAttribute($name, $value) {$this->__set($name, $value);}
-	function hasAttribute($name) {return $this->__isset($name);}
-	function removeAttribute($name) {$this->__set($name, null);}
-	function getElementById($id) {return $this->find("#$id", 0);}
-	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-	function getElementByTagName($name) {return $this->find($name, 0);}
-	function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);}
-	function parentNode() {return $this->parent();}
-	function childNodes($idx=-1) {return $this->children($idx);}
-	function firstChild() {return $this->first_child();}
-	function lastChild() {return $this->last_child();}
-	function nextSibling() {return $this->next_sibling();}
-	function previousSibling() {return $this->prev_sibling();}
-	function hasChildNodes() {return $this->has_child();}
-	function nodeName() {return $this->tag;}
-	function appendChild($node) {$node->parent($this); return $node;}
+	function getAllAttributes() {return $this->attr; }
+	function getAttribute($name) {return $this->__get($name); }
+	function setAttribute($name, $value) {$this->__set($name, $value); }
+	function hasAttribute($name) {return $this->__isset($name); }
+	function removeAttribute($name) {$this->__set($name, null); }
+	function getElementById($id) {return $this->find("#$id", 0); }
+	function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+	function getElementByTagName($name) {return $this->find($name, 0); }
+	function getElementsByTagName($name, $idx = null) {return $this->find($name, $idx); }
+	function parentNode() {return $this->parent(); }
+	function childNodes($idx = -1) {return $this->children($idx); }
+	function firstChild() {return $this->first_child(); }
+	function lastChild() {return $this->last_child(); }
+	function nextSibling() {return $this->next_sibling(); }
+	function previousSibling() {return $this->prev_sibling(); }
+	function hasChildNodes() {return $this->has_child(); }
+	function nodeName() {return $this->tag; }
+	function appendChild($node) {$node->parent($this); return $node; }
 
 }
 
@@ -1028,11 +1028,11 @@ 
 		'option'=>array('option'=>1),
 	);
 
-	function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	function __construct($str = null, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		if ($str)
 		{
-			if (preg_match("/^http:\/\//i",$str) || is_file($str))
+			if (preg_match("/^http:\/\//i", $str) || is_file($str))
 			{
 				$this->load_file($str);
 			}
@@ -1043,7 +1043,7 @@ 
 		}
 		// Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html.
 		if (!$forceTagsClosed) {
-			$this->optional_closing_array=array();
+			$this->optional_closing_array = array();
 		}
 		$this->_target_charset = $target_charset;
 	}
@@ -1054,7 +1054,7 @@ 
 	}
 
 	// load html from string
-	function load($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	function load($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		global $debug_object;
 
@@ -1096,7 +1096,7 @@ 
 		$args = func_get_args();
 		$this->load(call_user_func_array('file_get_contents', $args), true);
 		// Throw an error if we can't properly load the dom.
-		if (($error=error_get_last())!==null) {
+		if (($error = error_get_last()) !== null) {
 			$this->clear();
 			return false;
 		}
@@ -1115,16 +1115,16 @@ 
 	}
 
 	// save dom as string
-	function save($filepath='')
+	function save($filepath = '')
 	{
 		$ret = $this->root->innertext();
-		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		if ($filepath !== '') file_put_contents($filepath, $ret, LOCK_EX);
 		return $ret;
 	}
 
 	// find dom node by css selector
 	// Paperg - allow us to specify that we want case insensitive testing of the value of the selector.
-	function find($selector, $idx=null, $lowercase=false)
+	function find($selector, $idx = null, $lowercase = false)
 	{
 		return $this->root->find($selector, $idx, $lowercase);
 	}
@@ -1132,22 +1132,22 @@ 
 	// clean up memory due to php5 circular references memory leak...
 	function clear()
 	{
-		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
+		foreach ($this->nodes as $n) {$n->clear(); $n = null; }
 		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
-		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
-		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
+		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null; }
+		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent); }
+		if (isset($this->root)) {$this->root->clear(); unset($this->root); }
 		unset($this->doc);
 		unset($this->noise);
 	}
 
-	function dump($show_attr=true)
+	function dump($show_attr = true)
 	{
 		$this->root->dump($show_attr);
 	}
 
 	// prepare HTML data and init everything
-	protected function prepare($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT)
+	protected function prepare($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT)
 	{
 		$this->clear();
 
@@ -1178,13 +1178,13 @@ 
 		$this->root->_[HDOM_INFO_BEGIN] = -1;
 		$this->root->nodetype = HDOM_TYPE_ROOT;
 		$this->parent = $this->root;
-		if ($this->size>0) $this->char = $this->doc[0];
+		if ($this->size > 0) $this->char = $this->doc[0];
 	}
 
 	// parse html content
 	protected function parse()
 	{
-		if (($s = $this->copy_until_char('<'))==='')
+		if (($s = $this->copy_until_char('<')) === '')
 		{
 			return $this->read_tag();
 		}
@@ -1213,18 +1213,18 @@ 
 			if ($success)
 			{
 				$charset = $matches[1];
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: ' . $charset);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: '.$charset); }
 			}
 
 		}
 
 		if (empty($charset))
 		{
-			$el = $this->root->find('meta[http-equiv=Content-Type]',0, true);
+			$el = $this->root->find('meta[http-equiv=Content-Type]', 0, true);
 			if (!empty($el))
 			{
 				$fullvalue = $el->content;
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found' . $fullvalue);}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found'.$fullvalue); }
 
 				if (!empty($fullvalue))
 				{
@@ -1236,7 +1236,7 @@ 
 					else
 					{
 						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
-						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
+						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.'); }
 						$charset = 'ISO-8859-1';
 					}
 				}
@@ -1251,14 +1251,14 @@ 
 			if (function_exists('mb_detect_encoding'))
 			{
 				// Have php try to detect the encoding from the text given to us.
-				$charset = mb_detect_encoding($this->root->plaintext . "ascii", $encoding_list = array( "UTF-8", "CP1252" ) );
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: ' . $charset);}
+				$charset = mb_detect_encoding($this->root->plaintext."ascii", $encoding_list = array("UTF-8", "CP1252"));
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: '.$charset); }
 			}
 
 			// and if this doesn't work...  then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need...
 			if ($charset === false)
 			{
-				if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8');}
+				if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8'); }
 				$charset = 'UTF-8';
 			}
 		}
@@ -1266,11 +1266,11 @@ 
 		// Since CP1252 is a superset, if we get one of it's subsets, we want it instead.
 		if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1')))
 		{
-			if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing ' . $charset . ' with CP1252 as its a superset');}
+			if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing '.$charset.' with CP1252 as its a superset'); }
 			$charset = 'CP1252';
 		}
 
-		if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - ' . $charset);}
+		if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - '.$charset); }
 
 		return $this->_charset = $charset;
 	}
@@ -1278,41 +1278,41 @@ 
 	// read tag info
 	protected function read_tag()
 	{
-		if ($this->char!=='<')
+		if ($this->char !== '<')
 		{
 			$this->root->_[HDOM_INFO_END] = $this->cursor;
 			return false;
 		}
 		$begin_tag_pos = $this->pos;
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
 		// end tag
-		if ($this->char==='/')
+		if ($this->char === '/')
 		{
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			// This represents the change in the simple_html_dom trunk from revision 180 to 181.
 			// $this->skip($this->token_blank_t);
 			$this->skip($this->token_blank);
 			$tag = $this->copy_until_char('>');
 
 			// skip attributes in end tag
-			if (($pos = strpos($tag, ' '))!==false)
+			if (($pos = strpos($tag, ' ')) !== false)
 				$tag = substr($tag, 0, $pos);
 
 			$parent_lower = strtolower($this->parent->tag);
 			$tag_lower = strtolower($tag);
 
-			if ($parent_lower!==$tag_lower)
+			if ($parent_lower !== $tag_lower)
 			{
 				if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower]))
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
 						$this->parent = $this->parent->parent;
 
-					if (strtolower($this->parent->tag)!==$tag_lower) {
+					if (strtolower($this->parent->tag) !== $tag_lower) {
 						$this->parent = $org_parent; // restore origonal parent
 						if ($this->parent->parent) $this->parent = $this->parent->parent;
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
@@ -1324,17 +1324,17 @@ 
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
+					while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower)
 						$this->parent = $this->parent->parent;
 
-					if (strtolower($this->parent->tag)!==$tag_lower)
+					if (strtolower($this->parent->tag) !== $tag_lower)
 					{
 						$this->parent = $org_parent; // restore origonal parent
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
 				}
-				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower)
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$this->parent = $this->parent->parent;
@@ -1346,7 +1346,7 @@ 
 			$this->parent->_[HDOM_INFO_END] = $this->cursor;
 			if ($this->parent->parent) $this->parent = $this->parent->parent;
 
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
@@ -1357,25 +1357,25 @@ 
 		$node->tag_start = $begin_tag_pos;
 
 		// doctype, cdata & comments...
-		if (isset($tag[0]) && $tag[0]==='!') {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
+		if (isset($tag[0]) && $tag[0] === '!') {
+			$node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until_char('>');
 
-			if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') {
+			if (isset($tag[2]) && $tag[1] === '-' && $tag[2] === '-') {
 				$node->nodetype = HDOM_TYPE_COMMENT;
 				$node->tag = 'comment';
 			} else {
 				$node->nodetype = HDOM_TYPE_UNKNOWN;
 				$node->tag = 'unknown';
 			}
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
 			$this->link_nodes($node, true);
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
 		// text
-		if ($pos=strpos($tag, '<')!==false) {
-			$tag = '<' . substr($tag, 0, -1);
+		if ($pos = strpos($tag, '<') !== false) {
+			$tag = '<'.substr($tag, 0, -1);
 			$node->_[HDOM_INFO_TEXT] = $tag;
 			$this->link_nodes($node, false);
 			$this->char = $this->doc[--$this->pos]; // prev
@@ -1383,15 +1383,15 @@ 
 		}
 
 		if (!preg_match("/^[\w-:]+$/", $tag)) {
-			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
-			if ($this->char==='<') {
+			$node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until('<>');
+			if ($this->char === '<') {
 				$this->link_nodes($node, false);
 				return true;
 			}
 
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>';
 			$this->link_nodes($node, false);
-			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
 		}
 
@@ -1401,7 +1401,7 @@ 
 		$node->tag = ($this->lowercase) ? $tag_lower : $tag;
 
 		// handle optional closing tags
-		if (isset($this->optional_closing_tags[$tag_lower]) )
+		if (isset($this->optional_closing_tags[$tag_lower]))
 		{
 			while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)]))
 			{
@@ -1417,67 +1417,67 @@ 
 		// attributes
 		do
 		{
-			if ($this->char!==null && $space[0]==='')
+			if ($this->char !== null && $space[0] === '')
 			{
 				break;
 			}
 			$name = $this->copy_until($this->token_equal);
-			if ($guard===$this->pos)
+			if ($guard === $this->pos)
 			{
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				continue;
 			}
 			$guard = $this->pos;
 
 			// handle endless '<'
-			if ($this->pos>=$this->size-1 && $this->char!=='>') {
+			if ($this->pos >= $this->size - 1 && $this->char !== '>') {
 				$node->nodetype = HDOM_TYPE_TEXT;
 				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name;
+				$node->_[HDOM_INFO_TEXT] = '<'.$tag.$space[0].$name;
 				$node->tag = 'text';
 				$this->link_nodes($node, false);
 				return true;
 			}
 
 			// handle mismatch '<'
-			if ($this->doc[$this->pos-1]=='<') {
+			if ($this->doc[$this->pos - 1] == '<') {
 				$node->nodetype = HDOM_TYPE_TEXT;
 				$node->tag = 'text';
 				$node->attr = array();
 				$node->_[HDOM_INFO_END] = 0;
-				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1);
+				$node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos - $begin_tag_pos - 1);
 				$this->pos -= 2;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$this->link_nodes($node, false);
 				return true;
 			}
 
-			if ($name!=='/' && $name!=='') {
+			if ($name !== '/' && $name !== '') {
 				$space[1] = $this->copy_skip($this->token_blank);
 				$name = $this->restore_noise($name);
 				if ($this->lowercase) $name = strtolower($name);
-				if ($this->char==='=') {
-					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				if ($this->char === '=') {
+					$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 					$this->parse_attr($node, $name, $space);
 				}
 				else {
 					//no value attr: nowrap, checked selected...
 					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 					$node->attr[$name] = true;
-					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+					if ($this->char != '>') $this->char = $this->doc[--$this->pos]; // prev
 				}
 				$node->_[HDOM_INFO_SPACE][] = $space;
 				$space = array($this->copy_skip($this->token_blank), '', '');
 			}
 			else
 				break;
-		} while ($this->char!=='>' && $this->char!=='/');
+		} while ($this->char !== '>' && $this->char !== '/');
 
 		$this->link_nodes($node, true);
 		$node->_[HDOM_INFO_ENDSPACE] = $space[0];
 
 		// check self closing
-		if ($this->copy_until_char_escape('>')==='/')
+		if ($this->copy_until_char_escape('>') === '/')
 		{
 			$node->_[HDOM_INFO_ENDSPACE] .= '/';
 			$node->_[HDOM_INFO_END] = 0;
@@ -1487,7 +1487,7 @@ 
 			// reset parent
 			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
 		}
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 
 		// If it's a BR tag, we need to set it's text to the default text.
 		// This way when we see it in plaintext, we can generate formatting that the user wants.
@@ -1514,15 +1514,15 @@ 
 		switch ($this->char) {
 			case '"':
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"'));
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				break;
 			case '\'':
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE;
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				$node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\''));
-				$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 				break;
 			default:
 				$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
@@ -1553,16 +1553,16 @@ 
 	{
 		$node = new simple_html_dom_node($this);
 		++$this->cursor;
-		$node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
+		$node->_[HDOM_INFO_TEXT] = '</'.$tag.'>';
 		$this->link_nodes($node, false);
-		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 		return true;
 	}
 
 	protected function skip($chars)
 	{
 		$this->pos += strspn($this->doc, $chars, $this->pos);
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 	}
 
 	protected function copy_skip($chars)
@@ -1570,8 +1570,8 @@ 
 		$pos = $this->pos;
 		$len = strspn($this->doc, $chars, $pos);
 		$this->pos += $len;
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len===0) return '';
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+		if ($len === 0) return '';
 		return substr($this->doc, $pos, $len);
 	}
 
@@ -1580,70 +1580,70 @@ 
 		$pos = $this->pos;
 		$len = strcspn($this->doc, $chars, $pos);
 		$this->pos += $len;
-		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
 		return substr($this->doc, $pos, $len);
 	}
 
 	protected function copy_until_char($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char === null) return '';
 
-		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
-			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+		if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
+			$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
 			$this->char = null;
 			$this->pos = $this->size;
 			return $ret;
 		}
 
-		if ($pos===$this->pos) return '';
+		if ($pos === $this->pos) return '';
 		$pos_old = $this->pos;
 		$this->char = $this->doc[$pos];
 		$this->pos = $pos;
-		return substr($this->doc, $pos_old, $pos-$pos_old);
+		return substr($this->doc, $pos_old, $pos - $pos_old);
 	}
 
 	protected function copy_until_char_escape($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char === null) return '';
 
 		$start = $this->pos;
 		while (1)
 		{
-			if (($pos = strpos($this->doc, $char, $start))===false)
+			if (($pos = strpos($this->doc, $char, $start)) === false)
 			{
-				$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
+				$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
 				$this->char = null;
 				$this->pos = $this->size;
 				return $ret;
 			}
 
-			if ($pos===$this->pos) return '';
+			if ($pos === $this->pos) return '';
 
-			if ($this->doc[$pos-1]==='\\') {
-				$start = $pos+1;
+			if ($this->doc[$pos - 1] === '\\') {
+				$start = $pos + 1;
 				continue;
 			}
 
 			$pos_old = $this->pos;
 			$this->char = $this->doc[$pos];
 			$this->pos = $pos;
-			return substr($this->doc, $pos_old, $pos-$pos_old);
+			return substr($this->doc, $pos_old, $pos - $pos_old);
 		}
 	}
 
 	// remove noise from html content
 	// save the noise in the $this->noise array.
-	protected function remove_noise($pattern, $remove_tag=false)
+	protected function remove_noise($pattern, $remove_tag = false)
 	{
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
 		$count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
 
-		for ($i=$count-1; $i>-1; --$i)
+		for ($i = $count - 1; $i > -1; --$i)
 		{
-			$key = '___noise___'.sprintf('% 5d', count($this->noise)+1000);
-			if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: ' . $key); }
+			$key = '___noise___'.sprintf('% 5d', count($this->noise) + 1000);
+			if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: '.$key); }
 			$idx = ($remove_tag) ? 0 : 1;
 			$this->noise[$key] = $matches[$i][$idx][0];
 			$this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
@@ -1651,7 +1651,7 @@ 
 
 		// reset the length of content
 		$this->size = strlen($this->doc);
-		if ($this->size>0)
+		if ($this->size > 0)
 		{
 			$this->char = $this->doc[0];
 		}
@@ -1663,28 +1663,28 @@ 
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
-		while (($pos=strpos($text, '___noise___'))!==false)
+		while (($pos = strpos($text, '___noise___')) !== false)
 		{
 			// Sometimes there is a broken piece of markup, and we don't GET the pos+11 etc... token which indicates a problem outside of us...
-			if (strlen($text) > $pos+15)
+			if (strlen($text) > $pos + 15)
 			{
-				$key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13].$text[$pos+14].$text[$pos+15];
-				if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: ' . $key); }
+				$key = '___noise___'.$text[$pos + 11].$text[$pos + 12].$text[$pos + 13].$text[$pos + 14].$text[$pos + 15];
+				if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: '.$key); }
 
 				if (isset($this->noise[$key]))
 				{
-					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
+					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos + 16);
 				}
 				else
 				{
 					// do this to prevent an infinite loop.
-					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
+					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key.substr($text, $pos + 16);
 				}
 			}
 			else
 			{
 				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
-				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);
+				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY'.substr($text, $pos + 11);
 			}
 		}
 		return $text;
@@ -1696,9 +1696,9 @@ 
 		global $debug_object;
 		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
 
-		foreach($this->noise as $noiseElement)
+		foreach ($this->noise as $noiseElement)
 		{
-			if (strpos($noiseElement, $text)!==false)
+			if (strpos($noiseElement, $text) !== false)
 			{
 				return $noiseElement;
 			}
@@ -1727,16 +1727,16 @@ 
 	}
 
 	// camel naming conventions
-	function childNodes($idx=-1) {return $this->root->childNodes($idx);}
-	function firstChild() {return $this->root->first_child();}
-	function lastChild() {return $this->root->last_child();}
-	function createElement($name, $value=null) {return @str_get_html("<$name>$value</$name>")->first_child();}
-	function createTextNode($value) {return @end(str_get_html($value)->nodes);}
-	function getElementById($id) {return $this->find("#$id", 0);}
-	function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-	function getElementByTagName($name) {return $this->find($name, 0);}
-	function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
-	function loadFile() {$args = func_get_args();$this->load_file($args);}
+	function childNodes($idx = -1) {return $this->root->childNodes($idx); }
+	function firstChild() {return $this->root->first_child(); }
+	function lastChild() {return $this->root->last_child(); }
+	function createElement($name, $value = null) {return @str_get_html("<$name>$value</$name>")->first_child(); }
+	function createTextNode($value) {return @end(str_get_html($value)->nodes); }
+	function getElementById($id) {return $this->find("#$id", 0); }
+	function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); }
+	function getElementByTagName($name) {return $this->find($name, 0); }
+	function getElementsByTagName($name, $idx = -1) {return $this->find($name, $idx); }
+	function loadFile() {$args = func_get_args(); $this->load_file($args); }
 }
 
 ?>
\ No newline at end of file

Braces +193 added lines, -101 removed lines

@@ -159,8 +159,9 @@ 
 		if ($show_attr && count($this->attr)>0)
 		{
 			echo '(';
-			foreach ($this->attr as $k=>$v)
-				echo "[$k]=>\"".$this->$k.'", ';
+			foreach ($this->attr as $k=>$v) {
+							echo "[$k]=>\"".$this->$k.'", ';
+			}
 			echo ')';
 		}
 		echo "\n";
@@ -218,8 +219,7 @@ 
 		if (isset($node->_[HDOM_INFO_INNER]))
 		{
 			$string .= $node->_[HDOM_INFO_INNER] . "'";
-		}
-		else
+		} else
 		{
 			$string .= ' NULL ';
 		}
@@ -233,8 +233,7 @@ 
 		{
 			echo $string;
 			return;
-		}
-		else
+		} else
 		{
 			return $string;
 		}
@@ -320,12 +319,17 @@ 
 	// returns the previous sibling of node
 	function prev_sibling()
 	{
-		if ($this->parent===null) return null;
+		if ($this->parent===null) {
+			return null;
+		}
 		$idx = 0;
 		$count = count($this->parent->children);
-		while ($idx<$count && $this!==$this->parent->children[$idx])
-			++$idx;
-		if (--$idx<0) return null;
+		while ($idx<$count && $this!==$this->parent->children[$idx]) {
+					++$idx;
+		}
+		if (--$idx<0) {
+			return null;
+		}
 		return $this->parent->children[$idx];
 	}
 
@@ -354,12 +358,17 @@ 
 	// get dom node's inner html
 	function innertext()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '';
-		foreach ($this->nodes as $n)
-			$ret .= $n->outertext();
+		foreach ($this->nodes as $n) {
+					$ret .= $n->outertext();
+		}
 		return $ret;
 	}
 
@@ -380,7 +389,9 @@ 
 			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
 		}
 
-		if ($this->tag==='root') return $this->innertext();
+		if ($this->tag==='root') {
+			return $this->innertext();
+		}
 
 		// trigger callback
 		if ($this->dom && $this->dom->callback!==null)
@@ -388,8 +399,12 @@ 
 			call_user_func_array($this->dom->callback, array($this));
 		}
 
-		if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_OUTER])) {
+			return $this->_[HDOM_INFO_OUTER];
+		}
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		// render begin tag
 		if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]])
@@ -418,23 +433,30 @@ 
 		}
 
 		// render end tag
-		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
-			$ret .= '</'.$this->tag.'>';
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) {
+					$ret .= '</'.$this->tag.'>';
+		}
 		return $ret;
 	}
 
 	// get dom node's plain text
 	function text()
 	{
-		if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
 		switch ($this->nodetype)
 		{
 			case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
 			case HDOM_TYPE_COMMENT: return '';
 			case HDOM_TYPE_UNKNOWN: return '';
 		}
-		if (strcasecmp($this->tag, 'script')===0) return '';
-		if (strcasecmp($this->tag, 'style')===0) return '';
+		if (strcasecmp($this->tag, 'script')===0) {
+			return '';
+		}
+		if (strcasecmp($this->tag, 'style')===0) {
+			return '';
+		}
 
 		$ret = '';
 		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL.
@@ -470,7 +492,9 @@ 
 	function makeup()
 	{
 		// text, comment, unknown
-		if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
 
 		$ret = '<'.$this->tag;
 		$i = -1;
@@ -480,14 +504,15 @@ 
 			++$i;
 
 			// skip removed attribute
-			if ($val===null || $val===false)
-				continue;
+			if ($val===null || $val===false) {
+							continue;
+			}
 
 			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
 			//no value attr: nowrap, checked selected...
-			if ($val===true)
-				$ret .= $key;
-			else {
+			if ($val===true) {
+							$ret .= $key;
+			} else {
 				switch ($this->_[HDOM_INFO_QUOTE][$i])
 				{
 					case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
@@ -506,7 +531,9 @@ 
 	function find($selector, $idx=null, $lowercase=false)
 	{
 		$selectors = $this->parse_selector($selector);
-		if (($count=count($selectors))===0) return array();
+		if (($count=count($selectors))===0) {
+			return array();
+		}
 		$found_keys = array();
 
 		// find each selector
@@ -514,8 +541,12 @@ 
 		{
 			// The change on the below line was documented on the sourceforge code tracker id 2788009
 			// used to be: if (($levle=count($selectors[0]))===0) return array();
-			if (($levle=count($selectors[$c]))===0) return array();
-			if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
+			if (($levle=count($selectors[$c]))===0) {
+				return array();
+			}
+			if (!isset($this->_[HDOM_INFO_BEGIN])) {
+				return array();
+			}
 
 			$head = array($this->_[HDOM_INFO_BEGIN]=>1);
 
@@ -545,12 +576,16 @@ 
 		ksort($found_keys);
 
 		$found = array();
-		foreach ($found_keys as $k=>$v)
-			$found[] = $this->dom->nodes[$k];
+		foreach ($found_keys as $k=>$v) {
+					$found[] = $this->dom->nodes[$k];
+		}
 
 		// return nth-element or array
-		if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
+		if (is_null($idx)) {
+			return $found;
+		} else if ($idx<0) {
+			$idx = count($found) + $idx;
+		}
 		return (isset($found[$idx])) ? $found[$idx] : null;
 	}
 
@@ -595,8 +630,9 @@ 
 			$pass = true;
 
 			if ($tag==='*' && !$key) {
-				if (in_array($node, $this->children, true))
-					$ret[$i] = 1;
+				if (in_array($node, $this->children, true)) {
+									$ret[$i] = 1;
+				}
 				continue;
 			}
 
@@ -605,9 +641,13 @@ 
 			// compare key
 			if ($pass && $key) {
 				if ($no_key) {
-					if (isset($node->attr[$key])) $pass=false;
+					if (isset($node->attr[$key])) {
+						$pass=false;
+					}
 				} else {
-					if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false;
+					if (($key != "plaintext") && !isset($node->attr[$key])) {
+						$pass=false;
+					}
 				}
 			}
 			// compare value
@@ -640,13 +680,19 @@ 
 							} else {
 								$check = $this->match($exp, $val, $k);
 							}
-							if ($check) break;
+							if ($check) {
+								break;
+							}
 						}
 					}
 				}
-				if (!$check) $pass = false;
+				if (!$check) {
+					$pass = false;
+				}
+			}
+			if ($pass) {
+				$ret[$i] = 1;
 			}
-			if ($pass) $ret[$i] = 1;
 			unset($node);
 		}
 		// It's passed by reference so this is actually what this function returns.
@@ -696,9 +742,13 @@ 
 
 		foreach ($matches as $m) {
 			$m[0] = trim($m[0]);
-			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
+			if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') {
+				continue;
+			}
 			// for browser generated xpath
-			if ($m[1]==='tbody') continue;
+			if ($m[1]==='tbody') {
+				continue;
+			}
 
 			list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
 			if (!empty($m[2])) {$key='id'; $val=$m[2];}
@@ -718,8 +768,9 @@ 
 				$result = array();
 			}
 		}
-		if (count($result)>0)
-			$selectors[] = $result;
+		if (count($result)>0) {
+					$selectors[] = $result;
+		}
 		return $selectors;
 	}
 
@@ -748,7 +799,9 @@ 
 		{
 			case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
 			case 'innertext':
-				if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
+				if (isset($this->_[HDOM_INFO_TEXT])) {
+					return $this->_[HDOM_INFO_TEXT] = $value;
+				}
 				return $this->_[HDOM_INFO_INNER] = $value;
 		}
 		if (!isset($this->attr[$name]))
@@ -772,8 +825,9 @@ 
 	}
 
 	function __unset($name) {
-		if (isset($this->attr[$name]))
-			unset($this->attr[$name]);
+		if (isset($this->attr[$name])) {
+					unset($this->attr[$name]);
+		}
 	}
 
 	// PaperG - Function to convert the text from one character set to another if the two sets are not the same.
@@ -800,8 +854,7 @@ 
 			if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text)))
 			{
 				$converted_text = $text;
-			}
-			else
+			} else
 			{
 				$converted_text = iconv($sourceCharset, $targetCharset, $text);
 			}
@@ -839,19 +892,31 @@ 
 			$c=ord($str[$i]);
 			if($c > 128)
 			{
-				if(($c >= 254)) return false;
-				elseif($c >= 252) $bits=6;
-				elseif($c >= 248) $bits=5;
-				elseif($c >= 240) $bits=4;
-				elseif($c >= 224) $bits=3;
-				elseif($c >= 192) $bits=2;
-				else return false;
-				if(($i+$bits) > $len) return false;
+				if(($c >= 254)) {
+					return false;
+				} elseif($c >= 252) {
+					$bits=6;
+				} elseif($c >= 248) {
+					$bits=5;
+				} elseif($c >= 240) {
+					$bits=4;
+				} elseif($c >= 224) {
+					$bits=3;
+				} elseif($c >= 192) {
+					$bits=2;
+				} else {
+					return false;
+				}
+				if(($i+$bits) > $len) {
+					return false;
+				}
 				while($bits > 1)
 				{
 					$i++;
 					$b=ord($str[$i]);
-					if($b < 128 || $b > 191) return false;
+					if($b < 128 || $b > 191) {
+						return false;
+					}
 					$bits--;
 				}
 			}
@@ -1035,8 +1100,7 @@ 
 			if (preg_match("/^http:\/\//i",$str) || is_file($str))
 			{
 				$this->load_file($str);
-			}
-			else
+			} else
 			{
 				$this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText);
 			}
@@ -1118,7 +1182,9 @@ 
 	function save($filepath='')
 	{
 		$ret = $this->root->innertext();
-		if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX);
+		if ($filepath!=='') {
+			file_put_contents($filepath, $ret, LOCK_EX);
+		}
 		return $ret;
 	}
 
@@ -1134,7 +1200,10 @@ 
 	{
 		foreach ($this->nodes as $n) {$n->clear(); $n = null;}
 		// This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear.
-		if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;}
+		if (isset($this->children)) {
+			foreach ($this->children as $n) {$n->clear();
+		}
+		$n = null;}
 		if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
 		if (isset($this->root)) {$this->root->clear(); unset($this->root);}
 		unset($this->doc);
@@ -1178,7 +1247,9 @@ 
 		$this->root->_[HDOM_INFO_BEGIN] = -1;
 		$this->root->nodetype = HDOM_TYPE_ROOT;
 		$this->parent = $this->root;
-		if ($this->size>0) $this->char = $this->doc[0];
+		if ($this->size>0) {
+			$this->char = $this->doc[0];
+		}
 	}
 
 	// parse html content
@@ -1232,8 +1303,7 @@ 
 					if ($success)
 					{
 						$charset = $matches[1];
-					}
-					else
+					} else
 					{
 						// If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1
 						if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');}
@@ -1296,8 +1366,9 @@ 
 			$tag = $this->copy_until_char('>');
 
 			// skip attributes in end tag
-			if (($pos = strpos($tag, ' '))!==false)
-				$tag = substr($tag, 0, $pos);
+			if (($pos = strpos($tag, ' '))!==false) {
+							$tag = substr($tag, 0, $pos);
+			}
 
 			$parent_lower = strtolower($this->parent->tag);
 			$tag_lower = strtolower($tag);
@@ -1309,23 +1380,26 @@ 
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower) {
 						$this->parent = $org_parent; // restore origonal parent
-						if ($this->parent->parent) $this->parent = $this->parent->parent;
+						if ($this->parent->parent) {
+							$this->parent = $this->parent->parent;
+						}
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
+				} else if (($this->parent->parent) && isset($this->block_tags[$tag_lower]))
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$org_parent = $this->parent;
 
-					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-						$this->parent = $this->parent->parent;
+					while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) {
+											$this->parent = $this->parent->parent;
+					}
 
 					if (strtolower($this->parent->tag)!==$tag_lower)
 					{
@@ -1333,18 +1407,19 @@ 
 						$this->parent->_[HDOM_INFO_END] = $this->cursor;
 						return $this->as_text_node($tag);
 					}
-				}
-				else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
+				} else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower)
 				{
 					$this->parent->_[HDOM_INFO_END] = 0;
 					$this->parent = $this->parent->parent;
+				} else {
+									return $this->as_text_node($tag);
 				}
-				else
-					return $this->as_text_node($tag);
 			}
 
 			$this->parent->_[HDOM_INFO_END] = $this->cursor;
-			if ($this->parent->parent) $this->parent = $this->parent->parent;
+			if ($this->parent->parent) {
+				$this->parent = $this->parent->parent;
+			}
 
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1367,7 +1442,9 @@ 
 				$node->nodetype = HDOM_TYPE_UNKNOWN;
 				$node->tag = 'unknown';
 			}
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, true);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1389,7 +1466,9 @@ 
 				return true;
 			}
 
-			if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
+			if ($this->char==='>') {
+				$node->_[HDOM_INFO_TEXT].='>';
+			}
 			$this->link_nodes($node, false);
 			$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 			return true;
@@ -1455,22 +1534,26 @@ 
 			if ($name!=='/' && $name!=='') {
 				$space[1] = $this->copy_skip($this->token_blank);
 				$name = $this->restore_noise($name);
-				if ($this->lowercase) $name = strtolower($name);
+				if ($this->lowercase) {
+					$name = strtolower($name);
+				}
 				if ($this->char==='=') {
 					$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 					$this->parse_attr($node, $name, $space);
-				}
-				else {
+				} else {
 					//no value attr: nowrap, checked selected...
 					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
 					$node->attr[$name] = true;
-					if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
+					if ($this->char!='>') {
+						$this->char = $this->doc[--$this->pos];
+					}
+					// prev
 				}
 				$node->_[HDOM_INFO_SPACE][] = $space;
 				$space = array($this->copy_skip($this->token_blank), '', '');
+			} else {
+							break;
 			}
-			else
-				break;
 		} while ($this->char!=='>' && $this->char!=='/');
 
 		$this->link_nodes($node, true);
@@ -1481,11 +1564,12 @@ 
 		{
 			$node->_[HDOM_INFO_ENDSPACE] .= '/';
 			$node->_[HDOM_INFO_END] = 0;
-		}
-		else
+		} else
 		{
 			// reset parent
-			if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
+			if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+				$this->parent = $node;
+			}
 		}
 		$this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 
@@ -1571,7 +1655,9 @@ 
 		$len = strspn($this->doc, $chars, $pos);
 		$this->pos += $len;
 		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-		if ($len===0) return '';
+		if ($len===0) {
+			return '';
+		}
 		return substr($this->doc, $pos, $len);
 	}
 
@@ -1586,7 +1672,9 @@ 
 
 	protected function copy_until_char($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		if (($pos = strpos($this->doc, $char, $this->pos))===false) {
 			$ret = substr($this->doc, $this->pos, $this->size-$this->pos);
@@ -1595,7 +1683,9 @@ 
 			return $ret;
 		}
 
-		if ($pos===$this->pos) return '';
+		if ($pos===$this->pos) {
+			return '';
+		}
 		$pos_old = $this->pos;
 		$this->char = $this->doc[$pos];
 		$this->pos = $pos;
@@ -1604,7 +1694,9 @@ 
 
 	protected function copy_until_char_escape($char)
 	{
-		if ($this->char===null) return '';
+		if ($this->char===null) {
+			return '';
+		}
 
 		$start = $this->pos;
 		while (1)
@@ -1617,7 +1709,9 @@ 
 				return $ret;
 			}
 
-			if ($pos===$this->pos) return '';
+			if ($pos===$this->pos) {
+				return '';
+			}
 
 			if ($this->doc[$pos-1]==='\\') {
 				$start = $pos+1;
@@ -1674,14 +1768,12 @@ 
 				if (isset($this->noise[$key]))
 				{
 					$text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16);
-				}
-				else
+				} else
 				{
 					// do this to prevent an infinite loop.
 					$text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16);
 				}
-			}
-			else
+			} else
 			{
 				// There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem.
 				$text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11);

Doc Comments +40 added lines

@@ -125,6 +125,9 @@ 
 	public $tag_start = 0;
 	private $dom = null;
 
+	/**
+	 * @param simple_html_dom $dom
+	 */
 	function __construct($dom)
 	{
 		$this->dom = $dom;
@@ -1501,6 +1504,11 @@ 
 	}
 
 	// parse attributes
+
+	/**
+	 * @param simple_html_dom_node $node
+	 * @param string[] $space
+	 */
 	protected function parse_attr($node, $name, &$space)
 	{
 		// Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037
@@ -1538,6 +1546,11 @@ 
 	}
 
 	// link node's parent
+
+	/**
+	 * @param simple_html_dom_node $node
+	 * @param boolean $is_child
+	 */
 	protected function link_nodes(&$node, $is_child)
 	{
 		$node->parent = $this->parent;
@@ -1549,6 +1562,10 @@ 
 	}
 
 	// as a text node
+
+	/**
+	 * @param string $tag
+	 */
 	protected function as_text_node($tag)
 	{
 		$node = new simple_html_dom_node($this);
@@ -1559,12 +1576,18 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function skip($chars)
 	{
 		$this->pos += strspn($this->doc, $chars, $this->pos);
 		$this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function copy_skip($chars)
 	{
 		$pos = $this->pos;
@@ -1575,6 +1598,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $chars
+	 */
 	protected function copy_until($chars)
 	{
 		$pos = $this->pos;
@@ -1584,6 +1610,9 @@ 
 		return substr($this->doc, $pos, $len);
 	}
 
+	/**
+	 * @param string $char
+	 */
 	protected function copy_until_char($char)
 	{
 		if ($this->char===null) return '';
@@ -1602,6 +1631,9 @@ 
 		return substr($this->doc, $pos_old, $pos-$pos_old);
 	}
 
+	/**
+	 * @param string $char
+	 */
 	protected function copy_until_char_escape($char)
 	{
 		if ($this->char===null) return '';
@@ -1633,6 +1665,10 @@ 
 
 	// remove noise from html content
 	// save the noise in the $this->noise array.
+
+	/**
+	 * @param string $pattern
+	 */
 	protected function remove_noise($pattern, $remove_tag=false)
 	{
 		global $debug_object;
@@ -1658,6 +1694,10 @@ 
 	}
 
 	// restore noise to html content
+
+	/**
+	 * @param string|null $text
+	 */
 	function restore_noise($text)
 	{
 		global $debug_object;

require/libs/geoPHP/tests/tests/20120702Test.php

Indentation +268 added lines, -268 removed lines

@@ -9,281 +9,281 @@
   }
 
   function testMethods() {
-    $format = 'gpx';
-    $value = file_get_contents('./input/20120702.gpx');
-    $geometry = geoPHP::load($value, $format);
+	$format = 'gpx';
+	$value = file_get_contents('./input/20120702.gpx');
+	$geometry = geoPHP::load($value, $format);
 
-    $methods = array(
-      array('name' => 'area'),
-      array('name' => 'boundary'),
-      array('name' => 'getBBox'),
-      array('name' => 'centroid'),
-      array('name' => 'length'),
-      array('name' => 'greatCircleLength', 'argument' => 6378137),
-      array('name' => 'haversineLength'),
-      array('name' => 'y'),
-      array('name' => 'x'),
-      array('name' => 'numGeometries'),
-      array('name' => 'geometryN', 'argument' => '1'),
-      array('name' => 'startPoint'),
-      array('name' => 'endPoint'),
-      array('name' => 'isRing'),
-      array('name' => 'isClosed'),
-      array('name' => 'numPoints'),
-      array('name' => 'pointN', 'argument' => '1'),
-      array('name' => 'exteriorRing'),
-      array('name' => 'numInteriorRings'),
-      array('name' => 'interiorRingN', 'argument' => '1'),
-      array('name' => 'dimension'),
-      array('name' => 'geometryType'),
-      array('name' => 'SRID'),
-      array('name' => 'setSRID', 'argument' => '4326'),
-    );
+	$methods = array(
+	  array('name' => 'area'),
+	  array('name' => 'boundary'),
+	  array('name' => 'getBBox'),
+	  array('name' => 'centroid'),
+	  array('name' => 'length'),
+	  array('name' => 'greatCircleLength', 'argument' => 6378137),
+	  array('name' => 'haversineLength'),
+	  array('name' => 'y'),
+	  array('name' => 'x'),
+	  array('name' => 'numGeometries'),
+	  array('name' => 'geometryN', 'argument' => '1'),
+	  array('name' => 'startPoint'),
+	  array('name' => 'endPoint'),
+	  array('name' => 'isRing'),
+	  array('name' => 'isClosed'),
+	  array('name' => 'numPoints'),
+	  array('name' => 'pointN', 'argument' => '1'),
+	  array('name' => 'exteriorRing'),
+	  array('name' => 'numInteriorRings'),
+	  array('name' => 'interiorRingN', 'argument' => '1'),
+	  array('name' => 'dimension'),
+	  array('name' => 'geometryType'),
+	  array('name' => 'SRID'),
+	  array('name' => 'setSRID', 'argument' => '4326'),
+	);
 
-    foreach($methods as $method) {
-      $argument = NULL;
-      $method_name = $method['name'];
-      if (isset($method['argument'])) {
-        $argument = $method['argument'];
-      }
-      $this->_methods_tester($geometry, $method_name, $argument);
-    }
+	foreach($methods as $method) {
+	  $argument = NULL;
+	  $method_name = $method['name'];
+	  if (isset($method['argument'])) {
+		$argument = $method['argument'];
+	  }
+	  $this->_methods_tester($geometry, $method_name, $argument);
+	}
   }
 
   function _methods_tester($geometry, $method_name, $argument) {
 
-    if (!method_exists($geometry, $method_name)) {
-      $this->fail("Method ".$method_name.'() doesn\'t exists.');
-      return;
-    }
+	if (!method_exists($geometry, $method_name)) {
+	  $this->fail("Method ".$method_name.'() doesn\'t exists.');
+	  return;
+	}
 
-    switch ($method_name) {
-      case 'y':
-      case 'x':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'geometryN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'startPoint':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method startPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'endPoint':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method endPoint() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'isRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'isClosed':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'pointN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          //TODO: Add a method pointN() to MultiLineString.
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'exteriorRing':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numInteriorRings':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'interiorRingN':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'setSRID':
-        //TODO: The method setSRID() should return TRUE.
-        break;
-      case 'SRID':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'getBBox':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'centroid':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'length':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numGeometries':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'numPoints':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'dimension':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'boundary':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        break;
-      case 'greatCircleLength':
-        if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        }
-        if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
-        }
-        break;
-      case 'haversineLength':
-      case 'area':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      case 'geometryType':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
-        break;
-      default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
-    }
+	switch ($method_name) {
+	  case 'y':
+	  case 'x':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'geometryN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'startPoint':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method startPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'endPoint':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method endPoint() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'isRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'isClosed':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'pointN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  //TODO: Add a method pointN() to MultiLineString.
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'exteriorRing':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numInteriorRings':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'interiorRingN':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'setSRID':
+		//TODO: The method setSRID() should return TRUE.
+		break;
+	  case 'SRID':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'getBBox':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'centroid':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'length':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numGeometries':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'numPoints':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'dimension':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'boundary':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'greatCircleLength':
+		if ($geometry->geometryType() == 'Point') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'LineString') {
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		}
+		if ($geometry->geometryType() == 'MultiLineString') {
+		  $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
+		}
+		break;
+	  case 'haversineLength':
+	  case 'area':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  case 'geometryType':
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+		break;
+	  default:
+		$this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+	}
   }
 }
 

Spacing +58 added lines, -58 removed lines

@@ -40,7 +40,7 @@ 
       array('name' => 'setSRID', 'argument' => '4326'),
     );
 
-    foreach($methods as $method) {
+    foreach ($methods as $method) {
       $argument = NULL;
       $method_name = $method['name'];
       if (isset($method['argument'])) {
@@ -61,32 +61,32 @@ 
       case 'y':
       case 'x':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'geometryN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'startPoint':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method startPoint() to MultiLineString.
@@ -95,10 +95,10 @@ 
         break;
       case 'endPoint':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method endPoint() to MultiLineString.
@@ -107,32 +107,32 @@ 
         break;
       case 'isRing':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'isClosed':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'pointN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
           //TODO: Add a method pointN() to MultiLineString.
@@ -141,35 +141,35 @@ 
         break;
       case 'exteriorRing':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'numInteriorRings':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'interiorRingN':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'setSRID':
@@ -177,112 +177,112 @@ 
         break;
       case 'SRID':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'getBBox':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'centroid':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'length':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
+          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on '.$method_name);
         }
         break;
       case 'numGeometries':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'numPoints':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'dimension':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'boundary':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         break;
       case 'greatCircleLength':
         if ($geometry->geometryType() == 'Point') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'LineString') {
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         }
         if ($geometry->geometryType() == 'MultiLineString') {
-          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
+          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on '.$method_name);
         }
         break;
       case 'haversineLength':
       case 'area':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         break;
       case 'geometryType':
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
         break;
       default:
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
+        $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
     }
   }
 }