Ysurac / FlightAirMap

highlights-display.php

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	$limit_start = 0;
 	$limit_end = 28;
 	$absolute_difference = 28;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];

Spacing +4 added lines, -4 removed lines

@@ -7,12 +7,12 @@ 
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 28;
 	$absolute_difference = 28;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -39,7 +39,7 @@ 
 print '<div class="column">';	
 print '<p>'._("The view below shows all aircrafts that have been selected to have some sort of special characteristic about them, such as unique liveries, destinations etc.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if ($sort != '') {
 	$spotter_array = $Spotter->getSpotterDataByHighlight($limit_start.",".$absolute_difference, $sort);
 } else {
@@ -48,7 +48,7 @@ 
 if (!empty($spotter_array))
 {
 	print '<div class="dispay-view">';
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		if (isset($spotter_item['image']) && $spotter_item['image'] != "")
 		{

search-kml.php

Indentation +167 added lines, -167 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);
@@ -90,22 +90,22 @@ 
       
 $output = '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<kml xmlns="http://www.opengis.net/kml/2.2">';
-    $output .= '<Document>';
-	    $output .= '<Style id="departureAirport">';
-	    	$output .= '<IconStyle>';
-	      	$output .= '<Icon>';
-	        	$output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>';
-	         $output .= '</Icon>';
-	        $output .= '</IconStyle>';
-	    $output .= '</Style>';
-	    $output .= '<Style id="arrivalAirport">';
-	    	$output .= '<IconStyle>';
-	      	$output .= '<Icon>';
-	        	$output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>';
-	         $output .= '</Icon>';
-	        $output .= '</IconStyle>';
-	    $output .= '</Style>';
-	    $output .= '<Style id="route">';
+	$output .= '<Document>';
+		$output .= '<Style id="departureAirport">';
+			$output .= '<IconStyle>';
+		  	$output .= '<Icon>';
+				$output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>';
+			 $output .= '</Icon>';
+			$output .= '</IconStyle>';
+		$output .= '</Style>';
+		$output .= '<Style id="arrivalAirport">';
+			$output .= '<IconStyle>';
+		  	$output .= '<Icon>';
+				$output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>';
+			 $output .= '</Icon>';
+			$output .= '</IconStyle>';
+		$output .= '</Style>';
+		$output .= '<Style id="route">';
 				$output .= '<LineStyle>';  
 					$output .= '<color>7f0000ff</color>';
 					$output .= '<width>2</width>';
@@ -113,10 +113,10 @@ 
 				$output .= '</LineStyle>';
 			$output .= '</Style>';
             
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 				
 				
 				$altitude = $spotter_item['altitude'].'00';
@@ -127,12 +127,12 @@ 
 					$output .= '<styleUrl>#route</styleUrl>';
 					$output .= '<LineString>';
 						$output .= '<coordinates>';
-            	$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
+				$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
 							$waypoint_pieces = array_chunk($waypoint_pieces, 2);
 							    
 							foreach ($waypoint_pieces as $waypoint_coordinate)
 							{
-							        $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+									$output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
 							
 							}
 						$output .= '</coordinates>';
@@ -144,38 +144,38 @@ 
 				//departure airport 
 				$output .= '<Placemark>';  
 					$output .= '<name>'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</name>';
-                    $output .= '<description><![CDATA[ ';
-                        $output .= '<div class="ge-balloon">';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Name</span>';
-                                $output .= $spotter_item['departure_airport_name'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>City</span>';
-                                $output .= $spotter_item['departure_airport_city'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Country</span>';
-                                $output .= $spotter_item['departure_airport_country'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>ICAO</span>';
-                                $output .= $spotter_item['departure_airport_icao'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>IATA</span>';
-                                $output .= $spotter_item['departure_airport_iata'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Coordinates</span>';
-                                $output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Altitude</span>';
-                                $output .= $spotter_item['departure_airport_altitude'];
-                            $output .= '</div>';
-                         $output .= '</div>';
-                    $output .= ' ]]></description>';
+					$output .= '<description><![CDATA[ ';
+						$output .= '<div class="ge-balloon">';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Name</span>';
+								$output .= $spotter_item['departure_airport_name'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>City</span>';
+								$output .= $spotter_item['departure_airport_city'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Country</span>';
+								$output .= $spotter_item['departure_airport_country'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>ICAO</span>';
+								$output .= $spotter_item['departure_airport_icao'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>IATA</span>';
+								$output .= $spotter_item['departure_airport_iata'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Coordinates</span>';
+								$output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Altitude</span>';
+								$output .= $spotter_item['departure_airport_altitude'];
+							$output .= '</div>';
+						 $output .= '</div>';
+					$output .= ' ]]></description>';
 					$output .= '<styleUrl>#departureAirport</styleUrl>';
 					$output .= '<Point>';
 						$output .=  '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
@@ -186,38 +186,38 @@ 
 				//arrival airport 
 				$output .= '<Placemark>';  
 					$output .= '<name>'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</name>';
-                    $output .= '<description><![CDATA[ ';
-                        $output .= '<div class="ge-balloon">';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Name</span>';
-                                $output .= $spotter_item['arrival_airport_name'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>City</span>';
-                                $output .= $spotter_item['arrival_airport_city'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Country</span>';
-                                $output .= $spotter_item['arrival_airport_country'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>ICAO</span>';
-                                $output .= $spotter_item['arrival_airport_icao'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>IATA</span>';
-                                $output .= $spotter_item['arrival_airport_iata'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Coordinates</span>';
-                                $output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Altitude</span>';
-                                $output .= $spotter_item['arrival_airport_altitude'];
-                            $output .= '</div>';
-                         $output .= '</div>';
-                    $output .= ' ]]></description>';
+					$output .= '<description><![CDATA[ ';
+						$output .= '<div class="ge-balloon">';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Name</span>';
+								$output .= $spotter_item['arrival_airport_name'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>City</span>';
+								$output .= $spotter_item['arrival_airport_city'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Country</span>';
+								$output .= $spotter_item['arrival_airport_country'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>ICAO</span>';
+								$output .= $spotter_item['arrival_airport_icao'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>IATA</span>';
+								$output .= $spotter_item['arrival_airport_iata'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Coordinates</span>';
+								$output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Altitude</span>';
+								$output .= $spotter_item['arrival_airport_altitude'];
+							$output .= '</div>';
+						 $output .= '</div>';
+					$output .= ' ]]></description>';
 					$output .= '<styleUrl>#arrivalAirport</styleUrl>';
 					$output .= '<Point>';
 						$output .=  '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
@@ -230,41 +230,41 @@ 
 				$output .= '<Placemark>';  
 					$output .= '<name>'.$spotter_item['ident'].' - '.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'</name>';
 					$output .= '<description><![CDATA[ ';
-                            $output .= '<div class="ge-balloon">';
-                                if ($spotter_item['image_thumbnail'] != "")
-                                {
-                                    $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>';
-                                }
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Ident</span>';
-                                    $output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Registration</span>';
-                                    $output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Aircraft</span>';
-                                    $output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Airline</span>';
-                                    $output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Departure Airport</span>';
-                                    $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Arrival Airport</span>';
-                                    $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>';
-                                $output .= '</div>';
+							$output .= '<div class="ge-balloon">';
+								if ($spotter_item['image_thumbnail'] != "")
+								{
+									$output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>';
+								}
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Ident</span>';
+									$output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Registration</span>';
+									$output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Aircraft</span>';
+									$output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Airline</span>';
+									$output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Departure Airport</span>';
+									$output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Arrival Airport</span>';
+									$output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>';
+								$output .= '</div>';
 $output .= '<div class="ge-row">';
-                                    $output .= '<span>Date</span>';
-                                    $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>';
-                                $output .= '</div>';
-                        $output .= '</div>';
-                    $output .= ' ]]></description>';
+									$output .= '<span>Date</span>';
+									$output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>';
+								$output .= '</div>';
+						$output .= '</div>';
+					$output .= ' ]]></description>';
 					$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
 					$output .= '<Point>';
 						$output .=  '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
@@ -273,14 +273,14 @@ 
 				$output .= '</Placemark>'; 
 				
 				$output .= '<Style id="aircraft_'.$spotter_item['spotter_id'].'">';
-		    	$output .= '<IconStyle>';
-		      	$output .= '<Icon>';
-		        	$output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>';
-		         $output .= '</Icon>';
-		         $output .= '<heading>'.$spotter_item['heading'].'</heading>';
-		        $output .= '</IconStyle>';
-		    $output .= '</Style>';
-	    }
+				$output .= '<IconStyle>';
+			  	$output .= '<Icon>';
+					$output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>';
+				 $output .= '</Icon>';
+				 $output .= '<heading>'.$spotter_item['heading'].'</heading>';
+				$output .= '</IconStyle>';
+			$output .= '</Style>';
+		}
 	   }
 	   
 		 $output .= '</Document>';

Spacing +31 added lines, -31 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,23 +69,23 @@ 
 
 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, '');
       
       
 $output = '<?xml version="1.0" encoding="UTF-8"?>';
@@ -115,7 +115,7 @@ 
             
     if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
+	    foreach ($spotter_array as $spotter_item)
 	    {
 				
 				
@@ -132,7 +132,7 @@ 
 							    
 							foreach ($waypoint_pieces as $waypoint_coordinate)
 							{
-							        $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+							        $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
 							
 							}
 						$output .= '</coordinates>';
@@ -178,7 +178,7 @@ 
                     $output .= ' ]]></description>';
 					$output .= '<styleUrl>#departureAirport</styleUrl>';
 					$output .= '<Point>';
-						$output .=  '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
+						$output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
 						$output .= '<altitudeMode>absolute</altitudeMode>';
 					$output .= '</Point>';
 				$output .= '</Placemark>'; 
@@ -220,7 +220,7 @@ 
                     $output .= ' ]]></description>';
 					$output .= '<styleUrl>#arrivalAirport</styleUrl>';
 					$output .= '<Point>';
-						$output .=  '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
+						$output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
 						$output .= '<altitudeMode>absolute</altitudeMode>';
 					$output .= '</Point>';
 				$output .= '</Placemark>'; 
@@ -267,7 +267,7 @@ 
                     $output .= ' ]]></description>';
 					$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
 					$output .= '<Point>';
-						$output .=  '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
+						$output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
 						$output .= '<altitudeMode>absolute</altitudeMode>';
 					$output .= '</Point>';
 				$output .= '</Placemark>'; 

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/xml');
 
-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);

airline-sub-menu.php

Spacing +5 added lines, -5 removed lines

@@ -3,9 +3,9 @@ 
 </span>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/airline/<?php print $_GET['airline']; ?>" <?php if (strtolower($current_page) == "airline-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/airline/<?php print $_GET['airline']; ?>" <?php if (strtolower($current_page) == "airline-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "airline-statistics-aircraft" || strtolower($current_page) == "airline-statistics-registration" || strtolower($current_page) == "airline-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "airline-statistics-aircraft" || strtolower($current_page) == "airline-statistics-registration" || strtolower($current_page) == "airline-statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -15,7 +15,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "airline-statistics-departure-airport" || strtolower($current_page) == "airline-statistics-departure-airport-country" || strtolower($current_page) == "airline-statistics-arrival-airport" || strtolower($current_page) == "airline-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "airline-statistics-departure-airport" || strtolower($current_page) == "airline-statistics-departure-airport-country" || strtolower($current_page) == "airline-statistics-arrival-airport" || strtolower($current_page) == "airline-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -25,7 +25,7 @@ 
 			  <li><a href="<?php print $globalURL; ?>/airline/statistics/arrival-airport-country/<?php print $_GET['airline']; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/airline/statistics/route/<?php print $_GET['airline']; ?>" <?php if (strtolower($current_page) == "airline-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/airline/statistics/time/<?php print $_GET['airline']; ?>" <?php if (strtolower($current_page) == "airline-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/airline/statistics/route/<?php print $_GET['airline']; ?>" <?php if (strtolower($current_page) == "airline-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/airline/statistics/time/<?php print $_GET['airline']; ?>" <?php if (strtolower($current_page) == "airline-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
\ No newline at end of file

location-geojson.php

Indentation +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"name": "'.$spotter_item['name'].'",';
 			$output .= '"city": "'.$spotter_item['city'].'",';
 			$output .= '"country": "'.$spotter_item['country'].'",';
@@ -37,13 +37,13 @@ 
 			$output .= '"icon": "'.$globalURL.'/images/antenna.png",';
 			$output .= '"type": "'.$spotter_item['type'].'",';
 			$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 	}
 	$output  = substr($output, 0, -1);

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 if (!isset($globalDemo)) {
 	if (isset($_GET['coord'])) 
 	{
-		$coords = explode(',',$_GET['coord']);
+		$coords = explode(',', $_GET['coord']);
 //		$spotter_array = Source::getAllLocationInfobyCoord($coords);
 		$spotter_array = $Source->getAllLocationInfo();
 	} else {
@@ -23,7 +23,7 @@ 
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($spotter_array) && count($spotter_array) > 0)
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -46,7 +46,7 @@ 
 		    $output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 

search-rss.php

Indentation +47 added lines, -47 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);
@@ -102,16 +102,16 @@ 
   
   if (!empty($spotter_array))
   {
-    foreach($spotter_array as $spotter_item)
-    {
+	foreach($spotter_array as $spotter_item)
+	{
 
           
 		  print '<item>';
-		    print '<title>'.$spotter_item['ident'].' '.$spotter_item['airline_name'].' | '.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | '.$spotter_item['departure_airport'].' - '.$spotter_item['arrival_airport'].'</title>';
-		    print '<link>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</link>';
-		    print '<guid isPermaLink="false">http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</guid>';
-		    print '<description>Ident: '.$spotter_item['ident'].' | Registration: '.$spotter_item['registration'].' | Aircraft: '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | Airline: '.$spotter_item['airline_name'].' | Coming From: '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].') | Flying to: '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].') | Flew nearby on: '.date("M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</description>';
-		    print '<pubDate>'.$date.'</pubDate>';
+			print '<title>'.$spotter_item['ident'].' '.$spotter_item['airline_name'].' | '.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | '.$spotter_item['departure_airport'].' - '.$spotter_item['arrival_airport'].'</title>';
+			print '<link>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</link>';
+			print '<guid isPermaLink="false">http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</guid>';
+			print '<description>Ident: '.$spotter_item['ident'].' | Registration: '.$spotter_item['registration'].' | Aircraft: '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | Airline: '.$spotter_item['airline_name'].' | Coming From: '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].') | Flying to: '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].') | Flew nearby on: '.date("M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</description>';
+			print '<pubDate>'.$date.'</pubDate>';
 		  print '</item>';
 		    
 		 }

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];
@@ -72,23 +72,23 @@ 
 
 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, '');
  
 print '<?xml version="1.0" encoding="UTF-8" ?>';
 print '<rss xmlns:flightairmap="http://'.$_SERVER['HTTP_HOST'].''.htmlentities($_SERVER['REQUEST_URI']).'" version="2.0">';
@@ -102,7 +102,7 @@ 
   
   if (!empty($spotter_array))
   {
-    foreach($spotter_array as $spotter_item)
+    foreach ($spotter_array as $spotter_item)
     {
 
           

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];
@@ -70,8 +78,11 @@ 
 
 $date = date("D, d M Y H:i:s T", time());
 
-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);

country-statistics-departure-airport-country.php

Spacing +9 added lines, -9 removed lines

@@ -7,8 +7,8 @@ 
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@ 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country from %s"),$country);
+	$title = sprintf(_("Most Common Departure Airports by Country from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -42,7 +42,7 @@ 
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -51,7 +51,7 @@ 
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByCountry($country);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -64,7 +64,7 @@ 
             	["'._("Country").'", "'._("# of times").'"], ';
 
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -98,7 +98,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_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['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));

airport-sub-menu.php

Spacing +6 added lines, -6 removed lines

@@ -3,9 +3,9 @@ 
 </span>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/airport/<?php print $_GET['airport']; ?>" <?php if (strtolower($current_page) == "airport-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/airport/<?php print $_GET['airport']; ?>" <?php if (strtolower($current_page) == "airport-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "airport-statistics-aircraft" || strtolower($current_page) == "airport-statistics-registration" || strtolower($current_page) == "airport-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "airport-statistics-aircraft" || strtolower($current_page) == "airport-statistics-registration" || strtolower($current_page) == "airport-statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -15,7 +15,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "airport-statistics-airline" || strtolower($current_page) == "airport-statistics-airline-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "airport-statistics-airline" || strtolower($current_page) == "airport-statistics-airline-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -24,7 +24,7 @@ 
 		    </ul>
 		</li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "airport-statistics-departure-airport" || strtolower($current_page) == "airport-statistics-departure-airport-country" || strtolower($current_page) == "airport-statistics-arrival-airport" || strtolower($current_page) == "airport-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "airport-statistics-departure-airport" || strtolower($current_page) == "airport-statistics-departure-airport-country" || strtolower($current_page) == "airport-statistics-arrival-airport" || strtolower($current_page) == "airport-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -34,7 +34,7 @@ 
 			  <li><a href="<?php print $globalURL; ?>/airport/statistics/arrival-airport-country/<?php print $_GET['airport']; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/airport/statistics/route/<?php print $_GET['airport']; ?>" <?php if (strtolower($current_page) == "airport-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/airport/statistics/time/<?php print $_GET['airport']; ?>" <?php if (strtolower($current_page) == "airport-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/airport/statistics/route/<?php print $_GET['airport']; ?>" <?php if (strtolower($current_page) == "airport-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/airport/statistics/time/<?php print $_GET['airport']; ?>" <?php if (strtolower($current_page) == "airport-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
\ No newline at end of file

country-statistics-route.php

Spacing +8 added lines, -8 removed lines

@@ -7,8 +7,8 @@ 
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
@@ -18,16 +18,16 @@ 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from %s"),$country);
+	$title = sprintf(_("Most Common Routes from %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -42,7 +42,7 @@ 
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -51,7 +51,7 @@ 
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes of airports &amp; airlines from <strong>%s</strong>."), $country).'</p>';
 	$route_array = $Spotter->countAllRoutesByCountry($country);
 	if (!empty($route_array))
 	{
@@ -66,7 +66,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['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));

country-statistics-aircraft.php

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['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 

Spacing +7 added lines, -7 removed lines

@@ -9,12 +9,12 @@ 
 $Spotter = new Spotter();
 
 $country = ucwords(str_replace("-", " ", $_GET['country']));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 $spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft from %s"),$country);
+	$title = sprintf(_("Most Common Aircraft from %s"), $country);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -22,9 +22,9 @@ 
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -39,7 +39,7 @@ 
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -48,7 +48,7 @@ 
 	include('country-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 from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $country).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftTypesByCountry($country);
 	if (!empty($aircraft_array))
@@ -62,7 +62,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>';