Ysurac / FlightAirMap

table-output.php

Braces +45 added lines, -17 removed lines

@@ -367,7 +367,9 @@ 
 	if (isset($globalTimezone))
 	{
 		date_default_timezone_set($globalTimezone);
-	} else date_default_timezone_set('UTC');
+	} else {
+		date_default_timezone_set('UTC');
+	}
 	if ($showSpecial === true)
 	{
 		print '<tr class="special">'."\n";
@@ -386,8 +388,9 @@ 
 			print '<td class="aircraft_thumbnail">'."\n";
 			
 			if ($spotter_item['image_source'] == 'planespotters') {
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-				else {
+				if ($spotter_item['image_source_website'] != '') {
+					$image_src = $spotter_item['image_source_website'];
+				} else {
 					$planespotter_url_array = explode("_", $spotter_item['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -400,7 +403,9 @@ 
                         } else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		} else {
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		}
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
@@ -422,8 +427,9 @@ 
 			print '<td class="aircraft_thumbnail">'."\n";
 			//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 			if ($spotter_item['image_source'] == 'planespotters') {
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-				else {
+				if ($spotter_item['image_source_website'] != '') {
+					$image_src = $spotter_item['image_source_website'];
+				} else {
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -440,7 +446,9 @@ 
 			} else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		} else {
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		}
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -527,15 +535,21 @@ 
 		if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
 			if ($spotter_item['departure_airport_time'] > 2460) {
 				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
-			} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+			} else {
+				$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+			}
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			} else {
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
 		} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			} else {
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
 		} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 			if ($spotter_item['departure_airport_time'] > 2460) {
@@ -557,7 +571,9 @@ 
 					$longitude = $spotter_item['longitude'];
 				}
 				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
-			} else $distance = '';
+			} else {
+				$distance = '';
+			}
 			if ($distance != '') {
 			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 				    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
@@ -582,7 +598,9 @@ 
 		} else {
 			if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
 				print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
-				if (!isset($Spotter)) $Spotter = new Spotter();
+				if (!isset($Spotter)) {
+					$Spotter = new Spotter();
+				}
 				$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']);
 				print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
 				print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
@@ -598,20 +616,28 @@ 
 		if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+			} else {
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
+			}
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			} else {
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
 		} elseif (isset($spotter_item['real_arrival_airport_time'])) {
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			} else {
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
 		} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+			} else {
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
+			}
 			print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
 		}
 		if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
@@ -624,7 +650,9 @@ 
 					$longitude = $spotter_item['longitude'];
 				}
 				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
-			} else $distance = '';
+			} else {
+				$distance = '';
+			}
 			if ($distance != '') {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 					echo '<br/><i>'.round($distance*0.539957).' nm</i>';

require/class.Accident.php

Braces +75 added lines, -27 removed lines

@@ -96,8 +96,11 @@ 
 			$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)) {
@@ -113,17 +116,30 @@ 
 					$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'])) {
@@ -138,10 +154,14 @@ 
 				//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']);
+			}
 			$ids = $Spotter->getAllIDByRegistration($data['registration']);
 			$date = $data['date'];
 			if (isset($ids[$date])) {
@@ -158,8 +178,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 	
 	/*
@@ -198,7 +219,9 @@ 
 	*/
 	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) {
@@ -209,8 +232,11 @@ 
 				}
 				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';
+			}
 		}
 	}
 
@@ -246,14 +272,23 @@ 
 					}
 				}
 				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';
+			}
 		}
 	}
 
@@ -270,13 +305,17 @@ 
 		$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);
@@ -291,7 +330,9 @@ 
 					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);
@@ -313,9 +354,13 @@ 
 					$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();
@@ -354,8 +399,11 @@ 
 			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() {

accident-latest.php

Braces +6 added lines, -2 removed lines

@@ -58,8 +58,12 @@
 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>';