@@ -4,8 +4,8 @@ discard block |
||
4 | 4 | require_once('require/class.Stats.php'); |
5 | 5 | require_once('require/class.Language.php'); |
6 | 6 | if (!isset($_GET['airport'])) { |
7 | - header('Location: '.$globalURL.'/airport'); |
|
8 | - die(); |
|
7 | + header('Location: '.$globalURL.'/airport'); |
|
8 | + die(); |
|
9 | 9 | } |
10 | 10 | $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
11 | 11 | $Spotter = new Spotter(); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | function drawChart() { |
69 | 69 | var data = google.visualization.arrayToDataTable([ |
70 | 70 | ["'._("Aircraft").'", "'._("# of times").'"], '; |
71 | - $airline_data = ''; |
|
71 | + $airline_data = ''; |
|
72 | 72 | foreach($airline_array as $airline_item) |
73 | 73 | { |
74 | 74 | $airline_data .= '[ "'.$airline_item['airline_name'].'",'.$airline_item['airline_count'].'],'; |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['ident'])) { |
6 | - header('Location: '.$globalURL.'/ident'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/ident'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['ident'])) { |
6 | - header('Location: '.$globalURL.'/ident'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/ident'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -4,8 +4,8 @@ discard block |
||
4 | 4 | require_once('require/class.Stats.php'); |
5 | 5 | require_once('require/class.Language.php'); |
6 | 6 | if (!isset($_GET['aircraft_type'])) { |
7 | - header('Location: '.$globalURL.'/aircraft'); |
|
8 | - die(); |
|
7 | + header('Location: '.$globalURL.'/aircraft'); |
|
8 | + die(); |
|
9 | 9 | } |
10 | 10 | |
11 | 11 | $aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING); |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | function drawChart() { |
65 | 65 | var data = google.visualization.arrayToDataTable([ |
66 | 66 | ["'._("Hour").'", "'._("# of Flights").'"], '; |
67 | - $hour_data = ''; |
|
67 | + $hour_data = ''; |
|
68 | 68 | foreach($hour_array as $hour_item) |
69 | 69 | { |
70 | 70 | $hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],'; |
71 | 71 | } |
72 | 72 | $hour_data = substr($hour_data, 0, -1); |
73 | 73 | print $hour_data; |
74 | - print ']); |
|
74 | + print ']); |
|
75 | 75 | |
76 | 76 | var options = { |
77 | 77 | legend: {position: "none"}, |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['ident'])) { |
6 | - header('Location: '.$globalURL.'/ident'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/ident'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
@@ -11,13 +11,13 @@ discard block |
||
11 | 11 | $Connection = new Connection(); |
12 | 12 | |
13 | 13 | if (!$Connection->tableExists('airspace')) { |
14 | - die; |
|
14 | + die; |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | if (isset($_GET['coord'])) |
18 | 18 | { |
19 | 19 | $coords = explode(',',$_GET['coord']); |
20 | - if ($globalDBdriver == 'mysql') { |
|
20 | + if ($globalDBdriver == 'mysql') { |
|
21 | 21 | $query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))"; |
22 | 22 | try { |
23 | 23 | $sth = $Connection->db->prepare($query); |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | } |
38 | 38 | } |
39 | 39 | } else { |
40 | - if ($globalDBdriver == 'mysql') { |
|
40 | + if ($globalDBdriver == 'mysql') { |
|
41 | 41 | $query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace"; |
42 | 42 | } else { |
43 | 43 | $query = "SELECT *, ST_AsBinary(wkb_geometry,'NDR') AS wkb FROM airspace"; |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | $geojson = array( |
54 | - 'type' => 'FeatureCollection', |
|
55 | - 'features' => array() |
|
54 | + 'type' => 'FeatureCollection', |
|
55 | + 'features' => array() |
|
56 | 56 | ); |
57 | 57 | |
58 | 58 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
@@ -109,9 +109,9 @@ discard block |
||
109 | 109 | $properties['color'] = '#d9ffcb'; |
110 | 110 | } |
111 | 111 | $feature = array( |
112 | - 'type' => 'Feature', |
|
113 | - 'geometry' => json_decode($geom->out('json')), |
|
114 | - 'properties' => $properties |
|
112 | + 'type' => 'Feature', |
|
113 | + 'geometry' => json_decode($geom->out('json')), |
|
114 | + 'properties' => $properties |
|
115 | 115 | ); |
116 | 116 | array_push($geojson['features'], $feature); |
117 | 117 | } |
@@ -3,8 +3,8 @@ |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | if (!isset($_GET['country'])) { |
6 | - header('Location: '.$globalURL.'/country'); |
|
7 | - die(); |
|
6 | + header('Location: '.$globalURL.'/country'); |
|
7 | + die(); |
|
8 | 8 | } |
9 | 9 | $Spotter = new Spotter(); |
10 | 10 | $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
@@ -824,11 +824,11 @@ |
||
824 | 824 | } |
825 | 825 | |
826 | 826 | /** |
827 | - * Returns true if $string is valid UTF-8 and false otherwise. |
|
828 | - * |
|
829 | - * @param mixed $str String to be tested |
|
830 | - * @return boolean |
|
831 | - */ |
|
827 | + * Returns true if $string is valid UTF-8 and false otherwise. |
|
828 | + * |
|
829 | + * @param mixed $str String to be tested |
|
830 | + * @return boolean |
|
831 | + */ |
|
832 | 832 | static function is_utf8($str) |
833 | 833 | { |
834 | 834 | $c=0; $b=0; |
@@ -7,73 +7,73 @@ |
||
7 | 7 | public 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 |