Completed
Branch master (3f174d)
by Yannick
13:43
created
require/class.ACARS.php 1 patch
Indentation   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@  discard block
 block discarded – undo
16 16
 		$this->SI = new SpotterImport($this->db);
17 17
 	}
18 18
 	/**
19
-	* Change IATA to ICAO value for ident
20
-	*
21
-	* @param String $ident ident
22
-	* @return String the icao
23
-	*/
19
+	 * Change IATA to ICAO value for ident
20
+	 *
21
+	 * @param String $ident ident
22
+	 * @return String the icao
23
+	 */
24 24
 	public function ident2icao($ident) {
25 25
 		if (substr($ident,0,2) == 'AF') {
26 26
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
@@ -36,11 +36,11 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	/**
39
-	* Deletes all info in the live table
40
-	*
41
-	* @return String success or false
42
-	*
43
-	*/
39
+	 * Deletes all info in the live table
40
+	 *
41
+	 * @return String success or false
42
+	 *
43
+	 */
44 44
 	public function deleteLiveAcarsData()
45 45
 	{
46 46
 		global $globalDBdriver;
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
 	}
61 61
 
62 62
 	/**
63
-	* Deletes all info in the archive table
64
-	*
65
-	* @return String success or false
66
-	*
67
-	*/
63
+	 * Deletes all info in the archive table
64
+	 *
65
+	 * @return String success or false
66
+	 *
67
+	 */
68 68
 	public function deleteArchiveAcarsData()
69 69
 	{
70 70
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
 
86 86
 
87 87
 	/**
88
-	* Parse ACARS data
89
-	*
90
-	* @param String ACARS data in acarsdec data
91
-	*
92
-	*/
88
+	 * Parse ACARS data
89
+	 *
90
+	 * @param String ACARS data in acarsdec data
91
+	 *
92
+	 */
93 93
 	function parse($data) {
94 94
 		global $globalDebug, $globalACARSArchive;
95 95
 		$Image = new Image($this->db);
@@ -660,11 +660,11 @@  discard block
 block discarded – undo
660 660
 
661 661
 
662 662
 	/**
663
-	* Add ACARS data
664
-	*
665
-	* @param String ACARS data in acarsdec data
666
-	*
667
-	*/
663
+	 * Add ACARS data
664
+	 *
665
+	 * @param String ACARS data in acarsdec data
666
+	 *
667
+	 */
668 668
 	function add($data) {
669 669
 		global $globalDebug, $globalACARSArchive;
670 670
 		$Image = new Image($this->db);
@@ -719,15 +719,15 @@  discard block
 block discarded – undo
719 719
 	}
720 720
 
721 721
 	/**
722
-	* Add Live ACARS data in DB
723
-	*
724
-	* @param String $ident ident
725
-	* @param String $registration Registration of the aircraft
726
-	* @param String $label Label of the ACARS message
727
-	* @param String $block_id Block id of the ACARS message
728
-	* @param String $msg_no Number of the ACARS message
729
-	* @param String $message ACARS message
730
-	*/
722
+	 * Add Live ACARS data in DB
723
+	 *
724
+	 * @param String $ident ident
725
+	 * @param String $registration Registration of the aircraft
726
+	 * @param String $label Label of the ACARS message
727
+	 * @param String $block_id Block id of the ACARS message
728
+	 * @param String $msg_no Number of the ACARS message
729
+	 * @param String $message ACARS message
730
+	 */
731 731
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
732 732
 		global $globalDebug;
733 733
 		date_default_timezone_set('UTC');
@@ -765,15 +765,15 @@  discard block
 block discarded – undo
765 765
 	}
766 766
 
767 767
 	/**
768
-	* Add Archive ACARS data in DB
769
-	*
770
-	* @param String $ident ident
771
-	* @param String $registration Registration of the aircraft
772
-	* @param String $label Label of the ACARS message
773
-	* @param String $block_id Block id of the ACARS message
774
-	* @param String $msg_no Number of the ACARS message
775
-	* @param String $message ACARS message
776
-	*/
768
+	 * Add Archive ACARS data in DB
769
+	 *
770
+	 * @param String $ident ident
771
+	 * @param String $registration Registration of the aircraft
772
+	 * @param String $label Label of the ACARS message
773
+	 * @param String $block_id Block id of the ACARS message
774
+	 * @param String $msg_no Number of the ACARS message
775
+	 * @param String $message ACARS message
776
+	 */
777 777
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
778 778
 		global $globalDebug;
779 779
 		date_default_timezone_set('UTC');
@@ -807,11 +807,11 @@  discard block
 block discarded – undo
807 807
 	}
808 808
 
809 809
 	/**
810
-	* Get Message title from label from DB
811
-	*
812
-	* @param String $ident
813
-	* @return Array Return ACARS data in array
814
-	*/
810
+	 * Get Message title from label from DB
811
+	 *
812
+	 * @param String $ident
813
+	 * @return Array Return ACARS data in array
814
+	 */
815 815
 	public function getTitlefromLabel($label) {
816 816
 		$Connection = new Connection($this->db);
817 817
 		$this->db = $Connection->db;
@@ -830,10 +830,10 @@  discard block
 block discarded – undo
830 830
 	}
831 831
 
832 832
 	/**
833
-	* List all Message title & label from DB
834
-	*
835
-	* @return Array Return ACARS data in array
836
-	*/
833
+	 * List all Message title & label from DB
834
+	 *
835
+	 * @return Array Return ACARS data in array
836
+	 */
837 837
 	public function getAllTitleLabel() {
838 838
 		$query = "SELECT * FROM acars_label ORDER BY title";
839 839
 		$query_values = array();
@@ -850,11 +850,11 @@  discard block
 block discarded – undo
850 850
 	}
851 851
 
852 852
 	/**
853
-	* Get Live ACARS data from DB
854
-	*
855
-	* @param String $ident
856
-	* @return Array Return ACARS data in array
857
-	*/
853
+	 * Get Live ACARS data from DB
854
+	 *
855
+	 * @param String $ident
856
+	 * @return Array Return ACARS data in array
857
+	 */
858 858
 	public function getLiveAcarsData($ident) {
859 859
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
860 860
 		$query_values = array(':ident' => $ident);
@@ -871,10 +871,10 @@  discard block
 block discarded – undo
871 871
 	}
872 872
 
873 873
 	/**
874
-	* Get Latest ACARS data from DB
875
-	*
876
-	* @return Array Return ACARS data in array
877
-	*/
874
+	 * Get Latest ACARS data from DB
875
+	 *
876
+	 * @return Array Return ACARS data in array
877
+	 */
878 878
 	public function getLatestAcarsData($limit = '',$label = '') {
879 879
 		global $globalURL, $globalDBdriver;
880 880
 		$Image = new Image($this->db);
@@ -972,10 +972,10 @@  discard block
 block discarded – undo
972 972
 	}
973 973
 
974 974
 	/**
975
-	* Get Archive ACARS data from DB
976
-	*
977
-	* @return Array Return ACARS data in array
978
-	*/
975
+	 * Get Archive ACARS data from DB
976
+	 *
977
+	 * @return Array Return ACARS data in array
978
+	 */
979 979
 	public function getArchiveAcarsData($limit = '',$label = '') {
980 980
 		global $globalURL, $globalDBdriver;
981 981
 		$Image = new Image($this->db);
@@ -1077,13 +1077,13 @@  discard block
 block discarded – undo
1077 1077
 	}
1078 1078
 
1079 1079
 	/**
1080
-	* Add ModeS data to DB
1081
-	*
1082
-	* @param String $ident ident
1083
-	* @param String $registration Registration of the aircraft
1084
-	* @param String $icao
1085
-	* @param String $ICAOTypeCode
1086
-	*/
1080
+	 * Add ModeS data to DB
1081
+	 *
1082
+	 * @param String $ident ident
1083
+	 * @param String $registration Registration of the aircraft
1084
+	 * @param String $icao
1085
+	 * @param String $ICAOTypeCode
1086
+	 */
1087 1087
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1088 1088
 		global $globalDebug, $globalDBdriver;
1089 1089
 		$ident = trim($ident);
Please login to merge, or discard this patch.
require/class.SBS.php 1 patch
Indentation   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 class SBS {
3
-    static $latlon = array();
3
+	static $latlon = array();
4 4
     
5
-    function parse($buffer) {
5
+	function parse($buffer) {
6 6
 	// Not yet finished, no CRC checks
7 7
 	//echo $buffer."\n";
8 8
 	$typehex = substr($buffer,0,1);
@@ -12,47 +12,47 @@  discard block
 block discarded – undo
12 12
 	$bin = gmp_strval( gmp_init($hex,16), 2);
13 13
 	//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
14 14
 	if (strlen($hex) == 28) {
15
-	    $df = intval(substr($bin,0,5),2);
16
-	    $ca = intval(substr($bin,5,3),2);
17
-	    // Only support DF17 for now
18
-	    //if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
19
-	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
15
+		$df = intval(substr($bin,0,5),2);
16
+		$ca = intval(substr($bin,5,3),2);
17
+		// Only support DF17 for now
18
+		//if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
19
+		if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
20 20
 		$icao = substr($hex,2,6);
21 21
 		$data['hex'] = $icao;
22 22
 		$tc = intval(substr($bin,32,5),2);
23 23
 		if ($tc >= 1 && $tc <= 4) {
24
-		    //callsign
25
-		    $csbin = substr($bin,40,56);
26
-		    $charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
27
-		    $cs = '';
28
-		    $cs .= $charset[intval(substr($csbin,0,6),2)];
29
-		    $cs .= $charset[intval(substr($csbin,6,6),2)];
30
-		    $cs .= $charset[intval(substr($csbin,12,6),2)];
31
-		    $cs .= $charset[intval(substr($csbin,18,6),2)];
32
-		    $cs .= $charset[intval(substr($csbin,24,6),2)];
33
-		    $cs .= $charset[intval(substr($csbin,30,6),2)];
34
-		    $cs .= $charset[intval(substr($csbin,36,6),2)];
35
-		    $cs .= $charset[intval(substr($csbin,42,6),2)];
36
-		    $cs = str_replace('_','',$cs);
37
-		    $cs = str_replace('#','',$cs);
38
-		    $callsign = $cs;
39
-		    $data['ident'] = $callsign;
24
+			//callsign
25
+			$csbin = substr($bin,40,56);
26
+			$charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
27
+			$cs = '';
28
+			$cs .= $charset[intval(substr($csbin,0,6),2)];
29
+			$cs .= $charset[intval(substr($csbin,6,6),2)];
30
+			$cs .= $charset[intval(substr($csbin,12,6),2)];
31
+			$cs .= $charset[intval(substr($csbin,18,6),2)];
32
+			$cs .= $charset[intval(substr($csbin,24,6),2)];
33
+			$cs .= $charset[intval(substr($csbin,30,6),2)];
34
+			$cs .= $charset[intval(substr($csbin,36,6),2)];
35
+			$cs .= $charset[intval(substr($csbin,42,6),2)];
36
+			$cs = str_replace('_','',$cs);
37
+			$cs = str_replace('#','',$cs);
38
+			$callsign = $cs;
39
+			$data['ident'] = $callsign;
40 40
 		} elseif ($tc >= 9 && $tc <= 18) {
41
-		    // Check Q-bit
42
-		    $q = substr($bin,47,1);
43
-		    if ($q) {
41
+			// Check Q-bit
42
+			$q = substr($bin,47,1);
43
+			if ($q) {
44 44
 			$n = intval(substr($bin,40,7).substr($bin,48,4),2);
45 45
 			$alt = $n*25-1000;
46 46
 			$data['altitude'] = $alt;
47
-		    }
48
-		    // Check odd/even flag
49
-		    $oe = substr($bin,53,1);
50
-		    //if ($oe) => odd else even
51
-		    //  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
52
-		    $cprlat = intval(substr($bin,54,17),2)/131072.0;
53
-		    $cprlon = intval(substr($bin,71,17),2)/131072.0;
54
-		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
55
-		    elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
47
+			}
48
+			// Check odd/even flag
49
+			$oe = substr($bin,53,1);
50
+			//if ($oe) => odd else even
51
+			//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
52
+			$cprlat = intval(substr($bin,54,17),2)/131072.0;
53
+			$cprlon = intval(substr($bin,71,17),2)/131072.0;
54
+			if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
55
+			elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
56 56
 			$cprlat_odd = $cprlat;
57 57
 			$cprlon_odd = $cprlon;
58 58
 			$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -65,56 +65,56 @@  discard block
 block discarded – undo
65 65
 			if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
66 66
 			// check latitude zone
67 67
 			if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
68
-			    if ($this::$latlon[$icao]['created'] > time()) {
68
+				if ($this::$latlon[$icao]['created'] > time()) {
69 69
 				$ni = $this->cprN($lat_even,0);
70 70
 				$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
71 71
 				$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
72 72
 				$lat = $lat_even;
73 73
 				if ($lon > 180) $lon = $lon -360;
74 74
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
75
-				    //if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
76
-				    $data['latitude'] = $lat;
77
-				    $data['longitude'] = $lon;
75
+					//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
76
+					$data['latitude'] = $lat;
77
+					$data['longitude'] = $lon;
78 78
 				}
79
-			    } else {
79
+				} else {
80 80
 				$ni = $this->cprN($lat_odd,1);
81 81
 				$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
82 82
 				$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
83 83
 				$lat = $lat_odd;
84 84
 				if ($lon > 180) $lon = $lon -360;
85 85
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
86
-				    //if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
87
-				    $data['latitude'] = $lat;
88
-				    $data['longitude'] = $lon;
86
+					//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
87
+					$data['latitude'] = $lat;
88
+					$data['longitude'] = $lon;
89
+				}
89 90
 				}
90
-			    }
91 91
 			} else echo "Not cprNL";
92 92
 			unset($this::$latlon[$icao]);
93
-		    }
93
+			}
94 94
 		} elseif ($tc == 19) {
95
-		    // speed & heading
96
-		    $v_ew_dir = intval(substr($bin,45,1));
97
-		    $v_ew = intval(substr($bin,46,10),2);
98
-		    $v_ns_dir = intval(substr($bin,56,1));
99
-		    $v_ns = intval(substr($bin,57,10),2);
100
-		    if ($v_ew_dir) $v_ew = -1*$v_ew;
101
-		    if ($v_ns_dir) $v_ns = -1*$v_ns;
102
-		    $speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
103
-		    $heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
104
-		    if ($heading <0) $heading = $heading+360;
105
-		    $data['speed'] = $speed;
106
-		    $data['heading'] = $heading;
95
+			// speed & heading
96
+			$v_ew_dir = intval(substr($bin,45,1));
97
+			$v_ew = intval(substr($bin,46,10),2);
98
+			$v_ns_dir = intval(substr($bin,56,1));
99
+			$v_ns = intval(substr($bin,57,10),2);
100
+			if ($v_ew_dir) $v_ew = -1*$v_ew;
101
+			if ($v_ns_dir) $v_ns = -1*$v_ns;
102
+			$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
103
+			$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
104
+			if ($heading <0) $heading = $heading+360;
105
+			$data['speed'] = $speed;
106
+			$data['heading'] = $heading;
107
+		}
107 108
 		}
108
-	    }
109
-	    if (isset($data)) {
109
+		if (isset($data)) {
110 110
 		//print_r($data);
111 111
 		return $data;
112
-	    }
113
-        }
114
-    }
112
+		}
113
+		}
114
+	}
115 115
 
116 116
 
117
-    function cprNL($lat) {
117
+	function cprNL($lat) {
118 118
 	//Lookup table to convert the latitude to index.
119 119
 	if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
120 120
 	if ($lat < 10.47047130) return 59;
@@ -176,16 +176,16 @@  discard block
 block discarded – undo
176 176
 	if ($lat < 86.53536998) return 3;
177 177
 	if ($lat < 87.00000000) return 2;
178 178
 	return 1;
179
-    }
179
+	}
180 180
     
181
-    function cprN($lat,$isodd) {
181
+	function cprN($lat,$isodd) {
182 182
 	$nl = $this->cprNL($lat) - $isodd;
183 183
 	if ($nl > 1) return $nl;
184 184
 	else return 1;
185
-    }
185
+	}
186 186
 
187 187
 
188
-    function parityCheck($msg, $bin) {
188
+	function parityCheck($msg, $bin) {
189 189
 $modes_checksum_table = array(
190 190
 0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
191 191
 0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
@@ -207,13 +207,13 @@  discard block
 block discarded – undo
207 207
 	$checksum = intval(substr($msg,22,6),16);
208 208
 
209 209
 	for ($j = 0; $j < strlen($bin); $j++) {
210
-	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
210
+		if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
211 211
 	}
212 212
 	if ($crc == $checksum) return true;
213 213
 	else {
214
-	    //echo "**** CRC ERROR ****\n";
215
-	    return false;
214
+		//echo "**** CRC ERROR ****\n";
215
+		return false;
216
+	}
216 217
 	}
217
-    }
218 218
 }
219 219
 ?>
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Indentation   +685 added lines, -685 removed lines patch added patch discarded remove patch
@@ -8,199 +8,199 @@  discard block
 block discarded – undo
8 8
 require_once(dirname(__FILE__).'/class.Common.php');
9 9
 class Stats {
10 10
 	public $db;
11
-        function __construct($dbc = null) {
11
+		function __construct($dbc = null) {
12 12
 		$Connection = new Connection($dbc);
13 13
 		$this->db = $Connection->db;
14
-        }
14
+		}
15 15
               
16 16
 	public function addLastStatsUpdate($type,$stats_date) {
17
-                $query = "DELETE FROM config WHERE name = :type;
17
+				$query = "DELETE FROM config WHERE name = :type;
18 18
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
19
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
20
-                 try {
21
-                        $sth = $this->db->prepare($query);
22
-                        $sth->execute($query_values);
23
-                } catch(PDOException $e) {
24
-                        return "error : ".$e->getMessage();
25
-                }
26
-        }
19
+				$query_values = array('type' => $type,':stats_date' => $stats_date);
20
+				 try {
21
+						$sth = $this->db->prepare($query);
22
+						$sth->execute($query_values);
23
+				} catch(PDOException $e) {
24
+						return "error : ".$e->getMessage();
25
+				}
26
+		}
27 27
 
28 28
 	public function getLastStatsUpdate($type = 'last_update_stats') {
29
-                $query = "SELECT value FROM config WHERE name = :type";
30
-                 try {
31
-                        $sth = $this->db->prepare($query);
32
-                        $sth->execute(array(':type' => $type));
33
-                } catch(PDOException $e) {
34
-                        echo "error : ".$e->getMessage();
35
-                }
36
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
37
-                return $all;
38
-        }
29
+				$query = "SELECT value FROM config WHERE name = :type";
30
+				 try {
31
+						$sth = $this->db->prepare($query);
32
+						$sth->execute(array(':type' => $type));
33
+				} catch(PDOException $e) {
34
+						echo "error : ".$e->getMessage();
35
+				}
36
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
37
+				return $all;
38
+		}
39 39
 	public function getAllAirlineNames($airline_type = '') {
40
-                $query = "SELECT * FROM stats_airline ORDER BY airline_name ASC";
41
-                 try {
42
-                        $sth = $this->db->prepare($query);
43
-                        $sth->execute();
44
-                } catch(PDOException $e) {
45
-                        echo "error : ".$e->getMessage();
46
-                }
47
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
48
-                return $all;
49
-        }
40
+				$query = "SELECT * FROM stats_airline ORDER BY airline_name ASC";
41
+				 try {
42
+						$sth = $this->db->prepare($query);
43
+						$sth->execute();
44
+				} catch(PDOException $e) {
45
+						echo "error : ".$e->getMessage();
46
+				}
47
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
48
+				return $all;
49
+		}
50 50
 	public function getAllAircraftTypes() {
51
-                $query = "SELECT * FROM stats_aircraft ORDER BY aircraft_name ASC";
52
-                 try {
53
-                        $sth = $this->db->prepare($query);
54
-                        $sth->execute();
55
-                } catch(PDOException $e) {
56
-                        echo "error : ".$e->getMessage();
57
-                }
58
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
59
-                return $all;
60
-        }
51
+				$query = "SELECT * FROM stats_aircraft ORDER BY aircraft_name ASC";
52
+				 try {
53
+						$sth = $this->db->prepare($query);
54
+						$sth->execute();
55
+				} catch(PDOException $e) {
56
+						echo "error : ".$e->getMessage();
57
+				}
58
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
59
+				return $all;
60
+		}
61 61
 	public function getAllAirportNames() {
62
-                $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";
63
-                 try {
64
-                        $sth = $this->db->prepare($query);
65
-                        $sth->execute();
66
-                } catch(PDOException $e) {
67
-                        echo "error : ".$e->getMessage();
68
-                }
69
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
70
-                return $all;
71
-        }
62
+				$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";
63
+				 try {
64
+						$sth = $this->db->prepare($query);
65
+						$sth->execute();
66
+				} catch(PDOException $e) {
67
+						echo "error : ".$e->getMessage();
68
+				}
69
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
70
+				return $all;
71
+		}
72 72
 
73 73
 
74 74
 	public function countAllAircraftTypes($limit = true) {
75 75
 		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";
76 76
 		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";
77
-                 try {
78
-                        $sth = $this->db->prepare($query);
79
-                        $sth->execute();
80
-                } catch(PDOException $e) {
81
-                        echo "error : ".$e->getMessage();
82
-                }
83
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
84
-                if (empty($all)) {
85
-            	    $Spotter = new Spotter($this->db);
86
-            	    $all = $Spotter->countAllAircraftTypes($limit);
87
-                }
88
-                return $all;
77
+				 try {
78
+						$sth = $this->db->prepare($query);
79
+						$sth->execute();
80
+				} catch(PDOException $e) {
81
+						echo "error : ".$e->getMessage();
82
+				}
83
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
84
+				if (empty($all)) {
85
+					$Spotter = new Spotter($this->db);
86
+					$all = $Spotter->countAllAircraftTypes($limit);
87
+				}
88
+				return $all;
89 89
 	}
90 90
 	public function countAllAirlineCountries($limit = true) {
91 91
 		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";
92 92
 		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";
93
-                 try {
94
-                        $sth = $this->db->prepare($query);
95
-                        $sth->execute();
96
-                } catch(PDOException $e) {
97
-                        echo "error : ".$e->getMessage();
98
-                }
99
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
100
-                if (empty($all)) {
101
-            		$Spotter = new Spotter($this->db);
102
-            		$all = $Spotter->countAllAirlineCountries($limit);
93
+				 try {
94
+						$sth = $this->db->prepare($query);
95
+						$sth->execute();
96
+				} catch(PDOException $e) {
97
+						echo "error : ".$e->getMessage();
98
+				}
99
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
100
+				if (empty($all)) {
101
+					$Spotter = new Spotter($this->db);
102
+					$all = $Spotter->countAllAirlineCountries($limit);
103 103
                 
104
-                }
105
-                return $all;
104
+				}
105
+				return $all;
106 106
 	}
107 107
 	public function countAllAircraftManufacturers($limit = true) {
108 108
 		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";
109 109
 		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";
110
-                 try {
111
-                        $sth = $this->db->prepare($query);
112
-                        $sth->execute();
113
-                } catch(PDOException $e) {
114
-                        echo "error : ".$e->getMessage();
115
-                }
116
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
117
-                if (empty($all)) {
118
-            		$Spotter = new Spotter($this->db);
110
+				 try {
111
+						$sth = $this->db->prepare($query);
112
+						$sth->execute();
113
+				} catch(PDOException $e) {
114
+						echo "error : ".$e->getMessage();
115
+				}
116
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
117
+				if (empty($all)) {
118
+					$Spotter = new Spotter($this->db);
119 119
 			$all = $Spotter->countAllAircraftManufacturers($limit);
120
-                }
121
-                return $all;
120
+				}
121
+				return $all;
122 122
 	}
123 123
 
124 124
 	public function countAllArrivalCountries($limit = true) {
125 125
 		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";
126 126
 		else $query = "SELECT airport_country AS arrival_airport_country, arrival as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly'";
127
-                 try {
128
-                        $sth = $this->db->prepare($query);
129
-                        $sth->execute();
130
-                } catch(PDOException $e) {
131
-                        echo "error : ".$e->getMessage();
132
-                }
133
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
134
-                if (empty($all)) {
135
-	                $Spotter = new Spotter($this->db);
136
-            		$all = $Spotter->countAllArrivalCountries($limit);
137
-                }
138
-                return $all;
127
+				 try {
128
+						$sth = $this->db->prepare($query);
129
+						$sth->execute();
130
+				} catch(PDOException $e) {
131
+						echo "error : ".$e->getMessage();
132
+				}
133
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
134
+				if (empty($all)) {
135
+					$Spotter = new Spotter($this->db);
136
+					$all = $Spotter->countAllArrivalCountries($limit);
137
+				}
138
+				return $all;
139 139
 	}
140 140
 	public function countAllDepartureCountries($limit = true) {
141 141
 		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";
142 142
 		else $query = "SELECT airport_country AS departure_airport_country, departure as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly'";
143
-                 try {
144
-                        $sth = $this->db->prepare($query);
145
-                        $sth->execute();
146
-                } catch(PDOException $e) {
147
-                        echo "error : ".$e->getMessage();
148
-                }
149
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
150
-                if (empty($all)) {
151
-		        $Spotter = new Spotter($this->db);
152
-    	    	        $all = $Spotter->countAllDepartureCountries($limit);
153
-                }
154
-                return $all;
143
+				 try {
144
+						$sth = $this->db->prepare($query);
145
+						$sth->execute();
146
+				} catch(PDOException $e) {
147
+						echo "error : ".$e->getMessage();
148
+				}
149
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
150
+				if (empty($all)) {
151
+				$Spotter = new Spotter($this->db);
152
+						$all = $Spotter->countAllDepartureCountries($limit);
153
+				}
154
+				return $all;
155 155
 	}
156 156
 
157 157
 	public function countAllAirlines($limit = true) {
158 158
 		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";
159 159
 		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";
160
-                 try {
161
-                        $sth = $this->db->prepare($query);
162
-                        $sth->execute();
163
-                } catch(PDOException $e) {
164
-                        echo "error : ".$e->getMessage();
165
-                }
166
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
167
-                if (empty($all)) {
168
-	                $Spotter = new Spotter($this->db);
169
-    		        $all = $Spotter->countAllAirlines($limit);
170
-                }
171
-                return $all;
160
+				 try {
161
+						$sth = $this->db->prepare($query);
162
+						$sth->execute();
163
+				} catch(PDOException $e) {
164
+						echo "error : ".$e->getMessage();
165
+				}
166
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
167
+				if (empty($all)) {
168
+					$Spotter = new Spotter($this->db);
169
+					$all = $Spotter->countAllAirlines($limit);
170
+				}
171
+				return $all;
172 172
 	}
173 173
 	public function countAllAircraftRegistrations($limit = true) {
174 174
 		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";
175 175
 		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";
176
-                 try {
177
-                        $sth = $this->db->prepare($query);
178
-                        $sth->execute();
179
-                } catch(PDOException $e) {
180
-                        echo "error : ".$e->getMessage();
181
-                }
182
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
183
-                if (empty($all)) {
184
-	                $Spotter = new Spotter($this->db);
185
-    		        $all = $Spotter->countAllAircraftRegistrations($limit);
186
-                }
187
-                return $all;
176
+				 try {
177
+						$sth = $this->db->prepare($query);
178
+						$sth->execute();
179
+				} catch(PDOException $e) {
180
+						echo "error : ".$e->getMessage();
181
+				}
182
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
183
+				if (empty($all)) {
184
+					$Spotter = new Spotter($this->db);
185
+					$all = $Spotter->countAllAircraftRegistrations($limit);
186
+				}
187
+				return $all;
188 188
 	}
189 189
 	public function countAllCallsigns($limit = true) {
190 190
 		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";
191 191
 		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";
192
-                 try {
193
-                        $sth = $this->db->prepare($query);
194
-                        $sth->execute();
195
-                } catch(PDOException $e) {
196
-                        echo "error : ".$e->getMessage();
197
-                }
198
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
199
-                if (empty($all)) {
200
-	                $Spotter = new Spotter($this->db);
201
-    		        $all = $Spotter->countAllCallsigns($limit);
202
-                }
203
-                return $all;
192
+				 try {
193
+						$sth = $this->db->prepare($query);
194
+						$sth->execute();
195
+				} catch(PDOException $e) {
196
+						echo "error : ".$e->getMessage();
197
+				}
198
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
199
+				if (empty($all)) {
200
+					$Spotter = new Spotter($this->db);
201
+					$all = $Spotter->countAllCallsigns($limit);
202
+				}
203
+				return $all;
204 204
 	}
205 205
 	public function countAllFlightOverCountries($limit = true) {
206 206
 		$Connection = new Connection();
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 				echo "error : ".$e->getMessage();
215 215
 			}
216 216
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
217
-                /*
217
+				/*
218 218
                 if (empty($all)) {
219 219
 	                $Spotter = new Spotter($this->db);
220 220
     		        $all = $Spotter->countAllFlightOverCountries($limit);
@@ -228,102 +228,102 @@  discard block
 block discarded – undo
228 228
 	public function countAllPilots($limit = true) {
229 229
 		if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name FROM stats_pilot ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
230 230
 		else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name FROM stats_pilot ORDER BY pilot_count DESC";
231
-                 try {
232
-                        $sth = $this->db->prepare($query);
233
-                        $sth->execute();
234
-                } catch(PDOException $e) {
235
-                        echo "error : ".$e->getMessage();
236
-                }
237
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
238
-                if (empty($all)) {
239
-            		$Spotter = new Spotter($this->db);
240
-            		$all = $Spotter->countAllPilots($limit);
241
-                }
242
-                return $all;
231
+				 try {
232
+						$sth = $this->db->prepare($query);
233
+						$sth->execute();
234
+				} catch(PDOException $e) {
235
+						echo "error : ".$e->getMessage();
236
+				}
237
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
238
+				if (empty($all)) {
239
+					$Spotter = new Spotter($this->db);
240
+					$all = $Spotter->countAllPilots($limit);
241
+				}
242
+				return $all;
243 243
 	}
244 244
 	public function countAllOwners($limit = true) {
245 245
 		if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
246 246
 		else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner ORDER BY owner_count DESC";
247
-                 try {
248
-                        $sth = $this->db->prepare($query);
249
-                        $sth->execute();
250
-                } catch(PDOException $e) {
251
-                        echo "error : ".$e->getMessage();
252
-                }
253
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
254
-                if (empty($all)) {
255
-            		$Spotter = new Spotter($this->db);
256
-            		$all = $Spotter->countAllOwners($limit);
257
-                }
258
-                return $all;
247
+				 try {
248
+						$sth = $this->db->prepare($query);
249
+						$sth->execute();
250
+				} catch(PDOException $e) {
251
+						echo "error : ".$e->getMessage();
252
+				}
253
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
254
+				if (empty($all)) {
255
+					$Spotter = new Spotter($this->db);
256
+					$all = $Spotter->countAllOwners($limit);
257
+				}
258
+				return $all;
259 259
 	}
260 260
 	public function countAllDepartureAirports($limit = true) {
261 261
 		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";
262 262
 		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'";
263
-                 try {
264
-                        $sth = $this->db->prepare($query);
265
-                        $sth->execute();
266
-                } catch(PDOException $e) {
267
-                        echo "error : ".$e->getMessage();
268
-                }
269
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
270
-                if (empty($all)) {
271
-            		$Spotter = new Spotter($this->db);
272
-            		$pall = $Spotter->countAllDepartureAirports($limit);
273
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit);
274
-        		$all = array();
275
-        		foreach ($pall as $value) {
276
-        			$icao = $value['airport_departure_icao'];
277
-        			$all[$icao] = $value;
278
-        		}
263
+				 try {
264
+						$sth = $this->db->prepare($query);
265
+						$sth->execute();
266
+				} catch(PDOException $e) {
267
+						echo "error : ".$e->getMessage();
268
+				}
269
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
270
+				if (empty($all)) {
271
+					$Spotter = new Spotter($this->db);
272
+					$pall = $Spotter->countAllDepartureAirports($limit);
273
+				$dall = $Spotter->countAllDetectedDepartureAirports($limit);
274
+				$all = array();
275
+				foreach ($pall as $value) {
276
+					$icao = $value['airport_departure_icao'];
277
+					$all[$icao] = $value;
278
+				}
279 279
         		
280
-        		foreach ($dall as $value) {
281
-        			$icao = $value['airport_departure_icao'];
282
-        			if (isset($all[$icao])) {                                                           
283
-        				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
284
-        			} else $all[$icao] = $value;
285
-        		}
286
-        		$count = array();
287
-        		foreach ($all as $key => $row) {
288
-        			$count[$key] = $row['airport_departure_icao_count'];
289
-        		}
290
-        		array_multisort($count,SORT_DESC,$all);
291
-                }
292
-                return $all;
280
+				foreach ($dall as $value) {
281
+					$icao = $value['airport_departure_icao'];
282
+					if (isset($all[$icao])) {                                                           
283
+						$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
284
+					} else $all[$icao] = $value;
285
+				}
286
+				$count = array();
287
+				foreach ($all as $key => $row) {
288
+					$count[$key] = $row['airport_departure_icao_count'];
289
+				}
290
+				array_multisort($count,SORT_DESC,$all);
291
+				}
292
+				return $all;
293 293
 	}
294 294
 	public function countAllArrivalAirports($limit = true) {
295 295
 		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";
296 296
 		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'";
297
-                 try {
298
-                        $sth = $this->db->prepare($query);
299
-                        $sth->execute();
300
-                } catch(PDOException $e) {
301
-                        echo "error : ".$e->getMessage();
302
-                }
303
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
304
-                if (empty($all)) {
305
-            		$Spotter = new Spotter($this->db);
306
-        		$pall = $Spotter->countAllArrivalAirports($limit);
307
-        		$dall = $Spotter->countAllDetectedArrivalAirports($limit);
308
-        		$all = array();
309
-        		foreach ($pall as $value) {
310
-        			$icao = $value['airport_arrival_icao'];
311
-        			$all[$icao] = $value;
312
-        		}
297
+				 try {
298
+						$sth = $this->db->prepare($query);
299
+						$sth->execute();
300
+				} catch(PDOException $e) {
301
+						echo "error : ".$e->getMessage();
302
+				}
303
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
304
+				if (empty($all)) {
305
+					$Spotter = new Spotter($this->db);
306
+				$pall = $Spotter->countAllArrivalAirports($limit);
307
+				$dall = $Spotter->countAllDetectedArrivalAirports($limit);
308
+				$all = array();
309
+				foreach ($pall as $value) {
310
+					$icao = $value['airport_arrival_icao'];
311
+					$all[$icao] = $value;
312
+				}
313 313
         		
314
-        		foreach ($dall as $value) {
315
-        			$icao = $value['airport_arrival_icao'];
316
-        			if (isset($all[$icao])) {
317
-        				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
318
-        			} else $all[$icao] = $value;
319
-        		}
320
-        		$count = array();
321
-        		foreach ($all as $key => $row) {
322
-        			$count[$key] = $row['airport_arrival_icao_count'];
323
-        		}
324
-        		array_multisort($count,SORT_DESC,$all);
325
-                }
326
-                return $all;
314
+				foreach ($dall as $value) {
315
+					$icao = $value['airport_arrival_icao'];
316
+					if (isset($all[$icao])) {
317
+						$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
318
+					} else $all[$icao] = $value;
319
+				}
320
+				$count = array();
321
+				foreach ($all as $key => $row) {
322
+					$count[$key] = $row['airport_arrival_icao_count'];
323
+				}
324
+				array_multisort($count,SORT_DESC,$all);
325
+				}
326
+				return $all;
327 327
 	}
328 328
 	public function countAllMonthsLastYear($limit = true) {
329 329
 		global $globalDBdriver;
@@ -335,35 +335,35 @@  discard block
 block discarded – undo
335 335
 			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'";
336 336
 		}
337 337
 		$query_data = array();
338
-                 try {
339
-                        $sth = $this->db->prepare($query);
340
-                        $sth->execute($query_data);
341
-                } catch(PDOException $e) {
342
-                        echo "error : ".$e->getMessage();
343
-                }
344
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
345
-                if (empty($all)) {
346
-            		$Spotter = new Spotter($this->db);
347
-            		$all = $Spotter->countAllMonthsLastYear($limit);
348
-                }
349
-                return $all;
338
+				 try {
339
+						$sth = $this->db->prepare($query);
340
+						$sth->execute($query_data);
341
+				} catch(PDOException $e) {
342
+						echo "error : ".$e->getMessage();
343
+				}
344
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
345
+				if (empty($all)) {
346
+					$Spotter = new Spotter($this->db);
347
+					$all = $Spotter->countAllMonthsLastYear($limit);
348
+				}
349
+				return $all;
350 350
 	}
351 351
 	
352 352
 	public function countAllDatesLastMonth() {
353 353
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month'";
354 354
 		$query_data = array();
355
-                 try {
356
-                        $sth = $this->db->prepare($query);
357
-                        $sth->execute($query_data);
358
-                } catch(PDOException $e) {
359
-                        echo "error : ".$e->getMessage();
360
-                }
361
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
362
-                if (empty($all)) {
363
-            		$Spotter = new Spotter($this->db);
364
-            		$all = $Spotter->countAllDatesLastMonth();
365
-                }
366
-                return $all;
355
+				 try {
356
+						$sth = $this->db->prepare($query);
357
+						$sth->execute($query_data);
358
+				} catch(PDOException $e) {
359
+						echo "error : ".$e->getMessage();
360
+				}
361
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
362
+				if (empty($all)) {
363
+					$Spotter = new Spotter($this->db);
364
+					$all = $Spotter->countAllDatesLastMonth();
365
+				}
366
+				return $all;
367 367
 	}
368 368
 	public function countAllDatesLast7Days() {
369 369
 		global $globalDBdriver;
@@ -373,64 +373,64 @@  discard block
 block discarded – undo
373 373
 			$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'";
374 374
 		}
375 375
 		$query_data = array();
376
-                 try {
377
-                        $sth = $this->db->prepare($query);
378
-                        $sth->execute($query_data);
379
-                } catch(PDOException $e) {
380
-                        echo "error : ".$e->getMessage();
381
-                }
382
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
383
-                if (empty($all)) {
384
-            		$Spotter = new Spotter($this->db);
385
-            		$all = $Spotter->countAllDatesLast7Days();
386
-                }
387
-                return $all;
376
+				 try {
377
+						$sth = $this->db->prepare($query);
378
+						$sth->execute($query_data);
379
+				} catch(PDOException $e) {
380
+						echo "error : ".$e->getMessage();
381
+				}
382
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
383
+				if (empty($all)) {
384
+					$Spotter = new Spotter($this->db);
385
+					$all = $Spotter->countAllDatesLast7Days();
386
+				}
387
+				return $all;
388 388
 	}
389 389
 	public function countAllDates() {
390 390
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date'";
391 391
 		$query_data = array();
392
-                 try {
393
-                        $sth = $this->db->prepare($query);
394
-                        $sth->execute($query_data);
395
-                } catch(PDOException $e) {
396
-                        echo "error : ".$e->getMessage();
397
-                }
398
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
399
-                if (empty($all)) {
400
-            		$Spotter = new Spotter($this->db);
401
-            		$all = $Spotter->countAllDates();
402
-                }
403
-                return $all;
392
+				 try {
393
+						$sth = $this->db->prepare($query);
394
+						$sth->execute($query_data);
395
+				} catch(PDOException $e) {
396
+						echo "error : ".$e->getMessage();
397
+				}
398
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
399
+				if (empty($all)) {
400
+					$Spotter = new Spotter($this->db);
401
+					$all = $Spotter->countAllDates();
402
+				}
403
+				return $all;
404 404
 	}
405 405
 	public function countAllMonths() {
406
-	    	$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'";
407
-                 try {
408
-                        $sth = $this->db->prepare($query);
409
-                        $sth->execute();
410
-                } catch(PDOException $e) {
411
-                        echo "error : ".$e->getMessage();
412
-                }
413
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
414
-                if (empty($all)) {
415
-            		$Spotter = new Spotter($this->db);
416
-            		$all = $Spotter->countAllMonths();
417
-                }
418
-                return $all;
406
+			$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'";
407
+				 try {
408
+						$sth = $this->db->prepare($query);
409
+						$sth->execute();
410
+				} catch(PDOException $e) {
411
+						echo "error : ".$e->getMessage();
412
+				}
413
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
414
+				if (empty($all)) {
415
+					$Spotter = new Spotter($this->db);
416
+					$all = $Spotter->countAllMonths();
417
+				}
418
+				return $all;
419 419
 	}
420 420
 	public function countAllMilitaryMonths() {
421
-	    	$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'";
422
-                 try {
423
-                        $sth = $this->db->prepare($query);
424
-                        $sth->execute();
425
-                } catch(PDOException $e) {
426
-                        echo "error : ".$e->getMessage();
427
-                }
428
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
429
-                if (empty($all)) {
430
-            		$Spotter = new Spotter($this->db);
431
-            		$all = $Spotter->countAllMilitaryMonths();
432
-                }
433
-                return $all;
421
+			$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'";
422
+				 try {
423
+						$sth = $this->db->prepare($query);
424
+						$sth->execute();
425
+				} catch(PDOException $e) {
426
+						echo "error : ".$e->getMessage();
427
+				}
428
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
429
+				if (empty($all)) {
430
+					$Spotter = new Spotter($this->db);
431
+					$all = $Spotter->countAllMilitaryMonths();
432
+				}
433
+				return $all;
434 434
 	}
435 435
 	public function countAllHours($orderby = 'hour',$limit = true) {
436 436
 		global $globalTimezone;
@@ -438,18 +438,18 @@  discard block
 block discarded – undo
438 438
 		else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour'";
439 439
 		if ($orderby == 'hour') $query .= " ORDER BY CAST(flight_date AS integer) ASC";
440 440
 		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
441
-                 try {
442
-                        $sth = $this->db->prepare($query);
443
-                        $sth->execute();
444
-                } catch(PDOException $e) {
445
-                        echo "error : ".$e->getMessage();
446
-                }
447
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
448
-                if (empty($all)) {
449
-            		$Spotter = new Spotter($this->db);
450
-            		$all = $Spotter->countAllHours($orderby,$limit);
451
-                }
452
-                return $all;
441
+				 try {
442
+						$sth = $this->db->prepare($query);
443
+						$sth->execute();
444
+				} catch(PDOException $e) {
445
+						echo "error : ".$e->getMessage();
446
+				}
447
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
448
+				if (empty($all)) {
449
+					$Spotter = new Spotter($this->db);
450
+					$all = $Spotter->countAllHours($orderby,$limit);
451
+				}
452
+				return $all;
453 453
 	}
454 454
 	
455 455
 	public function countOverallFlights() {
@@ -512,157 +512,157 @@  discard block
 block discarded – undo
512 512
 	public function getLast7DaysAirports($airport_icao = '') {
513 513
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao ORDER BY date";
514 514
 		$query_values = array(':airport_icao' => $airport_icao);
515
-                 try {
516
-                        $sth = $this->db->prepare($query);
517
-                        $sth->execute($query_values);
518
-                } catch(PDOException $e) {
519
-                        echo "error : ".$e->getMessage();
520
-                }
521
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
522
-                return $all;
515
+				 try {
516
+						$sth = $this->db->prepare($query);
517
+						$sth->execute($query_values);
518
+				} catch(PDOException $e) {
519
+						echo "error : ".$e->getMessage();
520
+				}
521
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
522
+				return $all;
523 523
 	}
524 524
 	public function getStats($type) {
525
-                $query = "SELECT * FROM stats WHERE stats_type = :type ORDER BY stats_date";
526
-                $query_values = array(':type' => $type);
527
-                 try {
528
-                        $sth = $this->db->prepare($query);
529
-                        $sth->execute($query_values);
530
-                } catch(PDOException $e) {
531
-                        echo "error : ".$e->getMessage();
532
-                }
533
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
534
-                return $all;
535
-        }
525
+				$query = "SELECT * FROM stats WHERE stats_type = :type ORDER BY stats_date";
526
+				$query_values = array(':type' => $type);
527
+				 try {
528
+						$sth = $this->db->prepare($query);
529
+						$sth->execute($query_values);
530
+				} catch(PDOException $e) {
531
+						echo "error : ".$e->getMessage();
532
+				}
533
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
534
+				return $all;
535
+		}
536 536
 	public function getSumStats($type,$year) {
537
-    		global $globalArchiveMonths, $globalDBdriver;
538
-    		if ($globalDBdriver == 'mysql') {
539
-	                $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year";
540
-	        } else {
541
-            		$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year";
542
-                }
543
-                $query_values = array(':type' => $type, ':year' => $year);
544
-                 try {
545
-                        $sth = $this->db->prepare($query);
546
-                        $sth->execute($query_values);
547
-                } catch(PDOException $e) {
548
-                        echo "error : ".$e->getMessage();
549
-                }
550
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
551
-                return $all[0]['total'];
552
-        }
537
+			global $globalArchiveMonths, $globalDBdriver;
538
+			if ($globalDBdriver == 'mysql') {
539
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year";
540
+			} else {
541
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year";
542
+				}
543
+				$query_values = array(':type' => $type, ':year' => $year);
544
+				 try {
545
+						$sth = $this->db->prepare($query);
546
+						$sth->execute($query_values);
547
+				} catch(PDOException $e) {
548
+						echo "error : ".$e->getMessage();
549
+				}
550
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
551
+				return $all[0]['total'];
552
+		}
553 553
 	public function getStatsTotal($type) {
554
-    		global $globalArchiveMonths, $globalDBdriver;
555
-    		if ($globalDBdriver == 'mysql') {
554
+			global $globalArchiveMonths, $globalDBdriver;
555
+			if ($globalDBdriver == 'mysql') {
556 556
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH)";
557 557
 		} else {
558 558
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS'";
559
-                }
560
-                $query_values = array(':type' => $type);
561
-                 try {
562
-                        $sth = $this->db->prepare($query);
563
-                        $sth->execute($query_values);
564
-                } catch(PDOException $e) {
565
-                        echo "error : ".$e->getMessage();
566
-                }
567
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
568
-                return $all[0]['total'];
569
-        }
559
+				}
560
+				$query_values = array(':type' => $type);
561
+				 try {
562
+						$sth = $this->db->prepare($query);
563
+						$sth->execute($query_values);
564
+				} catch(PDOException $e) {
565
+						echo "error : ".$e->getMessage();
566
+				}
567
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
568
+				return $all[0]['total'];
569
+		}
570 570
 	public function getStatsAircraftTotal() {
571
-    		global $globalArchiveMonths, $globalDBdriver;
572
-    		if ($globalDBdriver == 'mysql') {
571
+			global $globalArchiveMonths, $globalDBdriver;
572
+			if ($globalDBdriver == 'mysql') {
573 573
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft";
574
-                } else {
574
+				} else {
575 575
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft";
576
-                }
577
-                 try {
578
-                        $sth = $this->db->prepare($query);
579
-                        $sth->execute();
580
-                } catch(PDOException $e) {
581
-                        echo "error : ".$e->getMessage();
582
-                }
583
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
584
-                return $all[0]['total'];
585
-        }
576
+				}
577
+				 try {
578
+						$sth = $this->db->prepare($query);
579
+						$sth->execute();
580
+				} catch(PDOException $e) {
581
+						echo "error : ".$e->getMessage();
582
+				}
583
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
584
+				return $all[0]['total'];
585
+		}
586 586
 	public function getStatsAirlineTotal() {
587
-    		global $globalArchiveMonths, $globalDBdriver;
588
-    		if ($globalDBdriver == 'mysql') {
587
+			global $globalArchiveMonths, $globalDBdriver;
588
+			if ($globalDBdriver == 'mysql') {
589 589
 			$query = "SELECT SUM(cnt) as total FROM stats_airline";
590
-                } else {
590
+				} else {
591 591
 			$query = "SELECT SUM(cnt) as total FROM stats_airline";
592
-                }
593
-                 try {
594
-                        $sth = $this->db->prepare($query);
595
-                        $sth->execute();
596
-                } catch(PDOException $e) {
597
-                        echo "error : ".$e->getMessage();
598
-                }
599
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
600
-                return $all[0]['total'];
601
-        }
592
+				}
593
+				 try {
594
+						$sth = $this->db->prepare($query);
595
+						$sth->execute();
596
+				} catch(PDOException $e) {
597
+						echo "error : ".$e->getMessage();
598
+				}
599
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
600
+				return $all[0]['total'];
601
+		}
602 602
 	public function getStatsOwnerTotal() {
603
-    		global $globalArchiveMonths, $globalDBdriver;
604
-    		if ($globalDBdriver == 'mysql') {
603
+			global $globalArchiveMonths, $globalDBdriver;
604
+			if ($globalDBdriver == 'mysql') {
605 605
 			$query = "SELECT SUM(cnt) as total FROM stats_owner";
606 606
 		} else {
607 607
 			$query = "SELECT SUM(cnt) as total FROM stats_owner";
608
-                }
609
-                 try {
610
-                        $sth = $this->db->prepare($query);
611
-                        $sth->execute();
612
-                } catch(PDOException $e) {
613
-                        echo "error : ".$e->getMessage();
614
-                }
615
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
616
-                return $all[0]['total'];
617
-        }
608
+				}
609
+				 try {
610
+						$sth = $this->db->prepare($query);
611
+						$sth->execute();
612
+				} catch(PDOException $e) {
613
+						echo "error : ".$e->getMessage();
614
+				}
615
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
616
+				return $all[0]['total'];
617
+		}
618 618
 	public function getStatsPilotTotal() {
619
-    		global $globalArchiveMonths, $globalDBdriver;
620
-    		if ($globalDBdriver == 'mysql') {
621
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot";
622
-            	} else {
623
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot";
624
-            	}
625
-                 try {
626
-                        $sth = $this->db->prepare($query);
627
-                        $sth->execute();
628
-                } catch(PDOException $e) {
629
-                        echo "error : ".$e->getMessage();
630
-                }
631
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
632
-                return $all[0]['total'];
633
-        }
619
+			global $globalArchiveMonths, $globalDBdriver;
620
+			if ($globalDBdriver == 'mysql') {
621
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot";
622
+				} else {
623
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot";
624
+				}
625
+				 try {
626
+						$sth = $this->db->prepare($query);
627
+						$sth->execute();
628
+				} catch(PDOException $e) {
629
+						echo "error : ".$e->getMessage();
630
+				}
631
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
632
+				return $all[0]['total'];
633
+		}
634 634
 
635 635
 	public function addStat($type,$cnt,$stats_date) {
636 636
 		global $globalDBdriver;
637 637
 		if ($globalDBdriver == 'mysql') {
638 638
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = :cnt";
639
-                } else {
639
+				} else {
640 640
 			$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);"; 
641 641
 		}
642
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
643
-                 try {
644
-                        $sth = $this->db->prepare($query);
645
-                        $sth->execute($query_values);
646
-                } catch(PDOException $e) {
647
-                        return "error : ".$e->getMessage();
648
-                }
649
-        }
642
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
643
+				 try {
644
+						$sth = $this->db->prepare($query);
645
+						$sth->execute($query_values);
646
+				} catch(PDOException $e) {
647
+						return "error : ".$e->getMessage();
648
+				}
649
+		}
650 650
 	public function updateStat($type,$cnt,$stats_date) {
651 651
 		global $globalDBdriver;
652 652
 		if ($globalDBdriver == 'mysql') {
653 653
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
654 654
 		} else {
655
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
655
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
656 656
 			$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);"; 
657
-                }
658
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
659
-                 try {
660
-                        $sth = $this->db->prepare($query);
661
-                        $sth->execute($query_values);
662
-                } catch(PDOException $e) {
663
-                        return "error : ".$e->getMessage();
664
-                }
665
-        }
657
+				}
658
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date);
659
+				 try {
660
+						$sth = $this->db->prepare($query);
661
+						$sth->execute($query_values);
662
+				} catch(PDOException $e) {
663
+						return "error : ".$e->getMessage();
664
+				}
665
+		}
666 666
 	public function getStatsSource($date,$stats_type = '') {
667 667
 		if ($stats_type == '') {
668 668
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -671,15 +671,15 @@  discard block
 block discarded – undo
671 671
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name";
672 672
 			$query_values = array(':date' => $date,':stats_type' => $stats_type);
673 673
 		}
674
-                 try {
675
-                        $sth = $this->db->prepare($query);
676
-                        $sth->execute($query_values);
677
-                } catch(PDOException $e) {
678
-                        echo "error : ".$e->getMessage();
679
-                }
680
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
681
-                return $all;
682
-        }
674
+				 try {
675
+						$sth = $this->db->prepare($query);
676
+						$sth->execute($query_values);
677
+				} catch(PDOException $e) {
678
+						echo "error : ".$e->getMessage();
679
+				}
680
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
681
+				return $all;
682
+		}
683 683
 
684 684
 	public function addStatSource($data,$source_name,$stats_type,$date) {
685 685
 		global $globalDBdriver;
@@ -687,25 +687,25 @@  discard block
 block discarded – undo
687 687
 			$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";
688 688
 		} else {
689 689
 			$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);"; 
690
-                }
691
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
692
-                 try {
693
-                        $sth = $this->db->prepare($query);
694
-                        $sth->execute($query_values);
695
-                } catch(PDOException $e) {
696
-                        return "error : ".$e->getMessage();
697
-                }
698
-        }
690
+				}
691
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
692
+				 try {
693
+						$sth = $this->db->prepare($query);
694
+						$sth->execute($query_values);
695
+				} catch(PDOException $e) {
696
+						return "error : ".$e->getMessage();
697
+				}
698
+		}
699 699
 	public function addStatFlight($type,$date_name,$cnt) {
700
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt) VALUES (:type,:flight_date,:cnt)";
701
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt);
702
-                 try {
703
-                        $sth = $this->db->prepare($query);
704
-                        $sth->execute($query_values);
705
-                } catch(PDOException $e) {
706
-                        return "error : ".$e->getMessage();
707
-                }
708
-        }
700
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt) VALUES (:type,:flight_date,:cnt)";
701
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt);
702
+				 try {
703
+						$sth = $this->db->prepare($query);
704
+						$sth->execute($query_values);
705
+				} catch(PDOException $e) {
706
+						return "error : ".$e->getMessage();
707
+				}
708
+		}
709 709
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '') {
710 710
 		global $globalDBdriver;
711 711
 		if ($globalDBdriver == 'mysql') {
@@ -713,14 +713,14 @@  discard block
 block discarded – undo
713 713
 		} else {
714 714
 			$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);"; 
715 715
 		}
716
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt);
717
-                 try {
718
-                        $sth = $this->db->prepare($query);
719
-                        $sth->execute($query_values);
720
-                } catch(PDOException $e) {
721
-                        return "error : ".$e->getMessage();
722
-                }
723
-        }
716
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt);
717
+				 try {
718
+						$sth = $this->db->prepare($query);
719
+						$sth->execute($query_values);
720
+				} catch(PDOException $e) {
721
+						return "error : ".$e->getMessage();
722
+				}
723
+		}
724 724
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '') {
725 725
 		global $globalDBdriver;
726 726
 		if ($globalDBdriver == 'mysql') {
@@ -728,14 +728,14 @@  discard block
 block discarded – undo
728 728
 		} else {
729 729
 			$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);"; 
730 730
 		}
731
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt);
732
-                 try {
733
-                        $sth = $this->db->prepare($query);
734
-                        $sth->execute($query_values);
735
-                } catch(PDOException $e) {
736
-                        return "error : ".$e->getMessage();
737
-                }
738
-        }
731
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt);
732
+				 try {
733
+						$sth = $this->db->prepare($query);
734
+						$sth->execute($query_values);
735
+				} catch(PDOException $e) {
736
+						return "error : ".$e->getMessage();
737
+				}
738
+		}
739 739
 	public function addStatCountry($iso2,$iso3,$name,$cnt) {
740 740
 		global $globalDBdriver;
741 741
 		if ($globalDBdriver == 'mysql') {
@@ -743,14 +743,14 @@  discard block
 block discarded – undo
743 743
 		} else {
744 744
 			$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);"; 
745 745
 		}
746
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt);
747
-                 try {
748
-                        $sth = $this->db->prepare($query);
749
-                        $sth->execute($query_values);
750
-                } catch(PDOException $e) {
751
-                        return "error : ".$e->getMessage();
752
-                }
753
-        }
746
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt);
747
+				 try {
748
+						$sth = $this->db->prepare($query);
749
+						$sth->execute($query_values);
750
+				} catch(PDOException $e) {
751
+						return "error : ".$e->getMessage();
752
+				}
753
+		}
754 754
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '') {
755 755
 		global $globalDBdriver;
756 756
 		if ($globalDBdriver == 'mysql') {
@@ -758,14 +758,14 @@  discard block
 block discarded – undo
758 758
 		} else {
759 759
 			$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);"; 
760 760
 		}
761
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt);
762
-                 try {
763
-                        $sth = $this->db->prepare($query);
764
-                        $sth->execute($query_values);
765
-                } catch(PDOException $e) {
766
-                        return "error : ".$e->getMessage();
767
-                }
768
-        }
761
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt);
762
+				 try {
763
+						$sth = $this->db->prepare($query);
764
+						$sth->execute($query_values);
765
+				} catch(PDOException $e) {
766
+						return "error : ".$e->getMessage();
767
+				}
768
+		}
769 769
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '') {
770 770
 		global $globalDBdriver;
771 771
 		if ($globalDBdriver == 'mysql') {
@@ -773,14 +773,14 @@  discard block
 block discarded – undo
773 773
 		} else {
774 774
 			$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);"; 
775 775
 		}
776
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt);
777
-                 try {
778
-                        $sth = $this->db->prepare($query);
779
-                        $sth->execute($query_values);
780
-                } catch(PDOException $e) {
781
-                        return "error : ".$e->getMessage();
782
-                }
783
-        }
776
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt);
777
+				 try {
778
+						$sth = $this->db->prepare($query);
779
+						$sth->execute($query_values);
780
+				} catch(PDOException $e) {
781
+						return "error : ".$e->getMessage();
782
+				}
783
+		}
784 784
 	public function addStatOwner($owner_name,$cnt) {
785 785
 		global $globalDBdriver;
786 786
 		if ($globalDBdriver == 'mysql') {
@@ -788,14 +788,14 @@  discard block
 block discarded – undo
788 788
 		} else {
789 789
 			$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);"; 
790 790
 		}
791
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt);
792
-                 try {
793
-                        $sth = $this->db->prepare($query);
794
-                        $sth->execute($query_values);
795
-                } catch(PDOException $e) {
796
-                        return "error : ".$e->getMessage();
797
-                }
798
-        }
791
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt);
792
+				 try {
793
+						$sth = $this->db->prepare($query);
794
+						$sth->execute($query_values);
795
+				} catch(PDOException $e) {
796
+						return "error : ".$e->getMessage();
797
+				}
798
+		}
799 799
 	public function addStatPilot($pilot_id,$cnt) {
800 800
 		global $globalDBdriver;
801 801
 		if ($globalDBdriver == 'mysql') {
@@ -803,14 +803,14 @@  discard block
 block discarded – undo
803 803
 		} else {
804 804
 			$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);"; 
805 805
 		}
806
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt);
807
-                 try {
808
-                        $sth = $this->db->prepare($query);
809
-                        $sth->execute($query_values);
810
-                } catch(PDOException $e) {
811
-                        return "error : ".$e->getMessage();
812
-                }
813
-        }
806
+				$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt);
807
+				 try {
808
+						$sth = $this->db->prepare($query);
809
+						$sth->execute($query_values);
810
+				} catch(PDOException $e) {
811
+						return "error : ".$e->getMessage();
812
+				}
813
+		}
814 814
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure) {
815 815
 		global $globalDBdriver;
816 816
 		if ($globalDBdriver == 'mysql') {
@@ -818,14 +818,14 @@  discard block
 block discarded – undo
818 818
 		} else {
819 819
 			$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');"; 
820 820
 		}
821
-                $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');
822
-                 try {
823
-                        $sth = $this->db->prepare($query);
824
-                        $sth->execute($query_values);
825
-                } catch(PDOException $e) {
826
-                        return "error : ".$e->getMessage();
827
-                }
828
-        }
821
+				$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');
822
+				 try {
823
+						$sth = $this->db->prepare($query);
824
+						$sth->execute($query_values);
825
+				} catch(PDOException $e) {
826
+						return "error : ".$e->getMessage();
827
+				}
828
+		}
829 829
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure) {
830 830
 		global $globalDBdriver;
831 831
 		if ($globalDBdriver == 'mysql') {
@@ -833,14 +833,14 @@  discard block
 block discarded – undo
833 833
 		} else {
834 834
 			$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');"; 
835 835
 		}
836
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date);
837
-                 try {
838
-                        $sth = $this->db->prepare($query);
839
-                        $sth->execute($query_values);
840
-                } catch(PDOException $e) {
841
-                        return "error : ".$e->getMessage();
842
-                }
843
-        }
836
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date);
837
+				 try {
838
+						$sth = $this->db->prepare($query);
839
+						$sth->execute($query_values);
840
+				} catch(PDOException $e) {
841
+						return "error : ".$e->getMessage();
842
+				}
843
+		}
844 844
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival) {
845 845
 		global $globalDBdriver;
846 846
 		if ($globalDBdriver == 'mysql') {
@@ -848,14 +848,14 @@  discard block
 block discarded – undo
848 848
 		} else {
849 849
 			$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');"; 
850 850
 		}
851
-                $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');
852
-                 try {
853
-                        $sth = $this->db->prepare($query);
854
-                        $sth->execute($query_values);
855
-                } catch(PDOException $e) {
856
-                        return "error : ".$e->getMessage();
857
-                }
858
-        }
851
+				$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');
852
+				 try {
853
+						$sth = $this->db->prepare($query);
854
+						$sth->execute($query_values);
855
+				} catch(PDOException $e) {
856
+						return "error : ".$e->getMessage();
857
+				}
858
+		}
859 859
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival) {
860 860
 		global $globalDBdriver;
861 861
 		if ($globalDBdriver == 'mysql') {
@@ -863,55 +863,55 @@  discard block
 block discarded – undo
863 863
 		} else {
864 864
 			$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');"; 
865 865
 		}
866
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date);
867
-                 try {
868
-                        $sth = $this->db->prepare($query);
869
-                        $sth->execute($query_values);
870
-                } catch(PDOException $e) {
871
-                        return "error : ".$e->getMessage();
872
-                }
873
-        }
866
+				$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date);
867
+				 try {
868
+						$sth = $this->db->prepare($query);
869
+						$sth->execute($query_values);
870
+				} catch(PDOException $e) {
871
+						return "error : ".$e->getMessage();
872
+				}
873
+		}
874 874
 
875 875
 	public function deleteStat($id) {
876
-                $query = "DELETE FROM stats WHERE stats_id = :id";
877
-                $query_values = array(':id' => $id);
878
-                 try {
879
-                        $sth = $this->db->prepare($query);
880
-                        $sth->execute($query_values);
881
-                } catch(PDOException $e) {
882
-                        return "error : ".$e->getMessage();
883
-                }
884
-        }
876
+				$query = "DELETE FROM stats WHERE stats_id = :id";
877
+				$query_values = array(':id' => $id);
878
+				 try {
879
+						$sth = $this->db->prepare($query);
880
+						$sth->execute($query_values);
881
+				} catch(PDOException $e) {
882
+						return "error : ".$e->getMessage();
883
+				}
884
+		}
885 885
 	public function deleteStatFlight($type) {
886
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
887
-                $query_values = array(':type' => $type);
888
-                 try {
889
-                        $sth = $this->db->prepare($query);
890
-                        $sth->execute($query_values);
891
-                } catch(PDOException $e) {
892
-                        return "error : ".$e->getMessage();
893
-                }
894
-        }
886
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
887
+				$query_values = array(':type' => $type);
888
+				 try {
889
+						$sth = $this->db->prepare($query);
890
+						$sth->execute($query_values);
891
+				} catch(PDOException $e) {
892
+						return "error : ".$e->getMessage();
893
+				}
894
+		}
895 895
 	public function deleteStatAirport($type) {
896
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
897
-                $query_values = array(':type' => $type);
898
-                 try {
899
-                        $sth = $this->db->prepare($query);
900
-                        $sth->execute($query_values);
901
-                } catch(PDOException $e) {
902
-                        return "error : ".$e->getMessage();
903
-                }
904
-        }
896
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
897
+				$query_values = array(':type' => $type);
898
+				 try {
899
+						$sth = $this->db->prepare($query);
900
+						$sth->execute($query_values);
901
+				} catch(PDOException $e) {
902
+						return "error : ".$e->getMessage();
903
+				}
904
+		}
905 905
         
906
-        public function addOldStats() {
907
-    		global $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver;
908
-    		$Common = new Common();
909
-    		$Connection = new Connection();
910
-    		date_default_timezone_set('UTC');
911
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
906
+		public function addOldStats() {
907
+			global $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver;
908
+			$Common = new Common();
909
+			$Connection = new Connection();
910
+			date_default_timezone_set('UTC');
911
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
912 912
 		//print_r($last_update);
913 913
 		$flightsbymonth = $this->getStats('flights_by_month');
914
-    		if (empty($last_update) && empty($flightsbymonth)) {
914
+			if (empty($last_update) && empty($flightsbymonth)) {
915 915
 			// Initial update
916 916
 			$Spotter = new Spotter($this->db);
917 917
 			$alldata = $Spotter->countAllMonths();
@@ -1052,46 +1052,46 @@  discard block
 block discarded – undo
1052 1052
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count']);
1053 1053
 				}
1054 1054
 				$pall = $Spotter->countAllDepartureAirports(false,$globalArchiveMonths);
1055
-        			$dall = $Spotter->countAllDetectedDepartureAirports(false,$globalArchiveMonths);
1056
-	        		$alldata = array();
1057
-    				foreach ($pall as $value) {
1058
-	        			$icao = $value['airport_departure_icao'];
1059
-    					$alldata[$icao] = $value;
1060
-	        		}
1061
-	        		foreach ($dall as $value) {
1062
-    					$icao = $value['airport_departure_icao'];
1063
-        				if (isset($alldata[$icao])) {                                                           
1064
-        					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1065
-	        			} else $alldata[$icao] = $value;
1066
-    				}
1067
-        			$count = array();
1068
-        			foreach ($alldata as $key => $row) {
1069
-        				$count[$key] = $row['airport_departure_icao_count'];
1070
-	        		}
1071
-    				array_multisort($count,SORT_DESC,$alldata);
1055
+					$dall = $Spotter->countAllDetectedDepartureAirports(false,$globalArchiveMonths);
1056
+					$alldata = array();
1057
+					foreach ($pall as $value) {
1058
+						$icao = $value['airport_departure_icao'];
1059
+						$alldata[$icao] = $value;
1060
+					}
1061
+					foreach ($dall as $value) {
1062
+						$icao = $value['airport_departure_icao'];
1063
+						if (isset($alldata[$icao])) {                                                           
1064
+							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1065
+						} else $alldata[$icao] = $value;
1066
+					}
1067
+					$count = array();
1068
+					foreach ($alldata as $key => $row) {
1069
+						$count[$key] = $row['airport_departure_icao_count'];
1070
+					}
1071
+					array_multisort($count,SORT_DESC,$alldata);
1072 1072
 
1073 1073
 				//print_r($alldate);
1074 1074
 				foreach ($alldata as $number) {
1075 1075
 					$this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
1076 1076
 				}
1077 1077
 				$pdata = $Spotter->countAllArrivalAirports(false,$globalArchiveMonths);
1078
-        			$dall = $Spotter->countAllDetectedArrivalAirports(false,$globalArchiveMonths);
1079
-	        		$alldata = array();
1080
-    				foreach ($pdata as $value) {
1081
-	        			$icao = $value['airport_arrival_icao'];
1082
-    					$alldata[$icao] = $value;
1083
-	        		}
1084
-	        		foreach ($dall as $value) {
1085
-    					$icao = $value['airport_arrival_icao'];
1086
-        				if (isset($alldata[$icao])) {                                                           
1087
-        					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1088
-	        			} else $alldata[$icao] = $value;
1089
-    				}
1090
-        			$count = array();
1091
-        			foreach ($alldata as $key => $row) {
1092
-        				$count[$key] = $row['airport_arrival_icao_count'];
1093
-	        		}
1094
-    				array_multisort($count,SORT_DESC,$alldata);
1078
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,$globalArchiveMonths);
1079
+					$alldata = array();
1080
+					foreach ($pdata as $value) {
1081
+						$icao = $value['airport_arrival_icao'];
1082
+						$alldata[$icao] = $value;
1083
+					}
1084
+					foreach ($dall as $value) {
1085
+						$icao = $value['airport_arrival_icao'];
1086
+						if (isset($alldata[$icao])) {                                                           
1087
+							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1088
+						} else $alldata[$icao] = $value;
1089
+					}
1090
+					$count = array();
1091
+					foreach ($alldata as $key => $row) {
1092
+						$count[$key] = $row['airport_arrival_icao_count'];
1093
+					}
1094
+					array_multisort($count,SORT_DESC,$alldata);
1095 1095
 				foreach ($alldata as $number) {
1096 1096
 					$this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
1097 1097
 				}
@@ -1159,46 +1159,46 @@  discard block
 block discarded – undo
1159 1159
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count']);
1160 1160
 			}
1161 1161
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1162
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1163
-	        	$alldata = array();
1164
-    			foreach ($pall as $value) {
1165
-	        		$icao = $value['airport_departure_icao'];
1166
-    				$alldata[$icao] = $value;
1167
-	        	}
1168
-	        	foreach ($dall as $value) {
1169
-    				$icao = $value['airport_departure_icao'];
1170
-        			if (isset($alldata[$icao])) {                                                           
1171
-    					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1172
-        			} else $alldata[$icao] = $value;
1162
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1163
+				$alldata = array();
1164
+				foreach ($pall as $value) {
1165
+					$icao = $value['airport_departure_icao'];
1166
+					$alldata[$icao] = $value;
1167
+				}
1168
+				foreach ($dall as $value) {
1169
+					$icao = $value['airport_departure_icao'];
1170
+					if (isset($alldata[$icao])) {                                                           
1171
+						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1172
+					} else $alldata[$icao] = $value;
1173 1173
 			}
1174
-    			$count = array();
1175
-    			foreach ($alldata as $key => $row) {
1176
-    				$count[$key] = $row['airport_departure_icao_count'];
1177
-        		}
1174
+				$count = array();
1175
+				foreach ($alldata as $key => $row) {
1176
+					$count[$key] = $row['airport_departure_icao_count'];
1177
+				}
1178 1178
 			array_multisort($count,SORT_DESC,$alldata);
1179 1179
 
1180 1180
 			foreach ($alldata as $number) {
1181 1181
 				$this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
1182 1182
 			}
1183 1183
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1184
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1185
-	        	$alldata = array();
1186
-    			foreach ($pall as $value) {
1187
-	        		$icao = $value['airport_arrival_icao'];
1188
-    				$alldata[$icao] = $value;
1189
-	        	}
1190
-	        	foreach ($dall as $value) {
1191
-    				$icao = $value['airport_arrival_icao'];
1192
-        			if (isset($alldata[$icao])) {                                                           
1193
-        				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1194
-	        		} else $alldata[$icao] = $value;
1195
-    			}
1196
-        		$count = array();
1197
-        		foreach ($alldata as $key => $row) {
1198
-        			$count[$key] = $row['airport_arrival_icao_count'];
1199
-	        	}
1200
-    			array_multisort($count,SORT_DESC,$alldata);
1201
-                        foreach ($alldata as $number) {
1184
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1185
+				$alldata = array();
1186
+				foreach ($pall as $value) {
1187
+					$icao = $value['airport_arrival_icao'];
1188
+					$alldata[$icao] = $value;
1189
+				}
1190
+				foreach ($dall as $value) {
1191
+					$icao = $value['airport_arrival_icao'];
1192
+					if (isset($alldata[$icao])) {                                                           
1193
+						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1194
+					} else $alldata[$icao] = $value;
1195
+				}
1196
+				$count = array();
1197
+				foreach ($alldata as $key => $row) {
1198
+					$count[$key] = $row['airport_arrival_icao_count'];
1199
+				}
1200
+				array_multisort($count,SORT_DESC,$alldata);
1201
+						foreach ($alldata as $number) {
1202 1202
 				$this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
1203 1203
 			}
1204 1204
 			if ($Connection->tableExists('countries')) {
@@ -1248,45 +1248,45 @@  discard block
 block discarded – undo
1248 1248
 			echo '...Departure'."\n";
1249 1249
 			$this->deleteStatAirport('daily');
1250 1250
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
1251
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1252
-	        	$alldata = array();
1253
-    			foreach ($pall as $value) {
1254
-	        		$icao = $value['departure_airport_icao'];
1255
-    				$alldata[$icao] = $value;
1256
-	        	}
1257
-	        	foreach ($dall as $value) {
1258
-    				$icao = $value['departure_airport_icao'];
1259
-        			if (isset($alldata[$icao])) {                                                           
1260
-        				$alldata[$icao]['departure_airport_count'] = $alldata[$icao]['departure_airport_count'] + $value['departure_airport_count'];
1261
-	        		} else $alldata[$icao] = $value;
1262
-    			}
1263
-        		$count = array();
1264
-        		foreach ($alldata as $key => $row) {
1265
-        			$count[$key] = $row['departure_airport_count'];
1266
-	        	}
1267
-    			array_multisort($count,SORT_DESC,$alldata);
1251
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1252
+				$alldata = array();
1253
+				foreach ($pall as $value) {
1254
+					$icao = $value['departure_airport_icao'];
1255
+					$alldata[$icao] = $value;
1256
+				}
1257
+				foreach ($dall as $value) {
1258
+					$icao = $value['departure_airport_icao'];
1259
+					if (isset($alldata[$icao])) {                                                           
1260
+						$alldata[$icao]['departure_airport_count'] = $alldata[$icao]['departure_airport_count'] + $value['departure_airport_count'];
1261
+					} else $alldata[$icao] = $value;
1262
+				}
1263
+				$count = array();
1264
+				foreach ($alldata as $key => $row) {
1265
+					$count[$key] = $row['departure_airport_count'];
1266
+				}
1267
+				array_multisort($count,SORT_DESC,$alldata);
1268 1268
 			foreach ($alldata as $number) {
1269 1269
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1270 1270
 			}
1271 1271
 			echo '...Arrival'."\n";
1272 1272
 			$pall = $Spotter->getLast7DaysAirportsArrival();
1273
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1274
-	        	$alldata = array();
1275
-    			foreach ($pall as $value) {
1276
-	        		$icao = $value['arrival_airport_icao'];
1277
-    				$alldata[$icao] = $value;
1278
-	        	}
1279
-	        	foreach ($dall as $value) {
1280
-    				$icao = $value['arrival_airport_icao'];
1281
-        			if (isset($alldata[$icao])) {                                                           
1282
-        				$alldata[$icao]['arrival_airport_icao_count'] = $alldata[$icao]['arrival_airport_count'] + $value['arrival_airport_count'];
1283
-	        		} else $alldata[$icao] = $value;
1284
-    			}
1285
-        		$count = array();
1286
-        		foreach ($alldata as $key => $row) {
1287
-        			$count[$key] = $row['arrival_airport_count'];
1288
-	        	}
1289
-    			array_multisort($count,SORT_DESC,$alldata);
1273
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1274
+				$alldata = array();
1275
+				foreach ($pall as $value) {
1276
+					$icao = $value['arrival_airport_icao'];
1277
+					$alldata[$icao] = $value;
1278
+				}
1279
+				foreach ($dall as $value) {
1280
+					$icao = $value['arrival_airport_icao'];
1281
+					if (isset($alldata[$icao])) {                                                           
1282
+						$alldata[$icao]['arrival_airport_icao_count'] = $alldata[$icao]['arrival_airport_count'] + $value['arrival_airport_count'];
1283
+					} else $alldata[$icao] = $value;
1284
+				}
1285
+				$count = array();
1286
+				foreach ($alldata as $key => $row) {
1287
+					$count[$key] = $row['arrival_airport_count'];
1288
+				}
1289
+				array_multisort($count,SORT_DESC,$alldata);
1290 1290
 
1291 1291
 			foreach ($alldata as $number) {
1292 1292
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
Please login to merge, or discard this patch.
require/class.METAR.php 1 patch
Indentation   +257 added lines, -257 removed lines patch added patch discarded remove patch
@@ -7,107 +7,107 @@  discard block
 block discarded – undo
7 7
 	public $db;
8 8
 	
9 9
 	protected $texts = Array(
10
-	    'MI' => 'Shallow',
11
-	    'PR' => 'Partial',
12
-	    'BC' => 'Low drifting',
13
-	    'BL' => 'Blowing',
14
-	    'SH' => 'Showers',
15
-	    'TS' => 'Thunderstorm',
16
-	    'FZ' => 'Freezing',
17
-	    'DZ' => 'Drizzle',
18
-	    'RA' => 'Rain',
19
-	    'SN' => 'Snow',
20
-	    'SG' => 'Snow Grains',
21
-	    'IC' => 'Ice crystals',
22
-	    'PL' => 'Ice pellets',
23
-	    'GR' => 'Hail',
24
-	    'GS' => 'Small hail',
25
-	    'UP' => 'Unknown',
26
-	    'BR' => 'Mist',
27
-	    'FG' => 'Fog',
28
-	    'FU' => 'Smoke',
29
-	    'VA' => 'Volcanic ash',
30
-	    'DU' => 'Widespread dust',
31
-	    'SA' => 'Sand',
32
-	    'HZ' => 'Haze',
33
-	    'PY' => 'Spray',
34
-	    'PO' => 'Well developed dust / sand whirls',
35
-	    'SQ' => 'Squalls',
36
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
37
-	    'SS' => 'Sandstorm',
38
-	    'DS' => 'Duststorm'
10
+		'MI' => 'Shallow',
11
+		'PR' => 'Partial',
12
+		'BC' => 'Low drifting',
13
+		'BL' => 'Blowing',
14
+		'SH' => 'Showers',
15
+		'TS' => 'Thunderstorm',
16
+		'FZ' => 'Freezing',
17
+		'DZ' => 'Drizzle',
18
+		'RA' => 'Rain',
19
+		'SN' => 'Snow',
20
+		'SG' => 'Snow Grains',
21
+		'IC' => 'Ice crystals',
22
+		'PL' => 'Ice pellets',
23
+		'GR' => 'Hail',
24
+		'GS' => 'Small hail',
25
+		'UP' => 'Unknown',
26
+		'BR' => 'Mist',
27
+		'FG' => 'Fog',
28
+		'FU' => 'Smoke',
29
+		'VA' => 'Volcanic ash',
30
+		'DU' => 'Widespread dust',
31
+		'SA' => 'Sand',
32
+		'HZ' => 'Haze',
33
+		'PY' => 'Spray',
34
+		'PO' => 'Well developed dust / sand whirls',
35
+		'SQ' => 'Squalls',
36
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
37
+		'SS' => 'Sandstorm',
38
+		'DS' => 'Duststorm'
39 39
 	);
40 40
 	
41 41
 	function __construct($dbc = null) {
42
-                $Connection = new Connection($dbc);
43
-                $this->db = $Connection->db;
44
-        }
42
+				$Connection = new Connection($dbc);
43
+				$this->db = $Connection->db;
44
+		}
45 45
 
46
-       public static function check_last_update() {
47
-    		global $globalDBdriver;
48
-    		if ($globalDBdriver == 'mysql') {
46
+	   public static function check_last_update() {
47
+			global $globalDBdriver;
48
+			if ($globalDBdriver == 'mysql') {
49 49
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value > DATE_SUB(DATE(NOW()), INTERVAL 1 HOUR)";
50 50
 		} else {
51 51
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_metar' AND value::timestamp > CURRENT_TIMESTAMP - INTERVAL '1 HOURS'";
52 52
 		}
53
-                try {
54
-                        $Connection = new Connection();
55
-                        $sth = $Connection->db->prepare($query);
56
-                        $sth->execute();
57
-                } catch(PDOException $e) {
58
-                        return "error : ".$e->getMessage();
59
-                }
60
-                $row = $sth->fetch(PDO::FETCH_ASSOC);
61
-                if ($row['nb'] > 0) return false;
62
-                else return true;
63
-        }
53
+				try {
54
+						$Connection = new Connection();
55
+						$sth = $Connection->db->prepare($query);
56
+						$sth->execute();
57
+				} catch(PDOException $e) {
58
+						return "error : ".$e->getMessage();
59
+				}
60
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
61
+				if ($row['nb'] > 0) return false;
62
+				else return true;
63
+		}
64 64
 
65
-        public static function insert_last_update() {
66
-                $query = "DELETE FROM config WHERE name = 'last_update_metar';
65
+		public static function insert_last_update() {
66
+				$query = "DELETE FROM config WHERE name = 'last_update_metar';
67 67
                         INSERT INTO config (name,value) VALUES ('last_update_metar',NOW());";
68
-                try {
69
-                        $Connection = new Connection();
70
-                        $sth = $Connection->db->prepare($query);
71
-                        $sth->execute();
72
-                } catch(PDOException $e) {
73
-                        return "error : ".$e->getMessage();
74
-                }
75
-        }
68
+				try {
69
+						$Connection = new Connection();
70
+						$sth = $Connection->db->prepare($query);
71
+						$sth->execute();
72
+				} catch(PDOException $e) {
73
+						return "error : ".$e->getMessage();
74
+				}
75
+		}
76 76
 
77 77
 
78 78
         
79
-        public function parse($data) {
80
-    		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
81
-    		$codes = implode('|', array_keys($this->texts));
82
-    		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
83
-    		//$pieces = explode(' ',$data);
84
-    		$pieces = preg_split('/\s/',$data);
85
-    		$pos = 0;
86
-    		if ($pieces[0] == 'METAR') $pos++;
87
-    		elseif ($pieces[0] == 'SPECI') $pos++;
88
-    		if (strlen($pieces[$pos]) != 4) $pos++;
89
-    		$result['location'] = $pieces[$pos];
90
-    		$pos++;
91
-    		$result['dayofmonth'] = substr($pieces[$pos],0,2);
92
-    		$result['time'] = substr($pieces[$pos],2,4);
93
-    		$c = count($pieces);
94
-    		for($pos++; $pos < $c; $pos++) {
95
-    			$piece = $pieces[$pos];
96
-    			if ($piece == 'RMK') break;
97
-    			if ($piece == 'AUTO') $result['auto'] = true;
98
-    			if ($piece == 'COR') $result['correction'] = true;
99
-    			// Wind Speed
100
-    			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
101
-    				$result['wind']['direction'] = (float)$matches[1];
79
+		public function parse($data) {
80
+			//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
81
+			$codes = implode('|', array_keys($this->texts));
82
+			$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
83
+			//$pieces = explode(' ',$data);
84
+			$pieces = preg_split('/\s/',$data);
85
+			$pos = 0;
86
+			if ($pieces[0] == 'METAR') $pos++;
87
+			elseif ($pieces[0] == 'SPECI') $pos++;
88
+			if (strlen($pieces[$pos]) != 4) $pos++;
89
+			$result['location'] = $pieces[$pos];
90
+			$pos++;
91
+			$result['dayofmonth'] = substr($pieces[$pos],0,2);
92
+			$result['time'] = substr($pieces[$pos],2,4);
93
+			$c = count($pieces);
94
+			for($pos++; $pos < $c; $pos++) {
95
+				$piece = $pieces[$pos];
96
+				if ($piece == 'RMK') break;
97
+				if ($piece == 'AUTO') $result['auto'] = true;
98
+				if ($piece == 'COR') $result['correction'] = true;
99
+				// Wind Speed
100
+				if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
101
+					$result['wind']['direction'] = (float)$matches[1];
102 102
 				$result['wind']['unit'] = $matches[4];
103
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
104
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
105
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
103
+					if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
104
+					elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
105
+					elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
106 106
 				$result['wind']['gust'] = (float)$matches[3];
107 107
 				$result['wind']['unit'] = $matches[4];
108 108
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
109 109
 				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
110
-    			}
110
+				}
111 111
 
112 112
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
113 113
     				$result['wind_direction'] = (float)$matches[1];
@@ -124,35 +124,35 @@  discard block
 block discarded – undo
124 124
     				}
125 125
     			}
126 126
     			*/
127
-    			// Temperature
128
-    			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
129
-    				$temp = (float)$matches[1];
127
+				// Temperature
128
+				if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
129
+					$temp = (float)$matches[1];
130 130
 				if ($matches[1]{0} == 'M') {
131 131
 					$temp = ((float)substr($matches[1], 1)) * -1;
132 132
 				}
133
-    				$result['temperature'] = $temp;
134
-    				$dew = (float)$matches[2];
133
+					$result['temperature'] = $temp;
134
+					$dew = (float)$matches[2];
135 135
 				if ($matches[2]{0} == 'M') {
136 136
 					$dew = ((float)substr($matches[2], 1)) * -1;
137 137
 				}
138 138
 				$result['dew'] = $dew;
139
-    			}
140
-    			// QNH
141
-    			if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
142
-    			// #^(Q|A)(////|[0-9]{4})( )#
143
-    				if ($matches[1] == 'Q') {
144
-    					// hPa
145
-    					$result['QNH'] = $matches[2];
146
-    				} else {
147
-    					// inHg
148
-    					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
149 139
 				}
150
-    				/*
140
+				// QNH
141
+				if (preg_match('#^(A|Q)([0-9]{4})$#', $piece, $matches)) {
142
+				// #^(Q|A)(////|[0-9]{4})( )#
143
+					if ($matches[1] == 'Q') {
144
+						// hPa
145
+						$result['QNH'] = $matches[2];
146
+					} else {
147
+						// inHg
148
+						$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
149
+				}
150
+					/*
151 151
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
152 152
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
153 153
     				*/
154
-    			}
155
-                     /*
154
+				}
155
+					 /*
156 156
     			// Wind Direction
157 157
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
158 158
     				$result['wind_direction'] = $matches[1];
@@ -163,9 +163,9 @@  discard block
 block discarded – undo
163 163
     				$result['speed_variable'] = $matches[1];
164 164
     			}
165 165
     			*/
166
-    			// Visibility
167
-    			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
168
-    				if (isset($matches[3]) && strlen($matches[3]) > 0) {
166
+				// Visibility
167
+				if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
168
+					if (isset($matches[3]) && strlen($matches[3]) > 0) {
169 169
 					$result['visibility'] = (float)$matches[3] * 1609.34;
170 170
 				} else {
171 171
 					if ($matches[1] == '9999') {
@@ -178,26 +178,26 @@  discard block
 block discarded – undo
178 178
 					$result['visibility'] = '> 10000';
179 179
 					$result['weather'] = "CAVOK";
180 180
 				}
181
-    			}
182
-    			// Cloud Coverage
183
-    			if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
184
-    				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
185
-    				$type = $matches[1];
186
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
187
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
188
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
189
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
190
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
191
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
192
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
193
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
194
-    				$cloud['type_code'] = $type;
195
-    				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
196
-    				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
197
-    				$result['cloud'][] = $cloud;
198
-    			}
199
-    			// RVR
200
-    			 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
181
+				}
182
+				// Cloud Coverage
183
+				if (preg_match('#^(SKC|CLR|FEW|SCT|BKN|OVC|VV)([0-9]{3})(CB|TCU|CU|CI)?$#', $piece, $matches)) {
184
+					//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
185
+					$type = $matches[1];
186
+					if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
187
+					elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
188
+					elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
189
+					elseif ($type == 'FEW') $cloud['type'] = 'Few';
190
+					elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
191
+					elseif ($type == 'BKN') $cloud['type'] = 'Broken';
192
+					elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
193
+					elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
194
+					$cloud['type_code'] = $type;
195
+					$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
196
+					$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
197
+					$result['cloud'][] = $cloud;
198
+				}
199
+				// RVR
200
+				 if (preg_match('#^(R.+)/([M|P])?(\d{4})(?:V(\d+)|[UDN])?(FT)?$#', $piece, $matches)) {
201 201
 				$rvr['runway'] = $matches[1];
202 202
 				$rvr['assessment'] = $matches[2];
203 203
 				$rvr['rvr'] = $matches[3];
@@ -206,33 +206,33 @@  discard block
 block discarded – undo
206 206
 				$result['RVR'] = $rvr;
207 207
 			}
208 208
     			
209
-    			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
210
-    			if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
211
-    				//print_r($matches);
212
-    				// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
213
-    				$result['RVR']['runway'] = $matches[1];
214
-        			$result['RVR']['deposits'] = $matches[2];
215
-        			$result['RVR']['extent'] = $matches[3];
216
-        			$result['RVR']['depth'] = $matches[4];
217
-        			$result['RVR']['friction'] = $matches[5];
218
-    			}
219
-    			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
220
-    				//echo $piece;
221
-    				//print_r($matches);
222
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
223
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
209
+				//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
210
+				if (preg_match('#^R(\d{2}[LRC]?)/([\d/])([\d/])([\d/]{2})([\d/]{2})$#', $piece, $matches)) {
211
+					//print_r($matches);
212
+					// https://github.com/davidmegginson/metar-taf/blob/master/Metar.php
213
+					$result['RVR']['runway'] = $matches[1];
214
+					$result['RVR']['deposits'] = $matches[2];
215
+					$result['RVR']['extent'] = $matches[3];
216
+					$result['RVR']['depth'] = $matches[4];
217
+					$result['RVR']['friction'] = $matches[5];
218
+				}
219
+				if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
220
+					//echo $piece;
221
+					//print_r($matches);
222
+					if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
223
+					else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
224 224
 				if (isset($matches[3])) {
225 225
 					$range = Array(
226
-					    'from' => (float)$matches[2],
227
-					    'to'   => (float)$matches[4],
228
-					    'unit' => $matches[5] ? 'FT' : 'M'
226
+						'from' => (float)$matches[2],
227
+						'to'   => (float)$matches[4],
228
+						'unit' => $matches[5] ? 'FT' : 'M'
229 229
 					);
230 230
 				}
231 231
 				$result['RVR'] = $matches[1];
232 232
 				$result['RVR_range'] = $range;
233
-    			}
234
-    			// Weather
235
-    			if (preg_match($regWeather, $piece, $matches)) {
233
+				}
234
+				// Weather
235
+				if (preg_match($regWeather, $piece, $matches)) {
236 236
 				$text = Array();
237 237
 				switch ($matches[1]) {
238 238
 					case '+':
@@ -255,35 +255,35 @@  discard block
 block discarded – undo
255 255
 				}
256 256
 				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
257 257
 				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
258
-    			}
259
-    		}
260
-    		return $result;
258
+				}
259
+			}
260
+			return $result;
261 261
         
262
-        }
262
+		}
263 263
         
264 264
 	public function getMETAR($icao) {
265
-    		global $globalMETARcycle, $globalDBdriver;
266
-    		if (isset($globalMETARcycle) && $globalMETARcycle) {
267
-            		$query = "SELECT * FROM metar WHERE metar_location = :icao";
268
-                } else {
269
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
270
-            		elseif ($globalDBdriver == 'pgsql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
271
-                }
272
-                $query_values = array(':icao' => $icao);
273
-                 try {
274
-                        $sth = $this->db->prepare($query);
275
-                        $sth->execute($query_values);
276
-                } catch(PDOException $e) {
277
-                        return "error : ".$e->getMessage();
278
-                }
279
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
280
-                if ((!isset($globalMETARcyle) || $globalMETARcycle === false) && count($all) == 0) {
281
-            		$all = $this->downloadMETAR($icao);
282
-                }
283
-                return $all;
284
-        }
265
+			global $globalMETARcycle, $globalDBdriver;
266
+			if (isset($globalMETARcycle) && $globalMETARcycle) {
267
+					$query = "SELECT * FROM metar WHERE metar_location = :icao";
268
+				} else {
269
+					if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
270
+					elseif ($globalDBdriver == 'pgsql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
271
+				}
272
+				$query_values = array(':icao' => $icao);
273
+				 try {
274
+						$sth = $this->db->prepare($query);
275
+						$sth->execute($query_values);
276
+				} catch(PDOException $e) {
277
+						return "error : ".$e->getMessage();
278
+				}
279
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
280
+				if ((!isset($globalMETARcyle) || $globalMETARcycle === false) && count($all) == 0) {
281
+					$all = $this->downloadMETAR($icao);
282
+				}
283
+				return $all;
284
+		}
285 285
 
286
-       public function addMETAR($location,$metar,$date) {
286
+	   public function addMETAR($location,$metar,$date) {
287 287
 		global $globalDBdriver;
288 288
 		$date = date('Y-m-d H:i:s',strtotime($date));
289 289
 		if ($globalDBdriver == 'mysql') {
@@ -291,98 +291,98 @@  discard block
 block discarded – undo
291 291
 		} else {
292 292
 			$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);";
293 293
 		}
294
-                $query_values = array(':location' => $location,':date' => $date,':metar' => $metar);
295
-                 try {
296
-                        $sth = $this->db->prepare($query);
297
-                        $sth->execute($query_values);
298
-                } catch(PDOException $e) {
299
-                        return "error : ".$e->getMessage();
300
-                }
301
-        }
294
+				$query_values = array(':location' => $location,':date' => $date,':metar' => $metar);
295
+				 try {
296
+						$sth = $this->db->prepare($query);
297
+						$sth->execute($query_values);
298
+				} catch(PDOException $e) {
299
+						return "error : ".$e->getMessage();
300
+				}
301
+		}
302 302
 
303
-       public function deleteMETAR($id) {
304
-                $query = "DELETE FROM metar WHERE id = :id";
305
-                $query_values = array(':id' => $id);
306
-                 try {
307
-                        $sth = $this->db->prepare($query);
308
-                        $sth->execute($query_values);
309
-                } catch(PDOException $e) {
310
-                        return "error : ".$e->getMessage();
311
-                }
312
-        }
313
-       public function deleteAllMETARLocation() {
314
-                $query = "DELETE FROM metar";
315
-                 try {
316
-                        $sth = $this->db->prepare($query);
317
-                        $sth->execute();
318
-                } catch(PDOException $e) {
319
-                        return "error : ".$e->getMessage();
320
-                }
321
-        }
303
+	   public function deleteMETAR($id) {
304
+				$query = "DELETE FROM metar WHERE id = :id";
305
+				$query_values = array(':id' => $id);
306
+				 try {
307
+						$sth = $this->db->prepare($query);
308
+						$sth->execute($query_values);
309
+				} catch(PDOException $e) {
310
+						return "error : ".$e->getMessage();
311
+				}
312
+		}
313
+	   public function deleteAllMETARLocation() {
314
+				$query = "DELETE FROM metar";
315
+				 try {
316
+						$sth = $this->db->prepare($query);
317
+						$sth->execute();
318
+				} catch(PDOException $e) {
319
+						return "error : ".$e->getMessage();
320
+				}
321
+		}
322 322
         
323
-        public function addMETARCycle() {
324
-    		global $globalDebug, $globalIVAO;
325
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
326
-    		date_default_timezone_set("UTC");
327
-    		$Common = new Common();
328
-    		if (isset($globalIVAO) && $globalIVAO) {
329
-        		$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
330
-    		} else {
323
+		public function addMETARCycle() {
324
+			global $globalDebug, $globalIVAO;
325
+			if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
326
+			date_default_timezone_set("UTC");
327
+			$Common = new Common();
328
+			if (isset($globalIVAO) && $globalIVAO) {
329
+				$cycle = $Common->getData('http://wx.ivao.aero/metar.php');
330
+			} else {
331 331
 			$cycle = $Common->getData('http://weather.noaa.gov/pub/data/observations/metar/cycles/'.date('H').'Z.TXT');
332
-    		}
333
-    		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
334
-    		$date = '';
335
-    		foreach(explode("\n",$cycle) as $line) {
336
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
337
-    				//echo "date : ".$line."\n";
338
-    				$date = $line;
339
-    			} elseif ($line != '') {
340
-    			    //$this->parse($line);
341
-    			    //echo $line;
342
-    			    if ($date == '') $date = date('Y/m/d H:m');
343
-    			    $pos = 0;
344
-    			    $pieces = preg_split('/\s/',$line);
345
-    			    if ($pieces[0] == 'METAR') $pos++;
346
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
347
-	        	    $location = $pieces[$pos];
348
-	        	    echo $this->addMETAR($location,$line,$date);
349
-    			}
350
-    			//echo $line."\n";
351
-    		}
352
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
332
+			}
333
+			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
334
+			$date = '';
335
+			foreach(explode("\n",$cycle) as $line) {
336
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
337
+					//echo "date : ".$line."\n";
338
+					$date = $line;
339
+				} elseif ($line != '') {
340
+					//$this->parse($line);
341
+					//echo $line;
342
+					if ($date == '') $date = date('Y/m/d H:m');
343
+					$pos = 0;
344
+					$pieces = preg_split('/\s/',$line);
345
+					if ($pieces[0] == 'METAR') $pos++;
346
+					if (strlen($pieces[$pos]) != 4) $pos++;
347
+					$location = $pieces[$pos];
348
+					echo $this->addMETAR($location,$line,$date);
349
+				}
350
+				//echo $line."\n";
351
+			}
352
+			if (isset($globalDebug) && $globalDebug) echo "Done\n";
353 353
         
354
-        }
355
-        public function downloadMETAR($icao) {
356
-    		global $globalMETARurl;
357
-    		if ($globalMETARurl == '') return array();
358
-    		date_default_timezone_set("UTC");
359
-    		$Common = new Common();
360
-    		$url = str_replace('{icao}',$icao,$globalMETARurl);
361
-    		$cycle = $Common->getData($url);
362
-    		$date = '';
363
-    		foreach(explode("\n",$cycle) as $line) {
364
-    			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
365
-    				echo "date : ".$line."\n";
366
-    				$date = $line;
367
-    			} elseif ($line != '') {
368
-    			    //$this->parse($line);
369
-    			    //echo $line;
370
-    			    if ($date == '') $date = date('Y/m/d H:m');
371
-    			    $pos = 0;
372
-    			    $pieces = preg_split('/\s/',$line);
373
-    			    if ($pieces[0] == 'METAR') $pos++;
374
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
375
-	        	    $location = $pieces[$pos];
376
-	        	    if (strlen($location == 4)) {
377
-	        		$this->addMETAR($location,$line,$date);
378
-	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
379
-	        	    } else return array();
380
-    			}
381
-    			//echo $line."\n";
382
-    		}
383
-    		return array();
354
+		}
355
+		public function downloadMETAR($icao) {
356
+			global $globalMETARurl;
357
+			if ($globalMETARurl == '') return array();
358
+			date_default_timezone_set("UTC");
359
+			$Common = new Common();
360
+			$url = str_replace('{icao}',$icao,$globalMETARurl);
361
+			$cycle = $Common->getData($url);
362
+			$date = '';
363
+			foreach(explode("\n",$cycle) as $line) {
364
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
365
+					echo "date : ".$line."\n";
366
+					$date = $line;
367
+				} elseif ($line != '') {
368
+					//$this->parse($line);
369
+					//echo $line;
370
+					if ($date == '') $date = date('Y/m/d H:m');
371
+					$pos = 0;
372
+					$pieces = preg_split('/\s/',$line);
373
+					if ($pieces[0] == 'METAR') $pos++;
374
+					if (strlen($pieces[$pos]) != 4) $pos++;
375
+					$location = $pieces[$pos];
376
+					if (strlen($location == 4)) {
377
+					$this->addMETAR($location,$line,$date);
378
+					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
379
+					} else return array();
380
+				}
381
+				//echo $line."\n";
382
+			}
383
+			return array();
384 384
         
385
-        }
385
+		}
386 386
 }
387 387
 /*
388 388
 $METAR = new METAR();
Please login to merge, or discard this patch.
require/class.SpotterArchive.php 1 patch
Indentation   +448 added lines, -448 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 class SpotterArchive {
3
-    public $global_query = "SELECT spotter_archive.* FROM spotter_archive";
4
-    public $db;
3
+	public $global_query = "SELECT spotter_archive.* FROM spotter_archive";
4
+	public $db;
5 5
 
6
-    function __construct($dbc = null) {
7
-            $Connection = new Connection($dbc);
8
-            $this->db = $Connection->db;
9
-    }
6
+	function __construct($dbc = null) {
7
+			$Connection = new Connection($dbc);
8
+			$this->db = $Connection->db;
9
+	}
10 10
 
11 11
 
12
-    // Spotter_archive
12
+	// Spotter_archive
13 13
     
14
-    function 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 = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') {
14
+	function 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 = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') {
15 15
 	require_once(dirname(__FILE__).'/class.Spotter.php');
16
-        if ($over_country == '') {
17
-	        $Spotter = new Spotter($this->db);
18
-	        $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
16
+		if ($over_country == '') {
17
+			$Spotter = new Spotter($this->db);
18
+			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
19 19
 		if (!empty($data_country)) $country = $data_country['iso2'];
20 20
 		else $country = '';
21 21
 	} else $country = $over_country;
@@ -28,55 +28,55 @@  discard block
 block discarded – undo
28 28
 	$query  = "INSERT INTO spotter_archive (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, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name)
29 29
                 VALUES (: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, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name)";
30 30
 
31
-        $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name);
32
-        try {
33
-            $sth = $this->db->prepare($query);
34
-            $sth->execute($query_values);
35
-        } catch(PDOException $e) {
36
-            return "error : ".$e->getMessage();
37
-        }
38
-        return "success";
39
-    }
40
-
41
-
42
-        /**
43
-        * Gets all the spotter information based on a particular callsign
44
-        *
45
-        * @return Array the spotter information
46
-        *
47
-        */
48
-        public function getLastArchiveSpotterDataByIdent($ident)
49
-        {
31
+		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name);
32
+		try {
33
+			$sth = $this->db->prepare($query);
34
+			$sth->execute($query_values);
35
+		} catch(PDOException $e) {
36
+			return "error : ".$e->getMessage();
37
+		}
38
+		return "success";
39
+	}
40
+
41
+
42
+		/**
43
+		 * Gets all the spotter information based on a particular callsign
44
+		 *
45
+		 * @return Array the spotter information
46
+		 *
47
+		 */
48
+		public function getLastArchiveSpotterDataByIdent($ident)
49
+		{
50 50
 		$Spotter = new Spotter($this->db);
51
-                date_default_timezone_set('UTC');
51
+				date_default_timezone_set('UTC');
52 52
 
53
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
54
-                //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
55
-                $query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
53
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
54
+				//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
55
+				$query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
56 56
 
57
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
57
+				$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
58 58
 
59
-                return $spotter_array;
60
-        }
59
+				return $spotter_array;
60
+		}
61 61
 
62 62
 
63
-        /**
64
-        * Gets last the spotter information based on a particular id
65
-        *
66
-        * @return Array the spotter information
67
-        *
68
-        */
69
-        public function getLastArchiveSpotterDataById($id)
70
-        {
71
-    		$Spotter = new Spotter($this->db);
72
-                date_default_timezone_set('UTC');
73
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
74
-                //$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
75
-                //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
76
-                $query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
63
+		/**
64
+		 * Gets last the spotter information based on a particular id
65
+		 *
66
+		 * @return Array the spotter information
67
+		 *
68
+		 */
69
+		public function getLastArchiveSpotterDataById($id)
70
+		{
71
+			$Spotter = new Spotter($this->db);
72
+				date_default_timezone_set('UTC');
73
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
74
+				//$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
75
+				//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
76
+				$query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
77 77
 
78 78
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
79
-                  /*
79
+				  /*
80 80
                 try {
81 81
                         $Connection = new Connection();
82 82
                         $sth = Connection->$db->prepare($query);
@@ -86,200 +86,200 @@  discard block
 block discarded – undo
86 86
                 }
87 87
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
88 88
                 */
89
-                $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
90
-
91
-                return $spotter_array;
92
-        }
93
-
94
-        /**
95
-        * Gets all the spotter information based on a particular id
96
-        *
97
-        * @return Array the spotter information
98
-        *
99
-        */
100
-        public function getAllArchiveSpotterDataById($id)
101
-        {
102
-                date_default_timezone_set('UTC');
103
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
104
-                $query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id";
89
+				$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
90
+
91
+				return $spotter_array;
92
+		}
93
+
94
+		/**
95
+		 * Gets all the spotter information based on a particular id
96
+		 *
97
+		 * @return Array the spotter information
98
+		 *
99
+		 */
100
+		public function getAllArchiveSpotterDataById($id)
101
+		{
102
+				date_default_timezone_set('UTC');
103
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
104
+				$query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id";
105 105
 
106 106
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
107 107
 
108
-                try {
109
-                        $sth = $this->db->prepare($query);
110
-                        $sth->execute(array(':id' => $id));
111
-                } catch(PDOException $e) {
112
-                        return "error";
113
-                }
114
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
108
+				try {
109
+						$sth = $this->db->prepare($query);
110
+						$sth->execute(array(':id' => $id));
111
+				} catch(PDOException $e) {
112
+						return "error";
113
+				}
114
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
115 115
 
116
-                return $spotter_array;
117
-        }
116
+				return $spotter_array;
117
+		}
118 118
 
119 119
 
120
-        /**
121
-        * Gets altitude information based on a particular callsign
122
-        *
123
-        * @return Array the spotter information
124
-        *
125
-        */
126
-        public function getAltitudeArchiveSpotterDataByIdent($ident)
127
-        {
120
+		/**
121
+		 * Gets altitude information based on a particular callsign
122
+		 *
123
+		 * @return Array the spotter information
124
+		 *
125
+		 */
126
+		public function getAltitudeArchiveSpotterDataByIdent($ident)
127
+		{
128 128
 
129
-                date_default_timezone_set('UTC');
129
+				date_default_timezone_set('UTC');
130 130
 
131
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
132
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
131
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
132
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
133 133
 
134
-                try {
135
-                        $sth = $this->db->prepare($query);
136
-                        $sth->execute(array(':ident' => $ident));
137
-                } catch(PDOException $e) {
138
-                        return "error";
139
-                }
140
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
134
+				try {
135
+						$sth = $this->db->prepare($query);
136
+						$sth->execute(array(':ident' => $ident));
137
+				} catch(PDOException $e) {
138
+						return "error";
139
+				}
140
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
141 141
 
142
-                return $spotter_array;
143
-        }
142
+				return $spotter_array;
143
+		}
144 144
 
145
-        /**
146
-        * Gets altitude information based on a particular id
147
-        *
148
-        * @return Array the spotter information
149
-        *
150
-        */
151
-        public function getAltitudeArchiveSpotterDataById($id)
152
-        {
145
+		/**
146
+		 * Gets altitude information based on a particular id
147
+		 *
148
+		 * @return Array the spotter information
149
+		 *
150
+		 */
151
+		public function getAltitudeArchiveSpotterDataById($id)
152
+		{
153 153
 
154
-                date_default_timezone_set('UTC');
154
+				date_default_timezone_set('UTC');
155 155
 
156
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
157
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
156
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
157
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
158 158
 
159
-                try {
160
-                        $sth = $this->db->prepare($query);
161
-                        $sth->execute(array(':id' => $id));
162
-                } catch(PDOException $e) {
163
-                        return "error";
164
-                }
165
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
159
+				try {
160
+						$sth = $this->db->prepare($query);
161
+						$sth->execute(array(':id' => $id));
162
+				} catch(PDOException $e) {
163
+						return "error";
164
+				}
165
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
166 166
 
167
-                return $spotter_array;
168
-        }
167
+				return $spotter_array;
168
+		}
169 169
 
170
-        /**
171
-        * Gets altitude & speed information based on a particular id
172
-        *
173
-        * @return Array the spotter information
174
-        *
175
-        */
176
-        public function getAltitudeSpeedArchiveSpotterDataById($id)
177
-        {
170
+		/**
171
+		 * Gets altitude & speed information based on a particular id
172
+		 *
173
+		 * @return Array the spotter information
174
+		 *
175
+		 */
176
+		public function getAltitudeSpeedArchiveSpotterDataById($id)
177
+		{
178 178
 
179
-                date_default_timezone_set('UTC');
179
+				date_default_timezone_set('UTC');
180 180
 
181
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
182
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
181
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
182
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
183 183
 
184
-                try {
185
-                        $sth = $this->db->prepare($query);
186
-                        $sth->execute(array(':id' => $id));
187
-                } catch(PDOException $e) {
188
-		        return "error : ".$e->getMessage();
189
-                }
190
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
184
+				try {
185
+						$sth = $this->db->prepare($query);
186
+						$sth->execute(array(':id' => $id));
187
+				} catch(PDOException $e) {
188
+				return "error : ".$e->getMessage();
189
+				}
190
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
191 191
 
192
-                return $spotter_array;
193
-        }
192
+				return $spotter_array;
193
+		}
194 194
 
195 195
 
196
-        /**
197
-        * Gets altitude information based on a particular callsign
198
-        *
199
-        * @return Array the spotter information
200
-        *
201
-        */
202
-        public function getLastAltitudeArchiveSpotterDataByIdent($ident)
203
-        {
196
+		/**
197
+		 * Gets altitude information based on a particular callsign
198
+		 *
199
+		 * @return Array the spotter information
200
+		 *
201
+		 */
202
+		public function getLastAltitudeArchiveSpotterDataByIdent($ident)
203
+		{
204 204
 
205
-                date_default_timezone_set('UTC');
205
+				date_default_timezone_set('UTC');
206 206
 
207
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
208
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
207
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
208
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
209 209
 //                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
210 210
 
211
-                try {
212
-                        $sth = $this->db->prepare($query);
213
-                        $sth->execute(array(':ident' => $ident));
214
-                } catch(PDOException $e) {
215
-                        return "error";
216
-                }
217
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
211
+				try {
212
+						$sth = $this->db->prepare($query);
213
+						$sth->execute(array(':ident' => $ident));
214
+				} catch(PDOException $e) {
215
+						return "error";
216
+				}
217
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
218 218
 
219
-                return $spotter_array;
220
-        }
219
+				return $spotter_array;
220
+		}
221 221
 
222 222
 
223 223
 
224
-       /**
225
-        * Gets all the archive spotter information
226
-        *
227
-        * @return Array the spotter information
228
-        *
229
-        */
230
-        public function getSpotterArchiveData($ident,$flightaware_id,$date)
231
-        {
232
-    		$Spotter = new Spotter($this->db);
233
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
234
-                $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 AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
224
+	   /**
225
+	    * Gets all the archive spotter information
226
+	    *
227
+	    * @return Array the spotter information
228
+	    *
229
+	    */
230
+		public function getSpotterArchiveData($ident,$flightaware_id,$date)
231
+		{
232
+			$Spotter = new Spotter($this->db);
233
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
234
+				$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 AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
235 235
 
236
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
236
+				$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
237 237
 
238
-                return $spotter_array;
239
-        }
238
+				return $spotter_array;
239
+		}
240 240
         
241
-        public function deleteSpotterArchiveTrackData()
242
-        {
241
+		public function deleteSpotterArchiveTrackData()
242
+		{
243 243
 		global $globalArchiveKeepTrackMonths;
244
-                date_default_timezone_set('UTC');
244
+				date_default_timezone_set('UTC');
245 245
 		$query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
246
-                try {
247
-                        $sth = $this->db->prepare($query);
248
-                        $sth->execute();
249
-                } catch(PDOException $e) {
250
-                        return "error";
251
-                }
246
+				try {
247
+						$sth = $this->db->prepare($query);
248
+						$sth->execute();
249
+				} catch(PDOException $e) {
250
+						return "error";
251
+				}
252 252
 	}
253 253
 
254 254
 	 /**
255
-        * Gets Minimal Live Spotter data
256
-        *
257
-        * @return Array the spotter information
258
-        *
259
-        */
260
-        public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
261
-        {
262
-                global $globalDBdriver, $globalLiveInterval;
263
-                date_default_timezone_set('UTC');
264
-
265
-                $filter_query = '';
266
-                if (isset($filter['source']) && !empty($filter['source'])) {
267
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
268
-                }
269
-                // FIXME : use spotter_output also
270
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
271
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
272
-                }
273
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
274
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
275
-                }
276
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
277
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
278
-                }
279
-
280
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
281
-                if ($globalDBdriver == 'mysql') {
282
-                        /*
255
+	  * Gets Minimal Live Spotter data
256
+	  *
257
+	  * @return Array the spotter information
258
+	  *
259
+	  */
260
+		public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
261
+		{
262
+				global $globalDBdriver, $globalLiveInterval;
263
+				date_default_timezone_set('UTC');
264
+
265
+				$filter_query = '';
266
+				if (isset($filter['source']) && !empty($filter['source'])) {
267
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
268
+				}
269
+				// FIXME : use spotter_output also
270
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
271
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
272
+				}
273
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
274
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
275
+				}
276
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
277
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
278
+				}
279
+
280
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
281
+				if ($globalDBdriver == 'mysql') {
282
+						/*
283 283
                         $query  = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk 
284 284
                     		    FROM spotter_archive 
285 285
                     		    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
@@ -291,79 +291,79 @@  discard block
 block discarded – undo
291 291
 						WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".') 
292 292
 						GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id 
293 293
 				    AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
294
-                } else if ($globalDBdriver == 'pgsql') {
295
-                        $query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
296
-                }
297
-                //echo $query;
298
-                try {
299
-                        $sth = $this->db->prepare($query);
300
-                        $sth->execute();
301
-                } catch(PDOException $e) {
302
-                        return "error";
303
-                }
304
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
305
-
306
-                return $spotter_array;
307
-        }
294
+				} else if ($globalDBdriver == 'pgsql') {
295
+						$query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
296
+				}
297
+				//echo $query;
298
+				try {
299
+						$sth = $this->db->prepare($query);
300
+						$sth->execute();
301
+				} catch(PDOException $e) {
302
+						return "error";
303
+				}
304
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
305
+
306
+				return $spotter_array;
307
+		}
308 308
 
309 309
 	 /**
310
-        * Gets count Live Spotter data
311
-        *
312
-        * @return Array the spotter information
313
-        *
314
-        */
315
-        public function getLiveSpotterCount($begindate,$enddate,$filter = array())
316
-        {
317
-                global $globalDBdriver, $globalLiveInterval;
318
-                date_default_timezone_set('UTC');
319
-
320
-                $filter_query = '';
321
-                if (isset($filter['source']) && !empty($filter['source'])) {
322
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
323
-                }
324
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
325
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
326
-                }
327
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
328
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
329
-                }
330
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
331
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
332
-                }
333
-
334
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
335
-                if ($globalDBdriver == 'mysql') {
310
+	  * Gets count Live Spotter data
311
+	  *
312
+	  * @return Array the spotter information
313
+	  *
314
+	  */
315
+		public function getLiveSpotterCount($begindate,$enddate,$filter = array())
316
+		{
317
+				global $globalDBdriver, $globalLiveInterval;
318
+				date_default_timezone_set('UTC');
319
+
320
+				$filter_query = '';
321
+				if (isset($filter['source']) && !empty($filter['source'])) {
322
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
323
+				}
324
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
325
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
326
+				}
327
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
328
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
329
+				}
330
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
331
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
332
+				}
333
+
334
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
335
+				if ($globalDBdriver == 'mysql') {
336 336
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb 
337 337
 			FROM spotter_archive l 
338 338
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
339 339
 
340
-                } else if ($globalDBdriver == 'pgsql') {
340
+				} else if ($globalDBdriver == 'pgsql') {
341 341
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
342
-                }
343
-                //echo $query;
344
-                try {
345
-                        $sth = $this->db->prepare($query);
346
-                        $sth->execute();
347
-                } catch(PDOException $e) {
348
-                        return "error";
349
-                }
342
+				}
343
+				//echo $query;
344
+				try {
345
+						$sth = $this->db->prepare($query);
346
+						$sth->execute();
347
+				} catch(PDOException $e) {
348
+						return "error";
349
+				}
350 350
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
351
-                return $result['nb'];
351
+				return $result['nb'];
352 352
 
353
-        }
353
+		}
354 354
 
355 355
 
356 356
 
357 357
 	// Spotter_Archive_output
358 358
 	
359
-    /**
360
-    * Gets all the spotter information
361
-    *
362
-    * @return Array the spotter information
363
-    *
364
-    */
365
-    public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '')
366
-    {
359
+	/**
360
+	 * Gets all the spotter information
361
+	 *
362
+	 * @return Array the spotter information
363
+	 *
364
+	 */
365
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '')
366
+	{
367 367
 	global $globalTimezone, $globalDbdriver;
368 368
 	require_once(dirname(__FILE__).'/class.Translation.php');
369 369
 	$Translation = new Translation();
@@ -374,159 +374,159 @@  discard block
 block discarded – undo
374 374
 	$additional_query = '';
375 375
 	if ($q != "")
376 376
 	{
377
-	    if (!is_string($q))
378
-	    {
377
+		if (!is_string($q))
378
+		{
379 379
 		return false;
380
-	    } else {
380
+		} else {
381 381
 	        
382 382
 		$q_array = explode(" ", $q);
383 383
 		
384 384
 		foreach ($q_array as $q_item){
385
-		    $additional_query .= " AND (";
386
-		    $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
387
-		    $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
388
-		    $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR ";
389
-		    $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
390
-		    $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR ";
391
-		    $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR ";
392
-		    $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR ";
393
-		    $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
394
-		    $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR ";
395
-		    $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR ";
396
-		    $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR ";
397
-		    $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
398
-		    $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
399
-		    $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
400
-		    $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
401
-		    $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR ";
402
-		    $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR ";
403
-		    $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR ";
404
-		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
405
-		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
406
-		    $translate = $Translation->ident2icao($q_item);
407
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
408
-		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
409
-		    $additional_query .= ")";
410
-		}
411
-	    }
385
+			$additional_query .= " AND (";
386
+			$additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
387
+			$additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
388
+			$additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR ";
389
+			$additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
390
+			$additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR ";
391
+			$additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR ";
392
+			$additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR ";
393
+			$additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
394
+			$additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR ";
395
+			$additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR ";
396
+			$additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR ";
397
+			$additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
398
+			$additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
399
+			$additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
400
+			$additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
401
+			$additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR ";
402
+			$additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR ";
403
+			$additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR ";
404
+			$additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
405
+			$additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
406
+			$translate = $Translation->ident2icao($q_item);
407
+			if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
408
+			$additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
409
+			$additional_query .= ")";
410
+		}
411
+		}
412 412
 	}
413 413
 	
414 414
 	if ($registration != "")
415 415
 	{
416
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
417
-	    if (!is_string($registration))
418
-	    {
416
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
417
+		if (!is_string($registration))
418
+		{
419 419
 		return false;
420
-	    } else {
420
+		} else {
421 421
 		$additional_query .= " AND (spotter_archive_output.registration = '".$registration."')";
422
-	    }
422
+		}
423 423
 	}
424 424
 	
425 425
 	if ($aircraft_icao != "")
426 426
 	{
427
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
428
-	    if (!is_string($aircraft_icao))
429
-	    {
427
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
428
+		if (!is_string($aircraft_icao))
429
+		{
430 430
 		return false;
431
-	    } else {
431
+		} else {
432 432
 		$additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')";
433
-	    }
433
+		}
434 434
 	}
435 435
 	
436 436
 	if ($aircraft_manufacturer != "")
437 437
 	{
438
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
439
-	    if (!is_string($aircraft_manufacturer))
440
-	    {
438
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
439
+		if (!is_string($aircraft_manufacturer))
440
+		{
441 441
 		return false;
442
-	    } else {
442
+		} else {
443 443
 		$additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
444
-	    }
444
+		}
445 445
 	}
446 446
 	
447 447
 	if ($highlights == "true")
448 448
 	{
449
-	    if (!is_string($highlights))
450
-	    {
449
+		if (!is_string($highlights))
450
+		{
451 451
 		return false;
452
-	    } else {
452
+		} else {
453 453
 		$additional_query .= " AND (spotter_archive_output.highlight <> '')";
454
-	    }
454
+		}
455 455
 	}
456 456
 	
457 457
 	if ($airline_icao != "")
458 458
 	{
459
-	    $registration = filter_var($airline_icao,FILTER_SANITIZE_STRING);
460
-	    if (!is_string($airline_icao))
461
-	    {
459
+		$registration = filter_var($airline_icao,FILTER_SANITIZE_STRING);
460
+		if (!is_string($airline_icao))
461
+		{
462 462
 		return false;
463
-	    } else {
463
+		} else {
464 464
 		$additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')";
465
-	    }
465
+		}
466 466
 	}
467 467
 	
468 468
 	if ($airline_country != "")
469 469
 	{
470
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
471
-	    if (!is_string($airline_country))
472
-	    {
470
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
471
+		if (!is_string($airline_country))
472
+		{
473 473
 		return false;
474
-	    } else {
474
+		} else {
475 475
 		$additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')";
476
-	    }
476
+		}
477 477
 	}
478 478
 	
479 479
 	if ($airline_type != "")
480 480
 	{
481
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
482
-	    if (!is_string($airline_type))
483
-	    {
481
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
482
+		if (!is_string($airline_type))
483
+		{
484 484
 		return false;
485
-	    } else {
485
+		} else {
486 486
 		if ($airline_type == "passenger")
487 487
 		{
488
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')";
488
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')";
489 489
 		}
490 490
 		if ($airline_type == "cargo")
491 491
 		{
492
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')";
492
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')";
493 493
 		}
494 494
 		if ($airline_type == "military")
495 495
 		{
496
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'military')";
496
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'military')";
497
+		}
497 498
 		}
498
-	    }
499 499
 	}
500 500
 	
501 501
 	if ($airport != "")
502 502
 	{
503
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
504
-	    if (!is_string($airport))
505
-	    {
503
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
504
+		if (!is_string($airport))
505
+		{
506 506
 		return false;
507
-	    } else {
507
+		} else {
508 508
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))";
509
-	    }
509
+		}
510 510
 	}
511 511
 	
512 512
 	if ($airport_country != "")
513 513
 	{
514
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
515
-	    if (!is_string($airport_country))
516
-	    {
514
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
515
+		if (!is_string($airport_country))
516
+		{
517 517
 		return false;
518
-	    } else {
518
+		} else {
519 519
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))";
520
-	    }
520
+		}
521 521
 	}
522 522
     
523 523
 	if ($callsign != "")
524 524
 	{
525
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
526
-	    if (!is_string($callsign))
527
-	    {
525
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
526
+		if (!is_string($callsign))
527
+		{
528 528
 		return false;
529
-	    } else {
529
+		} else {
530 530
 		$translate = $Translation->ident2icao($callsign);
531 531
 		if ($translate != $callsign) {
532 532
 			$additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)";
@@ -534,99 +534,99 @@  discard block
 block discarded – undo
534 534
 		} else {
535 535
 			$additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')";
536 536
 		}
537
-	    }
537
+		}
538 538
 	}
539 539
 
540 540
 	if ($owner != "")
541 541
 	{
542
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
543
-	    if (!is_string($owner))
544
-	    {
542
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
543
+		if (!is_string($owner))
544
+		{
545 545
 		return false;
546
-	    } else {
546
+		} else {
547 547
 		$additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')";
548
-	    }
548
+		}
549 549
 	}
550 550
 
551 551
 	if ($pilot_name != "")
552 552
 	{
553
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
554
-	    if (!is_string($pilot_name))
555
-	    {
553
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
554
+		if (!is_string($pilot_name))
555
+		{
556 556
 		return false;
557
-	    } else {
557
+		} else {
558 558
 		$additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')";
559
-	    }
559
+		}
560 560
 	}
561 561
 	
562 562
 	if ($pilot_id != "")
563 563
 	{
564
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
565
-	    if (!is_string($pilot_id))
566
-	    {
564
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
565
+		if (!is_string($pilot_id))
566
+		{
567 567
 		return false;
568
-	    } else {
568
+		} else {
569 569
 		$additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')";
570
-	    }
570
+		}
571 571
 	}
572 572
 	
573 573
 	if ($departure_airport_route != "")
574 574
 	{
575
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
576
-	    if (!is_string($departure_airport_route))
577
-	    {
575
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
576
+		if (!is_string($departure_airport_route))
577
+		{
578 578
 		return false;
579
-	    } else {
579
+		} else {
580 580
 		$additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')";
581
-	    }
581
+		}
582 582
 	}
583 583
 	
584 584
 	if ($arrival_airport_route != "")
585 585
 	{
586
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
587
-	    if (!is_string($arrival_airport_route))
588
-	    {
586
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
587
+		if (!is_string($arrival_airport_route))
588
+		{
589 589
 		return false;
590
-	    } else {
590
+		} else {
591 591
 		$additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
592
-	    }
592
+		}
593 593
 	}
594 594
 	
595 595
 	if ($altitude != "")
596 596
 	{
597
-	    $altitude_array = explode(",", $altitude);
597
+		$altitude_array = explode(",", $altitude);
598 598
 	    
599
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
600
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
599
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
600
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
601 601
 	    
602 602
 
603
-	    if ($altitude_array[1] != "")
604
-	    {                
603
+		if ($altitude_array[1] != "")
604
+		{                
605 605
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
606 606
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
607 607
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
608
-	    } else {
608
+		} else {
609 609
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
610 610
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
611
-	    }
611
+		}
612 612
 	}
613 613
 	
614 614
 	if ($date_posted != "")
615 615
 	{
616
-	    $date_array = explode(",", $date_posted);
616
+		$date_array = explode(",", $date_posted);
617 617
 	    
618
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
619
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
618
+		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
619
+		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
620 620
 	    
621
-	    if ($globalTimezone != '') {
621
+		if ($globalTimezone != '') {
622 622
 		date_default_timezone_set($globalTimezone);
623 623
 		$datetime = new DateTime();
624 624
 		$offset = $datetime->format('P');
625
-	    } else $offset = '+00:00';
625
+		} else $offset = '+00:00';
626 626
 
627 627
 
628
-	    if ($date_array[1] != "")
629
-	    {                
628
+		if ($date_array[1] != "")
629
+		{                
630 630
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
631 631
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
632 632
 		if ($globalDBdriver == 'mysql') {
@@ -634,28 +634,28 @@  discard block
 block discarded – undo
634 634
 		} else {
635 635
 			$additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
636 636
 		}
637
-	    } else {
637
+		} else {
638 638
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
639
-                if ($globalDBdriver == 'mysql') {
639
+				if ($globalDBdriver == 'mysql') {
640 640
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
641 641
 		} else {
642 642
 			$additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
643 643
 		}
644
-	    }
644
+		}
645 645
 	}
646 646
 	
647 647
 	if ($limit != "")
648 648
 	{
649
-	    $limit_array = explode(",", $limit);
649
+		$limit_array = explode(",", $limit);
650 650
 	    
651
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
652
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
651
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
652
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
653 653
 	    
654
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
655
-	    {
654
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
655
+		{
656 656
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
657 657
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
658
-	    }
658
+		}
659 659
 	}
660 660
 	
661 661
 
@@ -687,33 +687,33 @@  discard block
 block discarded – undo
687 687
 	$spotter_array = $Spotter->getDataFromDB($query, array(),$limit_query);
688 688
 
689 689
 	return $spotter_array;
690
-    }
690
+	}
691 691
 
692
-    public function deleteSpotterArchiveData()
693
-    {
692
+	public function deleteSpotterArchiveData()
693
+	{
694 694
 		global $globalArchiveKeepMonths, $globalDBdriver;
695
-                date_default_timezone_set('UTC');
696
-                if ($globalDBdriver == 'mysql') {
695
+				date_default_timezone_set('UTC');
696
+				if ($globalDBdriver == 'mysql') {
697 697
 			$query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
698 698
 		} else {
699 699
 			$query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
700 700
 		}
701
-                try {
702
-                        $sth = $this->db->prepare($query);
703
-                        $sth->execute();
704
-                } catch(PDOException $e) {
705
-                        return "error";
706
-                }
701
+				try {
702
+						$sth = $this->db->prepare($query);
703
+						$sth->execute();
704
+				} catch(PDOException $e) {
705
+						return "error";
706
+				}
707 707
 	}
708 708
 
709
-    /**
710
-    * Gets all the spotter information based on the callsign
711
-    *
712
-    * @return Array the spotter information
713
-    *
714
-    */
715
-    public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
716
-    {
709
+	/**
710
+	 * Gets all the spotter information based on the callsign
711
+	 *
712
+	 * @return Array the spotter information
713
+	 *
714
+	 */
715
+	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
716
+	{
717 717
 	$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
718 718
 	
719 719
 	date_default_timezone_set('UTC');
@@ -722,35 +722,35 @@  discard block
 block discarded – undo
722 722
 	
723 723
 	if ($ident != "")
724 724
 	{
725
-	    if (!is_string($ident))
726
-	    {
725
+		if (!is_string($ident))
726
+		{
727 727
 		return false;
728
-	    } else {
728
+		} else {
729 729
 		$additional_query = " AND (spotter_archive_output.ident = :ident)";
730 730
 		$query_values = array(':ident' => $ident);
731
-	    }
731
+		}
732 732
 	}
733 733
 	
734 734
 	if ($limit != "")
735 735
 	{
736
-	    $limit_array = explode(",", $limit);
736
+		$limit_array = explode(",", $limit);
737 737
 	    
738
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
739
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
738
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
739
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
740 740
 	    
741
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
742
-	    {
741
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
742
+		{
743 743
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
744 744
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
745
-	    }
745
+		}
746 746
 	}
747 747
 
748 748
 	if ($sort != "")
749 749
 	{
750
-	    $search_orderby_array = $this->getOrderBy();
751
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
750
+		$search_orderby_array = $this->getOrderBy();
751
+		$orderby_query = $search_orderby_array[$sort]['sql'];
752 752
 	} else {
753
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
753
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
754 754
 	}
755 755
 
756 756
 	$query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
@@ -759,16 +759,16 @@  discard block
 block discarded – undo
759 759
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
760 760
 
761 761
 	return $spotter_array;
762
-    }
763
-
764
-    /**
765
-    * Gets all number of flight over countries
766
-    *
767
-    * @return Array the airline country list
768
-    *
769
-    */
770
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
771
-    {
762
+	}
763
+
764
+	/**
765
+	 * Gets all number of flight over countries
766
+	 *
767
+	 * @return Array the airline country list
768
+	 *
769
+	 */
770
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
771
+	{
772 772
 	global $globalDBdriver;
773 773
 	/*
774 774
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -778,14 +778,14 @@  discard block
 block discarded – undo
778 778
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
779 779
 		    FROM countries c, spotter_archive s
780 780
 		    WHERE c.iso2 = s.over_country ";
781
-                if ($olderthanmonths > 0) {
782
-            		if ($globalDBdriver == 'mysql') {
781
+				if ($olderthanmonths > 0) {
782
+					if ($globalDBdriver == 'mysql') {
783 783
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
784 784
 			} else {
785 785
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
786 786
 			}
787 787
 		}
788
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
788
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
789 789
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
790 790
 	if ($limit) $query .= " LIMIT 0,10";
791 791
       
@@ -798,14 +798,14 @@  discard block
 block discarded – undo
798 798
         
799 799
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
800 800
 	{
801
-	    $temp_array['flight_count'] = $row['nb'];
802
-	    $temp_array['flight_country'] = $row['name'];
803
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
804
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
805
-	    $flight_array[] = $temp_array;
801
+		$temp_array['flight_count'] = $row['nb'];
802
+		$temp_array['flight_country'] = $row['name'];
803
+		$temp_array['flight_country_iso3'] = $row['iso3'];
804
+		$temp_array['flight_country_iso2'] = $row['iso2'];
805
+		$flight_array[] = $temp_array;
806 806
 	}
807 807
 	return $flight_array;
808
-    }
808
+	}
809 809
 
810 810
 }
811 811
 ?>
812 812
\ No newline at end of file
Please login to merge, or discard this patch.
require/class.APRS.php 1 patch
Indentation   +88 added lines, -88 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 class aprs {
3
-    private function urshift($n, $s) {
3
+	private function urshift($n, $s) {
4 4
 	return ($n >= 0) ? ($n >> $s) :
5
-    	    (($n & 0x7fffffff) >> $s) | 
6
-        	(0x40000000 >> ($s - 1));
7
-    }
5
+			(($n & 0x7fffffff) >> $s) | 
6
+			(0x40000000 >> ($s - 1));
7
+	}
8 8
 
9
-    public function parse($input) {
9
+	public function parse($input) {
10 10
 	$debug = false;
11 11
 	$result = array();
12 12
 	$input_len = strlen($input);
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 	
18 18
 	/* Check that end was found and body has at least one byte. */
19 19
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
20
-	    echo 'invalid';
21
-	    return false;
20
+		echo 'invalid';
21
+		return false;
22 22
 	}
23 23
 	
24 24
 	/* Save header and body. */
@@ -31,44 +31,44 @@  discard block
 block discarded – undo
31 31
 	/* Parse source, target and path. */
32 32
 	//FLRDF0A52>APRS,qAS,LSTB
33 33
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
34
-	    $ident = $matches[1];
35
-	    $all_elements = $matches[2];
36
-	    if ($debug) echo 'ident : '.$ident."\n";
37
-	    $result['ident'] = $ident;
34
+		$ident = $matches[1];
35
+		$all_elements = $matches[2];
36
+		if ($debug) echo 'ident : '.$ident."\n";
37
+		$result['ident'] = $ident;
38 38
 	} else return false;
39 39
 	$elements = explode(',',$all_elements);
40 40
 	$source = end($elements);
41 41
 	$result['source'] = $source;
42 42
 	foreach ($elements as $element) {
43
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
44
-	        //echo "ok";
45
-	        if ($element == 'TCPIP*') return false;
46
-	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
43
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
44
+			//echo "ok";
45
+			if ($element == 'TCPIP*') return false;
46
+		} elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
47 47
 		//echo "ok";
48
-	    } else {
49
-	        return false;
50
-	    }
48
+		} else {
49
+			return false;
50
+		}
51 51
 	}
52 52
 	// Check for Timestamp
53 53
 	$body_parse = substr($body,1);
54 54
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
55
-	    $timestamp = $matches[0];
56
-	    if ($matches[4] == 'h') {
55
+		$timestamp = $matches[0];
56
+		if ($matches[4] == 'h') {
57 57
 		$timestamp = strtotime($matches[1].':'.$matches[2].':'.$matches[3]);
58 58
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
59 59
 		/*
60 60
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
61 61
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
62 62
 		*/
63
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
63
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
64 64
 		// FIXME : fix this...
65 65
 		$timestamp = strtotime($matches[1].' '.$matches[2].':'.$matches[3]);
66
-	    }
67
-	    $body_parse = substr($body_parse,7);
68
-	    $result['timestamp'] = $timestamp;
66
+		}
67
+		$body_parse = substr($body_parse,7);
68
+		$result['timestamp'] = $timestamp;
69 69
 	}
70 70
 	if (strlen($body_parse) > 19) {
71
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
71
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
72 72
 		// 4658.70N/00707.78Ez
73 73
 		//print_r(str_split($body_parse));
74 74
 		$latlon = $matches[0];
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 		$lon = intval($lon_deg);
85 85
 		if ($lat > 89 || $lon > 179) return false;
86 86
 	    
87
-	    /*
87
+		/*
88 88
 	    $tmp_5b = str_replace('.','',$lat_min);
89 89
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
90 90
 	        print_r($matches);
@@ -96,58 +96,58 @@  discard block
 block discarded – undo
96 96
 		if ($wind == 'W') $longitude = 0-$longitude;
97 97
 		$result['latitude'] = $latitude;
98 98
 		$result['longitude'] = $longitude;
99
-	    }
100
-	    if ($body_len > 19) {
99
+		}
100
+		if ($body_len > 19) {
101 101
 		$body_split = str_split($body_parse);
102 102
 		$symbol_code = $body_split[18];
103 103
 		if ($symbol_code != '_') {
104
-		    $body_parse = substr($body_parse,19);
105
-		    $body_parse_len = strlen($body_parse);
106
-		    if ($body_parse_len >= 7) {
104
+			$body_parse = substr($body_parse,19);
105
+			$body_parse_len = strlen($body_parse);
106
+			if ($body_parse_len >= 7) {
107 107
 			
108
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
109
-		    	    $course = substr($body_parse,0,3);
110
-		    	    $tmp_s = intval($course);
111
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['course'] = intval($course);
112
-		    	    $speed = substr($body_parse,4,3);
113
-		    	    $result['speed'] = round($speed*1.852);
114
-		    	    $body_parse = substr($body_parse,7);
115
-		        }
116
-		        // Check PHGR, PHG, RNG
117
-		    } else if ($body_parse_len > 0) {
108
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
109
+					$course = substr($body_parse,0,3);
110
+					$tmp_s = intval($course);
111
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['course'] = intval($course);
112
+					$speed = substr($body_parse,4,3);
113
+					$result['speed'] = round($speed*1.852);
114
+					$body_parse = substr($body_parse,7);
115
+				}
116
+				// Check PHGR, PHG, RNG
117
+			} else if ($body_parse_len > 0) {
118 118
 			$rest = $body_parse;
119
-		    }
120
-		    if (strlen($body_parse) > 0) {
121
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
122
-		            $altitude = intval($matches[1]);
123
-		            $result['altitude'] = round($altitude*0.3048);
124
-		            $body_parse = substr($body_parse,strlen($matches[0])+1);
125
-		        }
126
-		    }
119
+			}
120
+			if (strlen($body_parse) > 0) {
121
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
122
+					$altitude = intval($matches[1]);
123
+					$result['altitude'] = round($altitude*0.3048);
124
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
125
+				}
126
+			}
127 127
 		    
128
-		    // Telemetry
129
-		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
130
-		        // Nothing yet...
131
-		    }
132
-		    // DAO
133
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
134
-			    $dao = $matches[1];
135
-			    $dao_split = str_split($dao);
136
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
137
-			        $lat_off = (($dao[1])-48.0)*0.001/60.0;
138
-			        $lon_off = (($dao[2])-48.0)*0.001/60.0;
128
+			// Telemetry
129
+			if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
130
+				// Nothing yet...
131
+			}
132
+			// DAO
133
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
134
+				$dao = $matches[1];
135
+				$dao_split = str_split($dao);
136
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
137
+					$lat_off = (($dao[1])-48.0)*0.001/60.0;
138
+					$lon_off = (($dao[2])-48.0)*0.001/60.0;
139 139
 			    
140
-			    }
141
-			    if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
142
-			    else $result['latitude'] += $lat_off;
143
-			    if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
144
-			    else $result['longitude'] += $lon_off;
145
-		            $body_parse = substr($body_parse,6);
146
-		    }
140
+				}
141
+				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
142
+				else $result['latitude'] += $lat_off;
143
+				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
144
+				else $result['longitude'] += $lon_off;
145
+					$body_parse = substr($body_parse,6);
146
+			}
147 147
 		    
148
-		    // OGN comment
148
+			// OGN comment
149 149
 		   // echo "Before OGN : ".$body_parse."\n";
150
-		    if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
150
+			if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
151 151
 			$id = $matches[1];
152 152
 			$mode = substr($id,0,2);
153 153
 			$address = substr($id,2);
@@ -177,49 +177,49 @@  discard block
 block discarded – undo
177 177
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
178 178
 			$result['stealth'] = $stealth;
179 179
 			$result['address'] = $address;
180
-		    }
180
+			}
181 181
 		    
182
-		    //Comment
183
-		    $result['comment'] = $body_parse;
182
+			//Comment
183
+			$result['comment'] = $body_parse;
184 184
 		} else {
185
-		    // parse weather
186
-		    $body_parse = substr($body_parse,19);
187
-		    $body_parse_len = strlen($body_parse);
185
+			// parse weather
186
+			$body_parse = substr($body_parse,19);
187
+			$body_parse_len = strlen($body_parse);
188 188
 
189
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
189
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
190 190
 			$result['wind_dir'] = $matches[1];
191 191
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
192 192
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
193 193
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
194
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
195
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
194
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
195
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
196 196
 			$result['wind_dir'] = $matches[1];
197 197
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
198 198
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
199 199
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
200
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
201
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
200
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
201
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
202 202
 			$result['wind_dir'] = $matches[1];
203 203
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
204 204
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
205
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
206
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
205
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
206
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
207 207
 			$result['wind_dir'] = $matches[1];
208 208
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
209 209
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
210
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
211
-		    }
212
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
210
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
211
+			}
212
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
213 213
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
214
-		    }
214
+			}
215
+		}
215 216
 		}
216
-	    }
217 217
 	}
218 218
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
219 219
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
220 220
 	//print_r($result);
221 221
 	return $result;
222
-    }
222
+	}
223 223
 }
224 224
 /*
225 225
 $aprs = new aprs();
Please login to merge, or discard this patch.
require/class.Scheduler.php 1 patch
Indentation   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -9,29 +9,29 @@  discard block
 block discarded – undo
9 9
 
10 10
 class Schedule {
11 11
 	protected $cookies = array();
12
-        public $db;
12
+		public $db;
13 13
 	function __construct($dbc = null) {
14 14
 		$Connection = new Connection($dbc);
15 15
 		$this->db = $Connection->db;
16
-        }
16
+		}
17 17
 	
18 18
 	/**
19
-	* Add schedule data to database
20
-	* @param String $ident aircraft ident
21
-	* @param String $departure_airport_icao departure airport icao
22
-	* @param String $departure_airport_time departure airport time
23
-	* @param String $arrival_airport_icao arrival airport icao
24
-	* @param String $arrival_airport_time arrival airport time
19
+	 * Add schedule data to database
20
+	 * @param String $ident aircraft ident
21
+	 * @param String $departure_airport_icao departure airport icao
22
+	 * @param String $departure_airport_time departure airport time
23
+	 * @param String $arrival_airport_icao arrival airport icao
24
+	 * @param String $arrival_airport_time arrival airport time
25 25
 	/ @param String $source source of data
26
-	*/
26
+	 */
27 27
 	
28 28
 	public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') {
29 29
 		date_default_timezone_set('UTC');
30 30
 		$date = date("Y-m-d H:i:s",time());
31
-	        //if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
32
-	        //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
33
-	        $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
34
-	        $query_values = array(':ident' => $ident);
31
+			//if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
32
+			//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
33
+			$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
34
+			$query_values = array(':ident' => $ident);
35 35
 		 try {
36 36
 			$sth = $this->db->prepare($query);
37 37
 			$sth->execute($query_values);
@@ -40,18 +40,18 @@  discard block
 block discarded – undo
40 40
 		}
41 41
 		if ($sth->fetchColumn() > 0) {
42 42
 			if ($departure_airport_time == '' && $arrival_airport_time == '') {
43
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
44
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
43
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
44
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
45 45
 			} elseif ($arrival_airport_time == '') {
46
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
47
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
46
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
47
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
48 48
 			} elseif ($departure_airport_time == '') {
49
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
50
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
49
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
50
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
51 51
 			} else {
52
-			    //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
53
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
54
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
52
+				//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
53
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
54
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
55 55
 			}
56 56
 			try {
57 57
 				$sth = $this->db->prepare($query);
@@ -62,17 +62,17 @@  discard block
 block discarded – undo
62 62
 			if ($sth->fetchColumn() == 0) {
63 63
 				//$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident';
64 64
 				if ($departure_airport_time == '' && $arrival_airport_time == '') {
65
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
66
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
65
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
66
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
67 67
 				} elseif ($arrival_airport_time == '') {
68
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
69
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
68
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
69
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
70 70
 				} elseif ($departure_airport_time == '') {
71
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
72
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
71
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
72
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
73 73
 				} else {
74
-                            	    $query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
75
-				    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
74
+									$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
75
+					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
76 76
 				}
77 77
 				 try {
78 78
 					$sth = $this->db->prepare($query);
@@ -107,16 +107,16 @@  discard block
 block discarded – undo
107 107
 	}
108 108
 
109 109
 	public function getSchedule($ident) {
110
-	        //$query = "SELECT * FROM schedule WHERE ident = :ident LIMIT 1";
111
-	        $Translation = new Translation($this->db);
112
-	        $operator = $Translation->checkTranslation($ident,false);
113
-	        if ($ident != $operator) {
114
-	    		$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :operator OR CallSign = :ident LIMIT 1";
115
-	    		$query_values = array(':ident' => $ident,'operator' => $operator);
116
-	    	} else {
117
-		        $query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :ident LIMIT 1";
118
-	    		$query_values = array(':ident' => $ident);
119
-	    	}
110
+			//$query = "SELECT * FROM schedule WHERE ident = :ident LIMIT 1";
111
+			$Translation = new Translation($this->db);
112
+			$operator = $Translation->checkTranslation($ident,false);
113
+			if ($ident != $operator) {
114
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :operator OR CallSign = :ident LIMIT 1";
115
+				$query_values = array(':ident' => $ident,'operator' => $operator);
116
+			} else {
117
+				$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE CallSign = :ident LIMIT 1";
118
+				$query_values = array(':ident' => $ident);
119
+			}
120 120
 		 try {
121 121
 			$sth = $this->db->prepare($query);
122 122
 			$sth->execute($query_values);
@@ -131,15 +131,15 @@  discard block
 block discarded – undo
131 131
 
132 132
 	public function checkSchedule($ident) {
133 133
 		global $globalDBdriver;
134
-	        //$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
135
-	        if ($globalDBdriver == 'mysql') {
134
+			//$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
135
+			if ($globalDBdriver == 'mysql') {
136 136
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE CallSign = :ident AND ((date_added BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 15 DAY)) AND DATE(NOW()) and date_modified IS NULL) OR (date_modified BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 15 DAY)) AND DATE(NOW()))) LIMIT 1";
137 137
 		} else {
138 138
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE CallSign = :ident 
139 139
 			AND ((date_added::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '15 DAYS' AND CURRENT_TIMESTAMP) and date_modified::timestamp IS NULL)
140 140
 			     OR (date_modified::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '15 DAYS' AND CURRENT_TIMESTAMP) LIMIT 1";
141 141
 		}
142
-	        $query_values = array(':ident' => $ident);
142
+			$query_values = array(':ident' => $ident);
143 143
 		 try {
144 144
 			$sth = $this->db->prepare($query);
145 145
 			$sth->execute($query_values);
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
151 151
 	}
152 152
 
153 153
 	/**
154
-	* Get flight info from Air France
155
-	* @param String $callsign The callsign
156
-	* @param String $date date we want flight number info
157
-	* @param String $carrier IATA code
158
-	* @return Flight departure and arrival airports and time
159
-	*/
154
+	 * Get flight info from Air France
155
+	 * @param String $callsign The callsign
156
+	 * @param String $date date we want flight number info
157
+	 * @param String $carrier IATA code
158
+	 * @return Flight departure and arrival airports and time
159
+	 */
160 160
 	private function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
161 161
 		$Common = new Common();
162 162
 		$check_date = new Datetime($date);
@@ -192,11 +192,11 @@  discard block
 block discarded – undo
192 192
 	}
193 193
 
194 194
 	/**
195
-	* Get flight info from EasyJet
196
-	* @param String $callsign The callsign
197
-	* @param String $date date we want flight number info
198
-	* @return Flight departure and arrival airports and time
199
-	*/
195
+	 * Get flight info from EasyJet
196
+	 * @param String $callsign The callsign
197
+	 * @param String $date date we want flight number info
198
+	 * @return Flight departure and arrival airports and time
199
+	 */
200 200
 	private function getEasyJet($callsign, $date = 'NOW') {
201 201
 		global $globalTimezone;
202 202
 		$Common = new Common();
@@ -220,10 +220,10 @@  discard block
 block discarded – undo
220 220
 	}
221 221
 
222 222
 	/**
223
-	* Get flight info from Ryanair
224
-	* @param String $callsign The callsign
225
-	* @return Flight departure and arrival airports and time
226
-	*/
223
+	 * Get flight info from Ryanair
224
+	 * @param String $callsign The callsign
225
+	 * @return Flight departure and arrival airports and time
226
+	 */
227 227
 	private function getRyanair($callsign) {
228 228
 		$Common = new Common();
229 229
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -246,10 +246,10 @@  discard block
 block discarded – undo
246 246
 	}
247 247
 
248 248
 	/**
249
-	* Get flight info from Swiss
250
-	* @param String $callsign The callsign
251
-	* @return Flight departure and arrival airports and time
252
-	*/
249
+	 * Get flight info from Swiss
250
+	 * @param String $callsign The callsign
251
+	 * @return Flight departure and arrival airports and time
252
+	 */
253 253
 	private function getSwiss($callsign) {
254 254
 		$Common = new Common();
255 255
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -276,11 +276,11 @@  discard block
 block discarded – undo
276 276
 	}
277 277
 	
278 278
 	/**
279
-	* Get flight info from British Airways API
280
-	* @param String $callsign The callsign
281
-	* @param String $date date we want flight number info
282
-	* @return Flight departure and arrival airports and time
283
-	*/
279
+	 * Get flight info from British Airways API
280
+	 * @param String $callsign The callsign
281
+	 * @param String $date date we want flight number info
282
+	 * @return Flight departure and arrival airports and time
283
+	 */
284 284
 	public function getBritishAirways($callsign, $date = 'NOW') {
285 285
 		global $globalBritishAirwaysKey;
286 286
 		$Common = new Common();
@@ -304,11 +304,11 @@  discard block
 block discarded – undo
304 304
 	}
305 305
 
306 306
 	/**
307
-	* Get flight info from Lutfhansa API
308
-	* @param String $callsign The callsign
309
-	* @param String $date date we want flight number info
310
-	* @return Flight departure and arrival airports and time
311
-	*/
307
+	 * Get flight info from Lutfhansa API
308
+	 * @param String $callsign The callsign
309
+	 * @param String $date date we want flight number info
310
+	 * @return Flight departure and arrival airports and time
311
+	 */
312 312
 	public function getLufthansa($callsign, $date = 'NOW') {
313 313
 		global $globalLufthansaKey;
314 314
 		$Common = new Common();
@@ -338,11 +338,11 @@  discard block
 block discarded – undo
338 338
 	}
339 339
 
340 340
 	/**
341
-	* Get flight info from Transavia API
342
-	* @param String $callsign The callsign
343
-	* @param String $date date we want flight number info
344
-	* @return Flight departure and arrival airports and time
345
-	*/
341
+	 * Get flight info from Transavia API
342
+	 * @param String $callsign The callsign
343
+	 * @param String $date date we want flight number info
344
+	 * @return Flight departure and arrival airports and time
345
+	 */
346 346
 	private function getTransavia($callsign, $date = 'NOW') {
347 347
 		global $globalTransaviaKey;
348 348
 		$Common = new Common();
@@ -366,10 +366,10 @@  discard block
 block discarded – undo
366 366
 	}
367 367
 
368 368
 	/**
369
-	* Get flight info from Tunisair
370
-	* @param String $callsign The callsign
371
-	* @return Flight departure and arrival airports and time
372
-	*/
369
+	 * Get flight info from Tunisair
370
+	 * @param String $callsign The callsign
371
+	 * @return Flight departure and arrival airports and time
372
+	 */
373 373
 	private function getTunisair($callsign) {
374 374
 		$Common = new Common();
375 375
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -386,10 +386,10 @@  discard block
 block discarded – undo
386 386
 	}
387 387
 
388 388
 	/**
389
-	* Get flight info from Vueling
390
-	* @param String $callsign The callsign
391
-	* @return Flight departure and arrival airports and time
392
-	*/
389
+	 * Get flight info from Vueling
390
+	 * @param String $callsign The callsign
391
+	 * @return Flight departure and arrival airports and time
392
+	 */
393 393
 	private function getVueling($callsign) {
394 394
 		$Common = new Common();
395 395
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -412,11 +412,11 @@  discard block
 block discarded – undo
412 412
 	}
413 413
 
414 414
 	/**
415
-	* Get flight info from Iberia
416
-	* @param String $callsign The callsign
417
-	* @param String $date date we want flight number info
418
-	* @return Flight departure and arrival airports and time
419
-	*/
415
+	 * Get flight info from Iberia
416
+	 * @param String $callsign The callsign
417
+	 * @param String $date date we want flight number info
418
+	 * @return Flight departure and arrival airports and time
419
+	 */
420 420
 	private function getIberia($callsign, $date = 'NOW') {
421 421
 		$Common = new Common();
422 422
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -446,11 +446,11 @@  discard block
 block discarded – undo
446 446
 	}
447 447
 
448 448
 	/**
449
-	* Get flight info from Star Alliance
450
-	* @param String $callsign The callsign
451
-	* @param String $date date we want flight number info
452
-	* @return Flight departure and arrival airports and time
453
-	*/
449
+	 * Get flight info from Star Alliance
450
+	 * @param String $callsign The callsign
451
+	 * @param String $date date we want flight number info
452
+	 * @return Flight departure and arrival airports and time
453
+	 */
454 454
 	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
455 455
 		$Common = new Common();
456 456
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -480,11 +480,11 @@  discard block
 block discarded – undo
480 480
 	}
481 481
 
482 482
 	/**
483
-	* Get flight info from Alitalia
484
-	* @param String $callsign The callsign
485
-	* @param String $date date we want flight number info
486
-	* @return Flight departure and arrival airports and time
487
-	*/
483
+	 * Get flight info from Alitalia
484
+	 * @param String $callsign The callsign
485
+	 * @param String $date date we want flight number info
486
+	 * @return Flight departure and arrival airports and time
487
+	 */
488 488
 	private function getAlitalia($callsign, $date = 'NOW') {
489 489
 		$Common = new Common();
490 490
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -503,11 +503,11 @@  discard block
 block discarded – undo
503 503
 	}
504 504
 
505 505
 	/**
506
-	* Get flight info from Brussels airlines
507
-	* @param String $callsign The callsign
508
-	* @param String $date date we want flight number info
509
-	* @return Flight departure and arrival airports and time
510
-	*/
506
+	 * Get flight info from Brussels airlines
507
+	 * @param String $callsign The callsign
508
+	 * @param String $date date we want flight number info
509
+	 * @return Flight departure and arrival airports and time
510
+	 */
511 511
 	private function getBrussels($callsign, $date = 'NOW') {
512 512
 		$Common = new Common();
513 513
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -517,24 +517,24 @@  discard block
 block discarded – undo
517 517
 		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
518 518
 		$data = $Common->getData($url);
519 519
 		if ($data != '') {
520
-		    //echo $data;
521
-		    $parsed_json = json_decode($data);
522
-		    if (isset($parsed_json[0]->FromAirportCode)) {
520
+			//echo $data;
521
+			$parsed_json = json_decode($data);
522
+			if (isset($parsed_json[0]->FromAirportCode)) {
523 523
 			$DepartureAirportIata = $parsed_json[0]->FromAirportCode;
524 524
 			$ArrivalAirportIata = $parsed_json[0]->ToAirportCode;
525 525
 			$departureTime = date('H:i',strtotime($parsed_json[0]->ScheduledDepatureDate));
526 526
 			$arrivalTime = date('H:i',strtotime($parsed_json[0]->ScheduledArrivalDate));
527 527
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
528
-		    }
528
+			}
529 529
 		}
530 530
 	}
531 531
 
532 532
 	/**
533
-	* Get flight info from FlightRadar24
534
-	* @param String $callsign The callsign
535
-	* @param String $date date we want flight number info
536
-	* @return Flight departure and arrival airports and time
537
-	*/
533
+	 * Get flight info from FlightRadar24
534
+	 * @param String $callsign The callsign
535
+	 * @param String $date date we want flight number info
536
+	 * @return Flight departure and arrival airports and time
537
+	 */
538 538
 /*
539 539
 	public function getFlightRadar24($callsign, $date = 'NOW') {
540 540
 		$Common = new Common();
@@ -563,11 +563,11 @@  discard block
 block discarded – undo
563 563
 	}
564 564
   */
565 565
 	/**
566
-	* Get flight info from Lufthansa
567
-	* @param String $callsign The callsign
568
-	* @param String $date date we want flight number info
569
-	* @return Flight departure and arrival airports and time
570
-	*/
566
+	 * Get flight info from Lufthansa
567
+	 * @param String $callsign The callsign
568
+	 * @param String $date date we want flight number info
569
+	 * @return Flight departure and arrival airports and time
570
+	 */
571 571
 
572 572
 /*	private function getLufthansa($callsign, $date = 'NOW') {
573 573
 		$Common = new Common();
@@ -595,11 +595,11 @@  discard block
 block discarded – undo
595 595
 	}
596 596
   */
597 597
 	/**
598
-	* Get flight info from flytap
599
-	* @param String $callsign The callsign
600
-	* @param String $date date we want flight number info
601
-	* @return Flight departure and arrival airports and time
602
-	*/
598
+	 * Get flight info from flytap
599
+	 * @param String $callsign The callsign
600
+	 * @param String $date date we want flight number info
601
+	 * @return Flight departure and arrival airports and time
602
+	 */
603 603
 	private function getFlyTap($callsign, $date = 'NOW') {
604 604
 		$Common = new Common();
605 605
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -622,11 +622,11 @@  discard block
 block discarded – undo
622 622
 	}
623 623
 
624 624
 	/**
625
-	* Get flight info from flightmapper
626
-	* @param String $callsign The callsign
627
-	* @param String $date date we want flight number info
628
-	* @return Flight departure and arrival airports and time
629
-	*/
625
+	 * Get flight info from flightmapper
626
+	 * @param String $callsign The callsign
627
+	 * @param String $date date we want flight number info
628
+	 * @return Flight departure and arrival airports and time
629
+	 */
630 630
 	public function getFlightMapper($callsign, $date = 'NOW') {
631 631
 		$Common = new Common();
632 632
 		if (!is_numeric(substr($callsign, 0, 3)))
@@ -648,11 +648,11 @@  discard block
 block discarded – undo
648 648
 				$sched = $table[5][0];
649 649
 				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr);
650 650
 				if ($n == 7) {
651
-				    $departureTime = $dhour;
652
-				    $arrivalTime = $ahour;
653
-				    $DepartureAirportIata = str_replace(array('(',')'),'',$darr);
654
-				    $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
655
-				    return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
651
+					$departureTime = $dhour;
652
+					$arrivalTime = $ahour;
653
+					$DepartureAirportIata = str_replace(array('(',')'),'',$darr);
654
+					$ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
655
+					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
656 656
 				}
657 657
 			}
658 658
 		}
@@ -660,11 +660,11 @@  discard block
 block discarded – undo
660 660
 	}
661 661
 
662 662
 	/**
663
-	* Get flight info from flightaware
664
-	* @param String $callsign The callsign
665
-	* @param String $date date we want flight number info
666
-	* @return Flight departure and arrival airports and time
667
-	*/
663
+	 * Get flight info from flightaware
664
+	 * @param String $callsign The callsign
665
+	 * @param String $date date we want flight number info
666
+	 * @return Flight departure and arrival airports and time
667
+	 */
668 668
 	public function getFlightAware($callsign, $date = 'NOW') {
669 669
 		$Common = new Common();
670 670
 		if (!is_numeric(substr($callsign, 0, 3)))
@@ -695,11 +695,11 @@  discard block
 block discarded – undo
695 695
 	}
696 696
 
697 697
 	/**
698
-	* Get flight info from CostToTravel
699
-	* @param String $callsign The callsign
700
-	* @param String $date date we want flight number info
701
-	* @return Flight departure and arrival airports and time
702
-	*/
698
+	 * Get flight info from CostToTravel
699
+	 * @param String $callsign The callsign
700
+	 * @param String $date date we want flight number info
701
+	 * @return Flight departure and arrival airports and time
702
+	 */
703 703
 	public function getCostToTravel($callsign, $date = 'NOW') {
704 704
 		$Common = new Common();
705 705
 		$url= "http://www.costtotravel.com/flight-number/".$callsign;
@@ -721,11 +721,11 @@  discard block
 block discarded – undo
721 721
 	}
722 722
 
723 723
 	/**
724
-	* Get flight info from Air Canada
725
-	* @param String $callsign The callsign
726
-	* @param String $date date we want flight number info
727
-	* @return Flight departure and arrival airports and time
728
-	*/
724
+	 * Get flight info from Air Canada
725
+	 * @param String $callsign The callsign
726
+	 * @param String $date date we want flight number info
727
+	 * @return Flight departure and arrival airports and time
728
+	 */
729 729
 	private function getAirCanada($callsign,$date = 'NOW') {
730 730
 		$Common = new Common();
731 731
 		date_default_timezone_set('UTC');
@@ -749,11 +749,11 @@  discard block
 block discarded – undo
749 749
 	}
750 750
 
751 751
 	/**
752
-	* Get flight info from Vietnam Airlines
753
-	* @param String $callsign The callsign
754
-	* @param String $date date we want flight number info
755
-	* @return Flight departure and arrival airports and time
756
-	*/
752
+	 * Get flight info from Vietnam Airlines
753
+	 * @param String $callsign The callsign
754
+	 * @param String $date date we want flight number info
755
+	 * @return Flight departure and arrival airports and time
756
+	 */
757 757
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
758 758
 		$Common = new Common();
759 759
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -775,12 +775,12 @@  discard block
 block discarded – undo
775 775
 	}
776 776
 
777 777
 	/**
778
-	* Get flight info from Air Berlin
779
-	* @param String $callsign The callsign
780
-	* @param String $date date we want flight number info
781
-	* @param String $carrier IATA code
782
-	* @return Flight departure and arrival airports and time
783
-	*/
778
+	 * Get flight info from Air Berlin
779
+	 * @param String $callsign The callsign
780
+	 * @param String $date date we want flight number info
781
+	 * @param String $carrier IATA code
782
+	 * @return Flight departure and arrival airports and time
783
+	 */
784 784
 	private function getAirBerlin($callsign, $date = 'NOW', $carrier = 'AB') {
785 785
 		$Common = new Common();
786 786
 		date_default_timezone_set('UTC');
@@ -809,11 +809,11 @@  discard block
 block discarded – undo
809 809
 			$table = $Common->table2array($data);
810 810
 			$flight = $table;
811 811
 			if (isset($flight[5][4])) {
812
-			    $arrivalTime = $flight[5][4];
813
-			    $arrivalAirport = $flight[5][3];
812
+				$arrivalTime = $flight[5][4];
813
+				$arrivalAirport = $flight[5][3];
814 814
 			} else {
815
-			    $arrivalTime = '';
816
-			    $arrivalAirport = '';
815
+				$arrivalTime = '';
816
+				$arrivalAirport = '';
817 817
 			}
818 818
 		}
819 819
 		$url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner';
@@ -1095,7 +1095,7 @@  discard block
 block discarded – undo
1095 1095
 					}
1096 1096
 			}
1097 1097
 		}
1098
-	        return array();
1098
+			return array();
1099 1099
 	}
1100 1100
 }
1101 1101
 
Please login to merge, or discard this patch.
require/class.Language.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 if (!function_exists("gettext")) {
4
-        function _($text) {
5
-                return $text;
6
-        }
4
+		function _($text) {
5
+				return $text;
6
+		}
7 7
 } else {
8 8
 	if (isset($_COOKIE['language']) && $_COOKIE['language'] != 'en_GB' && (isset($globalTranslate) && $globalTranslate)) {
9 9
 		$Language = new Language();
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 			);
76 76
 
77 77
 	/**
78
-	* Returns list of available locales
79
-	*
80
-	* @return array
78
+	 * Returns list of available locales
79
+	 *
80
+	 * @return array
81 81
 	 */
82 82
 	public function listLocaleDir()
83 83
 	{
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
103 103
 	}
104 104
 
105 105
 	/**
106
-	* Returns list of available languages
107
-	*
108
-	* @return array
106
+	 * Returns list of available languages
107
+	 *
108
+	 * @return array
109 109
 	 */
110 110
 	public function getLanguages()
111 111
 	{
Please login to merge, or discard this patch.
require/class.Source.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -7,73 +7,73 @@
 block discarded – undo
7 7
 	function __construct($dbc = null) {
8 8
 		$Connection = new Connection($dbc);
9 9
 		$this->db = $Connection->db;
10
-        }
11
-       public function getAllLocationInfo() {
12
-                $query = "SELECT * FROM source_location";
13
-                $query_values = array();
14
-                 try {
15
-                        $sth = $this->db->prepare($query);
16
-                        $sth->execute($query_values);
17
-                } catch(PDOException $e) {
18
-                        return "error : ".$e->getMessage();
19
-                }
20
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
21
-                return $all;
22
-        }
23
-       public function getLocationInfobyName($name) {
24
-                $query = "SELECT * FROM source_location WHERE name = :name";
25
-                $query_values = array(':name' => $name);
26
-                 try {
27
-                        $sth = $this->db->prepare($query);
28
-                        $sth->execute($query_values);
29
-                } catch(PDOException $e) {
30
-                        return "error : ".$e->getMessage();
31
-                }
32
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
33
-                return $all;
34
-        }
35
-       public function getLocationInfobySourceName($name) {
36
-                $query = "SELECT * FROM source_location WHERE source = :name";
37
-                $query_values = array(':name' => $name);
38
-                 try {
39
-                        $sth = $this->db->prepare($query);
40
-                        $sth->execute($query_values);
41
-                } catch(PDOException $e) {
42
-                        return "error : ".$e->getMessage();
43
-                }
44
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
45
-                return $all;
46
-        }
10
+		}
11
+	   public function getAllLocationInfo() {
12
+				$query = "SELECT * FROM source_location";
13
+				$query_values = array();
14
+				 try {
15
+						$sth = $this->db->prepare($query);
16
+						$sth->execute($query_values);
17
+				} catch(PDOException $e) {
18
+						return "error : ".$e->getMessage();
19
+				}
20
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
21
+				return $all;
22
+		}
23
+	   public function getLocationInfobyName($name) {
24
+				$query = "SELECT * FROM source_location WHERE name = :name";
25
+				$query_values = array(':name' => $name);
26
+				 try {
27
+						$sth = $this->db->prepare($query);
28
+						$sth->execute($query_values);
29
+				} catch(PDOException $e) {
30
+						return "error : ".$e->getMessage();
31
+				}
32
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
33
+				return $all;
34
+		}
35
+	   public function getLocationInfobySourceName($name) {
36
+				$query = "SELECT * FROM source_location WHERE source = :name";
37
+				$query_values = array(':name' => $name);
38
+				 try {
39
+						$sth = $this->db->prepare($query);
40
+						$sth->execute($query_values);
41
+				} catch(PDOException $e) {
42
+						return "error : ".$e->getMessage();
43
+				}
44
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
45
+				return $all;
46
+		}
47 47
   
48
-       public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
49
-                $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
50
-                $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
51
-                 try {
52
-                        $sth = $this->db->prepare($query);
53
-                        $sth->execute($query_values);
54
-                } catch(PDOException $e) {
55
-                        return "error : ".$e->getMessage();
56
-                }
57
-        }
48
+	   public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png') {
49
+				$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source)";
50
+				$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source);
51
+				 try {
52
+						$sth = $this->db->prepare($query);
53
+						$sth->execute($query_values);
54
+				} catch(PDOException $e) {
55
+						return "error : ".$e->getMessage();
56
+				}
57
+		}
58 58
 
59
-       public function deleteLocation($id) {
60
-                $query = "DELETE FROM source_location WHERE id = :id";
61
-                $query_values = array(':id' => $id);
62
-                 try {
63
-                        $sth = $this->db->prepare($query);
64
-                        $sth->execute($query_values);
65
-                } catch(PDOException $e) {
66
-                        return "error : ".$e->getMessage();
67
-                }
68
-        }
69
-       public function deleteAllLocation() {
70
-                $query = "DELETE FROM source_location";
71
-                 try {
72
-                        $sth = $this->db->prepare($query);
73
-                        $sth->execute();
74
-                } catch(PDOException $e) {
75
-                        return "error : ".$e->getMessage();
76
-                }
77
-        }
59
+	   public function deleteLocation($id) {
60
+				$query = "DELETE FROM source_location WHERE id = :id";
61
+				$query_values = array(':id' => $id);
62
+				 try {
63
+						$sth = $this->db->prepare($query);
64
+						$sth->execute($query_values);
65
+				} catch(PDOException $e) {
66
+						return "error : ".$e->getMessage();
67
+				}
68
+		}
69
+	   public function deleteAllLocation() {
70
+				$query = "DELETE FROM source_location";
71
+				 try {
72
+						$sth = $this->db->prepare($query);
73
+						$sth->execute();
74
+				} catch(PDOException $e) {
75
+						return "error : ".$e->getMessage();
76
+				}
77
+		}
78 78
 }
79 79
 ?>
80 80
\ No newline at end of file
Please login to merge, or discard this patch.