Inspection of "Remove flights limit" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a4a45b...27c107 )

by Yannick

created 2016-11-09 12:54 UTC

Status

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

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
-        $country_data = '';
+		$country_data = '';
 	foreach($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],';

Please login to merge, or discard this patch.

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

@@ -6,22 +6,22 @@  discard block
 block discarded – undo
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+	$title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airline" method="post">';
 	print '<select name="airline" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($_GET['airline'] == $airline_name['airline_icao'])
+		if ($_GET['airline'] == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 	include('airline-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</strong>."),$spotter_array[0]['airline_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByAirline($airline);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div>
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
         $country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -104,7 +104,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.

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

@@ -22,7 +22,9 @@  discard block
 block discarded – undo
 	print '<option></option>';
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
-	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
+	if (empty($airline_names)) {
+		$airline_names = $Spotter->getAllAirlineNames();
+	}
 	foreach($airline_names as $airline_name)
 	{
 		if($airline == $airline_name['airline_icao'])
@@ -44,8 +46,7 @@  discard block
 block discarded – undo
 			if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
-			}
-			elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
+			} elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
 			{
 				print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
 			}

Please login to merge, or discard this patch.

search-xml.php 3 patches

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

@@ -4,55 +4,55 @@  discard block
 block discarded – undo
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -89,56 +89,56 @@  discard block
 block discarded – undo
        
 $output = '<?xml version="1.0" encoding="UTF-8" ?>';
   $output .= '<flightairmap>';
-    $output .= '<title>'.$globalName.' XML Feed</title>';
-    $output .= '<link>http://'.$_SERVER['HTTP_HOST'].$globalURL.'</link>';
-    $output .= '<aircrafts>';
+	$output .= '<title>'.$globalName.' XML Feed</title>';
+	$output .= '<link>http://'.$_SERVER['HTTP_HOST'].$globalURL.'</link>';
+	$output .= '<aircrafts>';
     
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 	    	
-            $output .= '<aircraft>';
-              $output .= '<id>'.$spotter_item['spotter_id'].'</id>';
-		      $output .= '<ident>'.$spotter_item['ident'].'</ident>';
-		      $output .= '<registration>'.$spotter_item['registration'].'</registration>';
-              $output .= '<aircraft_icao>'.$spotter_item['aircraft_type'].'</aircraft_icao>';
-		      $output .= '<aircraft_name>'.$spotter_item['aircraft_name'].'</aircraft_name>';
-              $output .= '<aircraft_manufacturer>'.$spotter_item['aircraft_manufacturer'].'</aircraft_manufacturer>';
-              $output .= '<airline_name>'.$spotter_item['airline_name'].'</airline_name>';
-		      $output .= '<airline_icao>'.$spotter_item['airline_icao'].'</airline_icao>';
+			$output .= '<aircraft>';
+			  $output .= '<id>'.$spotter_item['spotter_id'].'</id>';
+			  $output .= '<ident>'.$spotter_item['ident'].'</ident>';
+			  $output .= '<registration>'.$spotter_item['registration'].'</registration>';
+			  $output .= '<aircraft_icao>'.$spotter_item['aircraft_type'].'</aircraft_icao>';
+			  $output .= '<aircraft_name>'.$spotter_item['aircraft_name'].'</aircraft_name>';
+			  $output .= '<aircraft_manufacturer>'.$spotter_item['aircraft_manufacturer'].'</aircraft_manufacturer>';
+			  $output .= '<airline_name>'.$spotter_item['airline_name'].'</airline_name>';
+			  $output .= '<airline_icao>'.$spotter_item['airline_icao'].'</airline_icao>';
 		if (isset($spotter_item['airline_iata'])) {
-            	    $output .= '<airline_iata>'.$spotter_item['airline_iata'].'</airline_iata>';
-              }
-              $output .= '<airline_country>'.$spotter_item['airline_country'].'</airline_country>';
-              if (isset($spotter_item['airline_callsign'])) {
-            	$output .= '<airline_callsign>'.$spotter_item['airline_callsign'].'</airline_callsign>';
-              }
-              $output .= '<airline_type>'.$spotter_item['airline_type'].'</airline_type>';
-              $output .= '<departure_airport_city>'.$spotter_item['departure_airport_city'].'</departure_airport_city>';
-		      $output .= '<departure_airport_country>'.$spotter_item['departure_airport_country'].'</departure_airport_country>';  
-              $output .= '<departure_airport_iata>'.$spotter_item['departure_airport_iata'].'</departure_airport_iata>';
-              $output .= '<departure_airport_icao>'.$spotter_item['departure_airport_icao'].'</departure_airport_icao>';
-              $output .= '<departure_airport_latitude>'.$spotter_item['departure_airport_latitude'].'</departure_airport_latitude>';
-              $output .= '<departure_airport_longitude>'.$spotter_item['departure_airport_longitude'].'</departure_airport_longitude>';
-              $output .= '<departure_airport_altitude>'.$spotter_item['departure_airport_altitude'].'</departure_airport_altitude>';
-              $output .= '<arrival_airport_city>'.$spotter_item['arrival_airport_city'].'</arrival_airport_city>';
-		      $output .= '<arrival_airport_country>'.$spotter_item['arrival_airport_country'].'</arrival_airport_country>';  
-              $output .= '<arrival_airport_iata>'.$spotter_item['arrival_airport_iata'].'</arrival_airport_iata>';
-              $output .= '<arrival_airport_icao>'.$spotter_item['arrival_airport_icao'].'</arrival_airport_icao>';
-              $output .= '<arrival_airport_latitude>'.$spotter_item['arrival_airport_latitude'].'</arrival_airport_latitude>';
-              $output .= '<arrival_airport_longitude>'.$spotter_item['arrival_airport_longitude'].'</arrival_airport_longitude>';
-              $output .= '<arrival_airport_altitude>'.$spotter_item['arrival_airport_altitude'].'</arrival_airport_altitude>';
-              $output .= '<latitude>'.$spotter_item['latitude'].'</latitude>';
-              $output .= '<longitude>'.$spotter_item['longitude'].'</longitude>';
-              $output .= '<altitude>'.$spotter_item['altitude'].'</altitude>';
-              $output .= '<ground_speed>'.$spotter_item['ground_speed'].'</ground_speed>';
-              $output .= '<heading>'.$spotter_item['heading'].'</heading>';
-              $output .= '<heading_name>'.$spotter_item['heading_name'].'</heading_name>';
-              $output .= '<waypoints>'.$spotter_item['waypoints'].'</waypoints>';
-		      $output .= '<date>'.date("c", strtotime($spotter_item['date_iso_8601'])).'</date>';
-            $output .= '</aircraft>';
-	    }
+					$output .= '<airline_iata>'.$spotter_item['airline_iata'].'</airline_iata>';
+			  }
+			  $output .= '<airline_country>'.$spotter_item['airline_country'].'</airline_country>';
+			  if (isset($spotter_item['airline_callsign'])) {
+				$output .= '<airline_callsign>'.$spotter_item['airline_callsign'].'</airline_callsign>';
+			  }
+			  $output .= '<airline_type>'.$spotter_item['airline_type'].'</airline_type>';
+			  $output .= '<departure_airport_city>'.$spotter_item['departure_airport_city'].'</departure_airport_city>';
+			  $output .= '<departure_airport_country>'.$spotter_item['departure_airport_country'].'</departure_airport_country>';  
+			  $output .= '<departure_airport_iata>'.$spotter_item['departure_airport_iata'].'</departure_airport_iata>';
+			  $output .= '<departure_airport_icao>'.$spotter_item['departure_airport_icao'].'</departure_airport_icao>';
+			  $output .= '<departure_airport_latitude>'.$spotter_item['departure_airport_latitude'].'</departure_airport_latitude>';
+			  $output .= '<departure_airport_longitude>'.$spotter_item['departure_airport_longitude'].'</departure_airport_longitude>';
+			  $output .= '<departure_airport_altitude>'.$spotter_item['departure_airport_altitude'].'</departure_airport_altitude>';
+			  $output .= '<arrival_airport_city>'.$spotter_item['arrival_airport_city'].'</arrival_airport_city>';
+			  $output .= '<arrival_airport_country>'.$spotter_item['arrival_airport_country'].'</arrival_airport_country>';  
+			  $output .= '<arrival_airport_iata>'.$spotter_item['arrival_airport_iata'].'</arrival_airport_iata>';
+			  $output .= '<arrival_airport_icao>'.$spotter_item['arrival_airport_icao'].'</arrival_airport_icao>';
+			  $output .= '<arrival_airport_latitude>'.$spotter_item['arrival_airport_latitude'].'</arrival_airport_latitude>';
+			  $output .= '<arrival_airport_longitude>'.$spotter_item['arrival_airport_longitude'].'</arrival_airport_longitude>';
+			  $output .= '<arrival_airport_altitude>'.$spotter_item['arrival_airport_altitude'].'</arrival_airport_altitude>';
+			  $output .= '<latitude>'.$spotter_item['latitude'].'</latitude>';
+			  $output .= '<longitude>'.$spotter_item['longitude'].'</longitude>';
+			  $output .= '<altitude>'.$spotter_item['altitude'].'</altitude>';
+			  $output .= '<ground_speed>'.$spotter_item['ground_speed'].'</ground_speed>';
+			  $output .= '<heading>'.$spotter_item['heading'].'</heading>';
+			  $output .= '<heading_name>'.$spotter_item['heading_name'].'</heading_name>';
+			  $output .= '<waypoints>'.$spotter_item['waypoints'].'</waypoints>';
+			  $output .= '<date>'.date("c", strtotime($spotter_item['date_iso_8601'])).'</date>';
+			$output .= '</aircraft>';
+		}
 	   }
 		 $output .= '</aircrafts>';
 $output .= '</flightairmap>';

Please login to merge, or discard this patch.

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

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

Please login to merge, or discard this patch.

Braces +18 added lines, -7 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

aircraft-sub-menu.php 1 patch

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

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

Please login to merge, or discard this patch.

route-statistics-airline-country.php 2 patches

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

@@ -35,7 +35,7 @@
 block discarded – undo
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
-            	$country_data = '';
+				$country_data = '';
 	foreach($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';

Please login to merge, or discard this patch.

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

@@ -8,12 +8,12 @@  discard block
 block discarded – undo
 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);
 $spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines by Country between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']);
+	$title = sprintf(_("Most Common Airlines by Country between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>';
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 	include('route-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 between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlineCountriesByRoute($_GET['departure_airport'], $_GET['arrival_airport']);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
             var data = google.visualization.arrayToDataTable([
             	["'._("Country").'", "'._("# of times").'"], ';
             	$country_data = '';
-	foreach($airline_array as $airline_item)
+	foreach ($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';
 	}
@@ -70,7 +70,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.

install/install_db.php 1 patch

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

@@ -1,30 +1,30 @@
 block discarded – undo
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.create_db.php');
-    echo "Create and import all tables...";
-    create_db::import_all_db('../db/');
-    echo "Done !\n";
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.create_db.php');
+	echo "Create and import all tables...";
+	create_db::import_all_db('../db/');
+	echo "Done !\n";
 
-    require('class.update_db.php');
-    echo "Populate all tables...\n";
-    update_db::update_all();
-    echo "\nInstall waypoints...(VERY slow!)";
-    update_db::update_waypoints();
-    echo "Done !\n";
-    echo "Install airspace...";
-    update_db::update_airspace();
-    echo "Done !\n";
-    echo 'All is now installed ! Thanks'."\n";
-    if ($globalSBS1) {
-            echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
-    }
-    if ($globalACARS) {
-            echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
-    }
+	require('class.update_db.php');
+	echo "Populate all tables...\n";
+	update_db::update_all();
+	echo "\nInstall waypoints...(VERY slow!)";
+	update_db::update_waypoints();
+	echo "Done !\n";
+	echo "Install airspace...";
+	update_db::update_airspace();
+	echo "Done !\n";
+	echo 'All is now installed ! Thanks'."\n";
+	if ($globalSBS1) {
+			echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
+	}
+	if ($globalACARS) {
+			echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
+	}
     
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

install/populate_ivao.php 1 patch

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

@@ -1,23 +1,23 @@
 block discarded – undo
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.update_db.php');
-    if (isset($globalVATSIM) && $globalVATSIM) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.update_db.php');
+	if (isset($globalVATSIM) && $globalVATSIM) {
 	echo "Install VATSIM airlines...";
 	update_db::update_vatsim();
 	echo "Done !\n";
-    }
-    if (isset($globalIVAO) && $globalIVAO) {
+	}
+	if (isset($globalIVAO) && $globalIVAO) {
 	if (!file_exists('tmp/ivae_feb2013.zip')) {
 		echo "You have to download the file ivae_feb2013.zip from https://www.ivao.aero/softdev/mirrors.asp?software=IvAeDataUp and put it in install/tmp directory";
 	} else {
-	        echo "Install IVAO airlines and logos...";
-	        update_db::update_IVAO();
+			echo "Install IVAO airlines and logos...";
+			update_db::update_IVAO();
 		echo "Done !\n";
 	}
-    }
+	}
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

install/header.php 1 patch

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

@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 <meta property="og:site_name" content="<?php print $globalName; ?>"/>
 
 <?php
-    if (!isset($_SESSION['install']) && !$globalInstalled) {
+	if (!isset($_SESSION['install']) && !$globalInstalled) {
 ?>
 <script language="JavaScript" type="text/javascript">
     function datasource_js() {
@@ -120,22 +120,22 @@  discard block
 block discarded – undo
     }
 </script>
 <?php
-    }
+	}
 ?>
 
 </head>
 
 <?php
-    if (!isset($_SESSION['install']) && !$globalInstalled) {
+	if (!isset($_SESSION['install']) && !$globalInstalled) {
 ?>
 
 <body class="page-<?php print strtolower($current_page); ?>" onload="datasource_js(); metarcycle_js(); create_database_js(); daemon_js(); schedule_js()">
 <?php
-    } else {
+	} else {
 ?>
     <body class="page-<?php print strtolower($current_page); ?>">
 <?php
-    }
+	}
 ?>
 <div class="navbar navbar-fixed-top" role="navigation">
   <div class="container">
@@ -154,12 +154,12 @@  discard block
 block discarded – undo
 
 <?php
 if (isset($top_header)) {
-    if ($top_header != "")
-    {
+	if ($top_header != "")
+	{
 	print '<div class="top-header container clear" role="main">';
 		print '<img src="../images/'.$top_header.'" alt="'.$title.'" title="'.$title.'" />';
 	print '</div>';
-    }
+	}
 }
 ?>
 

Please login to merge, or discard this patch.

install/install-action.php 3 patches

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

@@ -68,27 +68,27 @@  discard block
 block discarded – undo
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	if (update_schema::check_version(false) == '0') {
 		if ($globalDBdriver == 'mysql') {
-		    $error .= create_db::import_all_db('../db/');
+			$error .= create_db::import_all_db('../db/');
 		} elseif ($globalDBdriver == 'pgsql') {
-		    $error .= create_db::import_all_db('../db/pgsql/');
+			$error .= create_db::import_all_db('../db/pgsql/');
 		}
 		if ($error != '') {
-                        $_SESSION['error'] = $error;
+						$_SESSION['error'] = $error;
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 		} else {
-		    $_SESSION['install'] = 'sources';
-		    $_SESSION['next'] = 'Insert data in source table';
+			$_SESSION['install'] = 'sources';
+			$_SESSION['next'] = 'Insert data in source table';
 		}
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
-                        $_SESSION['error'] = $error;
+						$_SESSION['error'] = $error;
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
@@ -118,25 +118,25 @@  discard block
 block discarded – undo
 	$error .= update_db::update_countries();
 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
-	    $_SESSION['install'] = 'notam';
-	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'notam';
+		$_SESSION['next'] = 'Populate NOTAM table with externals data';
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
-	    $_SESSION['install'] = 'owner';
-	    $_SESSION['next'] = 'Populate owner table with externals data';
-	    unset($_SESSION['owner']);
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'owner';
+		$_SESSION['next'] = 'Populate owner table with externals data';
+		unset($_SESSION['owner']);
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	} else {
-	    $_SESSION['install'] = 'sources';
-	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'sources';
+		$_SESSION['next'] = 'Insert data in source table';
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -296,17 +296,17 @@  discard block
 block discarded – undo
 */
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'sources') {
 	if (isset($_SESSION['sources']) && count($_SESSION['sources']) > 0) {
-	    $sources = $_SESSION['sources'];
+		$sources = $_SESSION['sources'];
 
-	    include_once('../require/class.Source.php');
-	    $globalDebug = FALSE;
-	    $Source = new Source();
-	    $Source->deleteAllLocation();
-	    foreach ($sources as $src) {
+		include_once('../require/class.Source.php');
+		$globalDebug = FALSE;
+		$Source = new Source();
+		$Source->deleteAllLocation();
+		foreach ($sources as $src) {
 		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
-	    }
-	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
-	    unset($_SESSION['sources']);
+		}
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+		unset($_SESSION['sources']);
 	}
 	/*
 	if (isset($globalIVAO) && $globalIVAO) $_SESSION['install'] = 'ivao';

Please login to merge, or discard this patch.

Braces +23 added lines, -9 removed lines patch added patch discarded remove patch

@@ -164,15 +164,21 @@  discard block
 block discarded – undo
 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -303,7 +309,9 @@  discard block
 block discarded – undo
 	    $Source = new Source();
 	    $Source->deleteAllLocation();
 	    foreach ($sources as $src) {
-		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+		if (isset($src['latitude']) && $src['latitude'] != '') {
+			$Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+		}
 	    }
 	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
 	    unset($_SESSION['sources']);
@@ -314,15 +322,21 @@  discard block
 block discarded – undo
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';

Please login to merge, or discard this patch.

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

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

Please login to merge, or discard this patch.

install/update_arrival_airport.php 1 patch

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

@@ -4,13 +4,13 @@
 block discarded – undo
  *    This Script will try to find all real arrival airports for all flights in DB
  *
 */
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('../require/class.Spotter.php');
-    $Spotter = new Spotter();
-    $Spotter->updateArrivalAirports();
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('../require/class.Spotter.php');
+	$Spotter = new Spotter();
+	$Spotter->updateArrivalAirports();
 
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	<meta property="og:site_name" content="<?php print $globalName; ?>"/>
40	40
41	41	<?php
42		- if (!isset($_SESSION['install']) && !$globalInstalled) {
	42	+ if (!isset($_SESSION['install']) && !$globalInstalled) {
43	43	?>
44	44	<script language="JavaScript" type="text/javascript">
45	45	function datasource_js() {
		@@ -120,22 +120,22 @@ discard block
		block discarded – undo
120	120	}
121	121	</script>
122	122	<?php
123		- }
	123	+ }
124	124	?>
125	125
126	126	</head>
127	127
128	128	<?php
129		- if (!isset($_SESSION['install']) && !$globalInstalled) {
	129	+ if (!isset($_SESSION['install']) && !$globalInstalled) {
130	130	?>
131	131
132	132	<body class="page-<?php print strtolower($current_page); ?>" onload="datasource_js(); metarcycle_js(); create_database_js(); daemon_js(); schedule_js()">
133	133	<?php
134		- } else {
	134	+ } else {
135	135	?>
136	136	<body class="page-<?php print strtolower($current_page); ?>">
137	137	<?php
138		- }
	138	+ }
139	139	?>
140	140	<div class="navbar navbar-fixed-top" role="navigation">
141	141	<div class="container">
		@@ -154,12 +154,12 @@ discard block
		block discarded – undo
154	154
155	155	<?php
156	156	if (isset($top_header)) {
157		- if ($top_header != "")
158		- {
	157	+ if ($top_header != "")
	158	+ {
159	159	print '<div class="top-header container clear" role="main">';
160	160	print '<img src="../images/'.$top_header.'" alt="'.$title.'" title="'.$title.'" />';
161	161	print '</div>';
162		- }
	162	+ }
163	163	}
164	164	?>
165	165

		@@ -3,8 +3,8 @@ discard block
		block discarded – undo
3	3	require_once('require/class.Spotter.php');
4	4	require_once('require/class.Language.php');
5	5	if (!isset($_GET['airline'])) {
6		- header('Location: '.$globalURL.'/airline');
7		- die();
	6	+ header('Location: '.$globalURL.'/airline');
	7	+ die();
8	8	}
9	9	$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
10	10	$Spotter = new Spotter();
		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	function drawChart() {
70	70	var data = google.visualization.arrayToDataTable([
71	71	["'._("Country").'", "'._("# of times").'"], ';
72		- $country_data = '';
	72	+ $country_data = '';
73	73	foreach($airport_country_array as $airport_item)
74	74	{
75	75	$country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],';

		@@ -6,22 +6,22 @@ discard block
		block discarded – undo
6	6	header('Location: '.$globalURL.'/airline');
7	7	die();
8	8	}
9		-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
	9	+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
10	10	$Spotter = new Spotter();
11		-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
	11	+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
12	12
13	13	if (!empty($spotter_array))
14	14	{
15		- $title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
	15	+ $title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
16	16	require_once('header.php');
17	17	print '<div class="select-item">';
18	18	print '<form action="'.$globalURL.'/airline" method="post">';
19	19	print '<select name="airline" class="selectpicker" data-live-search="true">';
20	20	print '<option></option>';
21	21	$airline_names = $Spotter->getAllAirlineNames();
22		- foreach($airline_names as $airline_name)
	22	+ foreach ($airline_names as $airline_name)
23	23	{
24		- if($_GET['airline'] == $airline_name['airline_icao'])
	24	+ if ($_GET['airline'] == $airline_name['airline_icao'])
25	25	{
26	26	print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
27	27	} else {
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	include('airline-sub-menu.php');
60	60	print '<div class="column">';
61	61	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
62		- print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
	62	+ print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
63	63	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByAirline($airline);
64	64	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
65	65	print '<div id="chartCountry" class="chart" width="100%"></div>
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	var data = google.visualization.arrayToDataTable([
71	71	["'._("Country").'", "'._("# of times").'"], ';
72	72	$country_data = '';
73		- foreach($airport_country_array as $airport_item)
	73	+ foreach ($airport_country_array as $airport_item)
74	74	{
75	75	$country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],';
76	76	}
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	print '</thead>';
105	105	print '<tbody>';
106	106	$i = 1;
107		- foreach($airport_country_array as $airport_item)
	107	+ foreach ($airport_country_array as $airport_item)
108	108	{
109	109	print '<tr>';
110	110	print '<td><strong>'.$i.'</strong></td>';

		@@ -22,7 +22,9 @@ discard block
		block discarded – undo
22	22	print '<option></option>';
23	23	$Stats = new Stats();
24	24	$airline_names = $Stats->getAllAirlineNames();
25		- if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
	25	+ if (empty($airline_names)) {
	26	+ $airline_names = $Spotter->getAllAirlineNames();
	27	+ }
26	28	foreach($airline_names as $airline_name)
27	29	{
28	30	if($airline == $airline_name['airline_icao'])
		@@ -44,8 +46,7 @@ discard block
		block discarded – undo
44	46	if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif'))
45	47	{
46	48	print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
47		- }
48		- elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
	49	+ } elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png'))
49	50	{
50	51	print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />';
51	52	}

		@@ -4,55 +4,55 @@ discard block
		block discarded – undo
4	4	require_once('require/class.Language.php');
5	5	$Spotter = new Spotter();
6	6	if (isset($_GET['start_date'])) {
7		- //for the date manipulation into the query
8		- if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
9		- $start_date = $_GET['start_date'].":00";
10		- $end_date = $_GET['end_date'].":00";
11		- $sql_date = $start_date.",".$end_date;
12		- } else if($_GET['start_date'] != ""){
13		- $start_date = $_GET['start_date'].":00";
14		- $sql_date = $start_date;
15		- } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16		- $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17		- $sql_date = $end_date;
18		- } else $sql_date = '';
	7	+ //for the date manipulation into the query
	8	+ if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
	9	+ $start_date = $_GET['start_date'].":00";
	10	+ $end_date = $_GET['end_date'].":00";
	11	+ $sql_date = $start_date.",".$end_date;
	12	+ } else if($_GET['start_date'] != ""){
	13	+ $start_date = $_GET['start_date'].":00";
	14	+ $sql_date = $start_date;
	15	+ } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
	16	+ $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
	17	+ $sql_date = $end_date;
	18	+ } else $sql_date = '';
19	19	} else $sql_date = '';
20	20
21	21	if (isset($_GET['highest_altitude'])) {
22		- //for altitude manipulation
23		- if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
24		- $end_altitude = $_GET['highest_altitude'];
25		- $start_altitude = $_GET['lowest_altitude'];
26		- $sql_altitude = $start_altitude.",".$end_altitude;
27		- } else if($_GET['highest_altitude'] != ""){
28		- $end_altitude = $_GET['highest_altitude'];
29		- $sql_altitude = $end_altitude;
30		- } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31		- $start_altitude = $_GET['lowest_altitude'].",60000";
32		- $sql_altitude = $start_altitude;
33		- } else $sql_altitude = '';
	22	+ //for altitude manipulation
	23	+ if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
	24	+ $end_altitude = $_GET['highest_altitude'];
	25	+ $start_altitude = $_GET['lowest_altitude'];
	26	+ $sql_altitude = $start_altitude.",".$end_altitude;
	27	+ } else if($_GET['highest_altitude'] != ""){
	28	+ $end_altitude = $_GET['highest_altitude'];
	29	+ $sql_altitude = $end_altitude;
	30	+ } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
	31	+ $start_altitude = $_GET['lowest_altitude'].",60000";
	32	+ $sql_altitude = $start_altitude;
	33	+ } else $sql_altitude = '';
34	34	} else $sql_altitude = '';
35	35
36	36	//calculuation for the pagination
37	37	if(!isset($_GET['limit']))
38	38	{
39		- if (!isset($_GET['number_results']))
40		- {
41		- $limit_start = 0;
42		- $limit_end = 25;
43		- $absolute_difference = 25;
44		- } else {
45		- if ($_GET['number_results'] > 1000){
46		- $_GET['number_results'] = 1000;
47		- }
48		- $limit_start = 0;
49		- $limit_end = $_GET['number_results'];
50		- $absolute_difference = $_GET['number_results'];
51		- }
	39	+ if (!isset($_GET['number_results']))
	40	+ {
	41	+ $limit_start = 0;
	42	+ $limit_end = 25;
	43	+ $absolute_difference = 25;
	44	+ } else {
	45	+ if ($_GET['number_results'] > 1000){
	46	+ $_GET['number_results'] = 1000;
	47	+ }
	48	+ $limit_start = 0;
	49	+ $limit_end = $_GET['number_results'];
	50	+ $absolute_difference = $_GET['number_results'];
	51	+ }
52	52	} else {
53		- $limit_explode = explode(",", $_GET['limit']);
54		- $limit_start = $limit_explode[0];
55		- $limit_end = $limit_explode[1];
	53	+ $limit_explode = explode(",", $_GET['limit']);
	54	+ $limit_start = $limit_explode[0];
	55	+ $limit_end = $limit_explode[1];
56	56	}
57	57
58	58	$absolute_difference = abs($limit_start - $limit_end);
		@@ -89,56 +89,56 @@ discard block
		block discarded – undo
89	89
90	90	$output = '<?xml version="1.0" encoding="UTF-8" ?>';
91	91	$output .= '<flightairmap>';
92		- $output .= '<title>'.$globalName.' XML Feed</title>';
93		- $output .= '<link>http://'.$_SERVER['HTTP_HOST'].$globalURL.'</link>';
94		- $output .= '<aircrafts>';
	92	+ $output .= '<title>'.$globalName.' XML Feed</title>';
	93	+ $output .= '<link>http://'.$_SERVER['HTTP_HOST'].$globalURL.'</link>';
	94	+ $output .= '<aircrafts>';
95	95
96		- if (!empty($spotter_array))
	96	+ if (!empty($spotter_array))
97	97	{
98		- foreach($spotter_array as $spotter_item)
99		- {
	98	+ foreach($spotter_array as $spotter_item)
	99	+ {
100	100
101		- $output .= '<aircraft>';
102		- $output .= '<id>'.$spotter_item['spotter_id'].'</id>';
103		- $output .= '<ident>'.$spotter_item['ident'].'</ident>';
104		- $output .= '<registration>'.$spotter_item['registration'].'</registration>';
105		- $output .= '<aircraft_icao>'.$spotter_item['aircraft_type'].'</aircraft_icao>';
106		- $output .= '<aircraft_name>'.$spotter_item['aircraft_name'].'</aircraft_name>';
107		- $output .= '<aircraft_manufacturer>'.$spotter_item['aircraft_manufacturer'].'</aircraft_manufacturer>';
108		- $output .= '<airline_name>'.$spotter_item['airline_name'].'</airline_name>';
109		- $output .= '<airline_icao>'.$spotter_item['airline_icao'].'</airline_icao>';
	101	+ $output .= '<aircraft>';
	102	+ $output .= '<id>'.$spotter_item['spotter_id'].'</id>';
	103	+ $output .= '<ident>'.$spotter_item['ident'].'</ident>';
	104	+ $output .= '<registration>'.$spotter_item['registration'].'</registration>';
	105	+ $output .= '<aircraft_icao>'.$spotter_item['aircraft_type'].'</aircraft_icao>';
	106	+ $output .= '<aircraft_name>'.$spotter_item['aircraft_name'].'</aircraft_name>';
	107	+ $output .= '<aircraft_manufacturer>'.$spotter_item['aircraft_manufacturer'].'</aircraft_manufacturer>';
	108	+ $output .= '<airline_name>'.$spotter_item['airline_name'].'</airline_name>';
	109	+ $output .= '<airline_icao>'.$spotter_item['airline_icao'].'</airline_icao>';
110	110	if (isset($spotter_item['airline_iata'])) {
111		- $output .= '<airline_iata>'.$spotter_item['airline_iata'].'</airline_iata>';
112		- }
113		- $output .= '<airline_country>'.$spotter_item['airline_country'].'</airline_country>';
114		- if (isset($spotter_item['airline_callsign'])) {
115		- $output .= '<airline_callsign>'.$spotter_item['airline_callsign'].'</airline_callsign>';
116		- }
117		- $output .= '<airline_type>'.$spotter_item['airline_type'].'</airline_type>';
118		- $output .= '<departure_airport_city>'.$spotter_item['departure_airport_city'].'</departure_airport_city>';
119		- $output .= '<departure_airport_country>'.$spotter_item['departure_airport_country'].'</departure_airport_country>';
120		- $output .= '<departure_airport_iata>'.$spotter_item['departure_airport_iata'].'</departure_airport_iata>';
121		- $output .= '<departure_airport_icao>'.$spotter_item['departure_airport_icao'].'</departure_airport_icao>';
122		- $output .= '<departure_airport_latitude>'.$spotter_item['departure_airport_latitude'].'</departure_airport_latitude>';
123		- $output .= '<departure_airport_longitude>'.$spotter_item['departure_airport_longitude'].'</departure_airport_longitude>';
124		- $output .= '<departure_airport_altitude>'.$spotter_item['departure_airport_altitude'].'</departure_airport_altitude>';
125		- $output .= '<arrival_airport_city>'.$spotter_item['arrival_airport_city'].'</arrival_airport_city>';
126		- $output .= '<arrival_airport_country>'.$spotter_item['arrival_airport_country'].'</arrival_airport_country>';
127		- $output .= '<arrival_airport_iata>'.$spotter_item['arrival_airport_iata'].'</arrival_airport_iata>';
128		- $output .= '<arrival_airport_icao>'.$spotter_item['arrival_airport_icao'].'</arrival_airport_icao>';
129		- $output .= '<arrival_airport_latitude>'.$spotter_item['arrival_airport_latitude'].'</arrival_airport_latitude>';
130		- $output .= '<arrival_airport_longitude>'.$spotter_item['arrival_airport_longitude'].'</arrival_airport_longitude>';
131		- $output .= '<arrival_airport_altitude>'.$spotter_item['arrival_airport_altitude'].'</arrival_airport_altitude>';
132		- $output .= '<latitude>'.$spotter_item['latitude'].'</latitude>';
133		- $output .= '<longitude>'.$spotter_item['longitude'].'</longitude>';
134		- $output .= '<altitude>'.$spotter_item['altitude'].'</altitude>';
135		- $output .= '<ground_speed>'.$spotter_item['ground_speed'].'</ground_speed>';
136		- $output .= '<heading>'.$spotter_item['heading'].'</heading>';
137		- $output .= '<heading_name>'.$spotter_item['heading_name'].'</heading_name>';
138		- $output .= '<waypoints>'.$spotter_item['waypoints'].'</waypoints>';
139		- $output .= '<date>'.date("c", strtotime($spotter_item['date_iso_8601'])).'</date>';
140		- $output .= '</aircraft>';
141		- }
	111	+ $output .= '<airline_iata>'.$spotter_item['airline_iata'].'</airline_iata>';
	112	+ }
	113	+ $output .= '<airline_country>'.$spotter_item['airline_country'].'</airline_country>';
	114	+ if (isset($spotter_item['airline_callsign'])) {
	115	+ $output .= '<airline_callsign>'.$spotter_item['airline_callsign'].'</airline_callsign>';
	116	+ }
	117	+ $output .= '<airline_type>'.$spotter_item['airline_type'].'</airline_type>';
	118	+ $output .= '<departure_airport_city>'.$spotter_item['departure_airport_city'].'</departure_airport_city>';
	119	+ $output .= '<departure_airport_country>'.$spotter_item['departure_airport_country'].'</departure_airport_country>';
	120	+ $output .= '<departure_airport_iata>'.$spotter_item['departure_airport_iata'].'</departure_airport_iata>';
	121	+ $output .= '<departure_airport_icao>'.$spotter_item['departure_airport_icao'].'</departure_airport_icao>';
	122	+ $output .= '<departure_airport_latitude>'.$spotter_item['departure_airport_latitude'].'</departure_airport_latitude>';
	123	+ $output .= '<departure_airport_longitude>'.$spotter_item['departure_airport_longitude'].'</departure_airport_longitude>';
	124	+ $output .= '<departure_airport_altitude>'.$spotter_item['departure_airport_altitude'].'</departure_airport_altitude>';
	125	+ $output .= '<arrival_airport_city>'.$spotter_item['arrival_airport_city'].'</arrival_airport_city>';
	126	+ $output .= '<arrival_airport_country>'.$spotter_item['arrival_airport_country'].'</arrival_airport_country>';
	127	+ $output .= '<arrival_airport_iata>'.$spotter_item['arrival_airport_iata'].'</arrival_airport_iata>';
	128	+ $output .= '<arrival_airport_icao>'.$spotter_item['arrival_airport_icao'].'</arrival_airport_icao>';
	129	+ $output .= '<arrival_airport_latitude>'.$spotter_item['arrival_airport_latitude'].'</arrival_airport_latitude>';
	130	+ $output .= '<arrival_airport_longitude>'.$spotter_item['arrival_airport_longitude'].'</arrival_airport_longitude>';
	131	+ $output .= '<arrival_airport_altitude>'.$spotter_item['arrival_airport_altitude'].'</arrival_airport_altitude>';
	132	+ $output .= '<latitude>'.$spotter_item['latitude'].'</latitude>';
	133	+ $output .= '<longitude>'.$spotter_item['longitude'].'</longitude>';
	134	+ $output .= '<altitude>'.$spotter_item['altitude'].'</altitude>';
	135	+ $output .= '<ground_speed>'.$spotter_item['ground_speed'].'</ground_speed>';
	136	+ $output .= '<heading>'.$spotter_item['heading'].'</heading>';
	137	+ $output .= '<heading_name>'.$spotter_item['heading_name'].'</heading_name>';
	138	+ $output .= '<waypoints>'.$spotter_item['waypoints'].'</waypoints>';
	139	+ $output .= '<date>'.date("c", strtotime($spotter_item['date_iso_8601'])).'</date>';
	140	+ $output .= '</aircraft>';
	141	+ }
142	142	}
143	143	$output .= '</aircrafts>';
144	144	$output .= '</flightairmap>';

		@@ -5,14 +5,14 @@ discard block
		block discarded – undo
5	5	$Spotter = new Spotter();
6	6	if (isset($_GET['start_date'])) {
7	7	//for the date manipulation into the query
8		- if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
	8	+ if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
9	9	$start_date = $_GET['start_date'].":00";
10	10	$end_date = $_GET['end_date'].":00";
11	11	$sql_date = $start_date.",".$end_date;
12		- } else if($_GET['start_date'] != ""){
	12	+ } else if ($_GET['start_date'] != "") {
13	13	$start_date = $_GET['start_date'].":00";
14	14	$sql_date = $start_date;
15		- } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
	15	+ } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
16	16	$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17	17	$sql_date = $end_date;
18	18	} else $sql_date = '';
		@@ -20,21 +20,21 @@ discard block
		block discarded – undo
20	20
21	21	if (isset($_GET['highest_altitude'])) {
22	22	//for altitude manipulation
23		- if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
	23	+ if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
24	24	$end_altitude = $_GET['highest_altitude'];
25	25	$start_altitude = $_GET['lowest_altitude'];
26	26	$sql_altitude = $start_altitude.",".$end_altitude;
27		- } else if($_GET['highest_altitude'] != ""){
	27	+ } else if ($_GET['highest_altitude'] != "") {
28	28	$end_altitude = $_GET['highest_altitude'];
29	29	$sql_altitude = $end_altitude;
30		- } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
	30	+ } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
31	31	$start_altitude = $_GET['lowest_altitude'].",60000";
32	32	$sql_altitude = $start_altitude;
33	33	} else $sql_altitude = '';
34	34	} else $sql_altitude = '';
35	35
36	36	//calculuation for the pagination
37		-if(!isset($_GET['limit']))
	37	+if (!isset($_GET['limit']))
38	38	{
39	39	if (!isset($_GET['number_results']))
40	40	{
		@@ -42,14 +42,14 @@ discard block
		block discarded – undo
42	42	$limit_end = 25;
43	43	$absolute_difference = 25;
44	44	} else {
45		- if ($_GET['number_results'] > 1000){
	45	+ if ($_GET['number_results'] > 1000) {
46	46	$_GET['number_results'] = 1000;
47	47	}
48	48	$limit_start = 0;
49	49	$limit_end = $_GET['number_results'];
50	50	$absolute_difference = $_GET['number_results'];
51	51	}
52		-} else {
	52	+} else {
53	53	$limit_explode = explode(",", $_GET['limit']);
54	54	$limit_start = $limit_explode[0];
55	55	$limit_end = $limit_explode[1];
		@@ -69,23 +69,23 @@ discard block
		block discarded – undo
69	69
70	70	if (isset($_GET['sort'])) $sort = $_GET['sort'];
71	71	else $sort = '';
72		-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
73		-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
74		-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
75		-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
76		-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
77		-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
78		-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
79		-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
80		-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
81		-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
82		-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
83		-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
84		-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
85		-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
86		-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
87		-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
88		-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
	72	+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
	73	+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
	74	+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
	75	+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
	76	+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
	77	+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
	78	+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
	79	+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
	80	+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
	81	+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
	82	+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
	83	+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
	84	+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
	85	+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
	86	+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
	87	+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
	88	+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
89	89
90	90	$output = '{';
91	91	$output .= '"flightairmap": {';
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95
96	96	if (!empty($spotter_array))
97	97	{
98		- foreach($spotter_array as $spotter_item)
	98	+ foreach ($spotter_array as $spotter_item)
99	99	{
100	100
101	101	$output .= '{';

		@@ -15,8 +15,12 @@ discard block
		block discarded – undo
15	15	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
16	16	$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
17	17	$sql_date = $end_date;
18		- } else $sql_date = '';
19		-} else $sql_date = '';
	18	+ } else {
	19	+ $sql_date = '';
	20	+ }
	21	+ } else {
	22	+ $sql_date = '';
	23	+}
20	24
21	25	if (isset($_GET['highest_altitude'])) {
22	26	//for altitude manipulation
		@@ -30,8 +34,12 @@ discard block
		block discarded – undo
30	34	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
31	35	$start_altitude = $_GET['lowest_altitude'].",60000";
32	36	$sql_altitude = $start_altitude;
33		- } else $sql_altitude = '';
34		-} else $sql_altitude = '';
	37	+ } else {
	38	+ $sql_altitude = '';
	39	+ }
	40	+ } else {
	41	+ $sql_altitude = '';
	42	+}
35	43
36	44	//calculuation for the pagination
37	45	if(!isset($_GET['limit']))
		@@ -49,7 +57,7 @@ discard block
		block discarded – undo
49	57	$limit_end = $_GET['number_results'];
50	58	$absolute_difference = $_GET['number_results'];
51	59	}
52		-} else {
	60	+} else {
53	61	$limit_explode = explode(",", $_GET['limit']);
54	62	$limit_start = $limit_explode[0];
55	63	$limit_end = $limit_explode[1];
		@@ -67,8 +75,11 @@ discard block
		block discarded – undo
67	75
68	76	header("Content-type: text/yaml");
69	77
70		-if (isset($_GET['sort'])) $sort = $_GET['sort'];
71		-else $sort = '';
	78	+if (isset($_GET['sort'])) {
	79	+ $sort = $_GET['sort'];
	80	+} else {
	81	+ $sort = '';
	82	+}
72	83	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
73	84	$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
74	85	$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

		@@ -3,10 +3,10 @@ discard block
		block discarded – undo
3	3	</span>
4	4	<div class="sub-menu sub-menu-container">
5	5	<ul class="nav nav-pills">
6		- <li><a href="<?php print $globalURL; ?>/aircraft/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
7		- <li><a href="<?php print $globalURL; ?>/aircraft/statistics/registration/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-statistics-registration"){ print 'class="active"'; } ?>><?php echo _("Registration"); ?></a></li>
	6	+ <li><a href="<?php print $globalURL; ?>/aircraft/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
	7	+ <li><a href="<?php print $globalURL; ?>/aircraft/statistics/registration/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-statistics-registration") { print 'class="active"'; } ?>><?php echo _("Registration"); ?></a></li>
8	8	<li class="dropdown">
9		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "aircraft-statistics-airline" \|\| strtolower($current_page) == "aircraft-statistics-airline-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	9	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "aircraft-statistics-airline" \|\| strtolower($current_page) == "aircraft-statistics-airline-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
10	10	<?php echo _("Airline"); ?> <span class="caret"></span>
11	11	</a>
12	12	<ul class="dropdown-menu" role="menu">
		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15	</ul>
16	16	</li>
17	17	<li class="dropdown">
18		- <a class="dropdown-toggle <?php if(strtolower($current_page) == "aircraft-statistics-departure-airport" \|\| strtolower($current_page) == "aircraft-statistics-departure-airport-country" \|\| strtolower($current_page) == "aircraft-statistics-arrival-airport" \|\| strtolower($current_page) == "aircraft-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
	18	+ <a class="dropdown-toggle <?php if (strtolower($current_page) == "aircraft-statistics-departure-airport" \|\| strtolower($current_page) == "aircraft-statistics-departure-airport-country" \|\| strtolower($current_page) == "aircraft-statistics-arrival-airport" \|\| strtolower($current_page) == "aircraft-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
19	19	<?php echo _("Airport"); ?> <span class="caret"></span>
20	20	</a>
21	21	<ul class="dropdown-menu" role="menu">
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	<li><a href="<?php print $globalURL; ?>/aircraft/statistics/arrival-airport-country/<?php print $_GET['aircraft_type']; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
26	26	</ul>
27	27	</li>
28		- <li><a href="<?php print $globalURL; ?>/aircraft/statistics/route/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
29		- <li><a href="<?php print $globalURL; ?>/aircraft/statistics/time/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-statistics-time"){ print 'class="active"'; } ?>><?php echo ("Time"); ?></a></li>
	28	+ <li><a href="<?php print $globalURL; ?>/aircraft/statistics/route/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
	29	+ <li><a href="<?php print $globalURL; ?>/aircraft/statistics/time/<?php print $_GET['aircraft_type']; ?>" <?php if (strtolower($current_page) == "aircraft-statistics-time") { print 'class="active"'; } ?>><?php echo ("Time"); ?></a></li>
30	30	</ul>
31	31	</div>
32	32	\ No newline at end of file

		@@ -35,7 +35,7 @@
		block discarded – undo
35	35	function drawChart() {
36	36	var data = google.visualization.arrayToDataTable([
37	37	["'._("Country").'", "'._("# of times").'"], ';
38		- $country_data = '';
	38	+ $country_data = '';
39	39	foreach($airline_array as $airline_item)
40	40	{
41	41	$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';

		@@ -8,12 +8,12 @@ discard block
		block discarded – undo
8	8	require_once('require/class.Spotter.php');
9	9	require_once('require/class.Language.php');
10	10	$Spotter = new Spotter();
11		-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
	11	+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
12	12	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
13	13
14	14	if (!empty($spotter_array))
15	15	{
16		- $title = sprintf(_("Most Common Airlines by Country between %s (%s), %s - %s (%s), %s"),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']);
	16	+ $title = sprintf(_("Most Common Airlines by Country between %s (%s), %s - %s (%s), %s"), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']);
17	17	require_once('header.php');
18	18	print '<div class="info column">';
19	19	print '<h1>'._("Flights between").' '.$spotter_array[0]['departure_airport_name'].' ('.$spotter_array[0]['departure_airport_icao'].'), '.$spotter_array[0]['departure_airport_country'].' - '.$spotter_array[0]['arrival_airport_name'].' ('.$spotter_array[0]['arrival_airport_icao'].'), '.$spotter_array[0]['arrival_airport_country'].'</h1>';
		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	include('route-sub-menu.php');
25	25	print '<div class="column">';
26	26	print '<h2>'._("Most Common Airlines by Country").'</h2>';
27		- print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."),$spotter_array[0]['departure_airport_name'],$spotter_array[0]['departure_airport_icao'],$spotter_array[0]['departure_airport_country'],$spotter_array[0]['arrival_airport_name'],$spotter_array[0]['arrival_airport_icao'],$spotter_array[0]['arrival_airport_country']).'</p>';
	27	+ print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights between <strong>%s (%s), %s</strong> and <strong>%s (%s), %s</strong>."), $spotter_array[0]['departure_airport_name'], $spotter_array[0]['departure_airport_icao'], $spotter_array[0]['departure_airport_country'], $spotter_array[0]['arrival_airport_name'], $spotter_array[0]['arrival_airport_icao'], $spotter_array[0]['arrival_airport_country']).'</p>';
28	28
29	29	$airline_array = $Spotter->countAllAirlineCountriesByRoute($_GET['departure_airport'], $_GET['arrival_airport']);
30	30	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	var data = google.visualization.arrayToDataTable([
37	37	["'._("Country").'", "'._("# of times").'"], ';
38	38	$country_data = '';
39		- foreach($airline_array as $airline_item)
	39	+ foreach ($airline_array as $airline_item)
40	40	{
41	41	$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';
42	42	}
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	print '</thead>';
71	71	print '<tbody>';
72	72	$i = 1;
73		- foreach($airline_array as $airline_item)
	73	+ foreach ($airline_array as $airline_item)
74	74	{
75	75	print '<tr>';
76	76	print '<td><strong>'.$i.'</strong></td>';

		@@ -1,30 +1,30 @@
		block discarded – undo
1	1	#!/usr/bin/php
2	2	<?php
3		- require_once('../require/settings.php');
4		- if ($globalInstalled) {
5		- echo '$globalInstalled must be set to FALSE in require/settings.php';
6		- exit;
7		- }
8		- require('class.create_db.php');
9		- echo "Create and import all tables...";
10		- create_db::import_all_db('../db/');
11		- echo "Done !\n";
	3	+ require_once('../require/settings.php');
	4	+ if ($globalInstalled) {
	5	+ echo '$globalInstalled must be set to FALSE in require/settings.php';
	6	+ exit;
	7	+ }
	8	+ require('class.create_db.php');
	9	+ echo "Create and import all tables...";
	10	+ create_db::import_all_db('../db/');
	11	+ echo "Done !\n";
12	12
13		- require('class.update_db.php');
14		- echo "Populate all tables...\n";
15		- update_db::update_all();
16		- echo "\nInstall waypoints...(VERY slow!)";
17		- update_db::update_waypoints();
18		- echo "Done !\n";
19		- echo "Install airspace...";
20		- update_db::update_airspace();
21		- echo "Done !\n";
22		- echo 'All is now installed ! Thanks'."\n";
23		- if ($globalSBS1) {
24		- echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
25		- }
26		- if ($globalACARS) {
27		- echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
28		- }
	13	+ require('class.update_db.php');
	14	+ echo "Populate all tables...\n";
	15	+ update_db::update_all();
	16	+ echo "\nInstall waypoints...(VERY slow!)";
	17	+ update_db::update_waypoints();
	18	+ echo "Done !\n";
	19	+ echo "Install airspace...";
	20	+ update_db::update_airspace();
	21	+ echo "Done !\n";
	22	+ echo 'All is now installed ! Thanks'."\n";
	23	+ if ($globalSBS1) {
	24	+ echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
	25	+ }
	26	+ if ($globalACARS) {
	27	+ echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
	28	+ }
29	29
30	30	?>
31	31	\ No newline at end of file

		@@ -1,23 +1,23 @@
		block discarded – undo
1	1	#!/usr/bin/php
2	2	<?php
3		- require_once('../require/settings.php');
4		- if ($globalInstalled) {
5		- echo '$globalInstalled must be set to FALSE in require/settings.php';
6		- exit;
7		- }
8		- require('class.update_db.php');
9		- if (isset($globalVATSIM) && $globalVATSIM) {
	3	+ require_once('../require/settings.php');
	4	+ if ($globalInstalled) {
	5	+ echo '$globalInstalled must be set to FALSE in require/settings.php';
	6	+ exit;
	7	+ }
	8	+ require('class.update_db.php');
	9	+ if (isset($globalVATSIM) && $globalVATSIM) {
10	10	echo "Install VATSIM airlines...";
11	11	update_db::update_vatsim();
12	12	echo "Done !\n";
13		- }
14		- if (isset($globalIVAO) && $globalIVAO) {
	13	+ }
	14	+ if (isset($globalIVAO) && $globalIVAO) {
15	15	if (!file_exists('tmp/ivae_feb2013.zip')) {
16	16	echo "You have to download the file ivae_feb2013.zip from https://www.ivao.aero/softdev/mirrors.asp?software=IvAeDataUp and put it in install/tmp directory";
17	17	} else {
18		- echo "Install IVAO airlines and logos...";
19		- update_db::update_IVAO();
	18	+ echo "Install IVAO airlines and logos...";
	19	+ update_db::update_IVAO();
20	20	echo "Done !\n";
21	21	}
22		- }
	22	+ }
23	23	?>
24	24	\ No newline at end of file

		@@ -68,27 +68,27 @@ discard block
		block discarded – undo
68	68	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
69	69	if (update_schema::check_version(false) == '0') {
70	70	if ($globalDBdriver == 'mysql') {
71		- $error .= create_db::import_all_db('../db/');
	71	+ $error .= create_db::import_all_db('../db/');
72	72	} elseif ($globalDBdriver == 'pgsql') {
73		- $error .= create_db::import_all_db('../db/pgsql/');
	73	+ $error .= create_db::import_all_db('../db/pgsql/');
74	74	}
75	75	if ($error != '') {
76		- $_SESSION['error'] = $error;
	76	+ $_SESSION['error'] = $error;
77	77	}
78	78	$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
79	79	if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
80	80	$_SESSION['install'] = 'populate';
81	81	$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
82	82	} else {
83		- $_SESSION['install'] = 'sources';
84		- $_SESSION['next'] = 'Insert data in source table';
	83	+ $_SESSION['install'] = 'sources';
	84	+ $_SESSION['next'] = 'Insert data in source table';
85	85	}
86	86	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
87	87	print json_encode($result);
88	88	} else {
89	89	$error .= update_schema::check_version(true);
90	90	if ($error != '') {
91		- $_SESSION['error'] = $error;
	91	+ $_SESSION['error'] = $error;
92	92	}
93	93	$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
94	94	$_SESSION['install'] = 'sources';
		@@ -118,25 +118,25 @@ discard block
		block discarded – undo
118	118	$error .= update_db::update_countries();
119	119	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
120	120	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
121		- $_SESSION['install'] = 'notam';
122		- $_SESSION['next'] = 'Populate NOTAM table with externals data';
123		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
124		- print json_encode($result);
	121	+ $_SESSION['install'] = 'notam';
	122	+ $_SESSION['next'] = 'Populate NOTAM table with externals data';
	123	+ $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	124	+ print json_encode($result);
125	125	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
126		- $_SESSION['install'] = 'owner';
127		- $_SESSION['next'] = 'Populate owner table with externals data';
128		- unset($_SESSION['owner']);
129		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
130		- print json_encode($result);
	126	+ $_SESSION['install'] = 'owner';
	127	+ $_SESSION['next'] = 'Populate owner table with externals data';
	128	+ unset($_SESSION['owner']);
	129	+ $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	130	+ print json_encode($result);
131	131	} else {
132		- $_SESSION['install'] = 'sources';
133		- $_SESSION['next'] = 'Insert data in source table';
134		- $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
135		- print json_encode($result);
	132	+ $_SESSION['install'] = 'sources';
	133	+ $_SESSION['next'] = 'Insert data in source table';
	134	+ $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
	135	+ print json_encode($result);
136	136	}
137	137	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
138	138	if (!is_writable('tmp')) {
139		- $error = 'The directory <i>install/tmp</i> must be writable.';
	139	+ $error = 'The directory <i>install/tmp</i> must be writable.';
140	140	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
141	141	print json_encode($result);
142	142	} else {
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	}
153	153	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
154	154	if (!is_writable('tmp')) {
155		- $error = 'The directory <i>install/tmp</i> must be writable.';
	155	+ $error = 'The directory <i>install/tmp</i> must be writable.';
156	156	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
157	157	print json_encode($result);
158	158	} else {
		@@ -185,7 +185,7 @@ discard block
		block discarded – undo
185	185	}
186	186	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
187	187	if (!is_writable('tmp')) {
188		- $error = 'The directory <i>install/tmp</i> must be writable.';
	188	+ $error = 'The directory <i>install/tmp</i> must be writable.';
189	189	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
190	190	print json_encode($result);
191	191	} else {
		@@ -200,7 +200,7 @@ discard block
		block discarded – undo
200	200	}
201	201	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
202	202	if (!is_writable('tmp')) {
203		- $error = 'The directory <i>install/tmp</i> must be writable.';
	203	+ $error = 'The directory <i>install/tmp</i> must be writable.';
204	204	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
205	205	print json_encode($result);
206	206	} else {
		@@ -229,7 +229,7 @@ discard block
		block discarded – undo
229	229	}
230	230	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
231	231	if (!is_writable('tmp')) {
232		- $error = 'The directory <i>install/tmp</i> must be writable.';
	232	+ $error = 'The directory <i>install/tmp</i> must be writable.';
233	233	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
234	234	print json_encode($result);
235	235	} else {
		@@ -244,7 +244,7 @@ discard block
		block discarded – undo
244	244	}
245	245	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
246	246	if (!is_writable('tmp')) {
247		- $error = 'The directory <i>install/tmp</i> must be writable.';
	247	+ $error = 'The directory <i>install/tmp</i> must be writable.';
248	248	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
249	249	print json_encode($result);
250	250	} else {
		@@ -296,17 +296,17 @@ discard block
		block discarded – undo
296	296	*/
297	297	} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'sources') {
298	298	if (isset($_SESSION['sources']) && count($_SESSION['sources']) > 0) {
299		- $sources = $_SESSION['sources'];
	299	+ $sources = $_SESSION['sources'];
300	300
301		- include_once('../require/class.Source.php');
302		- $globalDebug = FALSE;
303		- $Source = new Source();
304		- $Source->deleteAllLocation();
305		- foreach ($sources as $src) {
	301	+ include_once('../require/class.Source.php');
	302	+ $globalDebug = FALSE;
	303	+ $Source = new Source();
	304	+ $Source->deleteAllLocation();
	305	+ foreach ($sources as $src) {
306	306	if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
307		- }
308		- $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
309		- unset($_SESSION['sources']);
	307	+ }
	308	+ $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
	309	+ unset($_SESSION['sources']);
310	310	}
311	311	/*
312	312	if (isset($globalIVAO) && $globalIVAO) $_SESSION['install'] = 'ivao';

		@@ -164,15 +164,21 @@ discard block
		block discarded – undo
164	164
165	165	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
166	166	$_SESSION['install'] = 'vatsim';
167		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
168		- else $_SESSION['next'] = 'Insert VATSIM data';
	167	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	168	+ $_SESSION['next'] = 'Insert IVAO data';
	169	+ } else {
	170	+ $_SESSION['next'] = 'Insert VATSIM data';
	171	+ }
169	172	} elseif (isset($globalVATSIM) && $globalVATSIM) {
170	173	$_SESSION['install'] = 'vatsim';
171	174	$_SESSION['next'] = 'Insert VATSIM data';
172	175	} elseif (isset($globalIVAO) && $globalIVAO) {
173	176	$_SESSION['install'] = 'vatsim';
174		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
175		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	177	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	178	+ $_SESSION['next'] = 'Insert IVAO data';
	179	+ } else {
	180	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	181	+ }
176	182	} elseif (isset($globalphpVMS) && $globalphpVMS) {
177	183	$_SESSION['install'] = 'vatsim';
178	184	$_SESSION['next'] = 'Insert phpVMS data';
		@@ -303,7 +309,9 @@ discard block
		block discarded – undo
303	309	$Source = new Source();
304	310	$Source->deleteAllLocation();
305	311	foreach ($sources as $src) {
306		- if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	312	+ if (isset($src['latitude']) && $src['latitude'] != '') {
	313	+ $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
	314	+ }
307	315	}
308	316	$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
309	317	unset($_SESSION['sources']);
		@@ -314,15 +322,21 @@ discard block
		block discarded – undo
314	322	*/
315	323	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
316	324	$_SESSION['install'] = 'vatsim';
317		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
318		- else $_SESSION['next'] = 'Insert VATSIM data';
	325	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	326	+ $_SESSION['next'] = 'Insert IVAO data';
	327	+ } else {
	328	+ $_SESSION['next'] = 'Insert VATSIM data';
	329	+ }
319	330	} elseif (isset($globalVATSIM) && $globalVATSIM) {
320	331	$_SESSION['install'] = 'vatsim';
321	332	$_SESSION['next'] = 'Insert VATSIM data';
322	333	} elseif (isset($globalIVAO) && $globalIVAO) {
323	334	$_SESSION['install'] = 'vatsim';
324		- if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
325		- else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	335	+ if (file_exists('tmp/ivae_feb2013.zip')) {
	336	+ $_SESSION['next'] = 'Insert IVAO data';
	337	+ } else {
	338	+ $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
	339	+ }
326	340	} elseif (isset($globalphpVMS) && $globalphpVMS) {
327	341	$_SESSION['install'] = 'vatsim';
328	342	$_SESSION['next'] = 'Insert phpVMS data';

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

		@@ -4,13 +4,13 @@
		block discarded – undo
4	4	* This Script will try to find all real arrival airports for all flights in DB
5	5	*
6	6	*/
7		- require_once('../require/settings.php');
8		- if ($globalInstalled) {
9		- echo '$globalInstalled must be set to FALSE in require/settings.php';
10		- exit;
11		- }
12		- require('../require/class.Spotter.php');
13		- $Spotter = new Spotter();
14		- $Spotter->updateArrivalAirports();
	7	+ require_once('../require/settings.php');
	8	+ if ($globalInstalled) {
	9	+ echo '$globalInstalled must be set to FALSE in require/settings.php';
	10	+ exit;
	11	+ }
	12	+ require('../require/class.Spotter.php');
	13	+ $Spotter = new Spotter();
	14	+ $Spotter->updateArrivalAirports();
15	15
16	16	?>
17	17	\ No newline at end of file

Ysurac / FlightAirMap

Push — master ( a4a45b...27c107 )

Status

Category

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

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

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

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

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

Braces +18 added lines, -7 removed lines patch added patch discarded remove patch

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

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

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

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

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

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

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

Braces +23 added lines, -9 removed lines patch added patch discarded remove patch

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

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