Inspection of "strictly test" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 8ce5a2...3d964c )

by Yannick

created 2017-01-31 10:51 UTC

Status

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

@@ -22,10 +22,10 @@
 block discarded – undo
 	}
 	
 	/**
-	* Get Accidents data from DB
-	*
-	* @return Array Return Accidents data in array
-	*/
+	 * Get Accidents data from DB
+	 *
+	 * @return Array Return Accidents data in array
+	 */
 	public function getAccidentData($limit = '',$type = '',$date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);

Please login to merge, or discard this patch.

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -26,20 +26,20 @@  discard block
 block discarded – undo
 	*
 	* @return Array Return Accidents data in array
 	*/
-	public function getAccidentData($limit = '',$type = '',$date = '') {
+	public function getAccidentData($limit = '', $type = '', $date = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 		$Translation = new Translation($this->db);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		date_default_timezone_set('UTC');
 		$result = array();
 		$limit_query = '';
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -48,20 +48,20 @@  discard block
 block discarded – undo
 
 		if ($type != '') {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY date DESC".$limit_query;
 				} else {
 					$date = $date.'%';
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY date DESC".$limit_query;
 				}
-				$query_values = array(':type' => $type,':date' => $date);
+				$query_values = array(':type' => $type, ':date' => $date);
 			} else {
 				$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type GROUP BY registration) ORDER BY date DESC".$limit_query;
 				$query_values = array(':type' => $type);
 			}
 		} else {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY date DESC".$limit_query;
 				} else {
 					$date = $date.'%';
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$i = 0;
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
 			$data = array();
 			if ($row['registration'] != '') {
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 				$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 				$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 				if (!empty($aircraft_info)) {
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
 					$data['aircraft_name'] = $aircraft_info[0]['type'];
 					$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
 				} else {
-					$data = array_merge($data,array('aircraft_type' => 'NA'));
+					$data = array_merge($data, array('aircraft_type' => 'NA'));
 				}
 				$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
 				if (!empty($owner_data)) {
@@ -102,18 +102,18 @@  discard block
 block discarded – undo
 					$data['aircraft_base'] = $owner_data['base'];
 					$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 				}
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
-			$icao = $Translation->checkTranslation($icao,false);
+			$icao = $Translation->checkTranslation($icao, false);
 			//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 			if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
 				//echo 'Check airline info... for '.$row['airline_name'].' ';
@@ -122,11 +122,11 @@  discard block
 block discarded – undo
 				if (!empty($airline_info)) {
 					//echo 'data found !'."\n";
 					//print_r($airline_info);
-					$data = array_merge($data,$airline_info);
+					$data = array_merge($data, $airline_info);
 				} 
 				//else echo 'No data...'."\n";
 			}
-			$data = array_merge($row,$data);
+			$data = array_merge($row, $data);
 			if ($data['ident'] == null) $data['ident'] = $icao;
 			if ($data['title'] == null) {
 				$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
@@ -151,15 +151,15 @@  discard block
 block discarded – undo
 		if ($globalDebug) echo 'Import '.$file."\n";
 		$result = array();
 		if (file_exists($file)) {
-			if (($handle = fopen($file,'r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
+			if (($handle = fopen($file, 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
 					if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
-						$result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam');
+						$result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam');
 					}
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
+			if (!empty($result)) $this->add($result, true);
 			elseif ($globalDebug) echo 'Nothing to import';
 		}
 	}
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
 		$all_md5_new = array();
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
 			if ($this->check_accidents_nb() > 0) {
-				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-					while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+					while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 						if (isset($data[1])) {
 							$year = $data[0];
 							$all_md5[$year] = $data[1];
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
 				}
 			}
 		}
-		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
+		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
-			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 					if (isset($data[1])) {
 						$year = $data[0];
 						$all_md5_new[$year] = $data[1];
@@ -195,16 +195,16 @@  discard block
 block discarded – undo
 				fclose($handle);
 			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
 		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
-		$result = $Common->arr_diff($all_md5_new,$all_md5);
+		$result = $Common->arr_diff($all_md5_new, $all_md5);
 		if (empty($result) && $globalDebug) echo 'Nothing to update';
 		foreach ($result as $file => $md5) {
-			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
+			$Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
 			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
 			elseif ($globalDebug) echo 'Download '.$file.' failed';
 		}
 	}
 
-	public function add($crash,$new = false) {
+	public function add($crash, $new = false) {
 		global $globalTransaction, $globalDebug;
 		require_once('class.Connection.php');
 		require_once('class.Image.php');
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
 		if ($globalTransaction) $Connection->db->beginTransaction();
-		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
+		$initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
 		$query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)';
@@ -233,31 +233,31 @@  discard block
 block discarded – undo
 				$cr = array_map(function($value) {
 					return $value === "" ? NULL : $value;
 				}, $cr);
-				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
-					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
+				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
+					if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					$query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
 					if ($result_check['nb'] == 0) {
-						$query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']);
+						$query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']);
 						$sth->execute($query_values);
-						if ($cr['date'] > time()-(30*86400)) {
+						if ($cr['date'] > time() - (30*86400)) {
 							if (empty($Image->getSpotterImage($cr['registration']))) {
 								//if ($globalDebug) echo 'Get image...'."\n";
 								$Image->addSpotterImage($cr['registration']);
 							}
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
 						}
-						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
+						$Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
 					}
 				}
-				if ($globalTransaction && $j % 1000 == 0) {
+				if ($globalTransaction && $j%1000 == 0) {
 					$Connection->db->commit();
 					$Connection->db->beginTransaction();
 				}
 			}
 			if ($globalTransaction) $Connection->db->commit();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack();
 			echo $e->getMessage();
 		}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}

Please login to merge, or discard this patch.

Braces +75 added lines, -27 removed lines patch added patch discarded remove patch

@@ -85,8 +85,11 @@  discard block
 block discarded – undo
 			$data = array();
 			if ($row['registration'] != '') {
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
 				$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 				$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 				if (!empty($aircraft_info)) {
@@ -102,17 +105,30 @@  discard block
 block discarded – undo
 					$data['aircraft_base'] = $owner_data['base'];
 					$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 				}
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+			} else {
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao,false);
 			//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 			if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
@@ -127,18 +143,23 @@  discard block
 block discarded – undo
 				//else echo 'No data...'."\n";
 			}
 			$data = array_merge($row,$data);
-			if ($data['ident'] == null) $data['ident'] = $icao;
+			if ($data['ident'] == null) {
+				$data['ident'] = $icao;
+			}
 			if ($data['title'] == null) {
 				$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
-			} else $data['message'] = strtolower($data['title']);
+			} else {
+				$data['message'] = strtolower($data['title']);
+			}
 			$result[] = $data;
 			$i++;
 		}
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 	
 	
@@ -148,7 +169,9 @@  discard block
 block discarded – undo
 	*/
 	public function import($file) {
 		global $globalTransaction, $globalDebug;
-		if ($globalDebug) echo 'Import '.$file."\n";
+		if ($globalDebug) {
+			echo 'Import '.$file."\n";
+		}
 		$result = array();
 		if (file_exists($file)) {
 			if (($handle = fopen($file,'r')) !== FALSE) {
@@ -159,8 +182,11 @@  discard block
 block discarded – undo
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
-			elseif ($globalDebug) echo 'Nothing to import';
+			if (!empty($result)) {
+				$this->add($result,true);
+			} elseif ($globalDebug) {
+				echo 'Nothing to import';
+			}
 		}
 	}
 
@@ -193,14 +219,23 @@  discard block
 block discarded – undo
 					}
 				}
 				fclose($handle);
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+			} elseif ($globalDebug) {
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
+			}
+		} elseif ($globalDebug) {
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+		}
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
+		if (empty($result) && $globalDebug) {
+			echo 'Nothing to update';
+		}
 		foreach ($result as $file => $md5) {
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
+			} elseif ($globalDebug) {
+				echo 'Download '.$file.' failed';
+			}
 		}
 	}
 
@@ -213,13 +248,17 @@  discard block
 block discarded – undo
 		$Image = new Image();
 		$Spotter = new Spotter();
 
-		if (empty($crash)) return false;
+		if (empty($crash)) {
+			return false;
+		}
 		if (!$new) {
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
 			$sthd = $Connection->db->prepare($query_delete);
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
@@ -234,7 +273,9 @@  discard block
 block discarded – undo
 					return $value === "" ? NULL : $value;
 				}, $cr);
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					if (strpos($cr['registration'],'-') === FALSE) {
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					}
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
@@ -256,9 +297,13 @@  discard block
 block discarded – undo
 					$Connection->db->beginTransaction();
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack();
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			echo $e->getMessage();
 		}
 		$sth_check->closeCursor();
@@ -293,8 +338,11 @@  discard block
 block discarded – undo
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_accidents_update() {

Please login to merge, or discard this patch.

accident.php 2 patches

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

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
 if ($date == '') $date = date('Y-m-d');
 header('Location: '.$globalURL.'/accident/'.$date);
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
+if ($date == '') {
+	$date = date('Y-m-d');
+}
 header('Location: '.$globalURL.'/accident/'.$date);
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

date.php 2 patches

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

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
 if ($date == '') $date = date('Y-m-d');
 header('Location: '.$globalURL.'/date/'.$date);
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
+if ($date == '') {
+	$date = date('Y-m-d');
+}
 header('Location: '.$globalURL.'/date/'.$date);
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

incident-detailed.php 2 patches

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

@@ -10,10 +10,10 @@  discard block
 block discarded – undo
 {
 	$date = date('Y-m-d');
 } else {
-	$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
+	$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
 }
 
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
 print '<br />';
 
 print '<div class="info column">';
-print '<h1>'.sprintf(_("Incidents from %s"),date("l F j, Y",strtotime($date))).'</h1>';
+print '<h1>'.sprintf(_("Incidents from %s"), date("l F j, Y", strtotime($date))).'</h1>';
 print '</div>';
 
 print '<div class="table column">';
-print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."),date("l M j, Y",strtotime($date))).'</p>';
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'incident',$date);
+print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."), date("l M j, Y", strtotime($date))).'</p>';
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'incident', $date);
 //print_r($spotter_array);
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -58,8 +58,12 @@
 block discarded – undo
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

Please login to merge, or discard this patch.

incident.php 2 patches

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

@@ -1,5 +1,5 @@
 block discarded – undo
 <?php
-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
 if ($date == '') $date = date('Y-m-d');
 header('Location: '.$globalURL.'/incident/'.$date);
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,5 +1,7 @@
 block discarded – undo
 <?php
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
+if ($date == '') {
+	$date = date('Y-m-d');
+}
 header('Location: '.$globalURL.'/incident/'.$date);
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

accident-detailed.php 2 patches

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

@@ -10,10 +10,10 @@  discard block
 block discarded – undo
 {
 	$date = date('Y-m-d');
 } else {
-	$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
+	$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
 }
 
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
 print '<br />';
 
 print '<div class="info column">';
-print '<h1>'.sprintf(_("Accidents from %s"),date("l F j, Y",strtotime($date))).'</h1>';
+print '<h1>'.sprintf(_("Accidents from %s"), date("l F j, Y", strtotime($date))).'</h1>';
 print '</div>';
 
 print '<div class="table column">';
-print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."),date("l M j, Y",strtotime($date))).'</p>';
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'accident',$date);
+print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."), date("l M j, Y", strtotime($date))).'</p>';
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'accident', $date);
 //print_r($spotter_array);
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -58,8 +58,12 @@
 block discarded – undo
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

Please login to merge, or discard this patch.

manufacturer.php 1 patch

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

@@ -5,11 +5,11 @@
 block discarded – undo
 
 if ($_POST['aircraft_manufacturer'] != "")
 {
-	$aircraft_manufacturer = filter_input(INPUT_POST,'aircraft_manufacturer',FILTER_SANITIZE_STRING);
+	$aircraft_manufacturer = filter_input(INPUT_POST, 'aircraft_manufacturer', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/manufacturer/'.$aircraft_manufacturer);
 } elseif ($_GET['aircraft_manufacturer'] != "")
 {
-	$aircraft_manufacturer = filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING);
+	$aircraft_manufacturer = filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/manufacturer/'.$aircraft_manufacturer);
 } else {
 	header('Location: '.$globalURL);

Please login to merge, or discard this patch.

registration.php 1 patch

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

@@ -5,7 +5,7 @@
 block discarded – undo
 
 if ($_POST['registration'] != "")
 {
-	$registration = filter_input(INPUT_POST,'registration',FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_POST, 'registration', FILTER_SANITIZE_STRING);
 	header('Location: '.$globalURL.'/registration/'.$registration);
 } else {
 	header('Location: '.$globalURL);

Please login to merge, or discard this patch.

js/map.js.php 3 patches

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@  discard block
 block discarded – undo
 require_once('../require/settings.php');
 require_once('../require/class.Language.php'); 
 
-setcookie("MapFormat",'2d');
+setcookie("MapFormat", '2d');
 
 // Compressed GeoJson is used if true
 if (!isset($globalJsonCompress)) $compress = true;
@@ -18,10 +18,10 @@  discard block
 block discarded – undo
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
 	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
 	else $enddate = time();
-	setcookie("archive_begin",$begindate);
-	setcookie("archive_end",$enddate);
-	setcookie("archive_update",$lastupd);
-	setcookie("archive_speed",$archivespeed);
+	setcookie("archive_begin", $begindate);
+	setcookie("archive_end", $enddate);
+	setcookie("archive_update", $lastupd);
+	setcookie("archive_speed", $archivespeed);
 ?>
 document.cookie =  'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
 document.cookie =  'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
@@ -92,16 +92,16 @@  discard block
 block discarded – undo
 <?php
 	}
 	if (isset($_GET['ident'])) {
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['flightaware_id'])) {
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['latitude'])) {
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
 	}
 	if (isset($_GET['longitude'])) {
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
 	}
 ?>
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
 	} else {
 		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
 	}
@@ -230,19 +230,19 @@  discard block
 block discarded – undo
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
 ?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
@@ -534,10 +534,10 @@  discard block
 block discarded – undo
 	};
 	archive.update = function (props) {
 		if (typeof props != 'undefined') {
-			//this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
-			this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
+			//this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i>  <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>  <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
+			this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
 		} else {
-			this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
+			this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' +  '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
 		}
 
 	};
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
 			    /*
 			    shadowUrl: iconURLShadowpath,
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
 			    */
 			})
 		    })
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -1460,23 +1460,23 @@  discard block
 block discarded – undo
 	    airs.push(air.value);
 	}
     }
-    document.cookie =  'filter_Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 function airlinestype(selectObj) {
     var idx = selectObj.selectedIndex;
     var airtype = selectObj.options[idx].value;
-    document.cookie =  'filter_airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 function alliance(selectObj) {
     var idx = selectObj.selectedIndex;
     var alliance = selectObj.options[idx].value;
-    document.cookie =  'filter_alliance='+alliance+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_alliance='+alliance+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 
 function identfilter() {
     var ident = $('#identfilter').val();
     console.log('Filter with '+ident);
-    document.cookie =  'filter_ident='+ident+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ident='+ident+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function removefilters() {
     // Get an array of all cookie names (the regex matches what we don't want)
@@ -1498,7 +1498,7 @@  discard block
 block discarded – undo
 	}
     }
     //document.cookie =  'Sources='+sources.join()+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+1, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
 }
 
 function show3D() {
@@ -1521,23 +1521,23 @@  discard block
 block discarded – undo
 
 function clickVATSIM(cb) {
     //document.cookie =  'ShowVATSIM='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickIVAO(cb) {
     //document.cookie =  'ShowIVAO='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickphpVMS(cb) {
     //document.cookie =  'ShowVMS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickSBS1(cb) {
     //document.cookie =  'ShowSBS1='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickAPRS(cb) {
     //document.cookie =  'ShowAPRS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
-    document.cookie =  'filter_ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m")  , date("d")+2, date("Y"))); ?>; path=/'
+    document.cookie =  'filter_ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
 }
 function clickFlightPopup(cb) {
     document.cookie =  'flightpopup='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'

Please login to merge, or discard this patch.

Braces +128 added lines, -33 removed lines patch added patch discarded remove patch

@@ -5,8 +5,11 @@  discard block
 block discarded – undo
 setcookie("MapFormat",'2d');
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 if (isset($_GET['archive'])) {
 	//$archiveupdatetime = 50;
 	$archiveupdatetime = $globalMapRefresh;
@@ -16,8 +19,11 @@  discard block
 block discarded – undo
 	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
 	//$lastupd = 20;
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
-	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
-	else $enddate = time();
+	if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
+		$enddate = $_GET['enddate'];
+	} else {
+		$enddate = time();
+	}
 	setcookie("archive_begin",$begindate);
 	setcookie("archive_end",$enddate);
 	setcookie("archive_update",$lastupd);
@@ -123,7 +129,17 @@  discard block
 block discarded – undo
 	}
 
 	//create the map
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
+	print $latitude;
+} else {
+	print $globalCenterLatitude;
+}
+?>,<?php if (isset($longitude)) {
+	print $longitude;
+} else {
+	print $globalCenterLongitude;
+}
+?>], zoom);
 <?php
 	} else {
 ?>
@@ -136,9 +152,19 @@  discard block
 block discarded – undo
 	     || navigator.userAgent.match(/BlackBerry/i)
 	     || navigator.userAgent.match(/Windows Phone/i))
 	{
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom-1;
+} else {
+	print '8';
+}
+?>;
 	} else {
-		var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
+		var zoom = <?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>;
 	}
 
 	//create the map
@@ -163,16 +189,27 @@  discard block
 block discarded – undo
 	bounds = L.latLngBounds(southWest,northEast);
 	//a few title layers
 <?php
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
-	else $MapType = $globalMapProvider;
+	if (isset($_COOKIE['MapType'])) {
+		$MapType = $_COOKIE['MapType'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
 
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapTypeId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapTypeId'];
+		}
+		?>
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
@@ -184,7 +221,12 @@  discard block
 block discarded – undo
 ?>
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
 	    maxZoom: 18,
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
 	}).addTo(map);
@@ -230,20 +272,26 @@  discard block
 block discarded – undo
 	map.addLayer(yandexLayer);
 <?php
 	} elseif ($MapType == 'Bing-Aerial') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Hybrid') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
 	map.addLayer(bingLayer);
 <?php
 	} elseif ($MapType == 'Bing-Road') {
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
-?>
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
+			setcookie('MapType','OpenStreetMap');
+		}
+		?>
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
 	map.addLayer(bingLayer);
 <?php
@@ -291,7 +339,12 @@  discard block
 block discarded – undo
 		}
 	} elseif ($globalBounding == 'circle') {
 ?>
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
+	print $globalBoundingCircleSize;
+} else {
+	print '70000';
+}
+?>,{
 	    color: '#92C7D1',
 	    fillColor: '#92C7D1',
 	    fillOpacity: 0.3,
@@ -350,8 +403,11 @@  discard block
 block discarded – undo
 
 	function update_airportsLayer() {
 	    <?php
-		if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
-		else $getZoom = '7';
+		if (isset($_COOKIE['AirportZoom'])) {
+			$getZoom = $_COOKIE['AirportZoom'];
+		} else {
+			$getZoom = '7';
+		}
 	    ?>
 	    //if (map.getZoom() <= <?php print $getZoom; ?>) {
 		if (typeof airportsLayer != 'undefined') {
@@ -687,9 +743,13 @@  discard block
 block discarded – undo
 		    if (callsign != ""){ markerLabel += callsign; }
 		    if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; }
 <?php
-	if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
-	elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['IconColor'])) {
+		$IconColor = $_COOKIE['IconColor'];
+	} elseif (isset($globalAircraftIconColor)) {
+		$IconColor = $globalAircraftIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 		    info_update(feature.properties.fc);
@@ -737,7 +797,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -786,7 +851,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -834,7 +904,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -1177,14 +1252,24 @@  discard block
 block discarded – undo
 	if (isset($_GET['archive'])) {
 ?>
 //then load it again every 30 seconds
-//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 //then load it again every 30 seconds
 reloadPage = setInterval(
-    function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+    function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 var currentdate = new Date();
 var currentyear = new Date().getFullYear();
 var begindate = new Date(Date.UTC(currentyear,11,24,2,0,0,0));
@@ -1196,7 +1281,12 @@  discard block
 block discarded – undo
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 update_polarLayer();
-setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -1212,7 +1302,12 @@  discard block
 block discarded – undo
 	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
-setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 	}
 ?>

Please login to merge, or discard this patch.

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

@@ -352,7 +352,7 @@  discard block
 block discarded – undo
 	    <?php
 		if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
 		else $getZoom = '7';
-	    ?>
+		?>
 	    //if (map.getZoom() <= <?php print $getZoom; ?>) {
 		if (typeof airportsLayer != 'undefined') {
 			if (map.hasLayer(airportsLayer) == true) {
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
 	update_locationsLayer();
 	
 <?php
-	    if (!isset($ident) && !isset($flightaware_id)) {
+		if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 	
 	function info_update (props) {
@@ -520,11 +520,11 @@  discard block
 block discarded – undo
 	}
 
 	<?php
-	    }
+		}
 	?>
 
 	<?php
-	    if (isset($_GET['archive'])) {
+		if (isset($_GET['archive'])) {
 	?>
 	var archive = L.control();
 	archive.onAdd = function (map) {
@@ -543,12 +543,12 @@  discard block
 block discarded – undo
 	};
 	archive.addTo(map);
 	<?php
-	    }
+		}
 	?>
 
 
 	<?php
-	    //if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) {
+		//if ((isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'false') || (isset($globalMapPopup) && !$globalMapPopup)) {
 	?>
 
 	$(".showdetails").on("click",".close",function(){
@@ -1041,15 +1041,15 @@  discard block
 block discarded – undo
 			if (map.getZoom() > 7) {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
 				"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 3,
 				"opacity": 1
@@ -1059,15 +1059,15 @@  discard block
 block discarded – undo
 			} else {
 			    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
 				"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 2,
 				"opacity": 1
@@ -1079,15 +1079,15 @@  discard block
 block discarded – undo
 			if (map.getZoom() > 7) {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
                     		"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
 				"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 3,
 				"opacity": 0.6
@@ -1097,15 +1097,15 @@  discard block
 block discarded – undo
 			} else {
                 	    var style = {
 				<?php
-				    if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
+					if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
 				?>
                     		"color": "#1a3151",
 				<?php
-				    } else {
+					} else {
 				?>
                     		"color": getAltitudeColor(altitude),
 				<?php
-				    }
+					}
 				?>
 				"weight": 2,
 				"opacity": 0.6
@@ -1115,21 +1115,21 @@  discard block
 block discarded – undo
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
 			    <?php
 				if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
-			    ?>
+				?>
                     	    "color": "#1a3151",
 			    <?php
 				} else {
-			    ?>
+				?>
                     	    "color": getAltitudeColor(altitude),
 			    <?php
 				}
-			    ?>
+				?>
                     	    "weight": 3,
                     	    "opacity": 0.6
                 	};
@@ -1139,15 +1139,15 @@  discard block
 block discarded – undo
                 	var style = {
 			    <?php
 				if (isset($globalMapAltitudeColor) && !$globalMapAltitudeColor) {
-			    ?>
+				?>
 			    "color": "#1a3151",
 			    <?php
 				} else {
-			    ?>
+				?>
 			    "color": getAltitudeColor(altitude),
 			    <?php
 				}
-			    ?>
+				?>
                     	    "weight": 2,
                     	    "opacity": 0.6
                 	};
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
                 	layer_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -1220,10 +1220,10 @@  discard block
 block discarded – undo
 
 
 <?php
-    // Add support for custom json via $globalMapJson
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
+	// Add support for custom json via $globalMapJson
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
 	foreach ($globalMapJson as $json) {
-	    if (isset($json['url'])) {
+		if (isset($json['url'])) {
 ?>
 update_genLayer('<?php print $json['url']; ?>');
 <?php
@@ -1232,9 +1232,9 @@  discard block
 block discarded – undo
 setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
 <?php
 		}
-	    }
+		}
+	}
 	}
-    }
 
 ?>
 

Please login to merge, or discard this patch.

		@@ -22,10 +22,10 @@
		block discarded – undo
22	22	}
23	23
24	24	/**
25		- * Get Accidents data from DB
26		- *
27		- * @return Array Return Accidents data in array
28		- */
	25	+ * Get Accidents data from DB
	26	+ *
	27	+ * @return Array Return Accidents data in array
	28	+ */
29	29	public function getAccidentData($limit = '',$type = '',$date = '') {
30	30	global $globalURL, $globalDBdriver;
31	31	$Image = new Image($this->db);

		@@ -26,20 +26,20 @@ discard block
		block discarded – undo
26	26	*
27	27	* @return Array Return Accidents data in array
28	28	*/
29		- public function getAccidentData($limit = '',$type = '',$date = '') {
	29	+ public function getAccidentData($limit = '', $type = '', $date = '') {
30	30	global $globalURL, $globalDBdriver;
31	31	$Image = new Image($this->db);
32	32	$Spotter = new Spotter($this->db);
33	33	$Translation = new Translation($this->db);
34		- $date = filter_var($date,FILTER_SANITIZE_STRING);
	34	+ $date = filter_var($date, FILTER_SANITIZE_STRING);
35	35	date_default_timezone_set('UTC');
36	36	$result = array();
37	37	$limit_query = '';
38	38	if ($limit != "")
39	39	{
40	40	$limit_array = explode(",", $limit);
41		- $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
42		- $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
	41	+ $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
	42	+ $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
43	43	if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
44	44	{
45	45	$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
		@@ -48,20 +48,20 @@ discard block
		block discarded – undo
48	48
49	49	if ($type != '') {
50	50	if ($date != '') {
51		- if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
	51	+ if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
52	52	$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY date DESC".$limit_query;
53	53	} else {
54	54	$date = $date.'%';
55	55	$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY date DESC".$limit_query;
56	56	}
57		- $query_values = array(':type' => $type,':date' => $date);
	57	+ $query_values = array(':type' => $type, ':date' => $date);
58	58	} else {
59	59	$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type GROUP BY registration) ORDER BY date DESC".$limit_query;
60	60	$query_values = array(':type' => $type);
61	61	}
62	62	} else {
63	63	if ($date != '') {
64		- if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
	64	+ if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
65	65	$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY date DESC".$limit_query;
66	66	} else {
67	67	$date = $date.'%';
		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77	try {
78	78	$sth = $this->db->prepare($query);
79	79	$sth->execute($query_values);
80		- } catch(PDOException $e) {
	80	+ } catch (PDOException $e) {
81	81	return "error : ".$e->getMessage();
82	82	}
83	83	$i = 0;
		@@ -85,8 +85,8 @@ discard block
		block discarded – undo
85	85	$data = array();
86	86	if ($row['registration'] != '') {
87	87	$image_array = $Image->getSpotterImage($row['registration']);
88		- if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
89		- else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	88	+ if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
	89	+ else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
90	90	$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
91	91	$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
92	92	if (!empty($aircraft_info)) {
		@@ -94,7 +94,7 @@ discard block
		block discarded – undo
94	94	$data['aircraft_name'] = $aircraft_info[0]['type'];
95	95	$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
96	96	} else {
97		- $data = array_merge($data,array('aircraft_type' => 'NA'));
	97	+ $data = array_merge($data, array('aircraft_type' => 'NA'));
98	98	}
99	99	$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
100	100	if (!empty($owner_data)) {
		@@ -102,18 +102,18 @@ discard block
		block discarded – undo
102	102	$data['aircraft_base'] = $owner_data['base'];
103	103	$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
104	104	}
105		- } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	105	+ } else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
106	106	if ($row['registration'] == '') $row['registration'] = 'NA';
107	107	if ($row['ident'] == '') $row['ident'] = 'NA';
108		- $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
	108	+ $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
109	109	if (isset($identicao[0])) {
110		- if (substr($row['ident'],0,2) == 'AF') {
111		- if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
112		- else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
113		- } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
114		- $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
	110	+ if (substr($row['ident'], 0, 2) == 'AF') {
	111	+ if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
	112	+ else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
	113	+ } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
	114	+ $data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
115	115	} else $icao = $row['ident'];
116		- $icao = $Translation->checkTranslation($icao,false);
	116	+ $icao = $Translation->checkTranslation($icao, false);
117	117	//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
118	118	if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
119	119	//echo 'Check airline info... for '.$row['airline_name'].' ';
		@@ -122,11 +122,11 @@ discard block
		block discarded – undo
122	122	if (!empty($airline_info)) {
123	123	//echo 'data found !'."\n";
124	124	//print_r($airline_info);
125		- $data = array_merge($data,$airline_info);
	125	+ $data = array_merge($data, $airline_info);
126	126	}
127	127	//else echo 'No data...'."\n";
128	128	}
129		- $data = array_merge($row,$data);
	129	+ $data = array_merge($row, $data);
130	130	if ($data['ident'] == null) $data['ident'] = $icao;
131	131	if ($data['title'] == null) {
132	132	$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
		@@ -151,15 +151,15 @@ discard block
		block discarded – undo
151	151	if ($globalDebug) echo 'Import '.$file."\n";
152	152	$result = array();
153	153	if (file_exists($file)) {
154		- if (($handle = fopen($file,'r')) !== FALSE) {
155		- while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
	154	+ if (($handle = fopen($file, 'r')) !== FALSE) {
	155	+ while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
156	156	if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
157		- $result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam');
	157	+ $result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam');
158	158	}
159	159	}
160	160	fclose($handle);
161	161	}
162		- if (!empty($result)) $this->add($result,true);
	162	+ if (!empty($result)) $this->add($result, true);
163	163	elseif ($globalDebug) echo 'Nothing to import';
164	164	}
165	165	}
		@@ -172,8 +172,8 @@ discard block
		block discarded – undo
172	172	$all_md5_new = array();
173	173	if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
174	174	if ($this->check_accidents_nb() > 0) {
175		- if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
176		- while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
	175	+ if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
	176	+ while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
177	177	if (isset($data[1])) {
178	178	$year = $data[0];
179	179	$all_md5[$year] = $data[1];
		@@ -183,10 +183,10 @@ discard block
		block discarded – undo
183	183	}
184	184	}
185	185	}
186		- $Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
	186	+ $Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
187	187	if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
188		- if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
189		- while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
	188	+ if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
	189	+ while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
190	190	if (isset($data[1])) {
191	191	$year = $data[0];
192	192	$all_md5_new[$year] = $data[1];
		@@ -195,16 +195,16 @@ discard block
		block discarded – undo
195	195	fclose($handle);
196	196	} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
197	197	} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
198		- $result = $Common->arr_diff($all_md5_new,$all_md5);
	198	+ $result = $Common->arr_diff($all_md5_new, $all_md5);
199	199	if (empty($result) && $globalDebug) echo 'Nothing to update';
200	200	foreach ($result as $file => $md5) {
201		- $Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
	201	+ $Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
202	202	if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
203	203	elseif ($globalDebug) echo 'Download '.$file.' failed';
204	204	}
205	205	}
206	206
207		- public function add($crash,$new = false) {
	207	+ public function add($crash, $new = false) {
208	208	global $globalTransaction, $globalDebug;
209	209	require_once('class.Connection.php');
210	210	require_once('class.Image.php');
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	$sthd->execute(array(':source' => $crash[0]['source']));
221	221	}
222	222	if ($globalTransaction) $Connection->db->beginTransaction();
223		- $initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
	223	+ $initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null);
224	224	$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
225	225	$sth_check = $Connection->db->prepare($query_check);
226	226	$query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)';
		@@ -233,31 +233,31 @@ discard block
		block discarded – undo
233	233	$cr = array_map(function($value) {
234	234	return $value === "" ? NULL : $value;
235	235	}, $cr);
236		- if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
237		- if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
238		- $query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
	236	+ if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
	237	+ if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
	238	+ $query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
239	239	$sth_check->execute($query_check_values);
240	240	$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
241	241	if ($result_check['nb'] == 0) {
242		- $query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']);
	242	+ $query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']);
243	243	$sth->execute($query_values);
244		- if ($cr['date'] > time()-(30*86400)) {
	244	+ if ($cr['date'] > time() - (30*86400)) {
245	245	if (empty($Image->getSpotterImage($cr['registration']))) {
246	246	//if ($globalDebug) echo 'Get image...'."\n";
247	247	$Image->addSpotterImage($cr['registration']);
248	248	}
249	249	// elseif ($globalDebug) echo 'Image already in DB'."\n";
250	250	}
251		- $Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
	251	+ $Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
252	252	}
253	253	}
254		- if ($globalTransaction && $j % 1000 == 0) {
	254	+ if ($globalTransaction && $j%1000 == 0) {
255	255	$Connection->db->commit();
256	256	$Connection->db->beginTransaction();
257	257	}
258	258	}
259	259	if ($globalTransaction) $Connection->db->commit();
260		- } catch(PDOException $e) {
	260	+ } catch (PDOException $e) {
261	261	if ($globalTransaction) $Connection->db->rollBack();
262	262	echo $e->getMessage();
263	263	}
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	$Connection = new Connection();
272	272	$sth = $Connection->db->prepare($query);
273	273	$sth->execute();
274		- } catch(PDOException $e) {
	274	+ } catch (PDOException $e) {
275	275	return "error : ".$e->getMessage();
276	276	}
277	277	$row = $sth->fetch(PDO::FETCH_ASSOC);
		@@ -289,7 +289,7 @@ discard block
		block discarded – undo
289	289	$Connection = new Connection();
290	290	$sth = $Connection->db->prepare($query);
291	291	$sth->execute();
292		- } catch(PDOException $e) {
	292	+ } catch (PDOException $e) {
293	293	return "error : ".$e->getMessage();
294	294	}
295	295	$row = $sth->fetch(PDO::FETCH_ASSOC);
		@@ -304,7 +304,7 @@ discard block
		block discarded – undo
304	304	$Connection = new Connection();
305	305	$sth = $Connection->db->prepare($query);
306	306	$sth->execute();
307		- } catch(PDOException $e) {
	307	+ } catch (PDOException $e) {
308	308	return "error : ".$e->getMessage();
309	309	}
310	310	}

		@@ -85,8 +85,11 @@ discard block
		block discarded – undo
85	85	$data = array();
86	86	if ($row['registration'] != '') {
87	87	$image_array = $Image->getSpotterImage($row['registration']);
88		- if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
89		- else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	88	+ if (count($image_array) > 0) {
	89	+ $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
	90	+ } else {
	91	+ $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	92	+ }
90	93	$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
91	94	$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
92	95	if (!empty($aircraft_info)) {
		@@ -102,17 +105,30 @@ discard block
		block discarded – undo
102	105	$data['aircraft_base'] = $owner_data['base'];
103	106	$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
104	107	}
105		- } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
106		- if ($row['registration'] == '') $row['registration'] = 'NA';
107		- if ($row['ident'] == '') $row['ident'] = 'NA';
	108	+ } else {
	109	+ $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
	110	+ }
	111	+ if ($row['registration'] == '') {
	112	+ $row['registration'] = 'NA';
	113	+ }
	114	+ if ($row['ident'] == '') {
	115	+ $row['ident'] = 'NA';
	116	+ }
108	117	$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
109	118	if (isset($identicao[0])) {
110	119	if (substr($row['ident'],0,2) == 'AF') {
111		- if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
112		- else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
113		- } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
	120	+ if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
	121	+ $icao = $row['ident'];
	122	+ } else {
	123	+ $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
	124	+ }
	125	+ } else {
	126	+ $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
	127	+ }
114	128	$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
115		- } else $icao = $row['ident'];
	129	+ } else {
	130	+ $icao = $row['ident'];
	131	+ }
116	132	$icao = $Translation->checkTranslation($icao,false);
117	133	//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
118	134	if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
		@@ -127,18 +143,23 @@ discard block
		block discarded – undo
127	143	//else echo 'No data...'."\n";
128	144	}
129	145	$data = array_merge($row,$data);
130		- if ($data['ident'] == null) $data['ident'] = $icao;
	146	+ if ($data['ident'] == null) {
	147	+ $data['ident'] = $icao;
	148	+ }
131	149	if ($data['title'] == null) {
132	150	$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
133		- } else $data['message'] = strtolower($data['title']);
	151	+ } else {
	152	+ $data['message'] = strtolower($data['title']);
	153	+ }
134	154	$result[] = $data;
135	155	$i++;
136	156	}
137	157	if (isset($result)) {
138	158	$result[0]['query_number_rows'] = $i;
139	159	return $result;
	160	+ } else {
	161	+ return array();
140	162	}
141		- else return array();
142	163	}
143	164
144	165
		@@ -148,7 +169,9 @@ discard block
		block discarded – undo
148	169	*/
149	170	public function import($file) {
150	171	global $globalTransaction, $globalDebug;
151		- if ($globalDebug) echo 'Import '.$file."\n";
	172	+ if ($globalDebug) {
	173	+ echo 'Import '.$file."\n";
	174	+ }
152	175	$result = array();
153	176	if (file_exists($file)) {
154	177	if (($handle = fopen($file,'r')) !== FALSE) {
		@@ -159,8 +182,11 @@ discard block
		block discarded – undo
159	182	}
160	183	fclose($handle);
161	184	}
162		- if (!empty($result)) $this->add($result,true);
163		- elseif ($globalDebug) echo 'Nothing to import';
	185	+ if (!empty($result)) {
	186	+ $this->add($result,true);
	187	+ } elseif ($globalDebug) {
	188	+ echo 'Nothing to import';
	189	+ }
164	190	}
165	191	}
166	192
		@@ -193,14 +219,23 @@ discard block
		block discarded – undo
193	219	}
194	220	}
195	221	fclose($handle);
196		- } elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
197		- } elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
	222	+ } elseif ($globalDebug) {
	223	+ echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
	224	+ }
	225	+ } elseif ($globalDebug) {
	226	+ echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
	227	+ }
198	228	$result = $Common->arr_diff($all_md5_new,$all_md5);
199		- if (empty($result) && $globalDebug) echo 'Nothing to update';
	229	+ if (empty($result) && $globalDebug) {
	230	+ echo 'Nothing to update';
	231	+ }
200	232	foreach ($result as $file => $md5) {
201	233	$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
202		- if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
203		- elseif ($globalDebug) echo 'Download '.$file.' failed';
	234	+ if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
	235	+ $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
	236	+ } elseif ($globalDebug) {
	237	+ echo 'Download '.$file.' failed';
	238	+ }
204	239	}
205	240	}
206	241
		@@ -213,13 +248,17 @@ discard block
		block discarded – undo
213	248	$Image = new Image();
214	249	$Spotter = new Spotter();
215	250
216		- if (empty($crash)) return false;
	251	+ if (empty($crash)) {
	252	+ return false;
	253	+ }
217	254	if (!$new) {
218	255	$query_delete = 'DELETE FROM accidents WHERE source = :source';
219	256	$sthd = $Connection->db->prepare($query_delete);
220	257	$sthd->execute(array(':source' => $crash[0]['source']));
221	258	}
222		- if ($globalTransaction) $Connection->db->beginTransaction();
	259	+ if ($globalTransaction) {
	260	+ $Connection->db->beginTransaction();
	261	+ }
223	262	$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
224	263	$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
225	264	$sth_check = $Connection->db->prepare($query_check);
		@@ -234,7 +273,9 @@ discard block
		block discarded – undo
234	273	return $value === "" ? NULL : $value;
235	274	}, $cr);
236	275	if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
237		- if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
	276	+ if (strpos($cr['registration'],'-') === FALSE) {
	277	+ $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
	278	+ }
238	279	$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
239	280	$sth_check->execute($query_check_values);
240	281	$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
		@@ -256,9 +297,13 @@ discard block
		block discarded – undo
256	297	$Connection->db->beginTransaction();
257	298	}
258	299	}
259		- if ($globalTransaction) $Connection->db->commit();
	300	+ if ($globalTransaction) {
	301	+ $Connection->db->commit();
	302	+ }
260	303	} catch(PDOException $e) {
261		- if ($globalTransaction) $Connection->db->rollBack();
	304	+ if ($globalTransaction) {
	305	+ $Connection->db->rollBack();
	306	+ }
262	307	echo $e->getMessage();
263	308	}
264	309	$sth_check->closeCursor();
		@@ -293,8 +338,11 @@ discard block
		block discarded – undo
293	338	return "error : ".$e->getMessage();
294	339	}
295	340	$row = $sth->fetch(PDO::FETCH_ASSOC);
296		- if ($row['nb'] > 0) return false;
297		- else return true;
	341	+ if ($row['nb'] > 0) {
	342	+ return false;
	343	+ } else {
	344	+ return true;
	345	+ }
298	346	}
299	347
300	348	public static function insert_last_accidents_update() {

		@@ -1,5 +1,5 @@
		block discarded – undo
1	1	<?php
2		-$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
	2	+$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING);
3	3	if ($date == '') $date = date('Y-m-d');
4	4	header('Location: '.$globalURL.'/accident/'.$date);
5	5	?>
6	6	\ No newline at end of file

		@@ -1,5 +1,7 @@
		block discarded – undo
1	1	<?php
2	2	$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
3		-if ($date == '') $date = date('Y-m-d');
	3	+if ($date == '') {
	4	+ $date = date('Y-m-d');
	5	+}
4	6	header('Location: '.$globalURL.'/accident/'.$date);
5	7	?>
6	8	\ No newline at end of file

		@@ -10,10 +10,10 @@ discard block
		block discarded – undo
10	10	{
11	11	$date = date('Y-m-d');
12	12	} else {
13		- $date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
	13	+ $date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING);
14	14	}
15	15
16		-if(!isset($_GET['limit']))
	16	+if (!isset($_GET['limit']))
17	17	{
18	18	$limit_start = 0;
19	19	$limit_end = 25;
		@@ -48,12 +48,12 @@ discard block
		block discarded – undo
48	48	print '<br />';
49	49
50	50	print '<div class="info column">';
51		-print '<h1>'.sprintf(_("Incidents from %s"),date("l F j, Y",strtotime($date))).'</h1>';
	51	+print '<h1>'.sprintf(_("Incidents from %s"), date("l F j, Y", strtotime($date))).'</h1>';
52	52	print '</div>';
53	53
54	54	print '<div class="table column">';
55		-print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."),date("l M j, Y",strtotime($date))).'</p>';
56		-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'incident',$date);
	55	+print '<p>'.sprintf(_("The table below shows the Incidents on <strong>%s</strong>."), date("l M j, Y", strtotime($date))).'</p>';
	56	+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'incident', $date);
57	57	//print_r($spotter_array);
58	58	if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
59	59	include('table-output.php');

		@@ -58,8 +58,12 @@
		block discarded – undo
58	58	if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
59	59	include('table-output.php');
60	60	print '<div class="pagination">';
61		- if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>';
62		- if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>';
	61	+ if ($limit_previous_1 >= 0) {
	62	+ print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>';
	63	+ }
	64	+ if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
	65	+ print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>';
	66	+ }
63	67	print '</div>';
64	68	}
65	69	print '</div>';

		@@ -5,11 +5,11 @@
		block discarded – undo
5	5
6	6	if ($_POST['aircraft_manufacturer'] != "")
7	7	{
8		- $aircraft_manufacturer = filter_input(INPUT_POST,'aircraft_manufacturer',FILTER_SANITIZE_STRING);
	8	+ $aircraft_manufacturer = filter_input(INPUT_POST, 'aircraft_manufacturer', FILTER_SANITIZE_STRING);
9	9	header('Location: '.$globalURL.'/manufacturer/'.$aircraft_manufacturer);
10	10	} elseif ($_GET['aircraft_manufacturer'] != "")
11	11	{
12		- $aircraft_manufacturer = filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING);
	12	+ $aircraft_manufacturer = filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING);
13	13	header('Location: '.$globalURL.'/manufacturer/'.$aircraft_manufacturer);
14	14	} else {
15	15	header('Location: '.$globalURL);

		@@ -5,7 +5,7 @@
		block discarded – undo
5	5
6	6	if ($_POST['registration'] != "")
7	7	{
8		- $registration = filter_input(INPUT_POST,'registration',FILTER_SANITIZE_STRING);
	8	+ $registration = filter_input(INPUT_POST, 'registration', FILTER_SANITIZE_STRING);
9	9	header('Location: '.$globalURL.'/registration/'.$registration);
10	10	} else {
11	11	header('Location: '.$globalURL);

		@@ -2,7 +2,7 @@ discard block
		block discarded – undo
2	2	require_once('../require/settings.php');
3	3	require_once('../require/class.Language.php');
4	4
5		-setcookie("MapFormat",'2d');
	5	+setcookie("MapFormat", '2d');
6	6
7	7	// Compressed GeoJson is used if true
8	8	if (!isset($globalJsonCompress)) $compress = true;
		@@ -18,10 +18,10 @@ discard block
		block discarded – undo
18	18	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
19	19	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
20	20	else $enddate = time();
21		- setcookie("archive_begin",$begindate);
22		- setcookie("archive_end",$enddate);
23		- setcookie("archive_update",$lastupd);
24		- setcookie("archive_speed",$archivespeed);
	21	+ setcookie("archive_begin", $begindate);
	22	+ setcookie("archive_end", $enddate);
	23	+ setcookie("archive_update", $lastupd);
	24	+ setcookie("archive_speed", $archivespeed);
25	25	?>
26	26	document.cookie = 'archive_begin=<?php print $begindate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
27	27	document.cookie = 'archive_end=<?php print $enddate; ?>; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/';
		@@ -92,16 +92,16 @@ discard block
		block discarded – undo
92	92	<?php
93	93	}
94	94	if (isset($_GET['ident'])) {
95		- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
	95	+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
96	96	}
97	97	if (isset($_GET['flightaware_id'])) {
98		- $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
	98	+ $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
99	99	}
100	100	if (isset($_GET['latitude'])) {
101		- $latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
	101	+ $latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
102	102	}
103	103	if (isset($_GET['longitude'])) {
104		- $longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
	104	+ $longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
105	105	}
106	106	?>
107	107
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	\|\| navigator.userAgent.match(/BlackBerry/i)
137	137	\|\| navigator.userAgent.match(/Windows Phone/i))
138	138	{
139		- var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
	139	+ var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom - 1; else print '8'; ?>;
140	140	} else {
141	141	var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
142	142	}
		@@ -230,19 +230,19 @@ discard block
		block discarded – undo
230	230	map.addLayer(yandexLayer);
231	231	<?php
232	232	} elseif ($MapType == 'Bing-Aerial') {
233		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
	233	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
234	234	?>
235	235	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
236	236	map.addLayer(bingLayer);
237	237	<?php
238	238	} elseif ($MapType == 'Bing-Hybrid') {
239		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
	239	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
240	240	?>
241	241	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
242	242	map.addLayer(bingLayer);
243	243	<?php
244	244	} elseif ($MapType == 'Bing-Road') {
245		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
	245	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
246	246	?>
247	247	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
248	248	map.addLayer(bingLayer);
		@@ -534,10 +534,10 @@ discard block
		block discarded – undo
534	534	};
535	535	archive.update = function (props) {
536	536	if (typeof props != 'undefined') {
537		- //this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i> <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a> <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
538		- this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
	537	+ //this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i> <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a> <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>';
	538	+ this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>';
539	539	} else {
540		- this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
	540	+ this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>';
541	541	}
542	542
543	543	};
		@@ -737,7 +737,7 @@ discard block
		block discarded – undo
737	737	<?php
738	738	} else {
739	739	?>
740		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	740	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000 + 20000; ?>+feature.properties.sqt*1000);
741	741	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
742	742	<?php
743	743	}
		@@ -753,7 +753,7 @@ discard block
		block discarded – undo
753	753	/*
754	754	shadowUrl: iconURLShadowpath,
755	755	shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
756		- shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
	756	+ shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
757	757	*/
758	758	})
759	759	})
		@@ -786,7 +786,7 @@ discard block
		block discarded – undo
786	786	<?php
787	787	} else {
788	788	?>
789		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	789	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000 + 20000; ?>+feature.properties.sqt*1000);
790	790	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
791	791	<?php
792	792	}
		@@ -834,7 +834,7 @@ discard block
		block discarded – undo
834	834	<?php
835	835	} else {
836	836	?>
837		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	837	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000 + 20000; ?>+feature.properties.sqt*1000);
838	838	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
839	839	<?php
840	840	}
		@@ -1460,23 +1460,23 @@ discard block
		block discarded – undo
1460	1460	airs.push(air.value);
1461	1461	}
1462	1462	}
1463		- document.cookie = 'filter_Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); ?>; path=/'
	1463	+ document.cookie = 'filter_Airlines='+airs.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
1464	1464	}
1465	1465	function airlinestype(selectObj) {
1466	1466	var idx = selectObj.selectedIndex;
1467	1467	var airtype = selectObj.options[idx].value;
1468		- document.cookie = 'filter_airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); ?>; path=/'
	1468	+ document.cookie = 'filter_airlinestype='+airtype+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
1469	1469	}
1470	1470	function alliance(selectObj) {
1471	1471	var idx = selectObj.selectedIndex;
1472	1472	var alliance = selectObj.options[idx].value;
1473		- document.cookie = 'filter_alliance='+alliance+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); ?>; path=/'
	1473	+ document.cookie = 'filter_alliance='+alliance+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
1474	1474	}
1475	1475
1476	1476	function identfilter() {
1477	1477	var ident = $('#identfilter').val();
1478	1478	console.log('Filter with '+ident);
1479		- document.cookie = 'filter_ident='+ident+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+2, date("Y"))); ?>; path=/'
	1479	+ document.cookie = 'filter_ident='+ident+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1480	1480	}
1481	1481	function removefilters() {
1482	1482	// Get an array of all cookie names (the regex matches what we don't want)
		@@ -1498,7 +1498,7 @@ discard block
		block discarded – undo
1498	1498	}
1499	1499	}
1500	1500	//document.cookie = 'Sources='+sources.join()+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1501		- document.cookie = 'filter_Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+1, date("Y"))); ?>; path=/'
	1501	+ document.cookie = 'filter_Sources='+sources.join()+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 1, date("Y"))); ?>; path=/'
1502	1502	}
1503	1503
1504	1504	function show3D() {
		@@ -1521,23 +1521,23 @@ discard block
		block discarded – undo
1521	1521
1522	1522	function clickVATSIM(cb) {
1523	1523	//document.cookie = 'ShowVATSIM='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1524		- document.cookie = 'filter_ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+2, date("Y"))); ?>; path=/'
	1524	+ document.cookie = 'filter_ShowVATSIM='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1525	1525	}
1526	1526	function clickIVAO(cb) {
1527	1527	//document.cookie = 'ShowIVAO='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1528		- document.cookie = 'filter_ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+2, date("Y"))); ?>; path=/'
	1528	+ document.cookie = 'filter_ShowIVAO='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1529	1529	}
1530	1530	function clickphpVMS(cb) {
1531	1531	//document.cookie = 'ShowVMS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1532		- document.cookie = 'filter_ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+2, date("Y"))); ?>; path=/'
	1532	+ document.cookie = 'filter_ShowVMS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1533	1533	}
1534	1534	function clickSBS1(cb) {
1535	1535	//document.cookie = 'ShowSBS1='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1536		- document.cookie = 'filter_ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+2, date("Y"))); ?>; path=/'
	1536	+ document.cookie = 'filter_ShowSBS1='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1537	1537	}
1538	1538	function clickAPRS(cb) {
1539	1539	//document.cookie = 'ShowAPRS='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
1540		- document.cookie = 'filter_ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T",mktime(0, 0, 0, date("m") , date("d")+2, date("Y"))); ?>; path=/'
	1540	+ document.cookie = 'filter_ShowAPRS='+cb.checked+'; expires=<?php print date("D, j M Y G:i:s T", mktime(0, 0, 0, date("m"), date("d") + 2, date("Y"))); ?>; path=/'
1541	1541	}
1542	1542	function clickFlightPopup(cb) {
1543	1543	document.cookie = 'flightpopup='+cb.checked+'; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'

		@@ -352,7 +352,7 @@ discard block
		block discarded – undo
352	352	<?php
353	353	if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
354	354	else $getZoom = '7';
355		- ?>
	355	+ ?>
356	356	//if (map.getZoom() <= <?php print $getZoom; ?>) {
357	357	if (typeof airportsLayer != 'undefined') {
358	358	if (map.hasLayer(airportsLayer) == true) {
		@@ -512,7 +512,7 @@ discard block
		block discarded – undo
512	512	update_locationsLayer();
513	513
514	514	<?php
515		- if (!isset($ident) && !isset($flightaware_id)) {
	515	+ if (!isset($ident) && !isset($flightaware_id)) {
516	516	?>
517	517
518	518	function info_update (props) {
		@@ -520,11 +520,11 @@ discard block
		block discarded – undo
520	520	}
521	521
522	522	<?php
523		- }
	523	+ }
524	524	?>
525	525
526	526	<?php
527		- if (isset($_GET['archive'])) {
	527	+ if (isset($_GET['archive'])) {
528	528	?>
529	529	var archive = L.control();
530	530	archive.onAdd = function (map) {
		@@ -543,12 +543,12 @@ discard block
		block discarded – undo
543	543	};
544	544	archive.addTo(map);
545	545	<?php

		@@ -5,8 +5,11 @@ discard block
		block discarded – undo
5	5	setcookie("MapFormat",'2d');
6	6
7	7	// Compressed GeoJson is used if true
8		-if (!isset($globalJsonCompress)) $compress = true;
9		-else $compress = $globalJsonCompress;
	8	+if (!isset($globalJsonCompress)) {
	9	+ $compress = true;
	10	+} else {
	11	+ $compress = $globalJsonCompress;
	12	+}
10	13	if (isset($_GET['archive'])) {
11	14	//$archiveupdatetime = 50;
12	15	$archiveupdatetime = $globalMapRefresh;
		@@ -16,8 +19,11 @@ discard block
		block discarded – undo
16	19	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
17	20	//$lastupd = 20;
18	21	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
19		- if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
20		- else $enddate = time();
	22	+ if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
	23	+ $enddate = $_GET['enddate'];
	24	+ } else {
	25	+ $enddate = time();
	26	+ }
21	27	setcookie("archive_begin",$begindate);
22	28	setcookie("archive_end",$enddate);
23	29	setcookie("archive_update",$lastupd);
		@@ -123,7 +129,17 @@ discard block
		block discarded – undo
123	129	}
124	130
125	131	//create the map
126		- map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
	132	+ map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
	133	+ print $latitude;
	134	+} else {
	135	+ print $globalCenterLatitude;
	136	+}
	137	+?>,<?php if (isset($longitude)) {
	138	+ print $longitude;
	139	+} else {
	140	+ print $globalCenterLongitude;
	141	+}
	142	+?>], zoom);
127	143	<?php
128	144	} else {
129	145	?>
		@@ -136,9 +152,19 @@ discard block
		block discarded – undo
136	152	\|\| navigator.userAgent.match(/BlackBerry/i)
137	153	\|\| navigator.userAgent.match(/Windows Phone/i))
138	154	{
139		- var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom-1; else print '8'; ?>;
	155	+ var zoom = <?php if (isset($globalLiveZoom)) {
	156	+ print $globalLiveZoom-1;
	157	+} else {
	158	+ print '8';
	159	+}
	160	+?>;
140	161	} else {
141		- var zoom = <?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>;
	162	+ var zoom = <?php if (isset($globalLiveZoom)) {
	163	+ print $globalLiveZoom;
	164	+} else {
	165	+ print '9';
	166	+}
	167	+?>;
142	168	}
143	169
144	170	//create the map
		@@ -163,16 +189,27 @@ discard block
		block discarded – undo
163	189	bounds = L.latLngBounds(southWest,northEast);
164	190	//a few title layers
165	191	<?php
166		- if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
167		- else $MapType = $globalMapProvider;
	192	+ if (isset($_COOKIE['MapType'])) {
	193	+ $MapType = $_COOKIE['MapType'];
	194	+ } else {
	195	+ $MapType = $globalMapProvider;
	196	+ }
168	197
169	198	if ($MapType == 'Mapbox') {
170		- if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
171		- else $MapBoxId = $_COOKIE['MapTypeId'];
172		-?>
	199	+ if ($_COOKIE['MapTypeId'] == 'default') {
	200	+ $MapBoxId = $globalMapboxId;
	201	+ } else {
	202	+ $MapBoxId = $_COOKIE['MapTypeId'];
	203	+ }
	204	+ ?>
173	205	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
174	206	maxZoom: 18,
175		- noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
	207	+ noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
	208	+ print 'false';
	209	+} else {
	210	+ print 'true';
	211	+}
	212	+?>,
176	213	attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
177	214	'<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
178	215	'Imagery © <a href="http://mapbox.com">Mapbox</a>',
		@@ -184,7 +221,12 @@ discard block
		block discarded – undo
184	221	?>
185	222	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
186	223	maxZoom: 18,
187		- noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
	224	+ noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
	225	+ print 'false';
	226	+} else {
	227	+ print 'true';
	228	+}
	229	+?>,
188	230	attribution: 'Map data © <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
189	231	'<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
190	232	}).addTo(map);
		@@ -230,20 +272,26 @@ discard block
		block discarded – undo
230	272	map.addLayer(yandexLayer);
231	273	<?php
232	274	} elseif ($MapType == 'Bing-Aerial') {
233		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
234		-?>
	275	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') {
	276	+ setcookie('MapType','OpenStreetMap');
	277	+ }
	278	+ ?>
235	279	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
236	280	map.addLayer(bingLayer);
237	281	<?php
238	282	} elseif ($MapType == 'Bing-Hybrid') {
239		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
240		-?>
	283	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') {
	284	+ setcookie('MapType','OpenStreetMap');
	285	+ }
	286	+ ?>
241	287	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
242	288	map.addLayer(bingLayer);
243	289	<?php
244	290	} elseif ($MapType == 'Bing-Road') {
245		- if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
246		-?>
	291	+ if (!isset($globalBingMapKey) \|\| $globalBingMapKey == '') {
	292	+ setcookie('MapType','OpenStreetMap');
	293	+ }
	294	+ ?>
247	295	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
248	296	map.addLayer(bingLayer);
249	297	<?php
		@@ -291,7 +339,12 @@ discard block
		block discarded – undo
291	339	}
292	340	} elseif ($globalBounding == 'circle') {
293	341	?>
294		- var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
	342	+ var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
	343	+ print $globalBoundingCircleSize;
	344	+} else {
	345	+ print '70000';
	346	+}
	347	+?>,{
295	348	color: '#92C7D1',
296	349	fillColor: '#92C7D1',
297	350	fillOpacity: 0.3,
		@@ -350,8 +403,11 @@ discard block
		block discarded – undo
350	403
351	404	function update_airportsLayer() {
352	405	<?php
353		- if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
354		- else $getZoom = '7';
	406	+ if (isset($_COOKIE['AirportZoom'])) {
	407	+ $getZoom = $_COOKIE['AirportZoom'];
	408	+ } else {
	409	+ $getZoom = '7';
	410	+ }
355	411	?>
356	412	//if (map.getZoom() <= <?php print $getZoom; ?>) {
357	413	if (typeof airportsLayer != 'undefined') {
		@@ -687,9 +743,13 @@ discard block
		block discarded – undo
687	743	if (callsign != ""){ markerLabel += callsign; }
688	744	if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; }
689	745	<?php
690		- if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
691		- elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
692		- else $IconColor = '1a3151';
	746	+ if (isset($_COOKIE['IconColor'])) {
	747	+ $IconColor = $_COOKIE['IconColor'];
	748	+ } elseif (isset($globalAircraftIconColor)) {
	749	+ $IconColor = $globalAircraftIconColor;
	750	+ } else {
	751	+ $IconColor = '1a3151';
	752	+ }
693	753	if (!isset($ident) && !isset($flightaware_id)) {
694	754	?>
695	755	info_update(feature.properties.fc);
		@@ -737,7 +797,12 @@ discard block
		block discarded – undo
737	797	<?php
738	798	} else {
739	799	?>
740		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	800	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	801	+ print $archiveupdatetime*1000;
	802	+} else {
	803	+ print $globalMapRefresh*1000+20000;
	804	+}
	805	+?>+feature.properties.sqt*1000);
741	806	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
742	807	<?php
743	808	}
		@@ -786,7 +851,12 @@ discard block
		block discarded – undo
786	851	<?php
787	852	} else {
788	853	?>
789		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	854	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	855	+ print $archiveupdatetime*1000;
	856	+} else {
	857	+ print $globalMapRefresh*1000+20000;
	858	+}
	859	+?>+feature.properties.sqt*1000);
790	860	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
791	861	<?php
792	862	}
		@@ -834,7 +904,12 @@ discard block
		block discarded – undo
834	904	<?php
835	905	} else {
836	906	?>
837		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	907	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	908	+ print $archiveupdatetime*1000;
	909	+} else {
	910	+ print $globalMapRefresh*1000+20000;
	911	+}
	912	+?>+feature.properties.sqt*1000);
838	913	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
839	914	<?php
840	915	}
		@@ -1177,14 +1252,24 @@ discard block
		block discarded – undo
1177	1252	if (isset($_GET['archive'])) {
1178	1253	?>
1179	1254	//then load it again every 30 seconds
1180		-// var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
	1255	+// var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
	1256	+ print ($globalMapRefresh*1000)/2;
	1257	+} else {
	1258	+ print '15000';
	1259	+}
	1260	+?>);
1181	1261	reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>);
1182	1262	<?php
1183	1263	} else {
1184	1264	?>
1185	1265	//then load it again every 30 seconds
1186	1266	reloadPage = setInterval(
1187		- function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
	1267	+ function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
	1268	+ print $globalMapRefresh*1000;
	1269	+} else {
	1270	+ print '30000';
	1271	+}
	1272	+?>);
1188	1273	var currentdate = new Date();
1189	1274	var currentyear = new Date().getFullYear();
1190	1275	var begindate = new Date(Date.UTC(currentyear,11,24,2,0,0,0));
		@@ -1196,7 +1281,12 @@ discard block
		block discarded – undo
1196	1281	if (!((isset($globalIVAO) && $globalIVAO) \|\| (isset($globalVATSIM) && $globalVATSIM) \|\| (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
1197	1282	?>
1198	1283	update_polarLayer();
1199		-setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh10002; else print '60000'; ?>);
	1284	+setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
	1285	+ print $globalMapRefresh10002;
	1286	+} else {
	1287	+ print '60000';
	1288	+}
	1289	+?>);
1200	1290	<?php
1201	1291	}
1202	1292	?>
		@@ -1212,7 +1302,12 @@ discard block
		block discarded – undo
1212	1302	if ((isset($globalIVAO) && $globalIVAO) \|\| (isset($globalVATSIM) && $globalVATSIM)) {
1213	1303	?>
1214	1304	update_atcLayer();
1215		-setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh10002; else print '60000'; ?>);
	1305	+setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
	1306	+ print $globalMapRefresh10002;
	1307	+} else {
	1308	+ print '60000';
	1309	+}
	1310	+?>);
1216	1311	<?php
1217	1312	}
1218	1313	?>

Ysurac / FlightAirMap

Push — master ( 8ce5a2...3d964c )

Status

Category

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

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch

Braces +75 added lines, -27 removed lines patch added patch discarded remove patch

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

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

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

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

Spacing +30 added lines, -30 removed lines patch added patch discarded remove patch

Braces +128 added lines, -33 removed lines patch added patch discarded remove patch

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