Ysurac /
FlightAirMap
@@ -8,15 +8,15 @@ discard block |
||
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | 10 | |
| 11 | -$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING); |
|
| 11 | +$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING); |
|
| 12 | 12 | |
| 13 | 13 | $Spotter = new Spotter(); |
| 14 | -$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1",""); |
|
| 14 | +$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", ""); |
|
| 15 | 15 | |
| 16 | 16 | |
| 17 | 17 | if (!empty($spotter_array)) |
| 18 | 18 | { |
| 19 | - $title = sprintf(_("Most Common Time of Day from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']); |
|
| 19 | + $title = sprintf(_("Most Common Time of Day from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']); |
|
| 20 | 20 | require_once('header.php'); |
| 21 | 21 | print '<div class="select-item">'; |
| 22 | 22 | print '<form action="'.$globalURL.'/aircraft" method="get">'; |
@@ -25,9 +25,9 @@ discard block |
||
| 25 | 25 | $Stats = new Stats(); |
| 26 | 26 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 27 | 27 | if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 28 | - foreach($aircraft_types as $aircrafttype) |
|
| 28 | + foreach ($aircraft_types as $aircrafttype) |
|
| 29 | 29 | { |
| 30 | - if($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 30 | + if ($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 31 | 31 | { |
| 32 | 32 | print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
| 33 | 33 | } else { |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | include('aircraft-sub-menu.php'); |
| 54 | 54 | print '<div class="column">'; |
| 55 | 55 | print '<h2>'._("Most Common Time of Day").'</h2>'; |
| 56 | - print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>'; |
|
| 56 | + print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>'; |
|
| 57 | 57 | |
| 58 | 58 | $hour_array = $Spotter->countAllHoursByAircraft($aircraft_type); |
| 59 | 59 | print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">'; |
@@ -63,9 +63,9 @@ discard block |
||
| 63 | 63 | $hour_data = ''; |
| 64 | 64 | $hour_cnt = ''; |
| 65 | 65 | $last = 0; |
| 66 | - foreach($hour_array as $hour_item) |
|
| 66 | + foreach ($hour_array as $hour_item) |
|
| 67 | 67 | { |
| 68 | - while($last != $hour_item['hour_name']) { |
|
| 68 | + while ($last != $hour_item['hour_name']) { |
|
| 69 | 69 | $hour_data .= '"'.$last.':00",'; |
| 70 | 70 | $hour_cnt .= '0,'; |
| 71 | 71 | $last++; |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | $hour_cnt .= $hour_item['hour_count'].','; |
| 76 | 76 | } |
| 77 | 77 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 78 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 78 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 79 | 79 | print 'c3.generate({ |
| 80 | 80 | bindto: "#chartHour", |
| 81 | 81 | data: { |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | print '</thead>'; |
| 99 | 99 | print '<tbody>'; |
| 100 | 100 | $i = 1; |
| 101 | - foreach($hour_array as $hour_item) |
|
| 101 | + foreach ($hour_array as $hour_item) |
|
| 102 | 102 | { |
| 103 | 103 | print '<tr>'; |
| 104 | 104 | print '<td>'.$hour_item['hour_name'].':00</td>'; |
@@ -9,15 +9,15 @@ discard block |
||
| 9 | 9 | die(); |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | -$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING); |
|
| 12 | +$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING); |
|
| 13 | 13 | |
| 14 | 14 | $Spotter = new Spotter(); |
| 15 | -$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1",""); |
|
| 15 | +$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", ""); |
|
| 16 | 16 | |
| 17 | 17 | |
| 18 | 18 | if (!empty($spotter_array)) |
| 19 | 19 | { |
| 20 | - $title = sprintf(_("Most Common Arrival Airports for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']); |
|
| 20 | + $title = sprintf(_("Most Common Arrival Airports for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']); |
|
| 21 | 21 | require_once('header.php'); |
| 22 | 22 | print '<div class="select-item">'; |
| 23 | 23 | print '<form action="'.$globalURL.'/aircraft" method="get">'; |
@@ -26,9 +26,9 @@ discard block |
||
| 26 | 26 | $Stats = new Stats(); |
| 27 | 27 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 28 | 28 | if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 29 | - foreach($aircraft_types as $aircrafttype) |
|
| 29 | + foreach ($aircraft_types as $aircrafttype) |
|
| 30 | 30 | { |
| 31 | - if($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 31 | + if ($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 32 | 32 | { |
| 33 | 33 | print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
| 34 | 34 | } else { |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | include('aircraft-sub-menu.php'); |
| 56 | 56 | print '<div class="column">'; |
| 57 | 57 | print '<h2>'._("Most Common Arrival Airports").'</h2>'; |
| 58 | - print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>'; |
|
| 58 | + print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>'; |
|
| 59 | 59 | $airport_airport_array = $Spotter->countAllArrivalAirportsByAircraft($aircraft_type); |
| 60 | 60 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
| 61 | 61 | print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>'; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | print '<script>'; |
| 65 | 65 | print 'var series = ['; |
| 66 | 66 | $airport_data = ''; |
| 67 | - foreach($airport_airport_array as $airport_item) |
|
| 67 | + foreach ($airport_airport_array as $airport_item) |
|
| 68 | 68 | { |
| 69 | 69 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_name'].' ('.$airport_item['airport_arrival_icao'].')",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
| 70 | 70 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | print '</thead>'; |
| 120 | 120 | print '<tbody>'; |
| 121 | 121 | $i = 1; |
| 122 | - foreach($airport_airport_array as $airport_item) |
|
| 122 | + foreach ($airport_airport_array as $airport_item) |
|
| 123 | 123 | { |
| 124 | 124 | print '<tr>'; |
| 125 | 125 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -7,14 +7,14 @@ discard block |
||
| 7 | 7 | header('Location: '.$globalURL.'/aircraft'); |
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | -$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING); |
|
| 10 | +$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | $Spotter = new Spotter(); |
| 12 | -$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1",""); |
|
| 12 | +$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", ""); |
|
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | if (!empty($spotter_array)) |
| 16 | 16 | { |
| 17 | - $title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']); |
|
| 17 | + $title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']); |
|
| 18 | 18 | require_once('header.php'); |
| 19 | 19 | print '<div class="select-item">'; |
| 20 | 20 | print '<form action="'.$globalURL.'/aircraft" method="get">'; |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $aircraft_types = $Stats->getAllAircraftTypes(); |
| 25 | 25 | if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
| 26 | - foreach($aircraft_types as $aircrafttype) |
|
| 26 | + foreach ($aircraft_types as $aircrafttype) |
|
| 27 | 27 | { |
| 28 | - if($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 28 | + if ($aircraft_type == $aircrafttype['aircraft_icao']) |
|
| 29 | 29 | { |
| 30 | 30 | print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>'; |
| 31 | 31 | } else { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | include('aircraft-sub-menu.php'); |
| 52 | 52 | print '<div class="column">'; |
| 53 | 53 | print '<h2>'._("Most Common Departure Airports by Country").'</h2>'; |
| 54 | - print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>'; |
|
| 54 | + print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>'; |
|
| 55 | 55 | $airport_country_array = $Spotter->countAllDepartureAirportCountriesByAircraft($aircraft_type); |
| 56 | 56 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
| 57 | 57 | print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>'; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | print '<div id="chartCountry" class="chart" width="100%"></div><script>'; |
| 60 | 60 | print 'var series = ['; |
| 61 | 61 | $country_data = ''; |
| 62 | - foreach($airport_country_array as $airport_item) |
|
| 62 | + foreach ($airport_country_array as $airport_item) |
|
| 63 | 63 | { |
| 64 | 64 | $country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],'; |
| 65 | 65 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | print '</thead>'; |
| 108 | 108 | print '<tbody>'; |
| 109 | 109 | $i = 1; |
| 110 | - foreach($airport_country_array as $airport_item) |
|
| 110 | + foreach ($airport_country_array as $airport_item) |
|
| 111 | 111 | { |
| 112 | 112 | print '<tr>'; |
| 113 | 113 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -50,20 +50,20 @@ discard block |
||
| 50 | 50 | die; |
| 51 | 51 | } |
| 52 | 52 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 53 | - $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
|
| 53 | + $globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | -$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine')); |
|
| 57 | +$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver', 'enable-aircraft', 'disable-aircraft', 'enable-tracker', 'disable-tracker', 'enable-marine', 'disable-marine')); |
|
| 58 | 58 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 59 | 59 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 60 | 60 | if (isset($options['s'])) { |
| 61 | 61 | $globalSources = array(); |
| 62 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 62 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']); |
|
| 63 | 63 | else $globalSources[] = array('host' => $options['s']); |
| 64 | 64 | } elseif (isset($options['source'])) { |
| 65 | 65 | $globalSources = array(); |
| 66 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 66 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']); |
|
| 67 | 67 | else $globalSources[] = array('host' => $options['source']); |
| 68 | 68 | } |
| 69 | 69 | if (isset($options['aprsserverhost'])) { |
@@ -104,13 +104,13 @@ discard block |
||
| 104 | 104 | else $id_source = 1; |
| 105 | 105 | if (isset($globalServer) && $globalServer) { |
| 106 | 106 | if ($globalDebug) echo "Using Server Mode\n"; |
| 107 | - $SI=new SpotterServer(); |
|
| 107 | + $SI = new SpotterServer(); |
|
| 108 | 108 | /* |
| 109 | 109 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 110 | 110 | $SI = new adsb2aprs(); |
| 111 | 111 | $SI->connect(); |
| 112 | 112 | */ |
| 113 | -} else $SI=new SpotterImport($Connection->db); |
|
| 113 | +} else $SI = new SpotterImport($Connection->db); |
|
| 114 | 114 | |
| 115 | 115 | if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
| 116 | 116 | if (isset($globalMarine) && $globalMarine) { |
@@ -124,17 +124,17 @@ discard block |
||
| 124 | 124 | $MI = new MarineImport($Connection->db); |
| 125 | 125 | } |
| 126 | 126 | //$APRS=new APRS($Connection->db); |
| 127 | -$SBS=new SBS(); |
|
| 127 | +$SBS = new SBS(); |
|
| 128 | 128 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 129 | - $ACARS=new ACARS($Connection->db,true); |
|
| 130 | - $Source=new Source($Connection->db); |
|
| 129 | + $ACARS = new ACARS($Connection->db, true); |
|
| 130 | + $Source = new Source($Connection->db); |
|
| 131 | 131 | } |
| 132 | -$Common=new Common(); |
|
| 132 | +$Common = new Common(); |
|
| 133 | 133 | date_default_timezone_set('UTC'); |
| 134 | 134 | //$servertz = system('date +%Z'); |
| 135 | 135 | // signal handler - playing nice with sockets and dump1090 |
| 136 | 136 | if (function_exists('pcntl_fork')) { |
| 137 | - pcntl_signal(SIGINT, function() { |
|
| 137 | + pcntl_signal(SIGINT, function() { |
|
| 138 | 138 | global $sockets; |
| 139 | 139 | echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
| 140 | 140 | die("Bye!\n"); |
@@ -150,30 +150,30 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | function connect_all($hosts) { |
| 152 | 152 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 153 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 153 | + global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context; |
|
| 154 | 154 | $reset++; |
| 155 | 155 | if ($globalDebug) echo 'Connect to all...'."\n"; |
| 156 | 156 | foreach ($hosts as $id => $value) { |
| 157 | 157 | $host = $value['host']; |
| 158 | 158 | $globalSources[$id]['last_exec'] = 0; |
| 159 | 159 | // Here we check type of source(s) |
| 160 | - if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 161 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 160 | + if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 161 | + if (preg_match('/deltadb.txt$/i', $host)) { |
|
| 162 | 162 | //$formats[$id] = 'deltadbtxt'; |
| 163 | 163 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 164 | 164 | //$last_exec['deltadbtxt'] = 0; |
| 165 | 165 | if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
| 166 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 166 | + } else if (preg_match('/vatsim-data.txt$/i', $host)) { |
|
| 167 | 167 | //$formats[$id] = 'vatsimtxt'; |
| 168 | 168 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 169 | 169 | //$last_exec['vatsimtxt'] = 0; |
| 170 | 170 | if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
| 171 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 171 | + } else if (preg_match('/aircraftlist.json$/i', $host)) { |
|
| 172 | 172 | //$formats[$id] = 'aircraftlistjson'; |
| 173 | 173 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 174 | 174 | //$last_exec['aircraftlistjson'] = 0; |
| 175 | 175 | if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
| 176 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 176 | + } else if (preg_match('/opensky/i', $host)) { |
|
| 177 | 177 | //$formats[$id] = 'aircraftlistjson'; |
| 178 | 178 | $globalSources[$id]['format'] = 'opensky'; |
| 179 | 179 | //$last_exec['aircraftlistjson'] = 0; |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | exit(0); |
| 191 | 191 | } |
| 192 | 192 | */ |
| 193 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 193 | + } else if (preg_match('/planeUpdateFAA.php$/i', $host)) { |
|
| 194 | 194 | //$formats[$id] = 'planeupdatefaa'; |
| 195 | 195 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 196 | 196 | //$last_exec['planeupdatefaa'] = 0; |
@@ -199,37 +199,37 @@ discard block |
||
| 199 | 199 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 200 | 200 | exit(0); |
| 201 | 201 | } |
| 202 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 202 | + } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) { |
|
| 203 | 203 | //$formats[$id] = 'phpvmacars'; |
| 204 | 204 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 205 | 205 | //$last_exec['phpvmacars'] = 0; |
| 206 | 206 | if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
| 207 | - } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) { |
|
| 207 | + } else if (preg_match('/\/api\/v1\/acars\/data$/i', $host)) { |
|
| 208 | 208 | //$formats[$id] = 'phpvmacars'; |
| 209 | 209 | $globalSources[$id]['format'] = 'vaos'; |
| 210 | 210 | //$last_exec['phpvmacars'] = 0; |
| 211 | 211 | if ($globalDebug) echo "Connect to vaos source (".$host.")...\n"; |
| 212 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 212 | + } else if (preg_match('/VAM-json.php$/i', $host)) { |
|
| 213 | 213 | //$formats[$id] = 'phpvmacars'; |
| 214 | 214 | $globalSources[$id]['format'] = 'vam'; |
| 215 | 215 | if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
| 216 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 216 | + } else if (preg_match('/whazzup/i', $host)) { |
|
| 217 | 217 | //$formats[$id] = 'whazzup'; |
| 218 | 218 | $globalSources[$id]['format'] = 'whazzup'; |
| 219 | 219 | //$last_exec['whazzup'] = 0; |
| 220 | 220 | if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
| 221 | - } else if (preg_match('/blitzortung/i',$host)) { |
|
| 221 | + } else if (preg_match('/blitzortung/i', $host)) { |
|
| 222 | 222 | $globalSources[$id]['format'] = 'blitzortung'; |
| 223 | 223 | if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n"; |
| 224 | - } else if (preg_match('/airwhere/i',$host)) { |
|
| 224 | + } else if (preg_match('/airwhere/i', $host)) { |
|
| 225 | 225 | $globalSources[$id]['format'] = 'airwhere'; |
| 226 | 226 | if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
| 227 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 227 | + } else if (preg_match('/recentpireps/i', $host)) { |
|
| 228 | 228 | //$formats[$id] = 'pirepsjson'; |
| 229 | 229 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 230 | 230 | //$last_exec['pirepsjson'] = 0; |
| 231 | 231 | if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
| 232 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 232 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) { |
|
| 233 | 233 | //$formats[$id] = 'fr24json'; |
| 234 | 234 | $globalSources[$id]['format'] = 'fr24json'; |
| 235 | 235 | //$last_exec['fr24json'] = 0; |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 239 | 239 | exit(0); |
| 240 | 240 | } |
| 241 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 241 | + } else if (preg_match(':myshiptracking.com/:i', $host)) { |
|
| 242 | 242 | //$formats[$id] = 'fr24json'; |
| 243 | 243 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 244 | 244 | //$last_exec['fr24json'] = 0; |
@@ -248,21 +248,21 @@ discard block |
||
| 248 | 248 | exit(0); |
| 249 | 249 | } |
| 250 | 250 | //} else if (preg_match('/10001/',$host)) { |
| 251 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 251 | + } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 252 | 252 | //$formats[$id] = 'tsv'; |
| 253 | 253 | $globalSources[$id]['format'] = 'tsv'; |
| 254 | 254 | if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
| 255 | 255 | } |
| 256 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 256 | + } elseif (filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 257 | 257 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 258 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 258 | + $idf = fopen($globalSources[$id]['host'], 'r', false, $context); |
|
| 259 | 259 | if ($idf !== false) { |
| 260 | 260 | $httpfeeds[$id] = $idf; |
| 261 | 261 | if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 262 | 262 | } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
| 263 | 263 | } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 264 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 265 | - $hostport = explode(':',$host); |
|
| 264 | + } elseif (!filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 265 | + $hostport = explode(':', $host); |
|
| 266 | 266 | if (isset($hostport[1])) { |
| 267 | 267 | $port = $hostport[1]; |
| 268 | 268 | $hostn = $hostport[0]; |
@@ -272,19 +272,19 @@ discard block |
||
| 272 | 272 | } |
| 273 | 273 | $Common = new Common(); |
| 274 | 274 | if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
| 275 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 275 | + $s = $Common->create_socket($hostn, $port, $errno, $errstr); |
|
| 276 | 276 | } else { |
| 277 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 277 | + $s = $Common->create_socket_udp($hostn, $port, $errno, $errstr); |
|
| 278 | 278 | } |
| 279 | 279 | if ($s) { |
| 280 | 280 | $sockets[$id] = $s; |
| 281 | 281 | if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
| 282 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 282 | + if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') { |
|
| 283 | 283 | //$formats[$id] = 'aprs'; |
| 284 | 284 | $globalSources[$id]['format'] = 'aprs'; |
| 285 | 285 | //$aprs_connect = 0; |
| 286 | 286 | //$use_aprs = true; |
| 287 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 287 | + } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 288 | 288 | $globalSources[$id]['format'] = 'vrstcp'; |
| 289 | 289 | } elseif ($port == '10001') { |
| 290 | 290 | //$formats[$id] = 'tsv'; |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
| 324 | 324 | else $timeout = 20; |
| 325 | 325 | $errno = ''; |
| 326 | -$errstr=''; |
|
| 326 | +$errstr = ''; |
|
| 327 | 327 | |
| 328 | 328 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 329 | 329 | /* Initiate connections to all the hosts simultaneously */ |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | //connect_all($globalSources); |
| 332 | 332 | |
| 333 | 333 | if (isset($globalProxy) && $globalProxy) { |
| 334 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 334 | + $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true))); |
|
| 335 | 335 | } else { |
| 336 | 336 | $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
| 337 | 337 | } |
@@ -361,16 +361,16 @@ discard block |
||
| 361 | 361 | |
| 362 | 362 | if ($use_aprs) { |
| 363 | 363 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 364 | - $APRS=new APRS(); |
|
| 364 | + $APRS = new APRS(); |
|
| 365 | 365 | $aprs_connect = 0; |
| 366 | 366 | $aprs_keep = 120; |
| 367 | 367 | $aprs_last_tx = time(); |
| 368 | 368 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 369 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 369 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 370 | 370 | if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
| 371 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 371 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 372 | 372 | if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
| 373 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 373 | + else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 374 | 374 | if ($aprs_full) $aprs_filter = ''; |
| 375 | 375 | if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
| 376 | 376 | else $aprs_pass = '-1'; |
@@ -384,12 +384,12 @@ discard block |
||
| 384 | 384 | sleep(1); |
| 385 | 385 | if ($globalDebug) echo "SCAN MODE \n\n"; |
| 386 | 386 | if (!isset($globalCronEnd)) $globalCronEnd = 60; |
| 387 | -$endtime = time()+$globalCronEnd; |
|
| 387 | +$endtime = time() + $globalCronEnd; |
|
| 388 | 388 | $i = 1; |
| 389 | 389 | $tt = array(); |
| 390 | 390 | // Delete all ATC |
| 391 | 391 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) { |
| 392 | - $ATC=new ATC($Connection->db); |
|
| 392 | + $ATC = new ATC($Connection->db); |
|
| 393 | 393 | } |
| 394 | 394 | if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 395 | 395 | $ATC->deleteAll(); |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | |
| 398 | 398 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 399 | 399 | while ($i > 0) { |
| 400 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 400 | + if (!$globalDaemon) $i = $endtime - time(); |
|
| 401 | 401 | // Delete old ATC |
| 402 | 402 | if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 403 | 403 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | } |
| 412 | 412 | if ($max != $globalMinFetch) { |
| 413 | 413 | if ($globalDebug) echo 'Sleeping...'."\n"; |
| 414 | - sleep($globalMinFetch-$max+2); |
|
| 414 | + sleep($globalMinFetch - $max + 2); |
|
| 415 | 415 | } |
| 416 | 416 | } |
| 417 | 417 | |
@@ -430,8 +430,8 @@ discard block |
||
| 430 | 430 | //$buffer = $Common->getData($hosts[$id]); |
| 431 | 431 | $buffer = $Common->getData($value['host']); |
| 432 | 432 | if ($buffer != '') $reset = 0; |
| 433 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 434 | - $buffer = explode('\n',$buffer); |
|
| 433 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 434 | + $buffer = explode('\n', $buffer); |
|
| 435 | 435 | foreach ($buffer as $line) { |
| 436 | 436 | if ($line != '' && count($line) > 7) { |
| 437 | 437 | $line = explode(',', $line); |
@@ -464,11 +464,11 @@ discard block |
||
| 464 | 464 | ) |
| 465 | 465 | ) { |
| 466 | 466 | date_default_timezone_set('CET'); |
| 467 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 467 | + $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host'])); |
|
| 468 | 468 | date_default_timezone_set('UTC'); |
| 469 | 469 | if ($buffer != '') $reset = 0; |
| 470 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 471 | - $buffer = explode('\n',$buffer); |
|
| 470 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 471 | + $buffer = explode('\n', $buffer); |
|
| 472 | 472 | foreach ($buffer as $line) { |
| 473 | 473 | if ($line != '') { |
| 474 | 474 | //echo "'".$line."'\n"; |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | $ais_data = $AIS->parse_line(trim($line)); |
| 477 | 477 | $data = array(); |
| 478 | 478 | if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
| 479 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9); |
|
| 479 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9); |
|
| 480 | 480 | if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
| 481 | 481 | if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
| 482 | 482 | if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 489 | 489 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 490 | 490 | if (isset($ais_data['timestamp'])) { |
| 491 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 491 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 492 | 492 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 493 | 493 | $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
| 494 | 494 | $add = true; |
@@ -511,21 +511,21 @@ discard block |
||
| 511 | 511 | $w = $e = null; |
| 512 | 512 | |
| 513 | 513 | if (isset($arr[$id])) { |
| 514 | - $nn = stream_select($arr,$w,$e,$timeout); |
|
| 514 | + $nn = stream_select($arr, $w, $e, $timeout); |
|
| 515 | 515 | if ($nn > 0) { |
| 516 | 516 | foreach ($httpfeeds as $feed) { |
| 517 | - $buffer = stream_get_line($feed,2000,"\n"); |
|
| 517 | + $buffer = stream_get_line($feed, 2000, "\n"); |
|
| 518 | 518 | if ($buffer === FALSE) { |
| 519 | 519 | connect_all($globalSources); |
| 520 | 520 | } |
| 521 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 522 | - $buffer = explode('\n',$buffer); |
|
| 521 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 522 | + $buffer = explode('\n', $buffer); |
|
| 523 | 523 | foreach ($buffer as $line) { |
| 524 | 524 | if ($line != '') { |
| 525 | 525 | $ais_data = $AIS->parse_line(trim($line)); |
| 526 | 526 | $data = array(); |
| 527 | 527 | if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
| 528 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9); |
|
| 528 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9); |
|
| 529 | 529 | if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
| 530 | 530 | if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
| 531 | 531 | if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
@@ -537,9 +537,9 @@ discard block |
||
| 537 | 537 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 538 | 538 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 539 | 539 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 540 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 540 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 541 | 541 | if (isset($ais_data['timestamp'])) { |
| 542 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 542 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 543 | 543 | } else { |
| 544 | 544 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 545 | 545 | } |
@@ -571,10 +571,10 @@ discard block |
||
| 571 | 571 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 572 | 572 | ) |
| 573 | 573 | ) { |
| 574 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 574 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 575 | 575 | if ($buffer != '') { |
| 576 | 576 | //echo $buffer; |
| 577 | - $all_data = json_decode($buffer,true); |
|
| 577 | + $all_data = json_decode($buffer, true); |
|
| 578 | 578 | //print_r($all_data); |
| 579 | 579 | if (isset($all_data[0]['DATA'])) { |
| 580 | 580 | foreach ($all_data[0]['DATA'] as $line) { |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | $data['ident'] = $line['NAME']; |
| 584 | 584 | $data['mmsi'] = $line['MMSI']; |
| 585 | 585 | if (strlen($data['mmsi']) > 9) { |
| 586 | - $data['mmsi'] = substr($data['mmsi'],-9); |
|
| 586 | + $data['mmsi'] = substr($data['mmsi'], -9); |
|
| 587 | 587 | } |
| 588 | 588 | $data['speed'] = $line['SOG']; |
| 589 | 589 | $data['heading'] = $line['COG']; |
@@ -593,8 +593,8 @@ discard block |
||
| 593 | 593 | //$data['type_id'] = $line['TYPE']; |
| 594 | 594 | $data['imo'] = $line['IMO']; |
| 595 | 595 | if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST']; |
| 596 | - if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV'])); |
|
| 597 | - $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 596 | + if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s', strtotime($line['ARV'])); |
|
| 597 | + $data['datetime'] = date('Y-m-d H:i:s', $line['T']); |
|
| 598 | 598 | $data['format_source'] = 'myshiptracking'; |
| 599 | 599 | $data['id_source'] = $id_source; |
| 600 | 600 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -611,16 +611,16 @@ discard block |
||
| 611 | 611 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) |
| 612 | 612 | ) |
| 613 | 613 | ) { |
| 614 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 614 | + $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host'])); |
|
| 615 | 615 | if ($buffer != '') { |
| 616 | - $all_data = json_decode($buffer,true); |
|
| 616 | + $all_data = json_decode($buffer, true); |
|
| 617 | 617 | if (isset($all_data[0]['mmsi'])) { |
| 618 | 618 | foreach ($all_data as $line) { |
| 619 | 619 | if ($line != '') { |
| 620 | 620 | $data = array(); |
| 621 | 621 | $data['ident'] = $line['shipname']; |
| 622 | 622 | $data['callsign'] = $line['callsign']; |
| 623 | - $data['mmsi'] = substr($line['mmsi'],-9); |
|
| 623 | + $data['mmsi'] = substr($line['mmsi'], -9); |
|
| 624 | 624 | $data['speed'] = $line['sog']; |
| 625 | 625 | if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
| 626 | 626 | $data['latitude'] = $line['latitude']; |
@@ -647,14 +647,14 @@ discard block |
||
| 647 | 647 | ) { |
| 648 | 648 | $buffer = $Common->getData($value['host']); |
| 649 | 649 | if ($buffer != '') { |
| 650 | - $all_data = json_decode($buffer,true); |
|
| 650 | + $all_data = json_decode($buffer, true); |
|
| 651 | 651 | if (isset($all_data['features'][0]['id'])) { |
| 652 | 652 | foreach ($all_data['features'] as $line) { |
| 653 | 653 | print_r($line); |
| 654 | 654 | $data = array(); |
| 655 | 655 | if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name']; |
| 656 | 656 | if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign']; |
| 657 | - if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9); |
|
| 657 | + if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'], -9); |
|
| 658 | 658 | if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo']; |
| 659 | 659 | if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed']; |
| 660 | 660 | if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading']; |
@@ -681,31 +681,31 @@ discard block |
||
| 681 | 681 | ) |
| 682 | 682 | ) { |
| 683 | 683 | echo 'download...'; |
| 684 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 684 | + $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter'); |
|
| 685 | 685 | echo 'done !'."\n"; |
| 686 | 686 | // FIXME: Need more work |
| 687 | 687 | if ($buffer != '') $reset = 0; |
| 688 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 689 | - $buffer = explode('\n',$buffer); |
|
| 688 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 689 | + $buffer = explode('\n', $buffer); |
|
| 690 | 690 | foreach ($buffer as $line) { |
| 691 | 691 | if ($line != '') { |
| 692 | 692 | $data = array(); |
| 693 | 693 | echo $line."\n"; |
| 694 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 695 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 696 | - $data['status_id'] = substr($line,21,2); |
|
| 697 | - $data['type_id'] = substr($line,24,3); |
|
| 698 | - $data['latitude'] = substr($line,29,9); |
|
| 699 | - $data['longitude'] = substr($line,41,9); |
|
| 700 | - $data['speed'] = round(substr($line,51,5)); |
|
| 694 | + $data['mmsi'] = (int) substr($line, 0, 9); |
|
| 695 | + $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10)); |
|
| 696 | + $data['status_id'] = substr($line, 21, 2); |
|
| 697 | + $data['type_id'] = substr($line, 24, 3); |
|
| 698 | + $data['latitude'] = substr($line, 29, 9); |
|
| 699 | + $data['longitude'] = substr($line, 41, 9); |
|
| 700 | + $data['speed'] = round(substr($line, 51, 5)); |
|
| 701 | 701 | //$data['course'] = substr($line,57,5); |
| 702 | - $data['heading'] = round(substr($line,63,3)); |
|
| 702 | + $data['heading'] = round(substr($line, 63, 3)); |
|
| 703 | 703 | //$data['draft'] = substr($line,67,4); |
| 704 | 704 | //$data['length'] = substr($line,72,3); |
| 705 | 705 | //$data['beam'] = substr($line,76,2); |
| 706 | - $data['ident'] = trim(utf8_encode(substr($line,78,20))); |
|
| 706 | + $data['ident'] = trim(utf8_encode(substr($line, 78, 20))); |
|
| 707 | 707 | //$data['callsign'] = trim(substr($line,100,7); |
| 708 | - $data['arrival_code'] = substr($line,108,20); |
|
| 708 | + $data['arrival_code'] = substr($line, 108, 20); |
|
| 709 | 709 | //$data['etaDate'] = substr($line,129,5); |
| 710 | 710 | //$data['etaTime'] = substr($line,135,5); |
| 711 | 711 | $data['format_source'] = 'shipplotter'; |
@@ -736,8 +736,8 @@ discard block |
||
| 736 | 736 | ) { |
| 737 | 737 | //$buffer = $Common->getData($hosts[$id]); |
| 738 | 738 | $buffer = $Common->getData($value['host']); |
| 739 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 740 | - $buffer = explode('\n',$buffer); |
|
| 739 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 740 | + $buffer = explode('\n', $buffer); |
|
| 741 | 741 | $reset = 0; |
| 742 | 742 | foreach ($buffer as $line) { |
| 743 | 743 | if ($line != '') { |
@@ -748,7 +748,7 @@ discard block |
||
| 748 | 748 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
| 749 | 749 | $data['pilot_id'] = $line[1]; |
| 750 | 750 | $data['pilot_name'] = $line[2]; |
| 751 | - $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
|
| 751 | + $data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT); |
|
| 752 | 752 | $data['ident'] = $line[0]; // ident |
| 753 | 753 | if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
| 754 | 754 | $data['speed'] = $line[8]; // speed |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 765 | 765 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 766 | 766 | $data['departure_airport_icao'] = $line[11]; |
| 767 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 767 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':'); |
|
| 768 | 768 | $data['arrival_airport_icao'] = $line[13]; |
| 769 | 769 | $data['frequency'] = $line[4]; |
| 770 | 770 | $data['type'] = $line[18]; |
@@ -773,7 +773,7 @@ discard block |
||
| 773 | 773 | $data['id_source'] = $id_source; |
| 774 | 774 | //$data['arrival_airport_time'] = ; |
| 775 | 775 | if ($line[9] != '') { |
| 776 | - $aircraft_data = explode('/',$line[9]); |
|
| 776 | + $aircraft_data = explode('/', $line[9]); |
|
| 777 | 777 | if (isset($aircraft_data[1])) { |
| 778 | 778 | $data['aircraft_icao'] = $aircraft_data[1]; |
| 779 | 779 | } |
@@ -788,9 +788,9 @@ discard block |
||
| 788 | 788 | if ($line[3] == 'PILOT') $SI->add($data); |
| 789 | 789 | elseif ($line[3] == 'ATC') { |
| 790 | 790 | //print_r($data); |
| 791 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 792 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 793 | - $typec = substr($data['ident'],-3); |
|
| 791 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 792 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 793 | + $typec = substr($data['ident'], -3); |
|
| 794 | 794 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 795 | 795 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
| 796 | 796 | elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
@@ -802,8 +802,8 @@ discard block |
||
| 802 | 802 | elseif ($data['type'] == '') $data['type'] = 'Observer'; |
| 803 | 803 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 804 | 804 | if (isset($ATC)) { |
| 805 | - if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 806 | - else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 805 | + if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']); |
|
| 806 | + else echo $ATC->add($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']); |
|
| 807 | 807 | } |
| 808 | 808 | } |
| 809 | 809 | unset($data); |
@@ -819,24 +819,24 @@ discard block |
||
| 819 | 819 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 820 | 820 | ) |
| 821 | 821 | ) { |
| 822 | - $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); |
|
| 822 | + $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20'); |
|
| 823 | 823 | if ($buffer != '') { |
| 824 | 824 | $all_data = simplexml_load_string($buffer); |
| 825 | - foreach($all_data->children() as $childdata) { |
|
| 825 | + foreach ($all_data->children() as $childdata) { |
|
| 826 | 826 | $data = array(); |
| 827 | 827 | $line = $childdata; |
| 828 | 828 | //$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT); |
| 829 | - $data['id'] = date('Ymd').(int)$line['pktPilotID']; |
|
| 830 | - $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST')); |
|
| 831 | - $data['latitude'] = (float)$line['pktLatitude']; |
|
| 832 | - $data['longitude'] = (float)$line['pktLongitude']; |
|
| 833 | - if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack']; |
|
| 834 | - if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed']; |
|
| 835 | - $data['altitude'] = round((int)$line['pktAltitude']*3.28084); |
|
| 829 | + $data['id'] = date('Ymd').(int) $line['pktPilotID']; |
|
| 830 | + $data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST')); |
|
| 831 | + $data['latitude'] = (float) $line['pktLatitude']; |
|
| 832 | + $data['longitude'] = (float) $line['pktLongitude']; |
|
| 833 | + if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack']; |
|
| 834 | + if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed']; |
|
| 835 | + $data['altitude'] = round((int) $line['pktAltitude']*3.28084); |
|
| 836 | 836 | $data['altitude_relative'] = 'AMSL'; |
| 837 | - $data['pilot_id'] = (int)$line['pktPilotID']; |
|
| 837 | + $data['pilot_id'] = (int) $line['pktPilotID']; |
|
| 838 | 838 | $data['aircraft_icao'] = 'PARAGLIDER'; |
| 839 | - $pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
|
| 839 | + $pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
|
| 840 | 840 | if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4]; |
| 841 | 841 | $data['format_source'] = $value['format']; |
| 842 | 842 | $SI->add($data); |
@@ -844,22 +844,22 @@ discard block |
||
| 844 | 844 | } |
| 845 | 845 | } |
| 846 | 846 | $Source->deleteOldLocationByType('gs'); |
| 847 | - $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); |
|
| 847 | + $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20'); |
|
| 848 | 848 | if ($buffer != '') { |
| 849 | 849 | $all_data = simplexml_load_string($buffer); |
| 850 | - foreach($all_data->children() as $childdata) { |
|
| 850 | + foreach ($all_data->children() as $childdata) { |
|
| 851 | 851 | $data = array(); |
| 852 | 852 | $line = $childdata; |
| 853 | - $data['id'] = (int)$line['gsID']; |
|
| 854 | - $data['latitude'] = (float)$line['gsLatitude']; |
|
| 855 | - $data['longitude'] = (float)$line['gsLongitude']; |
|
| 856 | - $data['altitude'] = round((int)$line['gsHeight']*3.28084); |
|
| 853 | + $data['id'] = (int) $line['gsID']; |
|
| 854 | + $data['latitude'] = (float) $line['gsLatitude']; |
|
| 855 | + $data['longitude'] = (float) $line['gsLongitude']; |
|
| 856 | + $data['altitude'] = round((int) $line['gsHeight']*3.28084); |
|
| 857 | 857 | $data['altitude_relative'] = 'AMSL'; |
| 858 | - $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST')); |
|
| 858 | + $data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST')); |
|
| 859 | 859 | if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) { |
| 860 | - $Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']); |
|
| 860 | + $Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']); |
|
| 861 | 861 | } else { |
| 862 | - $Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']); |
|
| 862 | + $Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']); |
|
| 863 | 863 | } |
| 864 | 864 | unset($data); |
| 865 | 865 | } |
@@ -877,9 +877,9 @@ discard block |
||
| 877 | 877 | (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch)) |
| 878 | 878 | ) |
| 879 | 879 | ) { |
| 880 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 880 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 881 | 881 | if ($buffer != '') { |
| 882 | - $all_data = json_decode($buffer,true); |
|
| 882 | + $all_data = json_decode($buffer, true); |
|
| 883 | 883 | if (isset($all_data['acList'])) { |
| 884 | 884 | $reset = 0; |
| 885 | 885 | foreach ($all_data['acList'] as $line) { |
@@ -895,7 +895,7 @@ discard block |
||
| 895 | 895 | if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
| 896 | 896 | $data['emergency'] = ''; // emergency |
| 897 | 897 | if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
| 898 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 898 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 899 | 899 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 900 | 900 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 901 | 901 | if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 921 | 921 | $data['squawk'] = $line['squawk']; // squawk |
| 922 | 922 | $data['emergency'] = ''; // emergency |
| 923 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 923 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 924 | 924 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 925 | 925 | $data['format_source'] = 'aircraftlistjson'; |
| 926 | 926 | $data['id_source'] = $id_source; |
@@ -941,7 +941,7 @@ discard block |
||
| 941 | 941 | ) |
| 942 | 942 | ) { |
| 943 | 943 | $buffer = $Common->getData($value['host']); |
| 944 | - $all_data = json_decode($buffer,true); |
|
| 944 | + $all_data = json_decode($buffer, true); |
|
| 945 | 945 | if (isset($all_data['planes'])) { |
| 946 | 946 | $reset = 0; |
| 947 | 947 | foreach ($all_data['planes'] as $key => $line) { |
@@ -958,12 +958,12 @@ discard block |
||
| 958 | 958 | $data['emergency'] = ''; // emergency |
| 959 | 959 | $data['registration'] = $line[2]; |
| 960 | 960 | $data['aircraft_icao'] = $line[0]; |
| 961 | - $deparr = explode('-',$line[1]); |
|
| 961 | + $deparr = explode('-', $line[1]); |
|
| 962 | 962 | if (count($deparr) == 2) { |
| 963 | 963 | $data['departure_airport_icao'] = $deparr[0]; |
| 964 | 964 | $data['arrival_airport_icao'] = $deparr[1]; |
| 965 | 965 | } |
| 966 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 966 | + $data['datetime'] = date('Y-m-d H:i:s', $line[9]); |
|
| 967 | 967 | $data['format_source'] = 'planeupdatefaa'; |
| 968 | 968 | $data['id_source'] = $id_source; |
| 969 | 969 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -981,7 +981,7 @@ discard block |
||
| 981 | 981 | ) |
| 982 | 982 | ) { |
| 983 | 983 | $buffer = $Common->getData($value['host']); |
| 984 | - $all_data = json_decode($buffer,true); |
|
| 984 | + $all_data = json_decode($buffer, true); |
|
| 985 | 985 | if (isset($all_data['states'])) { |
| 986 | 986 | $reset = 0; |
| 987 | 987 | foreach ($all_data['states'] as $key => $line) { |
@@ -998,7 +998,7 @@ discard block |
||
| 998 | 998 | //$data['emergency'] = ''; // emergency |
| 999 | 999 | //$data['registration'] = $line[2]; |
| 1000 | 1000 | //$data['aircraft_icao'] = $line[0]; |
| 1001 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 1001 | + $data['datetime'] = date('Y-m-d H:i:s', $line[3]); |
|
| 1002 | 1002 | $data['format_source'] = 'opensky'; |
| 1003 | 1003 | $data['id_source'] = $id_source; |
| 1004 | 1004 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -1017,7 +1017,7 @@ discard block |
||
| 1017 | 1017 | ) { |
| 1018 | 1018 | //$buffer = $Common->getData($hosts[$id]); |
| 1019 | 1019 | $buffer = $Common->getData($value['host']); |
| 1020 | - $all_data = json_decode($buffer,true); |
|
| 1020 | + $all_data = json_decode($buffer, true); |
|
| 1021 | 1021 | if (!empty($all_data)) $reset = 0; |
| 1022 | 1022 | foreach ($all_data as $key => $line) { |
| 1023 | 1023 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
@@ -1055,11 +1055,11 @@ discard block |
||
| 1055 | 1055 | ) |
| 1056 | 1056 | ) { |
| 1057 | 1057 | //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
| 1058 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 1058 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150'); |
|
| 1059 | 1059 | //echo $buffer; |
| 1060 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 1061 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 1062 | - $all_data = json_decode($buffer,true); |
|
| 1060 | + $buffer = str_replace(array("\n", "\r"), "", $buffer); |
|
| 1061 | + $buffer = preg_replace('/,"num":(.+)/', '}', $buffer); |
|
| 1062 | + $all_data = json_decode($buffer, true); |
|
| 1063 | 1063 | if (json_last_error() != JSON_ERROR_NONE) { |
| 1064 | 1064 | die(json_last_error_msg()); |
| 1065 | 1065 | } |
@@ -1082,7 +1082,7 @@ discard block |
||
| 1082 | 1082 | //$data['departure_airport_iata'] = $line[11]; |
| 1083 | 1083 | //$data['arrival_airport_iata'] = $line[12]; |
| 1084 | 1084 | //$data['emergency'] = ''; // emergency |
| 1085 | - $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
|
| 1085 | + $data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10] |
|
| 1086 | 1086 | $data['format_source'] = 'radarvirtueljson'; |
| 1087 | 1087 | $data['id_source'] = $id_source; |
| 1088 | 1088 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -1103,14 +1103,14 @@ discard block |
||
| 1103 | 1103 | ) { |
| 1104 | 1104 | //$buffer = $Common->getData($hosts[$id]); |
| 1105 | 1105 | $buffer = $Common->getData($value['host'].'?'.time()); |
| 1106 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 1106 | + $all_data = json_decode(utf8_encode($buffer), true); |
|
| 1107 | 1107 | |
| 1108 | 1108 | if (isset($all_data['pireps'])) { |
| 1109 | 1109 | $reset = 0; |
| 1110 | 1110 | foreach ($all_data['pireps'] as $line) { |
| 1111 | 1111 | $data = array(); |
| 1112 | 1112 | $data['id'] = $line['id']; |
| 1113 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1113 | + $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 1114 | 1114 | $data['ident'] = $line['callsign']; // ident |
| 1115 | 1115 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
| 1116 | 1116 | if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
@@ -1140,9 +1140,9 @@ discard block |
||
| 1140 | 1140 | $SI->add($data); |
| 1141 | 1141 | // print_r($data); |
| 1142 | 1142 | } elseif ($line['icon'] == 'ct') { |
| 1143 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 1144 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 1145 | - $typec = substr($data['ident'],-3); |
|
| 1143 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 1144 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 1145 | + $typec = substr($data['ident'], -3); |
|
| 1146 | 1146 | $data['type'] = ''; |
| 1147 | 1147 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 1148 | 1148 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
@@ -1153,7 +1153,7 @@ discard block |
||
| 1153 | 1153 | elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
| 1154 | 1154 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 1155 | 1155 | else $data['type'] = 'Observer'; |
| 1156 | - if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
|
| 1156 | + if (isset($ATC)) echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source']); |
|
| 1157 | 1157 | } |
| 1158 | 1158 | unset($data); |
| 1159 | 1159 | } |
@@ -1170,14 +1170,14 @@ discard block |
||
| 1170 | 1170 | //$buffer = $Common->getData($hosts[$id]); |
| 1171 | 1171 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1172 | 1172 | $buffer = $Common->getData($value['host']); |
| 1173 | - $all_data = json_decode($buffer,true); |
|
| 1173 | + $all_data = json_decode($buffer, true); |
|
| 1174 | 1174 | if ($buffer != '' && is_array($all_data)) { |
| 1175 | 1175 | $reset = 0; |
| 1176 | 1176 | foreach ($all_data as $line) { |
| 1177 | 1177 | $data = array(); |
| 1178 | 1178 | //$data['id'] = $line['id']; // id not usable |
| 1179 | 1179 | if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
| 1180 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1180 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1181 | 1181 | if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
| 1182 | 1182 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
| 1183 | 1183 | $data['ident'] = $line['flightnum']; // ident |
@@ -1192,7 +1192,7 @@ discard block |
||
| 1192 | 1192 | //$data['datetime'] = $line['lastupdate']; |
| 1193 | 1193 | //$data['last_update'] = $line['lastupdate']; |
| 1194 | 1194 | if (isset($value['timezone'])) { |
| 1195 | - $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone'])); |
|
| 1195 | + $datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone'])); |
|
| 1196 | 1196 | $datetime->setTimeZone(new DateTimeZone('UTC')); |
| 1197 | 1197 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1198 | 1198 | } else $data['datetime'] = date('Y-m-d H:i:s'); |
@@ -1208,14 +1208,14 @@ discard block |
||
| 1208 | 1208 | if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
| 1209 | 1209 | if (isset($line['aircraftname'])) { |
| 1210 | 1210 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 1211 | - $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
|
| 1212 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 1211 | + $line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']); |
|
| 1212 | + $aircraft_data = explode('-', $line['aircraftname']); |
|
| 1213 | 1213 | if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
| 1214 | 1214 | elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
| 1215 | 1215 | else { |
| 1216 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 1217 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1218 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1216 | + $aircraft_data = explode(' ', $line['aircraftname']); |
|
| 1217 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]); |
|
| 1218 | + else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']); |
|
| 1219 | 1219 | } |
| 1220 | 1220 | } |
| 1221 | 1221 | if (isset($line['route'])) $data['waypoints'] = $line['route']; |
@@ -1240,7 +1240,7 @@ discard block |
||
| 1240 | 1240 | //$buffer = $Common->getData($hosts[$id]); |
| 1241 | 1241 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1242 | 1242 | $buffer = $Common->getData($value['host']); |
| 1243 | - $all_data = json_decode($buffer,true); |
|
| 1243 | + $all_data = json_decode($buffer, true); |
|
| 1244 | 1244 | if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) { |
| 1245 | 1245 | $reset = 0; |
| 1246 | 1246 | foreach ($all_data['ACARSData'] as $line) { |
@@ -1251,7 +1251,7 @@ discard block |
||
| 1251 | 1251 | //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
| 1252 | 1252 | if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username']; |
| 1253 | 1253 | if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id']; |
| 1254 | - $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident |
|
| 1254 | + $data['ident'] = str_replace(' ', '', $line['bid']['flightnum']); // ident |
|
| 1255 | 1255 | if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident']; |
| 1256 | 1256 | $data['altitude'] = $line['altitude']; // altitude |
| 1257 | 1257 | $data['speed'] = $line['groundspeed']; // speed |
@@ -1262,7 +1262,7 @@ discard block |
||
| 1262 | 1262 | //$data['squawk'] = ''; // squawk |
| 1263 | 1263 | //$data['emergency'] = ''; // emergency |
| 1264 | 1264 | if (isset($value['timezone'])) { |
| 1265 | - $datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone'])); |
|
| 1265 | + $datetime = new DateTime($line['updated_at'], new DateTimeZone($value['timezone'])); |
|
| 1266 | 1266 | $datetime->setTimeZone(new DateTimeZone('UTC')); |
| 1267 | 1267 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1268 | 1268 | } else $data['datetime'] = date('Y-m-d H:i:s'); |
@@ -1298,14 +1298,14 @@ discard block |
||
| 1298 | 1298 | //$buffer = $Common->getData($hosts[$id]); |
| 1299 | 1299 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1300 | 1300 | $buffer = $Common->getData($value['host']); |
| 1301 | - $all_data = json_decode($buffer,true); |
|
| 1301 | + $all_data = json_decode($buffer, true); |
|
| 1302 | 1302 | if ($buffer != '' && is_array($all_data)) { |
| 1303 | 1303 | $reset = 0; |
| 1304 | 1304 | foreach ($all_data as $line) { |
| 1305 | 1305 | $data = array(); |
| 1306 | 1306 | //$data['id'] = $line['id']; // id not usable |
| 1307 | 1307 | $data['id'] = trim($line['flight_id']); |
| 1308 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1308 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1309 | 1309 | $data['pilot_name'] = $line['pilot_name']; |
| 1310 | 1310 | $data['pilot_id'] = $line['pilot_id']; |
| 1311 | 1311 | $data['ident'] = trim($line['callsign']); // ident |
@@ -1349,24 +1349,24 @@ discard block |
||
| 1349 | 1349 | //$buffer = $Common->getData($hosts[$id]); |
| 1350 | 1350 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1351 | 1351 | $buffer = $Common->getData($value['host']); |
| 1352 | - $all_data = json_decode($buffer,true); |
|
| 1352 | + $all_data = json_decode($buffer, true); |
|
| 1353 | 1353 | if ($buffer != '') { |
| 1354 | 1354 | $Source->deleteLocationBySource('blitzortung'); |
| 1355 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 1356 | - $buffer = explode('\n',$buffer); |
|
| 1355 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 1356 | + $buffer = explode('\n', $buffer); |
|
| 1357 | 1357 | foreach ($buffer as $buffer_line) { |
| 1358 | - $line = json_decode($buffer_line,true); |
|
| 1358 | + $line = json_decode($buffer_line, true); |
|
| 1359 | 1359 | if (isset($line['time'])) { |
| 1360 | 1360 | $data = array(); |
| 1361 | 1361 | $data['altitude'] = $line['alt']; // altitude |
| 1362 | 1362 | $data['latitude'] = $line['lat']; // lat |
| 1363 | 1363 | $data['longitude'] = $line['lon']; // long |
| 1364 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10)); |
|
| 1364 | + $data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10)); |
|
| 1365 | 1365 | $data['id_source'] = $id_source; |
| 1366 | 1366 | $data['format_source'] = 'blitzortung'; |
| 1367 | 1367 | $SI->add($data); |
| 1368 | 1368 | if ($globalDebug) echo '☈ Lightning added'."\n"; |
| 1369 | - $Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']); |
|
| 1369 | + $Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']); |
|
| 1370 | 1370 | unset($data); |
| 1371 | 1371 | } |
| 1372 | 1372 | } |
@@ -1391,11 +1391,11 @@ discard block |
||
| 1391 | 1391 | //$value = $formats[$nb]; |
| 1392 | 1392 | $format = $globalSources[$nb]['format']; |
| 1393 | 1393 | if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
| 1394 | - $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 1394 | + $buffer = @socket_read($r, 6000, PHP_NORMAL_READ); |
|
| 1395 | 1395 | } elseif ($format == 'vrstcp') { |
| 1396 | 1396 | $buffer = @socket_read($r, 6000); |
| 1397 | 1397 | } else { |
| 1398 | - $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 1398 | + $az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port); |
|
| 1399 | 1399 | } |
| 1400 | 1400 | //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
| 1401 | 1401 | //echo $buffer."\n"; |
@@ -1405,8 +1405,8 @@ discard block |
||
| 1405 | 1405 | //$SI::del(); |
| 1406 | 1406 | if ($buffer !== FALSE) { |
| 1407 | 1407 | if ($format == 'vrstcp') { |
| 1408 | - $buffer = explode('},{',$buffer); |
|
| 1409 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1408 | + $buffer = explode('},{', $buffer); |
|
| 1409 | + } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer)); |
|
| 1410 | 1410 | } |
| 1411 | 1411 | // SBS format is CSV format |
| 1412 | 1412 | if ($buffer !== FALSE && $buffer !== '') { |
@@ -1430,7 +1430,7 @@ discard block |
||
| 1430 | 1430 | $ais_data = $AIS->parse_line(trim($buffer)); |
| 1431 | 1431 | $data = array(); |
| 1432 | 1432 | if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
| 1433 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9); |
|
| 1433 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9); |
|
| 1434 | 1434 | if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
| 1435 | 1435 | if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
| 1436 | 1436 | if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
@@ -1441,13 +1441,13 @@ discard block |
||
| 1441 | 1441 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 1442 | 1442 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 1443 | 1443 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 1444 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1444 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 1445 | 1445 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1446 | 1446 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1447 | 1447 | if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
| 1448 | 1448 | |
| 1449 | 1449 | if (isset($ais_data['timestamp'])) { |
| 1450 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 1450 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 1451 | 1451 | } else { |
| 1452 | 1452 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1453 | 1453 | } |
@@ -1458,10 +1458,10 @@ discard block |
||
| 1458 | 1458 | } elseif ($format == 'flightgearsp') { |
| 1459 | 1459 | //echo $buffer."\n"; |
| 1460 | 1460 | if (strlen($buffer) > 5) { |
| 1461 | - $line = explode(',',$buffer); |
|
| 1461 | + $line = explode(',', $buffer); |
|
| 1462 | 1462 | $data = array(); |
| 1463 | 1463 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
| 1464 | - $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1464 | + $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 1465 | 1465 | $data['ident'] = $line[6]; |
| 1466 | 1466 | $data['aircraft_name'] = $line[7]; |
| 1467 | 1467 | $data['longitude'] = $line[1]; |
@@ -1478,16 +1478,16 @@ discard block |
||
| 1478 | 1478 | } elseif ($format == 'acars') { |
| 1479 | 1479 | if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
| 1480 | 1480 | $ACARS->add(trim($buffer)); |
| 1481 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1481 | + socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port); |
|
| 1482 | 1482 | $ACARS->deleteLiveAcarsData(); |
| 1483 | 1483 | } elseif ($format == 'flightgearmp') { |
| 1484 | - if (substr($buffer,0,1) != '#') { |
|
| 1484 | + if (substr($buffer, 0, 1) != '#') { |
|
| 1485 | 1485 | $data = array(); |
| 1486 | 1486 | //echo $buffer."\n"; |
| 1487 | - $line = explode(' ',$buffer); |
|
| 1487 | + $line = explode(' ', $buffer); |
|
| 1488 | 1488 | if (count($line) == 11) { |
| 1489 | - $userserver = explode('@',$line[0]); |
|
| 1490 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1489 | + $userserver = explode('@', $line[0]); |
|
| 1490 | + $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex |
|
| 1491 | 1491 | $data['ident'] = $userserver[0]; |
| 1492 | 1492 | $data['registration'] = $userserver[0]; |
| 1493 | 1493 | $data['latitude'] = $line[4]; |
@@ -1495,8 +1495,8 @@ discard block |
||
| 1495 | 1495 | $data['altitude'] = $line[6]; |
| 1496 | 1496 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1497 | 1497 | $aircraft_type = $line[10]; |
| 1498 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1499 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1498 | + $aircraft_type = preg_split(':/:', $aircraft_type); |
|
| 1499 | + $data['aircraft_name'] = substr(end($aircraft_type), 0, -4); |
|
| 1500 | 1500 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1501 | 1501 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1502 | 1502 | } |
@@ -1505,8 +1505,8 @@ discard block |
||
| 1505 | 1505 | echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
| 1506 | 1506 | die; |
| 1507 | 1507 | } elseif ($format == 'vrstcp') { |
| 1508 | - foreach($buffer as $all_data) { |
|
| 1509 | - $line = json_decode('{'.$all_data.'}',true); |
|
| 1508 | + foreach ($buffer as $all_data) { |
|
| 1509 | + $line = json_decode('{'.$all_data.'}', true); |
|
| 1510 | 1510 | $data = array(); |
| 1511 | 1511 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
| 1512 | 1512 | if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
@@ -1532,16 +1532,16 @@ discard block |
||
| 1532 | 1532 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1533 | 1533 | unset($data); |
| 1534 | 1534 | } |
| 1535 | - } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
|
| 1535 | + } elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') { |
|
| 1536 | 1536 | $line = explode("\t", $buffer); |
| 1537 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1537 | + for ($k = 0; $k < count($line); $k = $k + 2) { |
|
| 1538 | 1538 | $key = $line[$k]; |
| 1539 | - $lined[$key] = $line[$k+1]; |
|
| 1539 | + $lined[$key] = $line[$k + 1]; |
|
| 1540 | 1540 | } |
| 1541 | 1541 | if (count($lined) > 3) { |
| 1542 | 1542 | $data['hex'] = $lined['hexid']; |
| 1543 | 1543 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1544 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1544 | + $data['datetime'] = date('Y-m-d H:i:s'); ; |
|
| 1545 | 1545 | if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
| 1546 | 1546 | if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
| 1547 | 1547 | if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
@@ -1560,23 +1560,23 @@ discard block |
||
| 1560 | 1560 | } else $error = true; |
| 1561 | 1561 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1562 | 1562 | if ($aprs_connect == 0) { |
| 1563 | - $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 1563 | + $send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0); |
|
| 1564 | 1564 | $aprs_connect = 1; |
| 1565 | 1565 | } |
| 1566 | 1566 | |
| 1567 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1567 | + if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) { |
|
| 1568 | 1568 | $aprs_last_tx = time(); |
| 1569 | 1569 | $data_aprs = "# Keep alive"; |
| 1570 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 1570 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 1571 | 1571 | } |
| 1572 | 1572 | |
| 1573 | 1573 | //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
| 1574 | 1574 | //echo 'APRS data : '.$buffer."\n"; |
| 1575 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1576 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1575 | + $buffer = str_replace('APRS <- ', '', $buffer); |
|
| 1576 | + $buffer = str_replace('APRS -> ', '', $buffer); |
|
| 1577 | 1577 | //echo $buffer."\n"; |
| 1578 | 1578 | date_default_timezone_set('UTC'); |
| 1579 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1579 | + if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') { |
|
| 1580 | 1580 | $line = $APRS->parse($buffer); |
| 1581 | 1581 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1582 | 1582 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
@@ -1591,7 +1591,7 @@ discard block |
||
| 1591 | 1591 | if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date']; |
| 1592 | 1592 | if (isset($line['typeid'])) $data['type_id'] = $line['typeid']; |
| 1593 | 1593 | if (isset($line['statusid'])) $data['status_id'] = $line['statusid']; |
| 1594 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1594 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']); |
|
| 1595 | 1595 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1596 | 1596 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1597 | 1597 | if (isset($line['ident'])) $data['ident'] = $line['ident']; |
@@ -1674,29 +1674,29 @@ discard block |
||
| 1674 | 1674 | } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) { |
| 1675 | 1675 | if (!isset($data['altitude'])) $data['altitude'] = 0; |
| 1676 | 1676 | $Source->deleteOldLocationByType('gs'); |
| 1677 | - if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) { |
|
| 1678 | - $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
|
| 1677 | + if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) { |
|
| 1678 | + $Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']); |
|
| 1679 | 1679 | } else { |
| 1680 | - $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
|
| 1680 | + $Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']); |
|
| 1681 | 1681 | } |
| 1682 | 1682 | } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
| 1683 | 1683 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1684 | 1684 | if ($globalDebug) echo '# Weather Station added'."\n"; |
| 1685 | 1685 | $Source->deleteOldLocationByType('wx'); |
| 1686 | 1686 | $weather_data = json_encode($line); |
| 1687 | - if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) { |
|
| 1688 | - $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data); |
|
| 1687 | + if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) { |
|
| 1688 | + $Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data); |
|
| 1689 | 1689 | } else { |
| 1690 | - $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data); |
|
| 1690 | + $Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data); |
|
| 1691 | 1691 | } |
| 1692 | 1692 | } elseif (isset($line['symbol']) && ($line['symbol'] == 'Lightning' || $line['symbol'] == 'Thunderstorm')) { |
| 1693 | 1693 | //if ($globalDebug) echo '!! Weather Station not yet supported'."\n"; |
| 1694 | 1694 | if ($globalDebug) echo '☈ Lightning added'."\n"; |
| 1695 | 1695 | $Source->deleteOldLocationByType('lightning'); |
| 1696 | - if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) { |
|
| 1697 | - $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']); |
|
| 1696 | + if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) { |
|
| 1697 | + $Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']); |
|
| 1698 | 1698 | } else { |
| 1699 | - $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']); |
|
| 1699 | + $Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']); |
|
| 1700 | 1700 | } |
| 1701 | 1701 | } elseif ($globalDebug) { |
| 1702 | 1702 | echo '/!\ Not added: '.$buffer."\n"; |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | unset($data); |
| 1706 | 1706 | } |
| 1707 | 1707 | elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
| 1708 | - $Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']); |
|
| 1708 | + $Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']); |
|
| 1709 | 1709 | } |
| 1710 | 1710 | /* |
| 1711 | 1711 | elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) { |
@@ -1714,7 +1714,7 @@ discard block |
||
| 1714 | 1714 | */ |
| 1715 | 1715 | //elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
| 1716 | 1716 | elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n"; |
| 1717 | - if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) { |
|
| 1717 | + if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) { |
|
| 1718 | 1718 | $Source->deleteOldLocationByType('lightning'); |
| 1719 | 1719 | $Source->deleteOldLocationByType('wx'); |
| 1720 | 1720 | $globalSources[$nb]['last_weather_clean'] = time(); |
@@ -1799,7 +1799,7 @@ discard block |
||
| 1799 | 1799 | connect_all($sourceee); |
| 1800 | 1800 | $sourceee = array(); |
| 1801 | 1801 | //connect_all($globalSources); |
| 1802 | - $tt[$format]=0; |
|
| 1802 | + $tt[$format] = 0; |
|
| 1803 | 1803 | break; |
| 1804 | 1804 | } |
| 1805 | 1805 | //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."..."; |
@@ -1809,14 +1809,14 @@ discard block |
||
| 1809 | 1809 | } else { |
| 1810 | 1810 | $error = socket_strerror(socket_last_error()); |
| 1811 | 1811 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1812 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1812 | + if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n"; |
|
| 1813 | 1813 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1814 | 1814 | // Restart the script if possible |
| 1815 | 1815 | if (is_array($sockets)) { |
| 1816 | 1816 | if ($globalDebug) echo "Shutdown all sockets..."; |
| 1817 | 1817 | |
| 1818 | 1818 | foreach ($sockets as $sock) { |
| 1819 | - @socket_shutdown($sock,2); |
|
| 1819 | + @socket_shutdown($sock, 2); |
|
| 1820 | 1820 | @socket_close($sock); |
| 1821 | 1821 | } |
| 1822 | 1822 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | if (isset($this->all_tracked[$key]['id'])) { |
| 60 | 60 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 61 | 61 | $Marine = new Marine($this->db); |
| 62 | - $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 62 | + $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | } |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 72 | 72 | foreach ($this->all_tracked as $key => $flight) { |
| 73 | 73 | if (isset($flight['lastupdate'])) { |
| 74 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 74 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 75 | 75 | if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 76 | 76 | if (isset($this->all_tracked[$key]['id'])) { |
| 77 | 77 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | //$real_arrival = $this->arrival($key); |
| 84 | 84 | $Marine = new Marine($this->db); |
| 85 | 85 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 86 | - $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 86 | + $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 87 | 87 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 88 | 88 | } |
| 89 | 89 | // Put in archive |
@@ -97,14 +97,14 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | public function add($line) { |
| 100 | - global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
|
| 100 | + global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS, $APRSMarine; |
|
| 101 | 101 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
| 102 | 102 | date_default_timezone_set('UTC'); |
| 103 | 103 | $dataFound = false; |
| 104 | 104 | $send = false; |
| 105 | 105 | |
| 106 | 106 | // SBS format is CSV format |
| 107 | - if(is_array($line) && isset($line['mmsi'])) { |
|
| 107 | + if (is_array($line) && isset($line['mmsi'])) { |
|
| 108 | 108 | //print_r($line); |
| 109 | 109 | if (isset($line['mmsi'])) { |
| 110 | 110 | |
@@ -129,25 +129,25 @@ discard block |
||
| 129 | 129 | |
| 130 | 130 | if (!isset($this->all_tracked[$id])) { |
| 131 | 131 | $this->all_tracked[$id] = array(); |
| 132 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 133 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 134 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 132 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedMarine' => 0)); |
|
| 133 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'typeid' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '', 'mmsi' => '', 'status' => '', 'status_id' => '', 'imo' => '', 'callsign' => '', 'arrival_code' => '', 'arrival_date' => '', 'mmsi_type' => '')); |
|
| 134 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 135 | 135 | if (!isset($line['id'])) { |
| 136 | 136 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 137 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 138 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 137 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 138 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 139 | 139 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
| 143 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 143 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi' => $line['mmsi'])); |
|
| 144 | 144 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 145 | 145 | $Marine = new Marine($this->db); |
| 146 | 146 | $identity = $Marine->getIdentity($line['mmsi']); |
| 147 | 147 | if (!empty($identity)) { |
| 148 | 148 | $this->all_tracked[$id]['ident'] = $identity['ship_name']; |
| 149 | 149 | $this->all_tracked[$id]['type'] = $identity['type']; |
| 150 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($identity['type']))); |
|
| 150 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $AIS->getShipTypeID($identity['type']))); |
|
| 151 | 151 | } |
| 152 | 152 | //print_r($identity); |
| 153 | 153 | unset($Marine); |
@@ -155,23 +155,23 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | if (isset($line['type_id'])) { |
| 158 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 159 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $line['type_id'])); |
|
| 158 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $AIS->getShipType($line['type_id']))); |
|
| 159 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $line['type_id'])); |
|
| 160 | 160 | } |
| 161 | 161 | if (isset($line['type']) && $line['type'] != '' && $this->all_tracked[$id]['type'] == '') { |
| 162 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 163 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($line['type']))); |
|
| 162 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 163 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $AIS->getShipTypeID($line['type']))); |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($line['status']) && $line['status'] != '') { |
| 166 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 166 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status' => $line['status'])); |
|
| 167 | 167 | } |
| 168 | 168 | if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) { |
| 169 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id'])); |
|
| 169 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status_id' => $line['status_id'])); |
|
| 170 | 170 | if ($this->all_tracked[$id]['addedMarine'] == 1) { |
| 171 | 171 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 172 | 172 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 173 | 173 | $Marine = new Marine($this->db); |
| 174 | - $Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']); |
|
| 174 | + $Marine->updateStatusMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['status']); |
|
| 175 | 175 | unset($Marine); |
| 176 | 176 | } |
| 177 | 177 | } |
@@ -180,24 +180,24 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | |
| 182 | 182 | if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') { |
| 183 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 183 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi_type' => $line['mmsi_type'])); |
|
| 184 | 184 | } |
| 185 | 185 | if (isset($line['imo']) && $line['imo'] != '') { |
| 186 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 186 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('imo' => $line['imo'])); |
|
| 187 | 187 | } |
| 188 | 188 | if (isset($line['callsign']) && $line['callsign'] != '') { |
| 189 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 189 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('callsign' => $line['callsign'])); |
|
| 190 | 190 | } |
| 191 | 191 | if (isset($line['arrival_code']) && $line['arrival_code'] != '') { |
| 192 | 192 | if (!isset($this->all_tracked[$id]['arrival_code'])) { |
| 193 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 193 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_code' => $line['arrival_code'])); |
|
| 194 | 194 | if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n"; |
| 195 | 195 | if ($this->all_tracked[$id]['addedMarine'] != 0) { |
| 196 | 196 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 197 | 197 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 198 | 198 | $Marine = new Marine($this->db); |
| 199 | 199 | $fromsource = NULL; |
| 200 | - $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource); |
|
| 200 | + $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['arrival_code'], $fromsource); |
|
| 201 | 201 | $Marine->db = null; |
| 202 | 202 | } |
| 203 | 203 | } |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | if (isset($line['arrival_date']) && $line['arrival_date'] != '') { |
| 216 | - if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 216 | + if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_date' => $line['arrival_date'])); |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
@@ -222,44 +222,44 @@ discard block |
||
| 222 | 222 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 223 | 223 | $timeelapsed = microtime(true); |
| 224 | 224 | $Marine = new Marine($this->db); |
| 225 | - $Marine->addIdentity($this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['type']); |
|
| 225 | + $Marine->addIdentity($this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['type']); |
|
| 226 | 226 | $Marine->db = null; |
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 229 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 230 | 230 | if ($this->all_tracked[$id]['addedMarine'] == 1) { |
| 231 | 231 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 232 | 232 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 233 | 233 | $timeelapsed = microtime(true); |
| 234 | 234 | $Marine = new Marine($this->db); |
| 235 | 235 | $fromsource = NULL; |
| 236 | - $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 236 | + $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 237 | 237 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 238 | 238 | $Marine->db = null; |
| 239 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 239 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 243 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 244 | 244 | } |
| 245 | 245 | |
| 246 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 246 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 30*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 247 | 247 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
| 248 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 248 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 249 | 249 | } else { |
| 250 | 250 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
| 251 | 251 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 252 | 252 | return ''; |
| 253 | 253 | } |
| 254 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) { |
|
| 254 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time() - 30*60) { |
|
| 255 | 255 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n"; |
| 256 | 256 | return ''; |
| 257 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) >= time()+20*60) { |
|
| 257 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) >= time() + 20*60) { |
|
| 258 | 258 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n"; |
| 259 | 259 | return ''; |
| 260 | 260 | } elseif (!isset($line['datetime'])) { |
| 261 | 261 | date_default_timezone_set('UTC'); |
| 262 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 262 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 263 | 263 | } else { |
| 264 | 264 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!\n"; |
| 265 | 265 | return ''; |
@@ -267,24 +267,24 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | |
| 269 | 269 | if (isset($line['speed'])) { |
| 270 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 271 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 270 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 271 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 272 | 272 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 273 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 273 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 274 | 274 | if ($distance > 1000 && $distance < 10000) { |
| 275 | 275 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 276 | 276 | $speed = $speed*3.6; |
| 277 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 277 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 278 | 278 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 279 | 279 | } |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 283 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 283 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 284 | 284 | else unset($timediff); |
| 285 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 285 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) { |
|
| 286 | 286 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 287 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 287 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 288 | 288 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 289 | 289 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 290 | 290 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -293,10 +293,10 @@ discard block |
||
| 293 | 293 | $timeelapsed = microtime(true); |
| 294 | 294 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 295 | 295 | $Marine = new Marine($this->db); |
| 296 | - $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 296 | + $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 297 | 297 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 298 | 298 | $Marine->db = null; |
| 299 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 299 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 300 | 300 | } |
| 301 | 301 | $this->tmd = 0; |
| 302 | 302 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
@@ -305,55 +305,55 @@ discard block |
||
| 305 | 305 | |
| 306 | 306 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 307 | 307 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 308 | - if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 308 | + if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 309 | 309 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 310 | 310 | $dataFound = true; |
| 311 | 311 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 312 | 312 | } |
| 313 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 313 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 314 | 314 | } |
| 315 | 315 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 316 | 316 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 317 | 317 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 318 | - if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 318 | + if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 319 | 319 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 320 | 320 | $dataFound = true; |
| 321 | 321 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 322 | 322 | } |
| 323 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 323 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | } else if ($globalDebug && $timediff > 20) { |
| 327 | 327 | $this->tmd = $this->tmd + 1; |
| 328 | 328 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 329 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 330 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 329 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 330 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 331 | 331 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 332 | 332 | } |
| 333 | 333 | } |
| 334 | 334 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 335 | 335 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 336 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 336 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 337 | 337 | } |
| 338 | 338 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 339 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 339 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 340 | 340 | } |
| 341 | 341 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 342 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 342 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 343 | 343 | } |
| 344 | 344 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 345 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 345 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 346 | 346 | } |
| 347 | 347 | |
| 348 | 348 | if (isset($line['heading']) && $line['heading'] != '') { |
| 349 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 350 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 351 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 349 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 350 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 351 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 352 | 352 | //$dataFound = true; |
| 353 | 353 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 354 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 355 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 356 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 354 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 355 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 356 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 357 | 357 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 358 | 358 | } |
| 359 | 359 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) { |
| 364 | 364 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 365 | 365 | if ($this->all_tracked[$id]['addedMarine'] == 0) { |
| 366 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 366 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 367 | 367 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 368 | 368 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 369 | 369 | if ($globalDebug) echo "Check if vessel is already in DB..."; |
@@ -371,37 +371,37 @@ discard block |
||
| 371 | 371 | $MarineLive = new MarineLive($this->db); |
| 372 | 372 | if (isset($line['id'])) { |
| 373 | 373 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 374 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 374 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 375 | 375 | } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
| 376 | 376 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 377 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 377 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 378 | 378 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 379 | 379 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 380 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 380 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 381 | 381 | } else $recent_ident = ''; |
| 382 | - $MarineLive->db=null; |
|
| 382 | + $MarineLive->db = null; |
|
| 383 | 383 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 384 | 384 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 385 | 385 | } else $recent_ident = ''; |
| 386 | 386 | } else { |
| 387 | 387 | $recent_ident = ''; |
| 388 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 388 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 389 | 389 | } |
| 390 | 390 | //if there was no vessel with the same callsign within the last hour and go post it into the archive |
| 391 | - if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 391 | + if ($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 392 | 392 | { |
| 393 | 393 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
| 394 | 394 | //adds the spotter data for the archive |
| 395 | 395 | $highlight = ''; |
| 396 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 396 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 397 | 397 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 398 | 398 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 399 | 399 | $timeelapsed = microtime(true); |
| 400 | 400 | $Marine = new Marine($this->db); |
| 401 | - $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 401 | + $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 402 | 402 | $Marine->db = null; |
| 403 | 403 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 404 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 404 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 405 | 405 | } |
| 406 | 406 | } |
| 407 | 407 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
@@ -409,15 +409,15 @@ discard block |
||
| 409 | 409 | $Stats = new Stats($this->db); |
| 410 | 410 | if (!empty($this->stats)) { |
| 411 | 411 | if ($globalDebug) echo 'Add source stats : '; |
| 412 | - foreach($this->stats as $date => $data) { |
|
| 413 | - foreach($data as $source => $sourced) { |
|
| 412 | + foreach ($this->stats as $date => $data) { |
|
| 413 | + foreach ($data as $source => $sourced) { |
|
| 414 | 414 | //print_r($sourced); |
| 415 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date); |
|
| 416 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date); |
|
| 415 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_marine', $date); |
|
| 416 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_marine', $date); |
|
| 417 | 417 | if (isset($sourced['msg'])) { |
| 418 | 418 | if (time() - $sourced['msg']['date'] > 10) { |
| 419 | 419 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 420 | - echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date); |
|
| 420 | + echo $Stats->addStatSource($nbmsg, $source, 'msg_marine', $date); |
|
| 421 | 421 | unset($this->stats[$date][$source]['msg']); |
| 422 | 422 | } |
| 423 | 423 | } |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 442 | 442 | $MarineLive = new MarineLive($this->db); |
| 443 | 443 | $MarineLive->deleteLiveMarineData(); |
| 444 | - $MarineLive->db=null; |
|
| 444 | + $MarineLive->db = null; |
|
| 445 | 445 | if ($globalDebug) echo " Done\n"; |
| 446 | 446 | } |
| 447 | 447 | $this->last_delete = time(); |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 453 | 453 | if (isset($globalDaemon) && !$globalDaemon) { |
| 454 | 454 | $Marine = new Marine($this->db); |
| 455 | - $Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 455 | + $Marine->updateLatestMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 456 | 456 | $Marine->db = null; |
| 457 | 457 | } |
| 458 | 458 | } |
@@ -467,20 +467,20 @@ discard block |
||
| 467 | 467 | $ignoreImport = false; |
| 468 | 468 | |
| 469 | 469 | if (!$ignoreImport) { |
| 470 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 470 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 471 | 471 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 472 | 472 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 473 | 473 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 474 | 474 | $timeelapsed = microtime(true); |
| 475 | 475 | $MarineLive = new MarineLive($this->db); |
| 476 | - $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 476 | + $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 477 | 477 | $MarineLive->db = null; |
| 478 | 478 | if ($globalDebug) echo $result."\n"; |
| 479 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 479 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 480 | 480 | } |
| 481 | 481 | } |
| 482 | 482 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
| 483 | - $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 483 | + $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 484 | 484 | } |
| 485 | 485 | $this->all_tracked[$id]['putinarchive'] = false; |
| 486 | 486 | |
@@ -499,19 +499,19 @@ discard block |
||
| 499 | 499 | $latitude = $globalCenterLatitude; |
| 500 | 500 | $longitude = $globalCenterLongitude; |
| 501 | 501 | } |
| 502 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 502 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 503 | 503 | } else { |
| 504 | 504 | $latitude = $this->source_location[$source]['latitude']; |
| 505 | 505 | $longitude = $this->source_location[$source]['longitude']; |
| 506 | 506 | } |
| 507 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 507 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 508 | 508 | //$stats_heading = $stats_heading%22.5; |
| 509 | 509 | $stats_heading = round($stats_heading/22.5); |
| 510 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 510 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 511 | 511 | $current_date = date('Y-m-d'); |
| 512 | 512 | if ($stats_heading == 16) $stats_heading = 0; |
| 513 | 513 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 514 | - for ($i=0;$i<=15;$i++) { |
|
| 514 | + for ($i = 0; $i <= 15; $i++) { |
|
| 515 | 515 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 516 | 516 | } |
| 517 | 517 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -526,9 +526,9 @@ discard block |
||
| 526 | 526 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 527 | 527 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 528 | 528 | end($this->stats[$current_date][$source]['hist']); |
| 529 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 529 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 530 | 530 | } else $mini = 0; |
| 531 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 531 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 532 | 532 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 533 | 533 | } |
| 534 | 534 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -540,7 +540,7 @@ discard block |
||
| 540 | 540 | |
| 541 | 541 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 542 | 542 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 543 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 543 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 544 | 544 | //$this->del(); |
| 545 | 545 | |
| 546 | 546 | |
@@ -117,31 +117,31 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | private function make_latf($temp) { // unsigned long |
| 119 | 119 | $flat = 0.0; // float |
| 120 | - $temp = $temp & 0x07FFFFFF; |
|
| 121 | - if ($temp & 0x04000000) { |
|
| 122 | - $temp = $temp ^ 0x07FFFFFF; |
|
| 120 | + $temp = $temp&0x07FFFFFF; |
|
| 121 | + if ($temp&0x04000000) { |
|
| 122 | + $temp = $temp^0x07FFFFFF; |
|
| 123 | 123 | $temp += 1; |
| 124 | - $flat = (float)($temp / (60.0 * 10000.0)); |
|
| 124 | + $flat = (float) ($temp/(60.0*10000.0)); |
|
| 125 | 125 | $flat *= -1.0; |
| 126 | - } else $flat = (float)($temp / (60.0 * 10000.0)); |
|
| 126 | + } else $flat = (float) ($temp/(60.0*10000.0)); |
|
| 127 | 127 | return $flat; // float |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | private function make_lonf($temp) { // unsigned long |
| 131 | 131 | $flon = 0.0; // float |
| 132 | - $temp = $temp & 0x0FFFFFFF; |
|
| 133 | - if ($temp & 0x08000000) { |
|
| 134 | - $temp = $temp ^ 0x0FFFFFFF; |
|
| 132 | + $temp = $temp&0x0FFFFFFF; |
|
| 133 | + if ($temp&0x08000000) { |
|
| 134 | + $temp = $temp^0x0FFFFFFF; |
|
| 135 | 135 | $temp += 1; |
| 136 | - $flon = (float)($temp / (60.0 * 10000.0)); |
|
| 136 | + $flon = (float) ($temp/(60.0*10000.0)); |
|
| 137 | 137 | $flon *= -1.0; |
| 138 | - } else $flon = (float)($temp / (60.0 * 10000.0)); |
|
| 138 | + } else $flon = (float) ($temp/(60.0*10000.0)); |
|
| 139 | 139 | return $flon; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | private function ascii_2_dec($chr) { |
| 143 | - $dec=ord($chr);//get decimal ascii code |
|
| 144 | - $hex=dechex($dec);//convert decimal to hex |
|
| 143 | + $dec = ord($chr); //get decimal ascii code |
|
| 144 | + $hex = dechex($dec); //convert decimal to hex |
|
| 145 | 145 | return ($dec); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -160,15 +160,15 @@ discard block |
||
| 160 | 160 | //only process in the following range: 48-87, 96-119 |
| 161 | 161 | if ($ascii < 48) { } |
| 162 | 162 | else { |
| 163 | - if($ascii>119) { } |
|
| 163 | + if ($ascii > 119) { } |
|
| 164 | 164 | else { |
| 165 | - if ($ascii>87 && $ascii<96) ; |
|
| 165 | + if ($ascii > 87 && $ascii < 96); |
|
| 166 | 166 | else { |
| 167 | - $ascii=$ascii+40; |
|
| 168 | - if ($ascii>128){ |
|
| 169 | - $ascii=$ascii+32; |
|
| 167 | + $ascii = $ascii + 40; |
|
| 168 | + if ($ascii > 128) { |
|
| 169 | + $ascii = $ascii + 32; |
|
| 170 | 170 | } else { |
| 171 | - $ascii=$ascii+40; |
|
| 171 | + $ascii = $ascii + 40; |
|
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | private function dec_2_6bit($dec) { |
| 180 | - $bin=decbin($dec); |
|
| 180 | + $bin = decbin($dec); |
|
| 181 | 181 | return(substr($bin, -6)); |
| 182 | 182 | } |
| 183 | 183 | |
@@ -195,11 +195,11 @@ discard block |
||
| 195 | 195 | ); |
| 196 | 196 | // " |
| 197 | 197 | $rv = ''; |
| 198 | - if ($_size % 6 == 0) { |
|
| 199 | - $len = $_size / 6; |
|
| 200 | - for ($i=0; $i<$len; $i++) { |
|
| 201 | - $offset = $i * 6; |
|
| 202 | - $rv .= $ais_chars[ bindec(substr($_str,$_start + $offset,6)) ]; |
|
| 198 | + if ($_size%6 == 0) { |
|
| 199 | + $len = $_size/6; |
|
| 200 | + for ($i = 0; $i < $len; $i++) { |
|
| 201 | + $offset = $i*6; |
|
| 202 | + $rv .= $ais_chars[bindec(substr($_str, $_start + $offset, 6))]; |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | return $rv; |
@@ -226,93 +226,93 @@ discard block |
||
| 226 | 226 | $ro->eta_hour = ''; |
| 227 | 227 | $ro->eta_minute = ''; |
| 228 | 228 | $ro->ts = time(); |
| 229 | - $ro->id = bindec(substr($_aisdata,0,6)); |
|
| 230 | - $ro->mmsi = bindec(substr($_aisdata,8,30)); |
|
| 229 | + $ro->id = bindec(substr($_aisdata, 0, 6)); |
|
| 230 | + $ro->mmsi = bindec(substr($_aisdata, 8, 30)); |
|
| 231 | 231 | if ($ro->id >= 1 && $ro->id <= 3) { |
| 232 | - $ro->cog = bindec(substr($_aisdata,116,12))/10; |
|
| 233 | - $ro->sog = bindec(substr($_aisdata,50,10))/10; |
|
| 234 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28))); |
|
| 235 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27))); |
|
| 232 | + $ro->cog = bindec(substr($_aisdata, 116, 12))/10; |
|
| 233 | + $ro->sog = bindec(substr($_aisdata, 50, 10))/10; |
|
| 234 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28))); |
|
| 235 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27))); |
|
| 236 | 236 | $ro->cls = 1; // class A |
| 237 | 237 | } else if ($ro->id == 4) { |
| 238 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,79,28))); |
|
| 239 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,107,27))); |
|
| 238 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 79, 28))); |
|
| 239 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 107, 27))); |
|
| 240 | 240 | $ro->cls = 1; // class A |
| 241 | 241 | } else if ($ro->id == 5) { |
| 242 | - $ro->imo = bindec(substr($_aisdata,40,30)); |
|
| 243 | - $ro->callsign = $this->binchar($_aisdata,70,42); |
|
| 244 | - $ro->name = $this->binchar($_aisdata,112,120); |
|
| 245 | - $ro->typeid = bindec(substr($_aisdata,232,8)); |
|
| 242 | + $ro->imo = bindec(substr($_aisdata, 40, 30)); |
|
| 243 | + $ro->callsign = $this->binchar($_aisdata, 70, 42); |
|
| 244 | + $ro->name = $this->binchar($_aisdata, 112, 120); |
|
| 245 | + $ro->typeid = bindec(substr($_aisdata, 232, 8)); |
|
| 246 | 246 | $ro->type = $this->getShipType($ro->typeid); |
| 247 | 247 | //$ro->to_bow = bindec(substr($_aisdata,240,9)); |
| 248 | 248 | //$ro->to_stern = bindec(substr($_aisdata,249,9)); |
| 249 | 249 | //$ro->to_port = bindec(substr($_aisdata,258,6)); |
| 250 | 250 | //$ro->to_starboard = bindec(substr($_aisdata,264,6)); |
| 251 | - $ro->eta_month = bindec(substr($_aisdata,274,4)); |
|
| 252 | - $ro->eta_day = bindec(substr($_aisdata,278,5)); |
|
| 253 | - $ro->eta_hour = bindec(substr($_aisdata,283,5)); |
|
| 254 | - $ro->eta_minute = bindec(substr($_aisdata,288,6)); |
|
| 251 | + $ro->eta_month = bindec(substr($_aisdata, 274, 4)); |
|
| 252 | + $ro->eta_day = bindec(substr($_aisdata, 278, 5)); |
|
| 253 | + $ro->eta_hour = bindec(substr($_aisdata, 283, 5)); |
|
| 254 | + $ro->eta_minute = bindec(substr($_aisdata, 288, 6)); |
|
| 255 | 255 | //$ro->draught = bindec(substr($_aisdata,294,8)); |
| 256 | - $ro->destination = $this->binchar($_aisdata,302,120); |
|
| 256 | + $ro->destination = $this->binchar($_aisdata, 302, 120); |
|
| 257 | 257 | $ro->cls = 1; // class A |
| 258 | 258 | } else if ($ro->id == 9) { |
| 259 | 259 | // Search and Rescue aircraft position report |
| 260 | 260 | } else if ($ro->id == 18) { |
| 261 | - $ro->cog = bindec(substr($_aisdata,112,12))/10; |
|
| 262 | - $ro->sog = bindec(substr($_aisdata,46,10))/10; |
|
| 263 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28))); |
|
| 264 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27))); |
|
| 265 | - $ro->heading = bindec(substr($_aisdata,124,9)); |
|
| 261 | + $ro->cog = bindec(substr($_aisdata, 112, 12))/10; |
|
| 262 | + $ro->sog = bindec(substr($_aisdata, 46, 10))/10; |
|
| 263 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 57, 28))); |
|
| 264 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 85, 27))); |
|
| 265 | + $ro->heading = bindec(substr($_aisdata, 124, 9)); |
|
| 266 | 266 | if ($ro->heading == 511) $ro->heading = ''; |
| 267 | 267 | $ro->cls = 2; // class B |
| 268 | 268 | } else if ($ro->id == 19) { |
| 269 | - $ro->cog = bindec(substr($_aisdata,112,12))/10; |
|
| 270 | - $ro->sog = bindec(substr($_aisdata,46,10))/10; |
|
| 271 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28))); |
|
| 272 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27))); |
|
| 273 | - $ro->name = $this->binchar($_aisdata,143,120); |
|
| 269 | + $ro->cog = bindec(substr($_aisdata, 112, 12))/10; |
|
| 270 | + $ro->sog = bindec(substr($_aisdata, 46, 10))/10; |
|
| 271 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28))); |
|
| 272 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27))); |
|
| 273 | + $ro->name = $this->binchar($_aisdata, 143, 120); |
|
| 274 | 274 | $ro->cls = 2; // class B |
| 275 | - $ro->heading = bindec(substr($_aisdata,124,9)); |
|
| 275 | + $ro->heading = bindec(substr($_aisdata, 124, 9)); |
|
| 276 | 276 | if ($ro->heading == 511) $ro->heading = ''; |
| 277 | - $ro->typeid = bindec(substr($_aisdata,263,8)); |
|
| 277 | + $ro->typeid = bindec(substr($_aisdata, 263, 8)); |
|
| 278 | 278 | $ro->type = $this->getShipType($ro->typeid); |
| 279 | 279 | //$ro->to_bow = bindec(substr($_aisdata,271,9)); |
| 280 | 280 | //$ro->to_stern = bindec(substr($_aisdata,280,9)); |
| 281 | 281 | //$ro->to_port = bindec(substr($_aisdata,289,6)); |
| 282 | 282 | //$ro->to_starboard = bindec(substr($_aisdata,295,6)); |
| 283 | 283 | } else if ($ro->id == 21) { |
| 284 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,164,28))); |
|
| 285 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,192,27))); |
|
| 286 | - $ro->name = $this->binchar($_aisdata,43,120); |
|
| 284 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 164, 28))); |
|
| 285 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 192, 27))); |
|
| 286 | + $ro->name = $this->binchar($_aisdata, 43, 120); |
|
| 287 | 287 | //$ro->to_bow = bindec(substr($_aisdata,219,9)); |
| 288 | 288 | //$ro->to_stern = bindec(substr($_aisdata,228,9)); |
| 289 | 289 | //$ro->to_port = bindec(substr($_aisdata,237,6)); |
| 290 | 290 | //$ro->to_starboard = bindec(substr($_aisdata,243,6)); |
| 291 | 291 | $ro->cls = 2; // class B |
| 292 | 292 | } else if ($ro->id == 24) { |
| 293 | - $pn = bindec(substr($_aisdata,38,2)); |
|
| 293 | + $pn = bindec(substr($_aisdata, 38, 2)); |
|
| 294 | 294 | if ($pn == 0) { |
| 295 | - $ro->name = $this->binchar($_aisdata,40,120); |
|
| 295 | + $ro->name = $this->binchar($_aisdata, 40, 120); |
|
| 296 | 296 | } |
| 297 | - $ro->typeid = bindec(substr($_aisdata,40,8)); |
|
| 297 | + $ro->typeid = bindec(substr($_aisdata, 40, 8)); |
|
| 298 | 298 | $ro->type = $this->getShipType($ro->typeid); |
| 299 | - $ro->callsign = $this->binchar($_aisdata,90,42); |
|
| 299 | + $ro->callsign = $this->binchar($_aisdata, 90, 42); |
|
| 300 | 300 | //$ro->to_bow = bindec(substr($_aisdata,132,9)); |
| 301 | 301 | //$ro->to_stern = bindec(substr($_aisdata,141,9)); |
| 302 | 302 | //$ro->to_port = bindec(substr($_aisdata,150,6)); |
| 303 | 303 | //$ro->to_starboard = bindec(substr($_aisdata,156,6)); |
| 304 | 304 | $ro->cls = 2; // class B |
| 305 | 305 | } else if ($ro->id == 27) { |
| 306 | - $ro->cog = bindec(substr($_aisdata,85,9)); |
|
| 306 | + $ro->cog = bindec(substr($_aisdata, 85, 9)); |
|
| 307 | 307 | if ($ro->cog == 511) $ro->cog = 0.0; |
| 308 | - $ro->sog = bindec(substr($_aisdata,79,6)); |
|
| 308 | + $ro->sog = bindec(substr($_aisdata, 79, 6)); |
|
| 309 | 309 | if ($ro->sog == 63) $ro->sog = 0.0; |
| 310 | - $ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10); |
|
| 311 | - $ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10); |
|
| 310 | + $ro->lon = $this->make_lonf(bindec(substr($_aisdata, 44, 18))*10); |
|
| 311 | + $ro->lat = $this->make_latf(bindec(substr($_aisdata, 62, 17))*10); |
|
| 312 | 312 | $ro->cls = 1; // class A |
| 313 | 313 | |
| 314 | 314 | } |
| 315 | - $ro->statusid = bindec(substr($_aisdata,38,4)); |
|
| 315 | + $ro->statusid = bindec(substr($_aisdata, 38, 4)); |
|
| 316 | 316 | $ro->status = $this->getStatus($ro->statusid); |
| 317 | 317 | return $ro; |
| 318 | 318 | } |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | public function getShipTypeID($type) { |
| 362 | - $typeid = array_search($type,$this->shiptype); |
|
| 362 | + $typeid = array_search($type, $this->shiptype); |
|
| 363 | 363 | if ($typeid !== FALSE) return $typeid; |
| 364 | 364 | else return ''; |
| 365 | 365 | } |
@@ -367,14 +367,14 @@ discard block |
||
| 367 | 367 | public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) { |
| 368 | 368 | global $port; // tcpip port... |
| 369 | 369 | static $debug_counter = 0; |
| 370 | - $aisdata168='';//six bit array of ascii characters |
|
| 370 | + $aisdata168 = ''; //six bit array of ascii characters |
|
| 371 | 371 | $ais_nmea_array = str_split($_itu); // convert to an array |
| 372 | 372 | foreach ($ais_nmea_array as $value) { |
| 373 | 373 | $dec = $this->ascii_2_dec($value); |
| 374 | 374 | $bit8 = $this->asciidec_2_8bit($dec); |
| 375 | 375 | $bit6 = $this->dec_2_6bit($bit8); |
| 376 | 376 | //echo $value ."-" .$bit6 .""; |
| 377 | - $aisdata168 .=$bit6; |
|
| 377 | + $aisdata168 .= $bit6; |
|
| 378 | 378 | } |
| 379 | 379 | //echo $aisdata168 . "<br/>"; |
| 380 | 380 | //return $this->decode_ais($aisdata168, $aux); |
@@ -397,24 +397,24 @@ discard block |
||
| 397 | 397 | // calculate checksum after ! till * |
| 398 | 398 | // assume 1st ! is valid |
| 399 | 399 | // find * ensure that it is at correct position |
| 400 | - $end = strrpos ( $rawdata , '*' ); |
|
| 400 | + $end = strrpos($rawdata, '*'); |
|
| 401 | 401 | if ($end === FALSE) return -1; // check for NULLS!!! |
| 402 | - $cs = substr( $rawdata, $end + 1 ); |
|
| 403 | - if ( strlen($cs) != 2 ) return -1; // correct cs length |
|
| 404 | - $dcs = (int)hexdec( $cs ); |
|
| 405 | - for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum |
|
| 406 | - if ( $chksum == $dcs ) { // NMEA checksum pass |
|
| 402 | + $cs = substr($rawdata, $end + 1); |
|
| 403 | + if (strlen($cs) != 2) return -1; // correct cs length |
|
| 404 | + $dcs = (int) hexdec($cs); |
|
| 405 | + for ($alias = 1; $alias < $end; $alias++) $chksum ^= ord($rawdata[$alias]); // perform XOR for NMEA checksum |
|
| 406 | + if ($chksum == $dcs) { // NMEA checksum pass |
|
| 407 | 407 | $pcs = explode(',', $rawdata); |
| 408 | 408 | // !AI??? identifier |
| 409 | 409 | if (!isset($pcs[1])) { |
| 410 | 410 | echo "ERROR,INVALID_DATA ".time()." $rawdata\n"; |
| 411 | 411 | return -1; |
| 412 | 412 | } |
| 413 | - $num_seq = (int)$pcs[1]; // number of sequences |
|
| 414 | - $seq = (int)$pcs[2]; // get sequence |
|
| 413 | + $num_seq = (int) $pcs[1]; // number of sequences |
|
| 414 | + $seq = (int) $pcs[2]; // get sequence |
|
| 415 | 415 | // get msg sequence id |
| 416 | 416 | if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1 |
| 417 | - else $msg_sid = (int)$pcs[3]; // multipart message |
|
| 417 | + else $msg_sid = (int) $pcs[3]; // multipart message |
|
| 418 | 418 | $ais_ch = $pcs[4]; // get AIS channel |
| 419 | 419 | // message sequence checking |
| 420 | 420 | if ($num_seq < 1 || $num_seq > 9) { |
@@ -447,7 +447,7 @@ discard block |
||
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | 449 | $itu = $itu.$pcs[5]; // get itu message |
| 450 | - $filler += (int)$pcs[6][0]; // get filler |
|
| 450 | + $filler += (int) $pcs[6][0]; // get filler |
|
| 451 | 451 | if ($num_seq == 1 // valid single message |
| 452 | 452 | || $num_seq == $pseq // valid multi-part message |
| 453 | 453 | ) { |
@@ -469,13 +469,13 @@ discard block |
||
| 469 | 469 | $cbuf = $cbuf.$ibuf; |
| 470 | 470 | $last_pos = 0; |
| 471 | 471 | $result = new stdClass(); |
| 472 | - while ( ($start = strpos($cbuf,"VDM",$last_pos)) !== FALSE) { |
|
| 472 | + while (($start = strpos($cbuf, "VDM", $last_pos)) !== FALSE) { |
|
| 473 | 473 | //while ( ($start = strpos($cbuf,"!AI",$last_pos)) !== FALSE) { |
| 474 | 474 | //DEBUG echo $cbuf; |
| 475 | - if ( ($end = strpos($cbuf,"\r\n", $start)) !== FALSE) { //TBD need to trim? |
|
| 475 | + if (($end = strpos($cbuf, "\r\n", $start)) !== FALSE) { //TBD need to trim? |
|
| 476 | 476 | $tst = substr($cbuf, $start - 3, ($end - $start + 3)); |
| 477 | 477 | //DEBUG echo "[$start $end $tst]\n"; |
| 478 | - $result = $this->process_ais_raw( $tst, "" ); |
|
| 478 | + $result = $this->process_ais_raw($tst, ""); |
|
| 479 | 479 | $last_pos = $end + 1; |
| 480 | 480 | } else break; |
| 481 | 481 | } |
@@ -487,41 +487,41 @@ discard block |
||
| 487 | 487 | // incoming data from serial or IP comms |
| 488 | 488 | public function process_ais_line($cbuf) { |
| 489 | 489 | $result = new stdClass(); |
| 490 | - $start = strpos($cbuf,"VDM"); |
|
| 490 | + $start = strpos($cbuf, "VDM"); |
|
| 491 | 491 | $tst = substr($cbuf, $start - 3); |
| 492 | - $result = $this->process_ais_raw( $tst, "" ); |
|
| 492 | + $result = $this->process_ais_raw($tst, ""); |
|
| 493 | 493 | return $result; |
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | /* AIS Encoding |
| 497 | 497 | */ |
| 498 | - private function mk_ais_lat( $lat ) { |
|
| 498 | + private function mk_ais_lat($lat) { |
|
| 499 | 499 | //$lat = 1.2569; |
| 500 | - if ($lat<0.0) { |
|
| 500 | + if ($lat < 0.0) { |
|
| 501 | 501 | $lat = -$lat; |
| 502 | - $neg=true; |
|
| 503 | - } else $neg=false; |
|
| 502 | + $neg = true; |
|
| 503 | + } else $neg = false; |
|
| 504 | 504 | $latd = 0x00000000; |
| 505 | - $latd = intval ($lat * 600000.0); |
|
| 506 | - if ($neg==true) { |
|
| 505 | + $latd = intval($lat*600000.0); |
|
| 506 | + if ($neg == true) { |
|
| 507 | 507 | $latd = ~$latd; |
| 508 | - $latd+=1; |
|
| 508 | + $latd += 1; |
|
| 509 | 509 | $latd &= 0x07FFFFFF; |
| 510 | 510 | } |
| 511 | 511 | return $latd; |
| 512 | 512 | } |
| 513 | 513 | |
| 514 | - private function mk_ais_lon( $lon ) { |
|
| 514 | + private function mk_ais_lon($lon) { |
|
| 515 | 515 | //$lon = 103.851; |
| 516 | - if ($lon<0.0) { |
|
| 516 | + if ($lon < 0.0) { |
|
| 517 | 517 | $lon = -$lon; |
| 518 | - $neg=true; |
|
| 519 | - } else $neg=false; |
|
| 518 | + $neg = true; |
|
| 519 | + } else $neg = false; |
|
| 520 | 520 | $lond = 0x00000000; |
| 521 | - $lond = intval ($lon * 600000.0); |
|
| 522 | - if ($neg==true) { |
|
| 521 | + $lond = intval($lon*600000.0); |
|
| 522 | + if ($neg == true) { |
|
| 523 | 523 | $lond = ~$lond; |
| 524 | - $lond+=1; |
|
| 524 | + $lond += 1; |
|
| 525 | 525 | $lond &= 0x0FFFFFFF; |
| 526 | 526 | } |
| 527 | 527 | return $lond; |
@@ -529,8 +529,8 @@ discard block |
||
| 529 | 529 | |
| 530 | 530 | private function char2bin($name, $max_len) { |
| 531 | 531 | $len = strlen($name); |
| 532 | - if ($len > $max_len) $name = substr($name,0,$max_len); |
|
| 533 | - if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6); |
|
| 532 | + if ($len > $max_len) $name = substr($name, 0, $max_len); |
|
| 533 | + if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len)*6); |
|
| 534 | 534 | else $pad = ''; |
| 535 | 535 | $rv = ''; |
| 536 | 536 | $ais_chars = array( |
@@ -547,26 +547,26 @@ discard block |
||
| 547 | 547 | if ($_a) foreach ($_a as $_1) { |
| 548 | 548 | if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1]; |
| 549 | 549 | else $dec = 0; |
| 550 | - $bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT); |
|
| 550 | + $bin = str_pad(decbin($dec), 6, '0', STR_PAD_LEFT); |
|
| 551 | 551 | $rv .= $bin; |
| 552 | 552 | //echo "$_1 $dec ($bin)<br/>"; |
| 553 | 553 | } |
| 554 | 554 | return $rv.$pad; |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | - private function mk_ais($_enc, $_part=1,$_total=1,$_seq='',$_ch='A') { |
|
| 557 | + private function mk_ais($_enc, $_part = 1, $_total = 1, $_seq = '', $_ch = 'A') { |
|
| 558 | 558 | $len_bit = strlen($_enc); |
| 559 | - $rem6 = $len_bit % 6; |
|
| 559 | + $rem6 = $len_bit%6; |
|
| 560 | 560 | $pad6_len = 0; |
| 561 | 561 | if ($rem6) $pad6_len = 6 - $rem6; |
| 562 | 562 | //echo $pad6_len.'<br>'; |
| 563 | 563 | $_enc .= str_repeat("0", $pad6_len); // pad the text... |
| 564 | - $len_enc = strlen($_enc) / 6; |
|
| 564 | + $len_enc = strlen($_enc)/6; |
|
| 565 | 565 | //echo $_enc.' '.$len_enc.'<br/>'; |
| 566 | 566 | $itu = ''; |
| 567 | - for ($i=0; $i<$len_enc; $i++) { |
|
| 568 | - $offset = $i * 6; |
|
| 569 | - $dec = bindec(substr($_enc,$offset,6)); |
|
| 567 | + for ($i = 0; $i < $len_enc; $i++) { |
|
| 568 | + $offset = $i*6; |
|
| 569 | + $dec = bindec(substr($_enc, $offset, 6)); |
|
| 570 | 570 | if ($dec < 40) $dec += 48; |
| 571 | 571 | else $dec += 56; |
| 572 | 572 | //echo chr($dec)." $dec<br/>"; |
@@ -576,15 +576,15 @@ discard block |
||
| 576 | 576 | $chksum = 0; |
| 577 | 577 | $itu = "AIVDM,$_part,$_total,$_seq,$_ch,".$itu.",0"; |
| 578 | 578 | $len_itu = strlen($itu); |
| 579 | - for ($i=0; $i<$len_itu; $i++) { |
|
| 580 | - $chksum ^= ord( $itu[$i] ); |
|
| 579 | + for ($i = 0; $i < $len_itu; $i++) { |
|
| 580 | + $chksum ^= ord($itu[$i]); |
|
| 581 | 581 | } |
| 582 | - $hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); |
|
| 583 | - $lsb = $chksum & 0x0F; |
|
| 584 | - if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb]; |
|
| 582 | + $hex_arr = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'); |
|
| 583 | + $lsb = $chksum&0x0F; |
|
| 584 | + if ($lsb >= 0 && $lsb <= 15) $lsbc = $hex_arr[$lsb]; |
|
| 585 | 585 | else $lsbc = '0'; |
| 586 | - $msb = (($chksum & 0xF0) >> 4) & 0x0F; |
|
| 587 | - if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb]; |
|
| 586 | + $msb = (($chksum&0xF0) >> 4)&0x0F; |
|
| 587 | + if ($msb >= 0 && $msb <= 15) $msbc = $hex_arr[$msb]; |
|
| 588 | 588 | else $msbc = '0'; |
| 589 | 589 | $itu = '!'.$itu."*{$msbc}{$lsbc}\r\n"; |
| 590 | 590 | return $itu; |
@@ -610,14 +610,14 @@ discard block |
||
| 610 | 610 | |
| 611 | 611 | public function mmsitype($mmsi) { |
| 612 | 612 | if (strlen($mmsi) == 9) { |
| 613 | - if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS'; |
|
| 614 | - elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device'; |
|
| 615 | - elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)'; |
|
| 616 | - elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft'; |
|
| 617 | - elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship'; |
|
| 618 | - elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation'; |
|
| 619 | - elseif (substr($mmsi,0,2) == '00') return 'Coastal stations'; |
|
| 620 | - elseif (substr($mmsi,0,1) == '0') return 'Group of ships'; |
|
| 613 | + if (substr($mmsi, 0, 3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS'; |
|
| 614 | + elseif (substr($mmsi, 0, 3) == '972') return 'MOB (Man Overboard) device'; |
|
| 615 | + elseif (substr($mmsi, 0, 3) == '970') return 'AIS SART (Search and Rescue Transmitter)'; |
|
| 616 | + elseif (substr($mmsi, 0, 3) == '111') return 'SAR (Search and Rescue) aircraft'; |
|
| 617 | + elseif (substr($mmsi, 0, 2) == '98') return 'Auxiliary craft associated with a parent ship'; |
|
| 618 | + elseif (substr($mmsi, 0, 2) == '99') return 'Aids to Navigation'; |
|
| 619 | + elseif (substr($mmsi, 0, 2) == '00') return 'Coastal stations'; |
|
| 620 | + elseif (substr($mmsi, 0, 1) == '0') return 'Group of ships'; |
|
| 621 | 621 | else return 'Ship'; |
| 622 | 622 | } |
| 623 | 623 | |
@@ -627,19 +627,19 @@ discard block |
||
| 627 | 627 | public function parse_line($buffer) { |
| 628 | 628 | global $globalDebug; |
| 629 | 629 | $result = array(); |
| 630 | - $start = strpos($buffer,"VDM"); |
|
| 630 | + $start = strpos($buffer, "VDM"); |
|
| 631 | 631 | $tst = substr($buffer, $start - 3); |
| 632 | - $data = $this->process_ais_raw( $tst, "" ); |
|
| 632 | + $data = $this->process_ais_raw($tst, ""); |
|
| 633 | 633 | if (!is_object($data)) { |
| 634 | 634 | //if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n"; |
| 635 | 635 | return array(); |
| 636 | 636 | } |
| 637 | 637 | if ($data->lon != 0) $result['longitude'] = $data->lon; |
| 638 | 638 | if ($data->lat != 0) $result['latitude'] = $data->lat; |
| 639 | - $result['ident'] = trim(str_replace('@','',$data->name)); |
|
| 639 | + $result['ident'] = trim(str_replace('@', '', $data->name)); |
|
| 640 | 640 | $result['timestamp'] = $data->ts; |
| 641 | 641 | $result['mmsi'] = $data->mmsi; |
| 642 | - if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi']; |
|
| 642 | + if (strlen($result['mmsi']) == 8 && substr($result['mmsi'], 0, 3) == '669') $result['mmsi'] = '3'.$result['mmsi']; |
|
| 643 | 643 | $result['mmsi_type'] = $this->mmsitype($result['mmsi']); |
| 644 | 644 | if ($data->sog != -1.0) $result['speed'] = $data->sog; |
| 645 | 645 | if ($data->heading !== '') $result['heading'] = $data->heading; |
@@ -649,16 +649,16 @@ discard block |
||
| 649 | 649 | if ($data->type !== '') $result['type'] = $data->type; |
| 650 | 650 | if ($data->typeid !== '') $result['typeid'] = $data->typeid; |
| 651 | 651 | if ($data->imo !== '') $result['imo'] = $data->imo; |
| 652 | - if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@','',$data->callsign)); |
|
| 652 | + if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@', '', $data->callsign)); |
|
| 653 | 653 | if (is_numeric($data->eta_month) && $data->eta_month != 0 && is_numeric($data->eta_day) && $data->eta_day != 0 && $data->eta_hour !== '' && $data->eta_minute !== '') { |
| 654 | - $eta_ts = strtotime(date('Y').'-'.sprintf("%02d",$data->eta_month).'-'.sprintf("%02d",$data->eta_day).' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00'); |
|
| 654 | + $eta_ts = strtotime(date('Y').'-'.sprintf("%02d", $data->eta_month).'-'.sprintf("%02d", $data->eta_day).' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00'); |
|
| 655 | 655 | if ($eta_ts != '') $result['eta_ts'] = $eta_ts; |
| 656 | 656 | } elseif (is_numeric($data->eta_hour) && is_numeric($data->eta_minute)) { |
| 657 | - $eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00'); |
|
| 657 | + $eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00'); |
|
| 658 | 658 | if ($eta_ts != '') $result['eta_ts'] = $eta_ts; |
| 659 | 659 | } |
| 660 | 660 | if ($data->destination != '') { |
| 661 | - $dest = trim(str_replace('@','',$data->destination)); |
|
| 661 | + $dest = trim(str_replace('@', '', $data->destination)); |
|
| 662 | 662 | if ($dest != '') $result['destination'] = $dest; |
| 663 | 663 | } |
| 664 | 664 | $result['all'] = (array) $data; |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | try { |
| 15 | 15 | $sth = $Connection->db->prepare($query); |
| 16 | 16 | $sth->execute(); |
| 17 | - } catch(PDOException $e) { |
|
| 17 | + } catch (PDOException $e) { |
|
| 18 | 18 | return "error : ".$e->getMessage()."\n"; |
| 19 | 19 | } |
| 20 | 20 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 21 | - $Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']); |
|
| 21 | + $Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | try { |
| 51 | 51 | $sth = $Connection->db->prepare($query); |
| 52 | 52 | $sth->execute(); |
| 53 | - } catch(PDOException $e) { |
|
| 53 | + } catch (PDOException $e) { |
|
| 54 | 54 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 55 | 55 | } |
| 56 | 56 | // Copy schedules data to routes table |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | try { |
| 61 | 61 | $sth = $Connection->db->prepare($query); |
| 62 | 62 | $sth->execute(); |
| 63 | - } catch(PDOException $e) { |
|
| 63 | + } catch (PDOException $e) { |
|
| 64 | 64 | return "error (delete schedule table) : ".$e->getMessage()."\n"; |
| 65 | 65 | } |
| 66 | 66 | // Add source column |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | try { |
| 69 | 69 | $sth = $Connection->db->prepare($query); |
| 70 | 70 | $sth->execute(); |
| 71 | - } catch(PDOException $e) { |
|
| 71 | + } catch (PDOException $e) { |
|
| 72 | 72 | return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
| 73 | 73 | } |
| 74 | 74 | // Delete unused column |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | try { |
| 77 | 77 | $sth = $Connection->db->prepare($query); |
| 78 | 78 | $sth->execute(); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
| 81 | 81 | } |
| 82 | 82 | // Add ModeS column |
@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | try { |
| 85 | 85 | $sth = $Connection->db->prepare($query); |
| 86 | 86 | $sth->execute(); |
| 87 | - } catch(PDOException $e) { |
|
| 87 | + } catch (PDOException $e) { |
|
| 88 | 88 | return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
| 89 | 89 | } |
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; |
| 91 | 91 | try { |
| 92 | 92 | $sth = $Connection->db->prepare($query); |
| 93 | 93 | $sth->execute(); |
| 94 | - } catch(PDOException $e) { |
|
| 94 | + } catch (PDOException $e) { |
|
| 95 | 95 | return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
| 96 | 96 | } |
| 97 | 97 | // Add auto_increment for aircraft_modes |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | try { |
| 100 | 100 | $sth = $Connection->db->prepare($query); |
| 101 | 101 | $sth->execute(); |
| 102 | - } catch(PDOException $e) { |
|
| 102 | + } catch (PDOException $e) { |
|
| 103 | 103 | return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
| 104 | 104 | } |
| 105 | 105 | $error = ''; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | try { |
| 111 | 111 | $sth = $Connection->db->prepare($query); |
| 112 | 112 | $sth->execute(); |
| 113 | - } catch(PDOException $e) { |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 115 | 115 | } |
| 116 | 116 | return $error; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | try { |
| 124 | 124 | $sth = $Connection->db->prepare($query); |
| 125 | 125 | $sth->execute(); |
| 126 | - } catch(PDOException $e) { |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 128 | 128 | } |
| 129 | 129 | $error = ''; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | try { |
| 135 | 135 | $sth = $Connection->db->prepare($query); |
| 136 | 136 | $sth->execute(); |
| 137 | - } catch(PDOException $e) { |
|
| 137 | + } catch (PDOException $e) { |
|
| 138 | 138 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 139 | 139 | } |
| 140 | 140 | return $error; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | try { |
| 148 | 148 | $sth = $Connection->db->prepare($query); |
| 149 | 149 | $sth->execute(); |
| 150 | - } catch(PDOException $e) { |
|
| 150 | + } catch (PDOException $e) { |
|
| 151 | 151 | return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
| 152 | 152 | } |
| 153 | 153 | // Add image_source_website column to spotter_image |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | try { |
| 156 | 156 | $sth = $Connection->db->prepare($query); |
| 157 | 157 | $sth->execute(); |
| 158 | - } catch(PDOException $e) { |
|
| 158 | + } catch (PDOException $e) { |
|
| 159 | 159 | return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
| 160 | 160 | } |
| 161 | 161 | $error = ''; |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | try { |
| 165 | 165 | $sth = $Connection->db->prepare($query); |
| 166 | 166 | $sth->execute(); |
| 167 | - } catch(PDOException $e) { |
|
| 167 | + } catch (PDOException $e) { |
|
| 168 | 168 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 169 | 169 | } |
| 170 | 170 | return $error; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | try { |
| 183 | 183 | $sth = $Connection->db->prepare($query); |
| 184 | 184 | $sth->execute(); |
| 185 | - } catch(PDOException $e) { |
|
| 185 | + } catch (PDOException $e) { |
|
| 186 | 186 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 187 | 187 | } |
| 188 | 188 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | try { |
| 197 | 197 | $sth = $Connection->db->prepare($query); |
| 198 | 198 | $sth->execute(); |
| 199 | - } catch(PDOException $e) { |
|
| 199 | + } catch (PDOException $e) { |
|
| 200 | 200 | return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Add aircraft_shadow column to aircraft |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | $sth = $Connection->db->prepare($query); |
| 206 | 206 | $sth->execute(); |
| 207 | - } catch(PDOException $e) { |
|
| 207 | + } catch (PDOException $e) { |
|
| 208 | 208 | return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
| 209 | 209 | } |
| 210 | 210 | // Add aircraft_shadow column to spotter_live |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | try { |
| 213 | 213 | $sth = $Connection->db->prepare($query); |
| 214 | 214 | $sth->execute(); |
| 215 | - } catch(PDOException $e) { |
|
| 215 | + } catch (PDOException $e) { |
|
| 216 | 216 | return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
| 217 | 217 | } |
| 218 | 218 | $error = ''; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | try { |
| 226 | 226 | $sth = $Connection->db->prepare($query); |
| 227 | 227 | $sth->execute(); |
| 228 | - } catch(PDOException $e) { |
|
| 228 | + } catch (PDOException $e) { |
|
| 229 | 229 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 230 | 230 | } |
| 231 | 231 | return $error; |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | |
| 234 | 234 | private static function update_from_6() { |
| 235 | 235 | $Connection = new Connection(); |
| 236 | - if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 236 | + if (!$Connection->indexExists('spotter_output', 'flightaware_id')) { |
|
| 237 | 237 | $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
| 238 | 238 | ALTER TABLE spotter_output ADD INDEX(date); |
| 239 | 239 | ALTER TABLE spotter_output ADD INDEX(ident); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | try { |
| 251 | 251 | $sth = $Connection->db->prepare($query); |
| 252 | 252 | $sth->execute(); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | return "error (add some indexes) : ".$e->getMessage()."\n"; |
| 255 | 255 | } |
| 256 | 256 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | try { |
| 266 | 266 | $sth = $Connection->db->prepare($query); |
| 267 | 267 | $sth->execute(); |
| 268 | - } catch(PDOException $e) { |
|
| 268 | + } catch (PDOException $e) { |
|
| 269 | 269 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 270 | 270 | } |
| 271 | 271 | return $error; |
@@ -274,12 +274,12 @@ discard block |
||
| 274 | 274 | private static function update_from_7() { |
| 275 | 275 | global $globalDBname, $globalDBdriver; |
| 276 | 276 | $Connection = new Connection(); |
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 277 | + $query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 278 | 278 | ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;"; |
| 279 | 279 | try { |
| 280 | 280 | $sth = $Connection->db->prepare($query); |
| 281 | 281 | $sth->execute(); |
| 282 | - } catch(PDOException $e) { |
|
| 282 | + } catch (PDOException $e) { |
|
| 283 | 283 | return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 284 | 284 | } |
| 285 | 285 | if ($globalDBdriver == 'mysql') { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | try { |
| 288 | 288 | $sth = $Connection->db->prepare($query); |
| 289 | 289 | $sth->execute(); |
| 290 | - } catch(PDOException $e) { |
|
| 290 | + } catch (PDOException $e) { |
|
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 292 | 292 | } |
| 293 | 293 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -299,15 +299,15 @@ discard block |
||
| 299 | 299 | DROP TABLE spotter_archive; |
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; |
| 301 | 301 | } else { |
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 302 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | 303 | } |
| 304 | 304 | } else { |
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 305 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | 306 | } |
| 307 | 307 | try { |
| 308 | 308 | $sth = $Connection->db->prepare($query); |
| 309 | 309 | $sth->execute(); |
| 310 | - } catch(PDOException $e) { |
|
| 310 | + } catch (PDOException $e) { |
|
| 311 | 311 | return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
| 312 | 312 | } |
| 313 | 313 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | try { |
| 321 | 321 | $sth = $Connection->db->prepare($query); |
| 322 | 322 | $sth->execute(); |
| 323 | - } catch(PDOException $e) { |
|
| 323 | + } catch (PDOException $e) { |
|
| 324 | 324 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 325 | 325 | } |
| 326 | 326 | return $error; |
@@ -339,14 +339,14 @@ discard block |
||
| 339 | 339 | try { |
| 340 | 340 | $sth = $Connection->db->prepare($query); |
| 341 | 341 | $sth->execute(); |
| 342 | - } catch(PDOException $e) { |
|
| 342 | + } catch (PDOException $e) { |
|
| 343 | 343 | return "error (insert last_update values) : ".$e->getMessage()."\n"; |
| 344 | 344 | } |
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; |
| 346 | 346 | try { |
| 347 | 347 | $sth = $Connection->db->prepare($query); |
| 348 | 348 | $sth->execute(); |
| 349 | - } catch(PDOException $e) { |
|
| 349 | + } catch (PDOException $e) { |
|
| 350 | 350 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 351 | 351 | } |
| 352 | 352 | return $error; |
@@ -354,12 +354,12 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | private static function update_from_9() { |
| 356 | 356 | $Connection = new Connection(); |
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 357 | + $query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; |
| 359 | 359 | try { |
| 360 | 360 | $sth = $Connection->db->prepare($query); |
| 361 | 361 | $sth->execute(); |
| 362 | - } catch(PDOException $e) { |
|
| 362 | + } catch (PDOException $e) { |
|
| 363 | 363 | return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 364 | 364 | } |
| 365 | 365 | $error = ''; |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | try { |
| 372 | 372 | $sth = $Connection->db->prepare($query); |
| 373 | 373 | $sth->execute(); |
| 374 | - } catch(PDOException $e) { |
|
| 374 | + } catch (PDOException $e) { |
|
| 375 | 375 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 376 | 376 | } |
| 377 | 377 | return $error; |
@@ -379,11 +379,11 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | private static function update_from_10() { |
| 381 | 381 | $Connection = new Connection(); |
| 382 | - $query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 382 | + $query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 383 | 383 | try { |
| 384 | 384 | $sth = $Connection->db->prepare($query); |
| 385 | 385 | $sth->execute(); |
| 386 | - } catch(PDOException $e) { |
|
| 386 | + } catch (PDOException $e) { |
|
| 387 | 387 | return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
| 388 | 388 | } |
| 389 | 389 | $error = ''; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | try { |
| 402 | 402 | $sth = $Connection->db->prepare($query); |
| 403 | 403 | $sth->execute(); |
| 404 | - } catch(PDOException $e) { |
|
| 404 | + } catch (PDOException $e) { |
|
| 405 | 405 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 406 | 406 | } |
| 407 | 407 | return $error; |
@@ -410,18 +410,18 @@ discard block |
||
| 410 | 410 | private static function update_from_11() { |
| 411 | 411 | global $globalDBdriver, $globalDBname; |
| 412 | 412 | $Connection = new Connection(); |
| 413 | - $query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 413 | + $query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 414 | 414 | try { |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | 416 | $sth->execute(); |
| 417 | - } catch(PDOException $e) { |
|
| 417 | + } catch (PDOException $e) { |
|
| 418 | 418 | return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
| 419 | 419 | } |
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 420 | + $query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | 421 | try { |
| 422 | 422 | $sth = $Connection->db->prepare($query); |
| 423 | 423 | $sth->execute(); |
| 424 | - } catch(PDOException $e) { |
|
| 424 | + } catch (PDOException $e) { |
|
| 425 | 425 | return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
| 426 | 426 | } |
| 427 | 427 | if ($globalDBdriver == 'mysql') { |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | try { |
| 430 | 430 | $sth = $Connection->db->prepare($query); |
| 431 | 431 | $sth->execute(); |
| 432 | - } catch(PDOException $e) { |
|
| 432 | + } catch (PDOException $e) { |
|
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 434 | 434 | } |
| 435 | 435 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -441,15 +441,15 @@ discard block |
||
| 441 | 441 | DROP TABLE spotter_archive; |
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; |
| 443 | 443 | } else { |
| 444 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 444 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 445 | 445 | } |
| 446 | 446 | } else { |
| 447 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 447 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 448 | 448 | } |
| 449 | 449 | try { |
| 450 | 450 | $sth = $Connection->db->prepare($query); |
| 451 | 451 | $sth->execute(); |
| 452 | - } catch(PDOException $e) { |
|
| 452 | + } catch (PDOException $e) { |
|
| 453 | 453 | return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
| 454 | 454 | } |
| 455 | 455 | |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | try { |
| 460 | 460 | $sth = $Connection->db->prepare($query); |
| 461 | 461 | $sth->execute(); |
| 462 | - } catch(PDOException $e) { |
|
| 462 | + } catch (PDOException $e) { |
|
| 463 | 463 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 464 | 464 | } |
| 465 | 465 | return $error; |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | try { |
| 488 | 488 | $sth = $Connection->db->prepare($query); |
| 489 | 489 | $sth->execute(); |
| 490 | - } catch(PDOException $e) { |
|
| 490 | + } catch (PDOException $e) { |
|
| 491 | 491 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 492 | 492 | } |
| 493 | 493 | return $error; |
@@ -495,12 +495,12 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | private static function update_from_13() { |
| 497 | 497 | $Connection = new Connection(); |
| 498 | - if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) { |
|
| 499 | - $query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 498 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) { |
|
| 499 | + $query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 500 | 500 | try { |
| 501 | 501 | $sth = $Connection->db->prepare($query); |
| 502 | 502 | $sth->execute(); |
| 503 | - } catch(PDOException $e) { |
|
| 503 | + } catch (PDOException $e) { |
|
| 504 | 504 | return "error (update spotter_archive_output) : ".$e->getMessage()."\n"; |
| 505 | 505 | } |
| 506 | 506 | } |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | try { |
| 510 | 510 | $sth = $Connection->db->prepare($query); |
| 511 | 511 | $sth->execute(); |
| 512 | - } catch(PDOException $e) { |
|
| 512 | + } catch (PDOException $e) { |
|
| 513 | 513 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 514 | 514 | } |
| 515 | 515 | return $error; |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | try { |
| 528 | 528 | $sth = $Connection->db->prepare($query); |
| 529 | 529 | $sth->execute(); |
| 530 | - } catch(PDOException $e) { |
|
| 530 | + } catch (PDOException $e) { |
|
| 531 | 531 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 532 | 532 | } |
| 533 | 533 | return $error; |
@@ -538,11 +538,11 @@ discard block |
||
| 538 | 538 | $Connection = new Connection(); |
| 539 | 539 | $error = ''; |
| 540 | 540 | // Add tables |
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 541 | + $query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | 542 | try { |
| 543 | 543 | $sth = $Connection->db->prepare($query); |
| 544 | 544 | $sth->execute(); |
| 545 | - } catch(PDOException $e) { |
|
| 545 | + } catch (PDOException $e) { |
|
| 546 | 546 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 547 | } |
| 548 | 548 | if ($error != '') return $error; |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | try { |
| 551 | 551 | $sth = $Connection->db->prepare($query); |
| 552 | 552 | $sth->execute(); |
| 553 | - } catch(PDOException $e) { |
|
| 553 | + } catch (PDOException $e) { |
|
| 554 | 554 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 555 | 555 | } |
| 556 | 556 | return $error; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | try { |
| 572 | 572 | $sth = $Connection->db->prepare($query); |
| 573 | 573 | $sth->execute(); |
| 574 | - } catch(PDOException $e) { |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 576 | 576 | } |
| 577 | 577 | return $error; |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | try { |
| 590 | 590 | $sth = $Connection->db->prepare($query); |
| 591 | 591 | $sth->execute(); |
| 592 | - } catch(PDOException $e) { |
|
| 592 | + } catch (PDOException $e) { |
|
| 593 | 593 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 594 | 594 | } |
| 595 | 595 | return $error; |
@@ -598,12 +598,12 @@ discard block |
||
| 598 | 598 | $Connection = new Connection(); |
| 599 | 599 | $error = ''; |
| 600 | 600 | // Modify stats_airport table |
| 601 | - if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 601 | + if (!$Connection->checkColumnName('stats_airport', 'airport_name')) { |
|
| 602 | 602 | $query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)"; |
| 603 | 603 | try { |
| 604 | 604 | $sth = $Connection->db->prepare($query); |
| 605 | 605 | $sth->execute(); |
| 606 | - } catch(PDOException $e) { |
|
| 606 | + } catch (PDOException $e) { |
|
| 607 | 607 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 608 | } |
| 609 | 609 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | try { |
| 613 | 613 | $sth = $Connection->db->prepare($query); |
| 614 | 614 | $sth->execute(); |
| 615 | - } catch(PDOException $e) { |
|
| 615 | + } catch (PDOException $e) { |
|
| 616 | 616 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 617 | 617 | } |
| 618 | 618 | return $error; |
@@ -629,73 +629,73 @@ discard block |
||
| 629 | 629 | try { |
| 630 | 630 | $sth = $Connection->db->prepare($query); |
| 631 | 631 | $sth->execute(); |
| 632 | - } catch(PDOException $e) { |
|
| 632 | + } catch (PDOException $e) { |
|
| 633 | 633 | return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
| 634 | 634 | } |
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; |
| 636 | 636 | try { |
| 637 | 637 | $sth = $Connection->db->prepare($query); |
| 638 | 638 | $sth->execute(); |
| 639 | - } catch(PDOException $e) { |
|
| 639 | + } catch (PDOException $e) { |
|
| 640 | 640 | return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
| 641 | 641 | } |
| 642 | - if (!$Connection->checkColumnName('spotter_archive','over_country')) { |
|
| 642 | + if (!$Connection->checkColumnName('spotter_archive', 'over_country')) { |
|
| 643 | 643 | // Add column over_country |
| 644 | 644 | $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 645 | 645 | try { |
| 646 | 646 | $sth = $Connection->db->prepare($query); |
| 647 | 647 | $sth->execute(); |
| 648 | - } catch(PDOException $e) { |
|
| 648 | + } catch (PDOException $e) { |
|
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | - if (!$Connection->checkColumnName('spotter_live','over_country')) { |
|
| 652 | + if (!$Connection->checkColumnName('spotter_live', 'over_country')) { |
|
| 653 | 653 | // Add column over_country |
| 654 | 654 | $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 655 | 655 | try { |
| 656 | 656 | $sth = $Connection->db->prepare($query); |
| 657 | 657 | $sth->execute(); |
| 658 | - } catch(PDOException $e) { |
|
| 658 | + } catch (PDOException $e) { |
|
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | - if (!$Connection->checkColumnName('spotter_output','source_name')) { |
|
| 662 | + if (!$Connection->checkColumnName('spotter_output', 'source_name')) { |
|
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 664 | 664 | $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 665 | 665 | try { |
| 666 | 666 | $sth = $Connection->db->prepare($query); |
| 667 | 667 | $sth->execute(); |
| 668 | - } catch(PDOException $e) { |
|
| 668 | + } catch (PDOException $e) { |
|
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | - if (!$Connection->checkColumnName('spotter_live','source_name')) { |
|
| 672 | + if (!$Connection->checkColumnName('spotter_live', 'source_name')) { |
|
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 674 | 674 | $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 675 | 675 | try { |
| 676 | 676 | $sth = $Connection->db->prepare($query); |
| 677 | 677 | $sth->execute(); |
| 678 | - } catch(PDOException $e) { |
|
| 678 | + } catch (PDOException $e) { |
|
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | - if (!$Connection->checkColumnName('spotter_archive_output','source_name')) { |
|
| 682 | + if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) { |
|
| 683 | 683 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 684 | 684 | $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 685 | 685 | try { |
| 686 | 686 | $sth = $Connection->db->prepare($query); |
| 687 | 687 | $sth->execute(); |
| 688 | - } catch(PDOException $e) { |
|
| 688 | + } catch (PDOException $e) { |
|
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 690 | 690 | } |
| 691 | 691 | } |
| 692 | - if (!$Connection->checkColumnName('spotter_archive','source_name')) { |
|
| 692 | + if (!$Connection->checkColumnName('spotter_archive', 'source_name')) { |
|
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 694 | 694 | $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
| 695 | 695 | try { |
| 696 | 696 | $sth = $Connection->db->prepare($query); |
| 697 | 697 | $sth->execute(); |
| 698 | - } catch(PDOException $e) { |
|
| 698 | + } catch (PDOException $e) { |
|
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | try { |
| 705 | 705 | $sth = $Connection->db->prepare($query); |
| 706 | 706 | $sth->execute(); |
| 707 | - } catch(PDOException $e) { |
|
| 707 | + } catch (PDOException $e) { |
|
| 708 | 708 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 709 | 709 | } |
| 710 | 710 | return $error; |
@@ -719,13 +719,13 @@ discard block |
||
| 719 | 719 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 721 | 721 | } |
| 722 | - if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
|
| 722 | + if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) { |
|
| 723 | 723 | // Add column over_country |
| 724 | 724 | $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
| 725 | 725 | try { |
| 726 | 726 | $sth = $Connection->db->prepare($query); |
| 727 | 727 | $sth->execute(); |
| 728 | - } catch(PDOException $e) { |
|
| 728 | + } catch (PDOException $e) { |
|
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 730 | } |
| 731 | 731 | } |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | try { |
| 742 | 742 | $sth = $Connection->db->prepare($query); |
| 743 | 743 | $sth->execute(); |
| 744 | - } catch(PDOException $e) { |
|
| 744 | + } catch (PDOException $e) { |
|
| 745 | 745 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 746 | 746 | } |
| 747 | 747 | return $error; |
@@ -750,13 +750,13 @@ discard block |
||
| 750 | 750 | private static function update_from_21() { |
| 751 | 751 | $Connection = new Connection(); |
| 752 | 752 | $error = ''; |
| 753 | - if (!$Connection->checkColumnName('stats_airport','stats_type')) { |
|
| 753 | + if (!$Connection->checkColumnName('stats_airport', 'stats_type')) { |
|
| 754 | 754 | // Rename type to stats_type |
| 755 | 755 | $query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);"; |
| 756 | 756 | try { |
| 757 | 757 | $sth = $Connection->db->prepare($query); |
| 758 | 758 | $sth->execute(); |
| 759 | - } catch(PDOException $e) { |
|
| 759 | + } catch (PDOException $e) { |
|
| 760 | 760 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 761 | } |
| 762 | 762 | if ($error != '') return $error; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | try { |
| 766 | 766 | $sth = $Connection->db->prepare($query); |
| 767 | 767 | $sth->execute(); |
| 768 | - } catch(PDOException $e) { |
|
| 768 | + } catch (PDOException $e) { |
|
| 769 | 769 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 770 | 770 | } |
| 771 | 771 | return $error; |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | try { |
| 789 | 789 | $sth = $Connection->db->prepare($query); |
| 790 | 790 | $sth->execute(); |
| 791 | - } catch(PDOException $e) { |
|
| 791 | + } catch (PDOException $e) { |
|
| 792 | 792 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 793 | 793 | } |
| 794 | 794 | return $error; |
@@ -814,17 +814,17 @@ discard block |
||
| 814 | 814 | try { |
| 815 | 815 | $sth = $Connection->db->prepare($query); |
| 816 | 816 | $sth->execute(); |
| 817 | - } catch(PDOException $e) { |
|
| 817 | + } catch (PDOException $e) { |
|
| 818 | 818 | return "error (create index on spotter_archive) : ".$e->getMessage()."\n"; |
| 819 | 819 | } |
| 820 | 820 | } |
| 821 | - if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
|
| 821 | + if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) { |
|
| 822 | 822 | // Add aircraft_manufacturer to stats_aircraft |
| 823 | 823 | $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
| 824 | 824 | try { |
| 825 | 825 | $sth = $Connection->db->prepare($query); |
| 826 | 826 | $sth->execute(); |
| 827 | - } catch(PDOException $e) { |
|
| 827 | + } catch (PDOException $e) { |
|
| 828 | 828 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 829 | 829 | } |
| 830 | 830 | } |
@@ -833,7 +833,7 @@ discard block |
||
| 833 | 833 | try { |
| 834 | 834 | $sth = $Connection->db->prepare($query); |
| 835 | 835 | $sth->execute(); |
| 836 | - } catch(PDOException $e) { |
|
| 836 | + } catch (PDOException $e) { |
|
| 837 | 837 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 838 | 838 | } |
| 839 | 839 | return $error; |
@@ -849,23 +849,23 @@ discard block |
||
| 849 | 849 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 850 | 850 | } |
| 851 | 851 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 852 | - if (!$Connection->checkColumnName('airlines','forsource')) { |
|
| 852 | + if (!$Connection->checkColumnName('airlines', 'forsource')) { |
|
| 853 | 853 | // Add forsource to airlines |
| 854 | 854 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
| 855 | 855 | try { |
| 856 | 856 | $sth = $Connection->db->prepare($query); |
| 857 | 857 | $sth->execute(); |
| 858 | - } catch(PDOException $e) { |
|
| 858 | + } catch (PDOException $e) { |
|
| 859 | 859 | return "error (add forsource column) : ".$e->getMessage()."\n"; |
| 860 | 860 | } |
| 861 | 861 | } |
| 862 | - if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) { |
|
| 862 | + if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) { |
|
| 863 | 863 | // Add forsource to airlines |
| 864 | 864 | $query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 865 | 865 | try { |
| 866 | 866 | $sth = $Connection->db->prepare($query); |
| 867 | 867 | $sth->execute(); |
| 868 | - } catch(PDOException $e) { |
|
| 868 | + } catch (PDOException $e) { |
|
| 869 | 869 | return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n"; |
| 870 | 870 | } |
| 871 | 871 | // Add unique key |
@@ -877,17 +877,17 @@ discard block |
||
| 877 | 877 | try { |
| 878 | 878 | $sth = $Connection->db->prepare($query); |
| 879 | 879 | $sth->execute(); |
| 880 | - } catch(PDOException $e) { |
|
| 880 | + } catch (PDOException $e) { |
|
| 881 | 881 | return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n"; |
| 882 | 882 | } |
| 883 | 883 | } |
| 884 | - if (!$Connection->checkColumnName('stats_airport','stats_airline')) { |
|
| 884 | + if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) { |
|
| 885 | 885 | // Add forsource to airlines |
| 886 | 886 | $query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 887 | 887 | try { |
| 888 | 888 | $sth = $Connection->db->prepare($query); |
| 889 | 889 | $sth->execute(); |
| 890 | - } catch(PDOException $e) { |
|
| 890 | + } catch (PDOException $e) { |
|
| 891 | 891 | return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n"; |
| 892 | 892 | } |
| 893 | 893 | // Add unique key |
@@ -899,17 +899,17 @@ discard block |
||
| 899 | 899 | try { |
| 900 | 900 | $sth = $Connection->db->prepare($query); |
| 901 | 901 | $sth->execute(); |
| 902 | - } catch(PDOException $e) { |
|
| 902 | + } catch (PDOException $e) { |
|
| 903 | 903 | return "error (add unique key in stats_airport) : ".$e->getMessage()."\n"; |
| 904 | 904 | } |
| 905 | 905 | } |
| 906 | - if (!$Connection->checkColumnName('stats_country','stats_airline')) { |
|
| 906 | + if (!$Connection->checkColumnName('stats_country', 'stats_airline')) { |
|
| 907 | 907 | // Add forsource to airlines |
| 908 | 908 | $query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 909 | 909 | try { |
| 910 | 910 | $sth = $Connection->db->prepare($query); |
| 911 | 911 | $sth->execute(); |
| 912 | - } catch(PDOException $e) { |
|
| 912 | + } catch (PDOException $e) { |
|
| 913 | 913 | return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n"; |
| 914 | 914 | } |
| 915 | 915 | // Add unique key |
@@ -921,36 +921,36 @@ discard block |
||
| 921 | 921 | try { |
| 922 | 922 | $sth = $Connection->db->prepare($query); |
| 923 | 923 | $sth->execute(); |
| 924 | - } catch(PDOException $e) { |
|
| 924 | + } catch (PDOException $e) { |
|
| 925 | 925 | return "error (add unique key in stats_airline) : ".$e->getMessage()."\n"; |
| 926 | 926 | } |
| 927 | 927 | } |
| 928 | - if (!$Connection->checkColumnName('stats_flight','stats_airline')) { |
|
| 928 | + if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) { |
|
| 929 | 929 | // Add forsource to airlines |
| 930 | 930 | $query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 931 | 931 | try { |
| 932 | 932 | $sth = $Connection->db->prepare($query); |
| 933 | 933 | $sth->execute(); |
| 934 | - } catch(PDOException $e) { |
|
| 934 | + } catch (PDOException $e) { |
|
| 935 | 935 | return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n"; |
| 936 | 936 | } |
| 937 | 937 | } |
| 938 | - if (!$Connection->checkColumnName('stats','stats_airline')) { |
|
| 938 | + if (!$Connection->checkColumnName('stats', 'stats_airline')) { |
|
| 939 | 939 | // Add forsource to airlines |
| 940 | 940 | $query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 941 | 941 | try { |
| 942 | 942 | $sth = $Connection->db->prepare($query); |
| 943 | 943 | $sth->execute(); |
| 944 | - } catch(PDOException $e) { |
|
| 944 | + } catch (PDOException $e) { |
|
| 945 | 945 | return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n"; |
| 946 | 946 | } |
| 947 | - if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) { |
|
| 947 | + if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) { |
|
| 948 | 948 | // Add unique key |
| 949 | 949 | $query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);"; |
| 950 | 950 | try { |
| 951 | 951 | $sth = $Connection->db->prepare($query); |
| 952 | 952 | $sth->execute(); |
| 953 | - } catch(PDOException $e) { |
|
| 953 | + } catch (PDOException $e) { |
|
| 954 | 954 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 955 | 955 | } |
| 956 | 956 | } else { |
@@ -963,18 +963,18 @@ discard block |
||
| 963 | 963 | try { |
| 964 | 964 | $sth = $Connection->db->prepare($query); |
| 965 | 965 | $sth->execute(); |
| 966 | - } catch(PDOException $e) { |
|
| 966 | + } catch (PDOException $e) { |
|
| 967 | 967 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 968 | 968 | } |
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | - if (!$Connection->checkColumnName('stats_registration','stats_airline')) { |
|
| 971 | + if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) { |
|
| 972 | 972 | // Add forsource to airlines |
| 973 | 973 | $query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 974 | 974 | try { |
| 975 | 975 | $sth = $Connection->db->prepare($query); |
| 976 | 976 | $sth->execute(); |
| 977 | - } catch(PDOException $e) { |
|
| 977 | + } catch (PDOException $e) { |
|
| 978 | 978 | return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n"; |
| 979 | 979 | } |
| 980 | 980 | // Add unique key |
@@ -986,17 +986,17 @@ discard block |
||
| 986 | 986 | try { |
| 987 | 987 | $sth = $Connection->db->prepare($query); |
| 988 | 988 | $sth->execute(); |
| 989 | - } catch(PDOException $e) { |
|
| 989 | + } catch (PDOException $e) { |
|
| 990 | 990 | return "error (add unique key in stats_registration) : ".$e->getMessage()."\n"; |
| 991 | 991 | } |
| 992 | 992 | } |
| 993 | - if (!$Connection->checkColumnName('stats_callsign','filter_name')) { |
|
| 993 | + if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) { |
|
| 994 | 994 | // Add forsource to airlines |
| 995 | 995 | $query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 996 | 996 | try { |
| 997 | 997 | $sth = $Connection->db->prepare($query); |
| 998 | 998 | $sth->execute(); |
| 999 | - } catch(PDOException $e) { |
|
| 999 | + } catch (PDOException $e) { |
|
| 1000 | 1000 | return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n"; |
| 1001 | 1001 | } |
| 1002 | 1002 | // Add unique key |
@@ -1008,17 +1008,17 @@ discard block |
||
| 1008 | 1008 | try { |
| 1009 | 1009 | $sth = $Connection->db->prepare($query); |
| 1010 | 1010 | $sth->execute(); |
| 1011 | - } catch(PDOException $e) { |
|
| 1011 | + } catch (PDOException $e) { |
|
| 1012 | 1012 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1013 | 1013 | } |
| 1014 | 1014 | } |
| 1015 | - if (!$Connection->checkColumnName('stats_airline','filter_name')) { |
|
| 1015 | + if (!$Connection->checkColumnName('stats_airline', 'filter_name')) { |
|
| 1016 | 1016 | // Add forsource to airlines |
| 1017 | 1017 | $query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1018 | 1018 | try { |
| 1019 | 1019 | $sth = $Connection->db->prepare($query); |
| 1020 | 1020 | $sth->execute(); |
| 1021 | - } catch(PDOException $e) { |
|
| 1021 | + } catch (PDOException $e) { |
|
| 1022 | 1022 | return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n"; |
| 1023 | 1023 | } |
| 1024 | 1024 | // Add unique key |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | try { |
| 1031 | 1031 | $sth = $Connection->db->prepare($query); |
| 1032 | 1032 | $sth->execute(); |
| 1033 | - } catch(PDOException $e) { |
|
| 1033 | + } catch (PDOException $e) { |
|
| 1034 | 1034 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1035 | 1035 | } |
| 1036 | 1036 | } |
@@ -1039,7 +1039,7 @@ discard block |
||
| 1039 | 1039 | try { |
| 1040 | 1040 | $sth = $Connection->db->prepare($query); |
| 1041 | 1041 | $sth->execute(); |
| 1042 | - } catch(PDOException $e) { |
|
| 1042 | + } catch (PDOException $e) { |
|
| 1043 | 1043 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1044 | 1044 | } |
| 1045 | 1045 | return $error; |
@@ -1049,13 +1049,13 @@ discard block |
||
| 1049 | 1049 | global $globalDBdriver; |
| 1050 | 1050 | $Connection = new Connection(); |
| 1051 | 1051 | $error = ''; |
| 1052 | - if (!$Connection->checkColumnName('stats_owner','stats_airline')) { |
|
| 1052 | + if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) { |
|
| 1053 | 1053 | // Add forsource to airlines |
| 1054 | 1054 | $query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1055 | 1055 | try { |
| 1056 | 1056 | $sth = $Connection->db->prepare($query); |
| 1057 | 1057 | $sth->execute(); |
| 1058 | - } catch(PDOException $e) { |
|
| 1058 | + } catch (PDOException $e) { |
|
| 1059 | 1059 | return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n"; |
| 1060 | 1060 | } |
| 1061 | 1061 | // Add unique key |
@@ -1067,17 +1067,17 @@ discard block |
||
| 1067 | 1067 | try { |
| 1068 | 1068 | $sth = $Connection->db->prepare($query); |
| 1069 | 1069 | $sth->execute(); |
| 1070 | - } catch(PDOException $e) { |
|
| 1070 | + } catch (PDOException $e) { |
|
| 1071 | 1071 | return "error (add unique key in stats_owner) : ".$e->getMessage()."\n"; |
| 1072 | 1072 | } |
| 1073 | 1073 | } |
| 1074 | - if (!$Connection->checkColumnName('stats_pilot','stats_airline')) { |
|
| 1074 | + if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) { |
|
| 1075 | 1075 | // Add forsource to airlines |
| 1076 | 1076 | $query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1077 | 1077 | try { |
| 1078 | 1078 | $sth = $Connection->db->prepare($query); |
| 1079 | 1079 | $sth->execute(); |
| 1080 | - } catch(PDOException $e) { |
|
| 1080 | + } catch (PDOException $e) { |
|
| 1081 | 1081 | return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1082 | 1082 | } |
| 1083 | 1083 | // Add unique key |
@@ -1089,7 +1089,7 @@ discard block |
||
| 1089 | 1089 | try { |
| 1090 | 1090 | $sth = $Connection->db->prepare($query); |
| 1091 | 1091 | $sth->execute(); |
| 1092 | - } catch(PDOException $e) { |
|
| 1092 | + } catch (PDOException $e) { |
|
| 1093 | 1093 | return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1094 | 1094 | } |
| 1095 | 1095 | } |
@@ -1097,7 +1097,7 @@ discard block |
||
| 1097 | 1097 | try { |
| 1098 | 1098 | $sth = $Connection->db->prepare($query); |
| 1099 | 1099 | $sth->execute(); |
| 1100 | - } catch(PDOException $e) { |
|
| 1100 | + } catch (PDOException $e) { |
|
| 1101 | 1101 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1102 | 1102 | } |
| 1103 | 1103 | return $error; |
@@ -1107,12 +1107,12 @@ discard block |
||
| 1107 | 1107 | global $globalDBdriver; |
| 1108 | 1108 | $Connection = new Connection(); |
| 1109 | 1109 | $error = ''; |
| 1110 | - if (!$Connection->checkColumnName('atc','format_source')) { |
|
| 1110 | + if (!$Connection->checkColumnName('atc', 'format_source')) { |
|
| 1111 | 1111 | $query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL"; |
| 1112 | 1112 | try { |
| 1113 | 1113 | $sth = $Connection->db->prepare($query); |
| 1114 | 1114 | $sth->execute(); |
| 1115 | - } catch(PDOException $e) { |
|
| 1115 | + } catch (PDOException $e) { |
|
| 1116 | 1116 | return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n"; |
| 1117 | 1117 | } |
| 1118 | 1118 | } |
@@ -1120,7 +1120,7 @@ discard block |
||
| 1120 | 1120 | try { |
| 1121 | 1121 | $sth = $Connection->db->prepare($query); |
| 1122 | 1122 | $sth->execute(); |
| 1123 | - } catch(PDOException $e) { |
|
| 1123 | + } catch (PDOException $e) { |
|
| 1124 | 1124 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1125 | 1125 | } |
| 1126 | 1126 | return $error; |
@@ -1130,13 +1130,13 @@ discard block |
||
| 1130 | 1130 | global $globalDBdriver; |
| 1131 | 1131 | $Connection = new Connection(); |
| 1132 | 1132 | $error = ''; |
| 1133 | - if (!$Connection->checkColumnName('stats_pilot','format_source')) { |
|
| 1133 | + if (!$Connection->checkColumnName('stats_pilot', 'format_source')) { |
|
| 1134 | 1134 | // Add forsource to airlines |
| 1135 | 1135 | $query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''"; |
| 1136 | 1136 | try { |
| 1137 | 1137 | $sth = $Connection->db->prepare($query); |
| 1138 | 1138 | $sth->execute(); |
| 1139 | - } catch(PDOException $e) { |
|
| 1139 | + } catch (PDOException $e) { |
|
| 1140 | 1140 | return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1141 | 1141 | } |
| 1142 | 1142 | // Add unique key |
@@ -1148,7 +1148,7 @@ discard block |
||
| 1148 | 1148 | try { |
| 1149 | 1149 | $sth = $Connection->db->prepare($query); |
| 1150 | 1150 | $sth->execute(); |
| 1151 | - } catch(PDOException $e) { |
|
| 1151 | + } catch (PDOException $e) { |
|
| 1152 | 1152 | return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1153 | 1153 | } |
| 1154 | 1154 | } |
@@ -1156,7 +1156,7 @@ discard block |
||
| 1156 | 1156 | try { |
| 1157 | 1157 | $sth = $Connection->db->prepare($query); |
| 1158 | 1158 | $sth->execute(); |
| 1159 | - } catch(PDOException $e) { |
|
| 1159 | + } catch (PDOException $e) { |
|
| 1160 | 1160 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1161 | 1161 | } |
| 1162 | 1162 | return $error; |
@@ -1166,23 +1166,23 @@ discard block |
||
| 1166 | 1166 | global $globalDBdriver; |
| 1167 | 1167 | $Connection = new Connection(); |
| 1168 | 1168 | $error = ''; |
| 1169 | - if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) { |
|
| 1169 | + if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) { |
|
| 1170 | 1170 | // Add unique key |
| 1171 | 1171 | $query = "alter table spotter_live add index(latitude,longitude)"; |
| 1172 | 1172 | try { |
| 1173 | 1173 | $sth = $Connection->db->prepare($query); |
| 1174 | 1174 | $sth->execute(); |
| 1175 | - } catch(PDOException $e) { |
|
| 1175 | + } catch (PDOException $e) { |
|
| 1176 | 1176 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1177 | 1177 | } |
| 1178 | 1178 | } |
| 1179 | - if (!$Connection->checkColumnName('aircraft','mfr')) { |
|
| 1179 | + if (!$Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1180 | 1180 | // Add mfr to aircraft |
| 1181 | 1181 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
| 1182 | 1182 | try { |
| 1183 | 1183 | $sth = $Connection->db->prepare($query); |
| 1184 | 1184 | $sth->execute(); |
| 1185 | - } catch(PDOException $e) { |
|
| 1185 | + } catch (PDOException $e) { |
|
| 1186 | 1186 | return "error (add mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1187 | 1187 | } |
| 1188 | 1188 | } |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | try { |
| 1199 | 1199 | $sth = $Connection->db->prepare($query); |
| 1200 | 1200 | $sth->execute(); |
| 1201 | - } catch(PDOException $e) { |
|
| 1201 | + } catch (PDOException $e) { |
|
| 1202 | 1202 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1203 | 1203 | } |
| 1204 | 1204 | return $error; |
@@ -1208,13 +1208,13 @@ discard block |
||
| 1208 | 1208 | global $globalDBdriver; |
| 1209 | 1209 | $Connection = new Connection(); |
| 1210 | 1210 | $error = ''; |
| 1211 | - if ($Connection->checkColumnName('aircraft','mfr')) { |
|
| 1211 | + if ($Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1212 | 1212 | // drop mfr to aircraft |
| 1213 | 1213 | $query = "ALTER TABLE aircraft DROP COLUMN mfr"; |
| 1214 | 1214 | try { |
| 1215 | 1215 | $sth = $Connection->db->prepare($query); |
| 1216 | 1216 | $sth->execute(); |
| 1217 | - } catch(PDOException $e) { |
|
| 1217 | + } catch (PDOException $e) { |
|
| 1218 | 1218 | return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1219 | 1219 | } |
| 1220 | 1220 | } |
@@ -1230,7 +1230,7 @@ discard block |
||
| 1230 | 1230 | try { |
| 1231 | 1231 | $sth = $Connection->db->prepare($query); |
| 1232 | 1232 | $sth->execute(); |
| 1233 | - } catch(PDOException $e) { |
|
| 1233 | + } catch (PDOException $e) { |
|
| 1234 | 1234 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1235 | 1235 | } |
| 1236 | 1236 | return $error; |
@@ -1240,33 +1240,33 @@ discard block |
||
| 1240 | 1240 | global $globalDBdriver; |
| 1241 | 1241 | $Connection = new Connection(); |
| 1242 | 1242 | $error = ''; |
| 1243 | - if (!$Connection->indexExists('notam','ref_idx')) { |
|
| 1243 | + if (!$Connection->indexExists('notam', 'ref_idx')) { |
|
| 1244 | 1244 | // Add index key |
| 1245 | 1245 | $query = "create index ref_idx on notam (ref)"; |
| 1246 | 1246 | try { |
| 1247 | 1247 | $sth = $Connection->db->prepare($query); |
| 1248 | 1248 | $sth->execute(); |
| 1249 | - } catch(PDOException $e) { |
|
| 1249 | + } catch (PDOException $e) { |
|
| 1250 | 1250 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1251 | 1251 | } |
| 1252 | 1252 | } |
| 1253 | - if (!$Connection->indexExists('accidents','registration_idx')) { |
|
| 1253 | + if (!$Connection->indexExists('accidents', 'registration_idx')) { |
|
| 1254 | 1254 | // Add index key |
| 1255 | 1255 | $query = "create index registration_idx on accidents (registration)"; |
| 1256 | 1256 | try { |
| 1257 | 1257 | $sth = $Connection->db->prepare($query); |
| 1258 | 1258 | $sth->execute(); |
| 1259 | - } catch(PDOException $e) { |
|
| 1259 | + } catch (PDOException $e) { |
|
| 1260 | 1260 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1261 | 1261 | } |
| 1262 | 1262 | } |
| 1263 | - if (!$Connection->indexExists('accidents','rdts')) { |
|
| 1263 | + if (!$Connection->indexExists('accidents', 'rdts')) { |
|
| 1264 | 1264 | // Add index key |
| 1265 | 1265 | $query = "create index rdts on accidents (registration,date,type,source)"; |
| 1266 | 1266 | try { |
| 1267 | 1267 | $sth = $Connection->db->prepare($query); |
| 1268 | 1268 | $sth->execute(); |
| 1269 | - } catch(PDOException $e) { |
|
| 1269 | + } catch (PDOException $e) { |
|
| 1270 | 1270 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1271 | 1271 | } |
| 1272 | 1272 | } |
@@ -1275,7 +1275,7 @@ discard block |
||
| 1275 | 1275 | try { |
| 1276 | 1276 | $sth = $Connection->db->prepare($query); |
| 1277 | 1277 | $sth->execute(); |
| 1278 | - } catch(PDOException $e) { |
|
| 1278 | + } catch (PDOException $e) { |
|
| 1279 | 1279 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1280 | 1280 | } |
| 1281 | 1281 | return $error; |
@@ -1285,23 +1285,23 @@ discard block |
||
| 1285 | 1285 | global $globalDBdriver; |
| 1286 | 1286 | $Connection = new Connection(); |
| 1287 | 1287 | $error = ''; |
| 1288 | - if (!$Connection->checkColumnName('accidents','airline_name')) { |
|
| 1288 | + if (!$Connection->checkColumnName('accidents', 'airline_name')) { |
|
| 1289 | 1289 | // Add airline_name to accidents |
| 1290 | 1290 | $query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL"; |
| 1291 | 1291 | try { |
| 1292 | 1292 | $sth = $Connection->db->prepare($query); |
| 1293 | 1293 | $sth->execute(); |
| 1294 | - } catch(PDOException $e) { |
|
| 1294 | + } catch (PDOException $e) { |
|
| 1295 | 1295 | return "error (add airline_name column in accidents) : ".$e->getMessage()."\n"; |
| 1296 | 1296 | } |
| 1297 | 1297 | } |
| 1298 | - if (!$Connection->checkColumnName('accidents','airline_icao')) { |
|
| 1298 | + if (!$Connection->checkColumnName('accidents', 'airline_icao')) { |
|
| 1299 | 1299 | // Add airline_icao to accidents |
| 1300 | 1300 | $query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL"; |
| 1301 | 1301 | try { |
| 1302 | 1302 | $sth = $Connection->db->prepare($query); |
| 1303 | 1303 | $sth->execute(); |
| 1304 | - } catch(PDOException $e) { |
|
| 1304 | + } catch (PDOException $e) { |
|
| 1305 | 1305 | return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n"; |
| 1306 | 1306 | } |
| 1307 | 1307 | } |
@@ -1309,7 +1309,7 @@ discard block |
||
| 1309 | 1309 | try { |
| 1310 | 1310 | $sth = $Connection->db->prepare($query); |
| 1311 | 1311 | $sth->execute(); |
| 1312 | - } catch(PDOException $e) { |
|
| 1312 | + } catch (PDOException $e) { |
|
| 1313 | 1313 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1314 | 1314 | } |
| 1315 | 1315 | return $error; |
@@ -1319,13 +1319,13 @@ discard block |
||
| 1319 | 1319 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1320 | 1320 | $Connection = new Connection(); |
| 1321 | 1321 | $error = ''; |
| 1322 | - if (!$Connection->checkColumnName('airlines','alliance')) { |
|
| 1322 | + if (!$Connection->checkColumnName('airlines', 'alliance')) { |
|
| 1323 | 1323 | // Add alliance to airlines |
| 1324 | 1324 | $query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL"; |
| 1325 | 1325 | try { |
| 1326 | 1326 | $sth = $Connection->db->prepare($query); |
| 1327 | 1327 | $sth->execute(); |
| 1328 | - } catch(PDOException $e) { |
|
| 1328 | + } catch (PDOException $e) { |
|
| 1329 | 1329 | return "error (add alliance column in airlines) : ".$e->getMessage()."\n"; |
| 1330 | 1330 | } |
| 1331 | 1331 | } |
@@ -1352,7 +1352,7 @@ discard block |
||
| 1352 | 1352 | try { |
| 1353 | 1353 | $sth = $Connection->db->prepare($query); |
| 1354 | 1354 | $sth->execute(); |
| 1355 | - } catch(PDOException $e) { |
|
| 1355 | + } catch (PDOException $e) { |
|
| 1356 | 1356 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1357 | 1357 | } |
| 1358 | 1358 | return $error; |
@@ -1362,13 +1362,13 @@ discard block |
||
| 1362 | 1362 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1363 | 1363 | $Connection = new Connection(); |
| 1364 | 1364 | $error = ''; |
| 1365 | - if (!$Connection->checkColumnName('airlines','ban_eu')) { |
|
| 1365 | + if (!$Connection->checkColumnName('airlines', 'ban_eu')) { |
|
| 1366 | 1366 | // Add ban_eu to airlines |
| 1367 | 1367 | $query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'"; |
| 1368 | 1368 | try { |
| 1369 | 1369 | $sth = $Connection->db->prepare($query); |
| 1370 | 1370 | $sth->execute(); |
| 1371 | - } catch(PDOException $e) { |
|
| 1371 | + } catch (PDOException $e) { |
|
| 1372 | 1372 | return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n"; |
| 1373 | 1373 | } |
| 1374 | 1374 | } |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | try { |
| 1377 | 1377 | $sth = $Connection->db->prepare($query); |
| 1378 | 1378 | $sth->execute(); |
| 1379 | - } catch(PDOException $e) { |
|
| 1379 | + } catch (PDOException $e) { |
|
| 1380 | 1380 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1381 | 1381 | } |
| 1382 | 1382 | return $error; |
@@ -1387,19 +1387,19 @@ discard block |
||
| 1387 | 1387 | $Connection = new Connection(); |
| 1388 | 1388 | $error = ''; |
| 1389 | 1389 | if ($globalDBdriver == 'mysql') { |
| 1390 | - if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') { |
|
| 1390 | + if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') { |
|
| 1391 | 1391 | $query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL"; |
| 1392 | 1392 | try { |
| 1393 | 1393 | $sth = $Connection->db->prepare($query); |
| 1394 | 1394 | $sth->execute(); |
| 1395 | - } catch(PDOException $e) { |
|
| 1395 | + } catch (PDOException $e) { |
|
| 1396 | 1396 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1397 | 1397 | } |
| 1398 | 1398 | $query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()"; |
| 1399 | 1399 | try { |
| 1400 | 1400 | $sth = $Connection->db->prepare($query); |
| 1401 | 1401 | $sth->execute(); |
| 1402 | - } catch(PDOException $e) { |
|
| 1402 | + } catch (PDOException $e) { |
|
| 1403 | 1403 | return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n"; |
| 1404 | 1404 | } |
| 1405 | 1405 | |
@@ -1407,7 +1407,7 @@ discard block |
||
| 1407 | 1407 | try { |
| 1408 | 1408 | $sth = $Connection->db->prepare($query); |
| 1409 | 1409 | $sth->execute(); |
| 1410 | - } catch(PDOException $e) { |
|
| 1410 | + } catch (PDOException $e) { |
|
| 1411 | 1411 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1412 | 1412 | } |
| 1413 | 1413 | /*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150"; |
@@ -1458,7 +1458,7 @@ discard block |
||
| 1458 | 1458 | try { |
| 1459 | 1459 | $sth = $Connection->db->prepare($query); |
| 1460 | 1460 | $sth->execute(); |
| 1461 | - } catch(PDOException $e) { |
|
| 1461 | + } catch (PDOException $e) { |
|
| 1462 | 1462 | return "error (fix date) : ".$e->getMessage()."\n"; |
| 1463 | 1463 | } |
| 1464 | 1464 | } |
@@ -1543,7 +1543,7 @@ discard block |
||
| 1543 | 1543 | try { |
| 1544 | 1544 | $sth = $Connection->db->prepare($query); |
| 1545 | 1545 | $sth->execute(); |
| 1546 | - } catch(PDOException $e) { |
|
| 1546 | + } catch (PDOException $e) { |
|
| 1547 | 1547 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1548 | 1548 | } |
| 1549 | 1549 | return $error; |
@@ -1552,13 +1552,13 @@ discard block |
||
| 1552 | 1552 | global $globalDBdriver; |
| 1553 | 1553 | $Connection = new Connection(); |
| 1554 | 1554 | $error = ''; |
| 1555 | - if (!$Connection->indexExists('accidents','type')) { |
|
| 1555 | + if (!$Connection->indexExists('accidents', 'type')) { |
|
| 1556 | 1556 | // Add index key |
| 1557 | 1557 | $query = "create index type on accidents (type,date)"; |
| 1558 | 1558 | try { |
| 1559 | 1559 | $sth = $Connection->db->prepare($query); |
| 1560 | 1560 | $sth->execute(); |
| 1561 | - } catch(PDOException $e) { |
|
| 1561 | + } catch (PDOException $e) { |
|
| 1562 | 1562 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1563 | 1563 | } |
| 1564 | 1564 | } |
@@ -1566,7 +1566,7 @@ discard block |
||
| 1566 | 1566 | try { |
| 1567 | 1567 | $sth = $Connection->db->prepare($query); |
| 1568 | 1568 | $sth->execute(); |
| 1569 | - } catch(PDOException $e) { |
|
| 1569 | + } catch (PDOException $e) { |
|
| 1570 | 1570 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1571 | 1571 | } |
| 1572 | 1572 | return $error; |
@@ -1576,12 +1576,12 @@ discard block |
||
| 1576 | 1576 | global $globalDBdriver; |
| 1577 | 1577 | $Connection = new Connection(); |
| 1578 | 1578 | $error = ''; |
| 1579 | - if (!$Connection->checkColumnName('aircraft_modes','source_type')) { |
|
| 1579 | + if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) { |
|
| 1580 | 1580 | $query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'"; |
| 1581 | 1581 | try { |
| 1582 | 1582 | $sth = $Connection->db->prepare($query); |
| 1583 | 1583 | $sth->execute(); |
| 1584 | - } catch(PDOException $e) { |
|
| 1584 | + } catch (PDOException $e) { |
|
| 1585 | 1585 | return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n"; |
| 1586 | 1586 | } |
| 1587 | 1587 | } |
@@ -1647,7 +1647,7 @@ discard block |
||
| 1647 | 1647 | try { |
| 1648 | 1648 | $sth = $Connection->db->prepare($query); |
| 1649 | 1649 | $sth->execute(); |
| 1650 | - } catch(PDOException $e) { |
|
| 1650 | + } catch (PDOException $e) { |
|
| 1651 | 1651 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1652 | 1652 | } |
| 1653 | 1653 | return $error; |
@@ -1699,7 +1699,7 @@ discard block |
||
| 1699 | 1699 | try { |
| 1700 | 1700 | $sth = $Connection->db->prepare($query); |
| 1701 | 1701 | $sth->execute(); |
| 1702 | - } catch(PDOException $e) { |
|
| 1702 | + } catch (PDOException $e) { |
|
| 1703 | 1703 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 1704 | 1704 | } |
| 1705 | 1705 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -1708,18 +1708,18 @@ discard block |
||
| 1708 | 1708 | try { |
| 1709 | 1709 | $sth = $Connection->db->prepare($query); |
| 1710 | 1710 | $sth->execute(); |
| 1711 | - } catch(PDOException $e) { |
|
| 1711 | + } catch (PDOException $e) { |
|
| 1712 | 1712 | return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n"; |
| 1713 | 1713 | } |
| 1714 | 1714 | } |
| 1715 | 1715 | } |
| 1716 | - if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
|
| 1716 | + if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { |
|
| 1717 | 1717 | // Add index key |
| 1718 | 1718 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; |
| 1719 | 1719 | try { |
| 1720 | 1720 | $sth = $Connection->db->prepare($query); |
| 1721 | 1721 | $sth->execute(); |
| 1722 | - } catch(PDOException $e) { |
|
| 1722 | + } catch (PDOException $e) { |
|
| 1723 | 1723 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1724 | 1724 | } |
| 1725 | 1725 | } |
@@ -1727,7 +1727,7 @@ discard block |
||
| 1727 | 1727 | try { |
| 1728 | 1728 | $sth = $Connection->db->prepare($query); |
| 1729 | 1729 | $sth->execute(); |
| 1730 | - } catch(PDOException $e) { |
|
| 1730 | + } catch (PDOException $e) { |
|
| 1731 | 1731 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1732 | 1732 | } |
| 1733 | 1733 | return $error; |
@@ -1738,148 +1738,148 @@ discard block |
||
| 1738 | 1738 | $Connection = new Connection(); |
| 1739 | 1739 | $error = ''; |
| 1740 | 1740 | if ($globalDBdriver == 'mysql') { |
| 1741 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1741 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1742 | 1742 | $query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1743 | 1743 | try { |
| 1744 | 1744 | $sth = $Connection->db->prepare($query); |
| 1745 | 1745 | $sth->execute(); |
| 1746 | - } catch(PDOException $e) { |
|
| 1746 | + } catch (PDOException $e) { |
|
| 1747 | 1747 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1748 | 1748 | } |
| 1749 | 1749 | } |
| 1750 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1750 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1751 | 1751 | $query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1752 | 1752 | try { |
| 1753 | 1753 | $sth = $Connection->db->prepare($query); |
| 1754 | 1754 | $sth->execute(); |
| 1755 | - } catch(PDOException $e) { |
|
| 1755 | + } catch (PDOException $e) { |
|
| 1756 | 1756 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1757 | 1757 | } |
| 1758 | 1758 | } |
| 1759 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1759 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1760 | 1760 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1761 | 1761 | try { |
| 1762 | 1762 | $sth = $Connection->db->prepare($query); |
| 1763 | 1763 | $sth->execute(); |
| 1764 | - } catch(PDOException $e) { |
|
| 1764 | + } catch (PDOException $e) { |
|
| 1765 | 1765 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1766 | 1766 | } |
| 1767 | 1767 | } |
| 1768 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1768 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1769 | 1769 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1770 | 1770 | try { |
| 1771 | 1771 | $sth = $Connection->db->prepare($query); |
| 1772 | 1772 | $sth->execute(); |
| 1773 | - } catch(PDOException $e) { |
|
| 1773 | + } catch (PDOException $e) { |
|
| 1774 | 1774 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1775 | 1775 | } |
| 1776 | 1776 | } |
| 1777 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1777 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1778 | 1778 | $query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1779 | 1779 | try { |
| 1780 | 1780 | $sth = $Connection->db->prepare($query); |
| 1781 | 1781 | $sth->execute(); |
| 1782 | - } catch(PDOException $e) { |
|
| 1782 | + } catch (PDOException $e) { |
|
| 1783 | 1783 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1784 | 1784 | } |
| 1785 | 1785 | } |
| 1786 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1786 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1787 | 1787 | $query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1788 | 1788 | try { |
| 1789 | 1789 | $sth = $Connection->db->prepare($query); |
| 1790 | 1790 | $sth->execute(); |
| 1791 | - } catch(PDOException $e) { |
|
| 1791 | + } catch (PDOException $e) { |
|
| 1792 | 1792 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1793 | 1793 | } |
| 1794 | 1794 | } |
| 1795 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1795 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1796 | 1796 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1797 | 1797 | try { |
| 1798 | 1798 | $sth = $Connection->db->prepare($query); |
| 1799 | 1799 | $sth->execute(); |
| 1800 | - } catch(PDOException $e) { |
|
| 1800 | + } catch (PDOException $e) { |
|
| 1801 | 1801 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1802 | 1802 | } |
| 1803 | 1803 | } |
| 1804 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1804 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1805 | 1805 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1806 | 1806 | try { |
| 1807 | 1807 | $sth = $Connection->db->prepare($query); |
| 1808 | 1808 | $sth->execute(); |
| 1809 | - } catch(PDOException $e) { |
|
| 1809 | + } catch (PDOException $e) { |
|
| 1810 | 1810 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1811 | 1811 | } |
| 1812 | 1812 | } |
| 1813 | 1813 | } else { |
| 1814 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1814 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1815 | 1815 | $query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1816 | 1816 | try { |
| 1817 | 1817 | $sth = $Connection->db->prepare($query); |
| 1818 | 1818 | $sth->execute(); |
| 1819 | - } catch(PDOException $e) { |
|
| 1819 | + } catch (PDOException $e) { |
|
| 1820 | 1820 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1821 | 1821 | } |
| 1822 | 1822 | } |
| 1823 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1823 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1824 | 1824 | $query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL"; |
| 1825 | 1825 | try { |
| 1826 | 1826 | $sth = $Connection->db->prepare($query); |
| 1827 | 1827 | $sth->execute(); |
| 1828 | - } catch(PDOException $e) { |
|
| 1828 | + } catch (PDOException $e) { |
|
| 1829 | 1829 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1830 | 1830 | } |
| 1831 | 1831 | } |
| 1832 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1832 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1833 | 1833 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL"; |
| 1834 | 1834 | try { |
| 1835 | 1835 | $sth = $Connection->db->prepare($query); |
| 1836 | 1836 | $sth->execute(); |
| 1837 | - } catch(PDOException $e) { |
|
| 1837 | + } catch (PDOException $e) { |
|
| 1838 | 1838 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1839 | 1839 | } |
| 1840 | 1840 | } |
| 1841 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1841 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1842 | 1842 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1843 | 1843 | try { |
| 1844 | 1844 | $sth = $Connection->db->prepare($query); |
| 1845 | 1845 | $sth->execute(); |
| 1846 | - } catch(PDOException $e) { |
|
| 1846 | + } catch (PDOException $e) { |
|
| 1847 | 1847 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1848 | 1848 | } |
| 1849 | 1849 | } |
| 1850 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1850 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1851 | 1851 | $query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1852 | 1852 | try { |
| 1853 | 1853 | $sth = $Connection->db->prepare($query); |
| 1854 | 1854 | $sth->execute(); |
| 1855 | - } catch(PDOException $e) { |
|
| 1855 | + } catch (PDOException $e) { |
|
| 1856 | 1856 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1857 | 1857 | } |
| 1858 | 1858 | } |
| 1859 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1859 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1860 | 1860 | $query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL"; |
| 1861 | 1861 | try { |
| 1862 | 1862 | $sth = $Connection->db->prepare($query); |
| 1863 | 1863 | $sth->execute(); |
| 1864 | - } catch(PDOException $e) { |
|
| 1864 | + } catch (PDOException $e) { |
|
| 1865 | 1865 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1866 | 1866 | } |
| 1867 | 1867 | } |
| 1868 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1868 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1869 | 1869 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL"; |
| 1870 | 1870 | try { |
| 1871 | 1871 | $sth = $Connection->db->prepare($query); |
| 1872 | 1872 | $sth->execute(); |
| 1873 | - } catch(PDOException $e) { |
|
| 1873 | + } catch (PDOException $e) { |
|
| 1874 | 1874 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1875 | 1875 | } |
| 1876 | 1876 | } |
| 1877 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1877 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1878 | 1878 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1879 | 1879 | try { |
| 1880 | 1880 | $sth = $Connection->db->prepare($query); |
| 1881 | 1881 | $sth->execute(); |
| 1882 | - } catch(PDOException $e) { |
|
| 1882 | + } catch (PDOException $e) { |
|
| 1883 | 1883 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1884 | 1884 | } |
| 1885 | 1885 | } |
@@ -1888,7 +1888,7 @@ discard block |
||
| 1888 | 1888 | try { |
| 1889 | 1889 | $sth = $Connection->db->prepare($query); |
| 1890 | 1890 | $sth->execute(); |
| 1891 | - } catch(PDOException $e) { |
|
| 1891 | + } catch (PDOException $e) { |
|
| 1892 | 1892 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1893 | 1893 | } |
| 1894 | 1894 | return $error; |
@@ -1903,14 +1903,14 @@ discard block |
||
| 1903 | 1903 | try { |
| 1904 | 1904 | $sth = $Connection->db->prepare($query); |
| 1905 | 1905 | $sth->execute(); |
| 1906 | - } catch(PDOException $e) { |
|
| 1906 | + } catch (PDOException $e) { |
|
| 1907 | 1907 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1908 | 1908 | } |
| 1909 | 1909 | $query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL"; |
| 1910 | 1910 | try { |
| 1911 | 1911 | $sth = $Connection->db->prepare($query); |
| 1912 | 1912 | $sth->execute(); |
| 1913 | - } catch(PDOException $e) { |
|
| 1913 | + } catch (PDOException $e) { |
|
| 1914 | 1914 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1915 | 1915 | } |
| 1916 | 1916 | } else { |
@@ -1918,14 +1918,14 @@ discard block |
||
| 1918 | 1918 | try { |
| 1919 | 1919 | $sth = $Connection->db->prepare($query); |
| 1920 | 1920 | $sth->execute(); |
| 1921 | - } catch(PDOException $e) { |
|
| 1921 | + } catch (PDOException $e) { |
|
| 1922 | 1922 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1923 | 1923 | } |
| 1924 | 1924 | $query = "alter table marine_identity alter column mmsi type varchar(255)"; |
| 1925 | 1925 | try { |
| 1926 | 1926 | $sth = $Connection->db->prepare($query); |
| 1927 | 1927 | $sth->execute(); |
| 1928 | - } catch(PDOException $e) { |
|
| 1928 | + } catch (PDOException $e) { |
|
| 1929 | 1929 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1930 | 1930 | } |
| 1931 | 1931 | } |
@@ -1933,7 +1933,7 @@ discard block |
||
| 1933 | 1933 | try { |
| 1934 | 1934 | $sth = $Connection->db->prepare($query); |
| 1935 | 1935 | $sth->execute(); |
| 1936 | - } catch(PDOException $e) { |
|
| 1936 | + } catch (PDOException $e) { |
|
| 1937 | 1937 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1938 | 1938 | } |
| 1939 | 1939 | return $error; |
@@ -1943,32 +1943,32 @@ discard block |
||
| 1943 | 1943 | global $globalDBdriver; |
| 1944 | 1944 | $Connection = new Connection(); |
| 1945 | 1945 | $error = ''; |
| 1946 | - if (!$Connection->checkColumnName('source_location','last_seen')) { |
|
| 1946 | + if (!$Connection->checkColumnName('source_location', 'last_seen')) { |
|
| 1947 | 1947 | $query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL"; |
| 1948 | 1948 | try { |
| 1949 | 1949 | $sth = $Connection->db->prepare($query); |
| 1950 | 1950 | $sth->execute(); |
| 1951 | - } catch(PDOException $e) { |
|
| 1951 | + } catch (PDOException $e) { |
|
| 1952 | 1952 | return "error (add column last_seen in source_location) : ".$e->getMessage()."\n"; |
| 1953 | 1953 | } |
| 1954 | 1954 | } |
| 1955 | 1955 | if ($globalDBdriver == 'mysql') { |
| 1956 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1956 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1957 | 1957 | $query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL"; |
| 1958 | 1958 | try { |
| 1959 | 1959 | $sth = $Connection->db->prepare($query); |
| 1960 | 1960 | $sth->execute(); |
| 1961 | - } catch(PDOException $e) { |
|
| 1961 | + } catch (PDOException $e) { |
|
| 1962 | 1962 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1963 | 1963 | } |
| 1964 | 1964 | } |
| 1965 | 1965 | } else { |
| 1966 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1966 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1967 | 1967 | $query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL"; |
| 1968 | 1968 | try { |
| 1969 | 1969 | $sth = $Connection->db->prepare($query); |
| 1970 | 1970 | $sth->execute(); |
| 1971 | - } catch(PDOException $e) { |
|
| 1971 | + } catch (PDOException $e) { |
|
| 1972 | 1972 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1973 | 1973 | } |
| 1974 | 1974 | } |
@@ -1977,7 +1977,7 @@ discard block |
||
| 1977 | 1977 | try { |
| 1978 | 1978 | $sth = $Connection->db->prepare($query); |
| 1979 | 1979 | $sth->execute(); |
| 1980 | - } catch(PDOException $e) { |
|
| 1980 | + } catch (PDOException $e) { |
|
| 1981 | 1981 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1982 | 1982 | } |
| 1983 | 1983 | return $error; |
@@ -1987,12 +1987,12 @@ discard block |
||
| 1987 | 1987 | global $globalDBdriver; |
| 1988 | 1988 | $Connection = new Connection(); |
| 1989 | 1989 | $error = ''; |
| 1990 | - if (!$Connection->checkColumnName('source_location','description')) { |
|
| 1990 | + if (!$Connection->checkColumnName('source_location', 'description')) { |
|
| 1991 | 1991 | $query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL"; |
| 1992 | 1992 | try { |
| 1993 | 1993 | $sth = $Connection->db->prepare($query); |
| 1994 | 1994 | $sth->execute(); |
| 1995 | - } catch(PDOException $e) { |
|
| 1995 | + } catch (PDOException $e) { |
|
| 1996 | 1996 | return "error (add column description in source_location) : ".$e->getMessage()."\n"; |
| 1997 | 1997 | } |
| 1998 | 1998 | } |
@@ -2000,7 +2000,7 @@ discard block |
||
| 2000 | 2000 | try { |
| 2001 | 2001 | $sth = $Connection->db->prepare($query); |
| 2002 | 2002 | $sth->execute(); |
| 2003 | - } catch(PDOException $e) { |
|
| 2003 | + } catch (PDOException $e) { |
|
| 2004 | 2004 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2005 | 2005 | } |
| 2006 | 2006 | return $error; |
@@ -2010,39 +2010,39 @@ discard block |
||
| 2010 | 2010 | global $globalDBdriver; |
| 2011 | 2011 | $Connection = new Connection(); |
| 2012 | 2012 | $error = ''; |
| 2013 | - if (!$Connection->checkColumnName('spotter_live','real_altitude')) { |
|
| 2013 | + if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) { |
|
| 2014 | 2014 | $query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2015 | 2015 | try { |
| 2016 | 2016 | $sth = $Connection->db->prepare($query); |
| 2017 | 2017 | $sth->execute(); |
| 2018 | - } catch(PDOException $e) { |
|
| 2018 | + } catch (PDOException $e) { |
|
| 2019 | 2019 | return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n"; |
| 2020 | 2020 | } |
| 2021 | 2021 | } |
| 2022 | - if (!$Connection->checkColumnName('spotter_output','real_altitude')) { |
|
| 2022 | + if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) { |
|
| 2023 | 2023 | $query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2024 | 2024 | try { |
| 2025 | 2025 | $sth = $Connection->db->prepare($query); |
| 2026 | 2026 | $sth->execute(); |
| 2027 | - } catch(PDOException $e) { |
|
| 2027 | + } catch (PDOException $e) { |
|
| 2028 | 2028 | return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n"; |
| 2029 | 2029 | } |
| 2030 | 2030 | } |
| 2031 | - if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) { |
|
| 2031 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) { |
|
| 2032 | 2032 | $query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2033 | 2033 | try { |
| 2034 | 2034 | $sth = $Connection->db->prepare($query); |
| 2035 | 2035 | $sth->execute(); |
| 2036 | - } catch(PDOException $e) { |
|
| 2036 | + } catch (PDOException $e) { |
|
| 2037 | 2037 | return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n"; |
| 2038 | 2038 | } |
| 2039 | 2039 | } |
| 2040 | - if (!$Connection->checkColumnName('spotter_archive','real_altitude')) { |
|
| 2040 | + if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) { |
|
| 2041 | 2041 | $query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2042 | 2042 | try { |
| 2043 | 2043 | $sth = $Connection->db->prepare($query); |
| 2044 | 2044 | $sth->execute(); |
| 2045 | - } catch(PDOException $e) { |
|
| 2045 | + } catch (PDOException $e) { |
|
| 2046 | 2046 | return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n"; |
| 2047 | 2047 | } |
| 2048 | 2048 | } |
@@ -2050,7 +2050,7 @@ discard block |
||
| 2050 | 2050 | try { |
| 2051 | 2051 | $sth = $Connection->db->prepare($query); |
| 2052 | 2052 | $sth->execute(); |
| 2053 | - } catch(PDOException $e) { |
|
| 2053 | + } catch (PDOException $e) { |
|
| 2054 | 2054 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2055 | 2055 | } |
| 2056 | 2056 | return $error; |
@@ -2072,14 +2072,14 @@ discard block |
||
| 2072 | 2072 | try { |
| 2073 | 2073 | $sth = $Connection->db->prepare($query); |
| 2074 | 2074 | $sth->execute(); |
| 2075 | - } catch(PDOException $e) { |
|
| 2075 | + } catch (PDOException $e) { |
|
| 2076 | 2076 | return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n"; |
| 2077 | 2077 | } |
| 2078 | 2078 | $query = "UPDATE config SET value = '44' WHERE name = 'schema_version'"; |
| 2079 | 2079 | try { |
| 2080 | 2080 | $sth = $Connection->db->prepare($query); |
| 2081 | 2081 | $sth->execute(); |
| 2082 | - } catch(PDOException $e) { |
|
| 2082 | + } catch (PDOException $e) { |
|
| 2083 | 2083 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2084 | 2084 | } |
| 2085 | 2085 | return $error; |
@@ -2120,7 +2120,7 @@ discard block |
||
| 2120 | 2120 | try { |
| 2121 | 2121 | $sth = $Connection->db->prepare($query); |
| 2122 | 2122 | $sth->execute(); |
| 2123 | - } catch(PDOException $e) { |
|
| 2123 | + } catch (PDOException $e) { |
|
| 2124 | 2124 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2125 | 2125 | } |
| 2126 | 2126 | return $error; |
@@ -2143,7 +2143,7 @@ discard block |
||
| 2143 | 2143 | try { |
| 2144 | 2144 | $sth = $Connection->db->prepare($query); |
| 2145 | 2145 | $sth->execute(); |
| 2146 | - } catch(PDOException $e) { |
|
| 2146 | + } catch (PDOException $e) { |
|
| 2147 | 2147 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2148 | 2148 | } |
| 2149 | 2149 | return $error; |
@@ -2193,7 +2193,7 @@ discard block |
||
| 2193 | 2193 | try { |
| 2194 | 2194 | $sth = $Connection->db->prepare($query); |
| 2195 | 2195 | $sth->execute(); |
| 2196 | - } catch(PDOException $e) { |
|
| 2196 | + } catch (PDOException $e) { |
|
| 2197 | 2197 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2198 | 2198 | } |
| 2199 | 2199 | return $error; |
@@ -2216,7 +2216,7 @@ discard block |
||
| 2216 | 2216 | try { |
| 2217 | 2217 | $sth = $Connection->db->prepare($query); |
| 2218 | 2218 | $sth->execute(); |
| 2219 | - } catch(PDOException $e) { |
|
| 2219 | + } catch (PDOException $e) { |
|
| 2220 | 2220 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2221 | 2221 | } |
| 2222 | 2222 | return $error; |
@@ -2239,7 +2239,7 @@ discard block |
||
| 2239 | 2239 | try { |
| 2240 | 2240 | $sth = $Connection->db->prepare($query); |
| 2241 | 2241 | $sth->execute(); |
| 2242 | - } catch(PDOException $e) { |
|
| 2242 | + } catch (PDOException $e) { |
|
| 2243 | 2243 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2244 | 2244 | } |
| 2245 | 2245 | return $error; |
@@ -2262,7 +2262,7 @@ discard block |
||
| 2262 | 2262 | try { |
| 2263 | 2263 | $sth = $Connection->db->prepare($query); |
| 2264 | 2264 | $sth->execute(); |
| 2265 | - } catch(PDOException $e) { |
|
| 2265 | + } catch (PDOException $e) { |
|
| 2266 | 2266 | return "error (check_version): ".$e->getMessage()."\n"; |
| 2267 | 2267 | } |
| 2268 | 2268 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | if (!isset($filter_name)) $filter_name = ''; |
| 26 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 26 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 27 | 27 | if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) { |
| 28 | 28 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 29 | 29 | } |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $airline_info = $Spotter->getAllAirlineInfo($airline_icao); |
| 33 | 33 | if (isset($airline_info[0]['name'])) { |
| 34 | 34 | $airline_name = $airline_info[0]['name']; |
| 35 | - } elseif (strpos($airline_icao,'alliance_') !== FALSE) { |
|
| 35 | + } elseif (strpos($airline_icao, 'alliance_') !== FALSE) { |
|
| 36 | 36 | $alliance_name = $airline_icao; |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -42,8 +42,8 @@ discard block |
||
| 42 | 42 | $title = _("Statistics"); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 46 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 45 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 46 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 47 | 47 | |
| 48 | 48 | require_once('header.php'); |
| 49 | 49 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | date_default_timezone_set('UTC'); |
| 75 | 75 | $lastupdate = strtotime($last_update[0]['value']); |
| 76 | 76 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
| 77 | - print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
|
| 77 | + print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>'; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | ?> |
@@ -86,31 +86,31 @@ discard block |
||
| 86 | 86 | <?php |
| 87 | 87 | if ($type == 'aircraft') { |
| 88 | 88 | ?> |
| 89 | - <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 90 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 91 | - <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 92 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 89 | + <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 90 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 91 | + <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 92 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 93 | 93 | <?php |
| 94 | 94 | if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
| 95 | 95 | ?> |
| 96 | - <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 97 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 96 | + <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 97 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 98 | 98 | <?php |
| 99 | 99 | } |
| 100 | 100 | if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
| 101 | 101 | ?> |
| 102 | - <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 103 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 102 | + <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 103 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 104 | 104 | <?php |
| 105 | 105 | } |
| 106 | 106 | ?> |
| 107 | - <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 108 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 107 | + <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 108 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 109 | 109 | <?php |
| 110 | 110 | if ($airline_icao == '') { |
| 111 | 111 | ?> |
| 112 | - <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 113 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 112 | + <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 113 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 114 | 114 | <?php |
| 115 | 115 | } |
| 116 | 116 | ?> |
@@ -118,8 +118,8 @@ discard block |
||
| 118 | 118 | if (!(isset($globalVA) && $globalVA) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS) && !(isset($globalVAM) && $globalVAM)) { |
| 119 | 119 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 120 | 120 | ?> |
| 121 | - <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 122 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 121 | + <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 122 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 123 | 123 | <?php |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -127,22 +127,22 @@ discard block |
||
| 127 | 127 | <?php |
| 128 | 128 | } elseif ($type == 'marine') { |
| 129 | 129 | ?> |
| 130 | - <span><span class="badge"><?php print number_format($Stats->countOverallMarine($filter_name,$year,$month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 131 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 132 | - <span><span class="badge"><?php print number_format($Stats->countOverallMarineTypes($filter_name,$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 133 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 130 | + <span><span class="badge"><?php print number_format($Stats->countOverallMarine($filter_name, $year, $month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 131 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 132 | + <span><span class="badge"><?php print number_format($Stats->countOverallMarineTypes($filter_name, $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 133 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 134 | 134 | <?php |
| 135 | 135 | } elseif ($type == 'tracker') { |
| 136 | 136 | ?> |
| 137 | - <span><span class="badge"><?php print number_format($Stats->countOverallTracker($filter_name,$year,$month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 138 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 139 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 140 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 137 | + <span><span class="badge"><?php print number_format($Stats->countOverallTracker($filter_name, $year, $month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 138 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 139 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 140 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 141 | 141 | <?php |
| 142 | 142 | } |
| 143 | 143 | ?> |
| 144 | 144 | </p> |
| 145 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 145 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 146 | 146 | <div class="specific-stats"> |
| 147 | 147 | <?php |
| 148 | 148 | if ($type == 'aircraft') { |
@@ -151,13 +151,13 @@ discard block |
||
| 151 | 151 | <div class="col-md-6"> |
| 152 | 152 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 153 | 153 | <?php |
| 154 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 154 | + $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month); |
|
| 155 | 155 | if (count($aircraft_array) == 0) { |
| 156 | 156 | print _("No data available"); |
| 157 | 157 | } else { |
| 158 | 158 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 159 | 159 | $aircraft_data = ''; |
| 160 | - foreach($aircraft_array as $aircraft_item) { |
|
| 160 | + foreach ($aircraft_array as $aircraft_item) { |
|
| 161 | 161 | if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
| 162 | 162 | else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
| 163 | 163 | } |
@@ -186,16 +186,16 @@ discard block |
||
| 186 | 186 | ?> |
| 187 | 187 | </div> |
| 188 | 188 | </div> |
| 189 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 189 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 190 | 190 | <?php |
| 191 | 191 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 192 | - $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
|
| 192 | + $airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month); |
|
| 193 | 193 | if (count($airline_array) > 0) { |
| 194 | 194 | print '<div class="col-md-6">'; |
| 195 | 195 | print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
| 196 | 196 | print '<div id="chart2" class="chart" width="100%"></div><script>'; |
| 197 | 197 | $airline_data = ''; |
| 198 | - foreach($airline_array as $airline_item) { |
|
| 198 | + foreach ($airline_array as $airline_item) { |
|
| 199 | 199 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 200 | 200 | } |
| 201 | 201 | $airline_data = substr($airline_data, 0, -1); |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | ?> |
| 222 | 222 | </div> |
| 223 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 223 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 224 | 224 | <?php |
| 225 | 225 | } |
| 226 | 226 | } |
@@ -232,12 +232,12 @@ discard block |
||
| 232 | 232 | <div class="col-md-6"> |
| 233 | 233 | <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2> |
| 234 | 234 | <?php |
| 235 | - $marine_array = $Stats->countAllMarineTypes(true,$filter_name,$year,$month); |
|
| 235 | + $marine_array = $Stats->countAllMarineTypes(true, $filter_name, $year, $month); |
|
| 236 | 236 | if (count($marine_array) == 0) print _("No data available"); |
| 237 | 237 | else { |
| 238 | 238 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 239 | 239 | $marine_data = ''; |
| 240 | - foreach($marine_array as $marine_item) { |
|
| 240 | + foreach ($marine_array as $marine_item) { |
|
| 241 | 241 | $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],'; |
| 242 | 242 | } |
| 243 | 243 | $marine_data = substr($marine_data, 0, -1); |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | ?> |
| 267 | 267 | </div> |
| 268 | 268 | </div> |
| 269 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 269 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 270 | 270 | <!-- </div>--> |
| 271 | 271 | <?php |
| 272 | 272 | } |
@@ -276,12 +276,12 @@ discard block |
||
| 276 | 276 | <div class="col-md-6"> |
| 277 | 277 | <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2> |
| 278 | 278 | <?php |
| 279 | - $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month); |
|
| 279 | + $tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month); |
|
| 280 | 280 | if (count($tracker_array) == 0) print _("No data available"); |
| 281 | 281 | else { |
| 282 | 282 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 283 | 283 | $tracker_data = ''; |
| 284 | - foreach($tracker_array as $tracker_item) { |
|
| 284 | + foreach ($tracker_array as $tracker_item) { |
|
| 285 | 285 | $tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],'; |
| 286 | 286 | } |
| 287 | 287 | $tracker_data = substr($tracker_data, 0, -1); |
@@ -311,7 +311,7 @@ discard block |
||
| 311 | 311 | ?> |
| 312 | 312 | </div> |
| 313 | 313 | </div> |
| 314 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 314 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 315 | 315 | <!-- </div>--> |
| 316 | 316 | <?php |
| 317 | 317 | } |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | else { |
| 327 | 327 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 328 | 328 | $owner_data = ''; |
| 329 | - foreach($owner_array as $owner_item) { |
|
| 329 | + foreach ($owner_array as $owner_item) { |
|
| 330 | 330 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 331 | 331 | } |
| 332 | 332 | $owner_data = substr($owner_data, 0, -1); |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | </div> |
| 347 | 347 | --> |
| 348 | 348 | </div> |
| 349 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 349 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 350 | 350 | <div class="col-md-6"> |
| 351 | 351 | <h2><?php echo _("Top 10 Most Common Countries Owners"); ?></h2> |
| 352 | 352 | <?php |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | else { |
| 356 | 356 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 357 | 357 | $owner_data = ''; |
| 358 | - foreach($countries_array as $owner_item) { |
|
| 358 | + foreach ($countries_array as $owner_item) { |
|
| 359 | 359 | $owner_data .= '["'.$owner_item['country_name'].'",'.$owner_item['country_count'].'],'; |
| 360 | 360 | } |
| 361 | 361 | $owner_data = substr($owner_data, 0, -1); |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | --> |
| 377 | 377 | </div> |
| 378 | 378 | |
| 379 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 379 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 380 | 380 | ² </div> |
| 381 | 381 | <div class="row column"> |
| 382 | 382 | <div class="col-md-6"> |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | else { |
| 388 | 388 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 389 | 389 | $launch_site_data = ''; |
| 390 | - foreach($launch_site_array as $launch_site_item) { |
|
| 390 | + foreach ($launch_site_array as $launch_site_item) { |
|
| 391 | 391 | $launch_site_data .= '["'.$launch_site_item['launch_site'].'",'.$launch_site_item['launch_site_count'].'],'; |
| 392 | 392 | } |
| 393 | 393 | $launch_site_data = substr($launch_site_data, 0, -1); |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | ?> |
| 415 | 415 | <div class="row column"> |
| 416 | 416 | <?php |
| 417 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 417 | + $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month); |
|
| 418 | 418 | //if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 419 | 419 | if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
| 420 | 420 | if (empty($flightover_array)) { |
@@ -425,12 +425,12 @@ discard block |
||
| 425 | 425 | ?> |
| 426 | 426 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
| 427 | 427 | <?php |
| 428 | - $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
|
| 428 | + $pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month); |
|
| 429 | 429 | if (count($pilot_array) == 0) print _("No data available"); |
| 430 | 430 | else { |
| 431 | 431 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 432 | 432 | $pilot_data = ''; |
| 433 | - foreach($pilot_array as $pilot_item) { |
|
| 433 | + foreach ($pilot_array as $pilot_item) { |
|
| 434 | 434 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 435 | 435 | } |
| 436 | 436 | $pilot_data = substr($pilot_data, 0, -1); |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | ?> |
| 452 | 452 | </div> |
| 453 | 453 | |
| 454 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 454 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 455 | 455 | <?php |
| 456 | 456 | } |
| 457 | 457 | // else { |
@@ -460,12 +460,12 @@ discard block |
||
| 460 | 460 | <div class="col-md-6"> |
| 461 | 461 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
| 462 | 462 | <?php |
| 463 | - $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
|
| 463 | + $owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month); |
|
| 464 | 464 | if (count($owner_array) == 0) print _("No data available"); |
| 465 | 465 | else { |
| 466 | 466 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 467 | 467 | $owner_data = ''; |
| 468 | - foreach($owner_array as $owner_item) { |
|
| 468 | + foreach ($owner_array as $owner_item) { |
|
| 469 | 469 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 470 | 470 | } |
| 471 | 471 | $owner_data = substr($owner_data, 0, -1); |
@@ -484,7 +484,7 @@ discard block |
||
| 484 | 484 | </div> |
| 485 | 485 | </div> |
| 486 | 486 | |
| 487 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 487 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 488 | 488 | <?php |
| 489 | 489 | } |
| 490 | 490 | if (!empty($flightover_array)) { |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 499 | 499 | print 'var series = ['; |
| 500 | 500 | $flightover_data = ''; |
| 501 | - foreach($flightover_array as $flightover_item) { |
|
| 501 | + foreach ($flightover_array as $flightover_item) { |
|
| 502 | 502 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 503 | 503 | } |
| 504 | 504 | $flightover_data = substr($flightover_data, 0, -1); |
@@ -543,12 +543,12 @@ discard block |
||
| 543 | 543 | } |
| 544 | 544 | ?> |
| 545 | 545 | </div> |
| 546 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 546 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 547 | 547 | </div> |
| 548 | 548 | <?php |
| 549 | 549 | } |
| 550 | 550 | if ($type == 'marine') { |
| 551 | - $flightover_array = $Stats->countAllMarineOverCountries(true,$filter_name,$year,$month); |
|
| 551 | + $flightover_array = $Stats->countAllMarineOverCountries(true, $filter_name, $year, $month); |
|
| 552 | 552 | ?> |
| 553 | 553 | <!-- <div class="row column">--> |
| 554 | 554 | <div class="col-md-6"> |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 560 | 560 | print 'var series = ['; |
| 561 | 561 | $flightover_data = ''; |
| 562 | - foreach($flightover_array as $flightover_item) { |
|
| 562 | + foreach ($flightover_array as $flightover_item) { |
|
| 563 | 563 | $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],'; |
| 564 | 564 | } |
| 565 | 565 | $flightover_data = substr($flightover_data, 0, -1); |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | <div class="more"> |
| 600 | 600 | <a href="<?php print $globalURL; ?>/marine/statistics/country" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 601 | 601 | </div> |
| 602 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 602 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 603 | 603 | </div> |
| 604 | 604 | </div> |
| 605 | 605 | |
@@ -617,7 +617,7 @@ discard block |
||
| 617 | 617 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 618 | 618 | print 'var series = ['; |
| 619 | 619 | $flightover_data = ''; |
| 620 | - foreach($flightover_array as $flightover_item) { |
|
| 620 | + foreach ($flightover_array as $flightover_item) { |
|
| 621 | 621 | $flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],'; |
| 622 | 622 | } |
| 623 | 623 | $flightover_data = substr($flightover_data, 0, -1); |
@@ -667,14 +667,14 @@ discard block |
||
| 667 | 667 | <div class="row column"> |
| 668 | 668 | <div class="col-md-6"> |
| 669 | 669 | <?php |
| 670 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 670 | + $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 671 | 671 | if (count($airport_airport_array) > 0) { |
| 672 | 672 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 673 | 673 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
| 674 | 674 | print "\n"; |
| 675 | 675 | print 'var series = ['; |
| 676 | 676 | $airport_data = ''; |
| 677 | - foreach($airport_airport_array as $airport_item) { |
|
| 677 | + foreach ($airport_airport_array as $airport_item) { |
|
| 678 | 678 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
| 679 | 679 | } |
| 680 | 680 | $airport_data = substr($airport_data, 0, -1); |
@@ -724,18 +724,18 @@ discard block |
||
| 724 | 724 | } |
| 725 | 725 | ?> |
| 726 | 726 | </div> |
| 727 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 727 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 728 | 728 | |
| 729 | 729 | <div class="col-md-6"> |
| 730 | 730 | <?php |
| 731 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 731 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 732 | 732 | if (count($airport_airport_array2) > 0) { |
| 733 | 733 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 734 | 734 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
| 735 | 735 | print "\n"; |
| 736 | 736 | print 'var series = ['; |
| 737 | 737 | $airport_data = ''; |
| 738 | - foreach($airport_airport_array2 as $airport_item) |
|
| 738 | + foreach ($airport_airport_array2 as $airport_item) |
|
| 739 | 739 | { |
| 740 | 740 | if (isset($airport_item['airport_arrival_longitude']) && isset($airport_item['airport_arrival_latitude'])) { |
| 741 | 741 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
@@ -789,7 +789,7 @@ discard block |
||
| 789 | 789 | ?> |
| 790 | 790 | </div> |
| 791 | 791 | </div> |
| 792 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 792 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 793 | 793 | <?php |
| 794 | 794 | } |
| 795 | 795 | if ($type == 'aircraft') { |
@@ -801,18 +801,18 @@ discard block |
||
| 801 | 801 | <div class="col-md-6"> |
| 802 | 802 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 803 | 803 | <?php |
| 804 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 804 | + $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 805 | 805 | if (count($year_array) == 0) print _("No data available"); |
| 806 | 806 | else { |
| 807 | 807 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 808 | 808 | $year_data = ''; |
| 809 | 809 | $year_cnt = ''; |
| 810 | - foreach($year_array as $year_item) { |
|
| 810 | + foreach ($year_array as $year_item) { |
|
| 811 | 811 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 812 | 812 | $year_cnt .= $year_item['date_count'].','; |
| 813 | 813 | } |
| 814 | 814 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 815 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 815 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 816 | 816 | print 'c3.generate({ |
| 817 | 817 | bindto: "#chart8", |
| 818 | 818 | data: { x: "x", |
@@ -825,22 +825,22 @@ discard block |
||
| 825 | 825 | <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 826 | 826 | </div> |
| 827 | 827 | </div> |
| 828 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 828 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 829 | 829 | <div class="col-md-6"> |
| 830 | 830 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 831 | 831 | <?php |
| 832 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 832 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 833 | 833 | if (count($month_array) == 0) print _("No data available"); |
| 834 | 834 | else { |
| 835 | 835 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 836 | 836 | $month_data = ''; |
| 837 | 837 | $month_cnt = ''; |
| 838 | - foreach($month_array as $month_item) { |
|
| 838 | + foreach ($month_array as $month_item) { |
|
| 839 | 839 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 840 | 840 | $month_cnt .= $month_item['date_count'].','; |
| 841 | 841 | } |
| 842 | 842 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 843 | - $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
|
| 843 | + $month_cnt = "['flights',".substr($month_cnt, 0, -1)."]"; |
|
| 844 | 844 | print 'c3.generate({ |
| 845 | 845 | bindto: "#chart9", |
| 846 | 846 | data: { x: "x", |
@@ -853,23 +853,23 @@ discard block |
||
| 853 | 853 | <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 854 | 854 | </div> |
| 855 | 855 | </div> |
| 856 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 856 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 857 | 857 | |
| 858 | 858 | <div class="col-md-6"> |
| 859 | 859 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 860 | 860 | <?php |
| 861 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 861 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 862 | 862 | if (empty($date_array)) print _("No data available"); |
| 863 | 863 | else { |
| 864 | 864 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 865 | 865 | $date_data = ''; |
| 866 | 866 | $date_cnt = ''; |
| 867 | - foreach($date_array as $date_item) { |
|
| 867 | + foreach ($date_array as $date_item) { |
|
| 868 | 868 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 869 | 869 | $date_cnt .= $date_item['date_count'].','; |
| 870 | 870 | } |
| 871 | 871 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 872 | - $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
| 872 | + $date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
| 873 | 873 | print 'c3.generate({ |
| 874 | 874 | bindto: "#chart5", |
| 875 | 875 | data: { x: "x", |
@@ -882,22 +882,22 @@ discard block |
||
| 882 | 882 | <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 883 | 883 | </div> |
| 884 | 884 | </div> |
| 885 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 885 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 886 | 886 | <div class="col-md-6"> |
| 887 | 887 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 888 | 888 | <?php |
| 889 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 889 | + $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 890 | 890 | if (empty($hour_array)) print _("No data available"); |
| 891 | 891 | else { |
| 892 | 892 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 893 | 893 | $hour_data = ''; |
| 894 | 894 | $hour_cnt = ''; |
| 895 | - foreach($hour_array as $hour_item) { |
|
| 895 | + foreach ($hour_array as $hour_item) { |
|
| 896 | 896 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 897 | 897 | $hour_cnt .= $hour_item['hour_count'].','; |
| 898 | 898 | } |
| 899 | 899 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 900 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 900 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 901 | 901 | print 'c3.generate({ |
| 902 | 902 | bindto: "#chart6", |
| 903 | 903 | data: { |
@@ -910,7 +910,7 @@ discard block |
||
| 910 | 910 | <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 911 | 911 | </div> |
| 912 | 912 | </div> |
| 913 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 913 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 914 | 914 | </div> |
| 915 | 915 | <?php |
| 916 | 916 | } |
@@ -926,18 +926,18 @@ discard block |
||
| 926 | 926 | <div class="col-md-6"> |
| 927 | 927 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 928 | 928 | <?php |
| 929 | - $year_array = $Stats->countAllMarineMonthsLastYear(true,$filter_name); |
|
| 929 | + $year_array = $Stats->countAllMarineMonthsLastYear(true, $filter_name); |
|
| 930 | 930 | if (count($year_array) == 0) print _("No data available"); |
| 931 | 931 | else { |
| 932 | 932 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 933 | 933 | $year_data = ''; |
| 934 | 934 | $year_cnt = ''; |
| 935 | - foreach($year_array as $year_item) { |
|
| 935 | + foreach ($year_array as $year_item) { |
|
| 936 | 936 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 937 | 937 | $year_cnt .= $year_item['date_count'].','; |
| 938 | 938 | } |
| 939 | 939 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 940 | - $year_cnt = "['vessels',".substr($year_cnt,0,-1)."]"; |
|
| 940 | + $year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]"; |
|
| 941 | 941 | print 'c3.generate({ |
| 942 | 942 | bindto: "#chart8", |
| 943 | 943 | data: { x: "x", |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | </div> |
| 952 | 952 | </div> |
| 953 | 953 | |
| 954 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 954 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 955 | 955 | <div class="col-md-6"> |
| 956 | 956 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 957 | 957 | <?php |
@@ -961,12 +961,12 @@ discard block |
||
| 961 | 961 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 962 | 962 | $month_data = ''; |
| 963 | 963 | $month_cnt = ''; |
| 964 | - foreach($month_array as $month_item) { |
|
| 964 | + foreach ($month_array as $month_item) { |
|
| 965 | 965 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 966 | 966 | $month_cnt .= $month_item['date_count'].','; |
| 967 | 967 | } |
| 968 | 968 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 969 | - $month_cnt = "['vessels',".substr($month_cnt,0,-1)."]"; |
|
| 969 | + $month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]"; |
|
| 970 | 970 | print 'c3.generate({ |
| 971 | 971 | bindto: "#chart9", |
| 972 | 972 | data: { x: "x", |
@@ -979,7 +979,7 @@ discard block |
||
| 979 | 979 | <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 980 | 980 | </div> |
| 981 | 981 | </div> |
| 982 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 982 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 983 | 983 | |
| 984 | 984 | <div class="col-md-6"> |
| 985 | 985 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
@@ -990,12 +990,12 @@ discard block |
||
| 990 | 990 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 991 | 991 | $date_data = ''; |
| 992 | 992 | $date_cnt = ''; |
| 993 | - foreach($date_array as $date_item) { |
|
| 993 | + foreach ($date_array as $date_item) { |
|
| 994 | 994 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 995 | 995 | $date_cnt .= $date_item['date_count'].','; |
| 996 | 996 | } |
| 997 | 997 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 998 | - $date_cnt = "['vessels',".substr($date_cnt,0,-1)."]"; |
|
| 998 | + $date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]"; |
|
| 999 | 999 | print 'c3.generate({ |
| 1000 | 1000 | bindto: "#chart5", |
| 1001 | 1001 | data: { x: "x", |
@@ -1008,22 +1008,22 @@ discard block |
||
| 1008 | 1008 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1009 | 1009 | </div> |
| 1010 | 1010 | </div> |
| 1011 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1011 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1012 | 1012 | <div class="col-md-6"> |
| 1013 | 1013 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 1014 | 1014 | <?php |
| 1015 | - $hour_array = $Stats->countAllMarineHours('hour',true,$filter_name); |
|
| 1015 | + $hour_array = $Stats->countAllMarineHours('hour', true, $filter_name); |
|
| 1016 | 1016 | if (empty($hour_array)) print _("No data available"); |
| 1017 | 1017 | else { |
| 1018 | 1018 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 1019 | 1019 | $hour_data = ''; |
| 1020 | 1020 | $hour_cnt = ''; |
| 1021 | - foreach($hour_array as $hour_item) { |
|
| 1021 | + foreach ($hour_array as $hour_item) { |
|
| 1022 | 1022 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 1023 | 1023 | $hour_cnt .= $hour_item['hour_count'].','; |
| 1024 | 1024 | } |
| 1025 | 1025 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 1026 | - $hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]"; |
|
| 1026 | + $hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]"; |
|
| 1027 | 1027 | print 'c3.generate({ |
| 1028 | 1028 | bindto: "#chart6", |
| 1029 | 1029 | data: { |
@@ -1036,7 +1036,7 @@ discard block |
||
| 1036 | 1036 | <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1037 | 1037 | </div> |
| 1038 | 1038 | </div> |
| 1039 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1039 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1040 | 1040 | </div> |
| 1041 | 1041 | <?php |
| 1042 | 1042 | } |
@@ -1058,12 +1058,12 @@ discard block |
||
| 1058 | 1058 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 1059 | 1059 | $year_data = ''; |
| 1060 | 1060 | $year_cnt = ''; |
| 1061 | - foreach($year_array as $year_item) { |
|
| 1061 | + foreach ($year_array as $year_item) { |
|
| 1062 | 1062 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 1063 | 1063 | $year_cnt .= $year_item['date_count'].','; |
| 1064 | 1064 | } |
| 1065 | 1065 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1066 | - $year_cnt = "['trackers',".substr($year_cnt,0,-1)."]"; |
|
| 1066 | + $year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]"; |
|
| 1067 | 1067 | print 'c3.generate({ |
| 1068 | 1068 | bindto: "#chart8", |
| 1069 | 1069 | data: { x: "x", |
@@ -1077,7 +1077,7 @@ discard block |
||
| 1077 | 1077 | </div> |
| 1078 | 1078 | </div> |
| 1079 | 1079 | |
| 1080 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1080 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1081 | 1081 | <div class="col-md-6"> |
| 1082 | 1082 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 1083 | 1083 | <?php |
@@ -1087,12 +1087,12 @@ discard block |
||
| 1087 | 1087 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 1088 | 1088 | $month_data = ''; |
| 1089 | 1089 | $month_cnt = ''; |
| 1090 | - foreach($month_array as $month_item) { |
|
| 1090 | + foreach ($month_array as $month_item) { |
|
| 1091 | 1091 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 1092 | 1092 | $month_cnt .= $month_item['date_count'].','; |
| 1093 | 1093 | } |
| 1094 | 1094 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 1095 | - $month_cnt = "['trackers',".substr($month_cnt,0,-1)."]"; |
|
| 1095 | + $month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]"; |
|
| 1096 | 1096 | print 'c3.generate({ |
| 1097 | 1097 | bindto: "#chart9", |
| 1098 | 1098 | data: { x: "x", |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1106 | 1106 | </div> |
| 1107 | 1107 | </div> |
| 1108 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1108 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1109 | 1109 | |
| 1110 | 1110 | <div class="col-md-6"> |
| 1111 | 1111 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
@@ -1116,12 +1116,12 @@ discard block |
||
| 1116 | 1116 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 1117 | 1117 | $date_data = ''; |
| 1118 | 1118 | $date_cnt = ''; |
| 1119 | - foreach($date_array as $date_item) { |
|
| 1119 | + foreach ($date_array as $date_item) { |
|
| 1120 | 1120 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 1121 | 1121 | $date_cnt .= $date_item['date_count'].','; |
| 1122 | 1122 | } |
| 1123 | 1123 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 1124 | - $date_cnt = "['trackers',".substr($date_cnt,0,-1)."]"; |
|
| 1124 | + $date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]"; |
|
| 1125 | 1125 | print 'c3.generate({ |
| 1126 | 1126 | bindto: "#chart5", |
| 1127 | 1127 | data: { x: "x", |
@@ -1134,22 +1134,22 @@ discard block |
||
| 1134 | 1134 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1135 | 1135 | </div> |
| 1136 | 1136 | </div> |
| 1137 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1137 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1138 | 1138 | <div class="col-md-6"> |
| 1139 | 1139 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 1140 | 1140 | <?php |
| 1141 | - $hour_array = $Stats->countAllTrackerHours('hour',true); |
|
| 1141 | + $hour_array = $Stats->countAllTrackerHours('hour', true); |
|
| 1142 | 1142 | if (empty($hour_array)) print _("No data available"); |
| 1143 | 1143 | else { |
| 1144 | 1144 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 1145 | 1145 | $hour_data = ''; |
| 1146 | 1146 | $hour_cnt = ''; |
| 1147 | - foreach($hour_array as $hour_item) { |
|
| 1147 | + foreach ($hour_array as $hour_item) { |
|
| 1148 | 1148 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 1149 | 1149 | $hour_cnt .= $hour_item['hour_count'].','; |
| 1150 | 1150 | } |
| 1151 | 1151 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 1152 | - $hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]"; |
|
| 1152 | + $hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]"; |
|
| 1153 | 1153 | print 'c3.generate({ |
| 1154 | 1154 | bindto: "#chart6", |
| 1155 | 1155 | data: { |
@@ -1162,7 +1162,7 @@ discard block |
||
| 1162 | 1162 | <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1163 | 1163 | </div> |
| 1164 | 1164 | </div> |
| 1165 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1165 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1166 | 1166 | </div> |
| 1167 | 1167 | <?php |
| 1168 | 1168 | } |
@@ -1184,12 +1184,12 @@ discard block |
||
| 1184 | 1184 | print '<div id="chart21" class="chart" width="100%"></div><script>'; |
| 1185 | 1185 | $year_data = ''; |
| 1186 | 1186 | $year_cnt = ''; |
| 1187 | - foreach($year_array as $year_item) { |
|
| 1187 | + foreach ($year_array as $year_item) { |
|
| 1188 | 1188 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 1189 | 1189 | $year_cnt .= $year_item['date_count'].','; |
| 1190 | 1190 | } |
| 1191 | 1191 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1192 | - $year_cnt = "['satellite',".substr($year_cnt,0,-1)."]"; |
|
| 1192 | + $year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]"; |
|
| 1193 | 1193 | print 'c3.generate({ |
| 1194 | 1194 | bindto: "#chart21", |
| 1195 | 1195 | data: { x: "x", |
@@ -1205,7 +1205,7 @@ discard block |
||
| 1205 | 1205 | --> |
| 1206 | 1206 | </div> |
| 1207 | 1207 | |
| 1208 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1208 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1209 | 1209 | <div class="col-md-6"> |
| 1210 | 1210 | <h2><?php echo _("Busiest Launch Years of the last 10 Years"); ?></h2> |
| 1211 | 1211 | <?php |
@@ -1215,12 +1215,12 @@ discard block |
||
| 1215 | 1215 | print '<div id="chart22" class="chart" width="100%"></div><script>'; |
| 1216 | 1216 | $year_data = ''; |
| 1217 | 1217 | $year_cnt = ''; |
| 1218 | - foreach($year_array as $year_item) { |
|
| 1218 | + foreach ($year_array as $year_item) { |
|
| 1219 | 1219 | $year_data .= '"'.$year_item['year_name'].'-01-01'.'",'; |
| 1220 | 1220 | $year_cnt .= $year_item['date_count'].','; |
| 1221 | 1221 | } |
| 1222 | 1222 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1223 | - $year_cnt = "['satellite',".substr($year_cnt,0,-1)."]"; |
|
| 1223 | + $year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]"; |
|
| 1224 | 1224 | print 'c3.generate({ |
| 1225 | 1225 | bindto: "#chart22", |
| 1226 | 1226 | data: { x: "x", |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | --> |
| 1237 | 1237 | </div> |
| 1238 | 1238 | |
| 1239 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1239 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1240 | 1240 | </div> |
| 1241 | 1241 | <?php |
| 1242 | 1242 | } |
@@ -1258,12 +1258,12 @@ discard block |
||
| 1258 | 1258 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 1259 | 1259 | $year_data = ''; |
| 1260 | 1260 | $year_cnt = ''; |
| 1261 | - foreach($year_array as $year_item) { |
|
| 1261 | + foreach ($year_array as $year_item) { |
|
| 1262 | 1262 | $year_data .= '"'.$year_item['year'].'-01-01",'; |
| 1263 | 1263 | $year_cnt .= $year_item['count'].','; |
| 1264 | 1264 | } |
| 1265 | 1265 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1266 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1266 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1267 | 1267 | print 'c3.generate({ |
| 1268 | 1268 | bindto: "#chart32", |
| 1269 | 1269 | data: { x: "x", |
@@ -1276,7 +1276,7 @@ discard block |
||
| 1276 | 1276 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1277 | 1277 | </div> |
| 1278 | 1278 | </div> |
| 1279 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1279 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1280 | 1280 | |
| 1281 | 1281 | <div class="row column"> |
| 1282 | 1282 | <div class="col-md-6"> |
@@ -1288,12 +1288,12 @@ discard block |
||
| 1288 | 1288 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 1289 | 1289 | $year_data = ''; |
| 1290 | 1290 | $year_cnt = ''; |
| 1291 | - foreach($year_array as $year_item) { |
|
| 1291 | + foreach ($year_array as $year_item) { |
|
| 1292 | 1292 | $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
| 1293 | 1293 | $year_cnt .= $year_item['count'].','; |
| 1294 | 1294 | } |
| 1295 | 1295 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1296 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1296 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1297 | 1297 | print 'c3.generate({ |
| 1298 | 1298 | bindto: "#chart33", |
| 1299 | 1299 | data: { x: "x", |
@@ -1306,7 +1306,7 @@ discard block |
||
| 1306 | 1306 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1307 | 1307 | </div> |
| 1308 | 1308 | </div> |
| 1309 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1309 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1310 | 1310 | <br/> |
| 1311 | 1311 | <?php |
| 1312 | 1312 | } |
@@ -1320,19 +1320,19 @@ discard block |
||
| 1320 | 1320 | //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
| 1321 | 1321 | if ($year == '' && $month == '') { |
| 1322 | 1322 | if ($type == 'aircraft') { |
| 1323 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 1323 | + $polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d')); |
|
| 1324 | 1324 | } elseif ($type == 'marine') { |
| 1325 | - $polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d')); |
|
| 1325 | + $polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d')); |
|
| 1326 | 1326 | } elseif ($type == 'tracker') { |
| 1327 | - $polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d')); |
|
| 1327 | + $polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d')); |
|
| 1328 | 1328 | } |
| 1329 | 1329 | } else { |
| 1330 | 1330 | if ($type == 'aircraft') { |
| 1331 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 1331 | + $polar = $Stats->getStatsSource('polar', $year, $month); |
|
| 1332 | 1332 | } elseif ($type == 'marine') { |
| 1333 | - $polar = $Stats->getStatsSource('polar_marine',$year,$month); |
|
| 1333 | + $polar = $Stats->getStatsSource('polar_marine', $year, $month); |
|
| 1334 | 1334 | } elseif ($type == 'tracker') { |
| 1335 | - $polar = $Stats->getStatsSource('polar_tracker',$year,$month); |
|
| 1335 | + $polar = $Stats->getStatsSource('polar_tracker', $year, $month); |
|
| 1336 | 1336 | } |
| 1337 | 1337 | } |
| 1338 | 1338 | if (!empty($polar)) { |
@@ -1341,7 +1341,7 @@ discard block |
||
| 1341 | 1341 | unset($polar_data); |
| 1342 | 1342 | $Spotter = new Spotter(); |
| 1343 | 1343 | $data = json_decode($eachpolar['source_data']); |
| 1344 | - foreach($data as $value => $key) { |
|
| 1344 | + foreach ($data as $value => $key) { |
|
| 1345 | 1345 | $direction = $Spotter->parseDirection(($value*22.5)); |
| 1346 | 1346 | $distance = $key; |
| 1347 | 1347 | $unit = 'km'; |
@@ -1361,7 +1361,7 @@ discard block |
||
| 1361 | 1361 | ?> |
| 1362 | 1362 | <div class="col-md-6"> |
| 1363 | 1363 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 1364 | - <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1364 | + <div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1365 | 1365 | <script> |
| 1366 | 1366 | (function() { |
| 1367 | 1367 | var margin = {top: 100, right: 100, bottom: 100, left: 100}, |
@@ -1385,7 +1385,7 @@ discard block |
||
| 1385 | 1385 | color: color, |
| 1386 | 1386 | unit: '<?php echo $unit; ?>' |
| 1387 | 1387 | }; |
| 1388 | - RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1388 | + RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1389 | 1389 | })(); |
| 1390 | 1390 | </script> |
| 1391 | 1391 | </div> |
@@ -1400,19 +1400,19 @@ discard block |
||
| 1400 | 1400 | //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
| 1401 | 1401 | if ($year == '' && $month == '') { |
| 1402 | 1402 | if ($type == 'aircraft') { |
| 1403 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 1403 | + $msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d')); |
|
| 1404 | 1404 | } elseif ($type == 'marine') { |
| 1405 | - $msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d')); |
|
| 1405 | + $msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d')); |
|
| 1406 | 1406 | } elseif ($type == 'tracker') { |
| 1407 | - $msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d')); |
|
| 1407 | + $msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d')); |
|
| 1408 | 1408 | } |
| 1409 | 1409 | } else { |
| 1410 | 1410 | if ($type == 'aircraft') { |
| 1411 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 1411 | + $msg = $Stats->getStatsSource('msg', $year, $month); |
|
| 1412 | 1412 | } elseif ($type == 'marine') { |
| 1413 | - $msg = $Stats->getStatsSource('msg_marine',$year,$month); |
|
| 1413 | + $msg = $Stats->getStatsSource('msg_marine', $year, $month); |
|
| 1414 | 1414 | } elseif ($type == 'tracker') { |
| 1415 | - $msg = $Stats->getStatsSource('msg_tracker',$year,$month); |
|
| 1415 | + $msg = $Stats->getStatsSource('msg_tracker', $year, $month); |
|
| 1416 | 1416 | } |
| 1417 | 1417 | } |
| 1418 | 1418 | if (!empty($msg)) { |
@@ -1420,13 +1420,13 @@ discard block |
||
| 1420 | 1420 | foreach ($msg as $eachmsg) { |
| 1421 | 1421 | //$eachmsg = $msg[0]; |
| 1422 | 1422 | $data = $eachmsg['source_data']; |
| 1423 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 1423 | + if ($data > 500) $max = (round(($data + 100)/100))*100; |
|
| 1424 | 1424 | else $max = 500; |
| 1425 | 1425 | ?> |
| 1426 | - <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1426 | + <div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1427 | 1427 | <script> |
| 1428 | 1428 | var g = new JustGage({ |
| 1429 | - id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>", |
|
| 1429 | + id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>", |
|
| 1430 | 1430 | value: <?php echo $data; ?>, |
| 1431 | 1431 | min: 0, |
| 1432 | 1432 | max: <?php print $max; ?>, |
@@ -1448,19 +1448,19 @@ discard block |
||
| 1448 | 1448 | //$hist = $Stats->getStatsSource(date('Y-m-d'),'hist'); |
| 1449 | 1449 | if ($year == '' && $month == '') { |
| 1450 | 1450 | if ($type == 'aircraft') { |
| 1451 | - $hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d')); |
|
| 1451 | + $hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d')); |
|
| 1452 | 1452 | } elseif ($type == 'marine') { |
| 1453 | - $hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d')); |
|
| 1453 | + $hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d')); |
|
| 1454 | 1454 | } elseif ($type == 'tracker') { |
| 1455 | - $hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d')); |
|
| 1455 | + $hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d')); |
|
| 1456 | 1456 | } |
| 1457 | 1457 | } else { |
| 1458 | 1458 | if ($type == 'aircraft') { |
| 1459 | - $hist = $Stats->getStatsSource('hist',$year,$month); |
|
| 1459 | + $hist = $Stats->getStatsSource('hist', $year, $month); |
|
| 1460 | 1460 | } elseif ($type == 'marine') { |
| 1461 | - $hist = $Stats->getStatsSource('hist_marine',$year,$month); |
|
| 1461 | + $hist = $Stats->getStatsSource('hist_marine', $year, $month); |
|
| 1462 | 1462 | } elseif ($type == 'tracker') { |
| 1463 | - $hist = $Stats->getStatsSource('hist_tracker',$year,$month); |
|
| 1463 | + $hist = $Stats->getStatsSource('hist_tracker', $year, $month); |
|
| 1464 | 1464 | } |
| 1465 | 1465 | } |
| 1466 | 1466 | foreach ($hist as $hists) { |
@@ -1470,7 +1470,7 @@ discard block |
||
| 1470 | 1470 | $source = $hists['source_name']; |
| 1471 | 1471 | $hist_array = json_decode($hists['source_data']); |
| 1472 | 1472 | $unit = 'km'; |
| 1473 | - foreach($hist_array as $distance => $nb) { |
|
| 1473 | + foreach ($hist_array as $distance => $nb) { |
|
| 1474 | 1474 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 1475 | 1475 | $distance = round($distance*0.539957); |
| 1476 | 1476 | $unit = 'nm'; |
@@ -1490,18 +1490,18 @@ discard block |
||
| 1490 | 1490 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
| 1491 | 1491 | ?> |
| 1492 | 1492 | <div class="col-md-6"> |
| 1493 | - <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2> |
|
| 1493 | + <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2> |
|
| 1494 | 1494 | <?php |
| 1495 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1495 | + print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1496 | 1496 | print 'c3.generate({ |
| 1497 | - bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
|
| 1497 | + bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'", |
|
| 1498 | 1498 | data: { x: "x", |
| 1499 | 1499 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 1500 | 1500 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 1501 | 1501 | print '</script>'; |
| 1502 | 1502 | ?> |
| 1503 | 1503 | </div> |
| 1504 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1504 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1505 | 1505 | <?php |
| 1506 | 1506 | } |
| 1507 | 1507 | ?> |
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | $from_archive = false; |
| 13 | 13 | if (isset($_GET['ident'])) { |
| 14 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 14 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 15 | 15 | if (isset($_GET['currenttime'])) { |
| 16 | - $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT); |
|
| 16 | + $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT); |
|
| 17 | 17 | $currenttime = round($currenttime/1000); |
| 18 | - $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime); |
|
| 18 | + $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime); |
|
| 19 | 19 | if (empty($spotter_array)) { |
| 20 | 20 | $from_archive = true; |
| 21 | - $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime); |
|
| 21 | + $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime); |
|
| 22 | 22 | } |
| 23 | 23 | } else { |
| 24 | 24 | $spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident); |
@@ -29,15 +29,15 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | if (isset($_GET['flightaware_id'])) { |
| 32 | - $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
| 32 | + $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
| 33 | 33 | if (isset($_GET['currenttime'])) { |
| 34 | - $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT); |
|
| 34 | + $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT); |
|
| 35 | 35 | $currenttime = round($currenttime/1000); |
| 36 | - $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime); |
|
| 36 | + $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime); |
|
| 37 | 37 | if (empty($spotter_array)) { |
| 38 | 38 | $from_archive = true; |
| 39 | 39 | // $spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id); |
| 40 | - $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime); |
|
| 40 | + $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime); |
|
| 41 | 41 | } |
| 42 | 42 | } else { |
| 43 | 43 | $spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "") |
| 58 | 58 | { |
| 59 | 59 | if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') { |
| 60 | - $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 60 | + $image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 61 | 61 | } else $image = $spotter_item['image_thumbnail']; |
| 62 | 62 | } |
| 63 | 63 | /* else { |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country']; |
| 78 | 78 | if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') { |
| 79 | 79 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 80 | - print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>'; |
|
| 80 | + print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>'; |
|
| 81 | 81 | } else { |
| 82 | 82 | print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>'; |
| 83 | 83 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country']; |
| 87 | 87 | if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') { |
| 88 | 88 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 89 | - print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>'; |
|
| 89 | + print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>'; |
|
| 90 | 90 | } else { |
| 91 | 91 | print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>'; |
| 92 | 92 | } |
@@ -111,8 +111,8 @@ discard block |
||
| 111 | 111 | print '<div id ="altitude"><span>'._("Altitude").'</span>'; |
| 112 | 112 | if (isset($globalGroundAltitude) && $globalGroundAltitude) { |
| 113 | 113 | try { |
| 114 | - $groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']); |
|
| 115 | - } catch(Exception $e) { |
|
| 114 | + $groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']); |
|
| 115 | + } catch (Exception $e) { |
|
| 116 | 116 | // If catched not exist |
| 117 | 117 | } |
| 118 | 118 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | print '</div>'; |
| 180 | 180 | if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>'; |
| 181 | 181 | if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>'; |
| 182 | - if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>'; |
|
| 182 | + if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>'; |
|
| 183 | 183 | if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>'; |
| 184 | 184 | print '</div>'; |
| 185 | 185 | } |
