Inspection of "Add owner and pilot list page" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 7b031c...3082e8 )

by Yannick

created 2017-02-07 16:29 UTC

Status

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,14 +7,14 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+	$title = sprintf(_("Most Common Time of Day from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airline" method="post">';
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 	include('airline-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	$hour_array = $Spotter->countAllHoursByAirline($airline);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
 	print '<div id="chartHour" class="chart" width="100%"></div>
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
         $hour_data = '';
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
 	}

Please login to merge, or discard this patch.

manufacturer-statistics-aircraft.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -8,13 +8,13 @@  discard block
 block discarded – undo
         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 Aircraft from %s"),$manufacturer);
+	$title = sprintf(_("Most Common Aircraft from %s"), $manufacturer);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$all_manufacturers = $Stats->getAllManufacturers();
 	if (empty($all_manufacturers)) $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 {
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 	include('manufacturer-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>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $manufacturer).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftTypesByManufacturer($manufacturer);
 	if (!empty($aircraft_array))
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 		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>';

Please login to merge, or discard this patch.

date-detailed.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -1,20 +1,20 @@  discard block
 block discarded – undo
 <?php
 require_once('require/class.Connection.php');
-require_once('require/class.Spotter.php');;
+require_once('require/class.Spotter.php'); ;
 require_once('require/class.Language.php');
 
-if (!isset($_GET['date'])){
+if (!isset($_GET['date'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Spotter = new Spotter();
 	
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -28,22 +28,22 @@  discard block
 block discarded – undo
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
+	$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
 	$page_url = $globalURL.'/date/'.$date;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($sort != '') 
 	{
-		$spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort);
+		$spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference, $sort);
 	} else {
-		$spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference);
+		$spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference);
 	}
 	
 	
 	if (!empty($spotter_array))
 	{
 		date_default_timezone_set($globalTimezone);
-		$title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+		$title = sprintf(_("Detailed View for flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
 		print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>';
 		print '<br />';
 		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="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
  
 		include('table-output.php');
 		print '<div class="pagination">';

Please login to merge, or discard this patch.

manufacturer-statistics-departure-airport-country.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -8,13 +8,13 @@  discard block
 block discarded – undo
         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 by Country from %s"),$manufacturer);
+	$title = sprintf(_("'Most Common Departure Airports by Country from %s"), $manufacturer);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$all_manufacturers = $Stats->getAllManufacturers();
 	if (empty($all_manufacturers)) $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 {
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 	 include('manufacturer-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 from <strong>%s</strong>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."), $manufacturer).'</p>';
 
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByManufacturer($manufacturer);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
             	["'._("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'].'],';
 	}
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
 		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>';

Please login to merge, or discard this patch.

manufacturer-statistics-time.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -8,14 +8,14 @@  discard block
 block discarded – undo
         die();
 }
 $Spotter = new Spotter();
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
+$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);
+$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 Time of Day from %s"),$manufacturer);
+	$title = sprintf(_("Most Common Time of Day from %s"), $manufacturer);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/manufacturer" method="post">';
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
 	$Stats = new Stats();
 	$all_manufacturers = $Stats->getAllManufacturers();
 	if (empty($all_manufacturers)) $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 {
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
 	include('manufacturer-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $manufacturer).'</p>';
 
 	$hour_array = $Spotter->countAllHoursByManufacturer($manufacturer);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
             	$hour_data = '';
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
 	}

Please login to merge, or discard this patch.

header.php 1 patch

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -8,31 +8,31 @@  discard block
 block discarded – undo
 if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
 else $MapType = $globalMapProvider;
 if (isset($_GET['3d'])) {
-	setcookie('MapFormat','3d');
+	setcookie('MapFormat', '3d');
 } else if (isset($_GET['2d'])) {
-	setcookie('MapFormat','2d');
+	setcookie('MapFormat', '2d');
 }
 
 if (isset($_POST['archive'])) {
-	setcookie('archive','true');
-	setcookie('archive_begin',strtotime($_POST['start_date']));
-	setcookie('archive_end',strtotime($_POST['end_date']));
-	setcookie('archive_speed',$_POST['archivespeed']);
+	setcookie('archive', 'true');
+	setcookie('archive_begin', strtotime($_POST['start_date']));
+	setcookie('archive_end', strtotime($_POST['end_date']));
+	setcookie('archive_speed', $_POST['archivespeed']);
 }
 if (isset($_POST['noarchive'])) {
-	setcookie('archive','false',-1);
-	setcookie('archive_begin','',-1);
-	setcookie('archive_end','',-1);
-	setcookie('archive_speed','',-1);
+	setcookie('archive', 'false', -1);
+	setcookie('archive_begin', '', -1);
+	setcookie('archive_end', '', -1);
+	setcookie('archive_speed', '', -1);
 }
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
-	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+	$allfilters = array_filter(array_keys($_COOKIE), function($key) {
+	    return strpos($key, 'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
-		setcookie($filt,null,-1);
+		setcookie($filt, null, -1);
 	}
 }
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
 ?>
       <div class="search">
       <form action="<?php print $globalURL; ?>/search" method="get">
-		<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
+		<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
 	</form>
 	</div>
   	<div class="social">
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
 	print '</div>';
 }
 
-if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') {
+if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') {
 ?>
     <div class="top-header clear" role="main">
 <?php
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
     </div>
 <?php
 }
-if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
+if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) || (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false))
 {
     ?>
     <div class="top-header clear" role="main">
@@ -494,15 +494,15 @@  discard block
 block discarded – undo
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+    if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+    } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -510,7 +510,7 @@  discard block
 block discarded – undo
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php

Please login to merge, or discard this patch.

install/install-action.php 1 patch

Spacing +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -68,15 +68,15 @@  discard block
 block discarded – undo
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') {
 	$dbroot = $_SESSION['database_root'];
 	$dbrootpass = $_SESSION['database_rootpass'];
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
 	sleep(5);
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 	}
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	if (update_schema::check_version(false) == '0') {
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
 		if ($error != '') {
                         $_SESSION['error'] = $error;
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -96,84 +96,84 @@  discard block
 block discarded – undo
 		    $_SESSION['install'] = 'sources';
 		    $_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
                         $_SESSION['error'] = $error;
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_waypoints();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
 
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_airspace_fam();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
 	$_SESSION['install'] = 'countries';
 	$_SESSION['next'] = 'Populate countries table';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_countries();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 	    $_SESSION['install'] = 'owner';
 	    $_SESSION['next'] = 'Populate owner table with externals data';
 	    unset($_SESSION['owner']);
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	} else {
 	    $_SESSION['install'] = 'sources';
 	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_ModeS();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
 
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_ModeS_flarm();
 		$error .= update_db::update_ModeS_ogn();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
@@ -193,34 +193,34 @@  discard block
 block discarded – undo
 			$_SESSION['install'] = 'routes';
 			$_SESSION['next'] = 'Populate routes table with externals data';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_routes();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_translation();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
 
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
@@ -237,48 +237,48 @@  discard block
 block discarded – undo
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error = update_db::update_owner();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		if (isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 			$error .= update_db::update_notam();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
 		} else {
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
 		}
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 			$_SESSION['install'] = 'owner';
 			$_SESSION['next'] = 'Populate owner table';
 			unset($_SESSION['owner']);
-			$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		} else {
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
-			$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		}
 	}
@@ -316,9 +316,9 @@  discard block
 block discarded – undo
 	    $Source = new Source();
 	    $Source->deleteAllLocation();
 	    foreach ($sources as $src) {
-		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
 	    }
-	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+	    $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
 	    unset($_SESSION['sources']);
 	}
 	/*
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
 		$_SESSION['install'] = 'finish';
 		$_SESSION['next'] = 'finish';
 	}
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
 	include_once('../install/class.create_db.php');
@@ -353,36 +353,36 @@  discard block
 block discarded – undo
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
 	}
 	//$_SESSION['install'] = 'routes';
 	//$_SESSION['next'] = 'Populate routes table with externals data';
 	$_SESSION['install'] = 'finish';
 	$_SESSION['next'] = 'finish';
 
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else {
 	//unset($_SESSION['install']);
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
 	print json_encode($result);
 }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

install/class.settings.php 1 patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 		$Common = new Common();
 		$settings_filename = '../require/settings.php';
 		$content = file_get_contents($settings_filename);
-		$fh = fopen($settings_filename,'w');
+		$fh = fopen($settings_filename, 'w');
 		foreach ($settings as $settingname => $value) {
 			if ($value == 'TRUE' || $value == 'FALSE') {
 				$pattern = '/\R\$'.$settingname." = ".'(TRUE|FALSE)'."/";
@@ -79,21 +79,21 @@  discard block
 block discarded – undo
 				$replace = "\n".'\$'.$settingname." = '".$value."'";
 			}
 			$rep_cnt = 0;
-			$content = preg_replace($pattern,$replace,$content,1,$rep_cnt);
+			$content = preg_replace($pattern, $replace, $content, 1, $rep_cnt);
 			
 			/// If setting was a string and is now an array
 			if ($rep_cnt === 0 && is_array($value)) {
 				$pattern = '/\R\$'.$settingname." = '".'(.*)'."'/";
-				$content = preg_replace($pattern,$replace,$content,1,$rep_cnt);
+				$content = preg_replace($pattern, $replace, $content, 1, $rep_cnt);
 			}
 			
 			// If setting is not in settings.php (for update)
 			if ($rep_cnt === 0) {
-				$content = preg_replace('/\?>/',$replace.";\n?>",$content,1,$rep_cnt);
+				$content = preg_replace('/\?>/', $replace.";\n?>", $content, 1, $rep_cnt);
 			}
 
 		}
-		fwrite($fh,$content);
+		fwrite($fh, $content);
 		fclose($fh);
 	}
 
@@ -105,13 +105,13 @@  discard block
 block discarded – undo
 		$Common = new Common();
 		$settings_filename = '../require/settings.php';
 		$content = file_get_contents($settings_filename);
-		$fh = fopen($settings_filename,'w');
+		$fh = fopen($settings_filename, 'w');
 		foreach ($settings as $settingname) {
 			$pattern = '/\R\$'.$settingname." = /";
 			$replace = '//$'.$settingname." = ";
-			$content = preg_replace($pattern,$replace,$content);
+			$content = preg_replace($pattern, $replace, $content);
 		}
-		fwrite($fh,$content);
+		fwrite($fh, $content);
 		fclose($fh);
 	}
 }

Please login to merge, or discard this patch.

airport-statistics-registration.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,14 +7,14 @@  discard block
 block discarded – undo
         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 Aircraft by Registration to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Aircraft by Registration 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">';
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
 	$airport_names = $Stats->getAllAirportNames();
 	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 	ksort($airport_names);
-	foreach($airport_names as $airport_name)
+	foreach ($airport_names as $airport_name)
 	{
-		if($_GET['airport'] == $airport_name['airport_icao'])
+		if ($_GET['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 {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByAirport($airport);
 	if (!empty($aircraft_array))
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
 		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>';

Please login to merge, or discard this patch.

		@@ -7,14 +7,14 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/airline');
8	8	die();
9	9	}
10		-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
	10	+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
11	11	$Spotter = new Spotter();
12		-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
	12	+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
13	13
14	14
15	15	if (!empty($spotter_array))
16	16	{
17		- $title = sprintf(_("Most Common Time of Day from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	17	+ $title = sprintf(_("Most Common Time of Day from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
18	18	require_once('header.php');
19	19	print '<div class="select-item">';
20	20	print '<form action="'.$globalURL.'/airline" method="post">';
		@@ -23,9 +23,9 @@ discard block
		block discarded – undo
23	23	$Stats = new Stats();
24	24	$airline_names = $Stats->getAllAirlineNames();
25	25	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
26		- foreach($airline_names as $airline_name)
	26	+ foreach ($airline_names as $airline_name)
27	27	{
28		- if($airline == $airline_name['airline_icao'])
	28	+ if ($airline == $airline_name['airline_icao'])
29	29	{
30	30	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
31	31	} else {
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	include('airline-sub-menu.php');
64	64	print '<div class="column">';
65	65	print '<h2>'._("Most Common Time of Day").'</h2>';
66		- print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	66	+ print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
67	67	$hour_array = $Spotter->countAllHoursByAirline($airline);
68	68	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
69	69	print '<div id="chartHour" class="chart" width="100%"></div>
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	var data = google.visualization.arrayToDataTable([
75	75	["'._("Hour").'", "'._("# of Flights").'"], ';
76	76	$hour_data = '';
77		- foreach($hour_array as $hour_item)
	77	+ foreach ($hour_array as $hour_item)
78	78	{
79	79	$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
80	80	}

		@@ -8,13 +8,13 @@ discard block
		block discarded – undo
8	8	die();
9	9	}
10	10	$Spotter = new Spotter();
11		-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
12		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
13		-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
	11	+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
	12	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
	13	+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
14	14
15	15	if (!empty($spotter_array))
16	16	{
17		- $title = sprintf(_("Most Common Aircraft from %s"),$manufacturer);
	17	+ $title = sprintf(_("Most Common Aircraft from %s"), $manufacturer);
18	18
19	19	require_once('header.php');
20	20	print '<div class="select-item">';
		@@ -23,9 +23,9 @@ discard block
		block discarded – undo
23	23	$Stats = new Stats();
24	24	$all_manufacturers = $Stats->getAllManufacturers();
25	25	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
26		- foreach($all_manufacturers as $all_manufacturer)
	26	+ foreach ($all_manufacturers as $all_manufacturer)
27	27	{
28		- if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
	28	+ if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
29	29	{
30	30	print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
31	31	} else {
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	include('manufacturer-sub-menu.php');
45	45	print '<div class="column">';
46	46	print '<h2>'._("Most Common Aircraft").'</h2>';
47		- print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$manufacturer).'</p>';
	47	+ print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $manufacturer).'</p>';
48	48
49	49	$aircraft_array = $Spotter->countAllAircraftTypesByManufacturer($manufacturer);
50	50	if (!empty($aircraft_array))
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	print '</thead>';
60	60	print '<tbody>';
61	61	$i = 1;
62		- foreach($aircraft_array as $aircraft_item)
	62	+ foreach ($aircraft_array as $aircraft_item)
63	63	{
64	64	print '<tr>';
65	65	print '<td><strong>'.$i.'</strong></td>';

		@@ -1,20 +1,20 @@ discard block
		block discarded – undo
1	1	<?php
2	2	require_once('require/class.Connection.php');
3		-require_once('require/class.Spotter.php');;
	3	+require_once('require/class.Spotter.php'); ;
4	4	require_once('require/class.Language.php');
5	5
6		-if (!isset($_GET['date'])){
	6	+if (!isset($_GET['date'])) {
7	7	header('Location: '.$globalURL.'');
8	8	} else {
9	9	$Spotter = new Spotter();
10	10
11	11	//calculuation for the pagination
12		- if(!isset($_GET['limit']))
	12	+ if (!isset($_GET['limit']))
13	13	{
14	14	$limit_start = 0;
15	15	$limit_end = 25;
16	16	$absolute_difference = 25;
17		- } else {
	17	+ } else {
18	18	$limit_explode = explode(",", $_GET['limit']);
19	19	$limit_start = $limit_explode[0];
20	20	$limit_end = $limit_explode[1];
		@@ -28,22 +28,22 @@ discard block
		block discarded – undo
28	28	$limit_previous_1 = $limit_start - $absolute_difference;
29	29	$limit_previous_2 = $limit_end - $absolute_difference;
30	30
31		- $date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
	31	+ $date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
32	32	$page_url = $globalURL.'/date/'.$date;
33	33
34		- $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	34	+ $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
35	35	if ($sort != '')
36	36	{
37		- $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort);
	37	+ $spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference, $sort);
38	38	} else {
39		- $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference);
	39	+ $spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference);
40	40	}
41	41
42	42
43	43	if (!empty($spotter_array))
44	44	{
45	45	date_default_timezone_set($globalTimezone);
46		- $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
	46	+ $title = sprintf(_("Detailed View for flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
47	47
48	48	require_once('header.php');
49	49	print '<div class="select-item">';
		@@ -61,12 +61,12 @@ discard block
		block discarded – undo
61	61	print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>';
62	62	print '<br />';
63	63	print '<div class="info column">';
64		- print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
	64	+ print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
65	65	print '</div>';
66	66
67	67	include('date-sub-menu.php');
68	68	print '<div class="table column">';
69		- print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
	69	+ print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
70	70
71	71	include('table-output.php');
72	72	print '<div class="pagination">';

		@@ -8,14 +8,14 @@ discard block
		block discarded – undo
8	8	die();
9	9	}
10	10	$Spotter = new Spotter();
11		-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
	11	+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
12	12
13		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
14		-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
	13	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
	14	+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
15	15
16	16	if (!empty($spotter_array))
17	17	{
18		- $title = sprintf(_("Most Common Time of Day from %s"),$manufacturer);
	18	+ $title = sprintf(_("Most Common Time of Day from %s"), $manufacturer);
19	19	require_once('header.php');
20	20	print '<div class="select-item">';
21	21	print '<form action="'.$globalURL.'/manufacturer" method="post">';
		@@ -23,9 +23,9 @@ discard block
		block discarded – undo
23	23	$Stats = new Stats();
24	24	$all_manufacturers = $Stats->getAllManufacturers();
25	25	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
26		- foreach($all_manufacturers as $all_manufacturer)
	26	+ foreach ($all_manufacturers as $all_manufacturer)
27	27	{
28		- if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
	28	+ if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
29	29	{
30	30	print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
31	31	} else {
		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	include('manufacturer-sub-menu.php');
45	45	print '<div class="column">';
46	46	print '<h2>'._("Most Common Time of Day").'</h2>';
47		- print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$manufacturer).'</p>';
	47	+ print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $manufacturer).'</p>';
48	48
49	49	$hour_array = $Spotter->countAllHoursByManufacturer($manufacturer);
50	50	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	var data = google.visualization.arrayToDataTable([
57	57	["'._("Hour").'", "'._("# of Flights").'"], ';
58	58	$hour_data = '';
59		- foreach($hour_array as $hour_item)
	59	+ foreach ($hour_array as $hour_item)
60	60	{
61	61	$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
62	62	}

		@@ -8,31 +8,31 @@ discard block
		block discarded – undo
8	8	if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
9	9	else $MapType = $globalMapProvider;
10	10	if (isset($_GET['3d'])) {
11		- setcookie('MapFormat','3d');
	11	+ setcookie('MapFormat', '3d');
12	12	} else if (isset($_GET['2d'])) {
13		- setcookie('MapFormat','2d');
	13	+ setcookie('MapFormat', '2d');
14	14	}
15	15
16	16	if (isset($_POST['archive'])) {
17		- setcookie('archive','true');
18		- setcookie('archive_begin',strtotime($_POST['start_date']));
19		- setcookie('archive_end',strtotime($_POST['end_date']));
20		- setcookie('archive_speed',$_POST['archivespeed']);
	17	+ setcookie('archive', 'true');
	18	+ setcookie('archive_begin', strtotime($_POST['start_date']));
	19	+ setcookie('archive_end', strtotime($_POST['end_date']));
	20	+ setcookie('archive_speed', $_POST['archivespeed']);
21	21	}
22	22	if (isset($_POST['noarchive'])) {
23		- setcookie('archive','false',-1);
24		- setcookie('archive_begin','',-1);
25		- setcookie('archive_end','',-1);
26		- setcookie('archive_speed','',-1);
	23	+ setcookie('archive', 'false', -1);
	24	+ setcookie('archive_begin', '', -1);
	25	+ setcookie('archive_end', '', -1);
	26	+ setcookie('archive_speed', '', -1);
27	27	}
28	28	// When button "Remove all filters" is clicked
29	29	if (isset($_POST['removefilters'])) {
30		- $allfilters = array_filter(array_keys($_COOKIE),function($key) {
31		- return strpos($key,'filter_') === 0;
	30	+ $allfilters = array_filter(array_keys($_COOKIE), function($key) {
	31	+ return strpos($key, 'filter_') === 0;
32	32	});
33	33	foreach ($allfilters as $filt) {
34	34	unset($_COOKIE[$filt]);
35		- setcookie($filt,null,-1);
	35	+ setcookie($filt, null, -1);
36	36	}
37	37	}
38	38
		@@ -222,7 +222,7 @@ discard block
		block discarded – undo
222	222	<script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
223	223	<script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
224	224	<script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
225		-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
	225	+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
226	226	<?php
227	227	if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' \|\| $MapType == 'Google-Satellite' \|\| $MapType == 'Google-Hybrid' \|\| $MapType == 'Google-Terrain')) {
228	228	?>
		@@ -276,7 +276,7 @@ discard block
		block discarded – undo
276	276	<script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
277	277	<script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
278	278	<script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
279		-<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
	279	+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
280	280	<?php
281	281	if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' \|\| $MapType == 'Google-Satellite' \|\| $MapType == 'Google-Hybrid' \|\| $MapType == 'Google-Terrain')) {
282	282	?>
		@@ -450,7 +450,7 @@ discard block
		block discarded – undo
450	450	?>
451	451	<div class="search">
452	452	<form action="<?php print $globalURL; ?>/search" method="get">
453		- <input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
	453	+ <input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
454	454	</form>
455	455	</div>
456	456	<div class="social">
		@@ -468,7 +468,7 @@ discard block
		block discarded – undo
468	468	print '</div>';
469	469	}
470	470
471		-if (strtolower($current_page) =='ident-detailed' \|\| strtolower($current_page) == 'flightid-overview') {
	471	+if (strtolower($current_page) == 'ident-detailed' \|\| strtolower($current_page) == 'flightid-overview') {
472	472	?>
473	473	<div class="top-header clear" role="main">
474	474	<?php
		@@ -481,7 +481,7 @@ discard block
		block discarded – undo
481	481	</div>
482	482	<?php
483	483	}
484		-if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) \|\| (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
	484	+if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) \|\| (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false))
485	485	{
486	486	?>
487	487	<div class="top-header clear" role="main">
		@@ -494,15 +494,15 @@ discard block
		block discarded – undo
494	494	var zoom = 13;
495	495	//create the map
496	496	<?php
497		- if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
	497	+ if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) {
498	498	?>
499	499	map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
500	500	<?php
501		- } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
	501	+ } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) {
502	502	?>
503	503	map = L.map('map', { zoomControl:true });
504	504	<?php
505		- } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
	505	+ } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
506	506	?>
507	507	map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
508	508	var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
		@@ -510,7 +510,7 @@ discard block
		block discarded – undo
510	510	var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
511	511	var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
512	512	<?php
513		- } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
	513	+ } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
514	514	?>
515	515	map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
516	516	<?php

		@@ -68,15 +68,15 @@ discard block
		block discarded – undo
68	68	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') {
69	69	$dbroot = $_SESSION['database_root'];
70	70	$dbrootpass = $_SESSION['database_rootpass'];
71		- $error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
	71	+ $error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
72	72	sleep(5);
73	73	if ($error != '') {
74	74	$_SESSION['error'] = $error;
75	75	}
76		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
	76	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
77	77	$_SESSION['install'] = 'database_import';
78	78	$_SESSION['next'] = 'Create and import tables';
79		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	79	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
80	80	print json_encode($result);
81	81	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
82	82	if (update_schema::check_version(false) == '0') {
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	if ($error != '') {
89	89	$_SESSION['error'] = $error;
90	90	}
91		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
	91	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
92	92	if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
93	93	$_SESSION['install'] = 'populate';
94	94	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
		@@ -96,84 +96,84 @@ discard block
		block discarded – undo
96	96	$_SESSION['install'] = 'sources';
97	97	$_SESSION['next'] = 'Insert data in source table';
98	98	}
99		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	99	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
100	100	print json_encode($result);
101	101	} else {
102	102	$error .= update_schema::check_version(true);
103	103	if ($error != '') {
104	104	$_SESSION['error'] = $error;
105	105	}
106		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
	106	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
107	107	$_SESSION['install'] = 'sources';
108	108	$_SESSION['next'] = 'Insert data in source table';
109		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	109	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
110	110	print json_encode($result);
111	111	}
112	112	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
113	113	include_once('class.update_db.php');
114	114	$error .= update_db::update_waypoints();
115		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
	115	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
116	116
117	117	$_SESSION['install'] = 'airspace';
118	118	$_SESSION['next'] = 'Populate airspace table';
119		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	119	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
120	120	print json_encode($result);
121	121	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
122	122	include_once('class.update_db.php');
123	123	$error .= update_db::update_airspace_fam();
124		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
	124	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
125	125	$_SESSION['install'] = 'countries';
126	126	$_SESSION['next'] = 'Populate countries table';
127		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	127	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
128	128	print json_encode($result);
129	129	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
130	130	include_once('class.update_db.php');
131	131	$error .= update_db::update_countries();
132		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
	132	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
133	133	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
134	134	$_SESSION['install'] = 'notam';
135	135	$_SESSION['next'] = 'Populate NOTAM table with externals data';
136		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	136	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
137	137	print json_encode($result);
138	138	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
139	139	$_SESSION['install'] = 'owner';
140	140	$_SESSION['next'] = 'Populate owner table with externals data';
141	141	unset($_SESSION['owner']);
142		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	142	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
143	143	print json_encode($result);
144	144	} else {
145	145	$_SESSION['install'] = 'sources';
146	146	$_SESSION['next'] = 'Insert data in source table';
147		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	147	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
148	148	print json_encode($result);
149	149	}
150	150	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
151	151	if (!is_writable('tmp')) {
152	152	$error = 'The directory <i>install/tmp</i> must be writable.';
153		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	153	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
154	154	print json_encode($result);
155	155	} else {
156	156	include_once('class.update_db.php');
157	157	$globalDebug = FALSE;
158	158	$error .= update_db::update_ModeS();
159		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
	159	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
160	160
161	161	$_SESSION['install'] = 'populate_flarm';
162	162	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
163		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	163	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
164	164	print json_encode($result);
165	165	}
166	166	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
167	167	if (!is_writable('tmp')) {
168	168	$error = 'The directory <i>install/tmp</i> must be writable.';
169		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	169	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
170	170	print json_encode($result);
171	171	} else {
172	172	include_once('class.update_db.php');
173	173	$globalDebug = FALSE;
174	174	$error .= update_db::update_ModeS_flarm();
175	175	$error .= update_db::update_ModeS_ogn();
176		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
	176	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
177	177
178	178	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
179	179	$_SESSION['install'] = 'vatsim';
		@@ -193,34 +193,34 @@ discard block
		block discarded – undo
193	193	$_SESSION['install'] = 'routes';
194	194	$_SESSION['next'] = 'Populate routes table with externals data';
195	195	}
196		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	196	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
197	197	print json_encode($result);
198	198	}
199	199	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
200	200	if (!is_writable('tmp')) {
201	201	$error = 'The directory <i>install/tmp</i> must be writable.';
202		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	202	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
203	203	print json_encode($result);
204	204	} else {
205	205	include_once('class.update_db.php');
206	206	$globalDebug = FALSE;
207	207	$error .= update_db::update_routes();
208		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
	208	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
209	209	$_SESSION['install'] = 'translation';
210	210	$_SESSION['next'] = 'Populate translation table with externals data';
211		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	211	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
212	212	print json_encode($result);
213	213	}
214	214	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
215	215	if (!is_writable('tmp')) {
216	216	$error = 'The directory <i>install/tmp</i> must be writable.';
217		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	217	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
218	218	print json_encode($result);
219	219	} else {
220	220	include_once('class.update_db.php');
221	221	$globalDebug = FALSE;
222	222	$error .= update_db::update_translation();
223		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
	223	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
224	224
225	225	if ($_SESSION['waypoints'] == 1) {
226	226	$_SESSION['install'] = 'waypoints';
		@@ -237,48 +237,48 @@ discard block
		block discarded – undo
237	237	$_SESSION['install'] = 'sources';
238	238	$_SESSION['next'] = 'Insert data in source table';
239	239	}
240		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	240	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
241	241	print json_encode($result);
242	242	}
243	243	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
244	244	if (!is_writable('tmp')) {
245	245	$error = 'The directory <i>install/tmp</i> must be writable.';
246		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	246	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
247	247	print json_encode($result);
248	248	} else {
249	249	include_once('class.update_db.php');
250	250	$globalDebug = FALSE;
251	251	$error = update_db::update_owner();
252		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
	252	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
253	253	$_SESSION['install'] = 'sources';
254	254	$_SESSION['next'] = 'Insert data in source table';
255		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	255	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
256	256	print json_encode($result);
257	257	}
258	258	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
259	259	if (!is_writable('tmp')) {
260	260	$error = 'The directory <i>install/tmp</i> must be writable.';
261		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	261	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
262	262	print json_encode($result);
263	263	} else {
264	264	include_once('class.update_db.php');
265	265	$globalDebug = FALSE;
266	266	if (isset($globalNOTAMSource) && $globalNOTAMSource != '') {
267	267	$error .= update_db::update_notam();
268		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
	268	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
269	269	} else {
270		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
	270	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
271	271	}
272	272	if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
273	273	$_SESSION['install'] = 'owner';
274	274	$_SESSION['next'] = 'Populate owner table';
275	275	unset($_SESSION['owner']);
276		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	276	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
277	277	print json_encode($result);
278	278	} else {
279	279	$_SESSION['install'] = 'sources';
280	280	$_SESSION['next'] = 'Insert data in source table';
281		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	281	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
282	282	print json_encode($result);
283	283	}
284	284	}
		@@ -316,9 +316,9 @@ discard block
		block discarded – undo
316	316	$Source = new Source();
317	317	$Source->deleteAllLocation();
318	318	foreach ($sources as $src) {
319		- if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	319	+ if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
320	320	}
321		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
	321	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
322	322	unset($_SESSION['sources']);
323	323	}
324	324	/*
		@@ -343,7 +343,7 @@ discard block
		block discarded – undo
343	343	$_SESSION['install'] = 'finish';
344	344	$_SESSION['next'] = 'finish';
345	345	}
346		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	346	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
347	347	print json_encode($result);
348	348	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
349	349	include_once('../install/class.create_db.php');
		@@ -353,36 +353,36 @@ discard block
		block discarded – undo
353	353	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
354	354	if (file_exists('tmp/ivae_feb2013.zip')) {
355	355	$error .= update_db::update_IVAO();
356		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	356	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
357	357	} else {
358	358	$error .= update_db::update_vatsim();
359		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	359	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
360	360	}
361	361	} elseif (isset($globalVATSIM) && $globalVATSIM) {
362	362	$error .= update_db::update_vatsim();
363		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
	363	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
364	364	} elseif (isset($globalIVAO) && $globalIVAO) {
365	365	if (file_exists('tmp/ivae_feb2013.zip')) {
366	366	$error .= update_db::update_IVAO();
367		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
	367	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
368	368	} else {
369	369	$error .= update_db::update_vatsim();
370		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
	370	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
371	371	}
372	372	} elseif (isset($globalphpVMS) && $globalphpVMS) {
373		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
	373	+ $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
374	374	}
375	375	//$_SESSION['install'] = 'routes';
376	376	//$_SESSION['next'] = 'Populate routes table with externals data';
377	377	$_SESSION['install'] = 'finish';
378	378	$_SESSION['next'] = 'finish';
379	379
380		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	380	+ $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
381	381	print json_encode($result);
382	382	} else {
383	383	//unset($_SESSION['install']);
384	384	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
385		- $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
	385	+ $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
386	386	print json_encode($result);
387	387	}
388	388	?>
389	389	\ No newline at end of file

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12	$Common = new Common();
13	13	$settings_filename = '../require/settings.php';
14	14	$content = file_get_contents($settings_filename);
15		- $fh = fopen($settings_filename,'w');
	15	+ $fh = fopen($settings_filename, 'w');
16	16	foreach ($settings as $settingname => $value) {
17	17	if ($value == 'TRUE' \|\| $value == 'FALSE') {
18	18	$pattern = '/\R\$'.$settingname." = ".'(TRUE\|FALSE)'."/";
		@@ -79,21 +79,21 @@ discard block
		block discarded – undo
79	79	$replace = "\n".'\$'.$settingname." = '".$value."'";
80	80	}
81	81	$rep_cnt = 0;
82		- $content = preg_replace($pattern,$replace,$content,1,$rep_cnt);
	82	+ $content = preg_replace($pattern, $replace, $content, 1, $rep_cnt);
83	83
84	84	/// If setting was a string and is now an array
85	85	if ($rep_cnt === 0 && is_array($value)) {
86	86	$pattern = '/\R\$'.$settingname." = '".'(.*)'."'/";
87		- $content = preg_replace($pattern,$replace,$content,1,$rep_cnt);
	87	+ $content = preg_replace($pattern, $replace, $content, 1, $rep_cnt);
88	88	}
89	89
90	90	// If setting is not in settings.php (for update)
91	91	if ($rep_cnt === 0) {
92		- $content = preg_replace('/\?>/',$replace.";\n?>",$content,1,$rep_cnt);
	92	+ $content = preg_replace('/\?>/', $replace.";\n?>", $content, 1, $rep_cnt);
93	93	}
94	94
95	95	}
96		- fwrite($fh,$content);
	96	+ fwrite($fh, $content);
97	97	fclose($fh);
98	98	}
99	99
		@@ -105,13 +105,13 @@ discard block
		block discarded – undo
105	105	$Common = new Common();
106	106	$settings_filename = '../require/settings.php';
107	107	$content = file_get_contents($settings_filename);
108		- $fh = fopen($settings_filename,'w');
	108	+ $fh = fopen($settings_filename, 'w');
109	109	foreach ($settings as $settingname) {
110	110	$pattern = '/\R\$'.$settingname." = /";
111	111	$replace = '//$'.$settingname." = ";
112		- $content = preg_replace($pattern,$replace,$content);
	112	+ $content = preg_replace($pattern, $replace, $content);
113	113	}
114		- fwrite($fh,$content);
	114	+ fwrite($fh, $content);
115	115	fclose($fh);
116	116	}
117	117	}

		@@ -7,14 +7,14 @@ discard block
		block discarded – undo
7	7	header('Location: '.$globalURL.'/airport');
8	8	die();
9	9	}
10		-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
	10	+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
11	11	$Spotter = new Spotter();
12		-$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
	12	+$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", "");
13	13	$airport_array = $Spotter->getAllAirportInfo($airport);
14	14
15	15	if (!empty($airport_array))
16	16	{
17		- $title = sprintf(_("Most Common Aircraft by Registration to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
	17	+ $title = sprintf(_("Most Common Aircraft by Registration to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
18	18
19	19	require_once('header.php');
20	20	print '<div class="select-item">';
		@@ -25,9 +25,9 @@ discard block
		block discarded – undo
25	25	$airport_names = $Stats->getAllAirportNames();
26	26	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
27	27	ksort($airport_names);
28		- foreach($airport_names as $airport_name)
	28	+ foreach ($airport_names as $airport_name)
29	29	{
30		- if($_GET['airport'] == $airport_name['airport_icao'])
	30	+ if ($_GET['airport'] == $airport_name['airport_icao'])
31	31	{
32	32	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>';
33	33	} else {
		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	include('airport-sub-menu.php');
59	59	print '<div class="column">';
60	60	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
61		- print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
	61	+ print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
62	62
63	63	$aircraft_array = $Spotter->countAllAircraftRegistrationByAirport($airport);
64	64	if (!empty($aircraft_array))
		@@ -75,7 +75,7 @@ discard block
		block discarded – undo
75	75	print '</thead>';
76	76	print '<tbody>';
77	77	$i = 1;
78		- foreach($aircraft_array as $aircraft_item)
	78	+ foreach ($aircraft_array as $aircraft_item)
79	79	{
80	80	print '<tr>';
81	81	print '<td><strong>'.$i.'</strong></td>';

Ysurac / FlightAirMap

Push — master ( 7b031c...3082e8 )

Status

Category

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

Spacing +46 added lines, -46 removed lines patch added patch discarded remove patch

Spacing +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch