@@ -8,7 +8,9 @@ discard block |
||
8 | 8 | public function __construct($dbc = null) { |
9 | 9 | $Connection = new Connection($dbc); |
10 | 10 | $this->db = $Connection->db(); |
11 | - if ($this->db === null) die('Error: No DB connection. (Marine)'); |
|
11 | + if ($this->db === null) { |
|
12 | + die('Error: No DB connection. (Marine)'); |
|
13 | + } |
|
12 | 14 | } |
13 | 15 | |
14 | 16 | /** |
@@ -30,7 +32,9 @@ discard block |
||
30 | 32 | if (isset($filter[0]['source'])) { |
31 | 33 | $filters = array_merge($filters,$filter); |
32 | 34 | } |
33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
35 | + if (is_array($globalFilter)) { |
|
36 | + $filter = array_merge($filter,$globalFilter); |
|
37 | + } |
|
34 | 38 | $filter_query_join = ''; |
35 | 39 | $filter_query_where = ''; |
36 | 40 | foreach($filters as $flt) { |
@@ -72,8 +76,11 @@ discard block |
||
72 | 76 | $filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'"; |
73 | 77 | } |
74 | 78 | } |
75 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
76 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
79 | + if ($filter_query_where == '' && $where) { |
|
80 | + $filter_query_where = ' WHERE'; |
|
81 | + } elseif ($filter_query_where != '' && $and) { |
|
82 | + $filter_query_where .= ' AND'; |
|
83 | + } |
|
77 | 84 | if ($filter_query_where != '') { |
78 | 85 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
79 | 86 | } |
@@ -127,32 +134,54 @@ discard block |
||
127 | 134 | $temp_array['spotter_id'] = $row['spotter_archive_id']; |
128 | 135 | } elseif (isset($row['spotter_archive_output_id'])) { |
129 | 136 | $temp_array['spotter_id'] = $row['spotter_archive_output_id']; |
130 | - */} |
|
131 | - elseif (isset($row['marineid'])) { |
|
137 | + */} elseif (isset($row['marineid'])) { |
|
132 | 138 | $temp_array['marine_id'] = $row['marineid']; |
133 | 139 | } else { |
134 | 140 | $temp_array['marine_id'] = ''; |
135 | 141 | } |
136 | - if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id']; |
|
137 | - if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi']; |
|
138 | - if (isset($row['type'])) $temp_array['type'] = $row['type']; |
|
139 | - if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id']; |
|
140 | - if (isset($row['ident'])) $temp_array['ident'] = $row['ident']; |
|
141 | - if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude']; |
|
142 | - if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude']; |
|
143 | - if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
|
142 | + if (isset($row['fammarine_id'])) { |
|
143 | + $temp_array['fammarine_id'] = $row['fammarine_id']; |
|
144 | + } |
|
145 | + if (isset($row['mmsi'])) { |
|
146 | + $temp_array['mmsi'] = $row['mmsi']; |
|
147 | + } |
|
148 | + if (isset($row['type'])) { |
|
149 | + $temp_array['type'] = $row['type']; |
|
150 | + } |
|
151 | + if (isset($row['type_id'])) { |
|
152 | + $temp_array['type_id'] = $row['type_id']; |
|
153 | + } |
|
154 | + if (isset($row['ident'])) { |
|
155 | + $temp_array['ident'] = $row['ident']; |
|
156 | + } |
|
157 | + if (isset($row['latitude'])) { |
|
158 | + $temp_array['latitude'] = $row['latitude']; |
|
159 | + } |
|
160 | + if (isset($row['longitude'])) { |
|
161 | + $temp_array['longitude'] = $row['longitude']; |
|
162 | + } |
|
163 | + if (isset($row['format_source'])) { |
|
164 | + $temp_array['format_source'] = $row['format_source']; |
|
165 | + } |
|
144 | 166 | if (isset($row['heading'])) { |
145 | 167 | $temp_array['heading'] = $row['heading']; |
146 | 168 | $heading_direction = $this->parseDirection($row['heading']); |
147 | - if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
169 | + if (isset($heading_direction[0]['direction_fullname'])) { |
|
170 | + $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
171 | + } |
|
172 | + } |
|
173 | + if (isset($row['ground_speed'])) { |
|
174 | + $temp_array['ground_speed'] = $row['ground_speed']; |
|
148 | 175 | } |
149 | - if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
|
150 | 176 | |
151 | 177 | if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "") |
152 | 178 | { |
153 | 179 | $Image = new Image($this->db); |
154 | - if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
155 | - else $image_array = $Image->getMarineImage($temp_array['mmsi']); |
|
180 | + if (isset($temp_array['ident']) && $temp_array['ident'] != '') { |
|
181 | + $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
182 | + } else { |
|
183 | + $image_array = $Image->getMarineImage($temp_array['mmsi']); |
|
184 | + } |
|
156 | 185 | unset($Image); |
157 | 186 | if (count($image_array) > 0) { |
158 | 187 | $temp_array['image'] = $image_array[0]['image']; |
@@ -204,13 +233,21 @@ discard block |
||
204 | 233 | } |
205 | 234 | |
206 | 235 | $fromsource = NULL; |
207 | - if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name']; |
|
208 | - if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country']; |
|
209 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
236 | + if (isset($row['source_name']) && $row['source_name'] != '') { |
|
237 | + $temp_array['source_name'] = $row['source_name']; |
|
238 | + } |
|
239 | + if (isset($row['over_country']) && $row['over_country'] != '') { |
|
240 | + $temp_array['over_country'] = $row['over_country']; |
|
241 | + } |
|
242 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
243 | + $temp_array['distance'] = $row['distance']; |
|
244 | + } |
|
210 | 245 | $temp_array['query_number_rows'] = $num_rows; |
211 | 246 | $spotter_array[] = $temp_array; |
212 | 247 | } |
213 | - if ($num_rows == 0) return array(); |
|
248 | + if ($num_rows == 0) { |
|
249 | + return array(); |
|
250 | + } |
|
214 | 251 | $spotter_array[0]['query_number_rows'] = $num_rows; |
215 | 252 | return $spotter_array; |
216 | 253 | } |
@@ -236,8 +273,12 @@ discard block |
||
236 | 273 | { |
237 | 274 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
238 | 275 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
239 | - } else $limit_query = ""; |
|
240 | - } else $limit_query = ""; |
|
276 | + } else { |
|
277 | + $limit_query = ""; |
|
278 | + } |
|
279 | + } else { |
|
280 | + $limit_query = ""; |
|
281 | + } |
|
241 | 282 | if ($sort != "") |
242 | 283 | { |
243 | 284 | $search_orderby_array = $this->getOrderBy(); |
@@ -261,7 +302,9 @@ discard block |
||
261 | 302 | global $global_query; |
262 | 303 | |
263 | 304 | date_default_timezone_set('UTC'); |
264 | - if ($id == '') return array(); |
|
305 | + if ($id == '') { |
|
306 | + return array(); |
|
307 | + } |
|
265 | 308 | $additional_query = "marine_output.fammarine_id = :id"; |
266 | 309 | $query_values = array(':id' => $id); |
267 | 310 | $query = $global_query." WHERE ".$additional_query." "; |
@@ -404,8 +447,11 @@ discard block |
||
404 | 447 | $query .= " ORDER BY marine_output.source_name ASC"; |
405 | 448 | |
406 | 449 | $sth = $this->db->prepare($query); |
407 | - if (!empty($query_values)) $sth->execute($query_values); |
|
408 | - else $sth->execute(); |
|
450 | + if (!empty($query_values)) { |
|
451 | + $sth->execute($query_values); |
|
452 | + } else { |
|
453 | + $sth->execute(); |
|
454 | + } |
|
409 | 455 | |
410 | 456 | $source_array = array(); |
411 | 457 | $temp_array = array(); |
@@ -460,8 +506,11 @@ discard block |
||
460 | 506 | $sth = $this->db->prepare($query); |
461 | 507 | $sth->execute(array(':mmsi' => $mmsi)); |
462 | 508 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
463 | - if (isset($result[0])) return $result[0]; |
|
464 | - else return array(); |
|
509 | + if (isset($result[0])) { |
|
510 | + return $result[0]; |
|
511 | + } else { |
|
512 | + return array(); |
|
513 | + } |
|
465 | 514 | } |
466 | 515 | |
467 | 516 | /** |
@@ -495,7 +544,9 @@ discard block |
||
495 | 544 | date_default_timezone_set($globalTimezone); |
496 | 545 | $datetime = new DateTime(); |
497 | 546 | $offset = $datetime->format('P'); |
498 | - } else $offset = '+00:00'; |
|
547 | + } else { |
|
548 | + $offset = '+00:00'; |
|
549 | + } |
|
499 | 550 | |
500 | 551 | if ($globalDBdriver == 'mysql') { |
501 | 552 | $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
@@ -720,9 +771,15 @@ discard block |
||
720 | 771 | $latitude = 0; |
721 | 772 | $longitude = 0; |
722 | 773 | } |
723 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
724 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
725 | - if ($arrival_date == '') $arrival_date = NULL; |
|
774 | + if ($heading == '' || $Common->isInteger($heading) === false) { |
|
775 | + $heading = 0; |
|
776 | + } |
|
777 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) { |
|
778 | + $groundspeed = 0; |
|
779 | + } |
|
780 | + if ($arrival_date == '') { |
|
781 | + $arrival_date = NULL; |
|
782 | + } |
|
726 | 783 | $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) |
727 | 784 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)"; |
728 | 785 | |
@@ -830,7 +887,9 @@ discard block |
||
830 | 887 | global $globalDBdriver, $globalArchive; |
831 | 888 | //$filter_query = $this->getFilter($filters,true,true); |
832 | 889 | $Connection= new Connection($this->db); |
833 | - if (!$Connection->tableExists('countries')) return array(); |
|
890 | + if (!$Connection->tableExists('countries')) { |
|
891 | + return array(); |
|
892 | + } |
|
834 | 893 | require_once('class.SpotterLive.php'); |
835 | 894 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
836 | 895 | $MarineLive = new MarineLive($this->db); |
@@ -874,7 +933,9 @@ discard block |
||
874 | 933 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT fammarine_id,over_country FROM marine_archive".$filter_query.") l ON c.iso2 = l.over_country "; |
875 | 934 | } |
876 | 935 | $query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC"; |
877 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
936 | + if ($limit) { |
|
937 | + $query .= " LIMIT 10 OFFSET 0"; |
|
938 | + } |
|
878 | 939 | |
879 | 940 | $sth = $this->db->prepare($query); |
880 | 941 | $sth->execute(); |
@@ -908,12 +969,18 @@ discard block |
||
908 | 969 | $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
909 | 970 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
910 | 971 | if ($olderthanmonths > 0) { |
911 | - if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
912 | - else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
972 | + if ($globalDBdriver == 'mysql') { |
|
973 | + $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
974 | + } else { |
|
975 | + $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
976 | + } |
|
913 | 977 | } |
914 | 978 | if ($sincedate != '') { |
915 | - if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'"; |
|
916 | - else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
979 | + if ($globalDBdriver == 'mysql') { |
|
980 | + $query .= " AND marine_output.date > '".$sincedate."'"; |
|
981 | + } else { |
|
982 | + $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
983 | + } |
|
917 | 984 | } |
918 | 985 | $query_values = array(); |
919 | 986 | if ($year != '') { |
@@ -944,7 +1011,9 @@ discard block |
||
944 | 1011 | } |
945 | 1012 | } |
946 | 1013 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
947 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
1014 | + if ($limit) { |
|
1015 | + $query .= " LIMIT 10 OFFSET 0"; |
|
1016 | + } |
|
948 | 1017 | |
949 | 1018 | $sth = $this->db->prepare($query); |
950 | 1019 | $sth->execute($query_values); |
@@ -979,7 +1048,9 @@ discard block |
||
979 | 1048 | date_default_timezone_set($globalTimezone); |
980 | 1049 | $datetime = new DateTime(); |
981 | 1050 | $offset = $datetime->format('P'); |
982 | - } else $offset = '+00:00'; |
|
1051 | + } else { |
|
1052 | + $offset = '+00:00'; |
|
1053 | + } |
|
983 | 1054 | |
984 | 1055 | if ($globalDBdriver == 'mysql') { |
985 | 1056 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1029,7 +1100,9 @@ discard block |
||
1029 | 1100 | date_default_timezone_set($globalTimezone); |
1030 | 1101 | $datetime = new DateTime(); |
1031 | 1102 | $offset = $datetime->format('P'); |
1032 | - } else $offset = '+00:00'; |
|
1103 | + } else { |
|
1104 | + $offset = '+00:00'; |
|
1105 | + } |
|
1033 | 1106 | $filter_query = $this->getFilter($filters,true,true); |
1034 | 1107 | if ($globalDBdriver == 'mysql') { |
1035 | 1108 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1075,7 +1148,9 @@ discard block |
||
1075 | 1148 | date_default_timezone_set($globalTimezone); |
1076 | 1149 | $datetime = new DateTime(); |
1077 | 1150 | $offset = $datetime->format('P'); |
1078 | - } else $offset = '+00:00'; |
|
1151 | + } else { |
|
1152 | + $offset = '+00:00'; |
|
1153 | + } |
|
1079 | 1154 | $filter_query = $this->getFilter($filters,true,true); |
1080 | 1155 | if ($globalDBdriver == 'mysql') { |
1081 | 1156 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1123,7 +1198,9 @@ discard block |
||
1123 | 1198 | date_default_timezone_set($globalTimezone); |
1124 | 1199 | $datetime = new DateTime(); |
1125 | 1200 | $offset = $datetime->format('P'); |
1126 | - } else $offset = '+00:00'; |
|
1201 | + } else { |
|
1202 | + $offset = '+00:00'; |
|
1203 | + } |
|
1127 | 1204 | |
1128 | 1205 | if ($globalDBdriver == 'mysql') { |
1129 | 1206 | $query = "SELECT YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -1172,7 +1249,9 @@ discard block |
||
1172 | 1249 | date_default_timezone_set($globalTimezone); |
1173 | 1250 | $datetime = new DateTime(); |
1174 | 1251 | $offset = $datetime->format('P'); |
1175 | - } else $offset = '+00:00'; |
|
1252 | + } else { |
|
1253 | + $offset = '+00:00'; |
|
1254 | + } |
|
1176 | 1255 | $filter_query = $this->getFilter($filters,true,true); |
1177 | 1256 | if ($globalDBdriver == 'mysql') { |
1178 | 1257 | $query = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
@@ -1221,7 +1300,9 @@ discard block |
||
1221 | 1300 | date_default_timezone_set($globalTimezone); |
1222 | 1301 | $datetime = new DateTime(); |
1223 | 1302 | $offset = $datetime->format('P'); |
1224 | - } else $offset = '+00:00'; |
|
1303 | + } else { |
|
1304 | + $offset = '+00:00'; |
|
1305 | + } |
|
1225 | 1306 | |
1226 | 1307 | $orderby_sql = ''; |
1227 | 1308 | if ($orderby == "hour") |
@@ -1290,7 +1371,9 @@ discard block |
||
1290 | 1371 | date_default_timezone_set($globalTimezone); |
1291 | 1372 | $datetime = new DateTime($date); |
1292 | 1373 | $offset = $datetime->format('P'); |
1293 | - } else $offset = '+00:00'; |
|
1374 | + } else { |
|
1375 | + $offset = '+00:00'; |
|
1376 | + } |
|
1294 | 1377 | |
1295 | 1378 | if ($globalDBdriver == 'mysql') { |
1296 | 1379 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1338,7 +1421,9 @@ discard block |
||
1338 | 1421 | date_default_timezone_set($globalTimezone); |
1339 | 1422 | $datetime = new DateTime(); |
1340 | 1423 | $offset = $datetime->format('P'); |
1341 | - } else $offset = '+00:00'; |
|
1424 | + } else { |
|
1425 | + $offset = '+00:00'; |
|
1426 | + } |
|
1342 | 1427 | |
1343 | 1428 | if ($globalDBdriver == 'mysql') { |
1344 | 1429 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1403,8 +1488,11 @@ discard block |
||
1403 | 1488 | $query_values = array_merge($query_values,array(':month' => $month)); |
1404 | 1489 | } |
1405 | 1490 | } |
1406 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
1407 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1491 | + if (empty($query_values)) { |
|
1492 | + $queryi .= $this->getFilter($filters); |
|
1493 | + } else { |
|
1494 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1495 | + } |
|
1408 | 1496 | |
1409 | 1497 | $sth = $this->db->prepare($queryi); |
1410 | 1498 | $sth->execute($query_values); |
@@ -1441,8 +1529,11 @@ discard block |
||
1441 | 1529 | $query_values = array_merge($query_values,array(':month' => $month)); |
1442 | 1530 | } |
1443 | 1531 | } |
1444 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
1445 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1532 | + if (empty($query_values)) { |
|
1533 | + $queryi .= $this->getFilter($filters); |
|
1534 | + } else { |
|
1535 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1536 | + } |
|
1446 | 1537 | |
1447 | 1538 | $sth = $this->db->prepare($queryi); |
1448 | 1539 | $sth->execute($query_values); |
@@ -1464,7 +1555,9 @@ discard block |
||
1464 | 1555 | date_default_timezone_set($globalTimezone); |
1465 | 1556 | $datetime = new DateTime(); |
1466 | 1557 | $offset = $datetime->format('P'); |
1467 | - } else $offset = '+00:00'; |
|
1558 | + } else { |
|
1559 | + $offset = '+00:00'; |
|
1560 | + } |
|
1468 | 1561 | |
1469 | 1562 | if ($globalDBdriver == 'mysql') { |
1470 | 1563 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1568,7 +1661,9 @@ discard block |
||
1568 | 1661 | */ |
1569 | 1662 | public function parseDirection($direction = 0) |
1570 | 1663 | { |
1571 | - if ($direction == '') $direction = 0; |
|
1664 | + if ($direction == '') { |
|
1665 | + $direction = 0; |
|
1666 | + } |
|
1572 | 1667 | $direction_array = array(); |
1573 | 1668 | $temp_array = array(); |
1574 | 1669 | |
@@ -1657,7 +1752,9 @@ discard block |
||
1657 | 1752 | $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
1658 | 1753 | |
1659 | 1754 | $Connection = new Connection($this->db); |
1660 | - if (!$Connection->tableExists('countries')) return ''; |
|
1755 | + if (!$Connection->tableExists('countries')) { |
|
1756 | + return ''; |
|
1757 | + } |
|
1661 | 1758 | |
1662 | 1759 | try { |
1663 | 1760 | /* |
@@ -1677,9 +1774,13 @@ discard block |
||
1677 | 1774 | $sth->closeCursor(); |
1678 | 1775 | if (count($row) > 0) { |
1679 | 1776 | return $row; |
1680 | - } else return ''; |
|
1777 | + } else { |
|
1778 | + return ''; |
|
1779 | + } |
|
1681 | 1780 | } catch (PDOException $e) { |
1682 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
1781 | + if (isset($globalDebug) && $globalDebug) { |
|
1782 | + echo 'Error : '.$e->getMessage()."\n"; |
|
1783 | + } |
|
1683 | 1784 | return ''; |
1684 | 1785 | } |
1685 | 1786 | |
@@ -1697,7 +1798,9 @@ discard block |
||
1697 | 1798 | $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
1698 | 1799 | |
1699 | 1800 | $Connection = new Connection($this->db); |
1700 | - if (!$Connection->tableExists('countries')) return ''; |
|
1801 | + if (!$Connection->tableExists('countries')) { |
|
1802 | + return ''; |
|
1803 | + } |
|
1701 | 1804 | |
1702 | 1805 | try { |
1703 | 1806 | $query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1"; |
@@ -1709,9 +1812,13 @@ discard block |
||
1709 | 1812 | $sth->closeCursor(); |
1710 | 1813 | if (count($row) > 0) { |
1711 | 1814 | return $row; |
1712 | - } else return ''; |
|
1815 | + } else { |
|
1816 | + return ''; |
|
1817 | + } |
|
1713 | 1818 | } catch (PDOException $e) { |
1714 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
1819 | + if (isset($globalDebug) && $globalDebug) { |
|
1820 | + echo 'Error : '.$e->getMessage()."\n"; |
|
1821 | + } |
|
1715 | 1822 | return ''; |
1716 | 1823 | } |
1717 | 1824 | |
@@ -1729,7 +1836,9 @@ discard block |
||
1729 | 1836 | { |
1730 | 1837 | global $globalBitlyAccessToken; |
1731 | 1838 | |
1732 | - if ($globalBitlyAccessToken == '') return $url; |
|
1839 | + if ($globalBitlyAccessToken == '') { |
|
1840 | + return $url; |
|
1841 | + } |
|
1733 | 1842 | |
1734 | 1843 | $google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url; |
1735 | 1844 | |
@@ -1805,7 +1914,9 @@ discard block |
||
1805 | 1914 | } |
1806 | 1915 | } |
1807 | 1916 | $query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC"; |
1808 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
1917 | + if ($limit) { |
|
1918 | + $query .= " LIMIT 10 OFFSET 0"; |
|
1919 | + } |
|
1809 | 1920 | $sth = $this->db->prepare($query); |
1810 | 1921 | $sth->execute($query_values); |
1811 | 1922 | $marine_array = array(); |
@@ -1842,9 +1953,15 @@ discard block |
||
1842 | 1953 | foreach ($q_array as $q_item){ |
1843 | 1954 | $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
1844 | 1955 | $additional_query .= " AND ("; |
1845 | - if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR "; |
|
1846 | - if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR "; |
|
1847 | - if (is_int($q_item)) $additional_query .= "(marine_output.imo = '".$q_item."') OR "; |
|
1956 | + if (is_int($q_item)) { |
|
1957 | + $additional_query .= "(marine_output.marine_id = '".$q_item."') OR "; |
|
1958 | + } |
|
1959 | + if (is_int($q_item)) { |
|
1960 | + $additional_query .= "(marine_output.mmsi = '".$q_item."') OR "; |
|
1961 | + } |
|
1962 | + if (is_int($q_item)) { |
|
1963 | + $additional_query .= "(marine_output.imo = '".$q_item."') OR "; |
|
1964 | + } |
|
1848 | 1965 | $additional_query .= "(marine_output.ident like '%".$q_item."%') OR "; |
1849 | 1966 | $additional_query .= ")"; |
1850 | 1967 | } |
@@ -1892,7 +2009,9 @@ discard block |
||
1892 | 2009 | date_default_timezone_set($globalTimezone); |
1893 | 2010 | $datetime = new DateTime(); |
1894 | 2011 | $offset = $datetime->format('P'); |
1895 | - } else $offset = '+00:00'; |
|
2012 | + } else { |
|
2013 | + $offset = '+00:00'; |
|
2014 | + } |
|
1896 | 2015 | if ($date_array[1] != "") |
1897 | 2016 | { |
1898 | 2017 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
@@ -1919,8 +2038,12 @@ discard block |
||
1919 | 2038 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
1920 | 2039 | { |
1921 | 2040 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
1922 | - } else $limit_query = ""; |
|
1923 | - } else $limit_query = ""; |
|
2041 | + } else { |
|
2042 | + $limit_query = ""; |
|
2043 | + } |
|
2044 | + } else { |
|
2045 | + $limit_query = ""; |
|
2046 | + } |
|
1924 | 2047 | if ($sort != "") |
1925 | 2048 | { |
1926 | 2049 | $search_orderby_array = $this->getOrderBy(); |