Ysurac / FlightAirMap

aircraft-statistics-arrival-airport-country.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 	print '<option></option>';
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types)) {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	foreach($aircraft_types as $aircrafttype)
 	{
 		if($aircraft_type == $aircrafttype['aircraft_icao'])

aircraft-statistics-departure-airport.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 	print '<option></option>';
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types)) {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	foreach($aircraft_types as $aircrafttype)
 	{
 		if($aircraft_type == $aircrafttype['aircraft_icao'])

aircraft-statistics-arrival-airport.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 	print '<option></option>';
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types)) {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	foreach($aircraft_types as $aircrafttype)
 	{
 		if($aircraft_type == $aircrafttype['aircraft_icao'])

aircraft-statistics-registration.php

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 	print '<option></option>';
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types)) {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	foreach($aircraft_types as $aircrafttype)
 	{
 		if($aircraft_type == $aircrafttype['aircraft_icao'])

airport.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];

search.php

Braces +116 added lines, -32 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> '; }
@@ -275,7 +291,10 @@ 
 			<div class="form-group">
 				<label class="control-label col-sm-2"><?php echo _("Keywords"); ?></label>
 				<div class="col-sm-10">
-					<input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) print $_GET['q']; ?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
+					<input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) {
+	print $_GET['q'];
+}
+?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
 				</div>
 			</div>
 		</fieldset>
@@ -290,7 +309,10 @@ 
 					    </select>
 					</div>
 				</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 class="control-label col-sm-2"><?php echo _("Type"); ?></label>
 						<div class="col-sm-10">
@@ -299,11 +321,17 @@ 
 							</select>
 						</div>
 				</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 class="control-label col-sm-2"><?php echo _("Registration"); ?></label> 
 					<div class="col-sm-10">
-						<input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) print $_GET['registration']; ?>" size="8" />
+						<input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) {
+	print $_GET['registration'];
+}
+?>" size="8" />
 					</div>
 				</div>
 <?php
@@ -312,22 +340,31 @@ 
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Pilot id"); ?></label> 
 					<div class="col-sm-10">
-						<input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) print $_GET['pilot_id']; ?>" size="15" />
+						<input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) {
+	print $_GET['pilot_id'];
+}
+?>" size="15" />
 					</div>
 				</div>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Pilot name"); ?></label> 
 					<div class="col-sm-10">
-						<input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) print $_GET['pilot_name']; ?>" size="15" />
+						<input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) {
+	print $_GET['pilot_name'];
+}
+?>" size="15" />
 					</div>
 				</div>
 <?php
-}else {
+} else {
 ?>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
 					<div class="col-sm-10">
-						<input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) print $_GET['owner']; ?>" size="15" />
+						<input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) {
+	print $_GET['owner'];
+}
+?>" size="15" />
 					</div>
 				</div>
 <?php
@@ -335,8 +372,14 @@ 
 ?>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-					<!--<div><input type="checkbox" class="form-control" 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>-->
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
+					<!--<div><input type="checkbox" class="form-control" 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>-->
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) {
+	if ($_GET['highlights'] == "true"){ print 'checked="checked"';
+}
+} ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -350,7 +393,10 @@ 
 						</select>
 					</div>
 				</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 class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -359,19 +405,34 @@ 
 						</select>
 					</div>
 				</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 class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> 
 					<div class="col-sm-10">
-						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $_GET['callsign']; ?>" size="8" />
+						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) {
+	print $_GET['callsign'];
+}
+?>" size="8" />
 					</div>
 				</div>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
 						<label class="radio-inline"><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"'; } ?>> <?php echo _("All airlines types"); ?></label>
-						<label class="radio-inline"><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"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
-						<label class="radio-inline"><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"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
-						<label class="radio-inline"><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"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
+						<label class="radio-inline"><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"';
+}
+} ?>> <?php echo _("Only Passenger airlines"); ?></label>
+						<label class="radio-inline"><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"';
+}
+} ?>> <?php echo _("Only Cargo airlines"); ?></label>
+						<label class="radio-inline"><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"';
+}
+} ?>> <?php echo _("Only Military airlines"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -385,7 +446,10 @@ 
 						</select>
 					</div>
 				</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 class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -394,7 +458,10 @@ 
 						</select>
 					</div>
 				</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>
@@ -406,7 +473,10 @@ 
 						</select>
 					</div>
 				</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 class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> 
 					<div class="col-sm-10">
@@ -415,7 +485,10 @@ 
 						</select>
 					</div>
 				</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>
@@ -423,7 +496,10 @@ 
 					<label class="control-label col-sm-2"><?php echo _("Start Date"); ?></label>
 					<div class="col-sm-10">
 						<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>
@@ -434,7 +510,10 @@ 
 					<label class="control-label col-sm-2"><?php echo _("End Date"); ?></label>
 					<div class="col-sm-10">
 						<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>
@@ -517,7 +596,12 @@ 
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) print $globalDistanceUnit; else print 'km'; print ')'; ?></label>
+				<label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) {
+	print $globalDistanceUnit;
+} else {
+	print 'km';
+}
+print ')'; ?></label>
 				<div class="col-sm-10">
 					<input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" />
 				</div>

manufacturer-statistics-aircraft.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
 	print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 	$Stats = new Stats();
 	$all_manufacturers = $Stats->getAllManufacturers();
-	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
+	if (empty($all_manufacturers)) {
+		$all_manufacturers = $Spotter->getAllManufacturers();
+	}
 	foreach($all_manufacturers as $all_manufacturer)
 	{
 		if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))

manufacturer-statistics-airline-country.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
 	print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 	$Stats = new Stats();
 	$all_manufacturers = $Stats->getAllManufacturers();
-	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
+	if (empty($all_manufacturers)) {
+		$all_manufacturers = $Spotter->getAllManufacturers();
+	}
 	foreach($all_manufacturers as $all_manufacturer)
 	{
 		if($GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))

manufacturer-detailed.php

Braces +4 added lines, -2 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];
@@ -47,7 +47,9 @@ 
 		print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 		$Stats = new Stats();
 		$all_manufacturers = $Stats->getAllManufacturers();
-		if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
+		if (empty($all_manufacturers)) {
+			$all_manufacturers = $Spotter->getAllManufacturers();
+		}
 		foreach($all_manufacturers as $all_manufacturer)
 		{
 			if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))