Completed
Push — master ( 8797d3...6ab92f )
by Yannick
27:52
created
require/class.Accident.php 2 patches
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -28,20 +28,20 @@  discard block
 block discarded – undo
28 28
 	* @param String $date get data for a date
29 29
 	* @return Array Return Accidents data in array
30 30
 	*/
31
-	public function getAccidentData($limit = '',$type = '',$date = '') {
31
+	public function getAccidentData($limit = '', $type = '', $date = '') {
32 32
 		global $globalURL, $globalDBdriver;
33 33
 		$Image = new Image($this->db);
34 34
 		$Spotter = new Spotter($this->db);
35 35
 		$Translation = new Translation($this->db);
36
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
36
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
37 37
 		date_default_timezone_set('UTC');
38 38
 		$result = array();
39 39
 		$limit_query = '';
40 40
 		if ($limit != "")
41 41
 		{
42 42
 			$limit_array = explode(",", $limit);
43
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
44
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
43
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
44
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
45 45
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
46 46
 			{
47 47
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -50,29 +50,29 @@  discard block
 block discarded – undo
50 50
 
51 51
 		if ($type != '') {
52 52
 			if ($date != '') {
53
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
53
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
54 54
 					$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 accidents.date DESC".$limit_query;
55 55
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
56
-					$query_values = array(':type' => $type,':date' => $date);
57
-				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/",$date)) {
56
+					$query_values = array(':type' => $type, ':date' => $date);
57
+				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/", $date)) {
58 58
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date BETWEEN :dated AND :datef GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
59
-					$query_values = array(':type' => $type,':dated' => $date.'-01', ':datef' => $date.'-31');
60
-				} elseif (preg_match("/^[0-9]{4}$/",$date)) {
59
+					$query_values = array(':type' => $type, ':dated' => $date.'-01', ':datef' => $date.'-31');
60
+				} elseif (preg_match("/^[0-9]{4}$/", $date)) {
61 61
 					if ($globalDBdriver == 'mysql') {
62 62
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND YEAR(date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
63 63
 					} else {
64 64
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND EXTRACT(YEAR FROM date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
65 65
 					}
66
-					$query_values = array(':type' => $type,':date' => $date);
66
+					$query_values = array(':type' => $type, ':date' => $date);
67 67
 				} else {
68 68
 					$date = $date.'%';
69 69
 					if ($globalDBdriver == 'mysql') {
70 70
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND DATE_FORMAT(date,'%Y-%m-%d') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
71
-						$query_values = array(':type' => $type,':date' => $date);
71
+						$query_values = array(':type' => $type, ':date' => $date);
72 72
 					} else {
73 73
 						$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 accidents.date DESC".$limit_query;
74 74
 						//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration 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 accidents.date DESC".$limit_query;
75
-						$query_values = array(':type' => $type,':date' => $date);
75
+						$query_values = array(':type' => $type, ':date' => $date);
76 76
 					}
77 77
 				}
78 78
 			} else {
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 			}
83 83
 		} else {
84 84
 			if ($date != '') {
85
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
85
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
86 86
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
87 87
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
88 88
 				} else {
@@ -100,17 +100,17 @@  discard block
 block discarded – undo
100 100
 		try {
101 101
 			$sth = $this->db->prepare($query);
102 102
 			$sth->execute($query_values);
103
-		} catch(PDOException $e) {
103
+		} catch (PDOException $e) {
104 104
 			echo "error : ".$e->getMessage();
105 105
 		}
106 106
 		$i = 0;
107 107
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
108
-			if (preg_match('/^[\w\-]+$/',$row['registration'])) {
108
+			if (preg_match('/^[\w\-]+$/', $row['registration'])) {
109 109
 				$data = array();
110 110
 				if ($row['registration'] != '') {
111 111
 					$image_array = $Image->getSpotterImage($row['registration']);
112
-					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']));
113
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
112
+					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']));
113
+					else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
114 114
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
115 115
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
116 116
 					if (!empty($aircraft_info)) {
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 						$data['aircraft_name'] = $aircraft_info[0]['type'];
119 119
 						$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
120 120
 					} else {
121
-						$data = array_merge($data,array('aircraft_type' => 'NA'));
121
+						$data = array_merge($data, array('aircraft_type' => 'NA'));
122 122
 					}
123 123
 					$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
124 124
 					if (!empty($owner_data)) {
@@ -126,18 +126,18 @@  discard block
 block discarded – undo
126 126
 						$data['aircraft_base'] = $owner_data['base'];
127 127
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
128 128
 					}
129
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
129
+				} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
130 130
 				if ($row['registration'] == '') $row['registration'] = 'NA';
131 131
 				if ($row['ident'] == '') $row['ident'] = 'NA';
132
-				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
132
+				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
133 133
 				if (isset($identicao[0])) {
134
-					if (substr($row['ident'],0,2) == 'AF') {
135
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
136
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
137
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
138
-					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
134
+					if (substr($row['ident'], 0, 2) == 'AF') {
135
+						if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
136
+						else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
137
+					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
138
+					$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
139 139
 				} else $icao = $row['ident'];
140
-				$icao = $Translation->checkTranslation($icao,false);
140
+				$icao = $Translation->checkTranslation($icao, false);
141 141
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
142 142
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
143 143
 					//echo 'Check airline info... for '.$row['airline_name'].' ';
@@ -146,16 +146,16 @@  discard block
 block discarded – undo
146 146
 					if (!empty($airline_info)) {
147 147
 						//echo 'data found !'."\n";
148 148
 						//print_r($airline_info);
149
-						$data = array_merge($data,$airline_info);
149
+						$data = array_merge($data, $airline_info);
150 150
 					} 
151 151
 					//else echo 'No data...'."\n";
152 152
 				}
153
-				$data = array_merge($row,$data);
153
+				$data = array_merge($row, $data);
154 154
 				if ($data['ident'] == null) $data['ident'] = $icao;
155 155
 				if ($data['title'] == null) {
156 156
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
157 157
 				} else $data['message'] = strtolower($data['title']);
158
-				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
158
+				$ids = $Spotter->getAllIDByRegistration($data['registration'], true);
159 159
 				$date = $data['date'];
160 160
 				if (isset($ids[$date])) {
161 161
 					$data['spotted'] = TRUE;
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 		try {
188 188
 			$sth = $this->db->prepare($query);
189 189
 			$sth->execute();
190
-		} catch(PDOException $e) {
190
+		} catch (PDOException $e) {
191 191
 			echo "Error : ".$e->getMessage();
192 192
 		}
193 193
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 		try {
208 208
 			$sth = $this->db->prepare($query);
209 209
 			$sth->execute();
210
-		} catch(PDOException $e) {
210
+		} catch (PDOException $e) {
211 211
 			echo "Error : ".$e->getMessage();
212 212
 		}
213 213
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -222,15 +222,15 @@  discard block
 block discarded – undo
222 222
 		if ($globalDebug) echo 'Import '.$file."\n";
223 223
 		$result = array();
224 224
 		if (file_exists($file)) {
225
-			if (($handle = fopen($file,'r')) !== FALSE) {
226
-				while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
225
+			if (($handle = fopen($file, 'r')) !== FALSE) {
226
+				while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
227 227
 					if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
228
-						$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');
228
+						$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');
229 229
 					}
230 230
 				}
231 231
 				fclose($handle);
232 232
 			}
233
-			if (!empty($result)) $this->add($result,true);
233
+			if (!empty($result)) $this->add($result, true);
234 234
 			elseif ($globalDebug) echo 'Nothing to import';
235 235
 		}
236 236
 	}
@@ -246,8 +246,8 @@  discard block
 block discarded – undo
246 246
 		$all_md5_new = array();
247 247
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
248 248
 			if ($this->check_accidents_nb() > 0) {
249
-				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
250
-					while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
249
+				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
250
+					while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
251 251
 						if (isset($data[1])) {
252 252
 							$year = $data[0];
253 253
 							$all_md5[$year] = $data[1];
@@ -257,10 +257,10 @@  discard block
 block discarded – undo
257 257
 				}
258 258
 			}
259 259
 		}
260
-		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
260
+		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
261 261
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
262
-			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
263
-				while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
262
+			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
263
+				while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
264 264
 					if (isset($data[1])) {
265 265
 						$year = $data[0];
266 266
 						$all_md5_new[$year] = $data[1];
@@ -269,10 +269,10 @@  discard block
 block discarded – undo
269 269
 				fclose($handle);
270 270
 			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
271 271
 		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
272
-		$result = $Common->arr_diff($all_md5_new,$all_md5);
272
+		$result = $Common->arr_diff($all_md5_new, $all_md5);
273 273
 		if (empty($result) && $globalDebug) echo 'Nothing to update';
274 274
 		foreach ($result as $file => $md5) {
275
-			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
275
+			$Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
276 276
 			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
277 277
 			elseif ($globalDebug) echo 'Download '.$file.' failed';
278 278
 		}
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
 	* Add data to DB
283 283
 	* @param Array $crash An array with accidents/incidents data
284 284
 	*/
285
-	public function add($crash,$new = false) {
285
+	public function add($crash, $new = false) {
286 286
 		global $globalTransaction, $globalDebug;
287 287
 		require_once('class.Connection.php');
288 288
 		require_once('class.Image.php');
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 			$sthd->execute(array(':source' => $crash[0]['source']));
299 299
 		}
300 300
 		if ($globalTransaction) $Connection->db->beginTransaction();
301
-		$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);
301
+		$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);
302 302
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
303 303
 		$sth_check = $Connection->db->prepare($query_check);
304 304
 		$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)';
@@ -311,15 +311,15 @@  discard block
 block discarded – undo
311 311
 				$cr = array_map(function($value) {
312 312
 					return $value === "" ? NULL : $value;
313 313
 				}, $cr);
314
-				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
315
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
316
-					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
314
+				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
315
+					if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
316
+					$query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
317 317
 					$sth_check->execute($query_check_values);
318 318
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
319 319
 					if ($result_check['nb'] == 0) {
320
-						$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']);
320
+						$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']);
321 321
 						$sth->execute($query_values);
322
-						if ($cr['date'] > time()-(30*86400)) {
322
+						if ($cr['date'] > time() - (30*86400)) {
323 323
 							$imgchk = $Image->getSpotterImage($cr['registration']);
324 324
 							if (empty($imgchk)) {
325 325
 								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
@@ -329,16 +329,16 @@  discard block
 block discarded – undo
329 329
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
330 330
 						}
331 331
 						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
332
-						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
332
+						$Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
333 333
 					}
334 334
 				}
335
-				if ($globalTransaction && $j % 1000 == 0) {
335
+				if ($globalTransaction && $j%1000 == 0) {
336 336
 					$Connection->db->commit();
337 337
 					$Connection->db->beginTransaction();
338 338
 				}
339 339
 			}
340 340
 			if ($globalTransaction) $Connection->db->commit();
341
-		} catch(PDOException $e) {
341
+		} catch (PDOException $e) {
342 342
 			if ($globalTransaction) $Connection->db->rollBack();
343 343
 			echo $e->getMessage();
344 344
 		}
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 			$Connection = new Connection();
357 357
 			$sth = $Connection->db->prepare($query);
358 358
 			$sth->execute();
359
-		} catch(PDOException $e) {
359
+		} catch (PDOException $e) {
360 360
 			return "error : ".$e->getMessage();
361 361
 		}
362 362
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 			$Connection = new Connection();
375 375
 			$sth = $Connection->db->prepare($query);
376 376
 			$sth->execute();
377
-		} catch(PDOException $e) {
377
+		} catch (PDOException $e) {
378 378
 			return "error : ".$e->getMessage();
379 379
 		}
380 380
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 			$Connection = new Connection();
390 390
 			$sth = $Connection->db->prepare($query);
391 391
 			$sth->execute();
392
-		} catch(PDOException $e) {
392
+		} catch (PDOException $e) {
393 393
 			return "error : ".$e->getMessage();
394 394
 		}
395 395
 	}
Please login to merge, or discard this patch.
Braces   +87 added lines, -31 removed lines patch added patch discarded remove patch
@@ -10,7 +10,9 @@  discard block
 block discarded – undo
10 10
 	public function __construct($dbc = null) {
11 11
 		$Connection = new Connection($dbc);
12 12
 		$this->db = $Connection->db();
13
-		if ($this->db === null) die('Error: No DB connection. (Accident)');
13
+		if ($this->db === null) {
14
+			die('Error: No DB connection. (Accident)');
15
+		}
14 16
 	}
15 17
 
16 18
 	public function get() {
@@ -109,8 +111,11 @@  discard block
 block discarded – undo
109 111
 				$data = array();
110 112
 				if ($row['registration'] != '') {
111 113
 					$image_array = $Image->getSpotterImage($row['registration']);
112
-					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']));
113
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
114
+					if (count($image_array) > 0) {
115
+						$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']));
116
+					} else {
117
+						$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
118
+					}
114 119
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
115 120
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
116 121
 					if (!empty($aircraft_info)) {
@@ -126,17 +131,30 @@  discard block
 block discarded – undo
126 131
 						$data['aircraft_base'] = $owner_data['base'];
127 132
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
128 133
 					}
129
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
130
-				if ($row['registration'] == '') $row['registration'] = 'NA';
131
-				if ($row['ident'] == '') $row['ident'] = 'NA';
134
+				} else {
135
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
136
+				}
137
+				if ($row['registration'] == '') {
138
+					$row['registration'] = 'NA';
139
+				}
140
+				if ($row['ident'] == '') {
141
+					$row['ident'] = 'NA';
142
+				}
132 143
 				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
133 144
 				if (isset($identicao[0])) {
134 145
 					if (substr($row['ident'],0,2) == 'AF') {
135
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
136
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
137
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
146
+						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
147
+							$icao = $row['ident'];
148
+						} else {
149
+							$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
150
+						}
151
+					} else {
152
+						$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
153
+					}
138 154
 					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
139
-				} else $icao = $row['ident'];
155
+				} else {
156
+					$icao = $row['ident'];
157
+				}
140 158
 				$icao = $Translation->checkTranslation($icao,false);
141 159
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
142 160
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
@@ -151,10 +169,14 @@  discard block
 block discarded – undo
151 169
 					//else echo 'No data...'."\n";
152 170
 				}
153 171
 				$data = array_merge($row,$data);
154
-				if ($data['ident'] == null) $data['ident'] = $icao;
172
+				if ($data['ident'] == null) {
173
+					$data['ident'] = $icao;
174
+				}
155 175
 				if ($data['title'] == null) {
156 176
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
157
-				} else $data['message'] = strtolower($data['title']);
177
+				} else {
178
+					$data['message'] = strtolower($data['title']);
179
+				}
158 180
 				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
159 181
 				$date = $data['date'];
160 182
 				if (isset($ids[$date])) {
@@ -173,8 +195,9 @@  discard block
 block discarded – undo
173 195
 		if (isset($result)) {
174 196
 			$result[0]['query_number_rows'] = $i;
175 197
 			return $result;
198
+		} else {
199
+			return array();
176 200
 		}
177
-		else return array();
178 201
 	}
179 202
 
180 203
 	/*
@@ -219,7 +242,9 @@  discard block
 block discarded – undo
219 242
 	*/
220 243
 	public function import($file) {
221 244
 		global $globalTransaction, $globalDebug;
222
-		if ($globalDebug) echo 'Import '.$file."\n";
245
+		if ($globalDebug) {
246
+			echo 'Import '.$file."\n";
247
+		}
223 248
 		$result = array();
224 249
 		if (file_exists($file)) {
225 250
 			if (($handle = fopen($file,'r')) !== FALSE) {
@@ -230,8 +255,11 @@  discard block
 block discarded – undo
230 255
 				}
231 256
 				fclose($handle);
232 257
 			}
233
-			if (!empty($result)) $this->add($result,true);
234
-			elseif ($globalDebug) echo 'Nothing to import';
258
+			if (!empty($result)) {
259
+				$this->add($result,true);
260
+			} elseif ($globalDebug) {
261
+				echo 'Nothing to import';
262
+			}
235 263
 		}
236 264
 	}
237 265
 
@@ -267,14 +295,23 @@  discard block
 block discarded – undo
267 295
 					}
268 296
 				}
269 297
 				fclose($handle);
270
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
271
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
298
+			} elseif ($globalDebug) {
299
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
300
+			}
301
+		} elseif ($globalDebug) {
302
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
303
+		}
272 304
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
273
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
305
+		if (empty($result) && $globalDebug) {
306
+			echo 'Nothing to update';
307
+		}
274 308
 		foreach ($result as $file => $md5) {
275 309
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
276
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
277
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
310
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
311
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
312
+			} elseif ($globalDebug) {
313
+				echo 'Download '.$file.' failed';
314
+			}
278 315
 		}
279 316
 	}
280 317
 
@@ -291,13 +328,17 @@  discard block
 block discarded – undo
291 328
 		$Image = new Image($this->db);
292 329
 		$Spotter = new Spotter($this->db);
293 330
 
294
-		if (empty($crash)) return false;
331
+		if (empty($crash)) {
332
+			return false;
333
+		}
295 334
 		if (!$new) {
296 335
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
297 336
 			$sthd = $Connection->db->prepare($query_delete);
298 337
 			$sthd->execute(array(':source' => $crash[0]['source']));
299 338
 		}
300
-		if ($globalTransaction) $Connection->db->beginTransaction();
339
+		if ($globalTransaction) {
340
+			$Connection->db->beginTransaction();
341
+		}
301 342
 		$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);
302 343
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
303 344
 		$sth_check = $Connection->db->prepare($query_check);
@@ -312,7 +353,9 @@  discard block
 block discarded – undo
312 353
 					return $value === "" ? NULL : $value;
313 354
 				}, $cr);
314 355
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
315
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
356
+					if (strpos($cr['registration'],'-') === FALSE) {
357
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
358
+					}
316 359
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
317 360
 					$sth_check->execute($query_check_values);
318 361
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
@@ -322,13 +365,19 @@  discard block
 block discarded – undo
322 365
 						if ($cr['date'] > time()-(30*86400)) {
323 366
 							$imgchk = $Image->getSpotterImage($cr['registration']);
324 367
 							if (empty($imgchk)) {
325
-								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
368
+								if ($globalDebug) {
369
+									echo "\t".'Get image for '.$cr['registration'].'...';
370
+								}
326 371
 								$Image->addSpotterImage($cr['registration']);
327
-								if ($globalDebug) echo "\t".'Done'."\n";
372
+								if ($globalDebug) {
373
+									echo "\t".'Done'."\n";
374
+								}
328 375
 							}
329 376
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
330 377
 						}
331
-						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
378
+						if ($cr['title'] == '') {
379
+							$cr['title'] = $cr['registration'].' '.$cr['type'];
380
+						}
332 381
 						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
333 382
 					}
334 383
 				}
@@ -337,9 +386,13 @@  discard block
 block discarded – undo
337 386
 					$Connection->db->beginTransaction();
338 387
 				}
339 388
 			}
340
-			if ($globalTransaction) $Connection->db->commit();
389
+			if ($globalTransaction) {
390
+				$Connection->db->commit();
391
+			}
341 392
 		} catch(PDOException $e) {
342
-			if ($globalTransaction) $Connection->db->rollBack();
393
+			if ($globalTransaction) {
394
+				$Connection->db->rollBack();
395
+			}
343 396
 			echo $e->getMessage();
344 397
 		}
345 398
 		$sth_check->closeCursor();
@@ -378,8 +431,11 @@  discard block
 block discarded – undo
378 431
 			return "error : ".$e->getMessage();
379 432
 		}
380 433
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
381
-		if ($row['nb'] > 0) return false;
382
-		else return true;
434
+		if ($row['nb'] > 0) {
435
+			return false;
436
+		} else {
437
+			return true;
438
+		}
383 439
 	}
384 440
 
385 441
 	public static function insert_last_accidents_update() {
Please login to merge, or discard this patch.