@@ -18,7 +18,7 @@ |
||
| 18 | 18 | $limit_start = 0; |
| 19 | 19 | $limit_end = 25; |
| 20 | 20 | $absolute_difference = 25; |
| 21 | -} else { |
|
| 21 | +} else { |
|
| 22 | 22 | $limit_explode = explode(",", $_GET['limit']); |
| 23 | 23 | $limit_start = $limit_explode[0]; |
| 24 | 24 | $limit_end = $limit_explode[1]; |
@@ -15,8 +15,12 @@ discard block |
||
| 15 | 15 | } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
| 16 | 16 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
| 17 | 17 | $sql_date = $end_date; |
| 18 | - } else $sql_date = ''; |
|
| 19 | -} else $sql_date = ''; |
|
| 18 | + } else { |
|
| 19 | + $sql_date = ''; |
|
| 20 | + } |
|
| 21 | + } else { |
|
| 22 | + $sql_date = ''; |
|
| 23 | +} |
|
| 20 | 24 | |
| 21 | 25 | if (isset($_GET['highest_altitude'])) { |
| 22 | 26 | //for altitude manipulation |
@@ -30,8 +34,12 @@ discard block |
||
| 30 | 34 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 31 | 35 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 36 | $sql_altitude = $start_altitude; |
| 33 | - } else $sql_altitude = ''; |
|
| 34 | -} else $sql_altitude = ''; |
|
| 37 | + } else { |
|
| 38 | + $sql_altitude = ''; |
|
| 39 | + } |
|
| 40 | + } else { |
|
| 41 | + $sql_altitude = ''; |
|
| 42 | +} |
|
| 35 | 43 | |
| 36 | 44 | //calculuation for the pagination |
| 37 | 45 | if(!isset($_GET['limit'])) |
@@ -49,7 +57,7 @@ discard block |
||
| 49 | 57 | $limit_end = $_GET['number_results']; |
| 50 | 58 | $absolute_difference = $_GET['number_results']; |
| 51 | 59 | } |
| 52 | -} else { |
|
| 60 | +} else { |
|
| 53 | 61 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 62 | $limit_start = $limit_explode[0]; |
| 55 | 63 | $limit_end = $limit_explode[1]; |
@@ -67,8 +75,11 @@ discard block |
||
| 67 | 75 | |
| 68 | 76 | header("Content-type: text/yaml"); |
| 69 | 77 | |
| 70 | -if (isset($_GET['sort'])) $sort = $_GET['sort']; |
|
| 71 | -else $sort = ''; |
|
| 78 | +if (isset($_GET['sort'])) { |
|
| 79 | + $sort = $_GET['sort']; |
|
| 80 | +} else { |
|
| 81 | + $sort = ''; |
|
| 82 | +} |
|
| 72 | 83 | $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
| 73 | 84 | $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
| 74 | 85 | $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | $limit_start = 0; |
| 14 | 14 | $limit_end = 25; |
| 15 | 15 | $absolute_difference = 25; |
| 16 | - } else { |
|
| 16 | + } else { |
|
| 17 | 17 | $limit_explode = explode(",", $_GET['limit']); |
| 18 | 18 | $limit_start = $limit_explode[0]; |
| 19 | 19 | $limit_end = $limit_explode[1]; |
@@ -23,7 +23,9 @@ |
||
| 23 | 23 | print '<fieldset class="form-group">'; |
| 24 | 24 | print '<label for="notam_message">'._("NOTAM Message").'</label>'; |
| 25 | 25 | print '<textarea class="form-control" name="notam_message" id="notam_message" rows="5">'; |
| 26 | -if ($message != '') print $message; |
|
| 26 | +if ($message != '') { |
|
| 27 | + print $message; |
|
| 28 | +} |
|
| 27 | 29 | print '</textarea>'; |
| 28 | 30 | print '</fieldset>'; |
| 29 | 31 | print '<button type="submit" class="btn btn-primary">Submit</button>'; |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | $limit_start = 0; |
| 19 | 19 | $limit_end = 25; |
| 20 | 20 | $absolute_difference = 25; |
| 21 | -} else { |
|
| 21 | +} else { |
|
| 22 | 22 | $limit_explode = explode(",", $_GET['limit']); |
| 23 | 23 | $limit_start = $limit_explode[0]; |
| 24 | 24 | $limit_end = $limit_explode[1]; |
@@ -15,8 +15,12 @@ discard block |
||
| 15 | 15 | } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
| 16 | 16 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
| 17 | 17 | $sql_date = $end_date; |
| 18 | - } else $sql_date = ''; |
|
| 19 | -} else $sql_date = ''; |
|
| 18 | + } else { |
|
| 19 | + $sql_date = ''; |
|
| 20 | + } |
|
| 21 | + } else { |
|
| 22 | + $sql_date = ''; |
|
| 23 | +} |
|
| 20 | 24 | |
| 21 | 25 | if (isset($_GET['highest_altitude'])) { |
| 22 | 26 | //for altitude manipulation |
@@ -30,8 +34,12 @@ discard block |
||
| 30 | 34 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 31 | 35 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 36 | $sql_altitude = $start_altitude; |
| 33 | - } else $sql_altitude = ''; |
|
| 34 | -} else $sql_altitude = ''; |
|
| 37 | + } else { |
|
| 38 | + $sql_altitude = ''; |
|
| 39 | + } |
|
| 40 | + } else { |
|
| 41 | + $sql_altitude = ''; |
|
| 42 | +} |
|
| 35 | 43 | |
| 36 | 44 | //calculuation for the pagination |
| 37 | 45 | if(!isset($_GET['limit'])) |
@@ -49,7 +57,7 @@ discard block |
||
| 49 | 57 | $limit_end = $_GET['number_results']; |
| 50 | 58 | $absolute_difference = $_GET['number_results']; |
| 51 | 59 | } |
| 52 | -} else { |
|
| 60 | +} else { |
|
| 53 | 61 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 62 | $limit_start = $limit_explode[0]; |
| 55 | 63 | $limit_end = $limit_explode[1]; |
@@ -67,8 +75,11 @@ discard block |
||
| 67 | 75 | |
| 68 | 76 | header("Content-type: text/yaml"); |
| 69 | 77 | |
| 70 | -if (isset($_GET['sort'])) $sort = $_GET['sort']; |
|
| 71 | -else $sort = ''; |
|
| 78 | +if (isset($_GET['sort'])) { |
|
| 79 | + $sort = $_GET['sort']; |
|
| 80 | +} else { |
|
| 81 | + $sort = ''; |
|
| 82 | +} |
|
| 72 | 83 | $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
| 73 | 84 | $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
| 74 | 85 | $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
@@ -12,7 +12,9 @@ |
||
| 12 | 12 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
| 13 | 13 | if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) { |
| 14 | 14 | $spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort); |
| 15 | -} else $spotter_array = array(); |
|
| 15 | +} else { |
|
| 16 | + $spotter_array = array(); |
|
| 17 | +} |
|
| 16 | 18 | |
| 17 | 19 | if (!empty($spotter_array)) |
| 18 | 20 | { |
@@ -35,7 +35,9 @@ |
||
| 35 | 35 | $first = ''; |
| 36 | 36 | foreach($data as $value => $key) { |
| 37 | 37 | $final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key); |
| 38 | - if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']'; |
|
| 38 | + if ($first == '') { |
|
| 39 | + $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']'; |
|
| 40 | + } |
|
| 39 | 41 | $output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],'; |
| 40 | 42 | } |
| 41 | 43 | $output .= $first; |
@@ -27,8 +27,11 @@ discard block |
||
| 27 | 27 | } else { |
| 28 | 28 | curl_setopt($ch, CURLOPT_USERAGENT, $useragent); |
| 29 | 29 | } |
| 30 | - if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); |
|
| 31 | - else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
|
| 30 | + if ($timeout == '') { |
|
| 31 | + curl_setopt($ch, CURLOPT_TIMEOUT, 10); |
|
| 32 | + } else { |
|
| 33 | + curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
|
| 34 | + } |
|
| 32 | 35 | curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback")); |
| 33 | 36 | if ($type == 'post') { |
| 34 | 37 | curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); |
@@ -73,8 +76,9 @@ discard block |
||
| 73 | 76 | |
| 74 | 77 | private function curlResponseHeaderCallback($ch, $headerLine) { |
| 75 | 78 | global $cookies; |
| 76 | - if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) |
|
| 77 | - $cookies[] = $cookie; |
|
| 79 | + if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) { |
|
| 80 | + $cookies[] = $cookie; |
|
| 81 | + } |
|
| 78 | 82 | return strlen($headerLine); // Needed by curl |
| 79 | 83 | } |
| 80 | 84 | |
@@ -84,10 +88,16 @@ discard block |
||
| 84 | 88 | * @return Array array of the tables in HTML page |
| 85 | 89 | */ |
| 86 | 90 | public function table2array($data) { |
| 87 | - if (!is_string($data)) return array(); |
|
| 88 | - if ($data == '') return array(); |
|
| 91 | + if (!is_string($data)) { |
|
| 92 | + return array(); |
|
| 93 | + } |
|
| 94 | + if ($data == '') { |
|
| 95 | + return array(); |
|
| 96 | + } |
|
| 89 | 97 | $html = str_get_html($data); |
| 90 | - if ($html === false) return array(); |
|
| 98 | + if ($html === false) { |
|
| 99 | + return array(); |
|
| 100 | + } |
|
| 91 | 101 | $tabledata=array(); |
| 92 | 102 | foreach($html->find('tr') as $element) |
| 93 | 103 | { |
@@ -122,7 +132,9 @@ discard block |
||
| 122 | 132 | */ |
| 123 | 133 | public function text2array($data) { |
| 124 | 134 | $html = str_get_html($data); |
| 125 | - if ($html === false) return array(); |
|
| 135 | + if ($html === false) { |
|
| 136 | + return array(); |
|
| 137 | + } |
|
| 126 | 138 | $tabledata=array(); |
| 127 | 139 | foreach($html->find('p') as $element) |
| 128 | 140 | { |
@@ -143,7 +155,9 @@ discard block |
||
| 143 | 155 | * @return Float Distance in $unit |
| 144 | 156 | */ |
| 145 | 157 | public function distance($lat, $lon, $latc, $lonc, $unit = 'km') { |
| 146 | - if ($lat == $latc && $lon == $lonc) return 0; |
|
| 158 | + if ($lat == $latc && $lon == $lonc) { |
|
| 159 | + return 0; |
|
| 160 | + } |
|
| 147 | 161 | $dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515; |
| 148 | 162 | if ($unit == "km") { |
| 149 | 163 | return round($dist * 1.609344); |
@@ -167,10 +181,16 @@ discard block |
||
| 167 | 181 | public function withinThreshold ($timeDifference, $distance) { |
| 168 | 182 | $x = abs($timeDifference); |
| 169 | 183 | $d = abs($distance); |
| 170 | - if ($x == 0 || $d == 0) return true; |
|
| 184 | + if ($x == 0 || $d == 0) { |
|
| 185 | + return true; |
|
| 186 | + } |
|
| 171 | 187 | // may be due to Internet jitter; distance is realistic |
| 172 | - if ($x < 0.7 && $d < 2000) return true; |
|
| 173 | - else return $d/$x < 1500*0.27778; // 1500 km/h max |
|
| 188 | + if ($x < 0.7 && $d < 2000) { |
|
| 189 | + return true; |
|
| 190 | + } else { |
|
| 191 | + return $d/$x < 1500*0.27778; |
|
| 192 | + } |
|
| 193 | + // 1500 km/h max |
|
| 174 | 194 | } |
| 175 | 195 | |
| 176 | 196 | |
@@ -230,7 +250,9 @@ discard block |
||
| 230 | 250 | public function hex2str($hex) { |
| 231 | 251 | $str = ''; |
| 232 | 252 | $hexln = strlen($hex); |
| 233 | - for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2))); |
|
| 253 | + for($i=0;$i<$hexln;$i+=2) { |
|
| 254 | + $str .= chr(hexdec(substr($hex,$i,2))); |
|
| 255 | + } |
|
| 234 | 256 | return $str; |
| 235 | 257 | } |
| 236 | 258 | |
@@ -258,8 +280,11 @@ discard block |
||
| 258 | 280 | $b = $lat2 - $lat1; |
| 259 | 281 | $c = -($a*$lat1+$b*$lon1); |
| 260 | 282 | $d = $a*$lat3+$b*$lon3+$c; |
| 261 | - if ($d > -$approx && $d < $approx) return true; |
|
| 262 | - else return false; |
|
| 283 | + if ($d > -$approx && $d < $approx) { |
|
| 284 | + return true; |
|
| 285 | + } else { |
|
| 286 | + return false; |
|
| 287 | + } |
|
| 263 | 288 | } |
| 264 | 289 | |
| 265 | 290 | public function array_merge_noappend() { |
@@ -285,7 +310,9 @@ discard block |
||
| 285 | 310 | return $result; |
| 286 | 311 | } |
| 287 | 312 | $handle = @opendir('./locale'); |
| 288 | - if ($handle === false) return $result; |
|
| 313 | + if ($handle === false) { |
|
| 314 | + return $result; |
|
| 315 | + } |
|
| 289 | 316 | while (false !== ($file = readdir($handle))) { |
| 290 | 317 | $path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo'; |
| 291 | 318 | if ($file != "." && $file != ".." && @file_exists($path)) { |