Ysurac / FlightAirMap

search-rss.php

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
         } 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 @@ 
         } 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 @@ 
                 $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];
@@ -70,8 +78,11 @@ 
 
 $date = date("D, d M Y H:i:s T", time());
 
-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);

airline-statistics-time.php

Braces +1 added lines, -2 removed lines

@@ -41,8 +41,7 @@
 			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" />';
 			}

registration-detailed.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];

contribute.php

Braces +13 added lines, -2 removed lines

@@ -11,10 +11,21 @@
     <p>You can contribute to <?php print $globalName; ?> if you have an ADS-B receiver.</p>
     <h3>You need to : </h3>
     <ul>
-	<li>Create an account on <a href="<?php if (isset($globalContributeLogin)) print $globalContributeLogin.'">'.$globalContributeLogin; else print 'https://login.flightairmap.fr">login.flightairmap.fr'; ?></a></li>
+	<li>Create an account on <a href="<?php if (isset($globalContributeLogin)) {
+	print $globalContributeLogin.'">'.$globalContributeLogin;
+} else {
+	print 'https://login.flightairmap.fr">login.flightairmap.fr';
+}
+?></a></li>
 	<li>Download dump1090 fork from <a href="https://github.com/Ysurac/dump1090">https://github.com/Ysurac/dump1090</a></li>
 	<li>Compile zfamup1090 with <em>make zfamup1090</em> (you need to have libcurl installed)</li>
-	<li>Run zfamup1090 : <em>./zfamup1090 --net-zfam-user YourUsername --net-zfam-pass YourPassword<?php if (isset($globalContributeURL)) print ' --net-zfam-addr '.$globalContributeURL; if (isset($globalContributePort)) print ' --net-zfam-port '.$globalContributePort; ?></em> (add <em>--net-bo-ipaddr ipofbeastsource --net-bo-port portofbeastsource</em> if needed, default to 127.0.0.1 and 30005)</li>
+	<li>Run zfamup1090 : <em>./zfamup1090 --net-zfam-user YourUsername --net-zfam-pass YourPassword<?php if (isset($globalContributeURL)) {
+	print ' --net-zfam-addr '.$globalContributeURL;
+}
+if (isset($globalContributePort)) {
+	print ' --net-zfam-port '.$globalContributePort;
+}
+?></em> (add <em>--net-bo-ipaddr ipofbeastsource --net-bo-port portofbeastsource</em> if needed, default to 127.0.0.1 and 30005)</li>
     </ul>
 </div>
 <?php

search.php

Braces +112 added lines, -31 removed lines

@@ -26,8 +26,12 @@ 
 	} 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:00: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
@@ -41,8 +45,12 @@ 
 	} 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']))
@@ -60,7 +68,7 @@ 
 		$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];
@@ -93,10 +101,15 @@ 
 	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_STRING);
 	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
 	if ($dist != '') {
-		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
-		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
+		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') {
+			$dist = $dist*1.60934;
+		} elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') {
+			$dist = $dist*1.852;
+		}
+	}
+	if (!isset($sql_date)) {
+		$sql_date = '';
 	}
-	if (!isset($sql_date)) $sql_date = '';
 	if ($archive == 1) {
 		$SpotterArchive = new SpotterArchive();
 		$spotter_array = $SpotterArchive->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,'',$origlat,$origlon,$dist);
@@ -164,7 +177,10 @@ 
 		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$_GET['aircraft'].'</span> '; }
 		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$_GET['manufacturer'].'</span> '; }
 		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$_GET['registration'].'</span> '; }
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$_GET['highlights'].'</span> '; }
+		if (isset($_GET['highlights'])) {
+			if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$_GET['highlights'].'</span> ';
+		}
+		}
 		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$_GET['airline'].'</span> '; }
 		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$_GET['airline_country'].'</span> '; }
 		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$_GET['airline_type'].'</span> '; }
@@ -274,7 +290,10 @@ 
 		<fieldset>
 			<div class="form-group">
 				<label><?php echo _("Keywords"); ?></label> 
-				<input type="text" id="q" name="q" value="<?php if (isset($_GET['q'])) print $_GET['q']; ?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
+				<input type="text" id="q" name="q" value="<?php if (isset($_GET['q'])) {
+	print $_GET['q'];
+}
+?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
 			</div>
 		</fieldset>
 		<div class="advanced-form">
@@ -286,41 +305,62 @@ 
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $_GET['manufacturer']; ?>')</script>
+				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) {
+	print $_GET['manufacturer'];
+}
+?>')</script>
 				<div class="form-group">
 					<label><?php echo _("Type"); ?></label> 
 					<select name="aircraft" id="aircrafttypes" class="selectpicker" data-live-search="true">
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $_GET['aircraft_icao']; ?>');</script>
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) {
+	print $_GET['aircraft_icao'];
+}
+?>');</script>
 				<div class="form-group">
 					<label><?php echo _("Registration"); ?></label> 
-					<input type="text" name="registration" value="<?php if (isset($_GET['registration'])) print $_GET['registration']; ?>" size="8" />
+					<input type="text" name="registration" value="<?php if (isset($_GET['registration'])) {
+	print $_GET['registration'];
+}
+?>" size="8" />
 				</div>
 <?php
 if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 ?>
 				<div class="form-group">
 					<label><?php echo _("Pilot id"); ?></label> 
-					<input type="text" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) print $_GET['pilot_id']; ?>" size="15" />
+					<input type="text" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) {
+	print $_GET['pilot_id'];
+}
+?>" size="15" />
 				</div>
 				<div class="form-group">
 					<label><?php echo _("Pilot name"); ?></label> 
-					<input type="text" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) print $_GET['pilot_name']; ?>" size="15" />
+					<input type="text" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) {
+	print $_GET['pilot_name'];
+}
+?>" size="15" />
 				</div>
 <?php
-}else {
+} else {
 ?>
 				<div class="form-group">
 					<label><?php echo _("Owner name"); ?></label> 
-					<input type="text" name="owner" value="<?php if (isset($_GET['owner'])) print $_GET['owner']; ?>" size="15" />
+					<input type="text" name="owner" value="<?php if (isset($_GET['owner'])) {
+	print $_GET['owner'];
+}
+?>" size="15" />
 				</div>
 <?php
 }
 ?>
 				<div class="form-group checkbox">
-					<div><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>
+					<div><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) {
+	if ($_GET['highlights'] == "true"){ print 'checked="checked"';
+}
+} ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>
 				</div>
 			</fieldset>
 			<fieldset>
@@ -331,23 +371,41 @@ 
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $_GET['airline']; ?>');</script>
+				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) {
+	print $_GET['airline'];
+}
+?>');</script>
 				<div class="form-group">
 					<label><?php echo _("Country"); ?></label> 
 					<select name="airline_country" id="airlinecountries" class="selectpicker" data-live-search="true">
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $_GET['airline_country']; ?>');</script>
+				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) {
+	print $_GET['airline_country'];
+}
+?>');</script>
 				<div class="form-group">
 					<label><?php echo _("Callsign"); ?></label> 
-					<input type="text" name="callsign" value="<?php if (isset($_GET['callsign'])) print $_GET['callsign']; ?>" size="8" />
+					<input type="text" name="callsign" value="<?php if (isset($_GET['callsign'])) {
+	print $_GET['callsign'];
+}
+?>" size="8" />
 				</div>
 				<div class="form-group radio">
 					<div><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <label for="airline_type_all"><?php echo _("All airlines types"); ?></label></div>
-					<div><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <label for="airline_type_passenger"><?php echo _("Only Passenger airlines"); ?></label></div>
-					<div><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <label for="airline_type_cargo"><?php echo _("Only Cargo airlines"); ?></label></div>
-					<div><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <label for="airline_type_military"><?php echo _("Only Military airlines"); ?></label></div>
+					<div><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) {
+	if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"';
+}
+} ?>> <label for="airline_type_passenger"><?php echo _("Only Passenger airlines"); ?></label></div>
+					<div><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) {
+	if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"';
+}
+} ?>> <label for="airline_type_cargo"><?php echo _("Only Cargo airlines"); ?></label></div>
+					<div><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) {
+	if ( $_GET['airline_type'] == "military"){ print 'checked="checked"';
+}
+} ?>> <label for="airline_type_military"><?php echo _("Only Military airlines"); ?></label></div>
 				</div>
 			</fieldset>
 			<fieldset>
@@ -358,14 +416,20 @@ 
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $_GET['airport_icao']; ?>');</script>
+				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) {
+	print $_GET['airport_icao'];
+}
+?>');</script>
 				<div class="form-group">
 					<label><?php echo _("Country"); ?></label> 
 					<select name="airport_country" id="airportcountries" class="selectpicker" data-live-search="true">
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $_GET['airport_country']; ?>');</script>
+				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) {
+	print $_GET['airport_country'];
+}
+?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend><?php echo _("Route"); ?></legend>
@@ -375,21 +439,30 @@ 
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $_GET['departure_airport_route']; ?>');</script>
+				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) {
+	print $_GET['departure_airport_route'];
+}
+?>');</script>
 				<div class="form-group">
 					<label><?php echo _("Arrival Airport"); ?></label> 
 					<select name="arrival_airport_route" id="arrivalairportnames" class="selectpicker" data-live-search="true">
 						<option></option>
 					</select>
 				</div>
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $_GET['arrival_airport_route']; ?>');</script>
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) {
+	print $_GET['arrival_airport_route'];
+}
+?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend><?php echo _("Date"); ?></legend>
 				<div class="form-group">
 					<label><?php echo _("Start Date"); ?></label>
 					<div class='input-group date' id='datetimepicker1'>
-						<input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date'])) print $_GET['start_date']; ?>" placeholder="<?php echo _("Start Date/Time"); ?>" />
+						<input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date'])) {
+	print $_GET['start_date'];
+}
+?>" placeholder="<?php echo _("Start Date/Time"); ?>" />
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-calendar"></span>
 						</span>
@@ -398,7 +471,10 @@ 
 				<div class="form-group">
 					<label><?php echo _("End Date"); ?></label>
 					<div class='input-group date' id='datetimepicker2'>
-						<input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date'])) print $_GET['end_date']; ?>" placeholder="<?php echo _("End Date/Time"); ?>" />
+						<input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date'])) {
+	print $_GET['end_date'];
+}
+?>" placeholder="<?php echo _("End Date/Time"); ?>" />
 						<span class="input-group-addon">
 							<span class="glyphicon glyphicon-calendar"></span>
 						</span>
@@ -474,7 +550,12 @@ 
 				<input type="text" name="origlon" class="form-control" placeholder="<?php echo _("Center point longitude"); ?>" />
 			</div>
 			<div class="form-group">
-				<label><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) print $globalDistanceUnit; else print 'km'; print ')'; ?></label>
+				<label><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) {
+	print $globalDistanceUnit;
+} else {
+	print 'km';
+}
+print ')'; ?></label>
 				<input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" />
 			</div>
 		</fieldset>

currently.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	$limit_start = 0;
 	$limit_end = 25;
 	$absolute_difference = 25;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];

date-statistics-airline-country.php

Braces +5 added lines, -2 removed lines

@@ -6,8 +6,11 @@
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
-else $spotter_array = array();
+if (isset($_GET['date'])) {
+	$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

footer.php

Braces +4 added lines, -1 removed lines

@@ -9,7 +9,10 @@
 	<?php
 	    }
 	?>
-	<span>Developed in Barrie by <a href="http://www.mariotrunz.com" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span>
+	<span>Developed in Barrie by <a href="http://www.mariotrunz.com" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span>
 </footer>
 
 <div class="notifications bottom-left"></div>

tools-acars.php

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 print '<fieldset class="form-group">';
 print '<label for="acars_message">'._("ACARS Message").'</label>';
 print '<textarea class="form-control" name="acars_message" id="acars_message" rows="5">';
-if ($message != '') print $message;
+if ($message != '') {
+	print $message;
+}
 print '</textarea>';
 print '</fieldset>';
 print '<button type="submit" class="btn btn-primary">Submit</button>';