Ysurac / FlightAirMap

search-wkt.php

Indentation +40 added lines, -40 removed lines

@@ -4,55 +4,55 @@
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);

require/class.NOTAM.php

Indentation +700 added lines, -700 removed lines

@@ -6,706 +6,706 @@
 class NOTAM {
 	public $db;
 	private $abbr = array(
-	                    'A/A' => 'Air-to-air',
-	                    'A/G' => 'Air-to-ground',
-	                    'AAL' => 'Above Aerodrome Level',
-	                    'ABM' => 'Abeam',
-	                    'ABN' => 'Aerodrome Beacon',
-	                    'ABT' => 'About',
-	                    'ABV' => 'Above',
-	                    'ACC' => 'Area Control',
-	                    'ACFT' => 'Aircraft',
-	                    'ACK' => 'Acknowledge',
-	                    'ACL' => 'Altimeter Check Location',
-	                    'ACN' => 'Aircraft Classification Number',
-	                    'ACPT' => 'Accepted',
-	                    'ACT' => 'Active',
-	                    'AD' => 'Aerodrome',
-	                    'ADA' => 'Advisory Area',
-	                    'ADC' => 'Aerodrome Chart',
-	                    'ADDN' => 'Additional',
-	                    'ADJ' => 'Adjacent',
-	                    'ADR' => 'Advisory Route',
-	                    'ADS' => 'Automatic Dependent Surveillance',
-	                    'ADVS' => 'Advisory Service',
-	                    'ADZ' => 'Advised',
-	                    'AFIL' => 'Flight Plan Filed In The Air',
-	                    'AFM' => 'Affirm',
-	                    'AFT' => 'After',
-	                    'AGA' => 'Aerodromes, Air Routes and Ground Aids',
-	                    'AGN' => 'Again',
-	                    'ALERFA' => 'Alert Phase',
-	                    'ALRS' => 'Alerting Service',
-	                    'ALS' => 'Approach Lighting System',
-	                    'ALT' => 'Altitude',
-	                    'ALTN' => 'Alternate',
-	                    'AMA' => 'Area Minimum Altitude',
-	                    'ANC' => 'Aeronautical Chart',
-	                    'ANCS' => 'Aeronautical Navigation Chart',
-	                    'ANS' => 'Answer',
-	                    'AOC' => 'Aerodrome Obstacle Chart',
-	                    'AP' => 'Airport',
-	                    'APCH' => 'Approach',
-	                    'APDC' => 'Aircraft Parking/docking Chart',
-	                    'APN' => 'Apron',
-	                    'APNS' => 'Aprons',
-	                    'APP' => 'Approach Control',
-	                    'APR' => 'April',
-	                    'APRX' => 'Approximately',
-	                    'APSG' => 'After Passing',
-	                    'APV' => 'Approved',
-	                    'ARC' => 'Area Chart',
-	                    'ARNG' => 'Arrange',
-	                    'ARO' => 'Air Traffic Services Reporting Office',
-	                    'ARP' => 'Aerodrome Reference Point',
-	                    'ARR' => 'Arriving',
-	                    'ARST' => 'Arresting',
-	                    'ASC' => 'Ascend To',
-	                    'ASDA' => 'Accelerate-Stop Distance Available',
-	                    'ASPEEDG' => 'Airspeed Gain',
-	                    'ASPEEDL' => 'Airspeed Loss',
-	                    'ASPH' => 'Asphalt',
-	                    'ATA' => 'Actual Time of Arrival',
-	                    'ATD' => 'Actual Time of Departure',
-	                    'ATFM' => 'Air Traffic Flow Management',
-	                    'ATM' => 'Air Traffic Management',
-	                    'ATP' => 'At',
-	                    'ATTN' => 'Attention',
-	                    'ATZ' => 'Aerodrome Traffic Zone',
-	                    'AUG' => 'August',
-	                    'AUTH' => 'Authorization',
-	                    'AUW' => 'All Up Weight',
-	                    'AUX' => 'Auxiliary',
-	                    'AVBL' => 'Available',
-	                    'AVG' => 'Average',
-	                    'AVGAS' => 'Aviation Gasoline',
-	                    'AWTA' => 'Advise At What Time Able',
-	                    'AWY' => 'Airway',
-	                    'AWYS' => 'Airways',
-	                    'AZM' => 'Azimuth',
-	                    'BA' => 'Braking Action',
-	                    'BCN' => 'Beacon',
-	                    'BCST' => 'Broadcast',
-	                    'BDRY' => 'Boundary',
-	                    'BFR' => 'Before',
-	                    'BLDG' => 'Building',
-	                    'BLO' => 'Below Clouds',
-	                    'BLW' => 'Below',
-	                    'BRF' => 'Short',
-	                    'BRG' => 'Bearing',
-	                    'BRKG' => 'Breaking',
-	                    'BTL' => 'Between Layers',
-	                    'BTN' => 'Between',
-	                    'CD' => 'Candela',
-	                    'CDN' => 'Coordination',
-	                    'CF' => 'Change Frequency To',
-	                    'CFM' => 'Confirm',
-	                    'CGL' => 'Circling Guidance Light(s)',
-	                    'CH' => 'Channel',
-	                    'CHG' => 'Changed',
-	                    'CIT' => 'Near or Over Large Towns',
-	                    'CIV' => 'Civil',
-	                    'CK' => 'Check',
-	                    'CL' => 'Centre Line',
-	                    'CLBR' => 'Calibration',
-	                    'CLD' => 'Cloud',
-	                    'CLG' => 'Calling',
-	                    'CLIMB-OUT' => 'Climb-out Area',
-	                    'CLR' => 'Clearance',
-	                    'CLRD' => 'Cleared',
-	                    'CLSD' => 'Closed',
-	                    'CMB' => 'Climb',
-	                    'CMPL' => 'Complete',
-	                    'CNL' => 'Cancel',
-	                    'CNS' => 'Communications, Navigation And Surveillance',
-	                    'COM' => 'Communications',
-	                    'CONC' => 'Concrete',
-	                    'COND' => 'Condition',
-	                    'CONS' => 'Continuous',
-	                    'CONST' => 'Construction',
-	                    'CONT' => 'Continued',
-	                    'COOR' => 'Coordination',
-	                    'COORD' => 'Coordinates',
-	                    'COP' => 'Change-over Point',
-	                    'COR' => 'Correction',
-	                    'COT' => 'At The Coast',
-	                    'COV' => 'Covered',
-	                    'CPDLC' => 'Controller-pilot Data Link Communications',
-	                    'CPL' => 'Current Flight Plan',
-	                    'CRC' => 'Cyclic Redundancy Check',
-	                    'CRZ' => 'Cruise',
-	                    'CTAM' => 'Climb To And Maintain',
-	                    'CTC' => 'Contact',
-	                    'CTL' => 'Control',
-	                    'CTN' => 'Caution',
-	                    'CTR' => 'Control Zone',
-	                    'CVR' => 'Cockpit Voice Recorder',
-	                    'CW' => 'Continuous Wave',
-	                    'CWY' => 'Clearway',
-	                    'DA' => 'Decision Altitude',
-	                    'DCKG' => 'Docking',
-	                    'DCP' => 'Datum Crossing Point',
-	                    'DCPC' => 'Direct Controller-pilot Communications',
-	                    'DCT' => 'Direct',
-	                    'DEC' => 'December',
-	                    'DEG' => 'Degrees',
-	                    'DEP' => 'Departing',
-	                    'DES' => 'Descend',
-	                    'DEST' => 'Destination',
-	                    'DETRESFA' => 'Distress Phase',
-	                    'DEV' => 'Deviating',
-	                    'DFDR' => 'Digital Flight Data Recorder',
-	                    'DFTI' => 'Distance From Touchdown Indicator',
-	                    'DH' => 'Decision Height',
-	                    'DIP' => 'Diffuse',
-	                    'DIST' => 'Distance',
-	                    'DIV' => 'Divert',
-	                    'DLA' => 'Delay',
-	                    'DLY' => 'Daily',
-	                    'DNG' => 'Dangerous',
-	                    'DOM' => 'Domestic',
-	                    'DPT' => 'Depth',
-	                    'DR' => 'Dead Reckoning',
-	                    'DRG' => 'During',
-	                    'DTAM' => 'Descend To And Maintain',
-	                    'DTG' => 'Date-time Group',
-	                    'DTHR' => 'Displaced Runway Threshold',
-	                    'DTRT' => 'Deteriorating',
-	                    'DTW' => 'Dual Tandem Wheels',
-	                    'DUPE' => 'This Is A Duplicate Message',
-	                    'DUR' => 'Duration',
-	                    'DVOR' => 'Doppler VOR',
-	                    'DW' => 'Dual Wheels',
-	                    'EAT' => 'Expected Approach Time',
-	                    'EB' => 'Eastbound',
-	                    'EDA' => 'Elevation Differential Area',
-	                    'EET' => 'Estimated Elapsed Time',
-	                    'EFC' => 'Expect Further Clearance',
-	                    'ELBA' => 'Emergency Location Beacon',
-	                    'ELEV' => 'Elevation',
-	                    'ELR' => 'Extra Long Range',
-	                    'EM' => 'Emission',
-	                    'EMERG' => 'Emergency',
-	                    'END' => 'Stop-end',
-	                    'ENE' => 'East-north-east',
-	                    'ENG' => 'Engine',
-	                    'ENR' => 'En-route',
-	                    'ENRC' => 'En-route Chart',
-	                    'EOBT' => 'Estimated Off-block Time',
-	                    'EQPT' => 'Equipment',
-	                    'ER' => 'Here',
-	                    'ESE' => 'East-south-east',
-	                    'EST' => 'Estimate',
-	                    'ETA' => 'Estimated Time Of Arrival',
-	                    'ETD' => 'Estimated Time Of Departure',
-	                    'ETO' => 'Estimated Time Over Significant Point',
-	                    'EV' => 'Every',
-	                    'EXC' => 'Except',
-	                    'EXER' => 'Exercise',
-	                    'EXP' => 'Expect',
-	                    'EXTD' => 'Extend',
-	                    'FAC' => 'Facilities',
-	                    'FAF' => 'Final Approach Fix',
-	                    'FAL' => 'Facilitation of International Airtransport',
-	                    'FAP' => 'Final Approach Point',
-	                    'FATO' => 'Final Approach And Take-off Area',
-	                    'FAX' => 'Fax',
-	                    'FBL' => 'Light',
-	                    'FCST' => 'Forecast',
-	                    'FCT' => 'Friction Coefficient',
-	                    'FDPS' => 'Flight Data Processing System',
-	                    'FEB' => 'February',
-	                    'FLD' => 'Field',
-	                    'FLG' => 'Flashing',
-	                    'FLR' => 'Flares',
-	                    'FLT' => 'Flight',
-	                    'FLTS' => 'Flights',
-	                    'FLTCK' => 'Flight Check',
-	                    'FLUC' => 'Fluctuating',
-	                    'FLW' => 'Follow(s)',
-	                    'FLY' => 'Fly',
-	                    'FM' => 'From',
-	                    'FMS' => 'Flight Management System',
-	                    'FMU' => 'Flow Management Unit',
-	                    'FNA' => 'Final Approach',
-	                    'FPAP' => 'Flight Path Alignment Point',
-	                    'FPL' => 'Flight Plan',
-	                    'FPLS' => 'Flight Plans',
-	                    'FPM' => 'Feet Per Minute',
-	                    'FPR' => 'Flight Plan Route',
-	                    'FR' => 'Fuel Remaining',
-	                    'FREQ' => 'Frequency',
-	                    'FRI' => 'Friday',
-	                    'FRNG' => 'Firing',
-	                    'FRONT' => 'Front',
-	                    'FRQ' => 'Frequent',
-	                    'FSL' => 'Full Stop Landing',
-	                    'FSS' => 'Flight Service Station',
-	                    'FST' => 'First',
-	                    'FTP' => 'Fictitious Threshold Point',
-	                    'G/A' => 'Ground-to-air',
-	                    'G/A/G' => 'Ground-to-air and Air-to-ground',
-	                    'GARP' => 'GBAS Azimuth Reference Point',
-	                    'GBAS' => 'Ground-based Augmentation System',
-	                    'GCAJ' => 'Ground Controlled Approach',
-	                    'GEN' => 'General',
-	                    'GEO' => 'Geographic or True',
-	                    'GES' => 'Ground Earth Station',
-	                    'GLD' => 'Glider',
-	                    'GMC' => 'Ground Movement Chart',
-	                    'GND' => 'Ground',
-	                    'GNDCK' => 'Ground Check',
-	                    'GP' => 'Glide Path',
-	                    'GRASS' => 'Grass landing area',
-	                    'GRVL' => 'Gravel',
-	                    'GUND' => 'Geoid Undulation',
-	                    'H24' => '24 Hours',
-	                    'HAPI' => 'Helicopter Approach Path Indicator',
-	                    'HBN' => 'Hazard Beacon',
-	                    'HDG' => 'Heading',
-	                    'HEL' => 'Helicopter',
-	                    'HGT' => 'Height',
-	                    'HJ' => 'Sunrise to Sunset',
-	                    'HLDG' => 'Holding',
-	                    'HN' => 'Sunset to Sunrise',
-	                    'HO' => 'Service Available To Meet Operational Requirements',
-	                    'HOL' => 'Holiday',
-	                    'HOSP' => 'Hospital Aircraft',
-	                    'HOT' => 'Height',
-	                    'HPA' => 'Hectopascal',
-	                    'HR' => 'Hours',
-	                    'HRS' => 'Hours',
-	                    'HS' => 'Service Available During Hours Of Scheduled Operations',
-	                    'HURCN' => 'Hurricane',
-	                    'HVY' => 'Heavy',
-	                    'HX' => 'No Specific Working Hours',
-	                    'HYR' => 'Higher',
-	                    'IAC' => 'Instrument Approach Chart',
-	                    'IAF' => 'Initial Approach Fix',
-	                    'IAO' => 'In And Out Of Clouds',
-	                    'IAP' => 'Instrument Approach Procedure',
-	                    'IAR' => 'Intersection Of Air Routes',
-	                    'IBN' => 'Identification Beacon',
-	                    'ID' => 'Identifier',
-	                    'IDENT' => 'Identification',
-	                    'IFF' => 'Identification Friend/Foe',
-	                    'IGA' => 'International General Aviation',
-	                    'IM' => 'Inner Marker',
-	                    'IMPR' => 'Improving',
-	                    'IMT' => 'Immediately',
-	                    'INA' => 'Initial Approach',
-	                    'INBD' => 'Inbound',
-	                    'INCERFA' => 'Uncertainty Phase',
-	                    'INFO' => 'Information',
-	                    'INOP' => 'Inoperative',
-	                    'INP' => 'If Not Possible',
-	                    'INPR' => 'In Progress',
-	                    'INSTL' => 'Installation',
-	                    'INSTR' => 'Instrument',
-	                    'INT' => 'Intersection',
-	                    'INTS' => 'Intersections',
-	                    'INTL' => 'International',
-	                    'INTRG' => 'Interrogator',
-	                    'INTRP' => 'Interruption',
-	                    'INTSF' => 'Intensifying',
-	                    'INTST' => 'Intensity',
-	                    'ISA' => 'International Standard Atmosphere',
-	                    'JAN' => 'January',
-	                    'JTST' => 'Jet stream',
-	                    'JUL' => 'July',
-	                    'JUN' => 'June',
-	                    'KMH' => 'Kilometres Per Hour',
-	                    'KPA' => 'Kilopascal',
-	                    'KT' => 'Knots',
-	                    'KW' => 'Kilowatts',
-	                    'LAN' => 'Inland',
-	                    'LAT' => 'Latitude',
-	                    'LDA' => 'Landing Distance Available',
-	                    'LDAH' => 'Landing Distance Available, Helicopter',
-	                    'LDG' => 'Landing',
-	                    'LDI' => 'Landing Direction Indicator',
-	                    'LEN' => 'Length',
-	                    'LGT' => 'Lighting',
-	                    'LGTD' => 'Lighted',
-	                    'LIH' => 'Light Intensity High',
-	                    'LIL' => 'Light Intensity Low',
-	                    'LIM' => 'Light Intensity Medium',
-	                    'LLZ' => 'Localizer',
-	                    'LM' => 'Locator, Middle',
-	                    'LMT' => 'Local Mean Time',
-	                    'LNG' => 'Long',
-	                    'LO' => 'Locator, Outer',
-	                    'LOG' => 'Located',
-	                    'LONG' => 'Longitude',
-	                    'LRG' => 'Long Range',
-	                    'LTD' => 'Limited',
-	                    'LTP' => 'Landing Threshold Point',
-	                    'LVE' => 'Leaving',
-	                    'LVL' => 'Level',
-	                    'LYR' => 'Layer',
-	                    'MAA' => 'Maximum Authorized Altitude',
-	                    'MAG' => 'Magnetic',
-	                    'MAINT' => 'Maintenance',
-	                    'MAP' => 'Aeronautical Maps and Charts',
-	                    'MAPT' => 'Missed Approach Point',
-	                    'MAR' => 'March',
-	                    'MAX' => 'Maximum',
-	                    'MAY' => 'May',
-	                    'MBST' => 'Microburst',
-	                    'MCA' => 'Minimum Crossing Altitude',
-	                    'MCW' => 'Modulated Continuous Wave',
-	                    'MDA' => 'Minimum Descent Altitude',
-	                    'MDH' => 'Minimum Descent Height',
-	                    'MEA' => 'Minimum En-route Altitude',
-	                    'MEHT' => 'Minimum Eye Height Over Threshold',
-	                    'MET' => 'Meteorological',
-	                    'MID' => 'Mid-point',
-	                    'MIL' => 'Military',
-	                    'MIN' => 'Minutes',
-	                    'MKR' => 'Marker Radio Beacon',
-	                    'MLS' => 'Microwave Landing System',
-	                    'MM' => 'Middle Marker',
-	                    'MNM' => 'Minimum',
-	                    'MNPS' => 'Minimum Navigation Performance Specifications',
-	                    'MNT' => 'Monitor',
-	                    'MNTN' => 'Maintain',
-	                    'MOA' => 'Military Operating Area',
-	                    'MOC' => 'Minimum Obstacle Clearance',
-	                    'MOD' => 'Moderate',
-	                    'MON' => 'Monday',
-	                    'MOPS' => 'Minimum Operational Performance Standards',
-	                    'MOV' => 'Movement',
-	                    'MRA' => 'Minimum Reception Altitude',
-	                    'MRG' => 'Medium Range',
-	                    'MRP' => 'ATS/MET Reporting Point',
-	                    'MS' => 'Minus',
-	                    'MSA' => 'Minimum Sector Altitude',
-	                    'MSAW' => 'Minimum Safe Altitude Warning',
-	                    'MSG' => 'Message',
-	                    'MSSR' => 'Monopulse Secondary Surveillance Radar',
-	                    'MT' => 'Mountain',
-	                    'MTU' => 'Metric Units',
-	                    'MTW' => 'Mountain Waves',
-	                    'NASC' => 'National AIS System Centre',
-	                    'NAT' => 'North Atlantic',
-	                    'NAV' => 'Navigation',
-	                    'NB' => 'Northbound',
-	                    'NBFR' => 'Not Before',
-	                    'NE' => 'North-east',
-	                    'NEB' => 'North-eastbound',
-	                    'NEG' => 'Negative',
-	                    'NGT' => 'Night',
-	                    'NIL' => 'None',
-	                    'NML' => 'Normal',
-	                    'NNE' => 'North-north-east',
-	                    'NNW' => 'North-north-west',
-	                    'NOF' => 'International NOTAM Office',
-	                    'NOV' => 'November',
-	                    'NOZ' => 'Normal Operating Zone',
-	                    'NR' => 'Number',
-	                    'NRH' => 'No Reply Heard',
-	                    'NTL' => 'National',
-	                    'NTZ' => 'No Transgression Zone',
-	                    'NW' => 'North-west',
-	                    'NWB' => 'North-westbound',
-	                    'NXT' => 'Next',
-	                    'O/R' => 'On Request',
-	                    'OAC' => 'Oceanic Area Control Centre',
-	                    'OAS' => 'Obstacle Assessment Surface',
-	                    'OBS' => 'Observe',
-	                    'OBST' => 'Obstacle',
-	                    'OBSTS' => 'Obstacles',
-	                    'OCA' => 'Oceanic Control Area',
-	                    'OCH' => 'Obstacle Clearance Height',
-	                    'OCS' => 'Obstacle Clearance Surface',
-	                    'OCT' => 'October',
-	                    'OFZ' => 'Obstacle Free Zone',
-	                    'OGN' => 'Originate',
-	                    'OHD' => 'Overhead',
-	                    'OM' => 'Outer Marker',
-	                    'OPC' => 'Control Indicated Is Operational Control',
-	                    'OPMET' => 'Operational Meteorological',
-	                    'OPN' => 'Open',
-	                    'OPR' => 'Operate',
-	                    'OPS' => 'Operations',
-	                    'ORD' => 'Order',
-	                    'OSV' => 'Ocean Station Vessel',
-	                    'OTLK' => 'Outlook',
-	                    'OTP' => 'On Top',
-	                    'OTS' => 'Organized Track System',
-	                    'OUBD' => 'Outbound',
-	                    'PA' => 'Precision Approach',
-	                    'PALS' => 'Precision Approach Lighting System',
-	                    'PANS' => 'Procedures for Air Navigation Services',
-	                    'PAR' => 'Precision Approach Radar',
-	                    'PARL' => 'Parallel',
-	                    'PATC' => 'Precision Approach Terrain Chart',
-	                    'PAX' => 'Passenger(s)',
-	                    'PCD' => 'Proceed',
-	                    'PCL' => 'Pilot-controlled Lighting',
-	                    'PCN' => 'Pavement Classification Number',
-	                    'PDC' => 'Pre-departure Clearance',
-	                    'PDG' => 'Procedure Design Gradient',
-	                    'PER' => 'Performance',
-	                    'PERM' => 'Permanent',
-	                    'PIB' => 'Pre-flight Information Bulletin',
-	                    'PJE' => 'Parachute Jumping Exercise',
-	                    'PLA' => 'Practice Low Approach',
-	                    'PLN' => 'Flight Plan',
-	                    'PLVL' => 'Present Level',
-	                    'PN' => 'Prior Notice Required',
-	                    'PNR' => 'Point Of No Return',
-	                    'POB' => 'Persons On Board',
-	                    'POSS' => 'Possible',
-	                    'PPI' => 'Plan Position Indicator',
-	                    'PPR' => 'Prior Permission Required',
-	                    'PPSN' => 'Present Position',
-	                    'PRI' => 'Primary',
-	                    'PRKG' => 'Parking',
-	                    'PROB' => 'Probability',
-	                    'PROC' => 'Procedure',
-	                    'PROV' => 'Provisional',
-	                    'PS' => 'Plus',
-	                    'PSG' => 'Passing',
-	                    'PSN' => 'Position',
-	                    'PSNS' => 'Positions',
-	                    'PSR' => 'Primary Surveillance Radar',
-	                    'PSYS' => 'Pressure System(s)',
-	                    'PTN' => 'Procedure Turn',
-	                    'PTS' => 'Polar Track Structure',
-	                    'PWR' => 'Power',
-	                    'QUAD' => 'Quadrant',
-	                    'RAC' => 'Rules of The Air and Air Traffic Services',
-	                    'RAG' => 'Runway Arresting Gear',
-	                    'RAI' => 'Runway Alignment Indicator',
-	                    'RASC' => 'Regional AIS System Centre',
-	                    'RASS' => 'Remote Altimeter Setting Source',
-	                    'RB' => 'Rescue Boat',
-	                    'RCA' => 'Reach Cruising Altitude',
-	                    'RCC' => 'Rescue Coordination Centre',
-	                    'RCF' => 'Radiocommunication Failure',
-	                    'RCH' => 'Reaching',
-	                    'RCL' => 'Runway Centre Line',
-	                    'RCLL' => 'Runway Centre Line Light(s)',
-	                    'RCLR' => 'Recleared',
-	                    'RDH' => 'Reference Datum Height',
-	                    'RDL' => 'Radial',
-	                    'RDO' => 'Radio',
-	                    'RE' => 'Recent',
-	                    'REC' => 'Receiver',
-	                    'REDL' => 'Runway Edge Light(s)',
-	                    'REF' => 'Refer To',
-	                    'REG' => 'Registration',
-	                    'RENL' => 'Runway End Light(s)',
-	                    'REP' => 'Report',
-	                    'REQ' => 'Requested',
-	                    'RERTE' => 'Re-route',
-	                    'RESA' => 'Runway End Safety Area',
-	                    'RG' => 'Range (lights)',
-	                    'RHC' => 'Right-hand Circuit',
-	                    'RIF' => 'Reclearance In Flight',
-	                    'RITE' => 'Right',
-	                    'RL' => 'Report Leaving',
-	                    'RLA' => 'Relay To',
-	                    'RLCE' => 'Request Level Change En Route',
-	                    'RLLS' => 'Runway Lead-in Lighting System',
-	                    'RLNA' => 'Request Level Not Available',
-	                    'RMAC' => 'Radar Minimum Altitude Chart',
-	                    'RMK' => 'Remark',
-	                    'RNG' => 'Radio Range',
-	                    'RNP' => 'Required Navigation Performance',
-	                    'ROC' => 'Rate Of Climb',
-	                    'ROD' => 'Rate Of Descent',
-	                    'ROFOR' => 'Route Forecast',
-	                    'RON' => 'Receiving Only',
-	                    'RPI' => 'Radar Position Indicator',
-	                    'RPL' => 'Repetitive Flight Plan',
-	                    'RPLC' => 'Replaced',
-	                    'RPS' => 'Radar Position Symbol',
-	                    'RQMNTS' => 'Requirements',
-	                    'RQP' => 'Request Flight Plan',
-	                    'RQS' => 'Request Supplementary Flight Plan',
-	                    'RR' => 'Report Reaching',
-	                    'RSC' => 'Rescue Sub-centre',
-	                    'RSCD' => 'Runway Surface Condition',
-	                    'RSP' => 'Responder Beacon',
-	                    'RSR' => 'En-route Surveillance Radar',
-	                    'RTE' => 'Route',
-	                    'RTES' => 'Routes',
-	                    'RTF' => 'Radiotelephone',
-	                    'RTG' => 'Radiotelegraph',
-	                    'RTHL' => 'Runway Threshold Light(s)',
-	                    'RTN' => 'Return',
-	                    'RTODAH' => 'Rejected Take-off Distance Available, Helicopter',
-	                    'RTS' => 'Return To Service',
-	                    'RTT' => 'Radioteletypewriter',
-	                    'RTZL' => 'Runway Touchdown Zone Light(s)',
-	                    'RUT' => 'Standard Regional Route Transmitting Frequencies',
-	                    'RV' => 'Rescue Vessel',
-	                    'RVSM' => 'Reduced Vertical Separation Minimum',
-	                    'RWY' => 'Runway',
-	                    'RWYS' => 'Runways',
-	                    'SALS' => 'Simple Approach Lighting System',
-	                    'SAN' => 'Sanitary',
-	                    'SAP' => 'As Soon As Possible',
-	                    'SAR' => 'Search and Rescue',
-	                    'SARPS' => 'Standards and Recommended Practices',
-	                    'SAT' => 'Saturday',
-	                    'SATCOM' => 'Satellite Communication',
-	                    'SB' => 'Southbound',
-	                    'SBAS' => 'Satellite-based Augmentation System',
-	                    'SDBY' => 'Stand by',
-	                    'SE' => 'South-east',
-	                    'SEA' => 'Sea',
-	                    'SEB' => 'South-eastbound',
-	                    'SEC' => 'Seconds',
-	                    'SECN' => 'Section',
-	                    'SECT' => 'Sector',
-	                    'SEP' => 'September',
-	                    'SER' => 'Service',
-	                    'SEV' => 'Severe',
-	                    'SFC' => 'Surface',
-	                    'SGL' => 'Signal',
-	                    'SID' => 'Standard Instrument Departure',
-	                    'SIF' => 'Selective Identification Feature',
-	                    'SIG' => 'Significant',
-	                    'SIMUL' => 'Simultaneous',
-	                    'SKED' => 'Schedule',
-	                    'SLP' => 'Speed Limiting Point',
-	                    'SLW' => 'Slow',
-	                    'SMC' => 'Surface Movement Control',
-	                    'SMR' => 'Surface Movement Radar',
-	                    'SPL' => 'Supplementary Flight Plan',
-	                    'SPOC' => 'SAR Point Of Contact',
-	                    'SPOT' => 'Spot Wind',
-	                    'SR' => 'Sunrise',
-	                    'SRA' => 'Surveillance Radar Approach',
-	                    'SRE' => 'Surveillance Radar Element Of Precision Approach Radar System',
-	                    'SRG' => 'Short Range',
-	                    'SRR' => 'Search and Rescue Region',
-	                    'SRY' => 'Secondary',
-	                    'SS' => 'Sunset',
-	                    'SSE' => 'South-south-east',
-	                    'SSR' => 'Secondary Surveillance Radar',
-	                    'SST' => 'Supersonic Transport',
-	                    'SSW' => 'South-south-west',
-	                    'STA' => 'Straight-in Approach',
-	                    'STAR' => 'Standard Instrument Arrival',
-	                    'STD' => 'Standard',
-	                    'STN' => 'Station',
-	                    'STNR' => 'Stationary',
-	                    'STOL' => 'Short Take-off and Landing',
-	                    'STS' => 'Status',
-	                    'STWL' => 'Stopway Light(s)',
-	                    'SUBJ' => 'Subject To',
-	                    'SUN' => 'Sunday',
-	                    'SUP' => 'Supplement',
-	                    'SUPPS' => 'Regional Supplementary Procedures Service Message',
-	                    'SVCBL' => 'Serviceable',
-	                    'SW' => 'South-west',
-	                    'SWB' => 'South-westbound',
-	                    'SWY' => 'Stopway',
-	                    'TA' => 'Transition Altitude',
-	                    'TAA' => 'Terminal Arrival Altitude',
-	                    'TAF' => 'Aerodrome Forecast',
-	                    'TAIL' => 'Tail Wind',
-	                    'TAR' => 'Terminal Area Surveillance Radar',
-	                    'TAX' => 'Taxi',
-	                    'TCAC' => 'Tropical Cyclone Advisory Centre',
-	                    'TDO' => 'Tornado',
-	                    'TDZ' => 'Touchdown Zone',
-	                    'TECR' => 'Technical Reason',
-	                    'TEMPO' => 'Temporarily',
-	                    'TFC' => 'Traffic',
-	                    'TGL' => 'Touch-and-go',
-	                    'TGS' => 'Taxiing Guidance System',
-	                    'THR' => 'Threshold',
-	                    'THRU' => 'Through',
-	                    'THU' => 'Thursday',
-	                    'TIBA' => 'Traffic Information Broadcast By Aircraft',
-	                    'TIL' => 'Until',
-	                    'TIP' => 'Until Past',
-	                    'TKOF' => 'Take-off',
-	                    'TL' => 'Till',
-	                    'TLOF' => 'Touchdown And Lift-off Area',
-	                    'TMA' => 'Terminal Control Area',
-	                    'TNA' => 'Turn Altitude',
-	                    'TNH' => 'Turn Height',
-	                    'TOC' => 'Top of Climb',
-	                    'TODA' => 'Take-off Distance Available',
-	                    'TODAH' => 'Take-off Distance Available, Helicopter',
-	                    'TORA' => 'Take-off Run Available',
-	                    'TP' => 'Turning Point',
-	                    'TR' => 'Track',
-	                    'TRA' => 'Temporary Reserved Airspace',
-	                    'TRANS' => 'Transmitter',
-	                    'TRL' => 'Transition Level',
-	                    'TUE' => 'Tuesday',
-	                    'TURB' => 'Turbulence',
-	                    'TVOR' => 'Terminal VOR',
-	                    'TWR' => 'Tower',
-	                    'TWY' => 'Taxiway',
-	                    'TWYL' => 'Taxiway-link',
-	                    'TXT' => 'Text',
-	                    'TYP' => 'Type of Aircraft',
-	                    'U/S' => 'Unserviceable',
-	                    'UAB' => 'Until Advised By',
-	                    'UAC' => 'Upper Area Control Centre',
-	                    'UAR' => 'Upper Air Route',
-	                    'UFN' => 'Until Further Notice',
-	                    'UHDT' => 'Unable Higher Due Traffic',
-	                    'UIC' => 'Upper Information Centre',
-	                    'UIR' => 'Upper Flight Information Region',
-	                    'ULR' => 'Ultra Long Range',
-	                    'UNA' => 'Unable',
-	                    'UNAP' => 'Unable To Approve',
-	                    'UNL' => 'Unlimited',
-	                    'UNREL' => 'Unreliable',
-	                    'UTA' => 'Upper Control Area',
-	                    'VAAC' => 'Volcanic Ash Advisory Centre',
-	                    'VAC' => 'Visual Approach Chart',
-	                    'VAL' => 'In Valleys',
-	                    'VAN' => 'Runway Control Van',
-	                    'VAR' => 'Visual-aural Radio Range',
-	                    'VC' => 'Vicinity',
-	                    'VCY' => 'Vicinity',
-	                    'VER' => 'Vertical',
-	                    'VIS' => 'Visibility',
-	                    'VLR' => 'Very Long Range',
-	                    'VPA' => 'Vertical Path Angle',
-	                    'VRB' => 'Variable',
-	                    'VSA' => 'By Visual Reference To The Ground',
-	                    'VSP' => 'Vertical Speed',
-	                    'VTOL' => 'Vertical Take-off And Landing',
-	                    'WAC' => 'World Aeronautical Chart',
-	                    'WAFC' => 'World Area Forecast Centre',
-	                    'WB' => 'Westbound',
-	                    'WBAR' => 'Wing Bar Lights',
-	                    'WDI' => 'Wind Direction Indicator',
-	                    'WDSPR' => 'Widespread',
-	                    'WED' => 'Wednesday',
-	                    'WEF' => 'Effective From',
-	                    'WI' => 'Within',
-	                    'WID' => 'Width',
-	                    'WIE' => 'Effective Immediately',
-	                    'WILCO' => 'Will Comply',
-	                    'WIND' => 'Wind',
-	                    'WINTEM' => 'Forecast Upper Wind And Temperature For Aviation',
-	                    'WIP' => 'Work In Progress',
-	                    'WKN' => 'Weaken',
-	                    'WNW' => 'West-north-west',
-	                    'WO' => 'Without',
-	                    'WPT' => 'Way-point',
-	                    'WRNG' => 'Warning',
-	                    'WSW' => 'West-south-west',
-	                    'WT' => 'Weight',
-	                    'WWW' => 'Worldwide Web',
-	                    'WX' => 'Weather',
-	                    'XBAR' => 'Crossbar',
-	                    'XNG' => 'Crossing',
-	                    'XS' => 'Atmospherics',
-	                    'YCZ' => 'Yellow Caution Zone',
-	                    'YR' => 'Your');
+						'A/A' => 'Air-to-air',
+						'A/G' => 'Air-to-ground',
+						'AAL' => 'Above Aerodrome Level',
+						'ABM' => 'Abeam',
+						'ABN' => 'Aerodrome Beacon',
+						'ABT' => 'About',
+						'ABV' => 'Above',
+						'ACC' => 'Area Control',
+						'ACFT' => 'Aircraft',
+						'ACK' => 'Acknowledge',
+						'ACL' => 'Altimeter Check Location',
+						'ACN' => 'Aircraft Classification Number',
+						'ACPT' => 'Accepted',
+						'ACT' => 'Active',
+						'AD' => 'Aerodrome',
+						'ADA' => 'Advisory Area',
+						'ADC' => 'Aerodrome Chart',
+						'ADDN' => 'Additional',
+						'ADJ' => 'Adjacent',
+						'ADR' => 'Advisory Route',
+						'ADS' => 'Automatic Dependent Surveillance',
+						'ADVS' => 'Advisory Service',
+						'ADZ' => 'Advised',
+						'AFIL' => 'Flight Plan Filed In The Air',
+						'AFM' => 'Affirm',
+						'AFT' => 'After',
+						'AGA' => 'Aerodromes, Air Routes and Ground Aids',
+						'AGN' => 'Again',
+						'ALERFA' => 'Alert Phase',
+						'ALRS' => 'Alerting Service',
+						'ALS' => 'Approach Lighting System',
+						'ALT' => 'Altitude',
+						'ALTN' => 'Alternate',
+						'AMA' => 'Area Minimum Altitude',
+						'ANC' => 'Aeronautical Chart',
+						'ANCS' => 'Aeronautical Navigation Chart',
+						'ANS' => 'Answer',
+						'AOC' => 'Aerodrome Obstacle Chart',
+						'AP' => 'Airport',
+						'APCH' => 'Approach',
+						'APDC' => 'Aircraft Parking/docking Chart',
+						'APN' => 'Apron',
+						'APNS' => 'Aprons',
+						'APP' => 'Approach Control',
+						'APR' => 'April',
+						'APRX' => 'Approximately',
+						'APSG' => 'After Passing',
+						'APV' => 'Approved',
+						'ARC' => 'Area Chart',
+						'ARNG' => 'Arrange',
+						'ARO' => 'Air Traffic Services Reporting Office',
+						'ARP' => 'Aerodrome Reference Point',
+						'ARR' => 'Arriving',
+						'ARST' => 'Arresting',
+						'ASC' => 'Ascend To',
+						'ASDA' => 'Accelerate-Stop Distance Available',
+						'ASPEEDG' => 'Airspeed Gain',
+						'ASPEEDL' => 'Airspeed Loss',
+						'ASPH' => 'Asphalt',
+						'ATA' => 'Actual Time of Arrival',
+						'ATD' => 'Actual Time of Departure',
+						'ATFM' => 'Air Traffic Flow Management',
+						'ATM' => 'Air Traffic Management',
+						'ATP' => 'At',
+						'ATTN' => 'Attention',
+						'ATZ' => 'Aerodrome Traffic Zone',
+						'AUG' => 'August',
+						'AUTH' => 'Authorization',
+						'AUW' => 'All Up Weight',
+						'AUX' => 'Auxiliary',
+						'AVBL' => 'Available',
+						'AVG' => 'Average',
+						'AVGAS' => 'Aviation Gasoline',
+						'AWTA' => 'Advise At What Time Able',
+						'AWY' => 'Airway',
+						'AWYS' => 'Airways',
+						'AZM' => 'Azimuth',
+						'BA' => 'Braking Action',
+						'BCN' => 'Beacon',
+						'BCST' => 'Broadcast',
+						'BDRY' => 'Boundary',
+						'BFR' => 'Before',
+						'BLDG' => 'Building',
+						'BLO' => 'Below Clouds',
+						'BLW' => 'Below',
+						'BRF' => 'Short',
+						'BRG' => 'Bearing',
+						'BRKG' => 'Breaking',
+						'BTL' => 'Between Layers',
+						'BTN' => 'Between',
+						'CD' => 'Candela',
+						'CDN' => 'Coordination',
+						'CF' => 'Change Frequency To',
+						'CFM' => 'Confirm',
+						'CGL' => 'Circling Guidance Light(s)',
+						'CH' => 'Channel',
+						'CHG' => 'Changed',
+						'CIT' => 'Near or Over Large Towns',
+						'CIV' => 'Civil',
+						'CK' => 'Check',
+						'CL' => 'Centre Line',
+						'CLBR' => 'Calibration',
+						'CLD' => 'Cloud',
+						'CLG' => 'Calling',
+						'CLIMB-OUT' => 'Climb-out Area',
+						'CLR' => 'Clearance',
+						'CLRD' => 'Cleared',
+						'CLSD' => 'Closed',
+						'CMB' => 'Climb',
+						'CMPL' => 'Complete',
+						'CNL' => 'Cancel',
+						'CNS' => 'Communications, Navigation And Surveillance',
+						'COM' => 'Communications',
+						'CONC' => 'Concrete',
+						'COND' => 'Condition',
+						'CONS' => 'Continuous',
+						'CONST' => 'Construction',
+						'CONT' => 'Continued',
+						'COOR' => 'Coordination',
+						'COORD' => 'Coordinates',
+						'COP' => 'Change-over Point',
+						'COR' => 'Correction',
+						'COT' => 'At The Coast',
+						'COV' => 'Covered',
+						'CPDLC' => 'Controller-pilot Data Link Communications',
+						'CPL' => 'Current Flight Plan',
+						'CRC' => 'Cyclic Redundancy Check',
+						'CRZ' => 'Cruise',
+						'CTAM' => 'Climb To And Maintain',
+						'CTC' => 'Contact',
+						'CTL' => 'Control',
+						'CTN' => 'Caution',
+						'CTR' => 'Control Zone',
+						'CVR' => 'Cockpit Voice Recorder',
+						'CW' => 'Continuous Wave',
+						'CWY' => 'Clearway',
+						'DA' => 'Decision Altitude',
+						'DCKG' => 'Docking',
+						'DCP' => 'Datum Crossing Point',
+						'DCPC' => 'Direct Controller-pilot Communications',
+						'DCT' => 'Direct',
+						'DEC' => 'December',
+						'DEG' => 'Degrees',
+						'DEP' => 'Departing',
+						'DES' => 'Descend',
+						'DEST' => 'Destination',
+						'DETRESFA' => 'Distress Phase',
+						'DEV' => 'Deviating',
+						'DFDR' => 'Digital Flight Data Recorder',
+						'DFTI' => 'Distance From Touchdown Indicator',
+						'DH' => 'Decision Height',
+						'DIP' => 'Diffuse',
+						'DIST' => 'Distance',
+						'DIV' => 'Divert',
+						'DLA' => 'Delay',
+						'DLY' => 'Daily',
+						'DNG' => 'Dangerous',
+						'DOM' => 'Domestic',
+						'DPT' => 'Depth',
+						'DR' => 'Dead Reckoning',
+						'DRG' => 'During',
+						'DTAM' => 'Descend To And Maintain',
+						'DTG' => 'Date-time Group',
+						'DTHR' => 'Displaced Runway Threshold',
+						'DTRT' => 'Deteriorating',
+						'DTW' => 'Dual Tandem Wheels',
+						'DUPE' => 'This Is A Duplicate Message',
+						'DUR' => 'Duration',
+						'DVOR' => 'Doppler VOR',
+						'DW' => 'Dual Wheels',
+						'EAT' => 'Expected Approach Time',
+						'EB' => 'Eastbound',
+						'EDA' => 'Elevation Differential Area',
+						'EET' => 'Estimated Elapsed Time',
+						'EFC' => 'Expect Further Clearance',
+						'ELBA' => 'Emergency Location Beacon',
+						'ELEV' => 'Elevation',
+						'ELR' => 'Extra Long Range',
+						'EM' => 'Emission',
+						'EMERG' => 'Emergency',
+						'END' => 'Stop-end',
+						'ENE' => 'East-north-east',
+						'ENG' => 'Engine',
+						'ENR' => 'En-route',
+						'ENRC' => 'En-route Chart',
+						'EOBT' => 'Estimated Off-block Time',
+						'EQPT' => 'Equipment',
+						'ER' => 'Here',
+						'ESE' => 'East-south-east',
+						'EST' => 'Estimate',
+						'ETA' => 'Estimated Time Of Arrival',
+						'ETD' => 'Estimated Time Of Departure',
+						'ETO' => 'Estimated Time Over Significant Point',
+						'EV' => 'Every',
+						'EXC' => 'Except',
+						'EXER' => 'Exercise',
+						'EXP' => 'Expect',
+						'EXTD' => 'Extend',
+						'FAC' => 'Facilities',
+						'FAF' => 'Final Approach Fix',
+						'FAL' => 'Facilitation of International Airtransport',
+						'FAP' => 'Final Approach Point',
+						'FATO' => 'Final Approach And Take-off Area',
+						'FAX' => 'Fax',
+						'FBL' => 'Light',
+						'FCST' => 'Forecast',
+						'FCT' => 'Friction Coefficient',
+						'FDPS' => 'Flight Data Processing System',
+						'FEB' => 'February',
+						'FLD' => 'Field',
+						'FLG' => 'Flashing',
+						'FLR' => 'Flares',
+						'FLT' => 'Flight',
+						'FLTS' => 'Flights',
+						'FLTCK' => 'Flight Check',
+						'FLUC' => 'Fluctuating',
+						'FLW' => 'Follow(s)',
+						'FLY' => 'Fly',
+						'FM' => 'From',
+						'FMS' => 'Flight Management System',
+						'FMU' => 'Flow Management Unit',
+						'FNA' => 'Final Approach',
+						'FPAP' => 'Flight Path Alignment Point',
+						'FPL' => 'Flight Plan',
+						'FPLS' => 'Flight Plans',
+						'FPM' => 'Feet Per Minute',
+						'FPR' => 'Flight Plan Route',
+						'FR' => 'Fuel Remaining',
+						'FREQ' => 'Frequency',
+						'FRI' => 'Friday',
+						'FRNG' => 'Firing',
+						'FRONT' => 'Front',
+						'FRQ' => 'Frequent',
+						'FSL' => 'Full Stop Landing',
+						'FSS' => 'Flight Service Station',
+						'FST' => 'First',
+						'FTP' => 'Fictitious Threshold Point',
+						'G/A' => 'Ground-to-air',
+						'G/A/G' => 'Ground-to-air and Air-to-ground',
+						'GARP' => 'GBAS Azimuth Reference Point',
+						'GBAS' => 'Ground-based Augmentation System',
+						'GCAJ' => 'Ground Controlled Approach',
+						'GEN' => 'General',
+						'GEO' => 'Geographic or True',
+						'GES' => 'Ground Earth Station',
+						'GLD' => 'Glider',
+						'GMC' => 'Ground Movement Chart',
+						'GND' => 'Ground',
+						'GNDCK' => 'Ground Check',
+						'GP' => 'Glide Path',
+						'GRASS' => 'Grass landing area',
+						'GRVL' => 'Gravel',
+						'GUND' => 'Geoid Undulation',
+						'H24' => '24 Hours',
+						'HAPI' => 'Helicopter Approach Path Indicator',
+						'HBN' => 'Hazard Beacon',
+						'HDG' => 'Heading',
+						'HEL' => 'Helicopter',
+						'HGT' => 'Height',
+						'HJ' => 'Sunrise to Sunset',
+						'HLDG' => 'Holding',
+						'HN' => 'Sunset to Sunrise',
+						'HO' => 'Service Available To Meet Operational Requirements',
+						'HOL' => 'Holiday',
+						'HOSP' => 'Hospital Aircraft',
+						'HOT' => 'Height',
+						'HPA' => 'Hectopascal',
+						'HR' => 'Hours',
+						'HRS' => 'Hours',
+						'HS' => 'Service Available During Hours Of Scheduled Operations',
+						'HURCN' => 'Hurricane',
+						'HVY' => 'Heavy',
+						'HX' => 'No Specific Working Hours',
+						'HYR' => 'Higher',
+						'IAC' => 'Instrument Approach Chart',
+						'IAF' => 'Initial Approach Fix',
+						'IAO' => 'In And Out Of Clouds',
+						'IAP' => 'Instrument Approach Procedure',
+						'IAR' => 'Intersection Of Air Routes',
+						'IBN' => 'Identification Beacon',
+						'ID' => 'Identifier',
+						'IDENT' => 'Identification',
+						'IFF' => 'Identification Friend/Foe',
+						'IGA' => 'International General Aviation',
+						'IM' => 'Inner Marker',
+						'IMPR' => 'Improving',
+						'IMT' => 'Immediately',
+						'INA' => 'Initial Approach',
+						'INBD' => 'Inbound',
+						'INCERFA' => 'Uncertainty Phase',
+						'INFO' => 'Information',
+						'INOP' => 'Inoperative',
+						'INP' => 'If Not Possible',
+						'INPR' => 'In Progress',
+						'INSTL' => 'Installation',
+						'INSTR' => 'Instrument',
+						'INT' => 'Intersection',
+						'INTS' => 'Intersections',
+						'INTL' => 'International',
+						'INTRG' => 'Interrogator',
+						'INTRP' => 'Interruption',
+						'INTSF' => 'Intensifying',
+						'INTST' => 'Intensity',
+						'ISA' => 'International Standard Atmosphere',
+						'JAN' => 'January',
+						'JTST' => 'Jet stream',
+						'JUL' => 'July',
+						'JUN' => 'June',
+						'KMH' => 'Kilometres Per Hour',
+						'KPA' => 'Kilopascal',
+						'KT' => 'Knots',
+						'KW' => 'Kilowatts',
+						'LAN' => 'Inland',
+						'LAT' => 'Latitude',
+						'LDA' => 'Landing Distance Available',
+						'LDAH' => 'Landing Distance Available, Helicopter',
+						'LDG' => 'Landing',
+						'LDI' => 'Landing Direction Indicator',
+						'LEN' => 'Length',
+						'LGT' => 'Lighting',
+						'LGTD' => 'Lighted',
+						'LIH' => 'Light Intensity High',
+						'LIL' => 'Light Intensity Low',
+						'LIM' => 'Light Intensity Medium',
+						'LLZ' => 'Localizer',
+						'LM' => 'Locator, Middle',
+						'LMT' => 'Local Mean Time',
+						'LNG' => 'Long',
+						'LO' => 'Locator, Outer',
+						'LOG' => 'Located',
+						'LONG' => 'Longitude',
+						'LRG' => 'Long Range',
+						'LTD' => 'Limited',
+						'LTP' => 'Landing Threshold Point',
+						'LVE' => 'Leaving',
+						'LVL' => 'Level',
+						'LYR' => 'Layer',
+						'MAA' => 'Maximum Authorized Altitude',
+						'MAG' => 'Magnetic',
+						'MAINT' => 'Maintenance',
+						'MAP' => 'Aeronautical Maps and Charts',
+						'MAPT' => 'Missed Approach Point',
+						'MAR' => 'March',
+						'MAX' => 'Maximum',
+						'MAY' => 'May',
+						'MBST' => 'Microburst',
+						'MCA' => 'Minimum Crossing Altitude',
+						'MCW' => 'Modulated Continuous Wave',
+						'MDA' => 'Minimum Descent Altitude',
+						'MDH' => 'Minimum Descent Height',
+						'MEA' => 'Minimum En-route Altitude',
+						'MEHT' => 'Minimum Eye Height Over Threshold',
+						'MET' => 'Meteorological',
+						'MID' => 'Mid-point',
+						'MIL' => 'Military',
+						'MIN' => 'Minutes',
+						'MKR' => 'Marker Radio Beacon',
+						'MLS' => 'Microwave Landing System',
+						'MM' => 'Middle Marker',
+						'MNM' => 'Minimum',
+						'MNPS' => 'Minimum Navigation Performance Specifications',
+						'MNT' => 'Monitor',
+						'MNTN' => 'Maintain',
+						'MOA' => 'Military Operating Area',
+						'MOC' => 'Minimum Obstacle Clearance',
+						'MOD' => 'Moderate',
+						'MON' => 'Monday',
+						'MOPS' => 'Minimum Operational Performance Standards',
+						'MOV' => 'Movement',
+						'MRA' => 'Minimum Reception Altitude',
+						'MRG' => 'Medium Range',
+						'MRP' => 'ATS/MET Reporting Point',
+						'MS' => 'Minus',
+						'MSA' => 'Minimum Sector Altitude',
+						'MSAW' => 'Minimum Safe Altitude Warning',
+						'MSG' => 'Message',
+						'MSSR' => 'Monopulse Secondary Surveillance Radar',
+						'MT' => 'Mountain',
+						'MTU' => 'Metric Units',
+						'MTW' => 'Mountain Waves',
+						'NASC' => 'National AIS System Centre',
+						'NAT' => 'North Atlantic',
+						'NAV' => 'Navigation',
+						'NB' => 'Northbound',
+						'NBFR' => 'Not Before',
+						'NE' => 'North-east',
+						'NEB' => 'North-eastbound',
+						'NEG' => 'Negative',
+						'NGT' => 'Night',
+						'NIL' => 'None',
+						'NML' => 'Normal',
+						'NNE' => 'North-north-east',
+						'NNW' => 'North-north-west',
+						'NOF' => 'International NOTAM Office',
+						'NOV' => 'November',
+						'NOZ' => 'Normal Operating Zone',
+						'NR' => 'Number',
+						'NRH' => 'No Reply Heard',
+						'NTL' => 'National',
+						'NTZ' => 'No Transgression Zone',
+						'NW' => 'North-west',
+						'NWB' => 'North-westbound',
+						'NXT' => 'Next',
+						'O/R' => 'On Request',
+						'OAC' => 'Oceanic Area Control Centre',
+						'OAS' => 'Obstacle Assessment Surface',
+						'OBS' => 'Observe',
+						'OBST' => 'Obstacle',
+						'OBSTS' => 'Obstacles',
+						'OCA' => 'Oceanic Control Area',
+						'OCH' => 'Obstacle Clearance Height',
+						'OCS' => 'Obstacle Clearance Surface',
+						'OCT' => 'October',
+						'OFZ' => 'Obstacle Free Zone',
+						'OGN' => 'Originate',
+						'OHD' => 'Overhead',
+						'OM' => 'Outer Marker',
+						'OPC' => 'Control Indicated Is Operational Control',
+						'OPMET' => 'Operational Meteorological',
+						'OPN' => 'Open',
+						'OPR' => 'Operate',
+						'OPS' => 'Operations',
+						'ORD' => 'Order',
+						'OSV' => 'Ocean Station Vessel',
+						'OTLK' => 'Outlook',
+						'OTP' => 'On Top',
+						'OTS' => 'Organized Track System',
+						'OUBD' => 'Outbound',
+						'PA' => 'Precision Approach',
+						'PALS' => 'Precision Approach Lighting System',
+						'PANS' => 'Procedures for Air Navigation Services',
+						'PAR' => 'Precision Approach Radar',
+						'PARL' => 'Parallel',
+						'PATC' => 'Precision Approach Terrain Chart',
+						'PAX' => 'Passenger(s)',
+						'PCD' => 'Proceed',
+						'PCL' => 'Pilot-controlled Lighting',
+						'PCN' => 'Pavement Classification Number',
+						'PDC' => 'Pre-departure Clearance',
+						'PDG' => 'Procedure Design Gradient',
+						'PER' => 'Performance',
+						'PERM' => 'Permanent',
+						'PIB' => 'Pre-flight Information Bulletin',
+						'PJE' => 'Parachute Jumping Exercise',
+						'PLA' => 'Practice Low Approach',
+						'PLN' => 'Flight Plan',
+						'PLVL' => 'Present Level',
+						'PN' => 'Prior Notice Required',
+						'PNR' => 'Point Of No Return',
+						'POB' => 'Persons On Board',
+						'POSS' => 'Possible',
+						'PPI' => 'Plan Position Indicator',
+						'PPR' => 'Prior Permission Required',
+						'PPSN' => 'Present Position',
+						'PRI' => 'Primary',
+						'PRKG' => 'Parking',
+						'PROB' => 'Probability',
+						'PROC' => 'Procedure',
+						'PROV' => 'Provisional',
+						'PS' => 'Plus',
+						'PSG' => 'Passing',
+						'PSN' => 'Position',
+						'PSNS' => 'Positions',
+						'PSR' => 'Primary Surveillance Radar',
+						'PSYS' => 'Pressure System(s)',
+						'PTN' => 'Procedure Turn',
+						'PTS' => 'Polar Track Structure',
+						'PWR' => 'Power',
+						'QUAD' => 'Quadrant',
+						'RAC' => 'Rules of The Air and Air Traffic Services',
+						'RAG' => 'Runway Arresting Gear',
+						'RAI' => 'Runway Alignment Indicator',
+						'RASC' => 'Regional AIS System Centre',
+						'RASS' => 'Remote Altimeter Setting Source',
+						'RB' => 'Rescue Boat',
+						'RCA' => 'Reach Cruising Altitude',
+						'RCC' => 'Rescue Coordination Centre',
+						'RCF' => 'Radiocommunication Failure',
+						'RCH' => 'Reaching',
+						'RCL' => 'Runway Centre Line',
+						'RCLL' => 'Runway Centre Line Light(s)',
+						'RCLR' => 'Recleared',
+						'RDH' => 'Reference Datum Height',
+						'RDL' => 'Radial',
+						'RDO' => 'Radio',
+						'RE' => 'Recent',
+						'REC' => 'Receiver',
+						'REDL' => 'Runway Edge Light(s)',
+						'REF' => 'Refer To',
+						'REG' => 'Registration',
+						'RENL' => 'Runway End Light(s)',
+						'REP' => 'Report',
+						'REQ' => 'Requested',
+						'RERTE' => 'Re-route',
+						'RESA' => 'Runway End Safety Area',
+						'RG' => 'Range (lights)',
+						'RHC' => 'Right-hand Circuit',
+						'RIF' => 'Reclearance In Flight',
+						'RITE' => 'Right',
+						'RL' => 'Report Leaving',
+						'RLA' => 'Relay To',
+						'RLCE' => 'Request Level Change En Route',
+						'RLLS' => 'Runway Lead-in Lighting System',
+						'RLNA' => 'Request Level Not Available',
+						'RMAC' => 'Radar Minimum Altitude Chart',
+						'RMK' => 'Remark',
+						'RNG' => 'Radio Range',
+						'RNP' => 'Required Navigation Performance',
+						'ROC' => 'Rate Of Climb',
+						'ROD' => 'Rate Of Descent',
+						'ROFOR' => 'Route Forecast',
+						'RON' => 'Receiving Only',
+						'RPI' => 'Radar Position Indicator',
+						'RPL' => 'Repetitive Flight Plan',
+						'RPLC' => 'Replaced',
+						'RPS' => 'Radar Position Symbol',
+						'RQMNTS' => 'Requirements',
+						'RQP' => 'Request Flight Plan',
+						'RQS' => 'Request Supplementary Flight Plan',
+						'RR' => 'Report Reaching',
+						'RSC' => 'Rescue Sub-centre',
+						'RSCD' => 'Runway Surface Condition',
+						'RSP' => 'Responder Beacon',
+						'RSR' => 'En-route Surveillance Radar',
+						'RTE' => 'Route',
+						'RTES' => 'Routes',
+						'RTF' => 'Radiotelephone',
+						'RTG' => 'Radiotelegraph',
+						'RTHL' => 'Runway Threshold Light(s)',
+						'RTN' => 'Return',
+						'RTODAH' => 'Rejected Take-off Distance Available, Helicopter',
+						'RTS' => 'Return To Service',
+						'RTT' => 'Radioteletypewriter',
+						'RTZL' => 'Runway Touchdown Zone Light(s)',
+						'RUT' => 'Standard Regional Route Transmitting Frequencies',
+						'RV' => 'Rescue Vessel',
+						'RVSM' => 'Reduced Vertical Separation Minimum',
+						'RWY' => 'Runway',
+						'RWYS' => 'Runways',
+						'SALS' => 'Simple Approach Lighting System',
+						'SAN' => 'Sanitary',
+						'SAP' => 'As Soon As Possible',
+						'SAR' => 'Search and Rescue',
+						'SARPS' => 'Standards and Recommended Practices',
+						'SAT' => 'Saturday',
+						'SATCOM' => 'Satellite Communication',
+						'SB' => 'Southbound',
+						'SBAS' => 'Satellite-based Augmentation System',
+						'SDBY' => 'Stand by',
+						'SE' => 'South-east',
+						'SEA' => 'Sea',
+						'SEB' => 'South-eastbound',
+						'SEC' => 'Seconds',
+						'SECN' => 'Section',
+						'SECT' => 'Sector',
+						'SEP' => 'September',
+						'SER' => 'Service',
+						'SEV' => 'Severe',
+						'SFC' => 'Surface',
+						'SGL' => 'Signal',
+						'SID' => 'Standard Instrument Departure',
+						'SIF' => 'Selective Identification Feature',
+						'SIG' => 'Significant',
+						'SIMUL' => 'Simultaneous',
+						'SKED' => 'Schedule',
+						'SLP' => 'Speed Limiting Point',
+						'SLW' => 'Slow',
+						'SMC' => 'Surface Movement Control',
+						'SMR' => 'Surface Movement Radar',
+						'SPL' => 'Supplementary Flight Plan',
+						'SPOC' => 'SAR Point Of Contact',
+						'SPOT' => 'Spot Wind',
+						'SR' => 'Sunrise',
+						'SRA' => 'Surveillance Radar Approach',
+						'SRE' => 'Surveillance Radar Element Of Precision Approach Radar System',
+						'SRG' => 'Short Range',
+						'SRR' => 'Search and Rescue Region',
+						'SRY' => 'Secondary',
+						'SS' => 'Sunset',
+						'SSE' => 'South-south-east',
+						'SSR' => 'Secondary Surveillance Radar',
+						'SST' => 'Supersonic Transport',
+						'SSW' => 'South-south-west',
+						'STA' => 'Straight-in Approach',
+						'STAR' => 'Standard Instrument Arrival',
+						'STD' => 'Standard',
+						'STN' => 'Station',
+						'STNR' => 'Stationary',
+						'STOL' => 'Short Take-off and Landing',
+						'STS' => 'Status',
+						'STWL' => 'Stopway Light(s)',
+						'SUBJ' => 'Subject To',
+						'SUN' => 'Sunday',
+						'SUP' => 'Supplement',
+						'SUPPS' => 'Regional Supplementary Procedures Service Message',
+						'SVCBL' => 'Serviceable',
+						'SW' => 'South-west',
+						'SWB' => 'South-westbound',
+						'SWY' => 'Stopway',
+						'TA' => 'Transition Altitude',
+						'TAA' => 'Terminal Arrival Altitude',
+						'TAF' => 'Aerodrome Forecast',
+						'TAIL' => 'Tail Wind',
+						'TAR' => 'Terminal Area Surveillance Radar',
+						'TAX' => 'Taxi',
+						'TCAC' => 'Tropical Cyclone Advisory Centre',
+						'TDO' => 'Tornado',
+						'TDZ' => 'Touchdown Zone',
+						'TECR' => 'Technical Reason',
+						'TEMPO' => 'Temporarily',
+						'TFC' => 'Traffic',
+						'TGL' => 'Touch-and-go',
+						'TGS' => 'Taxiing Guidance System',
+						'THR' => 'Threshold',
+						'THRU' => 'Through',
+						'THU' => 'Thursday',
+						'TIBA' => 'Traffic Information Broadcast By Aircraft',
+						'TIL' => 'Until',
+						'TIP' => 'Until Past',
+						'TKOF' => 'Take-off',
+						'TL' => 'Till',
+						'TLOF' => 'Touchdown And Lift-off Area',
+						'TMA' => 'Terminal Control Area',
+						'TNA' => 'Turn Altitude',
+						'TNH' => 'Turn Height',
+						'TOC' => 'Top of Climb',
+						'TODA' => 'Take-off Distance Available',
+						'TODAH' => 'Take-off Distance Available, Helicopter',
+						'TORA' => 'Take-off Run Available',
+						'TP' => 'Turning Point',
+						'TR' => 'Track',
+						'TRA' => 'Temporary Reserved Airspace',
+						'TRANS' => 'Transmitter',
+						'TRL' => 'Transition Level',
+						'TUE' => 'Tuesday',
+						'TURB' => 'Turbulence',
+						'TVOR' => 'Terminal VOR',
+						'TWR' => 'Tower',
+						'TWY' => 'Taxiway',
+						'TWYL' => 'Taxiway-link',
+						'TXT' => 'Text',
+						'TYP' => 'Type of Aircraft',
+						'U/S' => 'Unserviceable',
+						'UAB' => 'Until Advised By',
+						'UAC' => 'Upper Area Control Centre',
+						'UAR' => 'Upper Air Route',
+						'UFN' => 'Until Further Notice',
+						'UHDT' => 'Unable Higher Due Traffic',
+						'UIC' => 'Upper Information Centre',
+						'UIR' => 'Upper Flight Information Region',
+						'ULR' => 'Ultra Long Range',
+						'UNA' => 'Unable',
+						'UNAP' => 'Unable To Approve',
+						'UNL' => 'Unlimited',
+						'UNREL' => 'Unreliable',
+						'UTA' => 'Upper Control Area',
+						'VAAC' => 'Volcanic Ash Advisory Centre',
+						'VAC' => 'Visual Approach Chart',
+						'VAL' => 'In Valleys',
+						'VAN' => 'Runway Control Van',
+						'VAR' => 'Visual-aural Radio Range',
+						'VC' => 'Vicinity',
+						'VCY' => 'Vicinity',
+						'VER' => 'Vertical',
+						'VIS' => 'Visibility',
+						'VLR' => 'Very Long Range',
+						'VPA' => 'Vertical Path Angle',
+						'VRB' => 'Variable',
+						'VSA' => 'By Visual Reference To The Ground',
+						'VSP' => 'Vertical Speed',
+						'VTOL' => 'Vertical Take-off And Landing',
+						'WAC' => 'World Aeronautical Chart',
+						'WAFC' => 'World Area Forecast Centre',
+						'WB' => 'Westbound',
+						'WBAR' => 'Wing Bar Lights',
+						'WDI' => 'Wind Direction Indicator',
+						'WDSPR' => 'Widespread',
+						'WED' => 'Wednesday',
+						'WEF' => 'Effective From',
+						'WI' => 'Within',
+						'WID' => 'Width',
+						'WIE' => 'Effective Immediately',
+						'WILCO' => 'Will Comply',
+						'WIND' => 'Wind',
+						'WINTEM' => 'Forecast Upper Wind And Temperature For Aviation',
+						'WIP' => 'Work In Progress',
+						'WKN' => 'Weaken',
+						'WNW' => 'West-north-west',
+						'WO' => 'Without',
+						'WPT' => 'Way-point',
+						'WRNG' => 'Warning',
+						'WSW' => 'West-south-west',
+						'WT' => 'Weight',
+						'WWW' => 'Worldwide Web',
+						'WX' => 'Weather',
+						'XBAR' => 'Crossbar',
+						'XNG' => 'Crossing',
+						'XS' => 'Atmospherics',
+						'YCZ' => 'Yellow Caution Zone',
+						'YR' => 'Your');
 
 
 	function __construct($dbc = null) {

require/class.Translation.php

Indentation +78 added lines, -78 removed lines

@@ -7,90 +7,90 @@ 
 
 
 class Translation {
-    public $db;
-    function __construct($dbc = null) {
-	    $Connection = new Connection($dbc);
-	    $this->db = $Connection->db;
-    }
+	public $db;
+	function __construct($dbc = null) {
+		$Connection = new Connection($dbc);
+		$this->db = $Connection->db;
+	}
 
-    /**
-    * Change IATA to ICAO value for ident
-    * 
-    * @param String $ident ident
-    * @return String the icao
-    */
-    public function ident2icao($ident) {
+	/**
+	 * Change IATA to ICAO value for ident
+	 * 
+	 * @param String $ident ident
+	 * @return String the icao
+	 */
+	public function ident2icao($ident) {
 	$Spotter = new Spotter();
 	if (!is_numeric(substr($ident, 0, 3)))
-        {
-	    if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
-        	$airline_icao = substr($ident, 0, 2);
-            } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
-        	//$airline_icao = substr($ident, 0, 3);
-        	return $ident;
-            } else return $ident;
-        } else return $ident;
-        if ($airline_icao == 'AF') {
-            if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-            else $icao = 'AFR'.ltrim(substr($ident,2),'0');
-        } else {
-            $identicao = $Spotter->getAllAirlineInfo($airline_icao);
-            if (isset($identicao[0])) {
-                $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-            } else $icao = $ident;
-        }
-        return $icao;
-    }
+		{
+		if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
+			$airline_icao = substr($ident, 0, 2);
+			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
+			//$airline_icao = substr($ident, 0, 3);
+			return $ident;
+			} else return $ident;
+		} else return $ident;
+		if ($airline_icao == 'AF') {
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+		} else {
+			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
+			if (isset($identicao[0])) {
+				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+			} else $icao = $ident;
+		}
+		return $icao;
+	}
 
 
-       public function getOperator($ident) {
-                $query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1";
-                $query_values = array(':ident' => $ident);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if (count($row) > 0) {
-                        return $row['operator_correct'];
-                } else return $ident;
-        }
+	   public function getOperator($ident) {
+				$query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1";
+				$query_values = array(':ident' => $ident);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if (count($row) > 0) {
+						return $row['operator_correct'];
+				} else return $ident;
+		}
 
-       public function addOperator($ident,$correct_ident,$source) {
-                $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function addOperator($ident,$correct_ident,$source) {
+				$query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
+				$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function updateOperator($ident,$correct_ident,$source) {
-                $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function updateOperator($ident,$correct_ident,$source) {
+				$query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
+				$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function checkTranslation($ident,$web = false) {
-    	    global $globalTranslationSources, $globalTranslationFetch;
-    	    //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
-    	    $globalTranslationSources = array();
-    	    if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
-    	    //echo "Check Translation for ".$ident."...";
-    	    $correct = $this->getOperator($ident);
-    	    if ($correct != '' && $correct != $ident) {
-    		//echo "Found in DB !\n";
-    		 return $correct;
-    	    } /*
+		public function checkTranslation($ident,$web = false) {
+			global $globalTranslationSources, $globalTranslationFetch;
+			//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
+			$globalTranslationSources = array();
+			if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+			//echo "Check Translation for ".$ident."...";
+			$correct = $this->getOperator($ident);
+			if ($correct != '' && $correct != $ident) {
+			//echo "Found in DB !\n";
+			 return $correct;
+			} /*
     	    elseif ($web && $globalTranslationFetch) {
     		if (! is_numeric(substr($ident,-4))) {
     		    if (count($globalTranslationSources) > 0) {
@@ -107,8 +107,8 @@ 
     		}
     	    }
     	    */
-    	    return $this->ident2icao($ident);
-        }
+			return $this->ident2icao($ident);
+		}
 
 /*  
     function fromPlanefinder($icao) {

require/class.SpotterLive.php

Indentation +207 added lines, -207 removed lines

@@ -11,11 +11,11 @@ 
 	}
 	    
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -58,7 +58,7 @@ 
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query;
-                } else if ($globalDBdriver == 'pgsql') {
+				} else if ($globalDBdriver == 'pgsql') {
 			$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query;
 		}
 		$spotter_array = $Spotter->getDataFromDB($query.$limit_query);
@@ -67,11 +67,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -104,9 +104,9 @@ 
 //			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date ORDER BY spotter_live.date GROUP BY spotter_live.flightaware_id'.$filter_query;
 
 			//$query = 'SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk  FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao';
-                } else if ($globalDBdriver == 'pgsql') {
-            		//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '30 SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
-            		//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate$orderby_query";
+				} else if ($globalDBdriver == 'pgsql') {
+					//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '30 SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
+					//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate$orderby_query";
 			//$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, a.aircraft_shadow FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_live.aircraft_icao = a.icao';
 			$query  = "SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date 
 			FROM spotter_live
@@ -115,7 +115,7 @@ 
 //		$spotter_array = Spotter->getDataFromDB($query.$limit_query);
 		//echo $query;
 
-    		try {
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -127,11 +127,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -151,13 +151,13 @@ 
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
-            		//$query  = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query;
+					//$query  = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query;
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'.$filter_query;
-            	} elseif ($globalDBdriver == 'pgsql') {
-	                //$query  = "SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query;
+				} elseif ($globalDBdriver == 'pgsql') {
+					//$query  = "SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() AT TIME ZONE 'UTC' - '".$globalLiveInterval." SECONDS'->INTERVAL <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query;
 			$query = "SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_live WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date".$filter_query;
-                }
-    		try {
+				}
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -168,11 +168,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -193,140 +193,140 @@ 
 		}
 
 		if (is_array($coord)) {
-                        $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                        $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                        $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                        $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-                } else return array();
-                if ($globalDBdriver == 'mysql') {
-        		//$query  = "SELECT spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")";
-        		$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
-        	} else if ($globalDBdriver == 'pgsql') {
-            		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() at time zone 'UTC'  - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." GROUP BY spotter_live.flightaware_id".$filter_query;
-                }
-                $spotter_array = $Spotter->getDataFromDB($query);
-                return $spotter_array;
-        }
+						$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+						$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+						$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+						$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+				} else return array();
+				if ($globalDBdriver == 'mysql') {
+				//$query  = "SELECT spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")";
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
+			} else if ($globalDBdriver == 'pgsql') {
+					$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE NOW() at time zone 'UTC'  - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." GROUP BY spotter_live.flightaware_id".$filter_query;
+				}
+				$spotter_array = $Spotter->getDataFromDB($query);
+				return $spotter_array;
+		}
 
 	/**
-        * Gets all the spotter information based on a user's latitude and longitude
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
-        {
-    		$Spotter = new Spotter($this->db);
-                date_default_timezone_set('UTC');
-
-        if ($lat != '')
-                {
-                        if (!is_numeric($lat))
-                        {
-                                return false;
-                        }
-                }
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
+		{
+			$Spotter = new Spotter($this->db);
+				date_default_timezone_set('UTC');
+
+		if ($lat != '')
+				{
+						if (!is_numeric($lat))
+						{
+								return false;
+						}
+				}
         
-        if ($lng != '')
-                {
-                        if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+		if ($lng != '')
+				{
+						if (!is_numeric($lng))
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
         
-        if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
-        }
-
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+		if ($interval != '')
+				{
+						if (!is_string($interval))
+						{
+								$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
+		}
+
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius),$limit_query);
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius),$limit_query);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataByIdent($ident)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataById($id)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAltitudeLiveSpotterDataByIdent($ident)
 	{
 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -338,12 +338,12 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataById($id)
 	{
 		date_default_timezone_set('UTC');
@@ -351,7 +351,7 @@ 
 		$query  = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date';
 //		$spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -363,18 +363,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -387,24 +387,24 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
 
 		} elseif ($globalDBdriver == 'pgsql') {
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -416,18 +416,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -435,8 +435,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -444,20 +444,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['flightaware_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -468,9 +468,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -514,17 +514,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -536,17 +536,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -559,11 +559,11 @@ 
 
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -589,14 +589,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -622,14 +622,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by ModeS
-	*
-	* @return String the ModeS
-	*
-	*/
+	 * Check recent aircraft by ModeS
+	 *
+	 * @return String the ModeS
+	 *
+	 */
 	public function checkModeSRecent($modes)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -656,19 +656,19 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveSpotterData($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 = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -894,10 +894,10 @@ 
 			$arrival_airport_country = '';
 		}
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) == false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) == false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) == false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) == false ) $heading = 0;
+				if ($squawk == '' || $Common->isInteger($squawk) == false ) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) == false ) $verticalrate = NULL;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) == false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) == false ) $heading = 0;
             	
 		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, 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, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,: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,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
@@ -908,13 +908,13 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
-                	return "error : ".$e->getMessage();
-                }
+				} catch(PDOException $e) {
+					return "error : ".$e->getMessage();
+				}
 		if (isset($globalArchive) && $globalArchive && $putinarchive && !$noarchive) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+			if ($globalDebug) echo '(Add to SBS archive : ';
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+			if ($globalDebug) echo $result.')';
 		}
 		return "success";
 

require/class.Common.php

Indentation +46 added lines, -46 removed lines

@@ -6,13 +6,13 @@ 
 	protected $cookies = array();
 	
 	/**
-	* Get data from form result
-	* @param String $url form URL
-	* @param String $type type of submit form method (get or post)
-	* @param String or Array $data values form post method
-	* @param Array $headers header to submit with the form
-	* @return String the result
-	*/
+	 * Get data from form result
+	 * @param String $url form URL
+	 * @param String $type type of submit form method (get or post)
+	 * @param String or Array $data values form post method
+	 * @param Array $headers header to submit with the form
+	 * @return String the result
+	 */
 	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') {
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
@@ -67,7 +67,7 @@ 
 				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
 			}
 		} else {
-		    return $result;
+			return $result;
 		}
 	}
 	
@@ -79,10 +79,10 @@ 
 	}
 	
 	/**
-	* Convert a HTML table to an array
-	* @param String $data HTML page
-	* @return Array array of the tables in HTML page
-	*/
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
 	public function table2array($data) {
 		if (!is_string($data)) return array();
 		if ($data == '') return array();
@@ -115,10 +115,10 @@ 
 	}
 	
 	/**
-	* Convert <p> part of a HTML page to an array
-	* @param String $data HTML page
-	* @return Array array of the <p> in HTML page
-	*/
+	 * Convert <p> part of a HTML page to an array
+	 * @param String $data HTML page
+	 * @return Array array of the <p> in HTML page
+	 */
 	public function text2array($data) {
 		$html = str_get_html($data);
 		$tabledata=array();
@@ -132,14 +132,14 @@ 
 	}
 
 	/**
-	* Give distance between 2 coordonnates
-	* @param Float $lat latitude of first point
-	* @param Float $lon longitude of first point
-	* @param Float $latc latitude of second point
-	* @param Float $lonc longitude of second point
-	* @param String $unit km else no unit used
-	* @return Float Distance in $unit
-	*/
+	 * Give distance between 2 coordonnates
+	 * @param Float $lat latitude of first point
+	 * @param Float $lon longitude of first point
+	 * @param Float $latc latitude of second point
+	 * @param Float $lonc longitude of second point
+	 * @param String $unit km else no unit used
+	 * @return Float Distance in $unit
+	 */
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
@@ -157,11 +157,11 @@ 
 	}
 
 	/**
-	* Check is distance realistic
-	* @param int $timeDifference the time between the reception of both messages
-	* @param float $distance distance covered
-	* @return whether distance is realistic
-	*/
+	 * Check is distance realistic
+	 * @param int $timeDifference the time between the reception of both messages
+	 * @param float $distance distance covered
+	 * @return whether distance is realistic
+	 */
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
@@ -179,7 +179,7 @@ 
 	}
 
 	public function isInteger($input){
-	    return(ctype_digit(strval($input)));
+		return(ctype_digit(strval($input)));
 	}
 
 
@@ -195,11 +195,11 @@ 
 	}
 	
 	/**
-	* Copy folder contents
-	* @param       string   $source    Source path
-	* @param       string   $dest      Destination path
-	* @return      bool     Returns true on success, false on failure
-	*/
+	 * Copy folder contents
+	 * @param       string   $source    Source path
+	 * @param       string   $dest      Destination path
+	 * @return      bool     Returns true on success, false on failure
+	 */
 	public function xcopy($source, $dest, $permissions = 0755)
 	{
 		$files = glob($source.'*.*');
@@ -211,20 +211,20 @@ 
 	}
 	
 	/**
-	* Check if an url exist
-	* @param	String $url url to check
-	* @return	bool Return true on succes false on failure
-	*/
+	 * Check if an url exist
+	 * @param	String $url url to check
+	 * @return	bool Return true on succes false on failure
+	 */
 	public function urlexist($url){
 		$headers=get_headers($url);
 		return stripos($headers[0],"200 OK")?true:false;
 	}
 	
 	/**
-	* Convert hexa to string
-	* @param	String $hex data in hexa
-	* @return	String Return result
-	*/
+	 * Convert hexa to string
+	 * @param	String $hex data in hexa
+	 * @return	String Return result
+	 */
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
@@ -272,9 +272,9 @@ 
 	}
 	
 	/**
-	* Returns list of available locales
-	*
-	* @return array
+	 * Returns list of available locales
+	 *
+	 * @return array
 	 */
 	public function listLocaleDir()
 	{

require/class.ACARS.php

Indentation +72 added lines, -72 removed lines

@@ -16,11 +16,11 @@ 
 		$this->SI = new SpotterImport($this->db);
 	}
 	/**
-	* Change IATA to ICAO value for ident
-	*
-	* @param String $ident ident
-	* @return String the icao
-	*/
+	 * Change IATA to ICAO value for ident
+	 *
+	 * @param String $ident ident
+	 * @return String the icao
+	 */
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
@@ -36,11 +36,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the live table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the live table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveAcarsData()
 	{
 		global $globalDBdriver;
@@ -60,11 +60,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the archive table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the archive table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteArchiveAcarsData()
 	{
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
@@ -85,11 +85,11 @@ 
 
 
 	/**
-	* Parse ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Parse ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	function parse($data) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
@@ -660,11 +660,11 @@ 
 
 
 	/**
-	* Add ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Add ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	function add($data) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
@@ -719,15 +719,15 @@ 
 	}
 
 	/**
-	* Add Live ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Live ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -765,15 +765,15 @@ 
 	}
 
 	/**
-	* Add Archive ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Archive ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -807,11 +807,11 @@ 
 	}
 
 	/**
-	* Get Message title from label from DB
-	*
-	* @param String $ident
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Message title from label from DB
+	 *
+	 * @param String $ident
+	 * @return Array Return ACARS data in array
+	 */
 	public function getTitlefromLabel($label) {
 		$Connection = new Connection($this->db);
 		$this->db = $Connection->db;
@@ -830,10 +830,10 @@ 
 	}
 
 	/**
-	* List all Message title & label from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * List all Message title & label from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getAllTitleLabel() {
 		$query = "SELECT * FROM acars_label ORDER BY title";
 		$query_values = array();
@@ -850,11 +850,11 @@ 
 	}
 
 	/**
-	* Get Live ACARS data from DB
-	*
-	* @param String $ident
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Live ACARS data from DB
+	 *
+	 * @param String $ident
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLiveAcarsData($ident) {
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
 		$query_values = array(':ident' => $ident);
@@ -871,10 +871,10 @@ 
 	}
 
 	/**
-	* Get Latest ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Latest ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLatestAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -972,10 +972,10 @@ 
 	}
 
 	/**
-	* Get Archive ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Archive ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getArchiveAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -1077,13 +1077,13 @@ 
 	}
 
 	/**
-	* Add ModeS data to DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $icao
-	* @param String $ICAOTypeCode
-	*/
+	 * Add ModeS data to DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $icao
+	 * @param String $ICAOTypeCode
+	 */
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);

require/class.SBS.php

Indentation +71 added lines, -71 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 class SBS {
-    static $latlon = array();
+	static $latlon = array();
     
-    function parse($buffer) {
+	function parse($buffer) {
 	// Not yet finished, no CRC checks
 	//echo $buffer."\n";
 	$typehex = substr($buffer,0,1);
@@ -12,47 +12,47 @@ 
 	$bin = gmp_strval( gmp_init($hex,16), 2);
 	//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 	if (strlen($hex) == 28) {
-	    $df = intval(substr($bin,0,5),2);
-	    $ca = intval(substr($bin,5,3),2);
-	    // Only support DF17 for now
-	    //if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
-	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
+		$df = intval(substr($bin,0,5),2);
+		$ca = intval(substr($bin,5,3),2);
+		// Only support DF17 for now
+		//if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
+		if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
 		$icao = substr($hex,2,6);
 		$data['hex'] = $icao;
 		$tc = intval(substr($bin,32,5),2);
 		if ($tc >= 1 && $tc <= 4) {
-		    //callsign
-		    $csbin = substr($bin,40,56);
-		    $charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
-		    $cs = '';
-		    $cs .= $charset[intval(substr($csbin,0,6),2)];
-		    $cs .= $charset[intval(substr($csbin,6,6),2)];
-		    $cs .= $charset[intval(substr($csbin,12,6),2)];
-		    $cs .= $charset[intval(substr($csbin,18,6),2)];
-		    $cs .= $charset[intval(substr($csbin,24,6),2)];
-		    $cs .= $charset[intval(substr($csbin,30,6),2)];
-		    $cs .= $charset[intval(substr($csbin,36,6),2)];
-		    $cs .= $charset[intval(substr($csbin,42,6),2)];
-		    $cs = str_replace('_','',$cs);
-		    $cs = str_replace('#','',$cs);
-		    $callsign = $cs;
-		    $data['ident'] = $callsign;
+			//callsign
+			$csbin = substr($bin,40,56);
+			$charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
+			$cs = '';
+			$cs .= $charset[intval(substr($csbin,0,6),2)];
+			$cs .= $charset[intval(substr($csbin,6,6),2)];
+			$cs .= $charset[intval(substr($csbin,12,6),2)];
+			$cs .= $charset[intval(substr($csbin,18,6),2)];
+			$cs .= $charset[intval(substr($csbin,24,6),2)];
+			$cs .= $charset[intval(substr($csbin,30,6),2)];
+			$cs .= $charset[intval(substr($csbin,36,6),2)];
+			$cs .= $charset[intval(substr($csbin,42,6),2)];
+			$cs = str_replace('_','',$cs);
+			$cs = str_replace('#','',$cs);
+			$callsign = $cs;
+			$data['ident'] = $callsign;
 		} elseif ($tc >= 9 && $tc <= 18) {
-		    // Check Q-bit
-		    $q = substr($bin,47,1);
-		    if ($q) {
+			// Check Q-bit
+			$q = substr($bin,47,1);
+			if ($q) {
 			$n = intval(substr($bin,40,7).substr($bin,48,4),2);
 			$alt = $n*25-1000;
 			$data['altitude'] = $alt;
-		    }
-		    // Check odd/even flag
-		    $oe = substr($bin,53,1);
-		    //if ($oe) => odd else even
-		    //  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
-		    $cprlat = intval(substr($bin,54,17),2)/131072.0;
-		    $cprlon = intval(substr($bin,71,17),2)/131072.0;
-		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
-		    elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
+			}
+			// Check odd/even flag
+			$oe = substr($bin,53,1);
+			//if ($oe) => odd else even
+			//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
+			$cprlat = intval(substr($bin,54,17),2)/131072.0;
+			$cprlon = intval(substr($bin,71,17),2)/131072.0;
+			if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+			elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 			$cprlat_odd = $cprlat;
 			$cprlon_odd = $cprlon;
 			$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -65,56 +65,56 @@ 
 			if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
 			// check latitude zone
 			if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
-			    if ($this::$latlon[$icao]['created'] > time()) {
+				if ($this::$latlon[$icao]['created'] > time()) {
 				$ni = $this->cprN($lat_even,0);
 				$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
 				$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
 				$lat = $lat_even;
 				if ($lon > 180) $lon = $lon -360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
-				    //if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
-				    $data['latitude'] = $lat;
-				    $data['longitude'] = $lon;
+					//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
+					$data['latitude'] = $lat;
+					$data['longitude'] = $lon;
 				}
-			    } else {
+				} else {
 				$ni = $this->cprN($lat_odd,1);
 				$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
 				$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
 				$lat = $lat_odd;
 				if ($lon > 180) $lon = $lon -360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
-				    //if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
-				    $data['latitude'] = $lat;
-				    $data['longitude'] = $lon;
+					//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
+					$data['latitude'] = $lat;
+					$data['longitude'] = $lon;
+				}
 				}
-			    }
 			} else echo "Not cprNL";
 			unset($this::$latlon[$icao]);
-		    }
+			}
 		} elseif ($tc == 19) {
-		    // speed & heading
-		    $v_ew_dir = intval(substr($bin,45,1));
-		    $v_ew = intval(substr($bin,46,10),2);
-		    $v_ns_dir = intval(substr($bin,56,1));
-		    $v_ns = intval(substr($bin,57,10),2);
-		    if ($v_ew_dir) $v_ew = -1*$v_ew;
-		    if ($v_ns_dir) $v_ns = -1*$v_ns;
-		    $speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
-		    $heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-		    if ($heading <0) $heading = $heading+360;
-		    $data['speed'] = $speed;
-		    $data['heading'] = $heading;
+			// speed & heading
+			$v_ew_dir = intval(substr($bin,45,1));
+			$v_ew = intval(substr($bin,46,10),2);
+			$v_ns_dir = intval(substr($bin,56,1));
+			$v_ns = intval(substr($bin,57,10),2);
+			if ($v_ew_dir) $v_ew = -1*$v_ew;
+			if ($v_ns_dir) $v_ns = -1*$v_ns;
+			$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
+			$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
+			if ($heading <0) $heading = $heading+360;
+			$data['speed'] = $speed;
+			$data['heading'] = $heading;
+		}
 		}
-	    }
-	    if (isset($data)) {
+		if (isset($data)) {
 		//print_r($data);
 		return $data;
-	    }
-        }
-    }
+		}
+		}
+	}
 
 
-    function cprNL($lat) {
+	function cprNL($lat) {
 	//Lookup table to convert the latitude to index.
 	if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
 	if ($lat < 10.47047130) return 59;
@@ -176,16 +176,16 @@ 
 	if ($lat < 86.53536998) return 3;
 	if ($lat < 87.00000000) return 2;
 	return 1;
-    }
+	}
     
-    function cprN($lat,$isodd) {
+	function cprN($lat,$isodd) {
 	$nl = $this->cprNL($lat) - $isodd;
 	if ($nl > 1) return $nl;
 	else return 1;
-    }
+	}
 
 
-    function parityCheck($msg, $bin) {
+	function parityCheck($msg, $bin) {
 $modes_checksum_table = array(
 0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
 0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
@@ -207,13 +207,13 @@ 
 	$checksum = intval(substr($msg,22,6),16);
 
 	for ($j = 0; $j < strlen($bin); $j++) {
-	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+		if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
 	}
 	if ($crc == $checksum) return true;
 	else {
-	    //echo "**** CRC ERROR ****\n";
-	    return false;
+		//echo "**** CRC ERROR ****\n";
+		return false;
+	}
 	}
-    }
 }
 ?>

require/class.Stats.php

Indentation +685 added lines, -685 removed lines

@@ -8,199 +8,199 @@ 
 require_once(dirname(__FILE__).'/class.Common.php');
 class Stats {
 	public $db;
-        function __construct($dbc = null) {
+		function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-        }
+		}
               
 	public function addLastStatsUpdate($type,$stats_date) {
-                $query = "DELETE FROM config WHERE name = :type;
+				$query = "DELETE FROM config WHERE name = :type;
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array('type' => $type,':stats_date' => $stats_date);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 	public function getLastStatsUpdate($type = 'last_update_stats') {
-                $query = "SELECT value FROM config WHERE name = :type";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':type' => $type));
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT value FROM config WHERE name = :type";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':type' => $type));
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllAirlineNames($airline_type = '') {
-                $query = "SELECT * FROM stats_airline ORDER BY airline_name ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats_airline ORDER BY airline_name ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllAircraftTypes() {
-                $query = "SELECT * FROM stats_aircraft ORDER BY aircraft_name ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats_aircraft ORDER BY aircraft_name ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getAllAirportNames() {
-                $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
 
 	public function countAllAircraftTypes($limit = true) {
 		if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' ORDER BY aircraft_icao_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            	    $Spotter = new Spotter($this->db);
-            	    $all = $Spotter->countAllAircraftTypes($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAircraftTypes($limit);
+				}
+				return $all;
 	}
 	public function countAllAirlineCountries($limit = true) {
 		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao GROUP BY airline_country ORDER BY airline_country_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllAirlineCountries($limit);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAirlineCountries($limit);
                 
-                }
-                return $all;
+				}
+				return $all;
 	}
 	public function countAllAircraftManufacturers($limit = true) {
 		if ($limit) $query = "SELECT aircraft.manufacturer AS aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft,aircraft WHERE stats_aircraft.aircraft_icao=aircraft.icao GROUP BY aircraft.manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT aircraft.manufacturer AS aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft,aircraft WHERE stats_aircraft.aircraft_icao=aircraft.icao GROUP BY aircraft.manufacturer ORDER BY aircraft_manufacturer_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
 			$all = $Spotter->countAllAircraftManufacturers($limit);
-                }
-                return $all;
+				}
+				return $all;
 	}
 
 	public function countAllArrivalCountries($limit = true) {
 		if ($limit) $query = "SELECT airport_country AS arrival_airport_country, arrival as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' LIMIT 10 OFFSET 0";
 		else $query = "SELECT airport_country AS arrival_airport_country, arrival as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-	                $Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllArrivalCountries($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllArrivalCountries($limit);
+				}
+				return $all;
 	}
 	public function countAllDepartureCountries($limit = true) {
 		if ($limit) $query = "SELECT airport_country AS departure_airport_country, departure as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' LIMIT 10 OFFSET 0";
 		else $query = "SELECT airport_country AS departure_airport_country, departure as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-		        $Spotter = new Spotter($this->db);
-    	    	        $all = $Spotter->countAllDepartureCountries($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+				$Spotter = new Spotter($this->db);
+						$all = $Spotter->countAllDepartureCountries($limit);
+				}
+				return $all;
 	}
 
 	public function countAllAirlines($limit = true) {
 		if ($limit) $query = "SELECT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = airline_icao ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = airline_icao ORDER BY airline_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-	                $Spotter = new Spotter($this->db);
-    		        $all = $Spotter->countAllAirlines($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAirlines($limit);
+				}
+				return $all;
 	}
 	public function countAllAircraftRegistrations($limit = true) {
 		if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao ORDER BY aircraft_registration_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-	                $Spotter = new Spotter($this->db);
-    		        $all = $Spotter->countAllAircraftRegistrations($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllAircraftRegistrations($limit);
+				}
+				return $all;
 	}
 	public function countAllCallsigns($limit = true) {
 		if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao ORDER BY callsign_icao_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-	                $Spotter = new Spotter($this->db);
-    		        $all = $Spotter->countAllCallsigns($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllCallsigns($limit);
+				}
+				return $all;
 	}
 	public function countAllFlightOverCountries($limit = true) {
 		$Connection = new Connection();
@@ -214,7 +214,7 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                /*
+				/*
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
     		        $all = $Spotter->countAllFlightOverCountries($limit);
@@ -228,102 +228,102 @@ 
 	public function countAllPilots($limit = true) {
 		if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name FROM stats_pilot ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name FROM stats_pilot ORDER BY pilot_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllPilots($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllPilots($limit);
+				}
+				return $all;
 	}
 	public function countAllOwners($limit = true) {
 		if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
 		else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner ORDER BY owner_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllOwners($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllOwners($limit);
+				}
+				return $all;
 	}
 	public function countAllDepartureAirports($limit = true) {
 		if ($limit) $query = "SELECT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE stats_type = 'yearly' LIMIT 10 OFFSET 0";
 		else $query = "SELECT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE stats_type = 'yearly'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$pall = $Spotter->countAllDepartureAirports($limit);
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit);
-        		$all = array();
-        		foreach ($pall as $value) {
-        			$icao = $value['airport_departure_icao'];
-        			$all[$icao] = $value;
-        		}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$pall = $Spotter->countAllDepartureAirports($limit);
+				$dall = $Spotter->countAllDetectedDepartureAirports($limit);
+				$all = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$all[$icao] = $value;
+				}
         		
-        		foreach ($dall as $value) {
-        			$icao = $value['airport_departure_icao'];
-        			if (isset($all[$icao])) {                                                           
-        				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $all[$icao] = $value;
-        		}
-        		$count = array();
-        		foreach ($all as $key => $row) {
-        			$count[$key] = $row['airport_departure_icao_count'];
-        		}
-        		array_multisort($count,SORT_DESC,$all);
-                }
-                return $all;
+				foreach ($dall as $value) {
+					$icao = $value['airport_departure_icao'];
+					if (isset($all[$icao])) {                                                           
+						$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+					} else $all[$icao] = $value;
+				}
+				$count = array();
+				foreach ($all as $key => $row) {
+					$count[$key] = $row['airport_departure_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$all);
+				}
+				return $all;
 	}
 	public function countAllArrivalAirports($limit = true) {
 		if ($limit) $query = "SELECT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE stats_type = 'yearly' LIMIT 10 OFFSET 0";
 		else $query = "SELECT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE stats_type = 'yearly'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-        		$pall = $Spotter->countAllArrivalAirports($limit);
-        		$dall = $Spotter->countAllDetectedArrivalAirports($limit);
-        		$all = array();
-        		foreach ($pall as $value) {
-        			$icao = $value['airport_arrival_icao'];
-        			$all[$icao] = $value;
-        		}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+				$pall = $Spotter->countAllArrivalAirports($limit);
+				$dall = $Spotter->countAllDetectedArrivalAirports($limit);
+				$all = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$all[$icao] = $value;
+				}
         		
-        		foreach ($dall as $value) {
-        			$icao = $value['airport_arrival_icao'];
-        			if (isset($all[$icao])) {
-        				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-        			} else $all[$icao] = $value;
-        		}
-        		$count = array();
-        		foreach ($all as $key => $row) {
-        			$count[$key] = $row['airport_arrival_icao_count'];
-        		}
-        		array_multisort($count,SORT_DESC,$all);
-                }
-                return $all;
+				foreach ($dall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					if (isset($all[$icao])) {
+						$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+					} else $all[$icao] = $value;
+				}
+				$count = array();
+				foreach ($all as $key => $row) {
+					$count[$key] = $row['airport_arrival_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$all);
+				}
+				return $all;
 	}
 	public function countAllMonthsLastYear($limit = true) {
 		global $globalDBdriver;
@@ -335,35 +335,35 @@ 
 			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth'";
 		}
 		$query_data = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMonthsLastYear($limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMonthsLastYear($limit);
+				}
+				return $all;
 	}
 	
 	public function countAllDatesLastMonth() {
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month'";
 		$query_data = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesLastMonth();
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesLastMonth();
+				}
+				return $all;
 	}
 	public function countAllDatesLast7Days() {
 		global $globalDBdriver;
@@ -373,64 +373,64 @@ 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS'";
 		}
 		$query_data = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDatesLast7Days();
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDatesLast7Days();
+				}
+				return $all;
 	}
 	public function countAllDates() {
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date'";
 		$query_data = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_data);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllDates();
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_data);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllDates();
+				}
+				return $all;
 	}
 	public function countAllMonths() {
-	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMonths();
-                }
-                return $all;
+			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth'";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMonths();
+				}
+				return $all;
 	}
 	public function countAllMilitaryMonths() {
-	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth'";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllMilitaryMonths();
-                }
-                return $all;
+			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth'";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllMilitaryMonths();
+				}
+				return $all;
 	}
 	public function countAllHours($orderby = 'hour',$limit = true) {
 		global $globalTimezone;
@@ -438,18 +438,18 @@ 
 		else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour'";
 		if ($orderby == 'hour') $query .= " ORDER BY CAST(flight_date AS integer) ASC";
 		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (empty($all)) {
-            		$Spotter = new Spotter($this->db);
-            		$all = $Spotter->countAllHours($orderby,$limit);
-                }
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if (empty($all)) {
+					$Spotter = new Spotter($this->db);
+					$all = $Spotter->countAllHours($orderby,$limit);
+				}
+				return $all;
 	}
 	
 	public function countOverallFlights() {
@@ -512,157 +512,157 @@ 
 	public function getLast7DaysAirports($airport_icao = '') {
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao ORDER BY date";
 		$query_values = array(':airport_icao' => $airport_icao);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
 	}
 	public function getStats($type) {
-                $query = "SELECT * FROM stats WHERE stats_type = :type ORDER BY stats_date";
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				$query = "SELECT * FROM stats WHERE stats_type = :type ORDER BY stats_date";
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 	public function getSumStats($type,$year) {
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
-	                $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year";
-	        } else {
-            		$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year";
-                }
-                $query_values = array(':type' => $type, ':year' => $year);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year";
+			} else {
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year";
+				}
+				$query_values = array(':type' => $type, ':year' => $year);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsTotal($type) {
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH)";
 		} else {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS'";
-                }
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsAircraftTotal() {
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft";
-                } else {
+				} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsAirlineTotal() {
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline";
-                } else {
+				} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsOwnerTotal() {
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner";
 		} else {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner";
-                }
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 	public function getStatsPilotTotal() {
-    		global $globalArchiveMonths, $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot";
-            	} else {
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot";
-            	}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all[0]['total'];
-        }
+			global $globalArchiveMonths, $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot";
+				} else {
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot";
+				}
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all[0]['total'];
+		}
 
 	public function addStat($type,$cnt,$stats_date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = :cnt";
-                } else {
+				} else {
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date; INSERT INTO stats (stats_type,cnt,stats_date) SELECT :type,:cnt,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date);"; 
 		}
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function updateStat($type,$cnt,$stats_date) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 		} else {
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date; INSERT INTO stats (stats_type,cnt,stats_date) SELECT :type,:cnt,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date);"; 
-                }
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				}
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function getStatsSource($date,$stats_type = '') {
 		if ($stats_type == '') {
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -671,15 +671,15 @@ 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name";
 			$query_values = array(':date' => $date,':stats_type' => $stats_type);
 		}
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        echo "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						echo "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
 	public function addStatSource($data,$source_name,$stats_type,$date) {
 		global $globalDBdriver;
@@ -687,25 +687,25 @@ 
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
 		} else {
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
-                }
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				}
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatFlight($type,$date_name,$cnt) {
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt) VALUES (:type,:flight_date,:cnt)";
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt) VALUES (:type,:flight_date,:cnt)";
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -713,14 +713,14 @@ 
 		} else {
 			$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration; INSERT INTO stats_registration (aircraft_icao,registration,cnt) SELECT :aircraft_icao,:registration,:cnt WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -728,14 +728,14 @@ 
 		} else {
 			$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt) SELECT :callsign_icao,:airline_icao,:cnt WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao);"; 
 		}
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatCountry($iso2,$iso3,$name,$cnt) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -743,14 +743,14 @@ 
 		} else {
 			$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2; INSERT INTO stats_country (iso2,iso3,name,cnt) SELECT :iso2,:iso3,:name,:cnt WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2);"; 
 		}
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -758,14 +758,14 @@ 
 		} else {
 			$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt WHERE aircraft_icao = :aircraft_icao; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,cnt) SELECT :aircraft_icao,:aircraft_name,:cnt WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao);"; 
 		}
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '') {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -773,14 +773,14 @@ 
 		} else {
 			$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao; INSERT INTO stats_airline (airline_icao,airline_name,cnt) SELECT :airline_icao,:airline_name,:cnt WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao);"; 
 		}
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatOwner($owner_name,$cnt) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -788,14 +788,14 @@ 
 		} else {
 			$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name; INSERT INTO stats_owner (owner_name,cnt) SELECT :owner_name,:cnt WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name);"; 
 		}
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatPilot($pilot_id,$cnt) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -803,14 +803,14 @@ 
 		} else {
 			$query = "UPDATE stats_pilot SET cnt = cnt+:cnt WHERE pilot_id = :pilot_id; INSERT INTO stats_pilot (pilot_id,cnt) SELECT :pilot_id,:cnt WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id);"; 
 		}
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -818,14 +818,14 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly'; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airport_icao = :airport_icao AND stats_type = 'yearly');"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00');
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00');
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -833,14 +833,14 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'daily'; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airport_icao = :airport_icao AND stats_type = 'daily');"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -848,14 +848,14 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly'; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airport_icao = :airport_icao AND stats_type = 'yearly');"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00');
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00');
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival) {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
@@ -863,55 +863,55 @@ 
 		} else {
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily'; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airport_icao = :airport_icao AND stats_type = 'daily');"; 
 		}
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 	public function deleteStat($id) {
-                $query = "DELETE FROM stats WHERE stats_id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats WHERE stats_id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function deleteStatFlight($type) {
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 	public function deleteStatAirport($type) {
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
-                $query_values = array(':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
+				$query_values = array(':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addOldStats() {
-    		global $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver;
-    		$Common = new Common();
-    		$Connection = new Connection();
-    		date_default_timezone_set('UTC');
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
+		public function addOldStats() {
+			global $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver;
+			$Common = new Common();
+			$Connection = new Connection();
+			date_default_timezone_set('UTC');
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
 		//print_r($last_update);
 		$flightsbymonth = $this->getStats('flights_by_month');
-    		if (empty($last_update) && empty($flightsbymonth)) {
+			if (empty($last_update) && empty($flightsbymonth)) {
 			// Initial update
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonths();
@@ -1052,46 +1052,46 @@ 
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count']);
 				}
 				$pall = $Spotter->countAllDepartureAirports(false,$globalArchiveMonths);
-        			$dall = $Spotter->countAllDetectedDepartureAirports(false,$globalArchiveMonths);
-	        		$alldata = array();
-    				foreach ($pall as $value) {
-	        			$icao = $value['airport_departure_icao'];
-    					$alldata[$icao] = $value;
-	        		}
-	        		foreach ($dall as $value) {
-    					$icao = $value['airport_departure_icao'];
-        				if (isset($alldata[$icao])) {                                                           
-        					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-	        			} else $alldata[$icao] = $value;
-    				}
-        			$count = array();
-        			foreach ($alldata as $key => $row) {
-        				$count[$key] = $row['airport_departure_icao_count'];
-	        		}
-    				array_multisort($count,SORT_DESC,$alldata);
+					$dall = $Spotter->countAllDetectedDepartureAirports(false,$globalArchiveMonths);
+					$alldata = array();
+					foreach ($pall as $value) {
+						$icao = $value['airport_departure_icao'];
+						$alldata[$icao] = $value;
+					}
+					foreach ($dall as $value) {
+						$icao = $value['airport_departure_icao'];
+						if (isset($alldata[$icao])) {                                                           
+							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+						} else $alldata[$icao] = $value;
+					}
+					$count = array();
+					foreach ($alldata as $key => $row) {
+						$count[$key] = $row['airport_departure_icao_count'];
+					}
+					array_multisort($count,SORT_DESC,$alldata);
 
 				//print_r($alldate);
 				foreach ($alldata as $number) {
 					$this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
 				}
 				$pdata = $Spotter->countAllArrivalAirports(false,$globalArchiveMonths);
-        			$dall = $Spotter->countAllDetectedArrivalAirports(false,$globalArchiveMonths);
-	        		$alldata = array();
-    				foreach ($pdata as $value) {
-	        			$icao = $value['airport_arrival_icao'];
-    					$alldata[$icao] = $value;
-	        		}
-	        		foreach ($dall as $value) {
-    					$icao = $value['airport_arrival_icao'];
-        				if (isset($alldata[$icao])) {                                                           
-        					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-	        			} else $alldata[$icao] = $value;
-    				}
-        			$count = array();
-        			foreach ($alldata as $key => $row) {
-        				$count[$key] = $row['airport_arrival_icao_count'];
-	        		}
-    				array_multisort($count,SORT_DESC,$alldata);
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,$globalArchiveMonths);
+					$alldata = array();
+					foreach ($pdata as $value) {
+						$icao = $value['airport_arrival_icao'];
+						$alldata[$icao] = $value;
+					}
+					foreach ($dall as $value) {
+						$icao = $value['airport_arrival_icao'];
+						if (isset($alldata[$icao])) {                                                           
+							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+						} else $alldata[$icao] = $value;
+					}
+					$count = array();
+					foreach ($alldata as $key => $row) {
+						$count[$key] = $row['airport_arrival_icao_count'];
+					}
+					array_multisort($count,SORT_DESC,$alldata);
 				foreach ($alldata as $number) {
 					$this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
 				}
@@ -1159,46 +1159,46 @@ 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count']);
 			}
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
-	        	$alldata = array();
-    			foreach ($pall as $value) {
-	        		$icao = $value['airport_departure_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$icao = $value['airport_departure_icao'];
-        			if (isset($alldata[$icao])) {                                                           
-    					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $alldata[$icao] = $value;
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
+				$alldata = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_departure_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$icao = $value['airport_departure_icao'];
+					if (isset($alldata[$icao])) {                                                           
+						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
+					} else $alldata[$icao] = $value;
 			}
-    			$count = array();
-    			foreach ($alldata as $key => $row) {
-    				$count[$key] = $row['airport_departure_icao_count'];
-        		}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['airport_departure_icao_count'];
+				}
 			array_multisort($count,SORT_DESC,$alldata);
 
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
 			}
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
-	        	$alldata = array();
-    			foreach ($pall as $value) {
-	        		$icao = $value['airport_arrival_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$icao = $value['airport_arrival_icao'];
-        			if (isset($alldata[$icao])) {                                                           
-        				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-	        		} else $alldata[$icao] = $value;
-    			}
-        		$count = array();
-        		foreach ($alldata as $key => $row) {
-        			$count[$key] = $row['airport_arrival_icao_count'];
-	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
-                        foreach ($alldata as $number) {
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
+				$alldata = array();
+				foreach ($pall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$icao = $value['airport_arrival_icao'];
+					if (isset($alldata[$icao])) {                                                           
+						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
+					} else $alldata[$icao] = $value;
+				}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['airport_arrival_icao_count'];
+				}
+				array_multisort($count,SORT_DESC,$alldata);
+						foreach ($alldata as $number) {
 				$this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
 			}
 			if ($Connection->tableExists('countries')) {
@@ -1248,45 +1248,45 @@ 
 			echo '...Departure'."\n";
 			$this->deleteStatAirport('daily');
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
-	        	$alldata = array();
-    			foreach ($pall as $value) {
-	        		$icao = $value['departure_airport_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$icao = $value['departure_airport_icao'];
-        			if (isset($alldata[$icao])) {                                                           
-        				$alldata[$icao]['departure_airport_count'] = $alldata[$icao]['departure_airport_count'] + $value['departure_airport_count'];
-	        		} else $alldata[$icao] = $value;
-    			}
-        		$count = array();
-        		foreach ($alldata as $key => $row) {
-        			$count[$key] = $row['departure_airport_count'];
-	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
+				$alldata = array();
+				foreach ($pall as $value) {
+					$icao = $value['departure_airport_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$icao = $value['departure_airport_icao'];
+					if (isset($alldata[$icao])) {                                                           
+						$alldata[$icao]['departure_airport_count'] = $alldata[$icao]['departure_airport_count'] + $value['departure_airport_count'];
+					} else $alldata[$icao] = $value;
+				}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['departure_airport_count'];
+				}
+				array_multisort($count,SORT_DESC,$alldata);
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
 			}
 			echo '...Arrival'."\n";
 			$pall = $Spotter->getLast7DaysAirportsArrival();
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
-	        	$alldata = array();
-    			foreach ($pall as $value) {
-	        		$icao = $value['arrival_airport_icao'];
-    				$alldata[$icao] = $value;
-	        	}
-	        	foreach ($dall as $value) {
-    				$icao = $value['arrival_airport_icao'];
-        			if (isset($alldata[$icao])) {                                                           
-        				$alldata[$icao]['arrival_airport_icao_count'] = $alldata[$icao]['arrival_airport_count'] + $value['arrival_airport_count'];
-	        		} else $alldata[$icao] = $value;
-    			}
-        		$count = array();
-        		foreach ($alldata as $key => $row) {
-        			$count[$key] = $row['arrival_airport_count'];
-	        	}
-    			array_multisort($count,SORT_DESC,$alldata);
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
+				$alldata = array();
+				foreach ($pall as $value) {
+					$icao = $value['arrival_airport_icao'];
+					$alldata[$icao] = $value;
+				}
+				foreach ($dall as $value) {
+					$icao = $value['arrival_airport_icao'];
+					if (isset($alldata[$icao])) {                                                           
+						$alldata[$icao]['arrival_airport_icao_count'] = $alldata[$icao]['arrival_airport_count'] + $value['arrival_airport_count'];
+					} else $alldata[$icao] = $value;
+				}
+				$count = array();
+				foreach ($alldata as $key => $row) {
+					$count[$key] = $row['arrival_airport_count'];
+				}
+				array_multisort($count,SORT_DESC,$alldata);
 
 			foreach ($alldata as $number) {
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);

require/class.METAR.php

Indentation +257 added lines, -257 removed lines

@@ -7,107 +7,107 @@ 
 	public $db;
 	
 	protected $texts = Array(
-	    'MI' => 'Shallow',
-	    'PR' => 'Partial',
-	    'BC' => 'Low drifting',
-	    'BL' => 'Blowing',
-	    'SH' => 'Showers',
-	    'TS' => 'Thunderstorm',
-	    'FZ' => 'Freezing',
-	    'DZ' => 'Drizzle',
-	    'RA' => 'Rain',
-	    'SN' => 'Snow',
-	    'SG' => 'Snow Grains',
-	    'IC' => 'Ice crystals',
-	    'PL' => 'Ice pellets',
-	    'GR' => 'Hail',
-	    'GS' => 'Small hail',
-	    'UP' => 'Unknown',
-	    'BR' => 'Mist',
-	    'FG' => 'Fog',
-	    'FU' => 'Smoke',
-	    'VA' => 'Volcanic ash',
-	    'DU' => 'Widespread dust',
-	    'SA' => 'Sand',
-	    'HZ' => 'Haze',
-	    'PY' => 'Spray',
-	    'PO' => 'Well developed dust / sand whirls',
-	    'SQ' => 'Squalls',
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
-	    'SS' => 'Sandstorm',
-	    'DS' => 'Duststorm'
+		'MI' => 'Shallow',
+		'PR' => 'Partial',
+		'BC' => 'Low drifting',
+		'BL' => 'Blowing',
+		'SH' => 'Showers',
+		'TS' => 'Thunderstorm',
+		'FZ' => 'Freezing',
+		'DZ' => 'Drizzle',
+		'RA' => 'Rain',
+		'SN' => 'Snow',
+		'SG' => 'Snow Grains',
+		'IC' => 'Ice crystals',
+		'PL' => 'Ice pellets',
+		'GR' => 'Hail',
+		'GS' => 'Small hail',
+		'UP' => 'Unknown',
+		'BR' => 'Mist',
+		'FG' => 'Fog',
+		'FU' => 'Smoke',
+		'VA' => 'Volcanic ash',
+		'DU' => 'Widespread dust',
+		'SA' => 'Sand',
+		'HZ' => 'Haze',
+		'PY' => 'Spray',
+		'PO' => 'Well developed dust / sand whirls',
+		'SQ' => 'Squalls',
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
+		'SS' => 'Sandstorm',
+		'DS' => 'Duststorm'
 	);
 	
 	function __construct($dbc = null) {
-                $Connection = new Connection($dbc);
-                $this->db = $Connection->db;
-        }
+				$Connection = new Connection($dbc);
+				$this->db = $Connection->db;
+		}
 
-       public static function check_last_update() {
-    		global $globalDBdriver;
-    		if ($globalDBdriver == 'mysql') {
+	   public static function check_last_update() {
+			global $globalDBdriver;
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value > DATE_SUB(DATE(NOW()), INTERVAL 1 HOUR)";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value::timestamp > CURRENT_TIMESTAMP - INTERVAL '1 HOURS'";
 		}
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
+				if ($row['nb'] > 0) return false;
+				else return true;
+		}
 
-        public static function insert_last_update() {
-                $query = "DELETE FROM config WHERE name = 'last_update_metar';
+		public static function insert_last_update() {
+				$query = "DELETE FROM config WHERE name = 'last_update_metar';
                         INSERT INTO config (name,value) VALUES ('last_update_metar',NOW());";
-                try {
-                        $Connection = new Connection();
-                        $sth = $Connection->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				try {
+						$Connection = new Connection();
+						$sth = $Connection->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 
         
-        public function parse($data) {
-    		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
-    		$codes = implode('|', array_keys($this->texts));
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
-    		//$pieces = explode(' ',$data);
-    		$pieces = preg_split('/\s/',$data);
-    		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
-    		$result['location'] = $pieces[$pos];
-    		$pos++;
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-    		$result['time'] = substr($pieces[$pos],2,4);
-    		$c = count($pieces);
-    		for($pos++; $pos < $c; $pos++) {
-    			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
-    			// Wind Speed
-    			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-    				$result['wind']['direction'] = (float)$matches[1];
+		public function parse($data) {
+			//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
+			$codes = implode('|', array_keys($this->texts));
+			$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+			//$pieces = explode(' ',$data);
+			$pieces = preg_split('/\s/',$data);
+			$pos = 0;
+			if ($pieces[0] == 'METAR') $pos++;
+			elseif ($pieces[0] == 'SPECI') $pos++;
+			if (strlen($pieces[$pos]) != 4) $pos++;
+			$result['location'] = $pieces[$pos];
+			$pos++;
+			$result['dayofmonth'] = substr($pieces[$pos],0,2);
+			$result['time'] = substr($pieces[$pos],2,4);
+			$c = count($pieces);
+			for($pos++; $pos < $c; $pos++) {
+				$piece = $pieces[$pos];
+				if ($piece == 'RMK') break;
+				if ($piece == 'AUTO') $result['auto'] = true;
+				if ($piece == 'COR') $result['correction'] = true;
+				// Wind Speed
+				if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
+					$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+					if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+					elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+					elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
 				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
-    			}
+				}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
     				$result['wind_direction'] = (float)$matches[1];
@@ -124,35 +124,35 @@ 
     				}
     			}
     			*/
-    			// Temperature
-    			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-    				$temp = (float)$matches[1];
+				// Temperature
+				if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
+					$temp = (float)$matches[1];
 				if ($matches[1]{0} == 'M') {
 					$temp = ((float)substr($matches[1], 1)) * -1;
 				}
-    				$result['temperature'] = $temp;
-    				$dew = (float)$matches[2];
+					$result['temperature'] = $temp;
+					$dew = (float)$matches[2];
 				if ($matches[2]{0} == 'M') {
 					$dew = ((float)substr($matches[2], 1)) * -1;
 				}
 				$result['dew'] = $dew;
-    			}
-    			// QNH
-    			if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
-    			// #^(Q|A)(////|[0-9]{4})( )#
-    				if ($matches[1] == 'Q') {
-    					// hPa
-    					$result['QNH'] = $matches[2];
-    				} else {
-    					// inHg
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
 				}
-    				/*
+				// QNH
+				if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
+				// #^(Q|A)(////|[0-9]{4})( )#
+					if ($matches[1] == 'Q') {
+						// hPa
+						$result['QNH'] = $matches[2];
+					} else {
+						// inHg
+						$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+				}
+					/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
     				*/
-    			}
-                     /*
+				}
+					 /*
     			// Wind Direction
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
     				$result['wind_direction'] = $matches[1];
@@ -163,9 +163,9 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
-    			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
-    				if (isset($matches[3]) && strlen($matches[3]) > 0) {
+				// Visibility
+				if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
+					if (isset($matches[3]) && strlen($matches[3]) > 0) {
 					$result['visibility'] = (float)$matches[3] * 1609.34;
 				} else {
 					if ($matches[1] == '9999') {
@@ -178,26 +178,26 @@ 
 					$result['visibility'] = '> 10000';
 					$result['weather'] = "CAVOK";
 				}
-    			}
-    			// Cloud Coverage
-    			if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
-    				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
-    				$type = $matches[1];
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
-    				$cloud['type_code'] = $type;
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
-    				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
-    				$result['cloud'][] = $cloud;
-    			}
-    			// RVR
-    			 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
+				}
+				// Cloud Coverage
+				if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
+					//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
+					$type = $matches[1];
+					if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
+					elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
+					elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
+					elseif ($type == 'FEW') $cloud['type'] = 'Few';
+					elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
+					elseif ($type == 'BKN') $cloud['type'] = 'Broken';
+					elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
+					elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+					$cloud['type_code'] = $type;
+					$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+					$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
+					$result['cloud'][] = $cloud;
+				}
+				// RVR
+				 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
@@ -206,33 +206,33 @@ 
 				$result['RVR'] = $rvr;
 			}
     			
-    			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    			if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
-    				//print_r($matches);
-    				// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
-    				$result['RVR']['runway'] = $matches[1];
-        			$result['RVR']['deposits'] = $matches[2];
-        			$result['RVR']['extent'] = $matches[3];
-        			$result['RVR']['depth'] = $matches[4];
-        			$result['RVR']['friction'] = $matches[5];
-    			}
-    			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-    				//echo $piece;
-    				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+				if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
+					//print_r($matches);
+					// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
+					$result['RVR']['runway'] = $matches[1];
+					$result['RVR']['deposits'] = $matches[2];
+					$result['RVR']['extent'] = $matches[3];
+					$result['RVR']['depth'] = $matches[4];
+					$result['RVR']['friction'] = $matches[5];
+				}
+				if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
+					//echo $piece;
+					//print_r($matches);
+					if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+					else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
-					    'unit' => $matches[5] ? 'FT' : 'M'
+						'from' => (float)$matches[2],
+						'to'   => (float)$matches[4],
+						'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
 				$result['RVR'] = $matches[1];
 				$result['RVR_range'] = $range;
-    			}
-    			// Weather
-    			if (preg_match($regWeather, $piece, $matches)) {
+				}
+				// Weather
+				if (preg_match($regWeather, $piece, $matches)) {
 				$text = Array();
 				switch ($matches[1]) {
 					case '+':
@@ -255,35 +255,35 @@ 
 				}
 				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
 				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
-    			}
-    		}
-    		return $result;
+				}
+			}
+			return $result;
         
-        }
+		}
         
 	public function getMETAR($icao) {
-    		global $globalMETARcycle, $globalDBdriver;
-    		if (isset($globalMETARcycle) && $globalMETARcycle) {
-            		$query = "SELECT * FROM metar WHERE metar_location = :icao";
-                } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		elseif ($globalDBdriver == 'pgsql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
-                }
-                $query_values = array(':icao' => $icao);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if ((!isset($globalMETARcyle) || $globalMETARcycle === false) && count($all) == 0) {
-            		$all = $this->downloadMETAR($icao);
-                }
-                return $all;
-        }
+			global $globalMETARcycle, $globalDBdriver;
+			if (isset($globalMETARcycle) && $globalMETARcycle) {
+					$query = "SELECT * FROM metar WHERE metar_location = :icao";
+				} else {
+					if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+					elseif ($globalDBdriver == 'pgsql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+				}
+				$query_values = array(':icao' => $icao);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				if ((!isset($globalMETARcyle) || $globalMETARcycle === false) && count($all) == 0) {
+					$all = $this->downloadMETAR($icao);
+				}
+				return $all;
+		}
 
-       public function addMETAR($location,$metar,$date) {
+	   public function addMETAR($location,$metar,$date) {
 		global $globalDBdriver;
 		$date = date('Y-m-d H:i:s',strtotime($date));
 		if ($globalDBdriver == 'mysql') {
@@ -291,98 +291,98 @@ 
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-                $query_values = array(':location' => $location,':date' => $date,':metar' => $metar);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+				$query_values = array(':location' => $location,':date' => $date,':metar' => $metar);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteMETAR($id) {
-                $query = "DELETE FROM metar WHERE id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
-       public function deleteAllMETARLocation() {
-                $query = "DELETE FROM metar";
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteMETAR($id) {
+				$query = "DELETE FROM metar WHERE id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
+	   public function deleteAllMETARLocation() {
+				$query = "DELETE FROM metar";
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
         
-        public function addMETARCycle() {
-    		global $globalDebug, $globalIVAO;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		if (isset($globalIVAO) && $globalIVAO) {
-        		$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
-    		} else {
+		public function addMETARCycle() {
+			global $globalDebug, $globalIVAO;
+			if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			if (isset($globalIVAO) && $globalIVAO) {
+				$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
+			} else {
 			$cycle = $Common->getData('http://weather.noaa.gov/pub/data/observations/metar/cycles/'.date('H').'Z.TXT');
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				//echo "date : ".$line."\n";
-    				$date = $line;
-    			} elseif ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    echo $this->addMETAR($location,$line,$date);
-    			}
-    			//echo $line."\n";
-    		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					//echo "date : ".$line."\n";
+					$date = $line;
+				} elseif ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					echo $this->addMETAR($location,$line,$date);
+				}
+				//echo $line."\n";
+			}
+			if (isset($globalDebug) && $globalDebug) echo "Done\n";
         
-        }
-        public function downloadMETAR($icao) {
-    		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
-    		date_default_timezone_set("UTC");
-    		$Common = new Common();
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
-    		$cycle = $Common->getData($url);
-    		$date = '';
-    		foreach(explode("\n",$cycle) as $line) {
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
-    				echo "date : ".$line."\n";
-    				$date = $line;
-    			} elseif ($line != '') {
-    			    //$this->parse($line);
-    			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
-    			    $pos = 0;
-    			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
-	        	    $location = $pieces[$pos];
-	        	    if (strlen($location == 4)) {
-	        		$this->addMETAR($location,$line,$date);
-	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
-    			}
-    			//echo $line."\n";
-    		}
-    		return array();
+		}
+		public function downloadMETAR($icao) {
+			global $globalMETARurl;
+			if ($globalMETARurl == '') return array();
+			date_default_timezone_set("UTC");
+			$Common = new Common();
+			$url = str_replace('{icao}',$icao,$globalMETARurl);
+			$cycle = $Common->getData($url);
+			$date = '';
+			foreach(explode("\n",$cycle) as $line) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+					echo "date : ".$line."\n";
+					$date = $line;
+				} elseif ($line != '') {
+					//$this->parse($line);
+					//echo $line;
+					if ($date == '') $date = date('Y/m/d H:m');
+					$pos = 0;
+					$pieces = preg_split('/\s/',$line);
+					if ($pieces[0] == 'METAR') $pos++;
+					if (strlen($pieces[$pos]) != 4) $pos++;
+					$location = $pieces[$pos];
+					if (strlen($location == 4)) {
+					$this->addMETAR($location,$line,$date);
+					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
+					} else return array();
+				}
+				//echo $line."\n";
+			}
+			return array();
         
-        }
+		}
 }
 /*
 $METAR = new METAR();