Ysurac /
FlightAirMap
@@ -147,8 +147,8 @@ discard block |
||
| 147 | 147 | // Note that the standard is 1 based indexing |
| 148 | 148 | public function geometryN($n) { |
| 149 | 149 | $n = intval($n); |
| 150 | - if (array_key_exists($n-1, $this->components)) { |
|
| 151 | - return $this->components[$n-1]; |
|
| 150 | + if (array_key_exists($n - 1, $this->components)) { |
|
| 151 | + return $this->components[$n - 1]; |
|
| 152 | 152 | } |
| 153 | 153 | else { |
| 154 | 154 | return NULL; |
@@ -279,16 +279,16 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | // Not valid for this geometry type |
| 281 | 281 | // -------------------------------- |
| 282 | - public function x() { return NULL; } |
|
| 283 | - public function y() { return NULL; } |
|
| 284 | - public function startPoint() { return NULL; } |
|
| 285 | - public function endPoint() { return NULL; } |
|
| 286 | - public function isRing() { return NULL; } |
|
| 287 | - public function isClosed() { return NULL; } |
|
| 288 | - public function pointN($n) { return NULL; } |
|
| 289 | - public function exteriorRing() { return NULL; } |
|
| 282 | + public function x() { return NULL; } |
|
| 283 | + public function y() { return NULL; } |
|
| 284 | + public function startPoint() { return NULL; } |
|
| 285 | + public function endPoint() { return NULL; } |
|
| 286 | + public function isRing() { return NULL; } |
|
| 287 | + public function isClosed() { return NULL; } |
|
| 288 | + public function pointN($n) { return NULL; } |
|
| 289 | + public function exteriorRing() { return NULL; } |
|
| 290 | 290 | public function numInteriorRings() { return NULL; } |
| 291 | - public function interiorRingN($n) { return NULL; } |
|
| 292 | - public function pointOnSurface() { return NULL; } |
|
| 291 | + public function interiorRingN($n) { return NULL; } |
|
| 292 | + public function pointOnSurface() { return NULL; } |
|
| 293 | 293 | } |
| 294 | 294 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | foreach ($this->getPoints() as $delta => $point) { |
| 71 | 71 | $previous_point = $this->geometryN($delta); |
| 72 | 72 | if ($previous_point) { |
| 73 | - $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2)); |
|
| 73 | + $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY() - $point->getY()), 2)); |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | return $length; |
@@ -79,10 +79,10 @@ discard block |
||
| 79 | 79 | public function greatCircleLength($radius = 6378137) { |
| 80 | 80 | $length = 0; |
| 81 | 81 | $points = $this->getPoints(); |
| 82 | - for($i=0; $i<$this->numPoints()-1; $i++) { |
|
| 82 | + for ($i = 0; $i < $this->numPoints() - 1; $i++) { |
|
| 83 | 83 | $point = $points[$i]; |
| 84 | - $next_point = $points[$i+1]; |
|
| 85 | - if (!is_object($next_point)) {continue;} |
|
| 84 | + $next_point = $points[$i + 1]; |
|
| 85 | + if (!is_object($next_point)) {continue; } |
|
| 86 | 86 | // Great circle method |
| 87 | 87 | $lat1 = deg2rad($point->getY()); |
| 88 | 88 | $lat2 = deg2rad($next_point->getY()); |
@@ -90,15 +90,15 @@ discard block |
||
| 90 | 90 | $lon2 = deg2rad($next_point->getX()); |
| 91 | 91 | $dlon = $lon2 - $lon1; |
| 92 | 92 | $length += |
| 93 | - $radius * |
|
| 93 | + $radius* |
|
| 94 | 94 | atan2( |
| 95 | 95 | sqrt( |
| 96 | - pow(cos($lat2) * sin($dlon), 2) + |
|
| 97 | - pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2) |
|
| 96 | + pow(cos($lat2)*sin($dlon), 2) + |
|
| 97 | + pow(cos($lat1)*sin($lat2) - sin($lat1)*cos($lat2)*cos($dlon), 2) |
|
| 98 | 98 | ) |
| 99 | 99 | , |
| 100 | - sin($lat1) * sin($lat2) + |
|
| 101 | - cos($lat1) * cos($lat2) * cos($dlon) |
|
| 100 | + sin($lat1)*sin($lat2) + |
|
| 101 | + cos($lat1)*cos($lat2)*cos($dlon) |
|
| 102 | 102 | ); |
| 103 | 103 | } |
| 104 | 104 | // Returns length in meters. |
@@ -108,14 +108,14 @@ discard block |
||
| 108 | 108 | public function haversineLength() { |
| 109 | 109 | $degrees = 0; |
| 110 | 110 | $points = $this->getPoints(); |
| 111 | - for($i=0; $i<$this->numPoints()-1; $i++) { |
|
| 111 | + for ($i = 0; $i < $this->numPoints() - 1; $i++) { |
|
| 112 | 112 | $point = $points[$i]; |
| 113 | - $next_point = $points[$i+1]; |
|
| 114 | - if (!is_object($next_point)) {continue;} |
|
| 113 | + $next_point = $points[$i + 1]; |
|
| 114 | + if (!is_object($next_point)) {continue; } |
|
| 115 | 115 | $degree = rad2deg( |
| 116 | 116 | acos( |
| 117 | - sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) + |
|
| 118 | - cos(deg2rad($point->getY())) * cos(deg2rad($next_point->getY())) * |
|
| 117 | + sin(deg2rad($point->getY()))*sin(deg2rad($next_point->getY())) + |
|
| 118 | + cos(deg2rad($point->getY()))*cos(deg2rad($next_point->getY()))* |
|
| 119 | 119 | cos(deg2rad(abs($point->getX() - $next_point->getX()))) |
| 120 | 120 | ) |
| 121 | 121 | ); |
@@ -130,8 +130,8 @@ discard block |
||
| 130 | 130 | $points = $this->getPoints(); |
| 131 | 131 | |
| 132 | 132 | foreach ($points as $i => $point) { |
| 133 | - if (isset($points[$i+1])) { |
|
| 134 | - $parts[] = new LineString(array($point, $points[$i+1])); |
|
| 133 | + if (isset($points[$i + 1])) { |
|
| 134 | + $parts[] = new LineString(array($point, $points[$i + 1])); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | return $parts; |
@@ -168,18 +168,18 @@ discard block |
||
| 168 | 168 | $p3_x = $segment->endPoint()->x(); |
| 169 | 169 | $p3_y = $segment->endPoint()->y(); |
| 170 | 170 | |
| 171 | - $s1_x = $p1_x - $p0_x; $s1_y = $p1_y - $p0_y; |
|
| 172 | - $s2_x = $p3_x - $p2_x; $s2_y = $p3_y - $p2_y; |
|
| 171 | + $s1_x = $p1_x - $p0_x; $s1_y = $p1_y - $p0_y; |
|
| 172 | + $s2_x = $p3_x - $p2_x; $s2_y = $p3_y - $p2_y; |
|
| 173 | 173 | |
| 174 | - $fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y); |
|
| 175 | - $fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y); |
|
| 174 | + $fps = (-$s2_x*$s1_y) + ($s1_x*$s2_y); |
|
| 175 | + $fpt = (-$s2_x*$s1_y) + ($s1_x*$s2_y); |
|
| 176 | 176 | |
| 177 | 177 | if ($fps == 0 || $fpt == 0) { |
| 178 | 178 | return FALSE; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - $s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps; |
|
| 182 | - $t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt; |
|
| 181 | + $s = (-$s1_y*($p0_x - $p2_x) + $s1_x*($p0_y - $p2_y))/$fps; |
|
| 182 | + $t = ($s2_x*($p0_y - $p2_y) - $s2_y*($p0_x - $p2_x))/$fpt; |
|
| 183 | 183 | |
| 184 | 184 | if ($s > 0 && $s < 1 && $t > 0 && $t < 1) { |
| 185 | 185 | // Collision detected |
@@ -21,8 +21,8 @@ discard block |
||
| 21 | 21 | abstract public function geometryN($n); |
| 22 | 22 | abstract public function startPoint(); |
| 23 | 23 | abstract public function endPoint(); |
| 24 | - abstract public function isRing(); // Mssing dependancy |
|
| 25 | - abstract public function isClosed(); // Missing dependancy |
|
| 24 | + abstract public function isRing(); // Mssing dependancy |
|
| 25 | + abstract public function isClosed(); // Missing dependancy |
|
| 26 | 26 | abstract public function numPoints(); |
| 27 | 27 | abstract public function pointN($n); |
| 28 | 28 | abstract public function exteriorRing(); |
@@ -64,12 +64,12 @@ discard block |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $bbox = $this->getBBox(); |
| 67 | - $points = array ( |
|
| 68 | - new Point($bbox['maxx'],$bbox['miny']), |
|
| 69 | - new Point($bbox['maxx'],$bbox['maxy']), |
|
| 70 | - new Point($bbox['minx'],$bbox['maxy']), |
|
| 71 | - new Point($bbox['minx'],$bbox['miny']), |
|
| 72 | - new Point($bbox['maxx'],$bbox['miny']), |
|
| 67 | + $points = array( |
|
| 68 | + new Point($bbox['maxx'], $bbox['miny']), |
|
| 69 | + new Point($bbox['maxx'], $bbox['maxy']), |
|
| 70 | + new Point($bbox['minx'], $bbox['maxy']), |
|
| 71 | + new Point($bbox['minx'], $bbox['miny']), |
|
| 72 | + new Point($bbox['maxx'], $bbox['miny']), |
|
| 73 | 73 | ); |
| 74 | 74 | |
| 75 | 75 | $outer_boundary = new LineString($points); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | // It hasn't been set yet, generate it |
| 148 | 148 | if (geoPHP::geosInstalled()) { |
| 149 | 149 | $reader = new GEOSWKBReader(); |
| 150 | - $this->geos = $reader->readHEX($this->out('wkb',TRUE)); |
|
| 150 | + $this->geos = $reader->readHEX($this->out('wkb', TRUE)); |
|
| 151 | 151 | } |
| 152 | 152 | else { |
| 153 | 153 | $this->geos = FALSE; |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | static function getAdapterMap() {
|
| 94 | - return array ( |
|
| 94 | + return array( |
|
| 95 | 95 | 'wkt' => 'WKT', |
| 96 | 96 | 'ewkt' => 'EWKT', |
| 97 | 97 | 'wkb' => 'WKB', |
@@ -154,8 +154,8 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | // If the geometry cannot even theoretically be reduced more, then pass it back |
| 156 | 156 | if (gettype($geometry) == 'object') {
|
| 157 | - $passbacks = array('Point','LineString','Polygon');
|
|
| 158 | - if (in_array($geometry->geometryType(),$passbacks)) {
|
|
| 157 | + $passbacks = array('Point', 'LineString', 'Polygon');
|
|
| 158 | + if (in_array($geometry->geometryType(), $passbacks)) {
|
|
| 159 | 159 | return $geometry; |
| 160 | 160 | } |
| 161 | 161 | } |
@@ -163,8 +163,8 @@ discard block |
||
| 163 | 163 | // If it is a mutlti-geometry, check to see if it just has one member |
| 164 | 164 | // If it does, then pass the member, if not, then just pass back the geometry |
| 165 | 165 | if (gettype($geometry) == 'object') {
|
| 166 | - $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');
|
|
| 167 | - if (in_array(get_class($geometry),$passbacks)) {
|
|
| 166 | + $simple_collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon');
|
|
| 167 | + if (in_array(get_class($geometry), $passbacks)) {
|
|
| 168 | 168 | $components = $geometry->getComponents(); |
| 169 | 169 | if (count($components) == 1) {
|
| 170 | 170 | return $components[0]; |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | $geometries = array(); |
| 184 | 184 | $geom_types = array(); |
| 185 | 185 | |
| 186 | - $collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');
|
|
| 186 | + $collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon', 'GeometryCollection');
|
|
| 187 | 187 | |
| 188 | 188 | foreach ($geometry as $item) {
|
| 189 | 189 | if ($item) {
|
@@ -17,16 +17,16 @@ discard block |
||
| 17 | 17 | * @return Array the images list |
| 18 | 18 | * |
| 19 | 19 | */ |
| 20 | - public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
| 20 | + public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
| 21 | 21 | { |
| 22 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 23 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 24 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 22 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 23 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 24 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 25 | 25 | if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
| 26 | 26 | |
| 27 | 27 | $registration = trim($registration); |
| 28 | 28 | |
| 29 | - $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright |
|
| 29 | + $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright |
|
| 30 | 30 | FROM spotter_image |
| 31 | 31 | WHERE spotter_image.registration = :registration"; |
| 32 | 32 | |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
| 68 | 68 | elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
| 69 | 69 | if ($copyright != '') { |
| 70 | - $copyright = str_replace('Copyright ','',$copyright); |
|
| 71 | - $copyright = str_replace('© ','',$copyright); |
|
| 72 | - $copyright = str_replace('(c) ','',$copyright); |
|
| 70 | + $copyright = str_replace('Copyright ', '', $copyright); |
|
| 71 | + $copyright = str_replace('© ', '', $copyright); |
|
| 72 | + $copyright = str_replace('(c) ', '', $copyright); |
|
| 73 | 73 | } |
| 74 | 74 | return $copyright; |
| 75 | 75 | } |
@@ -80,22 +80,22 @@ discard block |
||
| 80 | 80 | * @return String either success or error |
| 81 | 81 | * |
| 82 | 82 | */ |
| 83 | - public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
| 83 | + public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
| 84 | 84 | { |
| 85 | 85 | global $globalAircraftImageFetch; |
| 86 | 86 | if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return ''; |
| 87 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 87 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 88 | 88 | $registration = trim($registration); |
| 89 | 89 | //getting the aircraft image |
| 90 | - $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
|
| 90 | + $image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao); |
|
| 91 | 91 | if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
| 92 | 92 | if ($image_url['original'] != '') { |
| 93 | - $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 93 | + $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
| 94 | 94 | try { |
| 95 | 95 | |
| 96 | 96 | $sth = $this->db->prepare($query); |
| 97 | - $sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website'])); |
|
| 98 | - } catch(PDOException $e) { |
|
| 97 | + $sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website'])); |
|
| 98 | + } catch (PDOException $e) { |
|
| 99 | 99 | echo $e->getMessage."\n"; |
| 100 | 100 | return "error"; |
| 101 | 101 | } |
@@ -116,10 +116,10 @@ discard block |
||
| 116 | 116 | global $globalAircraftImageSources, $globalIVAO; |
| 117 | 117 | $Spotter = new Spotter($this->db); |
| 118 | 118 | if (!isset($globalIVAO)) $globalIVAO = FALSE; |
| 119 | - $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
|
| 119 | + $aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING); |
|
| 120 | 120 | |
| 121 | 121 | if ($aircraft_registration != '') { |
| 122 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 122 | + if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 123 | 123 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
| 124 | 124 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
| 125 | 125 | if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
@@ -131,25 +131,25 @@ discard block |
||
| 131 | 131 | } elseif ($aircraft_icao != '') { |
| 132 | 132 | $aircraft_registration = $aircraft_icao; |
| 133 | 133 | $aircraft_name = ''; |
| 134 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
| 134 | + } else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 135 | 135 | |
| 136 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
| 136 | + if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
| 137 | 137 | |
| 138 | 138 | foreach ($globalAircraftImageSources as $source) { |
| 139 | 139 | $source = strtolower($source); |
| 140 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao); |
|
| 141 | - if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name); |
|
| 142 | - if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration,$aircraft_name); |
|
| 143 | - if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration,$aircraft_name); |
|
| 144 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name); |
|
| 145 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name); |
|
| 146 | - if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name); |
|
| 147 | - if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name); |
|
| 148 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration,$aircraft_name); |
|
| 149 | - if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name); |
|
| 140 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao, $airline_icao); |
|
| 141 | + if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration, $aircraft_name); |
|
| 142 | + if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration, $aircraft_name); |
|
| 143 | + if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration, $aircraft_name); |
|
| 144 | + if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration, $aircraft_name); |
|
| 145 | + if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration, $aircraft_name); |
|
| 146 | + if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration, $aircraft_name); |
|
| 147 | + if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration, $aircraft_name); |
|
| 148 | + if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration, $aircraft_name); |
|
| 149 | + if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration, $aircraft_name); |
|
| 150 | 150 | if (isset($images_array) && $images_array['original'] != '') return $images_array; |
| 151 | 151 | } |
| 152 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
| 152 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | /** |
@@ -160,24 +160,24 @@ discard block |
||
| 160 | 160 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 161 | 161 | * |
| 162 | 162 | */ |
| 163 | - public function fromPlanespotters($aircraft_registration, $aircraft_name='') { |
|
| 163 | + public function fromPlanespotters($aircraft_registration, $aircraft_name = '') { |
|
| 164 | 164 | $Common = new Common(); |
| 165 | 165 | // If aircraft registration is only number, also check with aircraft model |
| 166 | - if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') { |
|
| 167 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
| 166 | + if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') { |
|
| 167 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
| 168 | 168 | } else { |
| 169 | 169 | //$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss'; |
| 170 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
| 170 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | $data = $Common->getData($url); |
| 174 | 174 | if ($xml = simplexml_load_string($data)) { |
| 175 | 175 | if (isset($xml->channel->item)) { |
| 176 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 176 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 177 | 177 | $image_url['thumbnail'] = $thumbnail_url; |
| 178 | - $image_url['original'] = str_replace('thumbnail','original',$thumbnail_url); |
|
| 179 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
| 180 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 178 | + $image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url); |
|
| 179 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
| 180 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 181 | 181 | $image_url['source'] = 'planespotters'; |
| 182 | 182 | return $image_url; |
| 183 | 183 | } |
@@ -193,24 +193,24 @@ discard block |
||
| 193 | 193 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 194 | 194 | * |
| 195 | 195 | */ |
| 196 | - public function fromDeviantart($aircraft_registration, $aircraft_name='') { |
|
| 196 | + public function fromDeviantart($aircraft_registration, $aircraft_name = '') { |
|
| 197 | 197 | $Common = new Common(); |
| 198 | 198 | // If aircraft registration is only number, also check with aircraft model |
| 199 | - if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') { |
|
| 200 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name); |
|
| 199 | + if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') { |
|
| 200 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name); |
|
| 201 | 201 | } else { |
| 202 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration; |
|
| 202 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration; |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | $data = $Common->getData($url); |
| 206 | 206 | if ($xml = simplexml_load_string($data)) { |
| 207 | 207 | if (isset($xml->channel->item->link)) { |
| 208 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 208 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
| 209 | 209 | $image_url['thumbnail'] = $thumbnail_url; |
| 210 | - $original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
| 210 | + $original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
| 211 | 211 | $image_url['original'] = $original_url; |
| 212 | - $image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
| 213 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 212 | + $image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
| 213 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 214 | 214 | $image_url['source'] = 'deviantart'; |
| 215 | 215 | return $image_url; |
| 216 | 216 | } |
@@ -226,33 +226,33 @@ discard block |
||
| 226 | 226 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 227 | 227 | * |
| 228 | 228 | */ |
| 229 | - public function fromJetPhotos($aircraft_registration, $aircraft_name='') { |
|
| 229 | + public function fromJetPhotos($aircraft_registration, $aircraft_name = '') { |
|
| 230 | 230 | $Common = new Common(); |
| 231 | - $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
| 231 | + $url = 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
| 232 | 232 | |
| 233 | 233 | $data = $Common->getData($url); |
| 234 | 234 | $dom = new DOMDocument(); |
| 235 | 235 | @$dom->loadHTML($data); |
| 236 | 236 | $all_pics = array(); |
| 237 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
| 237 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
| 238 | 238 | if ($image->getAttribute('itemprop') == "http://schema.org/image") { |
| 239 | 239 | $all_pics[] = $image->getAttribute('src'); |
| 240 | 240 | } |
| 241 | 241 | } |
| 242 | 242 | $all_authors = array(); |
| 243 | - foreach($dom->getElementsByTagName('meta') as $author) { |
|
| 243 | + foreach ($dom->getElementsByTagName('meta') as $author) { |
|
| 244 | 244 | if ($author->getAttribute('itemprop') == "http://schema.org/author") { |
| 245 | 245 | $all_authors[] = $author->getAttribute('content'); |
| 246 | 246 | } |
| 247 | 247 | } |
| 248 | 248 | $all_ref = array(); |
| 249 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
| 249 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
| 250 | 250 | $all_ref[] = $link->getAttribute('href'); |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | if (isset($all_pics[0])) { |
| 254 | 254 | $image_url['thumbnail'] = $all_pics[0]; |
| 255 | - $image_url['original'] = str_replace('_tb','',$all_pics[0]); |
|
| 255 | + $image_url['original'] = str_replace('_tb', '', $all_pics[0]); |
|
| 256 | 256 | $image_url['copyright'] = $all_authors[0]; |
| 257 | 257 | $image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8]; |
| 258 | 258 | $image_url['source'] = 'JetPhotos'; |
@@ -269,24 +269,24 @@ discard block |
||
| 269 | 269 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 270 | 270 | * |
| 271 | 271 | */ |
| 272 | - public function fromPlanePictures($aircraft_registration, $aircraft_name='') { |
|
| 272 | + public function fromPlanePictures($aircraft_registration, $aircraft_name = '') { |
|
| 273 | 273 | $Common = new Common(); |
| 274 | - $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
| 274 | + $url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
| 275 | 275 | |
| 276 | 276 | $data = $Common->getData($url); |
| 277 | 277 | $dom = new DOMDocument(); |
| 278 | 278 | @$dom->loadHTML($data); |
| 279 | 279 | $all_pics = array(); |
| 280 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
| 280 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
| 281 | 281 | $all_pics[] = $image->getAttribute('src'); |
| 282 | 282 | } |
| 283 | 283 | $all_links = array(); |
| 284 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
| 285 | - $all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href')); |
|
| 284 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
| 285 | + $all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href')); |
|
| 286 | 286 | } |
| 287 | - if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1])) { |
|
| 287 | + if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1])) { |
|
| 288 | 288 | $image_url['thumbnail'] = 'http://www.planepictures.net'.$all_pics[1]; |
| 289 | - $image_url['original'] = 'http://www.planepictures.net'.str_replace('_TN','',$all_pics[1]); |
|
| 289 | + $image_url['original'] = 'http://www.planepictures.net'.str_replace('_TN', '', $all_pics[1]); |
|
| 290 | 290 | $image_url['copyright'] = $all_links[6]['text']; |
| 291 | 291 | $image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href']; |
| 292 | 292 | $image_url['source'] = 'PlanePictures'; |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 304 | 304 | * |
| 305 | 305 | */ |
| 306 | - public function fromFlickr($aircraft_registration,$aircraft_name='') { |
|
| 306 | + public function fromFlickr($aircraft_registration, $aircraft_name = '') { |
|
| 307 | 307 | $Common = new Common(); |
| 308 | 308 | |
| 309 | 309 | if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name); |
@@ -313,11 +313,11 @@ discard block |
||
| 313 | 313 | |
| 314 | 314 | if ($xml = simplexml_load_string($data)) { |
| 315 | 315 | if (isset($xml->channel->item)) { |
| 316 | - $original_url = trim((string)$xml->channel->item->enclosure->attributes()->url); |
|
| 316 | + $original_url = trim((string) $xml->channel->item->enclosure->attributes()->url); |
|
| 317 | 317 | $image_url['thumbnail'] = $original_url; |
| 318 | 318 | $image_url['original'] = $original_url; |
| 319 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
| 320 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
| 319 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
| 320 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
| 321 | 321 | $image_url['source'] = 'flickr'; |
| 322 | 322 | return $image_url; |
| 323 | 323 | } |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | |
| 330 | - public function fromIvaoMtl($aircraft_icao,$airline_icao) { |
|
| 330 | + public function fromIvaoMtl($aircraft_icao, $airline_icao) { |
|
| 331 | 331 | $Common = new Common(); |
| 332 | 332 | //echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg'; |
| 333 | 333 | if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) { |
@@ -352,16 +352,16 @@ discard block |
||
| 352 | 352 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 353 | 353 | * |
| 354 | 354 | */ |
| 355 | - public function fromBing($aircraft_registration,$aircraft_name='') { |
|
| 355 | + public function fromBing($aircraft_registration, $aircraft_name = '') { |
|
| 356 | 356 | global $globalImageBingKey; |
| 357 | 357 | $Common = new Common(); |
| 358 | 358 | if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false; |
| 359 | 359 | if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
| 360 | 360 | else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
| 361 | 361 | |
| 362 | - $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
|
| 362 | + $headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey)); |
|
| 363 | 363 | |
| 364 | - $data = $Common->getData($url,'get','',$headers); |
|
| 364 | + $data = $Common->getData($url, 'get', '', $headers); |
|
| 365 | 365 | |
| 366 | 366 | $result = json_decode($data); |
| 367 | 367 | if (isset($result->d->results[0]->MediaUrl)) { |
@@ -386,14 +386,14 @@ discard block |
||
| 386 | 386 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 387 | 387 | * |
| 388 | 388 | */ |
| 389 | - public function fromAirportData($aircraft_registration,$aircraft_name='') { |
|
| 389 | + public function fromAirportData($aircraft_registration, $aircraft_name = '') { |
|
| 390 | 390 | $Common = new Common(); |
| 391 | 391 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
| 392 | 392 | $data = $Common->getData($url); |
| 393 | 393 | $result = json_decode($data); |
| 394 | 394 | |
| 395 | 395 | if (isset($result->count) && $result->count > 0) { |
| 396 | - $image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image); |
|
| 396 | + $image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image); |
|
| 397 | 397 | $image_url['source_website'] = $result->data[0]->link; |
| 398 | 398 | $image_url['thumbnail'] = $result->data[0]->image; |
| 399 | 399 | $image_url['copyright'] = $result->data[0]->photographer; |
@@ -412,7 +412,7 @@ discard block |
||
| 412 | 412 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 413 | 413 | * |
| 414 | 414 | */ |
| 415 | - public function fromWikimedia($aircraft_registration,$aircraft_name='') { |
|
| 415 | + public function fromWikimedia($aircraft_registration, $aircraft_name = '') { |
|
| 416 | 416 | $Common = new Common(); |
| 417 | 417 | if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name); |
| 418 | 418 | else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft'; |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | $result = json_decode($data); |
| 422 | 422 | if (isset($result->query->search[0]->title)) { |
| 423 | 423 | $fileo = $result->query->search[0]->title; |
| 424 | - if (substr($fileo,-3) == 'pdf') return false; |
|
| 424 | + if (substr($fileo, -3) == 'pdf') return false; |
|
| 425 | 425 | $file = urlencode($fileo); |
| 426 | 426 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
| 427 | 427 | |
@@ -448,11 +448,11 @@ discard block |
||
| 448 | 448 | if (isset($result2->query->pages)) { |
| 449 | 449 | foreach ($result2->query->pages as $page) { |
| 450 | 450 | if (isset($page->imageinfo[0]->extmetadata->Artist)) { |
| 451 | - $image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
| 451 | + $image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
| 452 | 452 | if (isset($page->imageinfo[0]->extmetadata->License->value)) { |
| 453 | 453 | $image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')'; |
| 454 | 454 | } |
| 455 | - $image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright'])); |
|
| 455 | + $image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright'])); |
|
| 456 | 456 | return $image_url; |
| 457 | 457 | } |
| 458 | 458 | } |
@@ -472,21 +472,21 @@ discard block |
||
| 472 | 472 | * @return Array the aircraft thumbnail, orignal url and copyright |
| 473 | 473 | * |
| 474 | 474 | */ |
| 475 | - public function fromCustomSource($aircraft_registration,$aircraft_name='') { |
|
| 475 | + public function fromCustomSource($aircraft_registration, $aircraft_name = '') { |
|
| 476 | 476 | global $globalAircraftCustomSources; |
| 477 | 477 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
| 478 | 478 | if (!empty($globalAircraftImageCustomSources)) { |
| 479 | 479 | if (!isset($globalAircraftImageCustomSources[0])) $globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources; |
| 480 | 480 | foreach ($globalAircraftImageCustomSources as $source) { |
| 481 | 481 | $Common = new Common(); |
| 482 | - $url = str_replace('{registration}',$aircraft_registration,$source['original']); |
|
| 483 | - $url_thumbnail = str_replace('{registration}',$aircraft_registration,$source['original']); |
|
| 482 | + $url = str_replace('{registration}', $aircraft_registration, $source['original']); |
|
| 483 | + $url_thumbnail = str_replace('{registration}', $aircraft_registration, $source['original']); |
|
| 484 | 484 | if ($Common->urlexist($url)) { |
| 485 | 485 | $image_url['thumbnail'] = $url_thumbnail; |
| 486 | 486 | $image_url['original'] = $url; |
| 487 | 487 | if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
| 488 | 488 | else $exifCopyright = ''; |
| 489 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 489 | + if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
| 490 | 490 | else $image_url['copyright'] = $source['copyright']; |
| 491 | 491 | $image_url['source_website'] = $source['source_website']; |
| 492 | 492 | $image_url['source'] = $source['source']; |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 5 | 5 | $global_query = "SELECT spotter_output.* FROM spotter_output"; |
| 6 | 6 | |
| 7 | -class Spotter{ |
|
| 7 | +class Spotter { |
|
| 8 | 8 | public $db; |
| 9 | 9 | |
| 10 | 10 | function __construct($dbc = null) { |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | $sth = $this->db->prepare($query.$limitQuery); |
| 50 | 50 | $sth->execute($params); |
| 51 | 51 | } catch (PDOException $e) { |
| 52 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 52 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 53 | 53 | exit(); |
| 54 | 54 | } |
| 55 | 55 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $temp_array = array(); |
| 61 | 61 | |
| 62 | 62 | |
| 63 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 63 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 64 | 64 | { |
| 65 | 65 | $num_rows++; |
| 66 | 66 | $temp_array = array(); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | if (isset($row['route_stop'])) { |
| 106 | 106 | $temp_array['route_stop'] = $row['route_stop']; |
| 107 | 107 | if ($row['route_stop'] != '') { |
| 108 | - $allroute = explode(' ',$row['route_stop']); |
|
| 108 | + $allroute = explode(' ', $row['route_stop']); |
|
| 109 | 109 | |
| 110 | 110 | foreach ($allroute as $route) { |
| 111 | 111 | $route_airport_array = $this->getAllAirportInfo($route); |
@@ -156,11 +156,11 @@ discard block |
||
| 156 | 156 | { |
| 157 | 157 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 158 | 158 | } else { |
| 159 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 159 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 160 | 160 | } |
| 161 | 161 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 162 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 163 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 162 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 163 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 164 | 164 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 165 | 165 | |
| 166 | 166 | if (isset($row['aircraft_name']) && $row['aircraft_name'] != '' && isset($row['aircraft_shadow']) && $row['aircraft_shadow'] != '') { |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | $temp_array['airline_type'] = $row['airline_type']; |
| 217 | 217 | } |
| 218 | 218 | if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') { |
| 219 | - $acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'],3)); |
|
| 219 | + $acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'], 3)); |
|
| 220 | 220 | //$acars_array = ACARS->getLiveAcarsData('BA40YL'); |
| 221 | 221 | if (count($acars_array) > 0) { |
| 222 | 222 | $temp_array['acars'] = $acars_array; |
@@ -233,11 +233,11 @@ discard block |
||
| 233 | 233 | $temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg']; |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - if($temp_array['registration'] != "" || ($globalIVAO && $temp_array['aircraft_type'] != '')) |
|
| 236 | + if ($temp_array['registration'] != "" || ($globalIVAO && $temp_array['aircraft_type'] != '')) |
|
| 237 | 237 | { |
| 238 | 238 | if ($globalIVAO) { |
| 239 | - if (isset($temp_array['airline_icao'])) $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']); |
|
| 240 | - else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']); |
|
| 239 | + if (isset($temp_array['airline_icao'])) $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type'], $temp_array['airline_icao']); |
|
| 240 | + else $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type']); |
|
| 241 | 241 | } else $image_array = $Image->getSpotterImage($temp_array['registration']); |
| 242 | 242 | if (count($image_array) > 0) { |
| 243 | 243 | $temp_array['image'] = $image_array[0]['image']; |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | if (isset($row['arrival_airport_time']) && $row['arrival_airport_time'] != '') { |
| 261 | 261 | $temp_array['arrival_airport_time'] = $row['arrival_airport_time']; |
| 262 | 262 | } |
| 263 | - if ((!isset($globalIVAO) || ! $globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
|
| 263 | + if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) { |
|
| 264 | 264 | $schedule_array = $Schedule->getSchedule($temp_array['ident']); |
| 265 | 265 | //print_r($schedule_array); |
| 266 | 266 | if (count($schedule_array) > 0) { |
@@ -341,12 +341,12 @@ discard block |
||
| 341 | 341 | if (isset($row['squawk'])) { |
| 342 | 342 | $temp_array['squawk'] = $row['squawk']; |
| 343 | 343 | if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) { |
| 344 | - $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']); |
|
| 345 | - if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 344 | + $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['country_iso2']); |
|
| 345 | + if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry); |
|
| 346 | 346 | } elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) { |
| 347 | - $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']); |
|
| 348 | - if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 349 | - } elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry); |
|
| 347 | + $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['over_country']); |
|
| 348 | + if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry); |
|
| 349 | + } elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry); |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | $temp_array['query_number_rows'] = $num_rows; |
@@ -365,7 +365,7 @@ discard block |
||
| 365 | 365 | * @return Array the spotter information |
| 366 | 366 | * |
| 367 | 367 | */ |
| 368 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '') |
|
| 368 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '') |
|
| 369 | 369 | { |
| 370 | 370 | global $globalTimezone, $globalDBdriver; |
| 371 | 371 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -382,8 +382,8 @@ discard block |
||
| 382 | 382 | return false; |
| 383 | 383 | } else { |
| 384 | 384 | $q_array = explode(" ", $q); |
| 385 | - foreach ($q_array as $q_item){ |
|
| 386 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 385 | + foreach ($q_array as $q_item) { |
|
| 386 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 387 | 387 | $additional_query .= " AND ("; |
| 388 | 388 | if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR "; |
| 389 | 389 | $additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -415,37 +415,37 @@ discard block |
||
| 415 | 415 | |
| 416 | 416 | if ($registration != "") |
| 417 | 417 | { |
| 418 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 418 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 419 | 419 | if (!is_string($registration)) |
| 420 | 420 | { |
| 421 | 421 | return false; |
| 422 | 422 | } else { |
| 423 | 423 | $additional_query .= " AND spotter_output.registration = :registration"; |
| 424 | - $query_values = array_merge($query_values,array(':registration' => $registration)); |
|
| 424 | + $query_values = array_merge($query_values, array(':registration' => $registration)); |
|
| 425 | 425 | } |
| 426 | 426 | } |
| 427 | 427 | |
| 428 | 428 | if ($aircraft_icao != "") |
| 429 | 429 | { |
| 430 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 430 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 431 | 431 | if (!is_string($aircraft_icao)) |
| 432 | 432 | { |
| 433 | 433 | return false; |
| 434 | 434 | } else { |
| 435 | 435 | $additional_query .= " AND spotter_output.aircraft_icao = :aircraft_icao"; |
| 436 | - $query_values = array_merge($query_values,array(':aircraft_icao' => $aircraft_icao)); |
|
| 436 | + $query_values = array_merge($query_values, array(':aircraft_icao' => $aircraft_icao)); |
|
| 437 | 437 | } |
| 438 | 438 | } |
| 439 | 439 | |
| 440 | 440 | if ($aircraft_manufacturer != "") |
| 441 | 441 | { |
| 442 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 442 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 443 | 443 | if (!is_string($aircraft_manufacturer)) |
| 444 | 444 | { |
| 445 | 445 | return false; |
| 446 | 446 | } else { |
| 447 | 447 | $additional_query .= " AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer"; |
| 448 | - $query_values = array_merge($query_values,array(':aircraft_manufacturer' => $aircraft_manufacturer)); |
|
| 448 | + $query_values = array_merge($query_values, array(':aircraft_manufacturer' => $aircraft_manufacturer)); |
|
| 449 | 449 | } |
| 450 | 450 | } |
| 451 | 451 | |
@@ -461,25 +461,25 @@ discard block |
||
| 461 | 461 | |
| 462 | 462 | if ($airline_icao != "") |
| 463 | 463 | { |
| 464 | - $registration = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 464 | + $registration = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 465 | 465 | if (!is_string($airline_icao)) |
| 466 | 466 | { |
| 467 | 467 | return false; |
| 468 | 468 | } else { |
| 469 | 469 | $additional_query .= " AND spotter_output.airline_icao = :airline_icao"; |
| 470 | - $query_values = array_merge($query_values,array(':airline_icao' => $airline_icao)); |
|
| 470 | + $query_values = array_merge($query_values, array(':airline_icao' => $airline_icao)); |
|
| 471 | 471 | } |
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | if ($airline_country != "") |
| 475 | 475 | { |
| 476 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 476 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 477 | 477 | if (!is_string($airline_country)) |
| 478 | 478 | { |
| 479 | 479 | return false; |
| 480 | 480 | } else { |
| 481 | 481 | $additional_query .= " AND spotter_output.airline_country = :airline_country"; |
| 482 | - $query_values = array_merge($query_values,array(':airline_country' => $airline_country)); |
|
| 482 | + $query_values = array_merge($query_values, array(':airline_country' => $airline_country)); |
|
| 483 | 483 | } |
| 484 | 484 | } |
| 485 | 485 | |
@@ -506,31 +506,31 @@ discard block |
||
| 506 | 506 | |
| 507 | 507 | if ($airport != "") |
| 508 | 508 | { |
| 509 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 509 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 510 | 510 | if (!is_string($airport)) |
| 511 | 511 | { |
| 512 | 512 | return false; |
| 513 | 513 | } else { |
| 514 | 514 | $additional_query .= " AND (spotter_output.departure_airport_icao = :airport OR spotter_output.arrival_airport_icao = :airport)"; |
| 515 | - $query_values = array_merge($query_values,array(':airport' => $airport)); |
|
| 515 | + $query_values = array_merge($query_values, array(':airport' => $airport)); |
|
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | 518 | |
| 519 | 519 | if ($airport_country != "") |
| 520 | 520 | { |
| 521 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 521 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 522 | 522 | if (!is_string($airport_country)) |
| 523 | 523 | { |
| 524 | 524 | return false; |
| 525 | 525 | } else { |
| 526 | 526 | $additional_query .= " AND (spotter_output.departure_airport_country = :airport_country OR spotter_output.arrival_airport_country = :airport_country)"; |
| 527 | - $query_values = array_merge($query_values,array(':airport_country' => $airport_country)); |
|
| 527 | + $query_values = array_merge($query_values, array(':airport_country' => $airport_country)); |
|
| 528 | 528 | } |
| 529 | 529 | } |
| 530 | 530 | |
| 531 | 531 | if ($callsign != "") |
| 532 | 532 | { |
| 533 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 533 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 534 | 534 | if (!is_string($callsign)) |
| 535 | 535 | { |
| 536 | 536 | return false; |
@@ -538,79 +538,79 @@ discard block |
||
| 538 | 538 | $translate = $Translation->ident2icao($callsign); |
| 539 | 539 | if ($translate != $callsign) { |
| 540 | 540 | $additional_query .= " AND (spotter_output.ident = :callsign OR spotter_output.ident = :translate)"; |
| 541 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 541 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 542 | 542 | } else { |
| 543 | 543 | $additional_query .= " AND spotter_output.ident = :callsign"; |
| 544 | - $query_values = array_merge($query_values,array(':callsign' => $callsign)); |
|
| 544 | + $query_values = array_merge($query_values, array(':callsign' => $callsign)); |
|
| 545 | 545 | } |
| 546 | 546 | } |
| 547 | 547 | } |
| 548 | 548 | |
| 549 | 549 | if ($owner != "") |
| 550 | 550 | { |
| 551 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 551 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 552 | 552 | if (!is_string($owner)) |
| 553 | 553 | { |
| 554 | 554 | return false; |
| 555 | 555 | } else { |
| 556 | 556 | $additional_query .= " AND spotter_output.owner_name = :owner"; |
| 557 | - $query_values = array_merge($query_values,array(':owner' => $owner)); |
|
| 557 | + $query_values = array_merge($query_values, array(':owner' => $owner)); |
|
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | if ($pilot_name != "") |
| 562 | 562 | { |
| 563 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 563 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 564 | 564 | if (!is_string($pilot_name)) |
| 565 | 565 | { |
| 566 | 566 | return false; |
| 567 | 567 | } else { |
| 568 | 568 | $additional_query .= " AND spotter_output.pilot_name = :pilot_name"; |
| 569 | - $query_values = array_merge($query_values,array(':pilot_name' => $pilot_name)); |
|
| 569 | + $query_values = array_merge($query_values, array(':pilot_name' => $pilot_name)); |
|
| 570 | 570 | } |
| 571 | 571 | } |
| 572 | 572 | |
| 573 | 573 | if ($pilot_id != "") |
| 574 | 574 | { |
| 575 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 575 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 576 | 576 | if (!is_string($pilot_id)) |
| 577 | 577 | { |
| 578 | 578 | return false; |
| 579 | 579 | } else { |
| 580 | 580 | $additional_query .= " AND spotter_output.pilot_id = :pilot_id"; |
| 581 | - $query_values = array_merge($query_values,array(':pilot_id' => $pilot_id)); |
|
| 581 | + $query_values = array_merge($query_values, array(':pilot_id' => $pilot_id)); |
|
| 582 | 582 | } |
| 583 | 583 | } |
| 584 | 584 | |
| 585 | 585 | if ($departure_airport_route != "") |
| 586 | 586 | { |
| 587 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 587 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 588 | 588 | if (!is_string($departure_airport_route)) |
| 589 | 589 | { |
| 590 | 590 | return false; |
| 591 | 591 | } else { |
| 592 | 592 | $additional_query .= " AND spotter_output.departure_airport_icao = :departure_airport_route"; |
| 593 | - $query_values = array_merge($query_values,array(':departure_airport_route' => $departure_airport_route)); |
|
| 593 | + $query_values = array_merge($query_values, array(':departure_airport_route' => $departure_airport_route)); |
|
| 594 | 594 | } |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | 597 | if ($arrival_airport_route != "") |
| 598 | 598 | { |
| 599 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 599 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 600 | 600 | if (!is_string($arrival_airport_route)) |
| 601 | 601 | { |
| 602 | 602 | return false; |
| 603 | 603 | } else { |
| 604 | 604 | $additional_query .= " AND spotter_output.arrival_airport_icao = :arrival_airport_route"; |
| 605 | - $query_values = array_merge($query_values,array(':arrival_airport_route' => $arrival_airport_route)); |
|
| 605 | + $query_values = array_merge($query_values, array(':arrival_airport_route' => $arrival_airport_route)); |
|
| 606 | 606 | } |
| 607 | 607 | } |
| 608 | 608 | |
| 609 | 609 | if ($altitude != "") |
| 610 | 610 | { |
| 611 | 611 | $altitude_array = explode(",", $altitude); |
| 612 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 613 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 612 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 613 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 614 | 614 | |
| 615 | 615 | if ($altitude_array[1] != "") |
| 616 | 616 | { |
@@ -626,8 +626,8 @@ discard block |
||
| 626 | 626 | if ($date_posted != "") |
| 627 | 627 | { |
| 628 | 628 | $date_array = explode(",", $date_posted); |
| 629 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 630 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 629 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 630 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 631 | 631 | |
| 632 | 632 | if ($globalTimezone != '') { |
| 633 | 633 | date_default_timezone_set($globalTimezone); |
@@ -658,8 +658,8 @@ discard block |
||
| 658 | 658 | { |
| 659 | 659 | $limit_array = explode(",", $limit); |
| 660 | 660 | |
| 661 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 662 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 661 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 662 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 663 | 663 | |
| 664 | 664 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 665 | 665 | { |
@@ -688,24 +688,24 @@ discard block |
||
| 688 | 688 | |
| 689 | 689 | |
| 690 | 690 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 691 | - $dist = number_format($dist*0.621371,2,'.',''); // convert km to mile |
|
| 691 | + $dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile |
|
| 692 | 692 | |
| 693 | 693 | if ($globalDBdriver == 'mysql') { |
| 694 | - $query="SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance |
|
| 694 | + $query = "SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance |
|
| 695 | 695 | FROM spotter_output, spotter_archive WHERE spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND spotter_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and spotter_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 696 | 696 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query; |
| 697 | 697 | } else { |
| 698 | - $query="SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 698 | + $query = "SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 699 | 699 | FROM spotter_output, spotter_archive WHERE spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 700 | 700 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$orderby_query; |
| 701 | 701 | } |
| 702 | 702 | } else { |
| 703 | - $query = "SELECT spotter_output.* FROM spotter_output |
|
| 703 | + $query = "SELECT spotter_output.* FROM spotter_output |
|
| 704 | 704 | WHERE spotter_output.ident <> '' |
| 705 | 705 | ".$additional_query." |
| 706 | 706 | ".$orderby_query; |
| 707 | 707 | } |
| 708 | - $spotter_array = $this->getDataFromDB($query, $query_values,$limit_query); |
|
| 708 | + $spotter_array = $this->getDataFromDB($query, $query_values, $limit_query); |
|
| 709 | 709 | return $spotter_array; |
| 710 | 710 | } |
| 711 | 711 | |
@@ -726,8 +726,8 @@ discard block |
||
| 726 | 726 | { |
| 727 | 727 | $limit_array = explode(",", $limit); |
| 728 | 728 | |
| 729 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 730 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 729 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 730 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 731 | 731 | |
| 732 | 732 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 733 | 733 | { |
@@ -744,9 +744,9 @@ discard block |
||
| 744 | 744 | $orderby_query = " ORDER BY spotter_output.date DESC"; |
| 745 | 745 | } |
| 746 | 746 | |
| 747 | - $query = $global_query." ".$orderby_query; |
|
| 747 | + $query = $global_query." ".$orderby_query; |
|
| 748 | 748 | |
| 749 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query); |
|
| 749 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
|
| 750 | 750 | |
| 751 | 751 | return $spotter_array; |
| 752 | 752 | } |
@@ -792,34 +792,34 @@ discard block |
||
| 792 | 792 | { |
| 793 | 793 | return false; |
| 794 | 794 | } else { |
| 795 | - if ($interval == "30m"){ |
|
| 795 | + if ($interval == "30m") { |
|
| 796 | 796 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) <= $this_output.date '; |
| 797 | - } else if ($interval == "1h"){ |
|
| 797 | + } else if ($interval == "1h") { |
|
| 798 | 798 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) <= $this_output.date '; |
| 799 | - } else if ($interval == "3h"){ |
|
| 799 | + } else if ($interval == "3h") { |
|
| 800 | 800 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 3 HOUR) <= $this_output.date '; |
| 801 | - } else if ($interval == "6h"){ |
|
| 801 | + } else if ($interval == "6h") { |
|
| 802 | 802 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 6 HOUR) <= $this_output.date '; |
| 803 | - } else if ($interval == "12h"){ |
|
| 803 | + } else if ($interval == "12h") { |
|
| 804 | 804 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 HOUR) <= $this_output.date '; |
| 805 | - } else if ($interval == "24h"){ |
|
| 805 | + } else if ($interval == "24h") { |
|
| 806 | 806 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 24 HOUR) <= $this_output.date '; |
| 807 | - } else if ($interval == "7d"){ |
|
| 807 | + } else if ($interval == "7d") { |
|
| 808 | 808 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) <= $this_output.date '; |
| 809 | - } else if ($interval == "30d"){ |
|
| 809 | + } else if ($interval == "30d") { |
|
| 810 | 810 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 DAY) <= $this_output.date '; |
| 811 | 811 | } |
| 812 | 812 | } |
| 813 | 813 | } |
| 814 | 814 | |
| 815 | - $query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output |
|
| 815 | + $query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output |
|
| 816 | 816 | WHERE spotter_output.latitude <> '' |
| 817 | 817 | AND spotter_output.longitude <> '' |
| 818 | 818 | ".$additional_query." |
| 819 | 819 | HAVING distance < :radius |
| 820 | 820 | ORDER BY distance"; |
| 821 | 821 | |
| 822 | - $spotter_array = $this->getDataFromDB($query, array(':radius' => $radius),$limit_query); |
|
| 822 | + $spotter_array = $this->getDataFromDB($query, array(':radius' => $radius), $limit_query); |
|
| 823 | 823 | |
| 824 | 824 | return $spotter_array; |
| 825 | 825 | } |
@@ -841,8 +841,8 @@ discard block |
||
| 841 | 841 | { |
| 842 | 842 | $limit_array = explode(",", $limit); |
| 843 | 843 | |
| 844 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 845 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 844 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 845 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 846 | 846 | |
| 847 | 847 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 848 | 848 | { |
@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 860 | 860 | } |
| 861 | 861 | |
| 862 | - $query = $global_query." WHERE spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 862 | + $query = $global_query." WHERE spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 863 | 863 | |
| 864 | 864 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 865 | 865 | |
@@ -883,8 +883,8 @@ discard block |
||
| 883 | 883 | { |
| 884 | 884 | $limit_array = explode(",", $limit); |
| 885 | 885 | |
| 886 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 887 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 886 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 887 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 888 | 888 | |
| 889 | 889 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 890 | 890 | { |
@@ -901,7 +901,7 @@ discard block |
||
| 901 | 901 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 902 | 902 | } |
| 903 | 903 | |
| 904 | - $query = $global_query." WHERE spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 904 | + $query = $global_query." WHERE spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 905 | 905 | |
| 906 | 906 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 907 | 907 | |
@@ -925,8 +925,8 @@ discard block |
||
| 925 | 925 | { |
| 926 | 926 | $limit_array = explode(",", $limit); |
| 927 | 927 | |
| 928 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 929 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 928 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 929 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 930 | 930 | |
| 931 | 931 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 932 | 932 | { |
@@ -943,7 +943,7 @@ discard block |
||
| 943 | 943 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 944 | 944 | } |
| 945 | 945 | |
| 946 | - $query = $global_query." WHERE spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 946 | + $query = $global_query." WHERE spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 947 | 947 | |
| 948 | 948 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 949 | 949 | |
@@ -967,8 +967,8 @@ discard block |
||
| 967 | 967 | { |
| 968 | 968 | $limit_array = explode(",", $limit); |
| 969 | 969 | |
| 970 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 970 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | 972 | |
| 973 | 973 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 974 | 974 | { |
@@ -985,7 +985,7 @@ discard block |
||
| 985 | 985 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 986 | 986 | } |
| 987 | 987 | |
| 988 | - $query = $global_query." WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 988 | + $query = $global_query." WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 989 | 989 | |
| 990 | 990 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 991 | 991 | |
@@ -1009,8 +1009,8 @@ discard block |
||
| 1009 | 1009 | { |
| 1010 | 1010 | $limit_array = explode(",", $limit); |
| 1011 | 1011 | |
| 1012 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1013 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1012 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1013 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1014 | 1014 | |
| 1015 | 1015 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1016 | 1016 | { |
@@ -1027,7 +1027,7 @@ discard block |
||
| 1027 | 1027 | $orderby_query = " ORDER BY spotter_output.date DESC "; |
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | - $query = $global_query." WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1030 | + $query = $global_query." WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query; |
|
| 1031 | 1031 | |
| 1032 | 1032 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1033 | 1033 | |
@@ -1060,9 +1060,9 @@ discard block |
||
| 1060 | 1060 | } |
| 1061 | 1061 | } |
| 1062 | 1062 | |
| 1063 | - $query = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." "; |
|
| 1063 | + $query = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." "; |
|
| 1064 | 1064 | |
| 1065 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 1065 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 1066 | 1066 | |
| 1067 | 1067 | return $spotter_array; |
| 1068 | 1068 | } |
@@ -1099,8 +1099,8 @@ discard block |
||
| 1099 | 1099 | { |
| 1100 | 1100 | $limit_array = explode(",", $limit); |
| 1101 | 1101 | |
| 1102 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1103 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1102 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1103 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1104 | 1104 | |
| 1105 | 1105 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1106 | 1106 | { |
@@ -1155,8 +1155,8 @@ discard block |
||
| 1155 | 1155 | { |
| 1156 | 1156 | $limit_array = explode(",", $limit); |
| 1157 | 1157 | |
| 1158 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1159 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1158 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1159 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1160 | 1160 | |
| 1161 | 1161 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1162 | 1162 | { |
@@ -1210,8 +1210,8 @@ discard block |
||
| 1210 | 1210 | { |
| 1211 | 1211 | $limit_array = explode(",", $limit); |
| 1212 | 1212 | |
| 1213 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1214 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1213 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1214 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1215 | 1215 | |
| 1216 | 1216 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1217 | 1217 | { |
@@ -1267,8 +1267,8 @@ discard block |
||
| 1267 | 1267 | { |
| 1268 | 1268 | $limit_array = explode(",", $limit); |
| 1269 | 1269 | |
| 1270 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1271 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1270 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1271 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1272 | 1272 | |
| 1273 | 1273 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1274 | 1274 | { |
@@ -1321,8 +1321,8 @@ discard block |
||
| 1321 | 1321 | { |
| 1322 | 1322 | $limit_array = explode(",", $limit); |
| 1323 | 1323 | |
| 1324 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1325 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1324 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1325 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1326 | 1326 | |
| 1327 | 1327 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1328 | 1328 | { |
@@ -1380,8 +1380,8 @@ discard block |
||
| 1380 | 1380 | { |
| 1381 | 1381 | $limit_array = explode(",", $limit); |
| 1382 | 1382 | |
| 1383 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1384 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1383 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1384 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1385 | 1385 | |
| 1386 | 1386 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1387 | 1387 | { |
@@ -1437,8 +1437,8 @@ discard block |
||
| 1437 | 1437 | { |
| 1438 | 1438 | $limit_array = explode(",", $limit); |
| 1439 | 1439 | |
| 1440 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1441 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1440 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1441 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1442 | 1442 | |
| 1443 | 1443 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1444 | 1444 | { |
@@ -1493,8 +1493,8 @@ discard block |
||
| 1493 | 1493 | { |
| 1494 | 1494 | $limit_array = explode(",", $limit); |
| 1495 | 1495 | |
| 1496 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1497 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1496 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1497 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1498 | 1498 | |
| 1499 | 1499 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1500 | 1500 | { |
@@ -1541,7 +1541,7 @@ discard block |
||
| 1541 | 1541 | { |
| 1542 | 1542 | return false; |
| 1543 | 1543 | } else { |
| 1544 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1544 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1545 | 1545 | $additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao)"; |
| 1546 | 1546 | $query_values = array(':departure_airport_icao' => $departure_airport_icao); |
| 1547 | 1547 | } |
@@ -1553,9 +1553,9 @@ discard block |
||
| 1553 | 1553 | { |
| 1554 | 1554 | return false; |
| 1555 | 1555 | } else { |
| 1556 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1556 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1557 | 1557 | $additional_query .= " AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)"; |
| 1558 | - $query_values = array_merge($query_values,array(':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 1558 | + $query_values = array_merge($query_values, array(':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 1559 | 1559 | } |
| 1560 | 1560 | } |
| 1561 | 1561 | |
@@ -1563,8 +1563,8 @@ discard block |
||
| 1563 | 1563 | { |
| 1564 | 1564 | $limit_array = explode(",", $limit); |
| 1565 | 1565 | |
| 1566 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1567 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1566 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1567 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1568 | 1568 | |
| 1569 | 1569 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1570 | 1570 | { |
@@ -1608,8 +1608,8 @@ discard block |
||
| 1608 | 1608 | { |
| 1609 | 1609 | $limit_array = explode(",", $limit); |
| 1610 | 1610 | |
| 1611 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1612 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1611 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1612 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1613 | 1613 | |
| 1614 | 1614 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1615 | 1615 | { |
@@ -1626,7 +1626,7 @@ discard block |
||
| 1626 | 1626 | $orderby_query = " ORDER BY spotter_output.date DESC"; |
| 1627 | 1627 | } |
| 1628 | 1628 | |
| 1629 | - $query = $global_query." WHERE spotter_output.highlight <> '' ".$orderby_query; |
|
| 1629 | + $query = $global_query." WHERE spotter_output.highlight <> '' ".$orderby_query; |
|
| 1630 | 1630 | |
| 1631 | 1631 | $spotter_array = $this->getDataFromDB($query, array(), $limit_query); |
| 1632 | 1632 | |
@@ -1647,14 +1647,14 @@ discard block |
||
| 1647 | 1647 | |
| 1648 | 1648 | date_default_timezone_set('UTC'); |
| 1649 | 1649 | |
| 1650 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 1650 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 1651 | 1651 | |
| 1652 | 1652 | |
| 1653 | - $query = $global_query." WHERE spotter_output.highlight <> '' AND spotter_output.registration = :registration"; |
|
| 1653 | + $query = $global_query." WHERE spotter_output.highlight <> '' AND spotter_output.registration = :registration"; |
|
| 1654 | 1654 | $sth = $this->db->prepare($query); |
| 1655 | 1655 | $sth->execute(array(':registration' => $registration)); |
| 1656 | 1656 | |
| 1657 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1657 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1658 | 1658 | { |
| 1659 | 1659 | $highlight = $row['highlight']; |
| 1660 | 1660 | } |
@@ -1670,16 +1670,16 @@ discard block |
||
| 1670 | 1670 | * @return String usage |
| 1671 | 1671 | * |
| 1672 | 1672 | */ |
| 1673 | - public function getSquawkUsage($squawk = '',$country = 'FR') |
|
| 1673 | + public function getSquawkUsage($squawk = '', $country = 'FR') |
|
| 1674 | 1674 | { |
| 1675 | 1675 | |
| 1676 | - $squawk = filter_var($squawk,FILTER_SANITIZE_STRING); |
|
| 1677 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 1676 | + $squawk = filter_var($squawk, FILTER_SANITIZE_STRING); |
|
| 1677 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 1678 | 1678 | |
| 1679 | 1679 | $query_values = array(); |
| 1680 | 1680 | |
| 1681 | - $query = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1"; |
|
| 1682 | - $query_values = array(':squawk' => ltrim($squawk,'0'), ':country' => $country); |
|
| 1681 | + $query = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1"; |
|
| 1682 | + $query_values = array(':squawk' => ltrim($squawk, '0'), ':country' => $country); |
|
| 1683 | 1683 | |
| 1684 | 1684 | $sth = $this->db->prepare($query); |
| 1685 | 1685 | $sth->execute($query_values); |
@@ -1702,11 +1702,11 @@ discard block |
||
| 1702 | 1702 | public function getAirportIcao($airport_iata = '') |
| 1703 | 1703 | { |
| 1704 | 1704 | |
| 1705 | - $airport_iata = filter_var($airport_iata,FILTER_SANITIZE_STRING); |
|
| 1705 | + $airport_iata = filter_var($airport_iata, FILTER_SANITIZE_STRING); |
|
| 1706 | 1706 | |
| 1707 | 1707 | $query_values = array(); |
| 1708 | 1708 | |
| 1709 | - $query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1"; |
|
| 1709 | + $query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1"; |
|
| 1710 | 1710 | $query_values = array(':airport' => $airport_iata); |
| 1711 | 1711 | |
| 1712 | 1712 | |
@@ -1728,14 +1728,14 @@ discard block |
||
| 1728 | 1728 | * @return Float distance to the airport |
| 1729 | 1729 | * |
| 1730 | 1730 | */ |
| 1731 | - public function getAirportDistance($airport_icao,$latitude,$longitude) |
|
| 1731 | + public function getAirportDistance($airport_icao, $latitude, $longitude) |
|
| 1732 | 1732 | { |
| 1733 | 1733 | |
| 1734 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 1734 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 1735 | 1735 | |
| 1736 | 1736 | $query_values = array(); |
| 1737 | 1737 | |
| 1738 | - $query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1"; |
|
| 1738 | + $query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1"; |
|
| 1739 | 1739 | $query_values = array(':airport' => $airport_icao); |
| 1740 | 1740 | $sth = $this->db->prepare($query); |
| 1741 | 1741 | $sth->execute($query_values); |
@@ -1744,7 +1744,7 @@ discard block |
||
| 1744 | 1744 | $airport_latitude = $row['latitude']; |
| 1745 | 1745 | $airport_longitude = $row['longitude']; |
| 1746 | 1746 | $Common = new Common(); |
| 1747 | - return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude); |
|
| 1747 | + return $Common->distance($latitude, $longitude, $airport_latitude, $airport_longitude); |
|
| 1748 | 1748 | } else return ''; |
| 1749 | 1749 | } |
| 1750 | 1750 | |
@@ -1758,11 +1758,11 @@ discard block |
||
| 1758 | 1758 | public function getAllAirportInfo($airport = '') |
| 1759 | 1759 | { |
| 1760 | 1760 | |
| 1761 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 1761 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 1762 | 1762 | |
| 1763 | 1763 | $query_values = array(); |
| 1764 | 1764 | if ($airport == 'NA') { |
| 1765 | - return array(array('name' => 'Not available','city' => 'N/A', 'country' => 'N/A','iata' => 'NA','icao' => 'NA','altitude' => NULL,'latitude' => 0,'longitude' => 0,'type' => 'NA','home_link' => '','wikipedia_link' => '','image_thumb' => '', 'image' => '')); |
|
| 1765 | + return array(array('name' => 'Not available', 'city' => 'N/A', 'country' => 'N/A', 'iata' => 'NA', 'icao' => 'NA', 'altitude' => NULL, 'latitude' => 0, 'longitude' => 0, 'type' => 'NA', 'home_link' => '', 'wikipedia_link' => '', 'image_thumb' => '', 'image' => '')); |
|
| 1766 | 1766 | } elseif ($airport == '') { |
| 1767 | 1767 | $query = "SELECT airport.name, airport.city, airport.country, airport.iata, airport.icao, airport.latitude, airport.longitude, airport.altitude, airport.type, airport.home_link, airport.wikipedia_link, airport.image_thumb, airport.image FROM airport"; |
| 1768 | 1768 | } else { |
@@ -1810,14 +1810,14 @@ discard block |
||
| 1810 | 1810 | { |
| 1811 | 1811 | $lst_countries = ''; |
| 1812 | 1812 | foreach ($countries as $country) { |
| 1813 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 1813 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 1814 | 1814 | if ($lst_countries == '') { |
| 1815 | 1815 | $lst_countries = "'".$country."'"; |
| 1816 | 1816 | } else { |
| 1817 | 1817 | $lst_countries .= ",'".$country."'"; |
| 1818 | 1818 | } |
| 1819 | 1819 | } |
| 1820 | - $query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")"; |
|
| 1820 | + $query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")"; |
|
| 1821 | 1821 | |
| 1822 | 1822 | $sth = $this->db->prepare($query); |
| 1823 | 1823 | $sth->execute(); |
@@ -1825,7 +1825,7 @@ discard block |
||
| 1825 | 1825 | $airport_array = array(); |
| 1826 | 1826 | $temp_array = array(); |
| 1827 | 1827 | |
| 1828 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1828 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1829 | 1829 | { |
| 1830 | 1830 | $temp_array['name'] = $row['name']; |
| 1831 | 1831 | $temp_array['city'] = $row['city']; |
@@ -1854,10 +1854,10 @@ discard block |
||
| 1854 | 1854 | global $globalDBdriver; |
| 1855 | 1855 | $lst_countries = ''; |
| 1856 | 1856 | if (is_array($coord)) { |
| 1857 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1858 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1859 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1860 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1857 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1858 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1859 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1860 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1861 | 1861 | } |
| 1862 | 1862 | if ($globalDBdriver == 'mysql') { |
| 1863 | 1863 | $query = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'"; |
@@ -1870,7 +1870,7 @@ discard block |
||
| 1870 | 1870 | $airport_array = array(); |
| 1871 | 1871 | $temp_array = array(); |
| 1872 | 1872 | |
| 1873 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1873 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1874 | 1874 | { |
| 1875 | 1875 | $temp_array = $row; |
| 1876 | 1876 | |
@@ -1891,13 +1891,13 @@ discard block |
||
| 1891 | 1891 | { |
| 1892 | 1892 | $lst_countries = ''; |
| 1893 | 1893 | if (is_array($coord)) { |
| 1894 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1895 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1896 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1897 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1894 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1895 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1896 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1897 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1898 | 1898 | } |
| 1899 | 1899 | //$query = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong; |
| 1900 | - $query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 1900 | + $query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")"; |
|
| 1901 | 1901 | //$query = "SELECT waypoints.* FROM waypoints"; |
| 1902 | 1902 | //$query = "SELECT waypoints.* FROM waypoints INNER JOIN (SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") w ON w.name_end = waypoints.name_begin OR w.name_begin = waypoints.name_begin OR w.name_begin = waypoints.name_end OR w.name_end = waypoints.name_end"; |
| 1903 | 1903 | //$query = "SELECT * FROM waypoints LEFT JOIN waypoints w ON waypoints.name_end = w.name_begin WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong; |
@@ -1910,7 +1910,7 @@ discard block |
||
| 1910 | 1910 | $waypoints_array = array(); |
| 1911 | 1911 | $temp_array = array(); |
| 1912 | 1912 | |
| 1913 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1913 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1914 | 1914 | { |
| 1915 | 1915 | $temp_array = $row; |
| 1916 | 1916 | |
@@ -1930,9 +1930,9 @@ discard block |
||
| 1930 | 1930 | */ |
| 1931 | 1931 | public function getAllAirlineInfo($airline_icao) |
| 1932 | 1932 | { |
| 1933 | - $airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING)); |
|
| 1933 | + $airline_icao = strtoupper(filter_var($airline_icao, FILTER_SANITIZE_STRING)); |
|
| 1934 | 1934 | if ($airline_icao == 'NA') { |
| 1935 | - $airline_array[] = array('name' => 'Not Available','iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>''); |
|
| 1935 | + $airline_array[] = array('name' => 'Not Available', 'iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>''); |
|
| 1936 | 1936 | return $airline_array; |
| 1937 | 1937 | } else { |
| 1938 | 1938 | if (strlen($airline_icao) == 2) { |
@@ -1974,12 +1974,12 @@ discard block |
||
| 1974 | 1974 | */ |
| 1975 | 1975 | public function getAllAircraftInfo($aircraft_type) |
| 1976 | 1976 | { |
| 1977 | - $aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING); |
|
| 1977 | + $aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING); |
|
| 1978 | 1978 | |
| 1979 | 1979 | if ($aircraft_type == 'NA') { |
| 1980 | - return array(array('icao' => 'NA','type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL)); |
|
| 1980 | + return array(array('icao' => 'NA', 'type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL)); |
|
| 1981 | 1981 | } |
| 1982 | - $query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow FROM aircraft WHERE aircraft.icao = :aircraft_type"; |
|
| 1982 | + $query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow FROM aircraft WHERE aircraft.icao = :aircraft_type"; |
|
| 1983 | 1983 | |
| 1984 | 1984 | $sth = $this->db->prepare($query); |
| 1985 | 1985 | $sth->execute(array(':aircraft_type' => $aircraft_type)); |
@@ -2011,9 +2011,9 @@ discard block |
||
| 2011 | 2011 | */ |
| 2012 | 2012 | public function getAllAircraftType($aircraft_modes) |
| 2013 | 2013 | { |
| 2014 | - $aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING); |
|
| 2014 | + $aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING); |
|
| 2015 | 2015 | |
| 2016 | - $query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1"; |
|
| 2016 | + $query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1"; |
|
| 2017 | 2017 | |
| 2018 | 2018 | $sth = $this->db->prepare($query); |
| 2019 | 2019 | $sth->execute(array(':aircraft_modes' => $aircraft_modes)); |
@@ -2033,8 +2033,8 @@ discard block |
||
| 2033 | 2033 | */ |
| 2034 | 2034 | public function getOperator($operator) |
| 2035 | 2035 | { |
| 2036 | - $operator = filter_var($operator,FILTER_SANITIZE_STRING); |
|
| 2037 | - $query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1"; |
|
| 2036 | + $operator = filter_var($operator, FILTER_SANITIZE_STRING); |
|
| 2037 | + $query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1"; |
|
| 2038 | 2038 | |
| 2039 | 2039 | $sth = $this->db->prepare($query); |
| 2040 | 2040 | $sth->execute(array(':operator' => $operator)); |
@@ -2054,9 +2054,9 @@ discard block |
||
| 2054 | 2054 | */ |
| 2055 | 2055 | public function getRouteInfo($callsign) |
| 2056 | 2056 | { |
| 2057 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 2057 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 2058 | 2058 | if ($callsign == '') return array(); |
| 2059 | - $query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1"; |
|
| 2059 | + $query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1"; |
|
| 2060 | 2060 | |
| 2061 | 2061 | $sth = $this->db->prepare($query); |
| 2062 | 2062 | $sth->execute(array(':callsign' => $callsign)); |
@@ -2076,9 +2076,9 @@ discard block |
||
| 2076 | 2076 | */ |
| 2077 | 2077 | public function getAircraftInfoByRegistration($registration) |
| 2078 | 2078 | { |
| 2079 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 2079 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 2080 | 2080 | |
| 2081 | - $query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration"; |
|
| 2081 | + $query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration"; |
|
| 2082 | 2082 | |
| 2083 | 2083 | $sth = $this->db->prepare($query); |
| 2084 | 2084 | $sth->execute(array(':registration' => $registration)); |
@@ -2086,7 +2086,7 @@ discard block |
||
| 2086 | 2086 | $aircraft_array = array(); |
| 2087 | 2087 | $temp_array = array(); |
| 2088 | 2088 | |
| 2089 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2089 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2090 | 2090 | { |
| 2091 | 2091 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 2092 | 2092 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
@@ -2108,10 +2108,10 @@ discard block |
||
| 2108 | 2108 | */ |
| 2109 | 2109 | public function getAircraftOwnerByRegistration($registration) |
| 2110 | 2110 | { |
| 2111 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 2111 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 2112 | 2112 | $Connection = new Connection($this->db); |
| 2113 | 2113 | if ($Connection->tableExists('aircraft_owner')) { |
| 2114 | - $query = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1"; |
|
| 2114 | + $query = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1"; |
|
| 2115 | 2115 | $sth = $this->db->prepare($query); |
| 2116 | 2116 | $sth->execute(array(':registration' => $registration)); |
| 2117 | 2117 | |
@@ -2129,7 +2129,7 @@ discard block |
||
| 2129 | 2129 | public function getAllFlightsforSitemap() |
| 2130 | 2130 | { |
| 2131 | 2131 | //$query = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT "; |
| 2132 | - $query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0"; |
|
| 2132 | + $query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0"; |
|
| 2133 | 2133 | |
| 2134 | 2134 | $sth = $this->db->prepare($query); |
| 2135 | 2135 | $sth->execute(); |
@@ -2176,7 +2176,7 @@ discard block |
||
| 2176 | 2176 | $manufacturer_array = array(); |
| 2177 | 2177 | $temp_array = array(); |
| 2178 | 2178 | |
| 2179 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2179 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2180 | 2180 | { |
| 2181 | 2181 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 2182 | 2182 | |
@@ -2210,7 +2210,7 @@ discard block |
||
| 2210 | 2210 | $aircraft_array = array(); |
| 2211 | 2211 | $temp_array = array(); |
| 2212 | 2212 | |
| 2213 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2213 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2214 | 2214 | { |
| 2215 | 2215 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 2216 | 2216 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
@@ -2231,7 +2231,7 @@ discard block |
||
| 2231 | 2231 | */ |
| 2232 | 2232 | public function getAllAircraftRegistrations() |
| 2233 | 2233 | { |
| 2234 | - $query = "SELECT DISTINCT spotter_output.registration |
|
| 2234 | + $query = "SELECT DISTINCT spotter_output.registration |
|
| 2235 | 2235 | FROM spotter_output |
| 2236 | 2236 | WHERE spotter_output.registration <> '' |
| 2237 | 2237 | ORDER BY spotter_output.registration ASC"; |
@@ -2242,7 +2242,7 @@ discard block |
||
| 2242 | 2242 | $aircraft_array = array(); |
| 2243 | 2243 | $temp_array = array(); |
| 2244 | 2244 | |
| 2245 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2245 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2246 | 2246 | { |
| 2247 | 2247 | $temp_array['registration'] = $row['registration']; |
| 2248 | 2248 | |
@@ -2262,7 +2262,7 @@ discard block |
||
| 2262 | 2262 | public function getAllSourceName($type = '') |
| 2263 | 2263 | { |
| 2264 | 2264 | $query_values = array(); |
| 2265 | - $query = "SELECT DISTINCT spotter_output.source_name |
|
| 2265 | + $query = "SELECT DISTINCT spotter_output.source_name |
|
| 2266 | 2266 | FROM spotter_output |
| 2267 | 2267 | WHERE spotter_output.source_name <> ''"; |
| 2268 | 2268 | if ($type != '') { |
@@ -2278,7 +2278,7 @@ discard block |
||
| 2278 | 2278 | $source_array = array(); |
| 2279 | 2279 | $temp_array = array(); |
| 2280 | 2280 | |
| 2281 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2281 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2282 | 2282 | { |
| 2283 | 2283 | $temp_array['source_name'] = $row['source_name']; |
| 2284 | 2284 | $source_array[] = $temp_array; |
@@ -2296,7 +2296,7 @@ discard block |
||
| 2296 | 2296 | */ |
| 2297 | 2297 | public function getAllAirlineNames($airline_type = '') |
| 2298 | 2298 | { |
| 2299 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 2299 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 2300 | 2300 | if ($airline_type == '' || $airline_type == 'all') { |
| 2301 | 2301 | /* |
| 2302 | 2302 | $query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type |
@@ -2306,7 +2306,7 @@ discard block |
||
| 2306 | 2306 | */ |
| 2307 | 2307 | $query = "SELECT DISTINCT icao AS airline_icao, name AS airline_name, type AS airline_type FROM airlines ORDER BY name ASC"; |
| 2308 | 2308 | } else { |
| 2309 | - $query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type |
|
| 2309 | + $query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type |
|
| 2310 | 2310 | FROM spotter_output |
| 2311 | 2311 | WHERE spotter_output.airline_icao <> '' |
| 2312 | 2312 | AND spotter_output.airline_type = :airline_type |
@@ -2323,7 +2323,7 @@ discard block |
||
| 2323 | 2323 | $airline_array = array(); |
| 2324 | 2324 | $temp_array = array(); |
| 2325 | 2325 | |
| 2326 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2326 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2327 | 2327 | { |
| 2328 | 2328 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 2329 | 2329 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -2344,7 +2344,7 @@ discard block |
||
| 2344 | 2344 | public function getAllAirlineCountries() |
| 2345 | 2345 | { |
| 2346 | 2346 | |
| 2347 | - $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 2347 | + $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 2348 | 2348 | FROM spotter_output |
| 2349 | 2349 | WHERE spotter_output.airline_country <> '' |
| 2350 | 2350 | ORDER BY spotter_output.airline_country ASC"; |
@@ -2356,7 +2356,7 @@ discard block |
||
| 2356 | 2356 | $airline_array = array(); |
| 2357 | 2357 | $temp_array = array(); |
| 2358 | 2358 | |
| 2359 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2359 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2360 | 2360 | { |
| 2361 | 2361 | $temp_array['airline_country'] = $row['airline_country']; |
| 2362 | 2362 | |
@@ -2378,7 +2378,7 @@ discard block |
||
| 2378 | 2378 | { |
| 2379 | 2379 | $airport_array = array(); |
| 2380 | 2380 | |
| 2381 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country |
|
| 2381 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country |
|
| 2382 | 2382 | FROM spotter_output |
| 2383 | 2383 | WHERE spotter_output.departure_airport_icao <> '' AND spotter_output.departure_airport_icao <> 'NA' |
| 2384 | 2384 | ORDER BY spotter_output.departure_airport_city ASC"; |
@@ -2388,7 +2388,7 @@ discard block |
||
| 2388 | 2388 | $sth->execute(); |
| 2389 | 2389 | |
| 2390 | 2390 | $temp_array = array(); |
| 2391 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2391 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2392 | 2392 | { |
| 2393 | 2393 | $temp_array['airport_icao'] = $row['airport_icao']; |
| 2394 | 2394 | $temp_array['airport_name'] = $row['airport_name']; |
@@ -2398,7 +2398,7 @@ discard block |
||
| 2398 | 2398 | $airport_array[$row['airport_city'].",".$row['airport_name']] = $temp_array; |
| 2399 | 2399 | } |
| 2400 | 2400 | |
| 2401 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country |
|
| 2401 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country |
|
| 2402 | 2402 | FROM spotter_output |
| 2403 | 2403 | WHERE spotter_output.arrival_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' |
| 2404 | 2404 | ORDER BY spotter_output.arrival_airport_city ASC"; |
@@ -2406,7 +2406,7 @@ discard block |
||
| 2406 | 2406 | $sth = $this->db->prepare($query); |
| 2407 | 2407 | $sth->execute(); |
| 2408 | 2408 | |
| 2409 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2409 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2410 | 2410 | { |
| 2411 | 2411 | // if ($airport_array[$row['airport_city'].",".$row['airport_name']]['airport_icao'] != $row['airport_icao']) |
| 2412 | 2412 | // { |
@@ -2446,14 +2446,14 @@ discard block |
||
| 2446 | 2446 | |
| 2447 | 2447 | $temp_array = array(); |
| 2448 | 2448 | |
| 2449 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2449 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2450 | 2450 | { |
| 2451 | 2451 | $temp_array['airport_country'] = $row['airport_country']; |
| 2452 | 2452 | |
| 2453 | 2453 | $airport_array[$row['airport_country']] = $temp_array; |
| 2454 | 2454 | } |
| 2455 | 2455 | |
| 2456 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 2456 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 2457 | 2457 | FROM spotter_output |
| 2458 | 2458 | WHERE spotter_output.arrival_airport_country <> '' |
| 2459 | 2459 | ORDER BY spotter_output.arrival_airport_country ASC"; |
@@ -2461,7 +2461,7 @@ discard block |
||
| 2461 | 2461 | $sth = $this->db->prepare($query); |
| 2462 | 2462 | $sth->execute(); |
| 2463 | 2463 | |
| 2464 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2464 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2465 | 2465 | { |
| 2466 | 2466 | if (isset($airport_array[$row['airport_country']]['airport_country']) && $airport_array[$row['airport_country']]['airport_country'] != $row['airport_country']) |
| 2467 | 2467 | { |
@@ -2485,12 +2485,12 @@ discard block |
||
| 2485 | 2485 | */ |
| 2486 | 2486 | public function getAllCountries() |
| 2487 | 2487 | { |
| 2488 | - $Connection= new Connection($this->db); |
|
| 2488 | + $Connection = new Connection($this->db); |
|
| 2489 | 2489 | if ($Connection->tableExists('countries')) { |
| 2490 | 2490 | |
| 2491 | 2491 | $country_array = array(); |
| 2492 | 2492 | |
| 2493 | - $query = "SELECT countries.name AS airport_country |
|
| 2493 | + $query = "SELECT countries.name AS airport_country |
|
| 2494 | 2494 | FROM countries |
| 2495 | 2495 | ORDER BY countries.name ASC"; |
| 2496 | 2496 | $sth = $this->db->prepare($query); |
@@ -2498,7 +2498,7 @@ discard block |
||
| 2498 | 2498 | |
| 2499 | 2499 | $temp_array = array(); |
| 2500 | 2500 | |
| 2501 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2501 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2502 | 2502 | { |
| 2503 | 2503 | $temp_array['country'] = $row['airport_country']; |
| 2504 | 2504 | |
@@ -2506,7 +2506,7 @@ discard block |
||
| 2506 | 2506 | } |
| 2507 | 2507 | } else { |
| 2508 | 2508 | |
| 2509 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country |
|
| 2509 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country |
|
| 2510 | 2510 | FROM spotter_output |
| 2511 | 2511 | WHERE spotter_output.departure_airport_country <> '' |
| 2512 | 2512 | ORDER BY spotter_output.departure_airport_country ASC"; |
@@ -2516,14 +2516,14 @@ discard block |
||
| 2516 | 2516 | |
| 2517 | 2517 | $temp_array = array(); |
| 2518 | 2518 | |
| 2519 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2519 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2520 | 2520 | { |
| 2521 | 2521 | $temp_array['country'] = $row['airport_country']; |
| 2522 | 2522 | |
| 2523 | 2523 | $country_array[$row['airport_country']] = $temp_array; |
| 2524 | 2524 | } |
| 2525 | 2525 | |
| 2526 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 2526 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country |
|
| 2527 | 2527 | FROM spotter_output |
| 2528 | 2528 | WHERE spotter_output.arrival_airport_country <> '' |
| 2529 | 2529 | ORDER BY spotter_output.arrival_airport_country ASC"; |
@@ -2531,7 +2531,7 @@ discard block |
||
| 2531 | 2531 | $sth = $this->db->prepare($query); |
| 2532 | 2532 | $sth->execute(); |
| 2533 | 2533 | |
| 2534 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2534 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2535 | 2535 | { |
| 2536 | 2536 | if ($country_array[$row['airport_country']]['country'] != $row['airport_country']) |
| 2537 | 2537 | { |
@@ -2541,7 +2541,7 @@ discard block |
||
| 2541 | 2541 | } |
| 2542 | 2542 | } |
| 2543 | 2543 | |
| 2544 | - $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 2544 | + $query = "SELECT DISTINCT spotter_output.airline_country AS airline_country |
|
| 2545 | 2545 | FROM spotter_output |
| 2546 | 2546 | WHERE spotter_output.airline_country <> '' |
| 2547 | 2547 | ORDER BY spotter_output.airline_country ASC"; |
@@ -2549,7 +2549,7 @@ discard block |
||
| 2549 | 2549 | $sth = $this->db->prepare($query); |
| 2550 | 2550 | $sth->execute(); |
| 2551 | 2551 | |
| 2552 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2552 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2553 | 2553 | { |
| 2554 | 2554 | if (isset($country_array[$row['airline_country']]['country']) && $country_array[$row['airline_country']]['country'] != $row['airline_country']) |
| 2555 | 2555 | { |
@@ -2573,7 +2573,7 @@ discard block |
||
| 2573 | 2573 | */ |
| 2574 | 2574 | public function getAllIdents() |
| 2575 | 2575 | { |
| 2576 | - $query = "SELECT DISTINCT spotter_output.ident |
|
| 2576 | + $query = "SELECT DISTINCT spotter_output.ident |
|
| 2577 | 2577 | FROM spotter_output |
| 2578 | 2578 | WHERE spotter_output.ident <> '' |
| 2579 | 2579 | ORDER BY spotter_output.date ASC LIMIT 700 OFFSET 0"; |
@@ -2584,7 +2584,7 @@ discard block |
||
| 2584 | 2584 | $ident_array = array(); |
| 2585 | 2585 | $temp_array = array(); |
| 2586 | 2586 | |
| 2587 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2587 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2588 | 2588 | { |
| 2589 | 2589 | $temp_array['ident'] = $row['ident']; |
| 2590 | 2590 | $ident_array[] = $temp_array; |
@@ -2764,12 +2764,12 @@ discard block |
||
| 2764 | 2764 | } else $offset = '+00:00'; |
| 2765 | 2765 | |
| 2766 | 2766 | if ($globalDBdriver == 'mysql') { |
| 2767 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date |
|
| 2767 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date |
|
| 2768 | 2768 | FROM spotter_output |
| 2769 | 2769 | WHERE spotter_output.date <> '' |
| 2770 | 2770 | ORDER BY spotter_output.date ASC LIMIT 0,200"; |
| 2771 | 2771 | } else { |
| 2772 | - $query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 2772 | + $query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 2773 | 2773 | FROM spotter_output |
| 2774 | 2774 | WHERE spotter_output.date <> '' |
| 2775 | 2775 | ORDER BY spotter_output.date ASC LIMIT 0,200"; |
@@ -2781,7 +2781,7 @@ discard block |
||
| 2781 | 2781 | $date_array = array(); |
| 2782 | 2782 | $temp_array = array(); |
| 2783 | 2783 | |
| 2784 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2784 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2785 | 2785 | { |
| 2786 | 2786 | $temp_array['date'] = $row['date']; |
| 2787 | 2787 | |
@@ -2801,7 +2801,7 @@ discard block |
||
| 2801 | 2801 | */ |
| 2802 | 2802 | public function getAllRoutes() |
| 2803 | 2803 | { |
| 2804 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao |
|
| 2804 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao |
|
| 2805 | 2805 | FROM spotter_output |
| 2806 | 2806 | WHERE spotter_output.ident <> '' |
| 2807 | 2807 | GROUP BY route |
@@ -2812,7 +2812,7 @@ discard block |
||
| 2812 | 2812 | |
| 2813 | 2813 | $routes_array = array(); |
| 2814 | 2814 | $temp_array = array(); |
| 2815 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2815 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 2816 | 2816 | { |
| 2817 | 2817 | $temp_array['route'] = $row['route']; |
| 2818 | 2818 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -2845,7 +2845,7 @@ discard block |
||
| 2845 | 2845 | if (count($airline_array) == 0) { |
| 2846 | 2846 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 2847 | 2847 | } |
| 2848 | - if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){ |
|
| 2848 | + if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") { |
|
| 2849 | 2849 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 2850 | 2850 | } |
| 2851 | 2851 | } else { |
@@ -2858,7 +2858,7 @@ discard block |
||
| 2858 | 2858 | |
| 2859 | 2859 | |
| 2860 | 2860 | $query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id'; |
| 2861 | - $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type); |
|
| 2861 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type); |
|
| 2862 | 2862 | |
| 2863 | 2863 | try { |
| 2864 | 2864 | $sth = $this->db->prepare($query); |
@@ -2881,11 +2881,11 @@ discard block |
||
| 2881 | 2881 | * @return String success or false |
| 2882 | 2882 | * |
| 2883 | 2883 | */ |
| 2884 | - public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '') |
|
| 2884 | + public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '', $arrival_airport_time = '') |
|
| 2885 | 2885 | { |
| 2886 | 2886 | if ($groundspeed == '') $groundspeed = NULL; |
| 2887 | 2887 | $query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id'; |
| 2888 | - $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident); |
|
| 2888 | + $query_values = array(':flightaware_id' => $flightaware_id, ':real_arrival_airport_icao' => $arrival_airport_icao, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident); |
|
| 2889 | 2889 | |
| 2890 | 2890 | try { |
| 2891 | 2891 | $sth = $this->db->prepare($query); |
@@ -2909,7 +2909,7 @@ discard block |
||
| 2909 | 2909 | * @return String success or false |
| 2910 | 2910 | * |
| 2911 | 2911 | */ |
| 2912 | - public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '') |
|
| 2912 | + public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false, $format_source = '', $source_name = '') |
|
| 2913 | 2913 | { |
| 2914 | 2914 | global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed; |
| 2915 | 2915 | |
@@ -2932,13 +2932,13 @@ discard block |
||
| 2932 | 2932 | if ($ModeS != '') { |
| 2933 | 2933 | $timeelapsed = microtime(true); |
| 2934 | 2934 | $registration = $this->getAircraftRegistrationBymodeS($ModeS); |
| 2935 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 2935 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 2936 | 2936 | } else { |
| 2937 | - $myhex = explode('-',$flightaware_id); |
|
| 2937 | + $myhex = explode('-', $flightaware_id); |
|
| 2938 | 2938 | if (count($myhex) > 0) { |
| 2939 | 2939 | $timeelapsed = microtime(true); |
| 2940 | 2940 | $registration = $this->getAircraftRegistrationBymodeS($myhex[0]); |
| 2941 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 2941 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 2942 | 2942 | } |
| 2943 | 2943 | } |
| 2944 | 2944 | } |
@@ -2964,15 +2964,15 @@ discard block |
||
| 2964 | 2964 | if (count($airline_array) == 0) { |
| 2965 | 2965 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 2966 | 2966 | } |
| 2967 | - if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){ |
|
| 2967 | + if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") { |
|
| 2968 | 2968 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 2969 | 2969 | } |
| 2970 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 2970 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 2971 | 2971 | |
| 2972 | 2972 | } else { |
| 2973 | 2973 | $timeelapsed = microtime(true); |
| 2974 | 2974 | $airline_array = $this->getAllAirlineInfo("NA"); |
| 2975 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 2975 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 2976 | 2976 | } |
| 2977 | 2977 | } |
| 2978 | 2978 | } else $airline_array = array(); |
@@ -2988,27 +2988,27 @@ discard block |
||
| 2988 | 2988 | { |
| 2989 | 2989 | $timeelapsed = microtime(true); |
| 2990 | 2990 | $aircraft_array = $this->getAllAircraftInfo("NA"); |
| 2991 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 2991 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 2992 | 2992 | } else { |
| 2993 | 2993 | $timeelapsed = microtime(true); |
| 2994 | 2994 | $aircraft_array = $this->getAllAircraftInfo($aircraft_icao); |
| 2995 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 2995 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 2996 | 2996 | } |
| 2997 | 2997 | } |
| 2998 | 2998 | } else { |
| 2999 | 2999 | if ($ModeS != '') { |
| 3000 | 3000 | $timeelapsed = microtime(true); |
| 3001 | 3001 | $aircraft_icao = $this->getAllAircraftType($ModeS); |
| 3002 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3002 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3003 | 3003 | if ($aircraft_icao == "" || $aircraft_icao == "XXXX") |
| 3004 | 3004 | { |
| 3005 | 3005 | $timeelapsed = microtime(true); |
| 3006 | 3006 | $aircraft_array = $this->getAllAircraftInfo("NA"); |
| 3007 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3007 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3008 | 3008 | } else { |
| 3009 | 3009 | $timeelapsed = microtime(true); |
| 3010 | 3010 | $aircraft_array = $this->getAllAircraftInfo($aircraft_icao); |
| 3011 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3011 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3012 | 3012 | } |
| 3013 | 3013 | } |
| 3014 | 3014 | } |
@@ -3022,7 +3022,7 @@ discard block |
||
| 3022 | 3022 | } else { |
| 3023 | 3023 | $timeelapsed = microtime(true); |
| 3024 | 3024 | $departure_airport_array = $this->getAllAirportInfo($departure_airport_icao); |
| 3025 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3025 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3026 | 3026 | } |
| 3027 | 3027 | } |
| 3028 | 3028 | |
@@ -3035,7 +3035,7 @@ discard block |
||
| 3035 | 3035 | } else { |
| 3036 | 3036 | $timeelapsed = microtime(true); |
| 3037 | 3037 | $arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao); |
| 3038 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3038 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3039 | 3039 | } |
| 3040 | 3040 | } |
| 3041 | 3041 | |
@@ -3099,7 +3099,7 @@ discard block |
||
| 3099 | 3099 | { |
| 3100 | 3100 | $timeelapsed = microtime(true); |
| 3101 | 3101 | $image_array = $Image->getSpotterImage($registration); |
| 3102 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3102 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3103 | 3103 | if (!isset($image_array[0]['registration'])) |
| 3104 | 3104 | { |
| 3105 | 3105 | //echo "Add image !!!! \n"; |
@@ -3107,7 +3107,7 @@ discard block |
||
| 3107 | 3107 | } |
| 3108 | 3108 | $timeelapsed = microtime(true); |
| 3109 | 3109 | $owner_info = $this->getAircraftOwnerByRegistration($registration); |
| 3110 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3110 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3111 | 3111 | if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner'])); |
| 3112 | 3112 | } |
| 3113 | 3113 | |
@@ -3115,33 +3115,33 @@ discard block |
||
| 3115 | 3115 | { |
| 3116 | 3116 | if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao']; |
| 3117 | 3117 | else $airline_icao = ''; |
| 3118 | - $image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 3118 | + $image_array = $Image->getSpotterImage('', $aircraft_icao, $airline_icao); |
|
| 3119 | 3119 | if (!isset($image_array[0]['registration'])) |
| 3120 | 3120 | { |
| 3121 | 3121 | //echo "Add image !!!! \n"; |
| 3122 | - $Image->addSpotterImage('',$aircraft_icao,$airline_icao); |
|
| 3122 | + $Image->addSpotterImage('', $aircraft_icao, $airline_icao); |
|
| 3123 | 3123 | } |
| 3124 | 3124 | } |
| 3125 | 3125 | |
| 3126 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 3127 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 3128 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 3129 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 3130 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3131 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3132 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3133 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3134 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 3135 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3136 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 3137 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 3138 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 3139 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 3140 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 3141 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 3142 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 3143 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 3144 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 3126 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 3127 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 3128 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 3129 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 3130 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3131 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3132 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3133 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3134 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 3135 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3136 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 3137 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 3138 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 3139 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 3140 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 3141 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 3142 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 3143 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 3144 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 3145 | 3145 | |
| 3146 | 3146 | if (count($airline_array) == 0) |
| 3147 | 3147 | { |
@@ -3165,7 +3165,7 @@ discard block |
||
| 3165 | 3165 | if ($heading == '' || $Common->isInteger($heading) == false) $heading = 0; |
| 3166 | 3166 | if ($groundspeed == '' || $Common->isInteger($groundspeed) == false) $groundspeed = 0; |
| 3167 | 3167 | if (!isset($aircraft_owner)) $aircraft_owner = NULL; |
| 3168 | - $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) |
|
| 3168 | + $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) |
|
| 3169 | 3169 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)"; |
| 3170 | 3170 | |
| 3171 | 3171 | $airline_name = $airline_array[0]['name']; |
@@ -3175,7 +3175,7 @@ discard block |
||
| 3175 | 3175 | if ($airline_type == '') { |
| 3176 | 3176 | $timeelapsed = microtime(true); |
| 3177 | 3177 | $airline_type = $this->getAircraftTypeBymodeS($ModeS); |
| 3178 | - if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 3178 | + if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 3179 | 3179 | } |
| 3180 | 3180 | if ($airline_type == null) $airline_type = ''; |
| 3181 | 3181 | $aircraft_type = $aircraft_array[0]['type']; |
@@ -3187,7 +3187,7 @@ discard block |
||
| 3187 | 3187 | $arrival_airport_name = $arrival_airport_array[0]['name']; |
| 3188 | 3188 | $arrival_airport_city = $arrival_airport_array[0]['city']; |
| 3189 | 3189 | $arrival_airport_country = $arrival_airport_array[0]['country']; |
| 3190 | - $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name); |
|
| 3190 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name); |
|
| 3191 | 3191 | |
| 3192 | 3192 | try { |
| 3193 | 3193 | |
@@ -3213,13 +3213,13 @@ discard block |
||
| 3213 | 3213 | { |
| 3214 | 3214 | global $globalDBdriver, $globalTimezone; |
| 3215 | 3215 | if ($globalDBdriver == 'mysql') { |
| 3216 | - $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3216 | + $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3217 | 3217 | WHERE spotter_output.ident = :ident |
| 3218 | 3218 | AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 3219 | 3219 | AND spotter_output.date < UTC_TIMESTAMP()"; |
| 3220 | 3220 | $query_data = array(':ident' => $ident); |
| 3221 | 3221 | } elseif ($globalDBdriver == 'pgsql') { |
| 3222 | - $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3222 | + $query = "SELECT spotter_output.ident FROM spotter_output |
|
| 3223 | 3223 | WHERE spotter_output.ident = :ident |
| 3224 | 3224 | AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 3225 | 3225 | AND spotter_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -3228,8 +3228,8 @@ discard block |
||
| 3228 | 3228 | |
| 3229 | 3229 | $sth = $this->db->prepare($query); |
| 3230 | 3230 | $sth->execute($query_data); |
| 3231 | - $ident_result=''; |
|
| 3232 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3231 | + $ident_result = ''; |
|
| 3232 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3233 | 3233 | { |
| 3234 | 3234 | $ident_result = $row['ident']; |
| 3235 | 3235 | } |
@@ -3255,8 +3255,8 @@ discard block |
||
| 3255 | 3255 | return false; |
| 3256 | 3256 | } else { |
| 3257 | 3257 | $q_array = explode(" ", $q); |
| 3258 | - foreach ($q_array as $q_item){ |
|
| 3259 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 3258 | + foreach ($q_array as $q_item) { |
|
| 3259 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 3260 | 3260 | $additional_query .= " AND ("; |
| 3261 | 3261 | $additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR "; |
| 3262 | 3262 | $additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR "; |
@@ -3271,11 +3271,11 @@ discard block |
||
| 3271 | 3271 | } |
| 3272 | 3272 | } |
| 3273 | 3273 | if ($globalDBdriver == 'mysql') { |
| 3274 | - $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3274 | + $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3275 | 3275 | WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 3276 | 3276 | AND spotter_output.date < UTC_TIMESTAMP()"; |
| 3277 | 3277 | } else { |
| 3278 | - $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3278 | + $query = "SELECT spotter_output.* FROM spotter_output |
|
| 3279 | 3279 | WHERE spotter_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 3280 | 3280 | AND spotter_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 3281 | 3281 | } |
@@ -3295,7 +3295,7 @@ discard block |
||
| 3295 | 3295 | public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
| 3296 | 3296 | { |
| 3297 | 3297 | global $globalDBdriver; |
| 3298 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3298 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3299 | 3299 | FROM spotter_output |
| 3300 | 3300 | WHERE spotter_output.airline_name <> '' AND spotter_output.airline_icao <> 'NA' "; |
| 3301 | 3301 | if ($olderthanmonths > 0) { |
@@ -3322,7 +3322,7 @@ discard block |
||
| 3322 | 3322 | $airline_array = array(); |
| 3323 | 3323 | $temp_array = array(); |
| 3324 | 3324 | |
| 3325 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3325 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3326 | 3326 | { |
| 3327 | 3327 | $temp_array['airline_name'] = $row['airline_name']; |
| 3328 | 3328 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3344,7 +3344,7 @@ discard block |
||
| 3344 | 3344 | public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '') |
| 3345 | 3345 | { |
| 3346 | 3346 | global $globalDBdriver; |
| 3347 | - $query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count |
|
| 3347 | + $query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count |
|
| 3348 | 3348 | FROM spotter_output |
| 3349 | 3349 | WHERE spotter_output.pilot_id <> '' "; |
| 3350 | 3350 | if ($olderthanmonths > 0) { |
@@ -3371,7 +3371,7 @@ discard block |
||
| 3371 | 3371 | $airline_array = array(); |
| 3372 | 3372 | $temp_array = array(); |
| 3373 | 3373 | |
| 3374 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3374 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3375 | 3375 | { |
| 3376 | 3376 | $temp_array['pilot_name'] = $row['pilot_name']; |
| 3377 | 3377 | $temp_array['pilot_id'] = $row['pilot_id']; |
@@ -3403,7 +3403,7 @@ discard block |
||
| 3403 | 3403 | $airline_array = array(); |
| 3404 | 3404 | $temp_array = array(); |
| 3405 | 3405 | |
| 3406 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3406 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3407 | 3407 | { |
| 3408 | 3408 | $temp_array['owner_name'] = $row['owner_name']; |
| 3409 | 3409 | $temp_array['owner_count'] = $row['owner_count']; |
@@ -3421,9 +3421,9 @@ discard block |
||
| 3421 | 3421 | */ |
| 3422 | 3422 | public function countAllAirlinesByAircraft($aircraft_icao) |
| 3423 | 3423 | { |
| 3424 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 3424 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 3425 | 3425 | |
| 3426 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3426 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3427 | 3427 | FROM spotter_output |
| 3428 | 3428 | WHERE spotter_output.airline_name <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 3429 | 3429 | GROUP BY spotter_output.airline_name |
@@ -3436,7 +3436,7 @@ discard block |
||
| 3436 | 3436 | $airline_array = array(); |
| 3437 | 3437 | $temp_array = array(); |
| 3438 | 3438 | |
| 3439 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3439 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3440 | 3440 | { |
| 3441 | 3441 | $temp_array['airline_name'] = $row['airline_name']; |
| 3442 | 3442 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3458,9 +3458,9 @@ discard block |
||
| 3458 | 3458 | */ |
| 3459 | 3459 | public function countAllAirlineCountriesByAircraft($aircraft_icao) |
| 3460 | 3460 | { |
| 3461 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 3461 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 3462 | 3462 | |
| 3463 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3463 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3464 | 3464 | FROM spotter_output |
| 3465 | 3465 | WHERE spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 3466 | 3466 | GROUP BY spotter_output.airline_country |
@@ -3474,7 +3474,7 @@ discard block |
||
| 3474 | 3474 | $airline_country_array = array(); |
| 3475 | 3475 | $temp_array = array(); |
| 3476 | 3476 | |
| 3477 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3477 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3478 | 3478 | { |
| 3479 | 3479 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 3480 | 3480 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -3495,9 +3495,9 @@ discard block |
||
| 3495 | 3495 | */ |
| 3496 | 3496 | public function countAllAirlinesByAirport($airport_icao) |
| 3497 | 3497 | { |
| 3498 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 3498 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 3499 | 3499 | |
| 3500 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3500 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3501 | 3501 | FROM spotter_output |
| 3502 | 3502 | WHERE spotter_output.airline_name <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao ) |
| 3503 | 3503 | GROUP BY spotter_output.airline_name |
@@ -3510,7 +3510,7 @@ discard block |
||
| 3510 | 3510 | $airline_array = array(); |
| 3511 | 3511 | $temp_array = array(); |
| 3512 | 3512 | |
| 3513 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3513 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3514 | 3514 | { |
| 3515 | 3515 | $temp_array['airline_name'] = $row['airline_name']; |
| 3516 | 3516 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3531,9 +3531,9 @@ discard block |
||
| 3531 | 3531 | */ |
| 3532 | 3532 | public function countAllAirlineCountriesByAirport($airport_icao) |
| 3533 | 3533 | { |
| 3534 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 3534 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 3535 | 3535 | |
| 3536 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3536 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3537 | 3537 | FROM spotter_output |
| 3538 | 3538 | WHERE spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao ) |
| 3539 | 3539 | GROUP BY spotter_output.airline_country |
@@ -3547,7 +3547,7 @@ discard block |
||
| 3547 | 3547 | $airline_country_array = array(); |
| 3548 | 3548 | $temp_array = array(); |
| 3549 | 3549 | |
| 3550 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3550 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3551 | 3551 | { |
| 3552 | 3552 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 3553 | 3553 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -3566,9 +3566,9 @@ discard block |
||
| 3566 | 3566 | */ |
| 3567 | 3567 | public function countAllAirlinesByManufacturer($aircraft_manufacturer) |
| 3568 | 3568 | { |
| 3569 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 3569 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 3570 | 3570 | |
| 3571 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3571 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3572 | 3572 | FROM spotter_output |
| 3573 | 3573 | WHERE spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 3574 | 3574 | GROUP BY spotter_output.airline_name |
@@ -3580,7 +3580,7 @@ discard block |
||
| 3580 | 3580 | $airline_array = array(); |
| 3581 | 3581 | $temp_array = array(); |
| 3582 | 3582 | |
| 3583 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3583 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3584 | 3584 | { |
| 3585 | 3585 | $temp_array['airline_name'] = $row['airline_name']; |
| 3586 | 3586 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3602,9 +3602,9 @@ discard block |
||
| 3602 | 3602 | */ |
| 3603 | 3603 | public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer) |
| 3604 | 3604 | { |
| 3605 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 3605 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 3606 | 3606 | |
| 3607 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3607 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3608 | 3608 | FROM spotter_output |
| 3609 | 3609 | WHERE spotter_output.airline_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 3610 | 3610 | GROUP BY spotter_output.airline_country |
@@ -3618,7 +3618,7 @@ discard block |
||
| 3618 | 3618 | $airline_country_array = array(); |
| 3619 | 3619 | $temp_array = array(); |
| 3620 | 3620 | |
| 3621 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3621 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3622 | 3622 | { |
| 3623 | 3623 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 3624 | 3624 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -3637,7 +3637,7 @@ discard block |
||
| 3637 | 3637 | public function countAllAirlinesByDate($date) |
| 3638 | 3638 | { |
| 3639 | 3639 | global $globalTimezone, $globalDBdriver; |
| 3640 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 3640 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 3641 | 3641 | |
| 3642 | 3642 | if ($globalTimezone != '') { |
| 3643 | 3643 | date_default_timezone_set($globalTimezone); |
@@ -3646,13 +3646,13 @@ discard block |
||
| 3646 | 3646 | } else $offset = '+00:00'; |
| 3647 | 3647 | |
| 3648 | 3648 | if ($globalDBdriver == 'mysql') { |
| 3649 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3649 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3650 | 3650 | FROM spotter_output |
| 3651 | 3651 | WHERE DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 3652 | 3652 | GROUP BY spotter_output.airline_name |
| 3653 | 3653 | ORDER BY airline_count DESC"; |
| 3654 | 3654 | } else { |
| 3655 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3655 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3656 | 3656 | FROM spotter_output |
| 3657 | 3657 | WHERE to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 3658 | 3658 | GROUP BY spotter_output.airline_name |
@@ -3664,7 +3664,7 @@ discard block |
||
| 3664 | 3664 | |
| 3665 | 3665 | $airline_array = array(); |
| 3666 | 3666 | $temp_array = array(); |
| 3667 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3667 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3668 | 3668 | { |
| 3669 | 3669 | $temp_array['airline_name'] = $row['airline_name']; |
| 3670 | 3670 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3687,7 +3687,7 @@ discard block |
||
| 3687 | 3687 | public function countAllAirlineCountriesByDate($date) |
| 3688 | 3688 | { |
| 3689 | 3689 | global $globalTimezone, $globalDBdriver; |
| 3690 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 3690 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 3691 | 3691 | if ($globalTimezone != '') { |
| 3692 | 3692 | date_default_timezone_set($globalTimezone); |
| 3693 | 3693 | $datetime = new DateTime($date); |
@@ -3695,14 +3695,14 @@ discard block |
||
| 3695 | 3695 | } else $offset = '+00:00'; |
| 3696 | 3696 | |
| 3697 | 3697 | if ($globalDBdriver == 'mysql') { |
| 3698 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3698 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3699 | 3699 | FROM spotter_output |
| 3700 | 3700 | WHERE spotter_output.airline_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 3701 | 3701 | GROUP BY spotter_output.airline_country |
| 3702 | 3702 | ORDER BY airline_country_count DESC |
| 3703 | 3703 | LIMIT 10 OFFSET 0"; |
| 3704 | 3704 | } else { |
| 3705 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3705 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3706 | 3706 | FROM spotter_output |
| 3707 | 3707 | WHERE spotter_output.airline_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 3708 | 3708 | GROUP BY spotter_output.airline_country |
@@ -3715,7 +3715,7 @@ discard block |
||
| 3715 | 3715 | |
| 3716 | 3716 | $airline_country_array = array(); |
| 3717 | 3717 | $temp_array = array(); |
| 3718 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3718 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3719 | 3719 | { |
| 3720 | 3720 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 3721 | 3721 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -3734,9 +3734,9 @@ discard block |
||
| 3734 | 3734 | */ |
| 3735 | 3735 | public function countAllAirlinesByIdent($ident) |
| 3736 | 3736 | { |
| 3737 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 3737 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 3738 | 3738 | |
| 3739 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3739 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3740 | 3740 | FROM spotter_output |
| 3741 | 3741 | WHERE spotter_output.ident = :ident |
| 3742 | 3742 | GROUP BY spotter_output.airline_name |
@@ -3749,7 +3749,7 @@ discard block |
||
| 3749 | 3749 | $airline_array = array(); |
| 3750 | 3750 | $temp_array = array(); |
| 3751 | 3751 | |
| 3752 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3752 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3753 | 3753 | { |
| 3754 | 3754 | $temp_array['airline_name'] = $row['airline_name']; |
| 3755 | 3755 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3769,10 +3769,10 @@ discard block |
||
| 3769 | 3769 | */ |
| 3770 | 3770 | public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao) |
| 3771 | 3771 | { |
| 3772 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3773 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3772 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3773 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3774 | 3774 | |
| 3775 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3775 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3776 | 3776 | FROM spotter_output |
| 3777 | 3777 | WHERE (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 3778 | 3778 | GROUP BY spotter_output.airline_name |
@@ -3780,12 +3780,12 @@ discard block |
||
| 3780 | 3780 | |
| 3781 | 3781 | |
| 3782 | 3782 | $sth = $this->db->prepare($query); |
| 3783 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 3783 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 3784 | 3784 | |
| 3785 | 3785 | $airline_array = array(); |
| 3786 | 3786 | $temp_array = array(); |
| 3787 | 3787 | |
| 3788 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3788 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3789 | 3789 | { |
| 3790 | 3790 | $temp_array['airline_name'] = $row['airline_name']; |
| 3791 | 3791 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3805,10 +3805,10 @@ discard block |
||
| 3805 | 3805 | */ |
| 3806 | 3806 | public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao) |
| 3807 | 3807 | { |
| 3808 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3809 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 3808 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3809 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 3810 | 3810 | |
| 3811 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3811 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3812 | 3812 | FROM spotter_output |
| 3813 | 3813 | WHERE spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 3814 | 3814 | GROUP BY spotter_output.airline_country |
@@ -3817,11 +3817,11 @@ discard block |
||
| 3817 | 3817 | |
| 3818 | 3818 | |
| 3819 | 3819 | $sth = $this->db->prepare($query); |
| 3820 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 3820 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 3821 | 3821 | |
| 3822 | 3822 | $airline_country_array = array(); |
| 3823 | 3823 | $temp_array = array(); |
| 3824 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3824 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3825 | 3825 | { |
| 3826 | 3826 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 3827 | 3827 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -3841,9 +3841,9 @@ discard block |
||
| 3841 | 3841 | */ |
| 3842 | 3842 | public function countAllAirlinesByCountry($country) |
| 3843 | 3843 | { |
| 3844 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 3844 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 3845 | 3845 | |
| 3846 | - $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3846 | + $query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count |
|
| 3847 | 3847 | FROM spotter_output |
| 3848 | 3848 | WHERE ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 3849 | 3849 | GROUP BY spotter_output.airline_name |
@@ -3855,7 +3855,7 @@ discard block |
||
| 3855 | 3855 | |
| 3856 | 3856 | $airline_array = array(); |
| 3857 | 3857 | $temp_array = array(); |
| 3858 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3858 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3859 | 3859 | { |
| 3860 | 3860 | $temp_array['airline_name'] = $row['airline_name']; |
| 3861 | 3861 | $temp_array['airline_icao'] = $row['airline_icao']; |
@@ -3876,9 +3876,9 @@ discard block |
||
| 3876 | 3876 | */ |
| 3877 | 3877 | public function countAllAirlineCountriesByCountry($country) |
| 3878 | 3878 | { |
| 3879 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 3879 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 3880 | 3880 | |
| 3881 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3881 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3882 | 3882 | FROM spotter_output |
| 3883 | 3883 | WHERE spotter_output.airline_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 3884 | 3884 | GROUP BY spotter_output.airline_country |
@@ -3891,7 +3891,7 @@ discard block |
||
| 3891 | 3891 | |
| 3892 | 3892 | $airline_country_array = array(); |
| 3893 | 3893 | $temp_array = array(); |
| 3894 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3894 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3895 | 3895 | { |
| 3896 | 3896 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 3897 | 3897 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -3910,7 +3910,7 @@ discard block |
||
| 3910 | 3910 | */ |
| 3911 | 3911 | public function countAllAirlineCountries($limit = true) |
| 3912 | 3912 | { |
| 3913 | - $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3913 | + $query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count |
|
| 3914 | 3914 | FROM spotter_output |
| 3915 | 3915 | WHERE spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA' |
| 3916 | 3916 | GROUP BY spotter_output.airline_country |
@@ -3922,7 +3922,7 @@ discard block |
||
| 3922 | 3922 | |
| 3923 | 3923 | $airline_array = array(); |
| 3924 | 3924 | $temp_array = array(); |
| 3925 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3925 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3926 | 3926 | { |
| 3927 | 3927 | $temp_array['airline_country_count'] = $row['airline_country_count']; |
| 3928 | 3928 | $temp_array['airline_country'] = $row['airline_country']; |
@@ -3938,7 +3938,7 @@ discard block |
||
| 3938 | 3938 | * @return Array the airline country list |
| 3939 | 3939 | * |
| 3940 | 3940 | */ |
| 3941 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 3941 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 3942 | 3942 | { |
| 3943 | 3943 | global $globalDBdriver; |
| 3944 | 3944 | /* |
@@ -3967,7 +3967,7 @@ discard block |
||
| 3967 | 3967 | $flight_array = array(); |
| 3968 | 3968 | $temp_array = array(); |
| 3969 | 3969 | |
| 3970 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3970 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 3971 | 3971 | { |
| 3972 | 3972 | $temp_array['flight_count'] = $row['nb']; |
| 3973 | 3973 | $temp_array['flight_country'] = $row['name']; |
@@ -3985,10 +3985,10 @@ discard block |
||
| 3985 | 3985 | * @return Array the aircraft list |
| 3986 | 3986 | * |
| 3987 | 3987 | */ |
| 3988 | - public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 3988 | + public function countAllAircraftTypes($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 3989 | 3989 | { |
| 3990 | 3990 | global $globalDBdriver; |
| 3991 | - $query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 3991 | + $query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 3992 | 3992 | FROM spotter_output |
| 3993 | 3993 | WHERE spotter_output.aircraft_name <> '' AND spotter_output.aircraft_icao <> '' "; |
| 3994 | 3994 | if ($olderthanmonths > 0) { |
@@ -4018,7 +4018,7 @@ discard block |
||
| 4018 | 4018 | $aircraft_array = array(); |
| 4019 | 4019 | $temp_array = array(); |
| 4020 | 4020 | |
| 4021 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4021 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4022 | 4022 | { |
| 4023 | 4023 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4024 | 4024 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4039,9 +4039,9 @@ discard block |
||
| 4039 | 4039 | public function countAllAircraftRegistrationByAircraft($aircraft_icao) |
| 4040 | 4040 | { |
| 4041 | 4041 | $Image = new Image($this->db); |
| 4042 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 4042 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 4043 | 4043 | |
| 4044 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4044 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4045 | 4045 | FROM spotter_output |
| 4046 | 4046 | WHERE spotter_output.registration <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 4047 | 4047 | GROUP BY spotter_output.registration |
@@ -4053,14 +4053,14 @@ discard block |
||
| 4053 | 4053 | $aircraft_array = array(); |
| 4054 | 4054 | $temp_array = array(); |
| 4055 | 4055 | |
| 4056 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4056 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4057 | 4057 | { |
| 4058 | 4058 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4059 | 4059 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4060 | 4060 | $temp_array['registration'] = $row['registration']; |
| 4061 | 4061 | $temp_array['airline_name'] = $row['airline_name']; |
| 4062 | 4062 | $temp_array['image_thumbnail'] = ""; |
| 4063 | - if($row['registration'] != "") |
|
| 4063 | + if ($row['registration'] != "") |
|
| 4064 | 4064 | { |
| 4065 | 4065 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4066 | 4066 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4081,9 +4081,9 @@ discard block |
||
| 4081 | 4081 | */ |
| 4082 | 4082 | public function countAllAircraftTypesByAirline($airline_icao) |
| 4083 | 4083 | { |
| 4084 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 4084 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 4085 | 4085 | |
| 4086 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4086 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4087 | 4087 | FROM spotter_output |
| 4088 | 4088 | WHERE spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao = :airline_icao |
| 4089 | 4089 | GROUP BY spotter_output.aircraft_name |
@@ -4095,7 +4095,7 @@ discard block |
||
| 4095 | 4095 | $ircraft_array = array(); |
| 4096 | 4096 | $temp_array = array(); |
| 4097 | 4097 | |
| 4098 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4098 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4099 | 4099 | { |
| 4100 | 4100 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4101 | 4101 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4116,9 +4116,9 @@ discard block |
||
| 4116 | 4116 | public function countAllAircraftRegistrationByAirline($airline_icao) |
| 4117 | 4117 | { |
| 4118 | 4118 | $Image = new Image($this->db); |
| 4119 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 4119 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 4120 | 4120 | |
| 4121 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4121 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4122 | 4122 | FROM spotter_output |
| 4123 | 4123 | WHERE spotter_output.registration <> '' AND spotter_output.airline_icao = :airline_icao |
| 4124 | 4124 | GROUP BY spotter_output.registration |
@@ -4129,14 +4129,14 @@ discard block |
||
| 4129 | 4129 | |
| 4130 | 4130 | $aircraft_array = array(); |
| 4131 | 4131 | $temp_array = array(); |
| 4132 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4132 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4133 | 4133 | { |
| 4134 | 4134 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4135 | 4135 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4136 | 4136 | $temp_array['registration'] = $row['registration']; |
| 4137 | 4137 | $temp_array['airline_name'] = $row['airline_name']; |
| 4138 | 4138 | $temp_array['image_thumbnail'] = ""; |
| 4139 | - if($row['registration'] != "") |
|
| 4139 | + if ($row['registration'] != "") |
|
| 4140 | 4140 | { |
| 4141 | 4141 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4142 | 4142 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4157,9 +4157,9 @@ discard block |
||
| 4157 | 4157 | */ |
| 4158 | 4158 | public function countAllAircraftManufacturerByAirline($airline_icao) |
| 4159 | 4159 | { |
| 4160 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 4160 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 4161 | 4161 | |
| 4162 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4162 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4163 | 4163 | FROM spotter_output |
| 4164 | 4164 | WHERE spotter_output.aircraft_manufacturer <> '' AND spotter_output.airline_icao = :airline_icao |
| 4165 | 4165 | GROUP BY spotter_output.aircraft_manufacturer |
@@ -4171,7 +4171,7 @@ discard block |
||
| 4171 | 4171 | $aircraft_array = array(); |
| 4172 | 4172 | $temp_array = array(); |
| 4173 | 4173 | |
| 4174 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4174 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4175 | 4175 | { |
| 4176 | 4176 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 4177 | 4177 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -4190,9 +4190,9 @@ discard block |
||
| 4190 | 4190 | */ |
| 4191 | 4191 | public function countAllAircraftTypesByAirport($airport_icao) |
| 4192 | 4192 | { |
| 4193 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 4193 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 4194 | 4194 | |
| 4195 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4195 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4196 | 4196 | FROM spotter_output |
| 4197 | 4197 | WHERE spotter_output.aircraft_icao <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 4198 | 4198 | GROUP BY spotter_output.aircraft_name |
@@ -4203,7 +4203,7 @@ discard block |
||
| 4203 | 4203 | |
| 4204 | 4204 | $aircraft_array = array(); |
| 4205 | 4205 | $temp_array = array(); |
| 4206 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4206 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4207 | 4207 | { |
| 4208 | 4208 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4209 | 4209 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4224,9 +4224,9 @@ discard block |
||
| 4224 | 4224 | public function countAllAircraftRegistrationByAirport($airport_icao) |
| 4225 | 4225 | { |
| 4226 | 4226 | $Image = new Image($this->db); |
| 4227 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 4227 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 4228 | 4228 | |
| 4229 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4229 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4230 | 4230 | FROM spotter_output |
| 4231 | 4231 | WHERE spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 4232 | 4232 | GROUP BY spotter_output.registration |
@@ -4239,14 +4239,14 @@ discard block |
||
| 4239 | 4239 | $aircraft_array = array(); |
| 4240 | 4240 | $temp_array = array(); |
| 4241 | 4241 | |
| 4242 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4242 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4243 | 4243 | { |
| 4244 | 4244 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4245 | 4245 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4246 | 4246 | $temp_array['registration'] = $row['registration']; |
| 4247 | 4247 | $temp_array['airline_name'] = $row['airline_name']; |
| 4248 | 4248 | $temp_array['image_thumbnail'] = ""; |
| 4249 | - if($row['registration'] != "") |
|
| 4249 | + if ($row['registration'] != "") |
|
| 4250 | 4250 | { |
| 4251 | 4251 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4252 | 4252 | $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4268,9 +4268,9 @@ discard block |
||
| 4268 | 4268 | */ |
| 4269 | 4269 | public function countAllAircraftManufacturerByAirport($airport_icao) |
| 4270 | 4270 | { |
| 4271 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 4271 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 4272 | 4272 | |
| 4273 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4273 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4274 | 4274 | FROM spotter_output |
| 4275 | 4275 | WHERE spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 4276 | 4276 | GROUP BY spotter_output.aircraft_manufacturer |
@@ -4283,7 +4283,7 @@ discard block |
||
| 4283 | 4283 | $aircraft_array = array(); |
| 4284 | 4284 | $temp_array = array(); |
| 4285 | 4285 | |
| 4286 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4286 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4287 | 4287 | { |
| 4288 | 4288 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 4289 | 4289 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -4304,9 +4304,9 @@ discard block |
||
| 4304 | 4304 | */ |
| 4305 | 4305 | public function countAllAircraftTypesByManufacturer($aircraft_manufacturer) |
| 4306 | 4306 | { |
| 4307 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 4307 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 4308 | 4308 | |
| 4309 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4309 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4310 | 4310 | FROM spotter_output |
| 4311 | 4311 | WHERE spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 4312 | 4312 | GROUP BY spotter_output.aircraft_name |
@@ -4319,7 +4319,7 @@ discard block |
||
| 4319 | 4319 | $aircraft_array = array(); |
| 4320 | 4320 | $temp_array = array(); |
| 4321 | 4321 | |
| 4322 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4322 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4323 | 4323 | { |
| 4324 | 4324 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4325 | 4325 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4341,9 +4341,9 @@ discard block |
||
| 4341 | 4341 | public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer) |
| 4342 | 4342 | { |
| 4343 | 4343 | $Image = new Image($this->db); |
| 4344 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 4344 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 4345 | 4345 | |
| 4346 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4346 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4347 | 4347 | FROM spotter_output |
| 4348 | 4348 | WHERE spotter_output.registration <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 4349 | 4349 | GROUP BY spotter_output.registration |
@@ -4356,14 +4356,14 @@ discard block |
||
| 4356 | 4356 | $aircraft_array = array(); |
| 4357 | 4357 | $temp_array = array(); |
| 4358 | 4358 | |
| 4359 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4359 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4360 | 4360 | { |
| 4361 | 4361 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4362 | 4362 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4363 | 4363 | $temp_array['registration'] = $row['registration']; |
| 4364 | 4364 | $temp_array['airline_name'] = $row['airline_name']; |
| 4365 | 4365 | $temp_array['image_thumbnail'] = ""; |
| 4366 | - if($row['registration'] != "") |
|
| 4366 | + if ($row['registration'] != "") |
|
| 4367 | 4367 | { |
| 4368 | 4368 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4369 | 4369 | $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4387,7 +4387,7 @@ discard block |
||
| 4387 | 4387 | public function countAllAircraftTypesByDate($date) |
| 4388 | 4388 | { |
| 4389 | 4389 | global $globalTimezone, $globalDBdriver; |
| 4390 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 4390 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 4391 | 4391 | if ($globalTimezone != '') { |
| 4392 | 4392 | date_default_timezone_set($globalTimezone); |
| 4393 | 4393 | $datetime = new DateTime($date); |
@@ -4395,13 +4395,13 @@ discard block |
||
| 4395 | 4395 | } else $offset = '+00:00'; |
| 4396 | 4396 | |
| 4397 | 4397 | if ($globalDBdriver == 'mysql') { |
| 4398 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4398 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4399 | 4399 | FROM spotter_output |
| 4400 | 4400 | WHERE DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 4401 | 4401 | GROUP BY spotter_output.aircraft_name |
| 4402 | 4402 | ORDER BY aircraft_icao_count DESC"; |
| 4403 | 4403 | } else { |
| 4404 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4404 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4405 | 4405 | FROM spotter_output |
| 4406 | 4406 | WHERE to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 4407 | 4407 | GROUP BY spotter_output.aircraft_name |
@@ -4413,7 +4413,7 @@ discard block |
||
| 4413 | 4413 | |
| 4414 | 4414 | $aircraft_array = array(); |
| 4415 | 4415 | $temp_array = array(); |
| 4416 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4416 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4417 | 4417 | { |
| 4418 | 4418 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4419 | 4419 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4435,7 +4435,7 @@ discard block |
||
| 4435 | 4435 | { |
| 4436 | 4436 | global $globalTimezone, $globalDBdriver; |
| 4437 | 4437 | $Image = new Image($this->db); |
| 4438 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 4438 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 4439 | 4439 | if ($globalTimezone != '') { |
| 4440 | 4440 | date_default_timezone_set($globalTimezone); |
| 4441 | 4441 | $datetime = new DateTime($date); |
@@ -4443,13 +4443,13 @@ discard block |
||
| 4443 | 4443 | } else $offset = '+00:00'; |
| 4444 | 4444 | |
| 4445 | 4445 | if ($globalDBdriver == 'mysql') { |
| 4446 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4446 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4447 | 4447 | FROM spotter_output |
| 4448 | 4448 | WHERE spotter_output.registration <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 4449 | 4449 | GROUP BY spotter_output.registration |
| 4450 | 4450 | ORDER BY registration_count DESC"; |
| 4451 | 4451 | } else { |
| 4452 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4452 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4453 | 4453 | FROM spotter_output |
| 4454 | 4454 | WHERE spotter_output.registration <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 4455 | 4455 | GROUP BY spotter_output.registration |
@@ -4461,14 +4461,14 @@ discard block |
||
| 4461 | 4461 | |
| 4462 | 4462 | $aircraft_array = array(); |
| 4463 | 4463 | $temp_array = array(); |
| 4464 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4464 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4465 | 4465 | { |
| 4466 | 4466 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4467 | 4467 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4468 | 4468 | $temp_array['registration'] = $row['registration']; |
| 4469 | 4469 | $temp_array['airline_name'] = $row['airline_name']; |
| 4470 | 4470 | $temp_array['image_thumbnail'] = ""; |
| 4471 | - if($row['registration'] != "") |
|
| 4471 | + if ($row['registration'] != "") |
|
| 4472 | 4472 | { |
| 4473 | 4473 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4474 | 4474 | $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4490,7 +4490,7 @@ discard block |
||
| 4490 | 4490 | public function countAllAircraftManufacturerByDate($date) |
| 4491 | 4491 | { |
| 4492 | 4492 | global $globalTimezone, $globalDBdriver; |
| 4493 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 4493 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 4494 | 4494 | if ($globalTimezone != '') { |
| 4495 | 4495 | date_default_timezone_set($globalTimezone); |
| 4496 | 4496 | $datetime = new DateTime($date); |
@@ -4498,13 +4498,13 @@ discard block |
||
| 4498 | 4498 | } else $offset = '+00:00'; |
| 4499 | 4499 | |
| 4500 | 4500 | if ($globalDBdriver == 'mysql') { |
| 4501 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4501 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4502 | 4502 | FROM spotter_output |
| 4503 | 4503 | WHERE spotter_output.aircraft_manufacturer <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 4504 | 4504 | GROUP BY spotter_output.aircraft_manufacturer |
| 4505 | 4505 | ORDER BY aircraft_manufacturer_count DESC"; |
| 4506 | 4506 | } else { |
| 4507 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4507 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4508 | 4508 | FROM spotter_output |
| 4509 | 4509 | WHERE spotter_output.aircraft_manufacturer <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 4510 | 4510 | GROUP BY spotter_output.aircraft_manufacturer |
@@ -4517,7 +4517,7 @@ discard block |
||
| 4517 | 4517 | $aircraft_array = array(); |
| 4518 | 4518 | $temp_array = array(); |
| 4519 | 4519 | |
| 4520 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4520 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4521 | 4521 | { |
| 4522 | 4522 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 4523 | 4523 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -4536,9 +4536,9 @@ discard block |
||
| 4536 | 4536 | */ |
| 4537 | 4537 | public function countAllAircraftTypesByIdent($ident) |
| 4538 | 4538 | { |
| 4539 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 4539 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 4540 | 4540 | |
| 4541 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4541 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4542 | 4542 | FROM spotter_output |
| 4543 | 4543 | WHERE spotter_output.ident = :ident |
| 4544 | 4544 | GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao |
@@ -4550,7 +4550,7 @@ discard block |
||
| 4550 | 4550 | $aircraft_array = array(); |
| 4551 | 4551 | $temp_array = array(); |
| 4552 | 4552 | |
| 4553 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4553 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4554 | 4554 | { |
| 4555 | 4555 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4556 | 4556 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4571,9 +4571,9 @@ discard block |
||
| 4571 | 4571 | public function countAllAircraftRegistrationByIdent($ident) |
| 4572 | 4572 | { |
| 4573 | 4573 | $Image = new Image($this->db); |
| 4574 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 4574 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 4575 | 4575 | |
| 4576 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4576 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4577 | 4577 | FROM spotter_output |
| 4578 | 4578 | WHERE spotter_output.registration <> '' AND spotter_output.ident = :ident |
| 4579 | 4579 | GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
@@ -4586,14 +4586,14 @@ discard block |
||
| 4586 | 4586 | $aircraft_array = array(); |
| 4587 | 4587 | $temp_array = array(); |
| 4588 | 4588 | |
| 4589 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4589 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4590 | 4590 | { |
| 4591 | 4591 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4592 | 4592 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4593 | 4593 | $temp_array['registration'] = $row['registration']; |
| 4594 | 4594 | $temp_array['airline_name'] = $row['airline_name']; |
| 4595 | 4595 | $temp_array['image_thumbnail'] = ""; |
| 4596 | - if($row['registration'] != "") |
|
| 4596 | + if ($row['registration'] != "") |
|
| 4597 | 4597 | { |
| 4598 | 4598 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4599 | 4599 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4614,9 +4614,9 @@ discard block |
||
| 4614 | 4614 | */ |
| 4615 | 4615 | public function countAllAircraftManufacturerByIdent($ident) |
| 4616 | 4616 | { |
| 4617 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 4617 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 4618 | 4618 | |
| 4619 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4619 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4620 | 4620 | FROM spotter_output |
| 4621 | 4621 | WHERE spotter_output.aircraft_manufacturer <> '' AND spotter_output.ident = :ident |
| 4622 | 4622 | GROUP BY spotter_output.aircraft_manufacturer |
@@ -4629,7 +4629,7 @@ discard block |
||
| 4629 | 4629 | $aircraft_array = array(); |
| 4630 | 4630 | $temp_array = array(); |
| 4631 | 4631 | |
| 4632 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4632 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4633 | 4633 | { |
| 4634 | 4634 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 4635 | 4635 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -4649,11 +4649,11 @@ discard block |
||
| 4649 | 4649 | */ |
| 4650 | 4650 | public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao) |
| 4651 | 4651 | { |
| 4652 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4653 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4652 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4653 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4654 | 4654 | |
| 4655 | 4655 | |
| 4656 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4656 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4657 | 4657 | FROM spotter_output |
| 4658 | 4658 | WHERE (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 4659 | 4659 | GROUP BY spotter_output.aircraft_name |
@@ -4661,12 +4661,12 @@ discard block |
||
| 4661 | 4661 | |
| 4662 | 4662 | |
| 4663 | 4663 | $sth = $this->db->prepare($query); |
| 4664 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4664 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4665 | 4665 | |
| 4666 | 4666 | $aircraft_array = array(); |
| 4667 | 4667 | $temp_array = array(); |
| 4668 | 4668 | |
| 4669 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4669 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4670 | 4670 | { |
| 4671 | 4671 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4672 | 4672 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4688,10 +4688,10 @@ discard block |
||
| 4688 | 4688 | public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao) |
| 4689 | 4689 | { |
| 4690 | 4690 | $Image = new Image($this->db); |
| 4691 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4692 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4691 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4692 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4693 | 4693 | |
| 4694 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4694 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4695 | 4695 | FROM spotter_output |
| 4696 | 4696 | WHERE spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 4697 | 4697 | GROUP BY spotter_output.registration |
@@ -4699,19 +4699,19 @@ discard block |
||
| 4699 | 4699 | |
| 4700 | 4700 | |
| 4701 | 4701 | $sth = $this->db->prepare($query); |
| 4702 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4702 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4703 | 4703 | |
| 4704 | 4704 | $aircraft_array = array(); |
| 4705 | 4705 | $temp_array = array(); |
| 4706 | 4706 | |
| 4707 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4707 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4708 | 4708 | { |
| 4709 | 4709 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4710 | 4710 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4711 | 4711 | $temp_array['registration'] = $row['registration']; |
| 4712 | 4712 | $temp_array['airline_name'] = $row['airline_name']; |
| 4713 | 4713 | $temp_array['image_thumbnail'] = ""; |
| 4714 | - if($row['registration'] != "") |
|
| 4714 | + if ($row['registration'] != "") |
|
| 4715 | 4715 | { |
| 4716 | 4716 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4717 | 4717 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4733,10 +4733,10 @@ discard block |
||
| 4733 | 4733 | */ |
| 4734 | 4734 | public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao) |
| 4735 | 4735 | { |
| 4736 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4737 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 4736 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4737 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 4738 | 4738 | |
| 4739 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4739 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4740 | 4740 | FROM spotter_output |
| 4741 | 4741 | WHERE spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 4742 | 4742 | GROUP BY spotter_output.aircraft_manufacturer |
@@ -4744,12 +4744,12 @@ discard block |
||
| 4744 | 4744 | |
| 4745 | 4745 | |
| 4746 | 4746 | $sth = $this->db->prepare($query); |
| 4747 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4747 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao)); |
|
| 4748 | 4748 | |
| 4749 | 4749 | $aircraft_array = array(); |
| 4750 | 4750 | $temp_array = array(); |
| 4751 | 4751 | |
| 4752 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4752 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4753 | 4753 | { |
| 4754 | 4754 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 4755 | 4755 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -4771,9 +4771,9 @@ discard block |
||
| 4771 | 4771 | */ |
| 4772 | 4772 | public function countAllAircraftTypesByCountry($country) |
| 4773 | 4773 | { |
| 4774 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 4774 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 4775 | 4775 | |
| 4776 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4776 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name |
|
| 4777 | 4777 | FROM spotter_output |
| 4778 | 4778 | WHERE ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 4779 | 4779 | GROUP BY spotter_output.aircraft_name |
@@ -4786,7 +4786,7 @@ discard block |
||
| 4786 | 4786 | $aircraft_array = array(); |
| 4787 | 4787 | $temp_array = array(); |
| 4788 | 4788 | |
| 4789 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4789 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4790 | 4790 | { |
| 4791 | 4791 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4792 | 4792 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
@@ -4808,9 +4808,9 @@ discard block |
||
| 4808 | 4808 | public function countAllAircraftRegistrationByCountry($country) |
| 4809 | 4809 | { |
| 4810 | 4810 | $Image = new Image($this->db); |
| 4811 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 4811 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 4812 | 4812 | |
| 4813 | - $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4813 | + $query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name |
|
| 4814 | 4814 | FROM spotter_output |
| 4815 | 4815 | WHERE spotter_output.registration <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country) |
| 4816 | 4816 | GROUP BY spotter_output.registration |
@@ -4823,14 +4823,14 @@ discard block |
||
| 4823 | 4823 | $aircraft_array = array(); |
| 4824 | 4824 | $temp_array = array(); |
| 4825 | 4825 | |
| 4826 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4826 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4827 | 4827 | { |
| 4828 | 4828 | $temp_array['aircraft_icao'] = $row['aircraft_icao']; |
| 4829 | 4829 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4830 | 4830 | $temp_array['registration'] = $row['registration']; |
| 4831 | 4831 | $temp_array['airline_name'] = $row['airline_name']; |
| 4832 | 4832 | $temp_array['image_thumbnail'] = ""; |
| 4833 | - if($row['registration'] != "") |
|
| 4833 | + if ($row['registration'] != "") |
|
| 4834 | 4834 | { |
| 4835 | 4835 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4836 | 4836 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4852,9 +4852,9 @@ discard block |
||
| 4852 | 4852 | */ |
| 4853 | 4853 | public function countAllAircraftManufacturerByCountry($country) |
| 4854 | 4854 | { |
| 4855 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 4855 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 4856 | 4856 | |
| 4857 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4857 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4858 | 4858 | FROM spotter_output |
| 4859 | 4859 | WHERE spotter_output.aircraft_manufacturer <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country) |
| 4860 | 4860 | GROUP BY spotter_output.aircraft_manufacturer |
@@ -4867,7 +4867,7 @@ discard block |
||
| 4867 | 4867 | $aircraft_array = array(); |
| 4868 | 4868 | $temp_array = array(); |
| 4869 | 4869 | |
| 4870 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4870 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4871 | 4871 | { |
| 4872 | 4872 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 4873 | 4873 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -4888,7 +4888,7 @@ discard block |
||
| 4888 | 4888 | */ |
| 4889 | 4889 | public function countAllAircraftManufacturers() |
| 4890 | 4890 | { |
| 4891 | - $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4891 | + $query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count |
|
| 4892 | 4892 | FROM spotter_output |
| 4893 | 4893 | WHERE spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available' |
| 4894 | 4894 | GROUP BY spotter_output.aircraft_manufacturer |
@@ -4902,7 +4902,7 @@ discard block |
||
| 4902 | 4902 | $manufacturer_array = array(); |
| 4903 | 4903 | $temp_array = array(); |
| 4904 | 4904 | |
| 4905 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4905 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4906 | 4906 | { |
| 4907 | 4907 | $temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer']; |
| 4908 | 4908 | $temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count']; |
@@ -4921,11 +4921,11 @@ discard block |
||
| 4921 | 4921 | * @return Array the aircraft list |
| 4922 | 4922 | * |
| 4923 | 4923 | */ |
| 4924 | - public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 4924 | + public function countAllAircraftRegistrations($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 4925 | 4925 | { |
| 4926 | 4926 | global $globalDBdriver; |
| 4927 | 4927 | $Image = new Image($this->db); |
| 4928 | - $query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
|
| 4928 | + $query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name |
|
| 4929 | 4929 | FROM spotter_output |
| 4930 | 4930 | WHERE spotter_output.registration <> '' AND spotter_output.registration <> 'NA' "; |
| 4931 | 4931 | if ($olderthanmonths > 0) { |
@@ -4954,7 +4954,7 @@ discard block |
||
| 4954 | 4954 | $aircraft_array = array(); |
| 4955 | 4955 | $temp_array = array(); |
| 4956 | 4956 | |
| 4957 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4957 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 4958 | 4958 | { |
| 4959 | 4959 | $temp_array['registration'] = $row['registration']; |
| 4960 | 4960 | $temp_array['aircraft_registration_count'] = $row['aircraft_registration_count']; |
@@ -4962,7 +4962,7 @@ discard block |
||
| 4962 | 4962 | $temp_array['aircraft_name'] = $row['aircraft_name']; |
| 4963 | 4963 | $temp_array['airline_name'] = $row['airline_name']; |
| 4964 | 4964 | $temp_array['image_thumbnail'] = ""; |
| 4965 | - if($row['registration'] != "") |
|
| 4965 | + if ($row['registration'] != "") |
|
| 4966 | 4966 | { |
| 4967 | 4967 | $image_array = $Image->getSpotterImage($row['registration']); |
| 4968 | 4968 | if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail']; |
@@ -4986,7 +4986,7 @@ discard block |
||
| 4986 | 4986 | public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '') |
| 4987 | 4987 | { |
| 4988 | 4988 | global $globalDBdriver; |
| 4989 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 4989 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 4990 | 4990 | FROM spotter_output |
| 4991 | 4991 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' "; |
| 4992 | 4992 | if ($olderthanmonths > 0) { |
@@ -5016,7 +5016,7 @@ discard block |
||
| 5016 | 5016 | $airport_array = array(); |
| 5017 | 5017 | $temp_array = array(); |
| 5018 | 5018 | |
| 5019 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5019 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5020 | 5020 | { |
| 5021 | 5021 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5022 | 5022 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5038,7 +5038,7 @@ discard block |
||
| 5038 | 5038 | public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '') |
| 5039 | 5039 | { |
| 5040 | 5040 | global $globalDBdriver; |
| 5041 | - $query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country |
|
| 5041 | + $query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country |
|
| 5042 | 5042 | FROM spotter_output, airport |
| 5043 | 5043 | WHERE spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao "; |
| 5044 | 5044 | if ($olderthanmonths > 0) { |
@@ -5068,7 +5068,7 @@ discard block |
||
| 5068 | 5068 | $airport_array = array(); |
| 5069 | 5069 | $temp_array = array(); |
| 5070 | 5070 | |
| 5071 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5071 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5072 | 5072 | { |
| 5073 | 5073 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5074 | 5074 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5091,9 +5091,9 @@ discard block |
||
| 5091 | 5091 | */ |
| 5092 | 5092 | public function countAllDepartureAirportsByAirline($airline_icao) |
| 5093 | 5093 | { |
| 5094 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 5094 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 5095 | 5095 | |
| 5096 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5096 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5097 | 5097 | FROM spotter_output |
| 5098 | 5098 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao |
| 5099 | 5099 | GROUP BY spotter_output.departure_airport_icao |
@@ -5106,7 +5106,7 @@ discard block |
||
| 5106 | 5106 | $airport_array = array(); |
| 5107 | 5107 | $temp_array = array(); |
| 5108 | 5108 | |
| 5109 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5109 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5110 | 5110 | { |
| 5111 | 5111 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5112 | 5112 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5130,9 +5130,9 @@ discard block |
||
| 5130 | 5130 | */ |
| 5131 | 5131 | public function countAllDepartureAirportCountriesByAirline($airline_icao) |
| 5132 | 5132 | { |
| 5133 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 5133 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 5134 | 5134 | |
| 5135 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5135 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5136 | 5136 | FROM spotter_output |
| 5137 | 5137 | WHERE spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao |
| 5138 | 5138 | GROUP BY spotter_output.departure_airport_country |
@@ -5145,7 +5145,7 @@ discard block |
||
| 5145 | 5145 | $airport_array = array(); |
| 5146 | 5146 | $temp_array = array(); |
| 5147 | 5147 | |
| 5148 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5148 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5149 | 5149 | { |
| 5150 | 5150 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5151 | 5151 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5166,9 +5166,9 @@ discard block |
||
| 5166 | 5166 | */ |
| 5167 | 5167 | public function countAllDepartureAirportsByAircraft($aircraft_icao) |
| 5168 | 5168 | { |
| 5169 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 5169 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 5170 | 5170 | |
| 5171 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5171 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5172 | 5172 | FROM spotter_output |
| 5173 | 5173 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao |
| 5174 | 5174 | GROUP BY spotter_output.departure_airport_icao |
@@ -5181,7 +5181,7 @@ discard block |
||
| 5181 | 5181 | $airport_array = array(); |
| 5182 | 5182 | $temp_array = array(); |
| 5183 | 5183 | |
| 5184 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5184 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5185 | 5185 | { |
| 5186 | 5186 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5187 | 5187 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5204,9 +5204,9 @@ discard block |
||
| 5204 | 5204 | */ |
| 5205 | 5205 | public function countAllDepartureAirportCountriesByAircraft($aircraft_icao) |
| 5206 | 5206 | { |
| 5207 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 5207 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 5208 | 5208 | |
| 5209 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5209 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5210 | 5210 | FROM spotter_output |
| 5211 | 5211 | WHERE spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 5212 | 5212 | GROUP BY spotter_output.departure_airport_country |
@@ -5219,7 +5219,7 @@ discard block |
||
| 5219 | 5219 | $airport_array = array(); |
| 5220 | 5220 | $temp_array = array(); |
| 5221 | 5221 | |
| 5222 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5222 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5223 | 5223 | { |
| 5224 | 5224 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5225 | 5225 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5239,9 +5239,9 @@ discard block |
||
| 5239 | 5239 | */ |
| 5240 | 5240 | public function countAllDepartureAirportsByRegistration($registration) |
| 5241 | 5241 | { |
| 5242 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 5242 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 5243 | 5243 | |
| 5244 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5244 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5245 | 5245 | FROM spotter_output |
| 5246 | 5246 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.registration = :registration |
| 5247 | 5247 | GROUP BY spotter_output.departure_airport_icao |
@@ -5254,7 +5254,7 @@ discard block |
||
| 5254 | 5254 | $airport_array = array(); |
| 5255 | 5255 | $temp_array = array(); |
| 5256 | 5256 | |
| 5257 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5257 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5258 | 5258 | { |
| 5259 | 5259 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5260 | 5260 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5277,9 +5277,9 @@ discard block |
||
| 5277 | 5277 | */ |
| 5278 | 5278 | public function countAllDepartureAirportCountriesByRegistration($registration) |
| 5279 | 5279 | { |
| 5280 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 5280 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 5281 | 5281 | |
| 5282 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5282 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5283 | 5283 | FROM spotter_output |
| 5284 | 5284 | WHERE spotter_output.departure_airport_country <> '' AND spotter_output.registration = :registration |
| 5285 | 5285 | GROUP BY spotter_output.departure_airport_country |
@@ -5292,7 +5292,7 @@ discard block |
||
| 5292 | 5292 | $airport_array = array(); |
| 5293 | 5293 | $temp_array = array(); |
| 5294 | 5294 | |
| 5295 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5295 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5296 | 5296 | { |
| 5297 | 5297 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5298 | 5298 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5312,9 +5312,9 @@ discard block |
||
| 5312 | 5312 | */ |
| 5313 | 5313 | public function countAllDepartureAirportsByAirport($airport_icao) |
| 5314 | 5314 | { |
| 5315 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 5315 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 5316 | 5316 | |
| 5317 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5317 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5318 | 5318 | FROM spotter_output |
| 5319 | 5319 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao = :airport_icao |
| 5320 | 5320 | GROUP BY spotter_output.departure_airport_icao |
@@ -5327,7 +5327,7 @@ discard block |
||
| 5327 | 5327 | $airport_array = array(); |
| 5328 | 5328 | $temp_array = array(); |
| 5329 | 5329 | |
| 5330 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5330 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5331 | 5331 | { |
| 5332 | 5332 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5333 | 5333 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5350,9 +5350,9 @@ discard block |
||
| 5350 | 5350 | */ |
| 5351 | 5351 | public function countAllDepartureAirportCountriesByAirport($airport_icao) |
| 5352 | 5352 | { |
| 5353 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 5353 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 5354 | 5354 | |
| 5355 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5355 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5356 | 5356 | FROM spotter_output |
| 5357 | 5357 | WHERE spotter_output.departure_airport_country <> '' AND spotter_output.arrival_airport_icao = :airport_icao |
| 5358 | 5358 | GROUP BY spotter_output.departure_airport_country |
@@ -5365,7 +5365,7 @@ discard block |
||
| 5365 | 5365 | $airport_array = array(); |
| 5366 | 5366 | $temp_array = array(); |
| 5367 | 5367 | |
| 5368 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5368 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5369 | 5369 | { |
| 5370 | 5370 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5371 | 5371 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5386,9 +5386,9 @@ discard block |
||
| 5386 | 5386 | */ |
| 5387 | 5387 | public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer) |
| 5388 | 5388 | { |
| 5389 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 5389 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 5390 | 5390 | |
| 5391 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5391 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5392 | 5392 | FROM spotter_output |
| 5393 | 5393 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 5394 | 5394 | GROUP BY spotter_output.departure_airport_icao |
@@ -5401,7 +5401,7 @@ discard block |
||
| 5401 | 5401 | $airport_array = array(); |
| 5402 | 5402 | $temp_array = array(); |
| 5403 | 5403 | |
| 5404 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5404 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5405 | 5405 | { |
| 5406 | 5406 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5407 | 5407 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5424,9 +5424,9 @@ discard block |
||
| 5424 | 5424 | */ |
| 5425 | 5425 | public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer) |
| 5426 | 5426 | { |
| 5427 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 5427 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 5428 | 5428 | |
| 5429 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5429 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5430 | 5430 | FROM spotter_output |
| 5431 | 5431 | WHERE spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 5432 | 5432 | GROUP BY spotter_output.departure_airport_country |
@@ -5439,7 +5439,7 @@ discard block |
||
| 5439 | 5439 | $airport_array = array(); |
| 5440 | 5440 | $temp_array = array(); |
| 5441 | 5441 | |
| 5442 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5442 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5443 | 5443 | { |
| 5444 | 5444 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5445 | 5445 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5460,7 +5460,7 @@ discard block |
||
| 5460 | 5460 | public function countAllDepartureAirportsByDate($date) |
| 5461 | 5461 | { |
| 5462 | 5462 | global $globalTimezone, $globalDBdriver; |
| 5463 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 5463 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 5464 | 5464 | |
| 5465 | 5465 | if ($globalTimezone != '') { |
| 5466 | 5466 | date_default_timezone_set($globalTimezone); |
@@ -5469,13 +5469,13 @@ discard block |
||
| 5469 | 5469 | } else $offset = '+00:00'; |
| 5470 | 5470 | |
| 5471 | 5471 | if ($globalDBdriver == 'mysql') { |
| 5472 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5472 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5473 | 5473 | FROM spotter_output |
| 5474 | 5474 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 5475 | 5475 | GROUP BY spotter_output.departure_airport_icao |
| 5476 | 5476 | ORDER BY airport_departure_icao_count DESC"; |
| 5477 | 5477 | } else { |
| 5478 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5478 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5479 | 5479 | FROM spotter_output |
| 5480 | 5480 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 5481 | 5481 | GROUP BY spotter_output.departure_airport_icao |
@@ -5488,7 +5488,7 @@ discard block |
||
| 5488 | 5488 | $airport_array = array(); |
| 5489 | 5489 | $temp_array = array(); |
| 5490 | 5490 | |
| 5491 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5491 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5492 | 5492 | { |
| 5493 | 5493 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5494 | 5494 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5512,7 +5512,7 @@ discard block |
||
| 5512 | 5512 | public function countAllDepartureAirportCountriesByDate($date) |
| 5513 | 5513 | { |
| 5514 | 5514 | global $globalTimezone, $globalDBdriver; |
| 5515 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 5515 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 5516 | 5516 | if ($globalTimezone != '') { |
| 5517 | 5517 | date_default_timezone_set($globalTimezone); |
| 5518 | 5518 | $datetime = new DateTime($date); |
@@ -5520,13 +5520,13 @@ discard block |
||
| 5520 | 5520 | } else $offset = '+00:00'; |
| 5521 | 5521 | |
| 5522 | 5522 | if ($globalDBdriver == 'mysql') { |
| 5523 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5523 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5524 | 5524 | FROM spotter_output |
| 5525 | 5525 | WHERE spotter_output.departure_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 5526 | 5526 | GROUP BY spotter_output.departure_airport_country |
| 5527 | 5527 | ORDER BY airport_departure_country_count DESC"; |
| 5528 | 5528 | } else { |
| 5529 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5529 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5530 | 5530 | FROM spotter_output |
| 5531 | 5531 | WHERE spotter_output.departure_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 5532 | 5532 | GROUP BY spotter_output.departure_airport_country |
@@ -5539,7 +5539,7 @@ discard block |
||
| 5539 | 5539 | $airport_array = array(); |
| 5540 | 5540 | $temp_array = array(); |
| 5541 | 5541 | |
| 5542 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5542 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5543 | 5543 | { |
| 5544 | 5544 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5545 | 5545 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5559,9 +5559,9 @@ discard block |
||
| 5559 | 5559 | */ |
| 5560 | 5560 | public function countAllDepartureAirportsByIdent($ident) |
| 5561 | 5561 | { |
| 5562 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 5562 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 5563 | 5563 | |
| 5564 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5564 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5565 | 5565 | FROM spotter_output |
| 5566 | 5566 | WHERE spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.ident = :ident |
| 5567 | 5567 | GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
@@ -5574,7 +5574,7 @@ discard block |
||
| 5574 | 5574 | $airport_array = array(); |
| 5575 | 5575 | $temp_array = array(); |
| 5576 | 5576 | |
| 5577 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5577 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5578 | 5578 | { |
| 5579 | 5579 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5580 | 5580 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5598,9 +5598,9 @@ discard block |
||
| 5598 | 5598 | */ |
| 5599 | 5599 | public function countAllDepartureAirportCountriesByIdent($ident) |
| 5600 | 5600 | { |
| 5601 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 5601 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 5602 | 5602 | |
| 5603 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5603 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5604 | 5604 | FROM spotter_output |
| 5605 | 5605 | WHERE spotter_output.departure_airport_country <> '' AND spotter_output.ident = :ident |
| 5606 | 5606 | GROUP BY spotter_output.departure_airport_country |
@@ -5613,7 +5613,7 @@ discard block |
||
| 5613 | 5613 | $airport_array = array(); |
| 5614 | 5614 | $temp_array = array(); |
| 5615 | 5615 | |
| 5616 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5616 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5617 | 5617 | { |
| 5618 | 5618 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5619 | 5619 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5634,9 +5634,9 @@ discard block |
||
| 5634 | 5634 | */ |
| 5635 | 5635 | public function countAllDepartureAirportsByCountry($country) |
| 5636 | 5636 | { |
| 5637 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 5637 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 5638 | 5638 | |
| 5639 | - $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5639 | + $query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
|
| 5640 | 5640 | FROM spotter_output |
| 5641 | 5641 | WHERE ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 5642 | 5642 | GROUP BY spotter_output.departure_airport_icao |
@@ -5649,7 +5649,7 @@ discard block |
||
| 5649 | 5649 | $airport_array = array(); |
| 5650 | 5650 | $temp_array = array(); |
| 5651 | 5651 | |
| 5652 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5652 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5653 | 5653 | { |
| 5654 | 5654 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
| 5655 | 5655 | $temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count']; |
@@ -5672,9 +5672,9 @@ discard block |
||
| 5672 | 5672 | */ |
| 5673 | 5673 | public function countAllDepartureAirportCountriesByCountry($country) |
| 5674 | 5674 | { |
| 5675 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 5675 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 5676 | 5676 | |
| 5677 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5677 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 5678 | 5678 | FROM spotter_output |
| 5679 | 5679 | WHERE spotter_output.departure_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 5680 | 5680 | GROUP BY spotter_output.departure_airport_country |
@@ -5687,7 +5687,7 @@ discard block |
||
| 5687 | 5687 | $airport_array = array(); |
| 5688 | 5688 | $temp_array = array(); |
| 5689 | 5689 | |
| 5690 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5690 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5691 | 5691 | { |
| 5692 | 5692 | $temp_array['departure_airport_country'] = $row['departure_airport_country']; |
| 5693 | 5693 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
@@ -5708,7 +5708,7 @@ discard block |
||
| 5708 | 5708 | public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false) |
| 5709 | 5709 | { |
| 5710 | 5710 | global $globalDBdriver; |
| 5711 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5711 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5712 | 5712 | FROM spotter_output |
| 5713 | 5713 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' "; |
| 5714 | 5714 | if ($olderthanmonths > 0) { |
@@ -5744,7 +5744,7 @@ discard block |
||
| 5744 | 5744 | $airport_array = array(); |
| 5745 | 5745 | $temp_array = array(); |
| 5746 | 5746 | |
| 5747 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5747 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5748 | 5748 | { |
| 5749 | 5749 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 5750 | 5750 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -5767,10 +5767,10 @@ discard block |
||
| 5767 | 5767 | * @return Array the airport list |
| 5768 | 5768 | * |
| 5769 | 5769 | */ |
| 5770 | - public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false) |
|
| 5770 | + public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false) |
|
| 5771 | 5771 | { |
| 5772 | 5772 | global $globalDBdriver; |
| 5773 | - $query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country |
|
| 5773 | + $query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country |
|
| 5774 | 5774 | FROM spotter_output, airport |
| 5775 | 5775 | WHERE spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao "; |
| 5776 | 5776 | if ($olderthanmonths > 0) { |
@@ -5806,7 +5806,7 @@ discard block |
||
| 5806 | 5806 | $airport_array = array(); |
| 5807 | 5807 | $temp_array = array(); |
| 5808 | 5808 | |
| 5809 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5809 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5810 | 5810 | { |
| 5811 | 5811 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 5812 | 5812 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -5833,9 +5833,9 @@ discard block |
||
| 5833 | 5833 | */ |
| 5834 | 5834 | public function countAllArrivalAirportsByAirline($airline_icao) |
| 5835 | 5835 | { |
| 5836 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 5836 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 5837 | 5837 | |
| 5838 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5838 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5839 | 5839 | FROM spotter_output |
| 5840 | 5840 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao |
| 5841 | 5841 | GROUP BY spotter_output.arrival_airport_icao |
@@ -5848,7 +5848,7 @@ discard block |
||
| 5848 | 5848 | $airport_array = array(); |
| 5849 | 5849 | $temp_array = array(); |
| 5850 | 5850 | |
| 5851 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5851 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5852 | 5852 | { |
| 5853 | 5853 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 5854 | 5854 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -5871,9 +5871,9 @@ discard block |
||
| 5871 | 5871 | */ |
| 5872 | 5872 | public function countAllArrivalAirportCountriesByAirline($airline_icao) |
| 5873 | 5873 | { |
| 5874 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 5874 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 5875 | 5875 | |
| 5876 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 5876 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 5877 | 5877 | FROM spotter_output |
| 5878 | 5878 | WHERE spotter_output.arrival_airport_country <> '' AND spotter_output.airline_icao = :airline_icao |
| 5879 | 5879 | GROUP BY spotter_output.arrival_airport_country |
@@ -5886,7 +5886,7 @@ discard block |
||
| 5886 | 5886 | $airport_array = array(); |
| 5887 | 5887 | $temp_array = array(); |
| 5888 | 5888 | |
| 5889 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5889 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5890 | 5890 | { |
| 5891 | 5891 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 5892 | 5892 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -5906,9 +5906,9 @@ discard block |
||
| 5906 | 5906 | */ |
| 5907 | 5907 | public function countAllArrivalAirportsByAircraft($aircraft_icao) |
| 5908 | 5908 | { |
| 5909 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 5909 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 5910 | 5910 | |
| 5911 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5911 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5912 | 5912 | FROM spotter_output |
| 5913 | 5913 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao |
| 5914 | 5914 | GROUP BY spotter_output.arrival_airport_icao |
@@ -5921,7 +5921,7 @@ discard block |
||
| 5921 | 5921 | $airport_array = array(); |
| 5922 | 5922 | $temp_array = array(); |
| 5923 | 5923 | |
| 5924 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5924 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5925 | 5925 | { |
| 5926 | 5926 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 5927 | 5927 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -5945,9 +5945,9 @@ discard block |
||
| 5945 | 5945 | */ |
| 5946 | 5946 | public function countAllArrivalAirportCountriesByAircraft($aircraft_icao) |
| 5947 | 5947 | { |
| 5948 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 5948 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 5949 | 5949 | |
| 5950 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 5950 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 5951 | 5951 | FROM spotter_output |
| 5952 | 5952 | WHERE spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 5953 | 5953 | GROUP BY spotter_output.arrival_airport_country |
@@ -5960,7 +5960,7 @@ discard block |
||
| 5960 | 5960 | $airport_array = array(); |
| 5961 | 5961 | $temp_array = array(); |
| 5962 | 5962 | |
| 5963 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5963 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5964 | 5964 | { |
| 5965 | 5965 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 5966 | 5966 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -5980,9 +5980,9 @@ discard block |
||
| 5980 | 5980 | */ |
| 5981 | 5981 | public function countAllArrivalAirportsByRegistration($registration) |
| 5982 | 5982 | { |
| 5983 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 5983 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 5984 | 5984 | |
| 5985 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5985 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 5986 | 5986 | FROM spotter_output |
| 5987 | 5987 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.registration = :registration |
| 5988 | 5988 | GROUP BY spotter_output.arrival_airport_icao |
@@ -5995,7 +5995,7 @@ discard block |
||
| 5995 | 5995 | $airport_array = array(); |
| 5996 | 5996 | $temp_array = array(); |
| 5997 | 5997 | |
| 5998 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5998 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 5999 | 5999 | { |
| 6000 | 6000 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 6001 | 6001 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -6018,9 +6018,9 @@ discard block |
||
| 6018 | 6018 | */ |
| 6019 | 6019 | public function countAllArrivalAirportCountriesByRegistration($registration) |
| 6020 | 6020 | { |
| 6021 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 6021 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 6022 | 6022 | |
| 6023 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6023 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6024 | 6024 | FROM spotter_output |
| 6025 | 6025 | WHERE spotter_output.arrival_airport_country <> '' AND spotter_output.registration = :registration |
| 6026 | 6026 | GROUP BY spotter_output.arrival_airport_country |
@@ -6033,7 +6033,7 @@ discard block |
||
| 6033 | 6033 | $airport_array = array(); |
| 6034 | 6034 | $temp_array = array(); |
| 6035 | 6035 | |
| 6036 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6036 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6037 | 6037 | { |
| 6038 | 6038 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 6039 | 6039 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -6054,9 +6054,9 @@ discard block |
||
| 6054 | 6054 | */ |
| 6055 | 6055 | public function countAllArrivalAirportsByAirport($airport_icao) |
| 6056 | 6056 | { |
| 6057 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 6057 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 6058 | 6058 | |
| 6059 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6059 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6060 | 6060 | FROM spotter_output |
| 6061 | 6061 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.departure_airport_icao = :airport_icao |
| 6062 | 6062 | GROUP BY spotter_output.arrival_airport_icao |
@@ -6069,7 +6069,7 @@ discard block |
||
| 6069 | 6069 | $airport_array = array(); |
| 6070 | 6070 | $temp_array = array(); |
| 6071 | 6071 | |
| 6072 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6072 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6073 | 6073 | { |
| 6074 | 6074 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 6075 | 6075 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -6092,9 +6092,9 @@ discard block |
||
| 6092 | 6092 | */ |
| 6093 | 6093 | public function countAllArrivalAirportCountriesByAirport($airport_icao) |
| 6094 | 6094 | { |
| 6095 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 6095 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 6096 | 6096 | |
| 6097 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6097 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6098 | 6098 | FROM spotter_output |
| 6099 | 6099 | WHERE spotter_output.arrival_airport_country <> '' AND spotter_output.departure_airport_icao = :airport_icao |
| 6100 | 6100 | GROUP BY spotter_output.arrival_airport_country |
@@ -6107,7 +6107,7 @@ discard block |
||
| 6107 | 6107 | $airport_array = array(); |
| 6108 | 6108 | $temp_array = array(); |
| 6109 | 6109 | |
| 6110 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6110 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6111 | 6111 | { |
| 6112 | 6112 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 6113 | 6113 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -6127,9 +6127,9 @@ discard block |
||
| 6127 | 6127 | */ |
| 6128 | 6128 | public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer) |
| 6129 | 6129 | { |
| 6130 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 6130 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 6131 | 6131 | |
| 6132 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6132 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6133 | 6133 | FROM spotter_output |
| 6134 | 6134 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 6135 | 6135 | GROUP BY spotter_output.arrival_airport_icao |
@@ -6142,7 +6142,7 @@ discard block |
||
| 6142 | 6142 | $airport_array = array(); |
| 6143 | 6143 | $temp_array = array(); |
| 6144 | 6144 | |
| 6145 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6145 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6146 | 6146 | { |
| 6147 | 6147 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 6148 | 6148 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -6166,9 +6166,9 @@ discard block |
||
| 6166 | 6166 | */ |
| 6167 | 6167 | public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer) |
| 6168 | 6168 | { |
| 6169 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 6169 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 6170 | 6170 | |
| 6171 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6171 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6172 | 6172 | FROM spotter_output |
| 6173 | 6173 | WHERE spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 6174 | 6174 | GROUP BY spotter_output.arrival_airport_country |
@@ -6181,7 +6181,7 @@ discard block |
||
| 6181 | 6181 | $airport_array = array(); |
| 6182 | 6182 | $temp_array = array(); |
| 6183 | 6183 | |
| 6184 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6184 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6185 | 6185 | { |
| 6186 | 6186 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 6187 | 6187 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -6203,7 +6203,7 @@ discard block |
||
| 6203 | 6203 | public function countAllArrivalAirportsByDate($date) |
| 6204 | 6204 | { |
| 6205 | 6205 | global $globalTimezone, $globalDBdriver; |
| 6206 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 6206 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 6207 | 6207 | if ($globalTimezone != '') { |
| 6208 | 6208 | date_default_timezone_set($globalTimezone); |
| 6209 | 6209 | $datetime = new DateTime($date); |
@@ -6211,13 +6211,13 @@ discard block |
||
| 6211 | 6211 | } else $offset = '+00:00'; |
| 6212 | 6212 | |
| 6213 | 6213 | if ($globalDBdriver == 'mysql') { |
| 6214 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6214 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6215 | 6215 | FROM spotter_output |
| 6216 | 6216 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 6217 | 6217 | GROUP BY spotter_output.arrival_airport_icao |
| 6218 | 6218 | ORDER BY airport_arrival_icao_count DESC"; |
| 6219 | 6219 | } else { |
| 6220 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6220 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6221 | 6221 | FROM spotter_output |
| 6222 | 6222 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 6223 | 6223 | GROUP BY spotter_output.arrival_airport_icao |
@@ -6230,7 +6230,7 @@ discard block |
||
| 6230 | 6230 | $airport_array = array(); |
| 6231 | 6231 | $temp_array = array(); |
| 6232 | 6232 | |
| 6233 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6233 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6234 | 6234 | { |
| 6235 | 6235 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 6236 | 6236 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -6254,7 +6254,7 @@ discard block |
||
| 6254 | 6254 | public function countAllArrivalAirportCountriesByDate($date) |
| 6255 | 6255 | { |
| 6256 | 6256 | global $globalTimezone, $globalDBdriver; |
| 6257 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 6257 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 6258 | 6258 | if ($globalTimezone != '') { |
| 6259 | 6259 | date_default_timezone_set($globalTimezone); |
| 6260 | 6260 | $datetime = new DateTime($date); |
@@ -6262,13 +6262,13 @@ discard block |
||
| 6262 | 6262 | } else $offset = '+00:00'; |
| 6263 | 6263 | |
| 6264 | 6264 | if ($globalDBdriver == 'mysql') { |
| 6265 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6265 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6266 | 6266 | FROM spotter_output |
| 6267 | 6267 | WHERE spotter_output.arrival_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 6268 | 6268 | GROUP BY spotter_output.arrival_airport_country |
| 6269 | 6269 | ORDER BY airport_arrival_country_count DESC"; |
| 6270 | 6270 | } else { |
| 6271 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6271 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6272 | 6272 | FROM spotter_output |
| 6273 | 6273 | WHERE spotter_output.arrival_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 6274 | 6274 | GROUP BY spotter_output.arrival_airport_country |
@@ -6281,7 +6281,7 @@ discard block |
||
| 6281 | 6281 | $airport_array = array(); |
| 6282 | 6282 | $temp_array = array(); |
| 6283 | 6283 | |
| 6284 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6284 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6285 | 6285 | { |
| 6286 | 6286 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 6287 | 6287 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -6301,9 +6301,9 @@ discard block |
||
| 6301 | 6301 | */ |
| 6302 | 6302 | public function countAllArrivalAirportsByIdent($ident) |
| 6303 | 6303 | { |
| 6304 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 6304 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 6305 | 6305 | |
| 6306 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6306 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6307 | 6307 | FROM spotter_output |
| 6308 | 6308 | WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.ident = :ident |
| 6309 | 6309 | GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
@@ -6316,7 +6316,7 @@ discard block |
||
| 6316 | 6316 | $airport_array = array(); |
| 6317 | 6317 | $temp_array = array(); |
| 6318 | 6318 | |
| 6319 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6319 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6320 | 6320 | { |
| 6321 | 6321 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 6322 | 6322 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -6339,9 +6339,9 @@ discard block |
||
| 6339 | 6339 | */ |
| 6340 | 6340 | public function countAllArrivalAirportCountriesByIdent($ident) |
| 6341 | 6341 | { |
| 6342 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 6342 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 6343 | 6343 | |
| 6344 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6344 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6345 | 6345 | FROM spotter_output |
| 6346 | 6346 | WHERE spotter_output.arrival_airport_country <> '' AND spotter_output.ident = :ident |
| 6347 | 6347 | GROUP BY spotter_output.arrival_airport_country |
@@ -6354,7 +6354,7 @@ discard block |
||
| 6354 | 6354 | $airport_array = array(); |
| 6355 | 6355 | $temp_array = array(); |
| 6356 | 6356 | |
| 6357 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6357 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6358 | 6358 | { |
| 6359 | 6359 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 6360 | 6360 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -6375,9 +6375,9 @@ discard block |
||
| 6375 | 6375 | */ |
| 6376 | 6376 | public function countAllArrivalAirportsByCountry($country) |
| 6377 | 6377 | { |
| 6378 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 6378 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 6379 | 6379 | |
| 6380 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6380 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
|
| 6381 | 6381 | FROM spotter_output |
| 6382 | 6382 | WHERE ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 6383 | 6383 | GROUP BY spotter_output.arrival_airport_icao |
@@ -6390,7 +6390,7 @@ discard block |
||
| 6390 | 6390 | $airport_array = array(); |
| 6391 | 6391 | $temp_array = array(); |
| 6392 | 6392 | |
| 6393 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6393 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6394 | 6394 | { |
| 6395 | 6395 | $temp_array['airport_arrival_icao'] = $row['arrival_airport_icao']; |
| 6396 | 6396 | $temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count']; |
@@ -6413,9 +6413,9 @@ discard block |
||
| 6413 | 6413 | */ |
| 6414 | 6414 | public function countAllArrivalAirportCountriesByCountry($country) |
| 6415 | 6415 | { |
| 6416 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 6416 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 6417 | 6417 | |
| 6418 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6418 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6419 | 6419 | FROM spotter_output |
| 6420 | 6420 | WHERE spotter_output.arrival_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 6421 | 6421 | GROUP BY spotter_output.arrival_airport_country |
@@ -6428,7 +6428,7 @@ discard block |
||
| 6428 | 6428 | $airport_array = array(); |
| 6429 | 6429 | $temp_array = array(); |
| 6430 | 6430 | |
| 6431 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6431 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6432 | 6432 | { |
| 6433 | 6433 | $temp_array['arrival_airport_country'] = $row['arrival_airport_country']; |
| 6434 | 6434 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
@@ -6449,7 +6449,7 @@ discard block |
||
| 6449 | 6449 | */ |
| 6450 | 6450 | public function countAllDepartureCountries() |
| 6451 | 6451 | { |
| 6452 | - $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6452 | + $query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count |
|
| 6453 | 6453 | FROM spotter_output |
| 6454 | 6454 | WHERE spotter_output.departure_airport_country <> '' AND spotter_output.departure_airport_icao <> 'NA' |
| 6455 | 6455 | GROUP BY spotter_output.departure_airport_country |
@@ -6463,7 +6463,7 @@ discard block |
||
| 6463 | 6463 | $airport_array = array(); |
| 6464 | 6464 | $temp_array = array(); |
| 6465 | 6465 | |
| 6466 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6466 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6467 | 6467 | { |
| 6468 | 6468 | $temp_array['airport_departure_country_count'] = $row['airport_departure_country_count']; |
| 6469 | 6469 | $temp_array['airport_departure_country'] = $row['departure_airport_country']; |
@@ -6483,7 +6483,7 @@ discard block |
||
| 6483 | 6483 | */ |
| 6484 | 6484 | public function countAllArrivalCountries($limit = true) |
| 6485 | 6485 | { |
| 6486 | - $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6486 | + $query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count |
|
| 6487 | 6487 | FROM spotter_output |
| 6488 | 6488 | WHERE spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA' |
| 6489 | 6489 | GROUP BY spotter_output.arrival_airport_country |
@@ -6497,7 +6497,7 @@ discard block |
||
| 6497 | 6497 | $airport_array = array(); |
| 6498 | 6498 | $temp_array = array(); |
| 6499 | 6499 | |
| 6500 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6500 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6501 | 6501 | { |
| 6502 | 6502 | $temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count']; |
| 6503 | 6503 | $temp_array['airport_arrival_country'] = $row['arrival_airport_country']; |
@@ -6521,7 +6521,7 @@ discard block |
||
| 6521 | 6521 | public function countAllRoutes() |
| 6522 | 6522 | { |
| 6523 | 6523 | |
| 6524 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6524 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6525 | 6525 | FROM spotter_output |
| 6526 | 6526 | WHERE spotter_output.ident <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> 'NA' |
| 6527 | 6527 | GROUP BY route,spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country |
@@ -6535,7 +6535,7 @@ discard block |
||
| 6535 | 6535 | $routes_array = array(); |
| 6536 | 6536 | $temp_array = array(); |
| 6537 | 6537 | |
| 6538 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6538 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6539 | 6539 | { |
| 6540 | 6540 | $temp_array['route_count'] = $row['route_count']; |
| 6541 | 6541 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6564,9 +6564,9 @@ discard block |
||
| 6564 | 6564 | */ |
| 6565 | 6565 | public function countAllRoutesByAircraft($aircraft_icao) |
| 6566 | 6566 | { |
| 6567 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 6567 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 6568 | 6568 | |
| 6569 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6569 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6570 | 6570 | FROM spotter_output |
| 6571 | 6571 | WHERE spotter_output.ident <> '' AND spotter_output.aircraft_icao = :aircraft_icao |
| 6572 | 6572 | GROUP BY route |
@@ -6579,7 +6579,7 @@ discard block |
||
| 6579 | 6579 | $routes_array = array(); |
| 6580 | 6580 | $temp_array = array(); |
| 6581 | 6581 | |
| 6582 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6582 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6583 | 6583 | { |
| 6584 | 6584 | $temp_array['route_count'] = $row['route_count']; |
| 6585 | 6585 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6608,7 +6608,7 @@ discard block |
||
| 6608 | 6608 | { |
| 6609 | 6609 | $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
| 6610 | 6610 | |
| 6611 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6611 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6612 | 6612 | FROM spotter_output |
| 6613 | 6613 | WHERE spotter_output.ident <> '' AND spotter_output.registration = :registration |
| 6614 | 6614 | GROUP BY route |
@@ -6621,7 +6621,7 @@ discard block |
||
| 6621 | 6621 | $routes_array = array(); |
| 6622 | 6622 | $temp_array = array(); |
| 6623 | 6623 | |
| 6624 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6624 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6625 | 6625 | { |
| 6626 | 6626 | $temp_array['route_count'] = $row['route_count']; |
| 6627 | 6627 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6649,9 +6649,9 @@ discard block |
||
| 6649 | 6649 | */ |
| 6650 | 6650 | public function countAllRoutesByAirline($airline_icao) |
| 6651 | 6651 | { |
| 6652 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 6652 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 6653 | 6653 | |
| 6654 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6654 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6655 | 6655 | FROM spotter_output |
| 6656 | 6656 | WHERE spotter_output.ident <> '' AND spotter_output.airline_icao = :airline_icao |
| 6657 | 6657 | GROUP BY route |
@@ -6664,7 +6664,7 @@ discard block |
||
| 6664 | 6664 | $routes_array = array(); |
| 6665 | 6665 | $temp_array = array(); |
| 6666 | 6666 | |
| 6667 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6667 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6668 | 6668 | { |
| 6669 | 6669 | $temp_array['route_count'] = $row['route_count']; |
| 6670 | 6670 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6692,9 +6692,9 @@ discard block |
||
| 6692 | 6692 | */ |
| 6693 | 6693 | public function countAllRoutesByAirport($airport_icao) |
| 6694 | 6694 | { |
| 6695 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 6695 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 6696 | 6696 | |
| 6697 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6697 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6698 | 6698 | FROM spotter_output |
| 6699 | 6699 | WHERE spotter_output.ident <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 6700 | 6700 | GROUP BY route |
@@ -6707,7 +6707,7 @@ discard block |
||
| 6707 | 6707 | $routes_array = array(); |
| 6708 | 6708 | $temp_array = array(); |
| 6709 | 6709 | |
| 6710 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6710 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6711 | 6711 | { |
| 6712 | 6712 | $temp_array['route_count'] = $row['route_count']; |
| 6713 | 6713 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6735,9 +6735,9 @@ discard block |
||
| 6735 | 6735 | */ |
| 6736 | 6736 | public function countAllRoutesByCountry($country) |
| 6737 | 6737 | { |
| 6738 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 6738 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 6739 | 6739 | |
| 6740 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6740 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6741 | 6741 | FROM spotter_output |
| 6742 | 6742 | WHERE spotter_output.ident <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 6743 | 6743 | GROUP BY route |
@@ -6750,7 +6750,7 @@ discard block |
||
| 6750 | 6750 | $routes_array = array(); |
| 6751 | 6751 | $temp_array = array(); |
| 6752 | 6752 | |
| 6753 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6753 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6754 | 6754 | { |
| 6755 | 6755 | $temp_array['route_count'] = $row['route_count']; |
| 6756 | 6756 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6778,7 +6778,7 @@ discard block |
||
| 6778 | 6778 | public function countAllRoutesByDate($date) |
| 6779 | 6779 | { |
| 6780 | 6780 | global $globalTimezone, $globalDBdriver; |
| 6781 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 6781 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 6782 | 6782 | if ($globalTimezone != '') { |
| 6783 | 6783 | date_default_timezone_set($globalTimezone); |
| 6784 | 6784 | $datetime = new DateTime($date); |
@@ -6786,13 +6786,13 @@ discard block |
||
| 6786 | 6786 | } else $offset = '+00:00'; |
| 6787 | 6787 | |
| 6788 | 6788 | if ($globalDBdriver == 'mysql') { |
| 6789 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6789 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6790 | 6790 | FROM spotter_output |
| 6791 | 6791 | WHERE spotter_output.ident <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 6792 | 6792 | GROUP BY route |
| 6793 | 6793 | ORDER BY route_count DESC"; |
| 6794 | 6794 | } else { |
| 6795 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6795 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6796 | 6796 | FROM spotter_output |
| 6797 | 6797 | WHERE spotter_output.ident <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date |
| 6798 | 6798 | GROUP BY route |
@@ -6805,7 +6805,7 @@ discard block |
||
| 6805 | 6805 | $routes_array = array(); |
| 6806 | 6806 | $temp_array = array(); |
| 6807 | 6807 | |
| 6808 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6808 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6809 | 6809 | { |
| 6810 | 6810 | $temp_array['route_count'] = $row['route_count']; |
| 6811 | 6811 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6832,9 +6832,9 @@ discard block |
||
| 6832 | 6832 | */ |
| 6833 | 6833 | public function countAllRoutesByIdent($ident) |
| 6834 | 6834 | { |
| 6835 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 6835 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 6836 | 6836 | |
| 6837 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6837 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6838 | 6838 | FROM spotter_output |
| 6839 | 6839 | WHERE spotter_output.ident <> '' AND spotter_output.ident = :ident |
| 6840 | 6840 | GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
@@ -6847,7 +6847,7 @@ discard block |
||
| 6847 | 6847 | $routes_array = array(); |
| 6848 | 6848 | $temp_array = array(); |
| 6849 | 6849 | |
| 6850 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6850 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6851 | 6851 | { |
| 6852 | 6852 | $temp_array['route_count'] = $row['route_count']; |
| 6853 | 6853 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6874,9 +6874,9 @@ discard block |
||
| 6874 | 6874 | */ |
| 6875 | 6875 | public function countAllRoutesByManufacturer($aircraft_manufacturer) |
| 6876 | 6876 | { |
| 6877 | - $aircraft_manufacturer = filter_var($aircraft_manufactuer,FILTER_SANITIZE_STRING); |
|
| 6877 | + $aircraft_manufacturer = filter_var($aircraft_manufactuer, FILTER_SANITIZE_STRING); |
|
| 6878 | 6878 | |
| 6879 | - $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6879 | + $query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6880 | 6880 | FROM spotter_output |
| 6881 | 6881 | WHERE spotter_output.ident <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 6882 | 6882 | GROUP BY route |
@@ -6889,7 +6889,7 @@ discard block |
||
| 6889 | 6889 | $routes_array = array(); |
| 6890 | 6890 | $temp_array = array(); |
| 6891 | 6891 | |
| 6892 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6892 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6893 | 6893 | { |
| 6894 | 6894 | $temp_array['route_count'] = $row['route_count']; |
| 6895 | 6895 | $temp_array['airport_departure_icao'] = $row['departure_airport_icao']; |
@@ -6917,7 +6917,7 @@ discard block |
||
| 6917 | 6917 | */ |
| 6918 | 6918 | public function countAllRoutesWithWaypoints() |
| 6919 | 6919 | { |
| 6920 | - $query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6920 | + $query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country |
|
| 6921 | 6921 | FROM spotter_output |
| 6922 | 6922 | WHERE spotter_output.ident <> '' AND spotter_output.waypoints <> '' |
| 6923 | 6923 | GROUP BY route, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country |
@@ -6931,7 +6931,7 @@ discard block |
||
| 6931 | 6931 | $routes_array = array(); |
| 6932 | 6932 | $temp_array = array(); |
| 6933 | 6933 | |
| 6934 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6934 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6935 | 6935 | { |
| 6936 | 6936 | $temp_array['spotter_id'] = $row['spotter_id']; |
| 6937 | 6937 | $temp_array['route_count'] = $row['route_count']; |
@@ -6962,7 +6962,7 @@ discard block |
||
| 6962 | 6962 | public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '') |
| 6963 | 6963 | { |
| 6964 | 6964 | global $globalDBdriver; |
| 6965 | - $query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao |
|
| 6965 | + $query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao |
|
| 6966 | 6966 | FROM spotter_output |
| 6967 | 6967 | WHERE spotter_output.ident <> '' "; |
| 6968 | 6968 | if ($olderthanmonths > 0) { |
@@ -6982,7 +6982,7 @@ discard block |
||
| 6982 | 6982 | $callsign_array = array(); |
| 6983 | 6983 | $temp_array = array(); |
| 6984 | 6984 | |
| 6985 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6985 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 6986 | 6986 | { |
| 6987 | 6987 | $temp_array['callsign_icao'] = $row['ident']; |
| 6988 | 6988 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -7014,13 +7014,13 @@ discard block |
||
| 7014 | 7014 | } else $offset = '+00:00'; |
| 7015 | 7015 | |
| 7016 | 7016 | if ($globalDBdriver == 'mysql') { |
| 7017 | - $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 7017 | + $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 7018 | 7018 | FROM spotter_output |
| 7019 | 7019 | GROUP BY date_name |
| 7020 | 7020 | ORDER BY date_count DESC |
| 7021 | 7021 | LIMIT 10 OFFSET 0"; |
| 7022 | 7022 | } else { |
| 7023 | - $query = "SELECT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 7023 | + $query = "SELECT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 7024 | 7024 | FROM spotter_output |
| 7025 | 7025 | GROUP BY date_name |
| 7026 | 7026 | ORDER BY date_count DESC |
@@ -7034,7 +7034,7 @@ discard block |
||
| 7034 | 7034 | $date_array = array(); |
| 7035 | 7035 | $temp_array = array(); |
| 7036 | 7036 | |
| 7037 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7037 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7038 | 7038 | { |
| 7039 | 7039 | $temp_array['date_name'] = $row['date_name']; |
| 7040 | 7040 | $temp_array['date_count'] = $row['date_count']; |
@@ -7063,14 +7063,14 @@ discard block |
||
| 7063 | 7063 | } else $offset = '+00:00'; |
| 7064 | 7064 | |
| 7065 | 7065 | if ($globalDBdriver == 'mysql') { |
| 7066 | - $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 7066 | + $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 7067 | 7067 | FROM spotter_output |
| 7068 | 7068 | WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) |
| 7069 | 7069 | GROUP BY date_name |
| 7070 | 7070 | ORDER BY spotter_output.date ASC"; |
| 7071 | 7071 | $query_data = array(':offset' => $offset); |
| 7072 | 7072 | } elseif ($globalDBdriver == 'pgsql') { |
| 7073 | - $query = "SELECT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 7073 | + $query = "SELECT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 7074 | 7074 | FROM spotter_output |
| 7075 | 7075 | WHERE spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '7 DAYS' |
| 7076 | 7076 | GROUP BY date_name |
@@ -7084,7 +7084,7 @@ discard block |
||
| 7084 | 7084 | $date_array = array(); |
| 7085 | 7085 | $temp_array = array(); |
| 7086 | 7086 | |
| 7087 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7087 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7088 | 7088 | { |
| 7089 | 7089 | $temp_array['date_name'] = $row['date_name']; |
| 7090 | 7090 | $temp_array['date_count'] = $row['date_count']; |
@@ -7111,14 +7111,14 @@ discard block |
||
| 7111 | 7111 | } else $offset = '+00:00'; |
| 7112 | 7112 | |
| 7113 | 7113 | if ($globalDBdriver == 'mysql') { |
| 7114 | - $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 7114 | + $query = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
|
| 7115 | 7115 | FROM spotter_output |
| 7116 | 7116 | WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH) |
| 7117 | 7117 | GROUP BY date_name |
| 7118 | 7118 | ORDER BY spotter_output.date ASC"; |
| 7119 | 7119 | $query_data = array(':offset' => $offset); |
| 7120 | 7120 | } elseif ($globalDBdriver == 'pgsql') { |
| 7121 | - $query = "SELECT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 7121 | + $query = "SELECT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count |
|
| 7122 | 7122 | FROM spotter_output |
| 7123 | 7123 | WHERE spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 MONTHS' |
| 7124 | 7124 | GROUP BY date_name |
@@ -7132,7 +7132,7 @@ discard block |
||
| 7132 | 7132 | $date_array = array(); |
| 7133 | 7133 | $temp_array = array(); |
| 7134 | 7134 | |
| 7135 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7135 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7136 | 7136 | { |
| 7137 | 7137 | $temp_array['date_name'] = $row['date_name']; |
| 7138 | 7138 | $temp_array['date_count'] = $row['date_count']; |
@@ -7159,12 +7159,12 @@ discard block |
||
| 7159 | 7159 | } else $offset = '+00:00'; |
| 7160 | 7160 | |
| 7161 | 7161 | if ($globalDBdriver == 'mysql') { |
| 7162 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 7162 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 7163 | 7163 | FROM spotter_output |
| 7164 | 7164 | GROUP BY year_name, month_name |
| 7165 | 7165 | ORDER BY date_count DESC"; |
| 7166 | 7166 | } else { |
| 7167 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 7167 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 7168 | 7168 | FROM spotter_output |
| 7169 | 7169 | GROUP BY year_name, month_name |
| 7170 | 7170 | ORDER BY date_count DESC"; |
@@ -7177,7 +7177,7 @@ discard block |
||
| 7177 | 7177 | $date_array = array(); |
| 7178 | 7178 | $temp_array = array(); |
| 7179 | 7179 | |
| 7180 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7180 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7181 | 7181 | { |
| 7182 | 7182 | $temp_array['month_name'] = $row['month_name']; |
| 7183 | 7183 | $temp_array['year_name'] = $row['year_name']; |
@@ -7205,13 +7205,13 @@ discard block |
||
| 7205 | 7205 | } else $offset = '+00:00'; |
| 7206 | 7206 | |
| 7207 | 7207 | if ($globalDBdriver == 'mysql') { |
| 7208 | - $query = "SELECT YEAR(CONVERT_TZ(s.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(s.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 7208 | + $query = "SELECT YEAR(CONVERT_TZ(s.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(s.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
|
| 7209 | 7209 | FROM spotter_output s |
| 7210 | 7210 | WHERE s.airline_type = 'military' |
| 7211 | 7211 | GROUP BY year_name, month_name |
| 7212 | 7212 | ORDER BY date_count DESC"; |
| 7213 | 7213 | } else { |
| 7214 | - $query = "SELECT EXTRACT(YEAR FROM s.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM s.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 7214 | + $query = "SELECT EXTRACT(YEAR FROM s.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM s.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count |
|
| 7215 | 7215 | FROM spotter_output s |
| 7216 | 7216 | WHERE s.airline_type = 'military' |
| 7217 | 7217 | GROUP BY year_name, month_name |
@@ -7224,7 +7224,7 @@ discard block |
||
| 7224 | 7224 | $date_array = array(); |
| 7225 | 7225 | $temp_array = array(); |
| 7226 | 7226 | |
| 7227 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7227 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7228 | 7228 | { |
| 7229 | 7229 | $temp_array['month_name'] = $row['month_name']; |
| 7230 | 7230 | $temp_array['year_name'] = $row['year_name']; |
@@ -7252,13 +7252,13 @@ discard block |
||
| 7252 | 7252 | } else $offset = '+00:00'; |
| 7253 | 7253 | |
| 7254 | 7254 | if ($globalDBdriver == 'mysql') { |
| 7255 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count |
|
| 7255 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count |
|
| 7256 | 7256 | FROM spotter_output |
| 7257 | 7257 | WHERE owner_name <> '' |
| 7258 | 7258 | GROUP BY year_name, month_name |
| 7259 | 7259 | ORDER BY date_count DESC"; |
| 7260 | 7260 | } else { |
| 7261 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count |
|
| 7261 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count |
|
| 7262 | 7262 | FROM spotter_output |
| 7263 | 7263 | WHERE owner_name <> '' |
| 7264 | 7264 | GROUP BY year_name, month_name |
@@ -7271,7 +7271,7 @@ discard block |
||
| 7271 | 7271 | $date_array = array(); |
| 7272 | 7272 | $temp_array = array(); |
| 7273 | 7273 | |
| 7274 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7274 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7275 | 7275 | { |
| 7276 | 7276 | $temp_array['month_name'] = $row['month_name']; |
| 7277 | 7277 | $temp_array['year_name'] = $row['year_name']; |
@@ -7299,13 +7299,13 @@ discard block |
||
| 7299 | 7299 | } else $offset = '+00:00'; |
| 7300 | 7300 | |
| 7301 | 7301 | if ($globalDBdriver == 'mysql') { |
| 7302 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count |
|
| 7302 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count |
|
| 7303 | 7303 | FROM spotter_output |
| 7304 | 7304 | WHERE pilot_id <> '' AND pilot_id IS NOT NULL |
| 7305 | 7305 | GROUP BY year_name, month_name |
| 7306 | 7306 | ORDER BY date_count DESC"; |
| 7307 | 7307 | } else { |
| 7308 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count |
|
| 7308 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count |
|
| 7309 | 7309 | FROM spotter_output |
| 7310 | 7310 | WHERE pilot_id <> '' AND pilot_id IS NOT NULL |
| 7311 | 7311 | GROUP BY year_name, month_name |
@@ -7318,7 +7318,7 @@ discard block |
||
| 7318 | 7318 | $date_array = array(); |
| 7319 | 7319 | $temp_array = array(); |
| 7320 | 7320 | |
| 7321 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7321 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7322 | 7322 | { |
| 7323 | 7323 | $temp_array['month_name'] = $row['month_name']; |
| 7324 | 7324 | $temp_array['year_name'] = $row['year_name']; |
@@ -7347,13 +7347,13 @@ discard block |
||
| 7347 | 7347 | } else $offset = '+00:00'; |
| 7348 | 7348 | |
| 7349 | 7349 | if ($globalDBdriver == 'mysql') { |
| 7350 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count |
|
| 7350 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count |
|
| 7351 | 7351 | FROM spotter_output |
| 7352 | 7352 | WHERE airline_icao <> '' |
| 7353 | 7353 | GROUP BY year_name, month_name |
| 7354 | 7354 | ORDER BY date_count DESC"; |
| 7355 | 7355 | } else { |
| 7356 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count |
|
| 7356 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count |
|
| 7357 | 7357 | FROM spotter_output |
| 7358 | 7358 | WHERE airline_icao <> '' |
| 7359 | 7359 | GROUP BY year_name, month_name |
@@ -7366,7 +7366,7 @@ discard block |
||
| 7366 | 7366 | $date_array = array(); |
| 7367 | 7367 | $temp_array = array(); |
| 7368 | 7368 | |
| 7369 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7369 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7370 | 7370 | { |
| 7371 | 7371 | $temp_array['month_name'] = $row['month_name']; |
| 7372 | 7372 | $temp_array['year_name'] = $row['year_name']; |
@@ -7394,13 +7394,13 @@ discard block |
||
| 7394 | 7394 | } else $offset = '+00:00'; |
| 7395 | 7395 | |
| 7396 | 7396 | if ($globalDBdriver == 'mysql') { |
| 7397 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 7397 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 7398 | 7398 | FROM spotter_output |
| 7399 | 7399 | WHERE aircraft_icao <> '' |
| 7400 | 7400 | GROUP BY year_name, month_name |
| 7401 | 7401 | ORDER BY date_count DESC"; |
| 7402 | 7402 | } else { |
| 7403 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 7403 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count |
|
| 7404 | 7404 | FROM spotter_output |
| 7405 | 7405 | WHERE aircraft_icao <> '' |
| 7406 | 7406 | GROUP BY year_name, month_name |
@@ -7413,7 +7413,7 @@ discard block |
||
| 7413 | 7413 | $date_array = array(); |
| 7414 | 7414 | $temp_array = array(); |
| 7415 | 7415 | |
| 7416 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7416 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7417 | 7417 | { |
| 7418 | 7418 | $temp_array['month_name'] = $row['month_name']; |
| 7419 | 7419 | $temp_array['year_name'] = $row['year_name']; |
@@ -7442,13 +7442,13 @@ discard block |
||
| 7442 | 7442 | } else $offset = '+00:00'; |
| 7443 | 7443 | |
| 7444 | 7444 | if ($globalDBdriver == 'mysql') { |
| 7445 | - $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 7445 | + $query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 7446 | 7446 | FROM spotter_output |
| 7447 | 7447 | WHERE real_arrival_airport_icao <> '' |
| 7448 | 7448 | GROUP BY year_name, month_name |
| 7449 | 7449 | ORDER BY date_count DESC"; |
| 7450 | 7450 | } else { |
| 7451 | - $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 7451 | + $query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count |
|
| 7452 | 7452 | FROM spotter_output |
| 7453 | 7453 | WHERE real_arrival_airport_icao <> '' |
| 7454 | 7454 | GROUP BY year_name, month_name |
@@ -7461,7 +7461,7 @@ discard block |
||
| 7461 | 7461 | $date_array = array(); |
| 7462 | 7462 | $temp_array = array(); |
| 7463 | 7463 | |
| 7464 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7464 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7465 | 7465 | { |
| 7466 | 7466 | $temp_array['month_name'] = $row['month_name']; |
| 7467 | 7467 | $temp_array['year_name'] = $row['year_name']; |
@@ -7491,7 +7491,7 @@ discard block |
||
| 7491 | 7491 | } else $offset = '+00:00'; |
| 7492 | 7492 | |
| 7493 | 7493 | if ($globalDBdriver == 'mysql') { |
| 7494 | - $query = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
|
| 7494 | + $query = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
|
| 7495 | 7495 | FROM spotter_output |
| 7496 | 7496 | WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR) |
| 7497 | 7497 | GROUP BY year_name, month_name |
@@ -7500,7 +7500,7 @@ discard block |
||
| 7500 | 7500 | } elseif ($globalDBdriver == 'pgsql') { |
| 7501 | 7501 | // FIXME : not working |
| 7502 | 7502 | //$query = "SELECT spotter_output.date AT TIME ZONE INTERVAL :offset AS date_name, count(*) as date_count |
| 7503 | - $query = "SELECT EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count |
|
| 7503 | + $query = "SELECT EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name, count(*) as date_count |
|
| 7504 | 7504 | FROM spotter_output |
| 7505 | 7505 | WHERE spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 YEARS' |
| 7506 | 7506 | GROUP BY year_name, month_name |
@@ -7514,7 +7514,7 @@ discard block |
||
| 7514 | 7514 | $date_array = array(); |
| 7515 | 7515 | $temp_array = array(); |
| 7516 | 7516 | |
| 7517 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7517 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7518 | 7518 | { |
| 7519 | 7519 | $temp_array['year_name'] = $row['year_name']; |
| 7520 | 7520 | $temp_array['month_name'] = $row['month_name']; |
@@ -7553,7 +7553,7 @@ discard block |
||
| 7553 | 7553 | } |
| 7554 | 7554 | |
| 7555 | 7555 | if ($globalDBdriver == 'mysql') { |
| 7556 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7556 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7557 | 7557 | FROM spotter_output |
| 7558 | 7558 | GROUP BY hour_name |
| 7559 | 7559 | ".$orderby_sql; |
@@ -7566,7 +7566,7 @@ discard block |
||
| 7566 | 7566 | */ |
| 7567 | 7567 | $query_data = array(':offset' => $offset); |
| 7568 | 7568 | } elseif ($globalDBdriver == 'pgsql') { |
| 7569 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7569 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7570 | 7570 | FROM spotter_output |
| 7571 | 7571 | GROUP BY hour_name |
| 7572 | 7572 | ".$orderby_sql; |
@@ -7579,7 +7579,7 @@ discard block |
||
| 7579 | 7579 | $hour_array = array(); |
| 7580 | 7580 | $temp_array = array(); |
| 7581 | 7581 | |
| 7582 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7582 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7583 | 7583 | { |
| 7584 | 7584 | $temp_array['hour_name'] = $row['hour_name']; |
| 7585 | 7585 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7606,16 +7606,16 @@ discard block |
||
| 7606 | 7606 | $offset = $datetime->format('P'); |
| 7607 | 7607 | } else $offset = '+00:00'; |
| 7608 | 7608 | |
| 7609 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 7609 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 7610 | 7610 | |
| 7611 | 7611 | if ($globalDBdriver == 'mysql') { |
| 7612 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7612 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7613 | 7613 | FROM spotter_output |
| 7614 | 7614 | WHERE spotter_output.airline_icao = :airline_icao |
| 7615 | 7615 | GROUP BY hour_name |
| 7616 | 7616 | ORDER BY hour_name ASC"; |
| 7617 | 7617 | } else { |
| 7618 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7618 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7619 | 7619 | FROM spotter_output |
| 7620 | 7620 | WHERE spotter_output.airline_icao = :airline_icao |
| 7621 | 7621 | GROUP BY hour_name |
@@ -7623,12 +7623,12 @@ discard block |
||
| 7623 | 7623 | } |
| 7624 | 7624 | |
| 7625 | 7625 | $sth = $this->db->prepare($query); |
| 7626 | - $sth->execute(array(':airline_icao' => $airline_icao,':offset' => $offset)); |
|
| 7626 | + $sth->execute(array(':airline_icao' => $airline_icao, ':offset' => $offset)); |
|
| 7627 | 7627 | |
| 7628 | 7628 | $hour_array = array(); |
| 7629 | 7629 | $temp_array = array(); |
| 7630 | 7630 | |
| 7631 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7631 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7632 | 7632 | { |
| 7633 | 7633 | $temp_array['hour_name'] = $row['hour_name']; |
| 7634 | 7634 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7651,7 +7651,7 @@ discard block |
||
| 7651 | 7651 | public function countAllHoursByAircraft($aircraft_icao) |
| 7652 | 7652 | { |
| 7653 | 7653 | global $globalTimezone, $globalDBdriver; |
| 7654 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 7654 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 7655 | 7655 | if ($globalTimezone != '') { |
| 7656 | 7656 | date_default_timezone_set($globalTimezone); |
| 7657 | 7657 | $datetime = new DateTime(); |
@@ -7659,13 +7659,13 @@ discard block |
||
| 7659 | 7659 | } else $offset = '+00:00'; |
| 7660 | 7660 | |
| 7661 | 7661 | if ($globalDBdriver == 'mysql') { |
| 7662 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7662 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7663 | 7663 | FROM spotter_output |
| 7664 | 7664 | WHERE spotter_output.aircraft_icao = :aircraft_icao |
| 7665 | 7665 | GROUP BY hour_name |
| 7666 | 7666 | ORDER BY hour_name ASC"; |
| 7667 | 7667 | } else { |
| 7668 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7668 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7669 | 7669 | FROM spotter_output |
| 7670 | 7670 | WHERE spotter_output.aircraft_icao = :aircraft_icao |
| 7671 | 7671 | GROUP BY hour_name |
@@ -7673,12 +7673,12 @@ discard block |
||
| 7673 | 7673 | } |
| 7674 | 7674 | |
| 7675 | 7675 | $sth = $this->db->prepare($query); |
| 7676 | - $sth->execute(array(':aircraft_icao' => $aircraft_icao,':offset' => $offset)); |
|
| 7676 | + $sth->execute(array(':aircraft_icao' => $aircraft_icao, ':offset' => $offset)); |
|
| 7677 | 7677 | |
| 7678 | 7678 | $hour_array = array(); |
| 7679 | 7679 | $temp_array = array(); |
| 7680 | 7680 | |
| 7681 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7681 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7682 | 7682 | { |
| 7683 | 7683 | $temp_array['hour_name'] = $row['hour_name']; |
| 7684 | 7684 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7699,7 +7699,7 @@ discard block |
||
| 7699 | 7699 | public function countAllHoursByRegistration($registration) |
| 7700 | 7700 | { |
| 7701 | 7701 | global $globalTimezone, $globalDBdriver; |
| 7702 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 7702 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 7703 | 7703 | if ($globalTimezone != '') { |
| 7704 | 7704 | date_default_timezone_set($globalTimezone); |
| 7705 | 7705 | $datetime = new DateTime(); |
@@ -7707,13 +7707,13 @@ discard block |
||
| 7707 | 7707 | } else $offset = '+00:00'; |
| 7708 | 7708 | |
| 7709 | 7709 | if ($globalDBdriver == 'mysql') { |
| 7710 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7710 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7711 | 7711 | FROM spotter_output |
| 7712 | 7712 | WHERE spotter_output.registration = :registration |
| 7713 | 7713 | GROUP BY hour_name |
| 7714 | 7714 | ORDER BY hour_name ASC"; |
| 7715 | 7715 | } else { |
| 7716 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7716 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7717 | 7717 | FROM spotter_output |
| 7718 | 7718 | WHERE spotter_output.registration = :registration |
| 7719 | 7719 | GROUP BY hour_name |
@@ -7721,12 +7721,12 @@ discard block |
||
| 7721 | 7721 | } |
| 7722 | 7722 | |
| 7723 | 7723 | $sth = $this->db->prepare($query); |
| 7724 | - $sth->execute(array(':registration' => $registration,':offset' => $offset)); |
|
| 7724 | + $sth->execute(array(':registration' => $registration, ':offset' => $offset)); |
|
| 7725 | 7725 | |
| 7726 | 7726 | $hour_array = array(); |
| 7727 | 7727 | $temp_array = array(); |
| 7728 | 7728 | |
| 7729 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7729 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7730 | 7730 | { |
| 7731 | 7731 | $temp_array['hour_name'] = $row['hour_name']; |
| 7732 | 7732 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7747,7 +7747,7 @@ discard block |
||
| 7747 | 7747 | public function countAllHoursByAirport($airport_icao) |
| 7748 | 7748 | { |
| 7749 | 7749 | global $globalTimezone, $globalDBdriver; |
| 7750 | - $airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING); |
|
| 7750 | + $airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING); |
|
| 7751 | 7751 | if ($globalTimezone != '') { |
| 7752 | 7752 | date_default_timezone_set($globalTimezone); |
| 7753 | 7753 | $datetime = new DateTime(); |
@@ -7755,13 +7755,13 @@ discard block |
||
| 7755 | 7755 | } else $offset = '+00:00'; |
| 7756 | 7756 | |
| 7757 | 7757 | if ($globalDBdriver == 'mysql') { |
| 7758 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7758 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7759 | 7759 | FROM spotter_output |
| 7760 | 7760 | WHERE (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 7761 | 7761 | GROUP BY hour_name |
| 7762 | 7762 | ORDER BY hour_name ASC"; |
| 7763 | 7763 | } else { |
| 7764 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7764 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7765 | 7765 | FROM spotter_output |
| 7766 | 7766 | WHERE (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) |
| 7767 | 7767 | GROUP BY hour_name |
@@ -7769,12 +7769,12 @@ discard block |
||
| 7769 | 7769 | } |
| 7770 | 7770 | |
| 7771 | 7771 | $sth = $this->db->prepare($query); |
| 7772 | - $sth->execute(array(':airport_icao' => $airport_icao,':offset' => $offset)); |
|
| 7772 | + $sth->execute(array(':airport_icao' => $airport_icao, ':offset' => $offset)); |
|
| 7773 | 7773 | |
| 7774 | 7774 | $hour_array = array(); |
| 7775 | 7775 | $temp_array = array(); |
| 7776 | 7776 | |
| 7777 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7777 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7778 | 7778 | { |
| 7779 | 7779 | $temp_array['hour_name'] = $row['hour_name']; |
| 7780 | 7780 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7796,7 +7796,7 @@ discard block |
||
| 7796 | 7796 | public function countAllHoursByManufacturer($aircraft_manufacturer) |
| 7797 | 7797 | { |
| 7798 | 7798 | global $globalTimezone, $globalDBdriver; |
| 7799 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 7799 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 7800 | 7800 | if ($globalTimezone != '') { |
| 7801 | 7801 | date_default_timezone_set($globalTimezone); |
| 7802 | 7802 | $datetime = new DateTime(); |
@@ -7804,13 +7804,13 @@ discard block |
||
| 7804 | 7804 | } else $offset = '+00:00'; |
| 7805 | 7805 | |
| 7806 | 7806 | if ($globalDBdriver == 'mysql') { |
| 7807 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7807 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7808 | 7808 | FROM spotter_output |
| 7809 | 7809 | WHERE spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 7810 | 7810 | GROUP BY hour_name |
| 7811 | 7811 | ORDER BY hour_name ASC"; |
| 7812 | 7812 | } else { |
| 7813 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7813 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7814 | 7814 | FROM spotter_output |
| 7815 | 7815 | WHERE spotter_output.aircraft_manufacturer = :aircraft_manufacturer |
| 7816 | 7816 | GROUP BY hour_name |
@@ -7818,12 +7818,12 @@ discard block |
||
| 7818 | 7818 | } |
| 7819 | 7819 | |
| 7820 | 7820 | $sth = $this->db->prepare($query); |
| 7821 | - $sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer,':offset' => $offset)); |
|
| 7821 | + $sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer, ':offset' => $offset)); |
|
| 7822 | 7822 | |
| 7823 | 7823 | $hour_array = array(); |
| 7824 | 7824 | $temp_array = array(); |
| 7825 | 7825 | |
| 7826 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7826 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7827 | 7827 | { |
| 7828 | 7828 | $temp_array['hour_name'] = $row['hour_name']; |
| 7829 | 7829 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7845,7 +7845,7 @@ discard block |
||
| 7845 | 7845 | public function countAllHoursByDate($date) |
| 7846 | 7846 | { |
| 7847 | 7847 | global $globalTimezone, $globalDBdriver; |
| 7848 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 7848 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 7849 | 7849 | if ($globalTimezone != '') { |
| 7850 | 7850 | date_default_timezone_set($globalTimezone); |
| 7851 | 7851 | $datetime = new DateTime($date); |
@@ -7853,13 +7853,13 @@ discard block |
||
| 7853 | 7853 | } else $offset = '+00:00'; |
| 7854 | 7854 | |
| 7855 | 7855 | if ($globalDBdriver == 'mysql') { |
| 7856 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7856 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7857 | 7857 | FROM spotter_output |
| 7858 | 7858 | WHERE DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date |
| 7859 | 7859 | GROUP BY hour_name |
| 7860 | 7860 | ORDER BY hour_name ASC"; |
| 7861 | 7861 | } else { |
| 7862 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7862 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7863 | 7863 | FROM spotter_output |
| 7864 | 7864 | WHERE to_char(spotter_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 7865 | 7865 | GROUP BY hour_name |
@@ -7872,7 +7872,7 @@ discard block |
||
| 7872 | 7872 | $hour_array = array(); |
| 7873 | 7873 | $temp_array = array(); |
| 7874 | 7874 | |
| 7875 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7875 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7876 | 7876 | { |
| 7877 | 7877 | $temp_array['hour_name'] = $row['hour_name']; |
| 7878 | 7878 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7894,7 +7894,7 @@ discard block |
||
| 7894 | 7894 | public function countAllHoursByIdent($ident) |
| 7895 | 7895 | { |
| 7896 | 7896 | global $globalTimezone, $globalDBdriver; |
| 7897 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 7897 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 7898 | 7898 | if ($globalTimezone != '') { |
| 7899 | 7899 | date_default_timezone_set($globalTimezone); |
| 7900 | 7900 | $datetime = new DateTime(); |
@@ -7902,13 +7902,13 @@ discard block |
||
| 7902 | 7902 | } else $offset = '+00:00'; |
| 7903 | 7903 | |
| 7904 | 7904 | if ($globalDBdriver == 'mysql') { |
| 7905 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7905 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7906 | 7906 | FROM spotter_output |
| 7907 | 7907 | WHERE spotter_output.ident = :ident |
| 7908 | 7908 | GROUP BY hour_name |
| 7909 | 7909 | ORDER BY hour_name ASC"; |
| 7910 | 7910 | } else { |
| 7911 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7911 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7912 | 7912 | FROM spotter_output |
| 7913 | 7913 | WHERE spotter_output.ident = :ident |
| 7914 | 7914 | GROUP BY hour_name |
@@ -7917,12 +7917,12 @@ discard block |
||
| 7917 | 7917 | |
| 7918 | 7918 | |
| 7919 | 7919 | $sth = $this->db->prepare($query); |
| 7920 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 7920 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 7921 | 7921 | |
| 7922 | 7922 | $hour_array = array(); |
| 7923 | 7923 | $temp_array = array(); |
| 7924 | 7924 | |
| 7925 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7925 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7926 | 7926 | { |
| 7927 | 7927 | $temp_array['hour_name'] = $row['hour_name']; |
| 7928 | 7928 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7944,8 +7944,8 @@ discard block |
||
| 7944 | 7944 | public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao) |
| 7945 | 7945 | { |
| 7946 | 7946 | global $globalTimezone, $globalDBdriver; |
| 7947 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 7948 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 7947 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 7948 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 7949 | 7949 | if ($globalTimezone != '') { |
| 7950 | 7950 | date_default_timezone_set($globalTimezone); |
| 7951 | 7951 | $datetime = new DateTime(); |
@@ -7953,13 +7953,13 @@ discard block |
||
| 7953 | 7953 | } else $offset = '+00:00'; |
| 7954 | 7954 | |
| 7955 | 7955 | if ($globalDBdriver == 'mysql') { |
| 7956 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7956 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 7957 | 7957 | FROM spotter_output |
| 7958 | 7958 | WHERE (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 7959 | 7959 | GROUP BY hour_name |
| 7960 | 7960 | ORDER BY hour_name ASC"; |
| 7961 | 7961 | } else { |
| 7962 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7962 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 7963 | 7963 | FROM spotter_output |
| 7964 | 7964 | WHERE (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) |
| 7965 | 7965 | GROUP BY hour_name |
@@ -7967,12 +7967,12 @@ discard block |
||
| 7967 | 7967 | } |
| 7968 | 7968 | |
| 7969 | 7969 | $sth = $this->db->prepare($query); |
| 7970 | - $sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':offset' => $offset)); |
|
| 7970 | + $sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':offset' => $offset)); |
|
| 7971 | 7971 | |
| 7972 | 7972 | $hour_array = array(); |
| 7973 | 7973 | $temp_array = array(); |
| 7974 | 7974 | |
| 7975 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7975 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 7976 | 7976 | { |
| 7977 | 7977 | $temp_array['hour_name'] = $row['hour_name']; |
| 7978 | 7978 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -7993,7 +7993,7 @@ discard block |
||
| 7993 | 7993 | public function countAllHoursByCountry($country) |
| 7994 | 7994 | { |
| 7995 | 7995 | global $globalTimezone, $globalDBdriver; |
| 7996 | - $country = filter_var($country,FILTER_SANITIZE_STRING); |
|
| 7996 | + $country = filter_var($country, FILTER_SANITIZE_STRING); |
|
| 7997 | 7997 | if ($globalTimezone != '') { |
| 7998 | 7998 | date_default_timezone_set($globalTimezone); |
| 7999 | 7999 | $datetime = new DateTime(); |
@@ -8001,13 +8001,13 @@ discard block |
||
| 8001 | 8001 | } else $offset = '+00:00'; |
| 8002 | 8002 | |
| 8003 | 8003 | if ($globalDBdriver == 'mysql') { |
| 8004 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 8004 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 8005 | 8005 | FROM spotter_output |
| 8006 | 8006 | WHERE ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 8007 | 8007 | GROUP BY hour_name |
| 8008 | 8008 | ORDER BY hour_name ASC"; |
| 8009 | 8009 | } else { |
| 8010 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 8010 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 8011 | 8011 | FROM spotter_output |
| 8012 | 8012 | WHERE ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country |
| 8013 | 8013 | GROUP BY hour_name |
@@ -8015,12 +8015,12 @@ discard block |
||
| 8015 | 8015 | } |
| 8016 | 8016 | |
| 8017 | 8017 | $sth = $this->db->prepare($query); |
| 8018 | - $sth->execute(array(':country' => $country,':offset' => $offset)); |
|
| 8018 | + $sth->execute(array(':country' => $country, ':offset' => $offset)); |
|
| 8019 | 8019 | |
| 8020 | 8020 | $hour_array = array(); |
| 8021 | 8021 | $temp_array = array(); |
| 8022 | 8022 | |
| 8023 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8023 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8024 | 8024 | { |
| 8025 | 8025 | $temp_array['hour_name'] = $row['hour_name']; |
| 8026 | 8026 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -8042,7 +8042,7 @@ discard block |
||
| 8042 | 8042 | */ |
| 8043 | 8043 | public function countOverallAircrafts() |
| 8044 | 8044 | { |
| 8045 | - $query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count |
|
| 8045 | + $query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count |
|
| 8046 | 8046 | FROM spotter_output |
| 8047 | 8047 | WHERE spotter_output.ident <> ''"; |
| 8048 | 8048 | |
@@ -8060,7 +8060,7 @@ discard block |
||
| 8060 | 8060 | */ |
| 8061 | 8061 | public function countOverallArrival() |
| 8062 | 8062 | { |
| 8063 | - $query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count |
|
| 8063 | + $query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count |
|
| 8064 | 8064 | FROM spotter_output |
| 8065 | 8065 | WHERE spotter_output.arrival_airport_icao <> ''"; |
| 8066 | 8066 | |
@@ -8078,7 +8078,7 @@ discard block |
||
| 8078 | 8078 | */ |
| 8079 | 8079 | public function countOverallPilots() |
| 8080 | 8080 | { |
| 8081 | - $query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count |
|
| 8081 | + $query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count |
|
| 8082 | 8082 | FROM spotter_output |
| 8083 | 8083 | WHERE spotter_output.pilot_id <> ''"; |
| 8084 | 8084 | |
@@ -8096,7 +8096,7 @@ discard block |
||
| 8096 | 8096 | */ |
| 8097 | 8097 | public function countOverallOwners() |
| 8098 | 8098 | { |
| 8099 | - $query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count |
|
| 8099 | + $query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count |
|
| 8100 | 8100 | FROM spotter_output |
| 8101 | 8101 | WHERE spotter_output.owner_name <> ''"; |
| 8102 | 8102 | |
@@ -8115,7 +8115,7 @@ discard block |
||
| 8115 | 8115 | */ |
| 8116 | 8116 | public function countOverallFlights() |
| 8117 | 8117 | { |
| 8118 | - $query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count |
|
| 8118 | + $query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count |
|
| 8119 | 8119 | FROM spotter_output"; |
| 8120 | 8120 | |
| 8121 | 8121 | |
@@ -8132,7 +8132,7 @@ discard block |
||
| 8132 | 8132 | */ |
| 8133 | 8133 | public function countOverallMilitaryFlights() |
| 8134 | 8134 | { |
| 8135 | - $query = "SELECT COUNT(s.spotter_id) AS flight_count |
|
| 8135 | + $query = "SELECT COUNT(s.spotter_id) AS flight_count |
|
| 8136 | 8136 | FROM spotter_output s, airlines a WHERE s.airline_icao = a.icao AND a.type = 'military'"; |
| 8137 | 8137 | |
| 8138 | 8138 | |
@@ -8151,7 +8151,7 @@ discard block |
||
| 8151 | 8151 | */ |
| 8152 | 8152 | public function countOverallAirlines() |
| 8153 | 8153 | { |
| 8154 | - $query = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count |
|
| 8154 | + $query = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count |
|
| 8155 | 8155 | FROM spotter_output"; |
| 8156 | 8156 | |
| 8157 | 8157 | |
@@ -8177,13 +8177,13 @@ discard block |
||
| 8177 | 8177 | } else $offset = '+00:00'; |
| 8178 | 8178 | |
| 8179 | 8179 | if ($globalDBdriver == 'mysql') { |
| 8180 | - $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 8180 | + $query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 8181 | 8181 | FROM spotter_output |
| 8182 | 8182 | WHERE DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = CURDATE() |
| 8183 | 8183 | GROUP BY hour_name |
| 8184 | 8184 | ORDER BY hour_name ASC"; |
| 8185 | 8185 | } else { |
| 8186 | - $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 8186 | + $query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 8187 | 8187 | FROM spotter_output |
| 8188 | 8188 | WHERE to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 8189 | 8189 | GROUP BY hour_name |
@@ -8196,7 +8196,7 @@ discard block |
||
| 8196 | 8196 | $hour_array = array(); |
| 8197 | 8197 | $temp_array = array(); |
| 8198 | 8198 | |
| 8199 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8199 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8200 | 8200 | { |
| 8201 | 8201 | $temp_array['hour_name'] = $row['hour_name']; |
| 8202 | 8202 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -8219,8 +8219,8 @@ discard block |
||
| 8219 | 8219 | if ($limit != "") |
| 8220 | 8220 | { |
| 8221 | 8221 | $limit_array = explode(",", $limit); |
| 8222 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 8223 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 8222 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 8223 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 8224 | 8224 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 8225 | 8225 | { |
| 8226 | 8226 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -8267,7 +8267,7 @@ discard block |
||
| 8267 | 8267 | FROM spotter_output |
| 8268 | 8268 | WHERE DATE_PART('dow', spotter_output.date) = DATE_PART('dow', date 'now' AT TIME ZONE :timezone) AND EXTRACT (HOUR FROM spotter_output.date AT TIME ZONE :timezone) >= '$currentHour' AND EXTRACT (HOUR FROM spotter_output.date AT TIME ZONE :timezone) <= '$next3Hours' AND ident <> '' |
| 8269 | 8269 | GROUP BY spotter_output.ident, spotter_output.spotter_id HAVING count(spotter_output.ident) > 10 $orderby_query"; |
| 8270 | - $spotter_array = $this->getDataFromDB($query.$limit_query,array(':timezone' => $globalTimezone)); |
|
| 8270 | + $spotter_array = $this->getDataFromDB($query.$limit_query, array(':timezone' => $globalTimezone)); |
|
| 8271 | 8271 | } |
| 8272 | 8272 | return $spotter_array; |
| 8273 | 8273 | } |
@@ -8281,9 +8281,9 @@ discard block |
||
| 8281 | 8281 | */ |
| 8282 | 8282 | public function getSpotterIDBasedOnFlightAwareID($flightaware_id) |
| 8283 | 8283 | { |
| 8284 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 8284 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 8285 | 8285 | |
| 8286 | - $query = "SELECT spotter_output.spotter_id |
|
| 8286 | + $query = "SELECT spotter_output.spotter_id |
|
| 8287 | 8287 | FROM spotter_output |
| 8288 | 8288 | WHERE spotter_output.flightaware_id = '".$flightaware_id."'"; |
| 8289 | 8289 | |
@@ -8291,7 +8291,7 @@ discard block |
||
| 8291 | 8291 | $sth = $this->db->prepare($query); |
| 8292 | 8292 | $sth->execute(); |
| 8293 | 8293 | |
| 8294 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8294 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8295 | 8295 | { |
| 8296 | 8296 | return $row['spotter_id']; |
| 8297 | 8297 | } |
@@ -8316,23 +8316,23 @@ discard block |
||
| 8316 | 8316 | } |
| 8317 | 8317 | |
| 8318 | 8318 | $current_date = date("Y-m-d H:i:s"); |
| 8319 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 8319 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 8320 | 8320 | |
| 8321 | 8321 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 8322 | 8322 | |
| 8323 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 8323 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 8324 | 8324 | $years = $time_array['years']; |
| 8325 | 8325 | |
| 8326 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 8326 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 8327 | 8327 | $months = $time_array['months']; |
| 8328 | 8328 | |
| 8329 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 8329 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 8330 | 8330 | $days = $time_array['days']; |
| 8331 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 8331 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 8332 | 8332 | $hours = $time_array['hours']; |
| 8333 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 8333 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 8334 | 8334 | $minutes = $time_array['minutes']; |
| 8335 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 8335 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 8336 | 8336 | |
| 8337 | 8337 | return $time_array; |
| 8338 | 8338 | } |
@@ -8358,63 +8358,63 @@ discard block |
||
| 8358 | 8358 | $temp_array['direction_degree'] = $direction; |
| 8359 | 8359 | $temp_array['direction_shortname'] = "N"; |
| 8360 | 8360 | $temp_array['direction_fullname'] = "North"; |
| 8361 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 8361 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 8362 | 8362 | $temp_array['direction_degree'] = $direction; |
| 8363 | 8363 | $temp_array['direction_shortname'] = "NNE"; |
| 8364 | 8364 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 8365 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 8365 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 8366 | 8366 | $temp_array['direction_degree'] = $direction; |
| 8367 | 8367 | $temp_array['direction_shortname'] = "NE"; |
| 8368 | 8368 | $temp_array['direction_fullname'] = "Northeast"; |
| 8369 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 8369 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 8370 | 8370 | $temp_array['direction_degree'] = $direction; |
| 8371 | 8371 | $temp_array['direction_shortname'] = "ENE"; |
| 8372 | 8372 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 8373 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 8373 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 8374 | 8374 | $temp_array['direction_degree'] = $direction; |
| 8375 | 8375 | $temp_array['direction_shortname'] = "E"; |
| 8376 | 8376 | $temp_array['direction_fullname'] = "East"; |
| 8377 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 8377 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 8378 | 8378 | $temp_array['direction_degree'] = $direction; |
| 8379 | 8379 | $temp_array['direction_shortname'] = "ESE"; |
| 8380 | 8380 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 8381 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 8381 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 8382 | 8382 | $temp_array['direction_degree'] = $direction; |
| 8383 | 8383 | $temp_array['direction_shortname'] = "SE"; |
| 8384 | 8384 | $temp_array['direction_fullname'] = "Southeast"; |
| 8385 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 8385 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 8386 | 8386 | $temp_array['direction_degree'] = $direction; |
| 8387 | 8387 | $temp_array['direction_shortname'] = "SSE"; |
| 8388 | 8388 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 8389 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 8389 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 8390 | 8390 | $temp_array['direction_degree'] = $direction; |
| 8391 | 8391 | $temp_array['direction_shortname'] = "S"; |
| 8392 | 8392 | $temp_array['direction_fullname'] = "South"; |
| 8393 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 8393 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 8394 | 8394 | $temp_array['direction_degree'] = $direction; |
| 8395 | 8395 | $temp_array['direction_shortname'] = "SSW"; |
| 8396 | 8396 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 8397 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 8397 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 8398 | 8398 | $temp_array['direction_degree'] = $direction; |
| 8399 | 8399 | $temp_array['direction_shortname'] = "SW"; |
| 8400 | 8400 | $temp_array['direction_fullname'] = "Southwest"; |
| 8401 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 8401 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 8402 | 8402 | $temp_array['direction_degree'] = $direction; |
| 8403 | 8403 | $temp_array['direction_shortname'] = "WSW"; |
| 8404 | 8404 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 8405 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 8405 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 8406 | 8406 | $temp_array['direction_degree'] = $direction; |
| 8407 | 8407 | $temp_array['direction_shortname'] = "W"; |
| 8408 | 8408 | $temp_array['direction_fullname'] = "West"; |
| 8409 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 8409 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 8410 | 8410 | $temp_array['direction_degree'] = $direction; |
| 8411 | 8411 | $temp_array['direction_shortname'] = "WNW"; |
| 8412 | 8412 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 8413 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 8413 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 8414 | 8414 | $temp_array['direction_degree'] = $direction; |
| 8415 | 8415 | $temp_array['direction_shortname'] = "NW"; |
| 8416 | 8416 | $temp_array['direction_fullname'] = "Northwest"; |
| 8417 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 8417 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 8418 | 8418 | $temp_array['direction_degree'] = $direction; |
| 8419 | 8419 | $temp_array['direction_shortname'] = "NNW"; |
| 8420 | 8420 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -8468,9 +8468,9 @@ discard block |
||
| 8468 | 8468 | |
| 8469 | 8469 | public function getAircraftRegistrationBymodeS($aircraft_modes) |
| 8470 | 8470 | { |
| 8471 | - $aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING); |
|
| 8471 | + $aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING); |
|
| 8472 | 8472 | |
| 8473 | - $query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1"; |
|
| 8473 | + $query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1"; |
|
| 8474 | 8474 | |
| 8475 | 8475 | $sth = $this->db->prepare($query); |
| 8476 | 8476 | $sth->execute(array(':aircraft_modes' => $aircraft_modes)); |
@@ -8493,9 +8493,9 @@ discard block |
||
| 8493 | 8493 | |
| 8494 | 8494 | public function getAircraftTypeBymodeS($aircraft_modes) |
| 8495 | 8495 | { |
| 8496 | - $aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING); |
|
| 8496 | + $aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING); |
|
| 8497 | 8497 | |
| 8498 | - $query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1"; |
|
| 8498 | + $query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1"; |
|
| 8499 | 8499 | |
| 8500 | 8500 | $sth = $this->db->prepare($query); |
| 8501 | 8501 | $sth->execute(array(':aircraft_modes' => $aircraft_modes)); |
@@ -8516,11 +8516,11 @@ discard block |
||
| 8516 | 8516 | * |
| 8517 | 8517 | */ |
| 8518 | 8518 | |
| 8519 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 8519 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 8520 | 8520 | { |
| 8521 | 8521 | global $globalDBdriver; |
| 8522 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 8523 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 8522 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 8523 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 8524 | 8524 | |
| 8525 | 8525 | try { |
| 8526 | 8526 | /* |
@@ -8556,19 +8556,19 @@ discard block |
||
| 8556 | 8556 | */ |
| 8557 | 8557 | public function convertAircraftRegistration($registration) |
| 8558 | 8558 | { |
| 8559 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 8559 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 8560 | 8560 | $registration_prefix = ''; |
| 8561 | 8561 | $registration_1 = substr($registration, 0, 1); |
| 8562 | 8562 | $registration_2 = substr($registration, 0, 2); |
| 8563 | 8563 | |
| 8564 | 8564 | //first get the prefix based on two characters |
| 8565 | - $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2"; |
|
| 8565 | + $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2"; |
|
| 8566 | 8566 | |
| 8567 | 8567 | |
| 8568 | 8568 | $sth = $this->db->prepare($query); |
| 8569 | 8569 | $sth->execute(array(':registration_2' => $registration_2)); |
| 8570 | 8570 | |
| 8571 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8571 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8572 | 8572 | { |
| 8573 | 8573 | $registration_prefix = $row['registration_prefix']; |
| 8574 | 8574 | } |
@@ -8576,12 +8576,12 @@ discard block |
||
| 8576 | 8576 | //if we didn't find a two chracter prefix lets just search the one with one character |
| 8577 | 8577 | if ($registration_prefix == "") |
| 8578 | 8578 | { |
| 8579 | - $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1"; |
|
| 8579 | + $query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1"; |
|
| 8580 | 8580 | |
| 8581 | 8581 | $sth = $this->db->prepare($query); |
| 8582 | 8582 | $sth->execute(array(':registration_1' => $registration_1)); |
| 8583 | 8583 | |
| 8584 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8584 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8585 | 8585 | { |
| 8586 | 8586 | $registration_prefix = $row['registration_prefix']; |
| 8587 | 8587 | } |
@@ -8595,7 +8595,7 @@ discard block |
||
| 8595 | 8595 | } else { |
| 8596 | 8596 | $registration = preg_replace("/^(.{1})/", "$1-", $registration); |
| 8597 | 8597 | } |
| 8598 | - } else if(strlen($registration_prefix) == 2){ |
|
| 8598 | + } else if (strlen($registration_prefix) == 2) { |
|
| 8599 | 8599 | if (0 === strpos($registration, 'N')) { |
| 8600 | 8600 | $registration = preg_replace("/^(.{2})/", "$1", $registration); |
| 8601 | 8601 | } else { |
@@ -8615,11 +8615,11 @@ discard block |
||
| 8615 | 8615 | */ |
| 8616 | 8616 | public function countryFromAircraftRegistration($registration) |
| 8617 | 8617 | { |
| 8618 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 8618 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 8619 | 8619 | |
| 8620 | 8620 | $registration_prefix = ''; |
| 8621 | 8621 | |
| 8622 | - $registration_test = explode('-',$registration); |
|
| 8622 | + $registration_test = explode('-', $registration); |
|
| 8623 | 8623 | $country = ''; |
| 8624 | 8624 | if ($registration_test[0] != $registration) { |
| 8625 | 8625 | $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
@@ -8627,7 +8627,7 @@ discard block |
||
| 8627 | 8627 | $sth = $this->db->prepare($query); |
| 8628 | 8628 | $sth->execute(array(':registration_1' => $registration_test[0])); |
| 8629 | 8629 | |
| 8630 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8630 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8631 | 8631 | { |
| 8632 | 8632 | $registration_prefix = $row['registration_prefix']; |
| 8633 | 8633 | $country = $row['country']; |
@@ -8638,13 +8638,13 @@ discard block |
||
| 8638 | 8638 | |
| 8639 | 8639 | $country = ''; |
| 8640 | 8640 | //first get the prefix based on two characters |
| 8641 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1"; |
|
| 8641 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1"; |
|
| 8642 | 8642 | |
| 8643 | 8643 | |
| 8644 | 8644 | $sth = $this->db->prepare($query); |
| 8645 | 8645 | $sth->execute(array(':registration_2' => $registration_2)); |
| 8646 | 8646 | |
| 8647 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8647 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8648 | 8648 | { |
| 8649 | 8649 | $registration_prefix = $row['registration_prefix']; |
| 8650 | 8650 | $country = $row['country']; |
@@ -8653,12 +8653,12 @@ discard block |
||
| 8653 | 8653 | //if we didn't find a two chracter prefix lets just search the one with one character |
| 8654 | 8654 | if ($registration_prefix == "") |
| 8655 | 8655 | { |
| 8656 | - $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 8656 | + $query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1"; |
|
| 8657 | 8657 | |
| 8658 | 8658 | $sth = $this->db->prepare($query); |
| 8659 | 8659 | $sth->execute(array(':registration_1' => $registration_1)); |
| 8660 | 8660 | |
| 8661 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8661 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8662 | 8662 | { |
| 8663 | 8663 | $registration_prefix = $row['registration_prefix']; |
| 8664 | 8664 | $country = $row['country']; |
@@ -8675,9 +8675,9 @@ discard block |
||
| 8675 | 8675 | * @param String $flightaware_id flightaware_id from spotter_output table |
| 8676 | 8676 | * @param String $highlight New highlight value |
| 8677 | 8677 | */ |
| 8678 | - public function setHighlightFlight($flightaware_id,$highlight) { |
|
| 8678 | + public function setHighlightFlight($flightaware_id, $highlight) { |
|
| 8679 | 8679 | |
| 8680 | - $query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id"; |
|
| 8680 | + $query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id"; |
|
| 8681 | 8681 | $sth = $this->db->prepare($query); |
| 8682 | 8682 | $sth->execute(array(':flightaware_id' => $flightaware_id, ':highlight' => $highlight)); |
| 8683 | 8683 | } |
@@ -8706,7 +8706,7 @@ discard block |
||
| 8706 | 8706 | |
| 8707 | 8707 | $bitly_data = json_decode($bitly_data); |
| 8708 | 8708 | |
| 8709 | - if ($bitly_data->status_txt = "OK"){ |
|
| 8709 | + if ($bitly_data->status_txt = "OK") { |
|
| 8710 | 8710 | $bitly_url = $bitly_data->data->url; |
| 8711 | 8711 | } |
| 8712 | 8712 | |
@@ -8716,7 +8716,7 @@ discard block |
||
| 8716 | 8716 | |
| 8717 | 8717 | public function getOrderBy() |
| 8718 | 8718 | { |
| 8719 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 8719 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 8720 | 8720 | |
| 8721 | 8721 | return $orderby; |
| 8722 | 8722 | |
@@ -8747,11 +8747,11 @@ discard block |
||
| 8747 | 8747 | { |
| 8748 | 8748 | if (is_array($result->SearchBirdseyeInFlightResult->aircraft)) |
| 8749 | 8749 | { |
| 8750 | - foreach($result->SearchBirdseyeInFlightResult->aircraft as $aircraft) |
|
| 8750 | + foreach ($result->SearchBirdseyeInFlightResult->aircraft as $aircraft) |
|
| 8751 | 8751 | { |
| 8752 | 8752 | if (!strstr($aircraft->origin, 'L ') && !strstr($aircraft->destination, 'L ')) |
| 8753 | 8753 | { |
| 8754 | - foreach($globalAirportIgnore as $airportIgnore) |
|
| 8754 | + foreach ($globalAirportIgnore as $airportIgnore) |
|
| 8755 | 8755 | { |
| 8756 | 8756 | if ($aircraft->origin == $airportIgnore || $aircraft->destination == $airportIgnore) |
| 8757 | 8757 | { |
@@ -8783,7 +8783,7 @@ discard block |
||
| 8783 | 8783 | |
| 8784 | 8784 | |
| 8785 | 8785 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 8786 | - if($last_hour_ident == "") |
|
| 8786 | + if ($last_hour_ident == "") |
|
| 8787 | 8787 | { |
| 8788 | 8788 | //adds the spotter data for the archive |
| 8789 | 8789 | $Spotter->addSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
@@ -8798,9 +8798,9 @@ discard block |
||
| 8798 | 8798 | } else { |
| 8799 | 8799 | if (!strstr($result->SearchBirdseyeInFlightResult->aircraft->origin, 'L ') && !strstr($result->SearchBirdseyeInFlightResult->aircraft->destination, 'L ')) |
| 8800 | 8800 | { |
| 8801 | - foreach($globalAirportIgnore as $airportIgnore) |
|
| 8801 | + foreach ($globalAirportIgnore as $airportIgnore) |
|
| 8802 | 8802 | { |
| 8803 | - foreach($globalAirportIgnore as $airportIgnore) |
|
| 8803 | + foreach ($globalAirportIgnore as $airportIgnore) |
|
| 8804 | 8804 | { |
| 8805 | 8805 | if ($aircraft->origin == $airportIgnore || $aircraft->destination == $airportIgnore) |
| 8806 | 8806 | { |
@@ -8831,7 +8831,7 @@ discard block |
||
| 8831 | 8831 | if ($arrival_airport == "" || $arrival_airport == "---" || $arrival_airport == "ZZZ" || $arrival_airport == "ZZZZ") { $arrival_airport = "NA"; } |
| 8832 | 8832 | |
| 8833 | 8833 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 8834 | - if($last_hour_ident == "") |
|
| 8834 | + if ($last_hour_ident == "") |
|
| 8835 | 8835 | { |
| 8836 | 8836 | //adds the spotter data for the archive |
| 8837 | 8837 | $Spotter->addSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
@@ -8865,14 +8865,14 @@ discard block |
||
| 8865 | 8865 | } |
| 8866 | 8866 | $sth = $this->db->prepare($query); |
| 8867 | 8867 | $sth->execute(); |
| 8868 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8868 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8869 | 8869 | { |
| 8870 | 8870 | $departure_airport_array = $this->getAllAirportInfo($row['fromairport_icao']); |
| 8871 | 8871 | $arrival_airport_array = $this->getAllAirportInfo($row['toairport_icao']); |
| 8872 | 8872 | if (count($departure_airport_array) > 0 && count($arrival_airport_array) > 0) { |
| 8873 | - $update_query="UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id"; |
|
| 8873 | + $update_query = "UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id"; |
|
| 8874 | 8874 | $sthu = $this->db->prepare($update_query); |
| 8875 | - $sthu->execute(array(':fromicao' => $row['fromairport_icao'],':toicao' => $row['toairport_icao'],':spotter_id' => $row['spotter_id'],':departure_airport_name' => $departure_airport_array[0]['name'],':departure_airport_city' => $departure_airport_array[0]['city'],':departure_airport_country' => $departure_airport_array[0]['country'],':arrival_airport_name' => $arrival_airport_array[0]['name'],':arrival_airport_city' => $arrival_airport_array[0]['city'],':arrival_airport_country' => $arrival_airport_array[0]['country'])); |
|
| 8875 | + $sthu->execute(array(':fromicao' => $row['fromairport_icao'], ':toicao' => $row['toairport_icao'], ':spotter_id' => $row['spotter_id'], ':departure_airport_name' => $departure_airport_array[0]['name'], ':departure_airport_city' => $departure_airport_array[0]['city'], ':departure_airport_country' => $departure_airport_array[0]['country'], ':arrival_airport_name' => $arrival_airport_array[0]['name'], ':arrival_airport_city' => $arrival_airport_array[0]['city'], ':arrival_airport_country' => $arrival_airport_array[0]['country'])); |
|
| 8876 | 8876 | } |
| 8877 | 8877 | } |
| 8878 | 8878 | |
@@ -8885,15 +8885,15 @@ discard block |
||
| 8885 | 8885 | } |
| 8886 | 8886 | $sth = $this->db->prepare($query); |
| 8887 | 8887 | $sth->execute(); |
| 8888 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8888 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8889 | 8889 | { |
| 8890 | 8890 | if (is_numeric(substr($row['ident'], -1, 1))) |
| 8891 | 8891 | { |
| 8892 | 8892 | $airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3)); |
| 8893 | 8893 | if (isset($airline_array[0]['name'])) { |
| 8894 | - $update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 8894 | + $update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 8895 | 8895 | $sthu = $this->db->prepare($update_query); |
| 8896 | - $sthu->execute(array(':airline_name' => $airline_array[0]['name'],':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id'])); |
|
| 8896 | + $sthu->execute(array(':airline_name' => $airline_array[0]['name'], ':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id'])); |
|
| 8897 | 8897 | } |
| 8898 | 8898 | } |
| 8899 | 8899 | } |
@@ -8913,18 +8913,18 @@ discard block |
||
| 8913 | 8913 | } |
| 8914 | 8914 | $sth = $this->db->prepare($query); |
| 8915 | 8915 | $sth->execute(); |
| 8916 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8916 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8917 | 8917 | { |
| 8918 | 8918 | if ($row['aircraft_icao'] != '') { |
| 8919 | 8919 | $aircraft_name = $this->getAllAircraftInfo($row['aircraft_icao']); |
| 8920 | - if ($row['registration'] != ""){ |
|
| 8920 | + if ($row['registration'] != "") { |
|
| 8921 | 8921 | $image_array = $Image->getSpotterImage($row['registration']); |
| 8922 | 8922 | if (count($image_array) == 0) { |
| 8923 | 8923 | $Image->addSpotterImage($row['registration']); |
| 8924 | 8924 | } |
| 8925 | 8925 | } |
| 8926 | 8926 | if (count($aircraft_name) > 0) { |
| 8927 | - $update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 8927 | + $update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id"; |
|
| 8928 | 8928 | $sthu = $this->db->prepare($update_query); |
| 8929 | 8929 | $sthu->execute(array(':aircraft_name' => $aircraft_name[0]['type'], ':aircraft_manufacturer' => $aircraft_name[0]['manufacturer'], ':spotter_id' => $row['spotter_id'])); |
| 8930 | 8930 | } |
@@ -8939,10 +8939,10 @@ discard block |
||
| 8939 | 8939 | $query = "SELECT spotter_output.spotter_id, spotter_output.last_latitude, spotter_output.last_longitude, spotter_output.last_altitude, spotter_output.arrival_airport_icao, spotter_output.real_arrival_airport_icao FROM spotter_output"; |
| 8940 | 8940 | $sth = $this->db->prepare($query); |
| 8941 | 8941 | $sth->execute(); |
| 8942 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8942 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 8943 | 8943 | { |
| 8944 | 8944 | if ($row['last_latitude'] != '' && $row['last_longitude'] != '') { |
| 8945 | - $closestAirports = $this->closestAirports($row['last_latitude'],$row['last_longitude'],$globalClosestMinDist); |
|
| 8945 | + $closestAirports = $this->closestAirports($row['last_latitude'], $row['last_longitude'], $globalClosestMinDist); |
|
| 8946 | 8946 | $airport_icao = ''; |
| 8947 | 8947 | if (isset($closestAirports[0])) { |
| 8948 | 8948 | if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) { |
@@ -8956,7 +8956,7 @@ discard block |
||
| 8956 | 8956 | break; |
| 8957 | 8957 | } |
| 8958 | 8958 | } |
| 8959 | - } elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) { |
|
| 8959 | + } elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100 + 1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude'] + 5000))) { |
|
| 8960 | 8960 | $airport_icao = $closestAirports[0]['icao']; |
| 8961 | 8961 | if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." ! Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n"; |
| 8962 | 8962 | } else { |
@@ -8967,28 +8967,28 @@ discard block |
||
| 8967 | 8967 | } |
| 8968 | 8968 | if ($row['real_arrival_airport_icao'] != $airport_icao) { |
| 8969 | 8969 | if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n"; |
| 8970 | - $update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id"; |
|
| 8970 | + $update_query = "UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id"; |
|
| 8971 | 8971 | $sthu = $this->db->prepare($update_query); |
| 8972 | - $sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id'])); |
|
| 8972 | + $sthu->execute(array(':airport_icao' => $airport_icao, ':spotter_id' => $row['spotter_id'])); |
|
| 8973 | 8973 | } |
| 8974 | 8974 | } |
| 8975 | 8975 | } |
| 8976 | 8976 | } |
| 8977 | 8977 | |
| 8978 | - public function closestAirports($origLat,$origLon,$dist = 10) { |
|
| 8978 | + public function closestAirports($origLat, $origLon, $dist = 10) { |
|
| 8979 | 8979 | global $globalDBdriver; |
| 8980 | - $dist = number_format($dist*0.621371,2,'.',''); // convert km to mile |
|
| 8980 | + $dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile |
|
| 8981 | 8981 | /* |
| 8982 | 8982 | $query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - abs(latitude))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(abs(latitude)*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance |
| 8983 | 8983 | FROM airport WHERE longitude between ($origLon-$dist/abs(cos(radians($origLat))*69)) and ($origLon+$dist/abs(cos(radians($origLat))*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 8984 | 8984 | having distance < $dist ORDER BY distance limit 100;"; |
| 8985 | 8985 | */ |
| 8986 | 8986 | if ($globalDBdriver == 'mysql') { |
| 8987 | - $query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance |
|
| 8987 | + $query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance |
|
| 8988 | 8988 | FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 8989 | 8989 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;"; |
| 8990 | 8990 | } else { |
| 8991 | - $query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance |
|
| 8991 | + $query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance |
|
| 8992 | 8992 | FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 8993 | 8993 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;"; |
| 8994 | 8994 | } |
@@ -15,25 +15,25 @@ discard block |
||
| 15 | 15 | try { |
| 16 | 16 | $sth = $this->db->prepare($query); |
| 17 | 17 | $sth->execute($query_values); |
| 18 | - } catch(PDOException $e) { |
|
| 18 | + } catch (PDOException $e) { |
|
| 19 | 19 | return "error : ".$e->getMessage(); |
| 20 | 20 | } |
| 21 | 21 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 22 | 22 | return $all; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '') { |
|
| 26 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 27 | - $info = str_replace('^','<br />',$info); |
|
| 28 | - $info = str_replace('&sect;','',$info); |
|
| 29 | - $info = str_replace('"','',$info); |
|
| 25 | + public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '') { |
|
| 26 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 27 | + $info = str_replace('^', '<br />', $info); |
|
| 28 | + $info = str_replace('&sect;', '', $info); |
|
| 29 | + $info = str_replace('"', '', $info); |
|
| 30 | 30 | if ($type == '') $type = NULL; |
| 31 | 31 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name)"; |
| 32 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type); |
|
| 32 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type); |
|
| 33 | 33 | try { |
| 34 | 34 | $sth = $this->db->prepare($query); |
| 35 | 35 | $sth->execute($query_values); |
| 36 | - } catch(PDOException $e) { |
|
| 36 | + } catch (PDOException $e) { |
|
| 37 | 37 | return "error : ".$e->getMessage(); |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | try { |
| 45 | 45 | $sth = $this->db->prepare($query); |
| 46 | 46 | $sth->execute($query_values); |
| 47 | - } catch(PDOException $e) { |
|
| 47 | + } catch (PDOException $e) { |
|
| 48 | 48 | return "error : ".$e->getMessage(); |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | try { |
| 56 | 56 | $sth = $this->db->prepare($query); |
| 57 | 57 | $sth->execute($query_values); |
| 58 | - } catch(PDOException $e) { |
|
| 58 | + } catch (PDOException $e) { |
|
| 59 | 59 | return "error : ".$e->getMessage(); |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | try { |
| 71 | 71 | $sth = $this->db->prepare($query); |
| 72 | 72 | $sth->execute(); |
| 73 | - } catch(PDOException $e) { |
|
| 73 | + } catch (PDOException $e) { |
|
| 74 | 74 | return "error"; |
| 75 | 75 | } |
| 76 | 76 | return "success"; |
@@ -29,18 +29,18 @@ discard block |
||
| 29 | 29 | $currentdate = date('Y-m-d'); |
| 30 | 30 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 31 | 31 | if (!empty($sourcestat)) { |
| 32 | - foreach($sourcestat as $srcst) { |
|
| 32 | + foreach ($sourcestat as $srcst) { |
|
| 33 | 33 | $type = $srcst['stats_type']; |
| 34 | 34 | if ($type == 'polar' || $type == 'hist') { |
| 35 | 35 | $source = $srcst['source_name']; |
| 36 | 36 | $data = $srcst['source_data']; |
| 37 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 37 | + $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - function get_Schedule($id,$ident) { |
|
| 43 | + function get_Schedule($id, $ident) { |
|
| 44 | 44 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 45 | 45 | // Get schedule here, so it's done only one time |
| 46 | 46 | |
@@ -63,8 +63,8 @@ discard block |
||
| 63 | 63 | $schedule = $Schedule->fetchSchedule($operator); |
| 64 | 64 | if (count($schedule) > 0) { |
| 65 | 65 | if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
| 66 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 67 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 66 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 67 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 68 | 68 | // FIXME : Check if route schedule = route from DB |
| 69 | 69 | if ($schedule['DepartureAirportIATA'] != '') { |
| 70 | 70 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | - $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 87 | + $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']); |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 115 | 115 | $Spotter = new Spotter($this->db); |
| 116 | 116 | $real_arrival = $this->arrival($key); |
| 117 | - $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 117 | + $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 118 | 118 | } |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | $airport_time = ''; |
| 127 | 127 | if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
| 128 | 128 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 129 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 129 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
| 130 | 130 | if (isset($closestAirports[0])) { |
| 131 | 131 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 132 | 132 | $airport_icao = $closestAirports[0]['icao']; |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | break; |
| 142 | 142 | } |
| 143 | 143 | } |
| 144 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 144 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) { |
|
| 145 | 145 | $airport_icao = $closestAirports[0]['icao']; |
| 146 | 146 | $airport_time = $this->all_flights[$key]['datetime']; |
| 147 | 147 | } else { |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | } else { |
| 155 | 155 | if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
| 156 | 156 | } |
| 157 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 157 | + return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | // Delete old infos |
| 165 | 165 | foreach ($this->all_flights as $key => $flight) { |
| 166 | 166 | if (isset($flight['lastupdate'])) { |
| 167 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 167 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 168 | 168 | if (isset($this->all_flights[$key]['id'])) { |
| 169 | 169 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
| 170 | 170 | /* |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | $real_arrival = $this->arrival($key); |
| 177 | 177 | $Spotter = new Spotter($this->db); |
| 178 | 178 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 179 | - $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 179 | + $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 180 | 180 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 181 | 181 | } |
| 182 | 182 | // Put in archive |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | $send = false; |
| 213 | 213 | |
| 214 | 214 | // SBS format is CSV format |
| 215 | - if(is_array($line) && isset($line['hex'])) { |
|
| 215 | + if (is_array($line) && isset($line['hex'])) { |
|
| 216 | 216 | //print_r($line); |
| 217 | 217 | if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) { |
| 218 | 218 | |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | //print_r($this->all_flights); |
| 246 | 246 | if (!isset($this->all_flights[$id]['hex'])) { |
| 247 | 247 | $this->all_flights[$id] = array('hex' => $hex); |
| 248 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 248 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 249 | 249 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 250 | 250 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 251 | 251 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | $Spotter = new Spotter($this->db); |
| 256 | 256 | $aircraft_icao = $Spotter->getAllAircraftType($hex); |
| 257 | 257 | $Spotter->db = null; |
| 258 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 258 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 259 | 259 | |
| 260 | 260 | if ($aircraft_icao == '' && isset($line['aircraft_type'])) { |
| 261 | 261 | if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
@@ -263,24 +263,24 @@ discard block |
||
| 263 | 263 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 264 | 264 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 265 | 265 | } |
| 266 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 267 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao'])); |
|
| 268 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => false)); |
|
| 269 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 266 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 267 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $line['aircraft_icao'])); |
|
| 268 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => false)); |
|
| 269 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 270 | 270 | if (!isset($line['id'])) { |
| 271 | 271 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 272 | 272 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 273 | 273 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 274 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 274 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 275 | 275 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 276 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 276 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 277 | 277 | |
| 278 | 278 | if ($globalDebug) echo "*********** New aircraft hex : ".$hex." ***********\n"; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | - if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 281 | + if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/', $line['datetime'])) { |
|
| 282 | 282 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 283 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 283 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 284 | 284 | } else { |
| 285 | 285 | if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 286 | 286 | elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
@@ -291,30 +291,30 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | return ''; |
| 293 | 293 | } |
| 294 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 294 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 295 | 295 | |
| 296 | 296 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 297 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 297 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 298 | 298 | } |
| 299 | 299 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 300 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 300 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 301 | 301 | } |
| 302 | 302 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 303 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id'])); |
|
| 303 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => $line['pilot_id'])); |
|
| 304 | 304 | } |
| 305 | 305 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 306 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name'])); |
|
| 306 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => $line['pilot_name'])); |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 310 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 310 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 311 | 311 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 312 | 312 | $timeelapsed = microtime(true); |
| 313 | 313 | $Spotter = new Spotter($this->db); |
| 314 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident']); |
|
| 314 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident']); |
|
| 315 | 315 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 316 | 316 | $Spotter->db = null; |
| 317 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 317 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | /* |
@@ -325,24 +325,24 @@ discard block |
||
| 325 | 325 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 326 | 326 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 327 | 327 | */ |
| 328 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 328 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 329 | 329 | |
| 330 | 330 | //$putinarchive = true; |
| 331 | 331 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 332 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 332 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 333 | 333 | } |
| 334 | 334 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 335 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 335 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 336 | 336 | } |
| 337 | 337 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 338 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 338 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 339 | 339 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 340 | 340 | $timeelapsed = microtime(true); |
| 341 | 341 | $Spotter = new Spotter($this->db); |
| 342 | 342 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 343 | 343 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 344 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 345 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 344 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 345 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 346 | 346 | |
| 347 | 347 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 348 | 348 | $timeelapsed = microtime(true); |
@@ -355,13 +355,13 @@ discard block |
||
| 355 | 355 | $Translation->db = null; |
| 356 | 356 | } |
| 357 | 357 | $Spotter->db = null; |
| 358 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 358 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 359 | 359 | |
| 360 | 360 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 361 | 361 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 362 | 362 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 363 | 363 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
| 364 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 364 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop'])); |
|
| 365 | 365 | } |
| 366 | 366 | } |
| 367 | 367 | if (!isset($globalFork)) $globalFork = TRUE; |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | } |
| 378 | 378 | } else { |
| 379 | 379 | */ |
| 380 | - $this->get_Schedule($id,trim($line['ident'])); |
|
| 380 | + $this->get_Schedule($id, trim($line['ident'])); |
|
| 381 | 381 | // } |
| 382 | 382 | } |
| 383 | 383 | } |
@@ -385,16 +385,16 @@ discard block |
||
| 385 | 385 | |
| 386 | 386 | if (isset($line['speed']) && $line['speed'] != '') { |
| 387 | 387 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 388 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 389 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 388 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 389 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 390 | 390 | //$dataFound = true; |
| 391 | 391 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 392 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 392 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 393 | 393 | if ($distance > 1000 && $distance < 10000) { |
| 394 | 394 | // use datetime |
| 395 | 395 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 396 | 396 | $speed = $speed*3.6; |
| 397 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 397 | + if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 398 | 398 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 399 | 399 | } |
| 400 | 400 | } |
@@ -402,11 +402,11 @@ discard block |
||
| 402 | 402 | |
| 403 | 403 | |
| 404 | 404 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') { |
| 405 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 405 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 406 | 406 | else unset($timediff); |
| 407 | - if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 407 | + if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) { |
|
| 408 | 408 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 409 | - if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 409 | + if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 410 | 410 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 411 | 411 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 412 | 412 | $this->all_flights[$id]['putinarchive'] = true; |
@@ -415,10 +415,10 @@ discard block |
||
| 415 | 415 | //echo "\n".' ------- Check Country.... '; |
| 416 | 416 | $timeelapsed = microtime(true); |
| 417 | 417 | $Spotter = new Spotter($this->db); |
| 418 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 418 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 419 | 419 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 420 | 420 | $Spotter->db = null; |
| 421 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 421 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 422 | 422 | $this->tmd = 0; |
| 423 | 423 | //echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 424 | 424 | //$putinarchive = true; |
@@ -433,13 +433,13 @@ discard block |
||
| 433 | 433 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 434 | 434 | //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 435 | 435 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 436 | - if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 436 | + if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 437 | 437 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 438 | 438 | $dataFound = true; |
| 439 | 439 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 440 | 440 | } |
| 441 | 441 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 442 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 442 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 443 | 443 | /* |
| 444 | 444 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 445 | 445 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -457,13 +457,13 @@ discard block |
||
| 457 | 457 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 458 | 458 | //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 459 | 459 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 460 | - if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 460 | + if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 461 | 461 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 462 | 462 | $dataFound = true; |
| 463 | 463 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 464 | 464 | } |
| 465 | 465 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 466 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 466 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 467 | 467 | /* |
| 468 | 468 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 469 | 469 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -481,41 +481,41 @@ discard block |
||
| 481 | 481 | } else if ($globalDebug && $timediff > 20) { |
| 482 | 482 | $this->tmd = $this->tmd + 1; |
| 483 | 483 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 484 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 485 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 484 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 485 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 486 | 486 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | 489 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 490 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 490 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 491 | 491 | //$dataFound = true; |
| 492 | 492 | } |
| 493 | 493 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 494 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 494 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 495 | 495 | } |
| 496 | 496 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 497 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 497 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 498 | 498 | } |
| 499 | 499 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 500 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 500 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 501 | 501 | //$dataFound = true; |
| 502 | 502 | } |
| 503 | 503 | if (isset($line['ground']) && $line['ground'] != '') { |
| 504 | 504 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 505 | 505 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 506 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 507 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 508 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 509 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 510 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 506 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 507 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 508 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 509 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 510 | + elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 511 | 511 | } |
| 512 | 512 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 513 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 513 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 514 | 514 | //$dataFound = true; |
| 515 | 515 | } |
| 516 | 516 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 517 | 517 | if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
| 518 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 518 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 519 | 519 | $highlight = ''; |
| 520 | 520 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 521 | 521 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -523,48 +523,48 @@ discard block |
||
| 523 | 523 | if ($highlight != '') { |
| 524 | 524 | $timeelapsed = microtime(true); |
| 525 | 525 | $Spotter = new Spotter($this->db); |
| 526 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 526 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 527 | 527 | $Spotter->db = null; |
| 528 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 528 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 529 | 529 | |
| 530 | 530 | $this->all_flights[$id]['putinarchive'] = true; |
| 531 | 531 | //$putinarchive = true; |
| 532 | 532 | $highlight = ''; |
| 533 | 533 | } |
| 534 | 534 | |
| 535 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 535 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 536 | 536 | //$dataFound = true; |
| 537 | 537 | } |
| 538 | 538 | |
| 539 | 539 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 540 | 540 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 541 | - if (abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 542 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 543 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 541 | + if (abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 542 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 543 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 544 | 544 | //$dataFound = true; |
| 545 | 545 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 546 | 546 | } |
| 547 | 547 | |
| 548 | 548 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 549 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 549 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 550 | 550 | } |
| 551 | 551 | |
| 552 | 552 | if (isset($line['heading']) && $line['heading'] != '') { |
| 553 | - if (abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 554 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 555 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 553 | + if (abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 554 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 555 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 556 | 556 | //$dataFound = true; |
| 557 | 557 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 558 | - $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 559 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 560 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 558 | + $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 559 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 560 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 561 | 561 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
| 562 | 562 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 563 | 563 | // If not enough messages and ACARS set heading to 0 |
| 564 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 564 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 565 | 565 | } |
| 566 | - if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 567 | - elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 566 | + if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 567 | + elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 568 | 568 | |
| 569 | 569 | // print_r($this->all_flights[$id]); |
| 570 | 570 | //gets the callsign from the last hour |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 574 | 574 | $this->all_flights[$id]['lastupdate'] = time(); |
| 575 | 575 | if ($this->all_flights[$id]['addedSpotter'] == 0) { |
| 576 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 576 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 577 | 577 | //print_r($this->all_flights); |
| 578 | 578 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 579 | 579 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -583,60 +583,60 @@ discard block |
||
| 583 | 583 | $SpotterLive = new SpotterLive($this->db); |
| 584 | 584 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) { |
| 585 | 585 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 586 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 586 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 587 | 587 | |
| 588 | 588 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 589 | 589 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 590 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 590 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 591 | 591 | |
| 592 | 592 | } else $recent_ident = ''; |
| 593 | - $SpotterLive->db=null; |
|
| 593 | + $SpotterLive->db = null; |
|
| 594 | 594 | |
| 595 | 595 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 596 | 596 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 597 | 597 | } else { |
| 598 | 598 | $recent_ident = ''; |
| 599 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 599 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 600 | 600 | } |
| 601 | 601 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 602 | - if($recent_ident == "") |
|
| 602 | + if ($recent_ident == "") |
|
| 603 | 603 | { |
| 604 | 604 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 605 | 605 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 606 | 606 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 607 | 607 | //adds the spotter data for the archive |
| 608 | 608 | $ignoreImport = false; |
| 609 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 609 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 610 | 610 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 611 | 611 | $ignoreImport = true; |
| 612 | 612 | } |
| 613 | 613 | } |
| 614 | 614 | if (count($globalAirportAccept) > 0) { |
| 615 | 615 | $ignoreImport = true; |
| 616 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 616 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 617 | 617 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 618 | 618 | $ignoreImport = false; |
| 619 | 619 | } |
| 620 | 620 | } |
| 621 | 621 | } |
| 622 | 622 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 623 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 624 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 623 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 624 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 625 | 625 | $ignoreImport = true; |
| 626 | 626 | } |
| 627 | 627 | } |
| 628 | 628 | } |
| 629 | 629 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 630 | 630 | $ignoreImport = true; |
| 631 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 632 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 631 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 632 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 633 | 633 | $ignoreImport = false; |
| 634 | 634 | } |
| 635 | 635 | } |
| 636 | 636 | } |
| 637 | 637 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 638 | 638 | $ignoreImport = true; |
| 639 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 639 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 640 | 640 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 641 | 641 | $ignoreImport = false; |
| 642 | 642 | } |
@@ -648,27 +648,27 @@ discard block |
||
| 648 | 648 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 649 | 649 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 650 | 650 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 651 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 651 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 652 | 652 | $timeelapsed = microtime(true); |
| 653 | 653 | $Spotter = new Spotter($this->db); |
| 654 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name']); |
|
| 654 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name']); |
|
| 655 | 655 | $Spotter->db = null; |
| 656 | 656 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 657 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 657 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 658 | 658 | |
| 659 | 659 | // Add source stat in DB |
| 660 | 660 | $Stats = new Stats($this->db); |
| 661 | 661 | if (!empty($this->stats)) { |
| 662 | 662 | if ($globalDebug) echo 'Add source stats : '; |
| 663 | - foreach($this->stats as $date => $data) { |
|
| 664 | - foreach($data as $source => $sourced) { |
|
| 663 | + foreach ($this->stats as $date => $data) { |
|
| 664 | + foreach ($data as $source => $sourced) { |
|
| 665 | 665 | //print_r($sourced); |
| 666 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 667 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 666 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 667 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 668 | 668 | if (isset($sourced['msg'])) { |
| 669 | 669 | if (time() - $sourced['msg']['date'] > 10) { |
| 670 | 670 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 671 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 671 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 672 | 672 | unset($this->stats[$date][$source]['msg']); |
| 673 | 673 | } |
| 674 | 674 | } |
@@ -704,18 +704,18 @@ discard block |
||
| 704 | 704 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 705 | 705 | $SpotterLive = new SpotterLive($this->db); |
| 706 | 706 | $SpotterLive->deleteLiveSpotterData(); |
| 707 | - $SpotterLive->db=null; |
|
| 707 | + $SpotterLive->db = null; |
|
| 708 | 708 | if ($globalDebug) echo " Done\n"; |
| 709 | 709 | $this->last_delete = time(); |
| 710 | 710 | } |
| 711 | 711 | } else { |
| 712 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) { |
|
| 712 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) { |
|
| 713 | 713 | $this->all_flights[$id]['id'] = $recent_ident; |
| 714 | 714 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 715 | 715 | } |
| 716 | 716 | if (isset($globalDaemon) && !$globalDaemon) { |
| 717 | 717 | $Spotter = new Spotter($this->db); |
| 718 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 718 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']); |
|
| 719 | 719 | $Spotter->db = null; |
| 720 | 720 | } |
| 721 | 721 | |
@@ -739,37 +739,37 @@ discard block |
||
| 739 | 739 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 740 | 740 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 741 | 741 | |
| 742 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 742 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 743 | 743 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 744 | 744 | $ignoreImport = true; |
| 745 | 745 | } |
| 746 | 746 | } |
| 747 | 747 | if (count($globalAirportAccept) > 0) { |
| 748 | 748 | $ignoreImport = true; |
| 749 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 749 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 750 | 750 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 751 | 751 | $ignoreImport = false; |
| 752 | 752 | } |
| 753 | 753 | } |
| 754 | 754 | } |
| 755 | 755 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 756 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 757 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 756 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 757 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 758 | 758 | $ignoreImport = true; |
| 759 | 759 | } |
| 760 | 760 | } |
| 761 | 761 | } |
| 762 | 762 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 763 | 763 | $ignoreImport = true; |
| 764 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 765 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 764 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 765 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 766 | 766 | $ignoreImport = false; |
| 767 | 767 | } |
| 768 | 768 | } |
| 769 | 769 | } |
| 770 | 770 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 771 | 771 | $ignoreImport = true; |
| 772 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 772 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 773 | 773 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 774 | 774 | $ignoreImport = false; |
| 775 | 775 | } |
@@ -777,13 +777,13 @@ discard block |
||
| 777 | 777 | } |
| 778 | 778 | |
| 779 | 779 | if (!$ignoreImport) { |
| 780 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 780 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 781 | 781 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 782 | 782 | $timeelapsed = microtime(true); |
| 783 | 783 | $SpotterLive = new SpotterLive($this->db); |
| 784 | - $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 784 | + $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 785 | 785 | $SpotterLive->db = null; |
| 786 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 786 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 787 | 787 | |
| 788 | 788 | // Put statistics in $this->stats variable |
| 789 | 789 | //if ($line['format_source'] != 'aprs') { |
@@ -801,19 +801,19 @@ discard block |
||
| 801 | 801 | $latitude = $globalCenterLatitude; |
| 802 | 802 | $longitude = $globalCenterLongitude; |
| 803 | 803 | } |
| 804 | - $source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 804 | + $source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 805 | 805 | } else { |
| 806 | 806 | $latitude = $source_location[$source]['latitude']; |
| 807 | 807 | $longitude = $source_location[$source]['longitude']; |
| 808 | 808 | } |
| 809 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 809 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 810 | 810 | //$stats_heading = $stats_heading%22.5; |
| 811 | 811 | $stats_heading = round($stats_heading/22.5); |
| 812 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 812 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 813 | 813 | $current_date = date('Y-m-d'); |
| 814 | 814 | if ($stats_heading == 16) $stats_heading = 0; |
| 815 | 815 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 816 | - for ($i=0;$i<=15;$i++) { |
|
| 816 | + for ($i = 0; $i <= 15; $i++) { |
|
| 817 | 817 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 818 | 818 | } |
| 819 | 819 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -828,9 +828,9 @@ discard block |
||
| 828 | 828 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 829 | 829 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 830 | 830 | end($this->stats[$current_date][$source]['hist']); |
| 831 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 831 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 832 | 832 | } else $mini = 0; |
| 833 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 833 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 834 | 834 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 835 | 835 | } |
| 836 | 836 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -843,7 +843,7 @@ discard block |
||
| 843 | 843 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 844 | 844 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 845 | 845 | if ($globalDebug) echo $result."\n"; |
| 846 | - } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 846 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 847 | 847 | //$this->del(); |
| 848 | 848 | |
| 849 | 849 | |
@@ -11,12 +11,12 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | function __construct($dbs = null) { |
| 13 | 13 | if ($dbs === null) { |
| 14 | - $Connection = new Connection(null,'server'); |
|
| 14 | + $Connection = new Connection(null, 'server'); |
|
| 15 | 15 | $this->dbs = $Connection->dbs; |
| 16 | 16 | $query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;"; |
| 17 | 17 | try { |
| 18 | 18 | $sth = $this->dbs['server']->exec($query); |
| 19 | - } catch(PDOException $e) { |
|
| 19 | + } catch (PDOException $e) { |
|
| 20 | 20 | return "error : ".$e->getMessage(); |
| 21 | 21 | } |
| 22 | 22 | } |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | date_default_timezone_set('UTC'); |
| 32 | 32 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'aprs')) { |
| 33 | 33 | if (isset($line['format_source'])) { |
| 34 | - if(is_array($line) && isset($line['hex'])) { |
|
| 34 | + if (is_array($line) && isset($line['hex'])) { |
|
| 35 | 35 | if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) { |
| 36 | 36 | $data['hex'] = trim($line['hex']); |
| 37 | - if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 37 | + if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/', $line['datetime'])) { |
|
| 38 | 38 | $data['datetime'] = $line['datetime']; |
| 39 | 39 | } else $data['datetime'] = date('Y-m-d H:i:s'); |
| 40 | 40 | if (!isset($line['aircraft_icao'])) { |
@@ -112,11 +112,11 @@ discard block |
||
| 112 | 112 | if ($id_user == NULL) $id_user = 1; |
| 113 | 113 | if (!isset($id_source)) $id_source = 1; |
| 114 | 114 | $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)'; |
| 115 | - $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']); |
|
| 115 | + $query_values = array(':id_user' => $id_user, ':datetime' => $data['datetime'], ':hex' => $data['hex'], ':ident' => $data['ident'], ':latitude' => $data['latitude'], ':longitude' => $data['longitude'], ':verticalrate' => $data['verticalrate'], ':speed' => $data['speed'], ':squawk' => $data['squawk'], ':altitude' => $data['altitude'], ':heading' => $data['heading'], ':registration' => $data['registration'], ':aircraft_icao' => $data['aircraft_icao'], ':waypoints' => $data['waypoints'], ':id_source' => $id_source, ':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'], ':over_country' => $data['over_country']); |
|
| 116 | 116 | try { |
| 117 | 117 | $sth = $this->dbs['server']->prepare($query); |
| 118 | 118 | $sth->execute($query_values); |
| 119 | - } catch(PDOException $e) { |
|
| 119 | + } catch (PDOException $e) { |
|
| 120 | 120 | return "error : ".$e->getMessage(); |
| 121 | 121 | } |
| 122 | 122 | } |
