Ysurac / FlightAirMap

install/index.php

Braces +446 added lines, -119 removed lines

@@ -131,45 +131,72 @@ 
 			</div>
 			<p>
 				<label for="dbhost">Database hostname</label>
-				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) print $globalDBhost; ?>" />
+				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) {
+	print $globalDBhost;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbport">Database port</label>
-				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) print $globalDBport; ?>" />
+				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) {
+	print $globalDBport;
+}
+?>" />
 				<p class="help-block">Default is 3306 for MariaDB/MySQL, 5432 for PostgreSQL</p>
 			</p>
 			<p>
 				<label for="dbname">Database name</label>
-				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) print $globalDBname; ?>" />
+				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) {
+	print $globalDBname;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbuser">Database user</label>
-				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) print $globalDBuser; ?>" />
+				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) {
+	print $globalDBuser;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbuserpass">Database user password</label>
-				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) print $globalDBpass; ?>" />
+				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) {
+	print $globalDBpass;
+}
+?>" />
 			</p>
 		</fieldset>
 		<fieldset id="site">
 			<legend>Site configuration</legend>
 			<p>
 				<label for="sitename">Site name</label>
-				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) print $globalName; ?>" />
+				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) {
+	print $globalName;
+}
+?>" />
 			</p>
 			<p>
 				<label for="siteurl">Site directory</label>
-				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" />
+				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>" />
 				<p class="help-block">Can be null. ex : <i>flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
 			</p>
 			<p>
 				<label for="timezone">Timezone</label>
-				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) print $globalTimezone; ?>" />
+				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) {
+	print $globalTimezone;
+}
+?>" />
 				<p class="help-block">ex : UTC, Europe/Paris,...</p>
 			</p>
 			<p>
 				<label for="language">Language</label>
-				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) print $globalLanguage; ?>" />
+				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) {
+	print $globalLanguage;
+}
+?>" />
 				<p class="help-block">Used only when link to wikipedia for now. Can be EN,DE,FR,...</p>
 			</p>
 		</fieldset>
@@ -190,11 +217,17 @@ 
 			<div id="mapbox_data">
 				<p>
 					<label for="mapboxid">Mapbox id</label>
-					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) print $globalMapboxId; ?>" />
+					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) {
+	print $globalMapboxId;
+}
+?>" />
 				</p>
 				<p>
 					<label for="mapboxtoken">Mapbox token</label>
-					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) print $globalMapboxToken; ?>" />
+					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) {
+	print $globalMapboxToken;
+}
+?>" />
 				</p>
 				<p class="help-block">Get a key <a href="https://www.mapbox.com/developers/">here</a></p>
 			</div>
@@ -202,7 +235,10 @@ 
 			<div id="google_data">
 				<p>
 					<label for="googlekey">Google API key</label>
-					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) print $globalGoogleAPIKey; ?>" />
+					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) {
+	print $globalGoogleAPIKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key">here</a></p>
 				</p>
 			</div>
@@ -210,7 +246,10 @@ 
 			<div id="bing_data">
 				<p>
 					<label for="bingkey">Bing Map key</label>
-					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) print $globalBingMapKey; ?>" />
+					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) {
+	print $globalBingMapKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://www.bingmapsportal.com/">here</a></p>
 				</p>
 			</div>
@@ -218,7 +257,10 @@ 
 			<div id="mapquest_data">
 				<p>
 					<label for="mapquestkey">MapQuest key</label>
-					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) print $globalMapQuestKey; ?>" />
+					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) {
+	print $globalMapQuestKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://developer.mapquest.com/user/me/apps">here</a></p>
 				</p>
 			</div>
@@ -226,11 +268,17 @@ 
 			<div id="here_data">
 				<p>
 					<label for="hereappid">Here App_Id</label>
-					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) print $globalHereappId; ?>" />
+					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) {
+	print $globalHereappId;
+}
+?>" />
 				</p>
 				<p>
 					<label for="hereappcode">Here App_Code</label>
-					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) print $globalHereappCode; ?>" />
+					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) {
+	print $globalHereappCode;
+}
+?>" />
 				</p>
 				<p class="help-block">Get a key <a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/quick-start.html">here</a></p>
 			</div>
@@ -239,42 +287,86 @@ 
 			<legend>Coverage area</legend>
 			<p>
 				<label for="latitudemax">The maximum latitude (north)</label>
-				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" />
+				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) {
+	print $globalLatitudeMax;
+}
+?>" />
 			</p>
 			<p>
 				<label for="latitudemin">The minimum latitude (south)</label>
-				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" />
+				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) {
+	print $globalLatitudeMin;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudemax">The maximum longitude (west)</label>
-				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" />
+				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) {
+	print $globalLongitudeMax;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudemin">The minimum longitude (east)</label>
-				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" />
+				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) {
+	print $globalLongitudeMin;
+}
+?>" />
 			</p>
 			<p>
 				<label for="latitudecenter">The latitude center</label>
-				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" />
+				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) {
+	print $globalCenterLatitude;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudecenter">The longitude center</label>
-				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" />
+				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) {
+	print $globalCenterLongitude;
+}
+?>" />
 			</p>
 			<p>
 				<label for="livezoom">Default Zoom on live map</label>
-				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" />
+				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>" />
 			</p>
 			<p>
 				<label for="squawk_country">Country for squawk usage</label>
 				<select name="squawk_country" id="squawk_country">
-					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option>
-					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option>
-					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option>
-					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option>
-					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option>
-					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option>
-					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option>
+					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') {
+	print ' selected ';
+}
+?>>UK</option>
+					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') {
+	print ' selected ';
+}
+?>>NZ</option>
+					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') {
+	print ' selected ';
+}
+?>>US</option>
+					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') {
+	print ' selected ';
+}
+?>>AU</option>
+					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') {
+	print ' selected ';
+}
+?>>NL</option>
+					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') {
+	print ' selected ';
+}
+?>>FR</option>
+					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') {
+	print ' selected ';
+}
+?>>TR</option>
 				</select>
 			</p>
 		</fieldset>
@@ -283,15 +375,24 @@ 
 			<p><i>Only put in DB flights that are inside a circle</i></p>
 			<p>
 				<label for="latitude">Center latitude</label>
-				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" />
+				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) {
+	echo $globalDistanceIgnore['latitude'];
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitude">Center longitude</label>
-				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" />
+				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) {
+	echo $globalDistanceIgnore['longitude'];
+}
+?>" />
 			</p>
 			<p>
 				<label for="Distance">Distance (in km)</label>
-				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" />
+				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) {
+	echo $globalDistanceIgnore['distance'];
+}
+?>" />
 			</p>
 		</fieldset>
 		<fieldset id="sourceloc">
@@ -397,11 +498,17 @@ 
 			<div id="flightaware_data">
 				<p>
 					<label for="flightawareusername">FlightAware username</label>
-					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" />
+					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) {
+	print $globalFlightAwareUsername;
+}
+?>" />
 				</p>
 				<p>
 					<label for="flightawarepassword">FlightAware password/API key</label>
-					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" />
+					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) {
+	print $globalFlightAwarePassword;
+}
+?>" />
 				</p>
 			</div>
 -->
@@ -461,28 +568,88 @@ 
 								?>
 								<td>
 									<select name="format[]" id="format">
-										<option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option>
-										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option>
-										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option>
-										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option>
-										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option>
-										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option>
-										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option>
-										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server AircraftList.json</option>
-										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') print 'selected'; ?>>Virtual Radar Server TCP</option>
-										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option>
-										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option>
-										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option>
-										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option>
-										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option>
-										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
-										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS SBS-3 over TCP</option>
-										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option>
+										<option value="auto" <?php if (!isset($source['format'])) {
+	print 'selected';
+}
+?>>Auto</option>
+										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') {
+	print 'selected';
+}
+?>>SBS</option>
+										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') {
+	print 'selected';
+}
+?>>TSV</option>
+										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') {
+	print 'selected';
+}
+?>>Raw</option>
+										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') {
+	print 'selected';
+}
+?>>APRS</option>
+										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') {
+	print 'selected';
+}
+?>>Radarcape deltadb.txt</option>
+										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') {
+	print 'selected';
+}
+?>>Vatsim</option>
+										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') {
+	print 'selected';
+}
+?>>Virtual Radar Server AircraftList.json</option>
+										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') {
+	print 'selected';
+}
+?>>Virtual Radar Server TCP</option>
+										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
+	print 'selected';
+}
+?>>phpVMS</option>
+										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') {
+	print 'selected';
+}
+?>>Virtual Airlines Manager</option>
+										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') {
+	print 'selected';
+}
+?>>IVAO</option>
+										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') {
+	print 'selected';
+}
+?>>FlightGear Multiplayer</option>
+										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') {
+	print 'selected';
+}
+?>>FlightGear Singleplayer</option>
+										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') {
+	print 'selected';
+}
+?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
+										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') {
+	print 'selected';
+}
+?>>ACARS SBS-3 over TCP</option>
+										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') {
+	print 'selected';
+}
+?>>NMEA AIS over TCP</option>
 									</select>
 								</td>
-								<td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" /></td>
-								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) print 'checked'; ?> /></td>
-								<td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) print 'checked'; ?> /></td>
+								<td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) {
+	print $source['name'];
+}
+?>" /></td>
+								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) {
+	print 'checked';
+}
+?> /></td>
+								<td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) {
+	print 'checked';
+}
+?> /></td>
 								<td><input type="button" id="delhost" value="Delete" onclick="deleteRow(this)" /> <input type="button" id="addhost" value="Add" onclick="insRow()" /></td>
 							</tr>
 <?php
@@ -531,11 +698,17 @@ 
 					<p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p>
 					<p>
 						<label for="acarshost">ACARS UDP host</label>
-						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" />
+						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) {
+	print $globalACARSHost;
+}
+?>" />
 					</p>
 					<p>
 						<label for="acarsport">ACARS UDP port</label>
-						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" />
+						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) {
+	print $globalACARSPort;
+}
+?>" />
 					</p>
 				</fieldset>
 			</div>
@@ -615,13 +788,19 @@ 
 			<div id="schedules_options">
 				<p>
 					<label for="britishairways">British Airways API Key</label>
-					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" />
+					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) {
+	print $globalBritishAirwaysKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p>
 				</p>
 				<!--
 				<p>
 					<label for="transavia">Transavia Test API Consumer Key</label>
-					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" />
+					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) {
+	print $globalTransaviaKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p>
 				</p>
 				-->
@@ -630,10 +809,16 @@ 
 						<b>Lufthansa API Key</b>
 						<p>
 							<label for="lufthansakey">Key</label>
-							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" />
+							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) {
+	print $globalLufthansaKey['key'];
+}
+?>" />
 						</p><p>
 							<label for="lufthansasecret">Secret</label>
-							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" />
+							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) {
+	print $globalLufthansaKey['secret'];
+}
+?>" />
 						</p>
 					</div>
 					<p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p>
@@ -653,7 +838,10 @@ 
 			</p>
 			<p>
 				<label for="notamsource">URL of your feed from notaminfo.com</label>
-				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" />
+				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) {
+	print $globalNOTAMSource;
+}
+?>" />
 				<p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p>
 			</p>
 			<br />
@@ -669,14 +857,20 @@ 
 			<div id="metarsrc">
 				<p>
 					<label for="metarsource">URL of your METAR source</label>
-					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" />
+					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) {
+	print $globalMETARurl;
+}
+?>" />
 					<p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p>
 				</p>
 			</div>
 			<br />
 			<p>
 				<label for="bitly">Bit.ly access token api (used in search page)</label>
-				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" />
+				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) {
+	print $globalBitlyAccessToken;
+}
+?>" />
 			</p>
 			<br />
 			<p>
@@ -696,7 +890,12 @@ 
 			</p>
 			<p>
 				<label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label>
-				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '0'; ?>" />
+				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) {
+	print $globalArchiveMonths;
+} else {
+	echo '0';
+}
+?>" />
 				<p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p>
 			</p>
 			<p>
@@ -706,12 +905,22 @@ 
 			</p>
 			<p>
 				<label for="archivekeepmonths">Keep flights data for xx months in archive</label>
-				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '0'; ?>" />
+				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) {
+	print $globalArchiveKeepMonths;
+} else {
+	echo '0';
+}
+?>" />
 				<p class="help-block">0 to disable</p>
 			</p>
 			<p>
 				<label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label>
-				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '0'; ?>" />
+				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) {
+	print $globalArchiveKeepTrackMonths;
+} else {
+	echo '0';
+}
+?>" />
 				<p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p>
 			</p>
 			<br />
@@ -721,7 +930,12 @@ 
 				<p class="help-block">Uncheck if the script is running as cron job</p>
 				<div id="cronends"> 
 					<label for="cronend">Run script for xx seconds</label>
-					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" />
+					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) {
+	print $globalCronEnd;
+} else {
+	print '0';
+}
+?>" />
 					<p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p>
 				</div>
 			</p>
@@ -766,15 +980,30 @@ 
 			<br />
 			<p>
 				<label for="refresh">Show flights detected since xxx seconds</label>
-				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" />
+				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) {
+	echo $globalLiveInterval;
+} else {
+	echo '200';
+}
+?>" />
 			</p>
 			<p>
 				<label for="maprefresh">Live map refresh (in seconds)</label>
-				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" />
+				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) {
+	echo $globalMapRefresh;
+} else {
+	echo '30';
+}
+?>" />
 			</p>
 			<p>
 				<label for="mapidle">Map idle timeout (in minutes)</label>
-				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" />
+				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) {
+	echo $globalMapIdleTimeout;
+} else {
+	echo '30';
+}
+?>" />
 				<p class="help-block">0 to disable</p>
 			</p>
 			<p>
@@ -784,12 +1013,20 @@ 
 			<br />
 			<p>
 				<label for="closestmindist">Distance to airport set as arrival (in km)</label>
-				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" />
+				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) {
+	echo $globalClosestMinDist;
+} else {
+	echo '50';
+}
+?>" />
 			</p>
 			<br />
 			<p>
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) {
+	echo $globalAircraftSize;
+}
+?>" />
 			</p>
 			<br />
 			<p>
@@ -797,7 +1034,12 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 			?>
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
-				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
+				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) {
+	echo $globalAircraftIconColor;
+} else {
+	echo '1a3151';
+}
+?>" />
 			<?php
 				if (!is_writable('../cache')) {
 			?>
@@ -815,8 +1057,18 @@ 
 			<p>
 				<label for="airportzoom">Zoom level minimum to see airports icons</label>
 				<div class="range">
-					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" />
-					<output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output>
+					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) {
+	echo $globalAirportZoom;
+} else {
+	echo '7';
+}
+?>" />
+					<output id="range"><?php if (isset($globalAirportZoom)) {
+	echo $globalAirportZoom;
+} else {
+	echo '7';
+}
+?></output>
 				</div>
 			</p>
 		</fieldset>
@@ -844,8 +1096,12 @@ 
 	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
 	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
 
-	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
-	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
+	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) {
+		$error .= 'Mysql driver for PDO must be loaded';
+	}
+	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) {
+		$error .= 'PosgreSQL driver for PDO must be loaded';
+	}
 	
 	$_SESSION['database_root'] = $dbroot;
 	$_SESSION['database_rootpass'] = $dbrootpass;
@@ -912,15 +1168,23 @@ 
 	$source_city = $_POST['source_city'];
 	$source_country = $_POST['source_country'];
 	$source_ref = $_POST['source_ref'];
-	if (isset($source_id)) $source_id = $_POST['source_id'];
-	else $source_id = array();
+	if (isset($source_id)) {
+		$source_id = $_POST['source_id'];
+	} else {
+		$source_id = array();
+	}
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    if (isset($source_id[$keys])) {
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
+	    } else {
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    }
+	}
+	if (count($sources) > 0) {
+		$_SESSION['sources'] = $sources;
 	}
-	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -940,14 +1204,23 @@ 
 	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
 
 	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
+	if ($globalaircraft == 'aircraft') {
+		$settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
+	}
 	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
+	if ($globaltracker == 'tracker') {
+		$settings = array_merge($settings,array('globalTracker' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalTracker' => 'FALSE'));
+	}
 	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
+	if ($globalmarine == 'marine') {
+		$settings = array_merge($settings,array('globalMarine' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalMarine' => 'FALSE'));
+	}
 
 /*	
 	$globalSBS1Hosts = array();
@@ -968,17 +1241,31 @@ 
 	$port = $_POST['port'];
 	$name = $_POST['name'];
 	$format = $_POST['format'];
-	if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats'];
-	else $sourcestats = array();
-	if (isset($_POST['noarchive'])) $noarchive = $_POST['noarchive'];
-	else $noarchive = array();
+	if (isset($_POST['sourcestats'])) {
+		$sourcestats = $_POST['sourcestats'];
+	} else {
+		$sourcestats = array();
+	}
+	if (isset($_POST['noarchive'])) {
+		$noarchive = $_POST['noarchive'];
+	} else {
+		$noarchive = array();
+	}
 	$gSources = array();
 	foreach ($host as $key => $h) {
-		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
-		else $cov = 'FALSE';
-		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
-		else $arch = 'FALSE';
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch);
+		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) {
+			$cov = 'TRUE';
+		} else {
+			$cov = 'FALSE';
+		}
+		if (isset($noarchive[$key]) && $noarchive[$key] == 1) {
+			$arch = 'TRUE';
+		} else {
+			$arch = 'FALSE';
+		}
+		if ($h != '') {
+			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch);
+		}
 	}
 	$settings = array_merge($settings,array('globalSources' => $gSources));
 
@@ -1003,7 +1290,9 @@ 
 	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
 		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+	} else {
+		$settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+	}
 
 	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
 	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
@@ -1042,7 +1331,9 @@ 
 
 	// Create in settings.php keys not yet configurable if not already here
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	if (!isset($globalDebug)) {
+		$settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	}
 
 	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
 	if ($resetyearstats == 'resetyearstats') {
@@ -1079,27 +1370,43 @@ 
 	}
 */
 	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	if ($globalsbs == 'sbs') {
+		$settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
+	}
+	if ($globalaprs == 'aprs') {
+		$settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	}
 	if ($globalivao == 'ivao') {
 		//$settings = array_merge($settings,array('globalIVAO' => 'TRUE','globalVATSIM' => 'FALSE'));
 		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	}
 	if ($globalvatsim == 'vatsim') {
 		//$settings = array_merge($settings,array('globalVATSIM' => 'TRUE','globalIVAO' => 'FALSE'));
 		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	}
 	if ($globalphpvms == 'phpvms') {
 		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	}
 	if ($globalvam == 'vam') {
 		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	}
 	if ($globalvatsim == 'vatsim' || $globalivao == 'ivao' || $globalphpvms == 'phpvms') {
 		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+	}
 	
 
 
@@ -1241,7 +1548,9 @@ 
 		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
 	}
 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	if (!isset($globalTransaction)) {
+		$settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	}
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
@@ -1256,15 +1565,23 @@ 
 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
 
-	if ($error == '') settings::modify_settings($settings);
-	if ($error == '') settings::comment_settings($settings_comment);
+	if ($error == '') {
+		settings::modify_settings($settings);
+	}
+	if ($error == '') {
+		settings::comment_settings($settings_comment);
+	}
 	if ($error != '') {
 		print '<div class="info column">'.$error.'</div>';
 		require('../footer.php');
 		exit;
 	} else {
-		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1;
-		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1;
+		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') {
+			$_SESSION['waypoints'] = 1;
+		}
+		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') {
+			$_SESSION['owner'] = 1;
+		}
 		if (isset($_POST['createdb'])) {
 			$_SESSION['install'] = 'database_create';
 		} else {
@@ -1305,10 +1622,18 @@ 
 	$popw = false;
 	foreach ($_SESSION['done'] as $done) {
 	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
-	    if ($done == 'Create database') $pop = true;
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
+	    if ($done == 'Create database') {
+	    	$pop = true;
+	    }
+	    if ($_SESSION['install'] == 'database_create') {
+	    	$pop = true;
+	    }
+	    if ($_SESSION['install'] == 'database_import') {
+	    	$popi = true;
+	    }
+	    if ($_SESSION['install'] == 'waypoints') {
+	    	$popw = true;
+	    }
 	}
 	if ($pop) {
 	    sleep(5);
@@ -1319,7 +1644,9 @@ 
 	} else if ($popw) {
 	    sleep(5);
 	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
-	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
+	} else {
+		print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
+	}
 	print '</div></ul>';
 	print '<div id="error"></div>';
 /*	foreach ($_SESSION['done'] as $done) {

require/class.Image.php

Braces +203 added lines, -75 removed lines

@@ -23,7 +23,9 @@ 
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
 		$reg = $registration;
-		if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao;
+		if ($reg == '' && $aircraft_icao != '') {
+			$reg = $aircraft_icao.$airline_icao;
+		}
 		$reg = trim($reg);
 		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration 
 			FROM spotter_image 
@@ -31,9 +33,13 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $reg));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (!empty($result)) return $result;
-		elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
-		else return array();
+		if (!empty($result)) {
+			return $result;
+		} elseif ($registration != '') {
+			return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -76,8 +82,11 @@ 
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
-		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
-		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
+		if (isset($exif['COMPUTED']['copyright'])) {
+			$copyright = $exif['COMPUTED']['copyright'];
+		} elseif (isset($exif['copyright'])) {
+			$copyright = $exif['copyright'];
+		}
 		if ($copyright != '') {
 			$copyright = str_replace('Copyright ','',$copyright);
 			$copyright = str_replace('© ','',$copyright);
@@ -95,17 +104,27 @@ 
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch;
-		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
+		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) {
+			return '';
+		}
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
-		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
-		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
-		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		if ($globalDebug && $registration != '') {
+			echo 'Try to find an aircraft image for '.$registration.'...';
+		} elseif ($globalDebug && $aircraft_icao != '') {
+			echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
+		} elseif ($globalDebug && $airline_icao != '') {
+			echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		}
 		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+		if ($registration == '' && $aircraft_icao != '') {
+			$registration = $aircraft_icao.$airline_icao;
+		}
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -114,7 +133,9 @@ 
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -127,7 +148,9 @@ 
 	public function addMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalDebug,$globalMarineImageFetch;
-		if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return '';
+		if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) {
+			return '';
+		}
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
 		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
@@ -137,16 +160,22 @@ 
 			$identity = $Marine->getIdentity($mmsi);
 			if (isset($identity[0]['mmsi'])) {
 				$imo = $identity[0]['imo'];
-				if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name'];
+				if ($identity[0]['ship_name'] != '') {
+					$name = $identity[0]['ship_name'];
+				}
 			}
 		}
 		unset($Marine);
 
 		//getting the aircraft image
-		if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...';
+		if ($globalDebug && $name != '') {
+			echo 'Try to find an vessel image for '.$name.'...';
+		}
 		$image_url = $this->findMarineImage($mmsi,$imo,$name);
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$query  = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -155,7 +184,9 @@ 
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -170,41 +201,85 @@ 
 	{
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
+		if (!isset($globalIVAO)) {
+			$globalIVAO = FALSE;
+		}
 		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '') {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration,'/') !== false) {
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			}
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
-			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
-			else $aircraft_name = '';
-			if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
-			else $aircraft_icao = '';
-			if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
-			else $airline_icao = '';
+			if (isset($aircraft_info[0]['aircraft_name'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_name'];
+			} else {
+				$aircraft_name = '';
+			}
+			if (isset($aircraft_info[0]['aircraft_icao'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_icao'];
+			} else {
+				$aircraft_icao = '';
+			}
+			if (isset($aircraft_info[0]['airline_icao'])) {
+				$airline_icao = $aircraft_info[0]['airline_icao'];
+			} else {
+				$airline_icao = '';
+			}
 		} elseif ($aircraft_icao != '') {
 			$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
-			if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type'];
-			else $aircraft_name = '';
+			if (isset($aircraft_info[0]['type'])) {
+				$aircraft_name = $aircraft_info[0]['type'];
+			} else {
+				$aircraft_name = '';
+			}
 			$aircraft_registration = $aircraft_icao;
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		} else {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
 		unset($Spotter);
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		if (!isset($globalAircraftImageSources)) {
+			$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		}
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'flickr') $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
-		}
-		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao);
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') {
+				$images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
+			}
+			if ($source == 'planespotters' && !$globalIVAO) {
+				$images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'flickr') {
+				$images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'deviantart') {
+				$images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'jetphotos' && !$globalIVAO) {
+				$images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'planepictures' && !$globalIVAO) {
+				$images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'airportdata' && !$globalIVAO) {
+				$images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
+		}
+		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) {
+			return $this->findAircraftImage($aircraft_icao);
+		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
 
@@ -224,7 +299,9 @@ 
 		//$imo = filter_var($imo,FILTER_SANITIZE_STRING);
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
 		$name = trim($name);
-		if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		if (strlen($name) < 4) {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
 		/*
 		$Marine = new Marine($this->db);
 		if ($imo == '' || $name == '') {
@@ -236,15 +313,29 @@ 
 		}
 		unset($Marine);
 		*/
-		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		if (!isset($globalMarineImageSources)) {
+			$globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		}
 		foreach ($globalMarineImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name);
-			if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
+			if ($source == 'flickr') {
+				$images_array = $this->fromFlickr('marine',$mmsi,$name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing('marine',$mmsi,$name);
+			}
+			if ($source == 'deviantart') {
+				$images_array = $this->fromDeviantart('marine',$mmsi,$name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia('marine',$mmsi,$name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource('marine',$mmsi,$name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
 		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
@@ -407,11 +498,17 @@ 
 	public function fromFlickr($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
-			if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name);
-			else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft';
+			if ($name != '') {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name);
+			} else {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft';
+			}
 		} elseif ($type == 'marine') {
-			if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.urlencode($name);
-			else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',vessel';
+			if ($name != '') {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.urlencode($name);
+			} else {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',vessel';
+			}
 		}
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
@@ -456,9 +553,14 @@ 
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
-		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
-		if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
-		else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+		if (!isset($globalImageBingKey) || $globalImageBingKey == '') {
+			return false;
+		}
+		if ($aircraft_name != '') {
+			$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
+		} else {
+			$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+		}
 		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
 		$data = $Common->getData($url,'get','',$headers);
 		$result = json_decode($data);
@@ -513,17 +615,25 @@ 
 	public function fromWikimedia($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
-			if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name);
-			else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
+			if ($name != '') {
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name);
+			} else {
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
+			}
 		} elseif ($type == 'marine') {
-			if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'"';
-			else return false;
+			if ($name != '') {
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'"';
+			} else {
+				return false;
+			}
 		}
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return false;
+			if (substr($fileo,-3) == 'pdf') {
+				return false;
+			}
 			$file = urlencode($fileo);
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
 			$data2 = $Common->getData($url2);
@@ -594,18 +704,27 @@ 
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
-					else $image_url['copyright'] = $source['source_website'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} elseif (isset($source['copyright'])) {
+						$image_url['copyright'] = $source['copyright'];
+					} else {
+						$image_url['copyright'] = $source['source_website'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return false;
-		} else return false;
+		} else {
+			return false;
+		}
 		if (!empty($globalMarineImageCustomSources) && $type == 'marine') {
 			$customsources = array();
 			if (!isset($globalMarineImageCustomSources[0])) {
@@ -630,18 +749,27 @@ 
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
-					else $image_url['copyright'] = $source['source_website'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} elseif (isset($source['copyright'])) {
+						$image_url['copyright'] = $source['copyright'];
+					} else {
+						$image_url['copyright'] = $source['source_website'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return false;
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 }