Inspection of "Display error" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a3214e...3969e1 )

by Yannick

created 2017-07-07 14:50 UTC

Status

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	foreach($airport_names as $airport_name)
 	{

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 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 Departure Airports by Country to %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Departure Airports by Country to %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -24,9 +24,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 {
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 	include('airport-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 to <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 all departure airports by Country of origin of flights to <strong>%s, %s, (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByAirport($airport);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>'; 
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -114,7 +114,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.

airport-statistics-departure-airport.php 3 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	foreach($airport_names as $airport_name)
 	{

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 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 Departure Airports to %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Departure Airports to %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -24,9 +24,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($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports of flights to <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 all departure airports of flights to <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 	$airport_airport_array = $Spotter->countAllDepartureAirportsByAirport($airport);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 	print '<script>';
 	print 'var series = [';
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 	}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airport-statistics-airline-country.php 3 patches

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	foreach($airport_names as $airport_name)
 	{

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 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 Airlines by Country to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Airlines by Country 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">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -24,9 +24,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($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin 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 airlines by Country of origin of flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlineCountriesByAirport($airport);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country_iso3'].'",'.$airline_item['airline_country_count'].'],';
 	}
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airport-statistics-airline.php 3 patches

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	foreach($airport_names as $airport_name)
 	{

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 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 Airlines to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Airlines 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">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -24,9 +24,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($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -57,14 +57,14 @@  discard block
 block discarded – undo
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines 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 airlines of flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlinesByAirport($airport);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3pie.min.js"></script>';
 	print '<div id="chart" class="chart" width="100%"></div><script>';
 	$airline_data = '';
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 	}
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airport-statistics-arrival-airport.php 3 patches

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	foreach($airport_names as $airport_name)
 	{

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 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 Arrival Airports from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Arrival Airports 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">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -24,9 +24,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($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights 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 all arrival airports of flights from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByAirport($airport);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
 	print '<script>';
 	print 'var series = [';
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
 	}
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Please login to merge, or discard this patch.

airport-statistics-arrival-airport-country.php 3 patches

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	foreach($airport_names as $airport_name)
 	{

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +8 added lines, -8 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 Arrival Airports by Country from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Arrival Airports by Country 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">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -24,9 +24,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($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights 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 all arrival airports by Country of origin of flights from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByAirport($airport);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -113,7 +113,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.

airport-statistics-time.php 3 patches

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -23,7 +23,9 @@
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airport_names = $Stats->getAllAirportNames();
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+	if (empty($airport_names)) {
+		$airport_names = $Spotter->getAllAirportNames();
+	}
 	ksort($airport_names);
 	foreach($airport_names as $airport_name)
 	{

Please login to merge, or discard this patch.

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 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 Time of Day to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Time of Day 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($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 	include('airport-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 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 time of day to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 
 	$hour_array = $Spotter->countAllHoursByAirport($airport);
 	print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
 	$hour_data = '';
 	$hour_cnt = '';
 	$last = 0;
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
-		while($last != $hour_item['hour_name']) {
+		while ($last != $hour_item['hour_name']) {
 			$hour_data .= '"'.$last.':00",';
 			$hour_cnt .= '0,';
 			$last++;
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
 		$hour_cnt .= $hour_item['hour_count'].',';
 	}
 	$hour_data = "[".substr($hour_data, 0, -1)."]";
-	$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
+	$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
 	print 'c3.generate({
 	    bindto: "#chartHour",
 	    data: {
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($hour_array as $hour_item)
+		foreach ($hour_array as $hour_item)
 		{
 			print '<tr>';
 			print '<td>'.$hour_item['hour_name'].':00</td>';

Please login to merge, or discard this patch.

aircraft.php 2 patches

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

@@ -19,10 +19,10 @@  discard block
 block discarded – undo
 	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
 	$previous = null;
 	print '<div class="alphabet-legend">';
-	foreach($aircraft_types as $value) {
+	foreach ($aircraft_types as $value) {
 		//$firstLetter = substr($value['aircraft_name'], 0, 1);
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
-		if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
+		if ($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 		{
 			if ($previous !== null) print ' | ';
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -31,12 +31,12 @@  discard block
 block discarded – undo
 	}
 	print '</div>';
 	$previous = null;
-	foreach($aircraft_types as $value) {
+	foreach ($aircraft_types as $value) {
 		//$firstLetter = substr($value['aircraft_name'], 0, 1);
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
 		if ($firstLetter != "")
 		{
-			if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
+			if ($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 			{
 				if ($previous !== null) print '</div>';
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

Please login to merge, or discard this patch.

Braces +15 added lines, -5 removed lines patch added patch discarded remove patch

@@ -16,7 +16,9 @@  discard block
 block discarded – undo
 	print '<h1>'._("Aircrafts Types").'</h1>';
 
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	$previous = null;
 	print '<div class="alphabet-legend">';
 	foreach($aircraft_types as $value) {
@@ -24,10 +26,14 @@  discard block
 block discarded – undo
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
 		if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 		{
-			if ($previous !== null) print ' | ';
+			if ($previous !== null) {
+				print ' | ';
+			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
-		if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
+		if ($firstLetter != '(' && $firstLetter != ')') {
+			$previous = $firstLetter;
+		}
 	}
 	print '</div>';
 	$previous = null;
@@ -38,10 +44,14 @@  discard block
 block discarded – undo
 		{
 			if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
 			{
-				if ($previous !== null) print '</div>';
+				if ($previous !== null) {
+					print '</div>';
+				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
 			}
-			if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
+			if ($firstLetter != '(' && $firstLetter != ')') {
+				$previous = $firstLetter;
+			}
 			print '<div class="alphabet-item">';
 			print '<a href="'.$globalURL.'/aircraft/'.$value['aircraft_icao'].'">';
 			if ($value['aircraft_name'] == '') {

Please login to merge, or discard this patch.

require/class.Accident.php 3 patches

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -23,12 +23,12 @@
 block discarded – undo
 	}
 	
 	/**
-	* Get Accidents data from DB
-	* @param String $limit Limit
-	* @param String $type Set type accident or incident
-	* @param String $date get data for a date
-	* @return Array Return Accidents data in array
-	*/
+	 * Get Accidents data from DB
+	 * @param String $limit Limit
+	 * @param String $type Set type accident or incident
+	 * @param String $date get data for a date
+	 * @return Array Return Accidents data in array
+	 */
 	public function getAccidentData($limit = '',$type = '',$date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);

Please login to merge, or discard this patch.

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

@@ -29,20 +29,20 @@  discard block
 block discarded – undo
 	* @param String $date get data for a date
 	* @return Array Return Accidents data in array
 	*/
-	public function getAccidentData($limit = '',$type = '',$date = '') {
+	public function getAccidentData($limit = '', $type = '', $date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 		$Translation = new Translation($this->db);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		date_default_timezone_set('UTC');
 		$result = array();
 		$limit_query = '';
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -51,29 +51,29 @@  discard block
 block discarded – undo
 
 		if ($type != '') {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-					$query_values = array(':type' => $type,':date' => $date);
-				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/",$date)) {
+					$query_values = array(':type' => $type, ':date' => $date);
+				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date BETWEEN :dated AND :datef GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-					$query_values = array(':type' => $type,':dated' => $date.'-01', ':datef' => $date.'-31');
-				} elseif (preg_match("/^[0-9]{4}$/",$date)) {
+					$query_values = array(':type' => $type, ':dated' => $date.'-01', ':datef' => $date.'-31');
+				} elseif (preg_match("/^[0-9]{4}$/", $date)) {
 					if ($globalDBdriver == 'mysql') {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND YEAR(date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					} else {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND EXTRACT(YEAR FROM date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					}
-					$query_values = array(':type' => $type,':date' => $date);
+					$query_values = array(':type' => $type, ':date' => $date);
 				} else {
 					$date = $date.'%';
 					if ($globalDBdriver == 'mysql') {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND DATE_FORMAT(date,'%Y-%m-%d') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-						$query_values = array(':type' => $type,':date' => $date);
+						$query_values = array(':type' => $type, ':date' => $date);
 					} else {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 						//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-						$query_values = array(':type' => $type,':date' => $date);
+						$query_values = array(':type' => $type, ':date' => $date);
 					}
 				}
 			} else {
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
 			}
 		} else {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 				} else {
@@ -102,19 +102,19 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 		}
 		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//print_r($row);
 			//echo $row['flightaware_id'];
-			if (preg_match('/^[\w\-]+$/',$row['registration'])) {
+			if (preg_match('/^[\w\-]+$/', $row['registration'])) {
 				$data = array();
 				if ($row['registration'] != '') {
 					$image_array = $Image->getSpotterImage($row['registration']);
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+					else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 					if (!empty($aircraft_info)) {
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
 						$data['aircraft_name'] = $aircraft_info[0]['type'];
 						$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
 					} else {
-						$data = array_merge($data,array('aircraft_type' => 'NA'));
+						$data = array_merge($data, array('aircraft_type' => 'NA'));
 					}
 					$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
 					if (!empty($owner_data)) {
@@ -130,18 +130,18 @@  discard block
 block discarded – undo
 						$data['aircraft_base'] = $owner_data['base'];
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 					}
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 				if ($row['registration'] == '') $row['registration'] = 'NA';
 				if ($row['ident'] == '') $row['ident'] = 'NA';
-				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
+				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
 				if (isset($identicao[0])) {
-					if (substr($row['ident'],0,2) == 'AF') {
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+					if (substr($row['ident'], 0, 2) == 'AF') {
+						if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+						else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+					$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 				} else $icao = $row['ident'];
-				$icao = $Translation->checkTranslation($icao,false);
+				$icao = $Translation->checkTranslation($icao, false);
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
 					//echo 'Check airline info... for '.$row['airline_name'].' ';
@@ -150,11 +150,11 @@  discard block
 block discarded – undo
 					if (!empty($airline_info)) {
 						//echo 'data found !'."\n";
 						//print_r($airline_info);
-						$data = array_merge($data,$airline_info);
+						$data = array_merge($data, $airline_info);
 					} 
 					//else echo 'No data...'."\n";
 				}
-				$data = array_merge($row,$data);
+				$data = array_merge($row, $data);
 				if ($data['ident'] == null) $data['ident'] = $icao;
 				if ($data['title'] == null) {
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 		}
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 		}
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -225,15 +225,15 @@  discard block
 block discarded – undo
 		if ($globalDebug) echo 'Import '.$file."\n";
 		$result = array();
 		if (file_exists($file)) {
-			if (($handle = fopen($file,'r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
+			if (($handle = fopen($file, 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
 					if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
-						$result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam');
+						$result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam');
 					}
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
+			if (!empty($result)) $this->add($result, true);
 			elseif ($globalDebug) echo 'Nothing to import';
 		}
 	}
@@ -249,8 +249,8 @@  discard block
 block discarded – undo
 		$all_md5_new = array();
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
 			if ($this->check_accidents_nb() > 0) {
-				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-					while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+					while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 						if (isset($data[1])) {
 							$year = $data[0];
 							$all_md5[$year] = $data[1];
@@ -260,10 +260,10 @@  discard block
 block discarded – undo
 				}
 			}
 		}
-		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
+		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
-			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 					if (isset($data[1])) {
 						$year = $data[0];
 						$all_md5_new[$year] = $data[1];
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
 				fclose($handle);
 			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
 		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
-		$result = $Common->arr_diff($all_md5_new,$all_md5);
+		$result = $Common->arr_diff($all_md5_new, $all_md5);
 		if (empty($result) && $globalDebug) echo 'Nothing to update';
 		foreach ($result as $file => $md5) {
-			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
+			$Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
 			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
 			elseif ($globalDebug) echo 'Download '.$file.' failed';
 		}
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
 	* Add data to DB
 	* @param Array $crash An array with accidents/incidents data
 	*/
-	public function add($crash,$new = false) {
+	public function add($crash, $new = false) {
 		global $globalTransaction, $globalDebug;
 		require_once('class.Connection.php');
 		require_once('class.Image.php');
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
 		if ($globalTransaction) $Connection->db->beginTransaction();
-		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
+		$initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
 		$query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)';
@@ -314,15 +314,15 @@  discard block
 block discarded – undo
 				$cr = array_map(function($value) {
 					return $value === "" ? NULL : $value;
 				}, $cr);
-				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
-					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
+				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
+					if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					$query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
 					if ($result_check['nb'] == 0) {
-						$query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']);
+						$query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']);
 						$sth->execute($query_values);
-						if ($cr['date'] > time()-(30*86400)) {
+						if ($cr['date'] > time() - (30*86400)) {
 							if (empty($Image->getSpotterImage($cr['registration']))) {
 								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
 								$Image->addSpotterImage($cr['registration']);
@@ -331,16 +331,16 @@  discard block
 block discarded – undo
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
 						}
 						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
-						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
+						$Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
 					}
 				}
-				if ($globalTransaction && $j % 1000 == 0) {
+				if ($globalTransaction && $j%1000 == 0) {
 					$Connection->db->commit();
 					$Connection->db->beginTransaction();
 				}
 			}
 			if ($globalTransaction) $Connection->db->commit();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack();
 			echo $e->getMessage();
 		}
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}

Please login to merge, or discard this patch.

Braces +84 added lines, -30 removed lines patch added patch discarded remove patch

@@ -113,8 +113,11 @@  discard block
 block discarded – undo
 				$data = array();
 				if ($row['registration'] != '') {
 					$image_array = $Image->getSpotterImage($row['registration']);
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					if (count($image_array) > 0) {
+						$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+					} else {
+						$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					}
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 					if (!empty($aircraft_info)) {
@@ -130,17 +133,30 @@  discard block
 block discarded – undo
 						$data['aircraft_base'] = $owner_data['base'];
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 					}
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-				if ($row['registration'] == '') $row['registration'] = 'NA';
-				if ($row['ident'] == '') $row['ident'] = 'NA';
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+				if ($row['registration'] == '') {
+					$row['registration'] = 'NA';
+				}
+				if ($row['ident'] == '') {
+					$row['ident'] = 'NA';
+				}
 				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
 				if (isset($identicao[0])) {
 					if (substr($row['ident'],0,2) == 'AF') {
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+							$icao = $row['ident'];
+						} else {
+							$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+						}
+					} else {
+						$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					}
 					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-				} else $icao = $row['ident'];
+				} else {
+					$icao = $row['ident'];
+				}
 				$icao = $Translation->checkTranslation($icao,false);
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
@@ -155,10 +171,14 @@  discard block
 block discarded – undo
 					//else echo 'No data...'."\n";
 				}
 				$data = array_merge($row,$data);
-				if ($data['ident'] == null) $data['ident'] = $icao;
+				if ($data['ident'] == null) {
+					$data['ident'] = $icao;
+				}
 				if ($data['title'] == null) {
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
-				} else $data['message'] = strtolower($data['title']);
+				} else {
+					$data['message'] = strtolower($data['title']);
+				}
 				$ids = $Spotter->getAllIDByRegistration($data['registration']);
 				$date = $data['date'];
 				if (isset($ids[$date])) {
@@ -177,8 +197,9 @@  discard block
 block discarded – undo
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 	
 	/*
@@ -222,7 +243,9 @@  discard block
 block discarded – undo
 	*/
 	public function import($file) {
 		global $globalTransaction, $globalDebug;
-		if ($globalDebug) echo 'Import '.$file."\n";
+		if ($globalDebug) {
+			echo 'Import '.$file."\n";
+		}
 		$result = array();
 		if (file_exists($file)) {
 			if (($handle = fopen($file,'r')) !== FALSE) {
@@ -233,8 +256,11 @@  discard block
 block discarded – undo
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
-			elseif ($globalDebug) echo 'Nothing to import';
+			if (!empty($result)) {
+				$this->add($result,true);
+			} elseif ($globalDebug) {
+				echo 'Nothing to import';
+			}
 		}
 	}
 
@@ -270,14 +296,23 @@  discard block
 block discarded – undo
 					}
 				}
 				fclose($handle);
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+			} elseif ($globalDebug) {
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
+			}
+		} elseif ($globalDebug) {
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+		}
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
+		if (empty($result) && $globalDebug) {
+			echo 'Nothing to update';
+		}
 		foreach ($result as $file => $md5) {
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
+			} elseif ($globalDebug) {
+				echo 'Download '.$file.' failed';
+			}
 		}
 	}
 
@@ -294,13 +329,17 @@  discard block
 block discarded – undo
 		$Image = new Image();
 		$Spotter = new Spotter();
 
-		if (empty($crash)) return false;
+		if (empty($crash)) {
+			return false;
+		}
 		if (!$new) {
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
 			$sthd = $Connection->db->prepare($query_delete);
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
@@ -315,7 +354,9 @@  discard block
 block discarded – undo
 					return $value === "" ? NULL : $value;
 				}, $cr);
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					if (strpos($cr['registration'],'-') === FALSE) {
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					}
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
@@ -324,13 +365,19 @@  discard block
 block discarded – undo
 						$sth->execute($query_values);
 						if ($cr['date'] > time()-(30*86400)) {
 							if (empty($Image->getSpotterImage($cr['registration']))) {
-								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
+								if ($globalDebug) {
+									echo "\t".'Get image for '.$cr['registration'].'...';
+								}
 								$Image->addSpotterImage($cr['registration']);
-								if ($globalDebug) echo "\t".'Done'."\n";
+								if ($globalDebug) {
+									echo "\t".'Done'."\n";
+								}
 							}
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
 						}
-						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
+						if ($cr['title'] == '') {
+							$cr['title'] = $cr['registration'].' '.$cr['type'];
+						}
 						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
 					}
 				}
@@ -339,9 +386,13 @@  discard block
 block discarded – undo
 					$Connection->db->beginTransaction();
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack();
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			echo $e->getMessage();
 		}
 		$sth_check->closeCursor();
@@ -380,8 +431,11 @@  discard block
 block discarded – undo
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_accidents_update() {

Please login to merge, or discard this patch.

		@@ -23,7 +23,9 @@
		block discarded – undo
23	23	print '<option></option>';
24	24	$Stats = new Stats();
25	25	$airport_names = $Stats->getAllAirportNames();
26		- if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
	26	+ if (empty($airport_names)) {
	27	+ $airport_names = $Spotter->getAllAirportNames();
	28	+ }
27	29	ksort($airport_names);
28	30	foreach($airport_names as $airport_name)
29	31	{

		@@ -4,8 +4,8 @@
		block discarded – undo
4	4	require_once('require/class.Stats.php');
5	5	require_once('require/class.Language.php');
6	6	if (!isset($_GET['airport'])) {
7		- header('Location: '.$globalURL.'/airport');
8		- die();
	7	+ header('Location: '.$globalURL.'/airport');
	8	+ die();
9	9	}
10	10	$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
11	11	$Spotter = new Spotter();

		@@ -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 Departure Airports by Country to %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
	17	+ $title = sprintf(_("Most Common Departure Airports by Country to %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
18	18	require_once('header.php');
19	19	print '<div class="select-item">';
20	20	print '<form action="'.$globalURL.'/airport" method="post">';
		@@ -24,9 +24,9 @@ discard block
		block discarded – undo
24	24	$airport_names = $Stats->getAllAirportNames();
25	25	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
26	26	ksort($airport_names);
27		- foreach($airport_names as $airport_name)
	27	+ foreach ($airport_names as $airport_name)
28	28	{
29		- if($_GET['airport'] == $airport_name['airport_icao'])
	29	+ if ($_GET['airport'] == $airport_name['airport_icao'])
30	30	{
31	31	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>';
32	32	} else {
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	include('airport-sub-menu.php');
58	58	print '<div class="column">';
59	59	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
60		- print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights to <strong>%s, %s, (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
	60	+ print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights to <strong>%s, %s, (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
61	61
62	62	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByAirport($airport);
63	63	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
		@@ -66,7 +66,7 @@ discard block
		block discarded – undo
66	66	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
67	67	print 'var series = [';
68	68	$country_data = '';
69		- foreach($airport_country_array as $airport_item)
	69	+ foreach ($airport_country_array as $airport_item)
70	70	{
71	71	$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
72	72	}
		@@ -114,7 +114,7 @@ discard block
		block discarded – undo
114	114	print '</thead>';
115	115	print '<tbody>';
116	116	$i = 1;
117		- foreach($airport_country_array as $airport_item)
	117	+ foreach ($airport_country_array as $airport_item)
118	118	{
119	119	print '<tr>';
120	120	print '<td><strong>'.$i.'</strong></td>';

		@@ -19,10 +19,10 @@ discard block
		block discarded – undo
19	19	if (empty($aircraft_types) \|\| $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
20	20	$previous = null;
21	21	print '<div class="alphabet-legend">';
22		- foreach($aircraft_types as $value) {
	22	+ foreach ($aircraft_types as $value) {
23	23	//$firstLetter = substr($value['aircraft_name'], 0, 1);
24	24	$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
25		- if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
	25	+ if ($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
26	26	{
27	27	if ($previous !== null) print ' \| ';
28	28	print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
		@@ -31,12 +31,12 @@ discard block
		block discarded – undo
31	31	}
32	32	print '</div>';
33	33	$previous = null;
34		- foreach($aircraft_types as $value) {
	34	+ foreach ($aircraft_types as $value) {
35	35	//$firstLetter = substr($value['aircraft_name'], 0, 1);
36	36	$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
37	37	if ($firstLetter != "")
38	38	{
39		- if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
	39	+ if ($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
40	40	{
41	41	if ($previous !== null) print '</div>';
42	42	print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';

		@@ -16,7 +16,9 @@ discard block
		block discarded – undo
16	16	print '<h1>'._("Aircrafts Types").'</h1>';
17	17
18	18	$aircraft_types = $Stats->getAllAircraftTypes();
19		- if (empty($aircraft_types) \|\| $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
	19	+ if (empty($aircraft_types) \|\| $aircraft_types[0]['aircraft_manufacturer'] == '') {
	20	+ $aircraft_types = $Spotter->getAllAircraftTypes();
	21	+ }
20	22	$previous = null;
21	23	print '<div class="alphabet-legend">';
22	24	foreach($aircraft_types as $value) {
		@@ -24,10 +26,14 @@ discard block
		block discarded – undo
24	26	$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
25	27	if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
26	28	{
27		- if ($previous !== null) print ' \| ';
	29	+ if ($previous !== null) {
	30	+ print ' \| ';
	31	+ }
28	32	print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
29	33	}
30		- if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
	34	+ if ($firstLetter != '(' && $firstLetter != ')') {
	35	+ $previous = $firstLetter;
	36	+ }
31	37	}
32	38	print '</div>';
33	39	$previous = null;
		@@ -38,10 +44,14 @@ discard block
		block discarded – undo
38	44	{
39	45	if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
40	46	{
41		- if ($previous !== null) print '</div>';
	47	+ if ($previous !== null) {
	48	+ print '</div>';
	49	+ }
42	50	print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
43	51	}
44		- if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
	52	+ if ($firstLetter != '(' && $firstLetter != ')') {
	53	+ $previous = $firstLetter;
	54	+ }
45	55	print '<div class="alphabet-item">';
46	56	print '<a href="'.$globalURL.'/aircraft/'.$value['aircraft_icao'].'">';
47	57	if ($value['aircraft_name'] == '') {

		@@ -23,12 +23,12 @@
		block discarded – undo
23	23	}
24	24
25	25	/**
26		- * Get Accidents data from DB
27		- * @param String $limit Limit
28		- * @param String $type Set type accident or incident
29		- * @param String $date get data for a date
30		- * @return Array Return Accidents data in array
31		- */
	26	+ * Get Accidents data from DB
	27	+ * @param String $limit Limit
	28	+ * @param String $type Set type accident or incident
	29	+ * @param String $date get data for a date
	30	+ * @return Array Return Accidents data in array
	31	+ */
32	32	public function getAccidentData($limit = '',$type = '',$date = '') {
33	33	global $globalURL, $globalDBdriver;
34	34	$Image = new Image($this->db);

		@@ -113,8 +113,11 @@ discard block
		block discarded – undo
113	113	$data = array();
114	114	if ($row['registration'] != '') {
115	115	$image_array = $Image->getSpotterImage($row['registration']);
116		- if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
117		- else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	116	+ if (count($image_array) > 0) {
	117	+ $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
	118	+ } else {
	119	+ $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	120	+ }
118	121	$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
119	122	$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
120	123	if (!empty($aircraft_info)) {
		@@ -130,17 +133,30 @@ discard block
		block discarded – undo
130	133	$data['aircraft_base'] = $owner_data['base'];
131	134	$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
132	135	}
133		- } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
134		- if ($row['registration'] == '') $row['registration'] = 'NA';
135		- if ($row['ident'] == '') $row['ident'] = 'NA';
	136	+ } else {
	137	+ $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	138	+ }
	139	+ if ($row['registration'] == '') {
	140	+ $row['registration'] = 'NA';
	141	+ }
	142	+ if ($row['ident'] == '') {
	143	+ $row['ident'] = 'NA';
	144	+ }
136	145	$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
137	146	if (isset($identicao[0])) {
138	147	if (substr($row['ident'],0,2) == 'AF') {
139		- if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
140		- else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
141		- } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
	148	+ if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
	149	+ $icao = $row['ident'];
	150	+ } else {
	151	+ $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
	152	+ }
	153	+ } else {
	154	+ $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
	155	+ }
142	156	$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
143		- } else $icao = $row['ident'];
	157	+ } else {
	158	+ $icao = $row['ident'];
	159	+ }
144	160	$icao = $Translation->checkTranslation($icao,false);
145	161	//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
146	162	if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
		@@ -155,10 +171,14 @@ discard block
		block discarded – undo
155	171	//else echo 'No data...'."\n";
156	172	}
157	173	$data = array_merge($row,$data);
158		- if ($data['ident'] == null) $data['ident'] = $icao;
	174	+ if ($data['ident'] == null) {
	175	+ $data['ident'] = $icao;
	176	+ }
159	177	if ($data['title'] == null) {
160	178	$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
161		- } else $data['message'] = strtolower($data['title']);
	179	+ } else {
	180	+ $data['message'] = strtolower($data['title']);
	181	+ }
162	182	$ids = $Spotter->getAllIDByRegistration($data['registration']);
163	183	$date = $data['date'];
164	184	if (isset($ids[$date])) {
		@@ -177,8 +197,9 @@ discard block
		block discarded – undo
177	197	if (isset($result)) {
178	198	$result[0]['query_number_rows'] = $i;
179	199	return $result;
	200	+ } else {
	201	+ return array();
180	202	}
181		- else return array();
182	203	}
183	204
184	205	/*
		@@ -222,7 +243,9 @@ discard block
		block discarded – undo
222	243	*/
223	244	public function import($file) {
224	245	global $globalTransaction, $globalDebug;
225		- if ($globalDebug) echo 'Import '.$file."\n";
	246	+ if ($globalDebug) {
	247	+ echo 'Import '.$file."\n";
	248	+ }
226	249	$result = array();
227	250	if (file_exists($file)) {
228	251	if (($handle = fopen($file,'r')) !== FALSE) {
		@@ -233,8 +256,11 @@ discard block
		block discarded – undo
233	256	}
234	257	fclose($handle);
235	258	}
236		- if (!empty($result)) $this->add($result,true);
237		- elseif ($globalDebug) echo 'Nothing to import';
	259	+ if (!empty($result)) {
	260	+ $this->add($result,true);
	261	+ } elseif ($globalDebug) {
	262	+ echo 'Nothing to import';
	263	+ }
238	264	}
239	265	}
240	266
		@@ -270,14 +296,23 @@ discard block
		block discarded – undo
270	296	}
271	297	}
272	298	fclose($handle);
273		- } elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
274		- } elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
	299	+ } elseif ($globalDebug) {
	300	+ echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
	301	+ }
	302	+ } elseif ($globalDebug) {
	303	+ echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
	304	+ }
275	305	$result = $Common->arr_diff($all_md5_new,$all_md5);
276		- if (empty($result) && $globalDebug) echo 'Nothing to update';
	306	+ if (empty($result) && $globalDebug) {
	307	+ echo 'Nothing to update';
	308	+ }
277	309	foreach ($result as $file => $md5) {
278	310	$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
279		- if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
280		- elseif ($globalDebug) echo 'Download '.$file.' failed';
	311	+ if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
	312	+ $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
	313	+ } elseif ($globalDebug) {
	314	+ echo 'Download '.$file.' failed';
	315	+ }
281	316	}
282	317	}
283	318
		@@ -294,13 +329,17 @@ discard block
		block discarded – undo
294	329	$Image = new Image();
295	330	$Spotter = new Spotter();
296	331
297		- if (empty($crash)) return false;
	332	+ if (empty($crash)) {
	333	+ return false;
	334	+ }
298	335	if (!$new) {
299	336	$query_delete = 'DELETE FROM accidents WHERE source = :source';
300	337	$sthd = $Connection->db->prepare($query_delete);
301	338	$sthd->execute(array(':source' => $crash[0]['source']));
302	339	}
303		- if ($globalTransaction) $Connection->db->beginTransaction();
	340	+ if ($globalTransaction) {
	341	+ $Connection->db->beginTransaction();
	342	+ }
304	343	$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
305	344	$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
306	345	$sth_check = $Connection->db->prepare($query_check);
		@@ -315,7 +354,9 @@ discard block
		block discarded – undo
315	354	return $value === "" ? NULL : $value;
316	355	}, $cr);
317	356	if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
318		- if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
	357	+ if (strpos($cr['registration'],'-') === FALSE) {
	358	+ $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
	359	+ }
319	360	$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
320	361	$sth_check->execute($query_check_values);
321	362	$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
		@@ -324,13 +365,19 @@ discard block
		block discarded – undo
324	365	$sth->execute($query_values);
325	366	if ($cr['date'] > time()-(30*86400)) {
326	367	if (empty($Image->getSpotterImage($cr['registration']))) {
327		- if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
	368	+ if ($globalDebug) {
	369	+ echo "\t".'Get image for '.$cr['registration'].'...';
	370	+ }
328	371	$Image->addSpotterImage($cr['registration']);
329		- if ($globalDebug) echo "\t".'Done'."\n";
	372	+ if ($globalDebug) {
	373	+ echo "\t".'Done'."\n";
	374	+ }
330	375	}
331	376	// elseif ($globalDebug) echo 'Image already in DB'."\n";
332	377	}
333		- if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
	378	+ if ($cr['title'] == '') {
	379	+ $cr['title'] = $cr['registration'].' '.$cr['type'];
	380	+ }
334	381	$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
335	382	}
336	383	}
		@@ -339,9 +386,13 @@ discard block
		block discarded – undo
339	386	$Connection->db->beginTransaction();
340	387	}
341	388	}
342		- if ($globalTransaction) $Connection->db->commit();
	389	+ if ($globalTransaction) {
	390	+ $Connection->db->commit();
	391	+ }
343	392	} catch(PDOException $e) {
344		- if ($globalTransaction) $Connection->db->rollBack();
	393	+ if ($globalTransaction) {
	394	+ $Connection->db->rollBack();
	395	+ }
345	396	echo $e->getMessage();
346	397	}
347	398	$sth_check->closeCursor();
		@@ -380,8 +431,11 @@ discard block
		block discarded – undo
380	431	return "error : ".$e->getMessage();
381	432	}
382	433	$row = $sth->fetch(PDO::FETCH_ASSOC);
383		- if ($row['nb'] > 0) return false;
384		- else return true;
	434	+ if ($row['nb'] > 0) {
	435	+ return false;
	436	+ } else {
	437	+ return true;
	438	+ }
385	439	}
386	440
387	441	public static function insert_last_accidents_update() {

Ysurac / FlightAirMap

Push — master ( a3214e...3969e1 )

Status

Category

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

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

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

Braces +15 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

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

Braces +84 added lines, -30 removed lines patch added patch discarded remove patch