Ysurac / FlightAirMap

require/class.Accident.php

Braces +87 added lines, -31 removed lines

@@ -10,7 +10,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Accident)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Accident)');
+		}
 	}
 
 	public function get() {
@@ -109,8 +111,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)) {
@@ -126,17 +131,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'])) {
@@ -151,10 +169,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'],true);
 				$date = $data['date'];
 				if (isset($ids[$date])) {
@@ -173,8 +195,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 
 	/*
@@ -219,7 +242,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) {
@@ -230,8 +255,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';
+			}
 		}
 	}
 
@@ -267,14 +295,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';
+			}
 		}
 	}
 
@@ -291,13 +328,17 @@ 
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 
-		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);
@@ -312,7 +353,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);
@@ -322,13 +365,19 @@ 
 						if ($cr['date'] > time()-(30*86400)) {
 							$imgchk = $Image->getSpotterImage($cr['registration']);
 							if (empty($imgchk)) {
-								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
+								if ($globalDebug) {
+									echo "\t".'Get image for '.$cr['registration'].'...';
+								}
 								$Image->addSpotterImage($cr['registration']);
-								if ($globalDebug) echo "\t".'Done'."\n";
+								if ($globalDebug) {
+									echo "\t".'Done'."\n";
+								}
 							}
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
 						}
-						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
+						if ($cr['title'] == '') {
+							$cr['title'] = $cr['registration'].' '.$cr['type'];
+						}
 						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
 					}
 				}
@@ -337,9 +386,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();
@@ -378,8 +431,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() {