Ysurac / FlightAirMap

registration-statistics-route.php

Spacing +5 added lines, -5 removed lines

@@ -3,15 +3,15 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Routes from aircraft with registration %s"), $registration);
 
 	require_once('header.php');
 	print '<div class="info column">';
@@ -24,7 +24,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes of aircraft with registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes of aircraft with registration <strong>%s</strong>."), $registration).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByRegistration($registration);
 	if (!empty($route_array))
@@ -40,7 +40,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

registration-statistics-departure-airport-country.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 	$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

Spacing +6 added lines, -6 removed lines

@@ -3,16 +3,16 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['registration'])) {
-	$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 } else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Departure Airports by Country of aircraft with registration %s"), $registration);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$registration.' - '.$aircraft_array[0]['aircraft_name'].' ('.$aircraft_array[0]['aircraft_icao'].')</h1>';
@@ -24,7 +24,7 @@ 
 	include('registration-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 with aircraft registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByRegistration($registration);
 	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>';
@@ -32,7 +32,7 @@ 
 	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'].'],';
 	}
@@ -80,7 +80,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

country-statistics-airline.php

Spacing +8 added lines, -8 removed lines

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

Indentation +2 added lines, -2 removed lines

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

country-detailed.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	  $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];

Spacing +9 added lines, -9 removed lines

@@ -3,17 +3,17 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['country'])){
+if (!isset($_GET['country'])) {
 	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];
@@ -30,7 +30,7 @@ 
 	$country = ucwords(str_replace("-", " ", $_GET['country']));
 	
 	$page_url = $globalURL.'/country/'.$_GET['country'];
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($sort != '') {
 		$spotter_array = $Spotter->getSpotterDataByCountry($country, $limit_start.",".$absolute_difference, $sort);
 	} else {
@@ -39,7 +39,7 @@ 
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for Airports & Airlines from %s"),$country);
+		$title = sprintf(_("Detailed View for Airports & Airlines from %s"), $country);
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -47,9 +47,9 @@ 
 		print '<select name="country" class="selectpicker" data-live-search="true">';
 		print '<option></option>';
 		$all_countries = $Spotter->getAllCountries();
-		foreach($all_countries as $all_country)
+		foreach ($all_countries as $all_country)
 		{
-			if($country == $all_country['country'])
+			if ($country == $all_country['country'])
 			{
 				print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 			} else {
@@ -64,7 +64,7 @@ 
 		if ($_GET['country'] != "NA")
 		{
 			print '<div class="info column">';
-			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 			print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -72,7 +72,7 @@ 
 
 		include('country-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."),$country).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."), $country).'</p>';
 
 		include('table-output.php');
 		print '<div class="pagination">';

registration-sub-menu.php

Spacing +4 added lines, -4 removed lines

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

scripts/cron.php

Indentation +6 added lines, -6 removed lines

@@ -11,12 +11,12 @@
 //checks to see if FlightAware import is set
 if ($globalFlightAware == TRUE)
 {
-    $SpotterLive = new SpotterLive();
-    $Spotter = new Spotter();
-    //deletes the spotter LIVE data
-    $SpotterLive->deleteLiveSpotterData();
+	$SpotterLive = new SpotterLive();
+	$Spotter = new Spotter();
+	//deletes the spotter LIVE data
+	$SpotterLive->deleteLiveSpotterData();
     
-    //imports the new data from FlightAware
-    $Spotter->importFromFlightAware();
+	//imports the new data from FlightAware
+	$Spotter->importFromFlightAware();
 }
 ?>
\ No newline at end of file

scripts/check_data.php

Indentation +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
 */
 require_once(dirname(__FILE__).'/../require/settings.php');
 if ($globalInstalled) {
-    echo '$globalInstalled must be set to FALSE in require/settings.php';
-    exit;
+	echo '$globalInstalled must be set to FALSE in require/settings.php';
+	exit;
 }
 
 require_once('../require/class.Connection.php');

scripts/daemon-acars.php

Indentation +20 added lines, -20 removed lines

@@ -11,8 +11,8 @@ 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 $schema = new Connection();
 if ($schema->latest() === false) {
-    echo "You MUST update to latest schema. Run install/index.php";
-    exit();
+	echo "You MUST update to latest schema. Run install/index.php";
+	exit();
 }
 
 $debug = true;
@@ -21,11 +21,11 @@ 
 date_default_timezone_set('UTC');
 // signal handler - playing nice with sockets and dump1090
 pcntl_signal(SIGINT,  function($signo) {
-    global $sock;
-    echo "\n\nctrl-c or kill signal received. Tidying up ... ";
-    socket_shutdown($sock, 0);
-    socket_close($sock);
-    die("Bye!\n");
+	global $sock;
+	echo "\n\nctrl-c or kill signal received. Tidying up ... ";
+	socket_shutdown($sock, 0);
+	socket_close($sock);
+	die("Bye!\n");
 });
 pcntl_signal_dispatch();
 
@@ -38,24 +38,24 @@ 
 // Bind the source address
 if( !socket_bind($sock, $globalACARSHost , $globalACARSPort) )
 {
-    $errorcode = socket_last_error();
-    $errormsg = socket_strerror($errorcode);
+	$errorcode = socket_last_error();
+	$errormsg = socket_strerror($errorcode);
      
-    die("Could not bind socket : [$errorcode] $errormsg \n");
+	die("Could not bind socket : [$errorcode] $errormsg \n");
 }
 
 echo "LISTEN UDP MODE \n\n";
 while(1) {
-    $r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
-
-    // lets play nice and handle signals such as ctrl-c/kill properly
-    pcntl_signal_dispatch();
-    $dataFound = false;
-    //  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
-    echo $buffer."\n";
-    $ACARS->add(trim($buffer));
-    socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
-    $ACARS->deleteLiveAcarsData();
+	$r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
+
+	// lets play nice and handle signals such as ctrl-c/kill properly
+	pcntl_signal_dispatch();
+	$dataFound = false;
+	//  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
+	echo $buffer."\n";
+	$ACARS->add(trim($buffer));
+	socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+	$ACARS->deleteLiveAcarsData();
 }
 pcntl_exec($_,$argv);
 ?>

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
 
 $debug = true;
 
-$ACARS=new ACARS();
+$ACARS = new ACARS();
 date_default_timezone_set('UTC');
 // signal handler - playing nice with sockets and dump1090
-pcntl_signal(SIGINT,  function($signo) {
+pcntl_signal(SIGINT, function($signo) {
     global $sock;
     echo "\n\nctrl-c or kill signal received. Tidying up ... ";
     socket_shutdown($sock, 0);
@@ -36,7 +36,7 @@ 
 $sock = socket_create(AF_INET, SOCK_DGRAM, 0) or die("Unable to create socket\n");
 
 // Bind the source address
-if( !socket_bind($sock, $globalACARSHost , $globalACARSPort) )
+if (!socket_bind($sock, $globalACARSHost, $globalACARSPort))
 {
     $errorcode = socket_last_error();
     $errormsg = socket_strerror($errorcode);
@@ -45,7 +45,7 @@ 
 }
 
 echo "LISTEN UDP MODE \n\n";
-while(1) {
+while (1) {
     $r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
 
     // lets play nice and handle signals such as ctrl-c/kill properly
@@ -54,8 +54,8 @@ 
     //  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
     echo $buffer."\n";
     $ACARS->add(trim($buffer));
-    socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+    socket_sendto($sock, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
     $ACARS->deleteLiveAcarsData();
 }
-pcntl_exec($_,$argv);
+pcntl_exec($_, $argv);
 ?>

ident-statistics-arrival-airport.php

Spacing +7 added lines, -7 removed lines

@@ -7,13 +7,13 @@ 
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports of %s"),$spotter_array[0]['ident']);
+	$title = sprintf(_("Most Common Arrival Airports of %s"), $spotter_array[0]['ident']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['ident'].'</h1>';
@@ -24,7 +24,7 @@ 
 	include('ident-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 with the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights with the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByIdent($ident);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
@@ -39,7 +39,7 @@ 
         	["'._("Airport").'", "'._("# of times").'"],';
 
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
 		$name = str_replace("'", "", $name);
@@ -78,7 +78,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

Indentation +2 added lines, -2 removed lines

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