Inspection of "Add tracker menu and pages" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( f1954e...8053db )

by Yannick

created 2017-04-11 19:42 UTC

Status

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

@@ -4,8 +4,8 @@  discard block
 block discarded – undo
 require_once('require/class.Language.php');
 
 if (!isset($_GET['aircraft_type'])) {
-        header('Location: '.$globalURL.'/aircraft');
-        die();
+		header('Location: '.$globalURL.'/aircraft');
+		die();
 }
 
 $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
 	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
 	 $airport_airport_array = $Spotter->countAllArrivalAirportsByAircraft($aircraft_type);
-    	?>
+		?>
     	<script type="text/javascript" src="https://www.google.com/jsapi"></script>
     	<script>
     	google.load("visualization", "1", {packages:["geochart"]});

Please login to merge, or discard this patch.

ident-statistics-time.php 1 patch

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

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

Please login to merge, or discard this patch.

atc-geojson.php 1 patch

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

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['ident'].'",';
 			$output .= '"frequency": "'.$spotter_item['frequency'].'",';
 			$radius = $spotter_item['atc_range']*100;
@@ -34,13 +34,13 @@  discard block
 block discarded – undo
 			$output .= '"ivao_name": "'.$spotter_item['ivao_name'].'",';
 			$output .= '"info": "'.$spotter_item['info'].'",';
 			$output .= '"type": "'.$spotter_item['type'].'"';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 	}
 	$output  = substr($output, 0, -1);

Please login to merge, or discard this patch.

search-xml.php 1 patch

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.

route-statistics-airline-country.php 1 patch

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.

search-gpx.php 1 patch

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

@@ -4,55 +4,55 @@
 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);

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/install-action.php 1 patch

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.

		@@ -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';

		@@ -4,8 +4,8 @@ discard block
		block discarded – undo
4	4	require_once('require/class.Language.php');
5	5
6	6	if (!isset($_GET['aircraft_type'])) {
7		- header('Location: '.$globalURL.'/aircraft');
8		- die();
	7	+ header('Location: '.$globalURL.'/aircraft');
	8	+ die();
9	9	}
10	10
11	11	$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	print '<h2>'._("Most Common Arrival Airports").'</h2>';
55	55	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
56	56	$airport_airport_array = $Spotter->countAllArrivalAirportsByAircraft($aircraft_type);
57		- ?>
	57	+ ?>
58	58	<script type="text/javascript" src="https://www.google.com/jsapi"></script>
59	59	<script>
60	60	google.load("visualization", "1", {packages:["geochart"]});

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

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	date_default_timezone_set('UTC');
26	26	//waypoint plotting
27	27	$output .= '{"type": "Feature",';
28		- $output .= '"properties": {';
	28	+ $output .= '"properties": {';
29	29	$output .= '"ident": "'.$spotter_item['ident'].'",';
30	30	$output .= '"frequency": "'.$spotter_item['frequency'].'",';
31	31	$radius = $spotter_item['atc_range']*100;
		@@ -34,13 +34,13 @@ discard block
		block discarded – undo
34	34	$output .= '"ivao_name": "'.$spotter_item['ivao_name'].'",';
35	35	$output .= '"info": "'.$spotter_item['info'].'",';
36	36	$output .= '"type": "'.$spotter_item['type'].'"';
37		- $output .= '},';
38		- $output .= '"geometry": {';
	37	+ $output .= '},';
	38	+ $output .= '"geometry": {';
39	39	$output .= '"type": "Point",';
40	40	$output .= '"coordinates": [';
41		- $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
	41	+ $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
42	42	$output .= ']';
43		- $output .= '}';
	43	+ $output .= '}';
44	44	$output .= '},';
45	45	}
46	46	$output = substr($output, 0, -1);

		@@ -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>';

		@@ -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'].'],';

		@@ -4,55 +4,55 @@
		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);

		@@ -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

Ysurac / FlightAirMap

Push — master ( f1954e...8053db )

Status

Category

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

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

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

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

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

Indentation +40 added lines, -40 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 +34 added lines, -34 removed lines patch added patch discarded remove patch