Ysurac / FlightAirMap

owner-statistics-departure-airport.php

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
+if ($year != '') {
+	$filter = array_merge($filter,array('year' => $year));
+}
+if ($month != '') {
+	$filter = array_merge($filter,array('month' => $month));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

owner-statistics-route.php

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
+if ($year != '') {
+	$filter = array_merge($filter,array('year' => $year));
+}
+if ($month != '') {
+	$filter = array_merge($filter,array('month' => $month));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

owner-statistics-manufacturer.php

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
+if ($year != '') {
+	$filter = array_merge($filter,array('year' => $year));
+}
+if ($month != '') {
+	$filter = array_merge($filter,array('month' => $month));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

owner-statistics-registration.php

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
+if ($year != '') {
+	$filter = array_merge($filter,array('year' => $year));
+}
+if ($month != '') {
+	$filter = array_merge($filter,array('month' => $month));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

require/class.Weather.php

Braces +12 added lines, -4 removed lines

@@ -63,12 +63,16 @@ 
 	
 	public function openweathermap($latitude,$longitude) {
 		global $globalOpenWeatherMapKey;
-		if ($globalOpenWeatherMapKey == '') return array();
+		if ($globalOpenWeatherMapKey == '') {
+			return array();
+		}
 		$Common = new Common();
 		$url = 'http://api.openweathermap.org/data/2.5/weather?lat='.$latitude.'&lon='.$longitude.'&units=metric&appid='.$globalOpenWeatherMapKey;
 		//echo $url."\n";
 		$weatherdata = json_decode($Common->getData($url),true);
-		if (!isset($weatherdata['main']['temp']) || !isset($weatherdata['weather'][0]['id'])) return array('clouds' => array(),'rain' => array());
+		if (!isset($weatherdata['main']['temp']) || !isset($weatherdata['weather'][0]['id'])) {
+			return array('clouds' => array(),'rain' => array());
+		}
 		$dew = $weatherdata['main']['temp'] - ((100-$weatherdata['main']['humidity'])/5);
 		$cumulus_base = 122.0 * ($weatherdata['main']['temp'] - $dew);
 		$stratus_base = 100.0 * (100.0 * $weatherdata['main']['humidity'])*0.3048;
@@ -104,7 +108,9 @@ 
 	
 	public function nomad_wind($hour = '') {
 		global $globalWindsPath;
-		if ($hour == '') $hour = date('G');
+		if ($hour == '') {
+			$hour = date('G');
+		}
 		if (isset($globalWindsPath) && $globalWindsPath != '') {
 			$grib2json = $globalWindsPath['grib2json'];
 			$windpathsrc = $globalWindsPath['source'];
@@ -142,7 +148,9 @@ 
 			system($grib2json.' --data --output '.$windpathdest.' --names --compact '.$windpathsrc);
 		} else {
 			// if not try previous run
-			if ($hour == date('G')) $this->nomad_wind(date('G')-6);
+			if ($hour == date('G')) {
+				$this->nomad_wind(date('G')-6);
+			}
 		}
 	}
 

owner-statistics-arrival-airport.php

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 $filter = array();
-if ($year != '') $filter = array_merge($filter,array('year' => $year));
-if ($month != '') $filter = array_merge($filter,array('month' => $month));
+if ($year != '') {
+	$filter = array_merge($filter,array('year' => $year));
+}
+if ($month != '') {
+	$filter = array_merge($filter,array('month' => $month));
+}
 $archive = false;
 $spotter_array = $Spotter->getSpotterDataByOwner($owner,"0,1", $sort,$filter);
 if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {

require/class.SpotterArchive.php

Braces +48 added lines, -17 removed lines

@@ -6,7 +6,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (SpotterArchive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (SpotterArchive)');
+		}
 	}
 
     /**
@@ -29,7 +31,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -121,8 +125,11 @@ 
 			}
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -136,10 +143,17 @@ 
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
 			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
+		if ($airline_type === NULL) {
+			$airline_type ='';
+		}
 
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
@@ -678,7 +692,9 @@ 
 					$additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
 					$additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
 					$translate = $Translation->ident2icao($q_item);
-					if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+					if ($translate != $q_item) {
+						$additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+					}
 					$additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
 					$additional_query .= ")";
 				}
@@ -858,7 +874,9 @@ 
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
 				$offset = $datetime->format('P');
-			} else $offset = '+00:00';
+			} else {
+				$offset = '+00:00';
+			}
 			if ($date_array[1] != "") {
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 				$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
@@ -1112,9 +1130,13 @@ 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-		if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+		if ($sincedate != '') {
+			$query .= "AND date > '".$sincedate."' ";
+		}
 		$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-		if ($limit) $query .= " LIMIT 0,10";
+		if ($limit) {
+			$query .= " LIMIT 0,10";
+		}
 
 
 		$sth = $this->db->prepare($query);
@@ -1158,9 +1180,13 @@ 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-		if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+		if ($sincedate != '') {
+			$query .= "AND s.date > '".$sincedate."' ";
+		}
 		$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-		if ($limit) $query .= " LIMIT 0,10";
+		if ($limit) {
+			$query .= " LIMIT 0,10";
+		}
 
 
 		$sth = $this->db->prepare($query);
@@ -1382,8 +1408,11 @@ 
 			if($row['registration'] != "")
 			{
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
-				else $temp_array['image_thumbnail'] = '';
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				} else {
+					$temp_array['image_thumbnail'] = '';
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 			$aircraft_array[] = $temp_array;
@@ -1442,7 +1471,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_archive_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 			    FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner 

require/class.Common.php

Braces +123 added lines, -53 removed lines

@@ -36,7 +36,9 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true); 
-		if ($getheaders) curl_setopt($ch, CURLOPT_HEADER, 1); 
+		if ($getheaders) {
+			curl_setopt($ch, CURLOPT_HEADER, 1);
+		}
 		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
@@ -45,8 +47,11 @@ 
 		} else {
 			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 		}
-		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
-		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
+		if ($timeout == '') {
+			curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		} else {
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		}
 		//curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -59,7 +64,9 @@ 
 			} else {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
 			}
-		} elseif ($type != 'get' && $type != '') curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $type);
+		} elseif ($type != 'get' && $type != '') {
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $type);
+		}
 		if ($headers != '') {
 			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 		}
@@ -103,8 +110,9 @@ 
 	private function curlResponseHeaderCallback($ch, $headerLine) {
 		global $curl_cookies;
 		$curl_cookies = array();
-		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1)
-			$curl_cookies[] = $cookie;
+		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) {
+					$curl_cookies[] = $cookie;
+		}
 		return strlen($headerLine); // Needed by curl
 	}
 
@@ -116,7 +124,9 @@ 
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
 			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
@@ -128,7 +138,9 @@ 
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
-		if (curl_errno($ch) && $globalDebug) echo 'Download error: '.curl_error($ch);
+		if (curl_errno($ch) && $globalDebug) {
+			echo 'Download error: '.curl_error($ch);
+		}
 		curl_close($ch);
 		fclose($fp);
 	}
@@ -136,12 +148,16 @@ 
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.gz', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
-			else {
+			if (function_exists('gzopen')) {
+				$file = gzopen($in_file,'rb');
+			} elseif (function_exists('gzopen64')) {
+				$file = gzopen64($in_file,'rb');
+			} else {
 				echo 'gzopen not available';
 				die;
 			}
@@ -157,11 +173,14 @@ 
 	public static function bunzip2($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.bz2', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
-			else {
+			if (function_exists('bzopen')) {
+				$file = bzopen($in_file,'rb');
+			} else {
 				echo 'bzopen not available';
 				die;
 			}
@@ -180,10 +199,16 @@ 
 	* @return array array of the tables in HTML page
 	*/
 	public function table2array($data) {
-		if (!is_string($data)) return array();
-		if ($data == '') return array();
+		if (!is_string($data)) {
+			return array();
+		}
+		if ($data == '') {
+			return array();
+		}
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('tr') as $element)
 		{
@@ -218,7 +243,9 @@ 
 	*/
 	public function text2array($data) {
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('p') as $element)
 		{
@@ -239,7 +266,9 @@ 
 	* @return Float Distance in $unit
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
-		if ($lat == $latc && $lon == $lonc) return 0;
+		if ($lat == $latc && $lon == $lonc) {
+			return 0;
+		}
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
 			return round($dist * 1.609344);
@@ -285,7 +314,9 @@ 
 		$dX = $latc - $lat;
 		$dY = $lonc - $lon;
 		$azimuth = rad2deg(atan2($dY,$dX));
-		if ($azimuth < 0) return $azimuth+360;
+		if ($azimuth < 0) {
+			return $azimuth+360;
+		}
 		return $azimuth;
 	}
 	
@@ -299,10 +330,16 @@ 
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
-		if ($x == 0 || $d == 0) return true;
+		if ($x == 0 || $d == 0) {
+			return true;
+		}
 		// may be due to Internet jitter; distance is realistic
-		if ($x < 0.7 && $d < 2000) return true;
-		else return $d/$x < 1500*0.27778; // 1500 km/h max
+		if ($x < 0.7 && $d < 2000) {
+			return true;
+		} else {
+			return $d/$x < 1500*0.27778;
+		}
+		// 1500 km/h max
 	}
 
 
@@ -354,11 +391,17 @@ 
 	
 	public function convertDM($coord,$latlong) {
 		if ($latlong == 'latitude') {
-			if ($coord < 0) $NSEW = 'S';
-			else $NSEW = 'N';
+			if ($coord < 0) {
+				$NSEW = 'S';
+			} else {
+				$NSEW = 'N';
+			}
 		} else {
-			if ($coord < 0) $NSEW = 'W';
-			else $NSEW = 'E';
+			if ($coord < 0) {
+				$NSEW = 'W';
+			} else {
+				$NSEW = 'E';
+			}
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
@@ -368,11 +411,17 @@ 
 	}
 	public function convertDMS($coord,$latlong) {
 		if ($latlong == 'latitude') {
-			if ($coord < 0) $NSEW = 'S';
-			else $NSEW = 'N';
+			if ($coord < 0) {
+				$NSEW = 'S';
+			} else {
+				$NSEW = 'N';
+			}
 		} else {
-			if ($coord < 0) $NSEW = 'W';
-			else $NSEW = 'E';
+			if ($coord < 0) {
+				$NSEW = 'W';
+			} else {
+				$NSEW = 'E';
+			}
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
@@ -416,7 +465,9 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for($i=0;$i<$hexln;$i+=2) {
+			$str .= chr(hexdec(substr($hex,$i,2)));
+		}
 		return $str;
 	}
 	
@@ -453,8 +504,11 @@ 
 		$b = $lat2 - $lat1;
 		$c = -($a*$lat1+$b*$lon1);
 		$d = $a*$lat3+$b*$lon3+$c;
-		if ($d > -$approx && $d < $approx) return true;
-		else return false;
+		if ($d > -$approx && $d < $approx) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	public function array_merge_noappend() {
@@ -513,7 +567,9 @@ 
 			return $result;
 		}
 		$handle = @opendir('./locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {
@@ -584,8 +640,9 @@ 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
 			if ($fp_in = fopen($source,'rb')) { 
-				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+				while (!feof($fp_in)) {
+									gzwrite($fp_out, fread($fp_in, 1024 * 512));
+				}
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -594,14 +651,17 @@ 
 		} else {
 			$error = true; 
 		}
-		if ($error)
-			return false; 
-		else
-			return $dest; 
+		if ($error) {
+					return false;
+		} else {
+					return $dest;
+		}
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+		}
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -725,7 +785,9 @@ 
 		$ip = gethostbyname($host);
 		$s = socket_create(AF_INET, SOCK_STREAM, 0);
 		$r = @socket_connect($s, $ip, $port);
-		if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+		if (!socket_set_nonblock($s)) {
+			echo "Unable to set nonblock on socket\n";
+		}
 		if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
 			return $s;
 		}
@@ -770,18 +832,22 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path)-1}=='/') {
+			// recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
-		else if (is_dir($path))
-			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
+		} else if (is_dir($path)) {
+					return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
+		}
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
-			return false;
+		if ($f===false) {
+					return false;
+		}
 		fclose($f);
-		if (!$rm)
-			unlink($path);
+		if (!$rm) {
+					unlink($path);
+		}
 		return true;
 	}
 	
@@ -797,7 +863,9 @@ 
 	 * @return Array Coordinate of the route
 	*/
 	public function greatcircle($begin_lat,$begin_lon,$end_lat,$end_lon,$nbpts = 20, $offset = 10) {
-		if ($nbpts <= 2) return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
+		if ($nbpts <= 2) {
+			return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
+		}
 		$sx = deg2rad($begin_lon);
 		$sy = deg2rad($begin_lat);
 		$ex = deg2rad($end_lon);
@@ -806,7 +874,9 @@ 
 		$h = $sy - $ey;
 		$z = pow(sin($h/2.0),2) + cos($sy)*cos($ey)*pow(sin($w/2.0),2);
 		$g = 2.0*asin(sqrt($z));
-		if ($g == M_PI || is_nan($g)) return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
+		if ($g == M_PI || is_nan($g)) {
+			return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
+		}
 		$first_pass = array();
 		$delta = 1.0/($nbpts-1);
 		for ($i =0; $i < $nbpts; ++$i) {

require/class.ATC.php

Braces +20 added lines, -7 removed lines

@@ -18,7 +18,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (ATC)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (ATC)');
+		}
 	}
 
     /**
@@ -33,20 +35,27 @@ 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
+					if (isset($source['source'])) {
+						$filter['source'][] = $source['source'];
+					}
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
@@ -133,7 +142,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {
@@ -164,7 +175,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {