Ysurac / FlightAirMap

airport-statistics-arrival-airport-country.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airport'])) {
-        header('Location: '.$globalURL.'/airport');
-        die();
+		header('Location: '.$globalURL.'/airport');
+		die();
 }
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

country-statistics-airline-country.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));

country-statistics-arrival-airport-country.php

Indentation +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
@@ -51,7 +51,7 @@ 
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-        print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights of airports &amp; airlines from <strong>%s</strong>."),$country).'</p>';
 
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByCountry($country);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

require/class.Common.php

Indentation +143 added lines, -143 removed lines

@@ -7,13 +7,13 @@ 
 	//protected $cookies = array();
 	
 	/**
-	* Get data from form result
-	* @param String $url form URL
-	* @param String $type type of submit form method (get or post)
-	* @param String|Array $data values form post method
-	* @param Array $headers header to submit with the form
-	* @return String the result
-	*/
+	 * Get data from form result
+	 * @param String $url form URL
+	 * @param String $type type of submit form method (get or post)
+	 * @param String|Array $data values form post method
+	 * @param Array $headers header to submit with the form
+	 * @return String the result
+	 */
 	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') {
 		global $globalProxy, $globalForceIPv4;
 		$ch = curl_init();
@@ -107,10 +107,10 @@ 
 	}
 	
 	/**
-	* Convert a HTML table to an array
-	* @param String $data HTML page
-	* @return Array array of the tables in HTML page
-	*/
+	 * Convert a HTML table to an array
+	 * @param String $data HTML page
+	 * @return Array array of the tables in HTML page
+	 */
 	public function table2array($data) {
 		if (!is_string($data)) return array();
 		if ($data == '') return array();
@@ -144,10 +144,10 @@ 
 	}
 	
 	/**
-	* Convert <p> part of a HTML page to an array
-	* @param String $data HTML page
-	* @return Array array of the <p> in HTML page
-	*/
+	 * Convert <p> part of a HTML page to an array
+	 * @param String $data HTML page
+	 * @return Array array of the <p> in HTML page
+	 */
 	public function text2array($data) {
 		$html = str_get_html($data);
 		if ($html === false) return array();
@@ -162,14 +162,14 @@ 
 	}
 
 	/**
-	* Give distance between 2 coordonnates
-	* @param Float $lat latitude of first point
-	* @param Float $lon longitude of first point
-	* @param Float $latc latitude of second point
-	* @param Float $lonc longitude of second point
-	* @param String $unit km else no unit used
-	* @return Float Distance in $unit
-	*/
+	 * Give distance between 2 coordonnates
+	 * @param Float $lat latitude of first point
+	 * @param Float $lon longitude of first point
+	 * @param Float $latc latitude of second point
+	 * @param Float $lonc longitude of second point
+	 * @param String $unit km else no unit used
+	 * @return Float Distance in $unit
+	 */
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
 		if ($lat == $latc && $lon == $lonc) return 0;
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
@@ -187,11 +187,11 @@ 
 	}
 
 	/**
-	* Check is distance realistic
-	* @param int $timeDifference the time between the reception of both messages
-	* @param float $distance distance covered
-	* @return whether distance is realistic
-	*/
+	 * Check is distance realistic
+	 * @param int $timeDifference the time between the reception of both messages
+	 * @param float $distance distance covered
+	 * @return whether distance is realistic
+	 */
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
@@ -209,7 +209,7 @@ 
 	}
 
 	public function isInteger($input){
-	    return(ctype_digit(strval($input)));
+		return(ctype_digit(strval($input)));
 	}
 
 
@@ -240,11 +240,11 @@ 
 	}
 	
 	/**
-	* Copy folder contents
-	* @param       string   $source    Source path
-	* @param       string   $dest      Destination path
-	* @return      bool     Returns true on success, false on failure
-	*/
+	 * Copy folder contents
+	 * @param       string   $source    Source path
+	 * @param       string   $dest      Destination path
+	 * @return      bool     Returns true on success, false on failure
+	 */
 	public function xcopy($source, $dest)
 	{
 		$files = glob($source.'*.*');
@@ -256,20 +256,20 @@ 
 	}
 	
 	/**
-	* Check if an url exist
-	* @param	String $url url to check
-	* @return	bool Return true on succes false on failure
-	*/
+	 * Check if an url exist
+	 * @param	String $url url to check
+	 * @return	bool Return true on succes false on failure
+	 */
 	public function urlexist($url){
 		$headers=get_headers($url);
 		return stripos($headers[0],"200 OK")?true:false;
 	}
 	
 	/**
-	* Convert hexa to string
-	* @param	String $hex data in hexa
-	* @return	String Return result
-	*/
+	 * Convert hexa to string
+	 * @param	String $hex data in hexa
+	 * @return	String Return result
+	 */
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
@@ -278,10 +278,10 @@ 
 	}
 	
 	/**
-	* Convert hexa color to rgb
-	* @param	String $hex data in hexa
-	* @return	String Return result
-	*/
+	 * Convert hexa color to rgb
+	 * @param	String $hex data in hexa
+	 * @return	String Return result
+	 */
 	public function hex2rgb($hex) {
 		$hex = str_replace('#','',$hex);
 		return sscanf($hex, "%02x%02x%02x"); 
@@ -359,9 +359,9 @@ 
 	}
 	
 	/**
-	* Returns list of available locales
-	*
-	* @return array
+	 * Returns list of available locales
+	 *
+	 * @return array
 	 */
 	public function listLocaleDir()
 	{
@@ -456,100 +456,100 @@ 
 	public function remove_accents($string) {
 		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
 		$chars = array(
-		    // Decompositions for Latin-1 Supplement
-		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
-		    chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
-		    chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
-		    chr(195).chr(135) => 'C', chr(195).chr(136) => 'E',
-		    chr(195).chr(137) => 'E', chr(195).chr(138) => 'E',
-		    chr(195).chr(139) => 'E', chr(195).chr(140) => 'I',
-		    chr(195).chr(141) => 'I', chr(195).chr(142) => 'I',
-		    chr(195).chr(143) => 'I', chr(195).chr(145) => 'N',
-		    chr(195).chr(146) => 'O', chr(195).chr(147) => 'O',
-		    chr(195).chr(148) => 'O', chr(195).chr(149) => 'O',
-		    chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
-		    chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
-		    chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
-		    chr(195).chr(159) => 's', chr(195).chr(160) => 'a',
-		    chr(195).chr(161) => 'a', chr(195).chr(162) => 'a',
-		    chr(195).chr(163) => 'a', chr(195).chr(164) => 'a',
-		    chr(195).chr(165) => 'a', chr(195).chr(167) => 'c',
-		    chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
-		    chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
-		    chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
-		    chr(195).chr(174) => 'i', chr(195).chr(175) => 'i',
-		    chr(195).chr(177) => 'n', chr(195).chr(178) => 'o',
-		    chr(195).chr(179) => 'o', chr(195).chr(180) => 'o',
-		    chr(195).chr(181) => 'o', chr(195).chr(182) => 'o',
-		    chr(195).chr(182) => 'o', chr(195).chr(185) => 'u',
-		    chr(195).chr(186) => 'u', chr(195).chr(187) => 'u',
-		    chr(195).chr(188) => 'u', chr(195).chr(189) => 'y',
-		    chr(195).chr(191) => 'y',
-		    // Decompositions for Latin Extended-A
-		    chr(196).chr(128) => 'A', chr(196).chr(129) => 'a',
-		    chr(196).chr(130) => 'A', chr(196).chr(131) => 'a',
-		    chr(196).chr(132) => 'A', chr(196).chr(133) => 'a',
-		    chr(196).chr(134) => 'C', chr(196).chr(135) => 'c',
-		    chr(196).chr(136) => 'C', chr(196).chr(137) => 'c',
-		    chr(196).chr(138) => 'C', chr(196).chr(139) => 'c',
-		    chr(196).chr(140) => 'C', chr(196).chr(141) => 'c',
-		    chr(196).chr(142) => 'D', chr(196).chr(143) => 'd',
-		    chr(196).chr(144) => 'D', chr(196).chr(145) => 'd',
-		    chr(196).chr(146) => 'E', chr(196).chr(147) => 'e',
-		    chr(196).chr(148) => 'E', chr(196).chr(149) => 'e',
-		    chr(196).chr(150) => 'E', chr(196).chr(151) => 'e',
-		    chr(196).chr(152) => 'E', chr(196).chr(153) => 'e',
-		    chr(196).chr(154) => 'E', chr(196).chr(155) => 'e',
-		    chr(196).chr(156) => 'G', chr(196).chr(157) => 'g',
-		    chr(196).chr(158) => 'G', chr(196).chr(159) => 'g',
-		    chr(196).chr(160) => 'G', chr(196).chr(161) => 'g',
-		    chr(196).chr(162) => 'G', chr(196).chr(163) => 'g',
-		    chr(196).chr(164) => 'H', chr(196).chr(165) => 'h',
-		    chr(196).chr(166) => 'H', chr(196).chr(167) => 'h',
-		    chr(196).chr(168) => 'I', chr(196).chr(169) => 'i',
-		    chr(196).chr(170) => 'I', chr(196).chr(171) => 'i',
-		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
-		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
-		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
-		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
-		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
-		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
-		    chr(196).chr(186) => 'l', chr(196).chr(187) => 'L',
-		    chr(196).chr(188) => 'l', chr(196).chr(189) => 'L',
-		    chr(196).chr(190) => 'l', chr(196).chr(191) => 'L',
-		    chr(197).chr(128) => 'l', chr(197).chr(129) => 'L',
-		    chr(197).chr(130) => 'l', chr(197).chr(131) => 'N',
-		    chr(197).chr(132) => 'n', chr(197).chr(133) => 'N',
-		    chr(197).chr(134) => 'n', chr(197).chr(135) => 'N',
-		    chr(197).chr(136) => 'n', chr(197).chr(137) => 'N',
-		    chr(197).chr(138) => 'n', chr(197).chr(139) => 'N',
-		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
-		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
-		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
-		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
-		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
-		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
-		    chr(197).chr(166) => 'T', chr(197).chr(167) => 't',
-		    chr(197).chr(168) => 'U', chr(197).chr(169) => 'u',
-		    chr(197).chr(170) => 'U', chr(197).chr(171) => 'u',
-		    chr(197).chr(172) => 'U', chr(197).chr(173) => 'u',
-		    chr(197).chr(174) => 'U', chr(197).chr(175) => 'u',
-		    chr(197).chr(176) => 'U', chr(197).chr(177) => 'u',
-		    chr(197).chr(178) => 'U', chr(197).chr(179) => 'u',
-		    chr(197).chr(180) => 'W', chr(197).chr(181) => 'w',
-		    chr(197).chr(182) => 'Y', chr(197).chr(183) => 'y',
-		    chr(197).chr(184) => 'Y', chr(197).chr(185) => 'Z',
-		    chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
-		    chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
-		    chr(197).chr(190) => 'z', chr(197).chr(191) => 's'
+			// Decompositions for Latin-1 Supplement
+			chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
+			chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
+			chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
+			chr(195).chr(135) => 'C', chr(195).chr(136) => 'E',
+			chr(195).chr(137) => 'E', chr(195).chr(138) => 'E',
+			chr(195).chr(139) => 'E', chr(195).chr(140) => 'I',
+			chr(195).chr(141) => 'I', chr(195).chr(142) => 'I',
+			chr(195).chr(143) => 'I', chr(195).chr(145) => 'N',
+			chr(195).chr(146) => 'O', chr(195).chr(147) => 'O',
+			chr(195).chr(148) => 'O', chr(195).chr(149) => 'O',
+			chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
+			chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
+			chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
+			chr(195).chr(159) => 's', chr(195).chr(160) => 'a',
+			chr(195).chr(161) => 'a', chr(195).chr(162) => 'a',
+			chr(195).chr(163) => 'a', chr(195).chr(164) => 'a',
+			chr(195).chr(165) => 'a', chr(195).chr(167) => 'c',
+			chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
+			chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
+			chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
+			chr(195).chr(174) => 'i', chr(195).chr(175) => 'i',
+			chr(195).chr(177) => 'n', chr(195).chr(178) => 'o',
+			chr(195).chr(179) => 'o', chr(195).chr(180) => 'o',
+			chr(195).chr(181) => 'o', chr(195).chr(182) => 'o',
+			chr(195).chr(182) => 'o', chr(195).chr(185) => 'u',
+			chr(195).chr(186) => 'u', chr(195).chr(187) => 'u',
+			chr(195).chr(188) => 'u', chr(195).chr(189) => 'y',
+			chr(195).chr(191) => 'y',
+			// Decompositions for Latin Extended-A
+			chr(196).chr(128) => 'A', chr(196).chr(129) => 'a',
+			chr(196).chr(130) => 'A', chr(196).chr(131) => 'a',
+			chr(196).chr(132) => 'A', chr(196).chr(133) => 'a',
+			chr(196).chr(134) => 'C', chr(196).chr(135) => 'c',
+			chr(196).chr(136) => 'C', chr(196).chr(137) => 'c',
+			chr(196).chr(138) => 'C', chr(196).chr(139) => 'c',
+			chr(196).chr(140) => 'C', chr(196).chr(141) => 'c',
+			chr(196).chr(142) => 'D', chr(196).chr(143) => 'd',
+			chr(196).chr(144) => 'D', chr(196).chr(145) => 'd',
+			chr(196).chr(146) => 'E', chr(196).chr(147) => 'e',
+			chr(196).chr(148) => 'E', chr(196).chr(149) => 'e',
+			chr(196).chr(150) => 'E', chr(196).chr(151) => 'e',
+			chr(196).chr(152) => 'E', chr(196).chr(153) => 'e',
+			chr(196).chr(154) => 'E', chr(196).chr(155) => 'e',
+			chr(196).chr(156) => 'G', chr(196).chr(157) => 'g',
+			chr(196).chr(158) => 'G', chr(196).chr(159) => 'g',
+			chr(196).chr(160) => 'G', chr(196).chr(161) => 'g',
+			chr(196).chr(162) => 'G', chr(196).chr(163) => 'g',
+			chr(196).chr(164) => 'H', chr(196).chr(165) => 'h',
+			chr(196).chr(166) => 'H', chr(196).chr(167) => 'h',
+			chr(196).chr(168) => 'I', chr(196).chr(169) => 'i',
+			chr(196).chr(170) => 'I', chr(196).chr(171) => 'i',
+			chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
+			chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
+			chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
+			chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+			chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
+			chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
+			chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
+			chr(196).chr(186) => 'l', chr(196).chr(187) => 'L',
+			chr(196).chr(188) => 'l', chr(196).chr(189) => 'L',
+			chr(196).chr(190) => 'l', chr(196).chr(191) => 'L',
+			chr(197).chr(128) => 'l', chr(197).chr(129) => 'L',
+			chr(197).chr(130) => 'l', chr(197).chr(131) => 'N',
+			chr(197).chr(132) => 'n', chr(197).chr(133) => 'N',
+			chr(197).chr(134) => 'n', chr(197).chr(135) => 'N',
+			chr(197).chr(136) => 'n', chr(197).chr(137) => 'N',
+			chr(197).chr(138) => 'n', chr(197).chr(139) => 'N',
+			chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
+			chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
+			chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
+			chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
+			chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
+			chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
+			chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
+			chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
+			chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
+			chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+			chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
+			chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
+			chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
+			chr(197).chr(166) => 'T', chr(197).chr(167) => 't',
+			chr(197).chr(168) => 'U', chr(197).chr(169) => 'u',
+			chr(197).chr(170) => 'U', chr(197).chr(171) => 'u',
+			chr(197).chr(172) => 'U', chr(197).chr(173) => 'u',
+			chr(197).chr(174) => 'U', chr(197).chr(175) => 'u',
+			chr(197).chr(176) => 'U', chr(197).chr(177) => 'u',
+			chr(197).chr(178) => 'U', chr(197).chr(179) => 'u',
+			chr(197).chr(180) => 'W', chr(197).chr(181) => 'w',
+			chr(197).chr(182) => 'Y', chr(197).chr(183) => 'y',
+			chr(197).chr(184) => 'Y', chr(197).chr(185) => 'Z',
+			chr(197).chr(186) => 'z', chr(197).chr(187) => 'Z',
+			chr(197).chr(188) => 'z', chr(197).chr(189) => 'Z',
+			chr(197).chr(190) => 'z', chr(197).chr(191) => 's'
 		);
 		$string = strtr($string, $chars);
 		return $string;

live-geojson.php

Indentation +31 added lines, -31 removed lines

@@ -5,23 +5,23 @@ 
 $marine = false;
 $usecoord = false;
 if (isset($_GET['tracker'])) {
-    $tracker = true;
+	$tracker = true;
 }
 if (isset($_GET['marine'])) {
-    $marine = true;
+	$marine = true;
 }
 if ($tracker) {
-    require_once('require/class.Tracker.php');
-    require_once('require/class.TrackerLive.php');
-    //require_once('require/class.TrackerArchive.php');
+	require_once('require/class.Tracker.php');
+	require_once('require/class.TrackerLive.php');
+	//require_once('require/class.TrackerArchive.php');
 } elseif ($marine) {
-    require_once('require/class.Marine.php');
-    require_once('require/class.MarineLive.php');
-    //require_once('require/class.MarineArchive.php');
+	require_once('require/class.Marine.php');
+	require_once('require/class.MarineLive.php');
+	//require_once('require/class.MarineArchive.php');
 } else {
-    require_once('require/class.Spotter.php');
-    require_once('require/class.SpotterLive.php');
-    require_once('require/class.SpotterArchive.php');
+	require_once('require/class.Spotter.php');
+	require_once('require/class.SpotterLive.php');
+	require_once('require/class.SpotterArchive.php');
 }
 
 $begintime = microtime(true);
@@ -41,10 +41,10 @@ 
 $Common = new Common();
 
 if (isset($_GET['download'])) {
-    if ($_GET['download'] == "true")
-    {
+	if ($_GET['download'] == "true")
+	{
 	header('Content-disposition: attachment; filename="flightairmap.json"');
-    }
+	}
 }
 header('Content-Type: text/javascript');
 
@@ -496,13 +496,13 @@ 
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
 				
 				if (
-				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
-				    || ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
+					(isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
+					|| ((isset($globalMapHistory) && $globalMapHistory) || $allhistory)
 				//    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id']))
 				//    || (isset($history) && $history != '' && $history != 'NA' && $history == $spotter_item['ident'])
-				    || (isset($history) && $history != '' && $history != 'NA' && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
-				    || (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
-				    ) {
+					|| (isset($history) && $history != '' && $history != 'NA' && str_replace('-','',$history) == str_replace('-','',$spotter_item['flightaware_id']))
+					|| (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])
+					) {
 					if ($tracker) {
 						$spotter_history_array = $TrackerLive->getAllLiveTrackerDataById($spotter_item['famtrackid']);
 					} elseif ($marine) {
@@ -555,26 +555,26 @@ 
 				}
 				
 				if (isset($history) && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
-				    $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
-				    if (isset($spotter_item['departure_airport_latitude'])) {
+					$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
+					if (isset($spotter_item['departure_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 					if (isset($dairport[0]['latitude'])) {
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
 					}
-				    }
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
+					}
+					if (isset($spotter_item['arrival_airport_latitude'])) {
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 					if (isset($aairport[0]['latitude'])) {
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
 					}
-				    }
-				    $output_air .= ']}},';
-				    $output .= $output_air;
-				    unset($output_air);
+					}
+					$output_air .= ']}},';
+					$output .= $output_air;
+					unset($output_air);
 				}
 			}
 			$output  = substr($output, 0, -1);

airport-geojson.php

Indentation +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"name": "'.str_replace('"',"'",$spotter_item['name']).'",';
 			$output .= '"city": "'.str_replace('"',"'",$spotter_item['city']).'",';
 			$output .= '"country": "'.$spotter_item['country'].'",';
@@ -50,13 +50,13 @@ 
 			$output .= '"homepage": "'.$spotter_item['home_link'].'",';
 			$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
 //			$output .= '"photo": "'.$spotter_item['image_thumbnail'].'",';
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 		$output .= '},';
 	}
 	$output  = substr($output, 0, -1);

statistics.php

Indentation +226 added lines, -226 removed lines

@@ -51,7 +51,7 @@ 
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
 		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 	}
-    ?>
+	?>
     </div>
     <?php include('statistics-sub-menu.php'); ?>
     <p class="global-stats">
@@ -60,23 +60,23 @@ 
         <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
-	    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+		if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    	    } else {
-    	?>
+			} else {
+		?>
     	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
     	<?php
-    	    }
-    	?>
+			}
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
         <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         <?php
-    		if ($airline_icao == '') {
-    	?>
+			if ($airline_icao == '') {
+		?>
         <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
 	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 	<?php
@@ -99,88 +99,88 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
-                  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
-                    print '<div id="chart1" class="chart" width="100%"></div><script>';
-                    $aircraft_data = '';
-                    foreach($aircraft_array as $aircraft_item)
-                    {
-                        $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
-                    }
-                    $aircraft_data = substr($aircraft_data, 0, -1);
-		    print 'var series = ['.$aircraft_data.'];';
-		    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-		    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);';
-		    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-                    print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-                    print 'dataset';
-                    print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-                    print '</script>';
-                  }
-                  ?>
+				  $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
+			if (count($aircraft_array) == 0) print _("No data available");
+			else {
+					print '<div id="chart1" class="chart" width="100%"></div><script>';
+					$aircraft_data = '';
+					foreach($aircraft_array as $aircraft_item)
+					{
+						$aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
+					}
+					$aircraft_data = substr($aircraft_data, 0, -1);
+			print 'var series = ['.$aircraft_data.'];';
+			print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+			print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);';
+			print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+					print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+					print 'dataset';
+					print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+					print '</script>';
+				  }
+				  ?>
                 <div class="more">
             	    <?php
-            		if ($year != '' && $month != '') {
-            	    ?>
+					if ($year != '' && $month != '') {
+					?>
             	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
             	    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
             	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
             	    <?php
-            		}
-            	    ?>
+					}
+					?>
                 </div>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
 //    echo $airline_icao;
-    if ($airline_icao == '' || $airline_icao == 'all') {
+	if ($airline_icao == '' || $airline_icao == 'all') {
 	$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
 	if (count($airline_array) > 0) {
-            print '<div class="col-md-6">';
-	    print '<h2>'._("Top 10 Most Common Airline").'</h2>';
-	    print '<div id="chart2" class="chart" width="100%"></div><script>';
-	    $airline_data = '';
-	    foreach($airline_array as $airline_item)
-	    {
+			print '<div class="col-md-6">';
+		print '<h2>'._("Top 10 Most Common Airline").'</h2>';
+		print '<div id="chart2" class="chart" width="100%"></div><script>';
+		$airline_data = '';
+		foreach($airline_array as $airline_item)
+		{
 		$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
-	    }
-	    $airline_data = substr($airline_data, 0, -1);
-	    print 'var series = ['.$airline_data.'];';
-	    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-            print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-	    print 'dataset';
-            print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-            print '</script>';
-	    if ($year != '' && $month != '') {
+		}
+		$airline_data = substr($airline_data, 0, -1);
+		print 'var series = ['.$airline_data.'];';
+		print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+			print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+		print 'dataset';
+			print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+			print '</script>';
+		if ($year != '' && $month != '') {
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
 		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 		print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-	    } else {
+		} else {
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
 		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-	    }
-    	    print '</div>';
+		}
+			print '</div>';
 	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
+	}
 ?>
         <div class="row column">
 <?php
-    $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
-    if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
+	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
+	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if (empty($flightover_array)) {
-	    print '<div class="col-md-12">';
+		print '<div class="col-md-12">';
 	} else {
-            print '<div class="col-md-6">';
+			print '<div class="col-md-6">';
 	}
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
@@ -188,23 +188,23 @@ 
 	$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
 	if (count($pilot_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div><script>';
-	    $pilot_data = '';
-	    foreach($pilot_array as $pilot_item)
-	    {
+		print '<div id="chart7" class="chart" width="100%"></div><script>';
+		$pilot_data = '';
+		foreach($pilot_array as $pilot_item)
+		{
 		$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
-	    }
-	    $pilot_data = substr($pilot_data, 0, -1);
-	    print 'var series = ['.$pilot_data.'];';
-	    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-            print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-	    print 'dataset';
-            print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-            print '</script>';
-        }
-        print '<div class="more">';
+		}
+		$pilot_data = substr($pilot_data, 0, -1);
+		print 'var series = ['.$pilot_data.'];';
+		print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+			print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+		print 'dataset';
+			print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+			print '</script>';
+		}
+		print '<div class="more">';
 	print '<a href="'.$globalURL.'/statistics/pilot'; 
 	if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 	print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
@@ -214,7 +214,7 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    } else {
+	} else {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
@@ -222,21 +222,21 @@ 
 	$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
 	if (count($owner_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart7" class="chart" width="100%"></div><script>';
-	    $owner_data = '';
-	    foreach($owner_array as $owner_item)
-	    {
+		print '<div id="chart7" class="chart" width="100%"></div><script>';
+		$owner_data = '';
+		foreach($owner_array as $owner_item)
+		{
 		$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
-	    }
-	    $owner_data = substr($owner_data, 0, -1);
-	    print 'var series = ['.$owner_data.'];';
-	    print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
-            print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
-	    print 'dataset';
-            print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
-	    print '</script>';
+		}
+		$owner_data = substr($owner_data, 0, -1);
+		print 'var series = ['.$owner_data.'];';
+		print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});';
+			print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":';
+		print 'dataset';
+			print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});';
+		print '</script>';
 	}
 ?>
                 <div class="more">
@@ -246,8 +246,8 @@ 
         
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    }
-    if (!empty($flightover_array)) {
+	}
+	if (!empty($flightover_array)) {
 ?>
             <div class="col-md-6">
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
@@ -255,20 +255,20 @@ 
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
 	if (count($flightover_array) == 0) print _("No data available");
 	else {
-	    print '<div id="chart10" class="chart" width="100%"></div><script>';
-	    print 'var series = [';
-            $flightover_data = '';
-	    foreach($flightover_array as $flightover_item)
-	    {
+		print '<div id="chart10" class="chart" width="100%"></div><script>';
+		print 'var series = [';
+			$flightover_data = '';
+		foreach($flightover_array as $flightover_item)
+		{
 		$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
-	    }
-	    $flightover_data = substr($flightover_data, 0, -1);
-	    print $flightover_data;
-	    print '];';
-	    print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-	    print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-	    print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
-	    print 'new Datamap({
+		}
+		$flightover_data = substr($flightover_data, 0, -1);
+		print $flightover_data;
+		print '];';
+		print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
+		print 'new Datamap({
 		element: document.getElementById("chart10"),
 		projection: "mercator", // big world map
 		fills: { defaultFill: "#F5F5F5" },
@@ -293,7 +293,7 @@ 
         	    }
 		}
 	    });";
-	    print '</script>';
+		print '</script>';
 	}
 ?>
                 <div class="more">
@@ -301,7 +301,7 @@ 
                 </div>
             </div>
 <?php
-    }
+	}
 ?>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
@@ -311,13 +311,13 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-    $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
-    if (count($airport_airport_array) > 0) {
+	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
+	if (count($airport_airport_array) > 0) {
 	print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 	print '<div id="chart3" class="chart" width="100%"></div><script>';
-        print "\n";
-        print 'var series = [';
-        $airport_data = '';
+		print "\n";
+		print 'var series = [';
+		$airport_data = '';
 	foreach($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
@@ -366,20 +366,20 @@ 
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; 
 	if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 	print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-    $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
-    if (count($airport_airport_array2) > 0) {
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
+	if (count($airport_airport_array2) > 0) {
 	print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 	print '<div id="chart4" class="chart" width="100%"></div><script>';
-        print "\n";
-        print 'var series = [';
-        $airport_data = '';
+		print "\n";
+		print 'var series = [';
+		$airport_data = '';
 	foreach($airport_airport_array2 as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
@@ -429,28 +429,28 @@ 
 	print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
 	if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
 	print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
-    }
+	}
 ?>
             </div>
         </div>
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <?php
-    if ($year == '' && $month == '') {
+	if ($year == '' && $month == '') {
 ?>
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+				  $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+			if (count($year_array) == 0) print _("No data available");
+			else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
 			foreach($year_array as $year_item)
 			{
-			    $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
-			    $year_cnt .= $year_item['date_count'].',';
+				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
+				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
 			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
@@ -460,8 +460,8 @@ 
                 	     columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 			print '</script>';
-                    }
-                  ?>
+					}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -470,16 +470,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
                 <?php
-                  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-		    if (count($month_array) == 0) print _("No data available");
-		    else {
-                	print '<div id="chart9" class="chart" width="100%"></div><script>';
-                        $month_data = '';
+				  $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+			if (count($month_array) == 0) print _("No data available");
+			else {
+					print '<div id="chart9" class="chart" width="100%"></div><script>';
+						$month_data = '';
 			$month_cnt = '';
 			foreach($month_array as $month_item)
 			{
-			    $month_data .= '"'.$month_item['date_name'].'",';
-			    $month_cnt .= $month_item['date_count'].',';
+				$month_data .= '"'.$month_item['date_name'].'",';
+				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
 			$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
@@ -489,9 +489,9 @@ 
                 	     columns: ['.$month_data.','.$month_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 			
-            		print '</script>';
-                    }
-                  ?>
+					print '</script>';
+					}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -501,16 +501,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
                 <?php
-                    $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-		    if (empty($date_array)) print _("No data available");
-		    else {
-                	print '<div id="chart5" class="chart" width="100%"></div><script>';
-                        $date_data = '';
+					$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+			if (empty($date_array)) print _("No data available");
+			else {
+					print '<div id="chart5" class="chart" width="100%"></div><script>';
+						$date_data = '';
 			$date_cnt = '';
 			foreach($date_array as $date_item)
 			{
-			    $date_data .= '"'.$date_item['date_name'].'",';
-			    $date_cnt .= $date_item['date_count'].',';
+				$date_data .= '"'.$date_item['date_name'].'",';
+				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
 			$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
@@ -520,9 +520,9 @@ 
                 	     columns: ['.$date_data.','.$date_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries",tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 			
-                	print '</script>';
-                    }
-                  ?>
+					print '</script>';
+					}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -531,16 +531,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
                 <?php
-                  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-		    if (empty($hour_array)) print _("No data available");
-		    else {
-                	print '<div id="chart6" class="chart" width="100%"></div><script>';
-                        $hour_data = '';
+				  $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+			if (empty($hour_array)) print _("No data available");
+			else {
+					print '<div id="chart6" class="chart" width="100%"></div><script>';
+						$hour_data = '';
 			$hour_cnt = '';
 			foreach($hour_array as $hour_item)
 			{
-			    $hour_data .= '"'.$hour_item['hour_name'].':00",';
-			    $hour_cnt .= $hour_item['hour_count'].',';
+				$hour_data .= '"'.$hour_item['hour_name'].':00",';
+				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
 			$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
@@ -550,9 +550,9 @@ 
                 	     columns: ['.$hour_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});';
 
-            	     print '</script>';
-                  }
-                ?>
+					 print '</script>';
+				  }
+				?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -560,26 +560,26 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         </div>
 <?php
-    }
+	}
 ?>
 
 <?php
-    if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) {
+	if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) {
 ?>
         <div class="row column">
             <div class="col-md-6">
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
                 <?php
-                  $year_array = $Stats->countFatalitiesByYear();
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+				  $year_array = $Stats->countFatalitiesByYear();
+			if (count($year_array) == 0) print _("No data available");
+			else {
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
-                        $year_data = '';
+						$year_data = '';
 			$year_cnt = '';
 			foreach($year_array as $year_item)
 			{
-			    $year_data .= '"'.$year_item['year'].'-01-01",';
-			    $year_cnt .= $year_item['count'].',';
+				$year_data .= '"'.$year_item['year'].'-01-01",';
+				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
 			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
@@ -590,8 +590,8 @@ 
                 	     axis: { x: { type: "timeseries",tick: { format: "%Y"}}, y: { label: "# of Fatalities"}},legend: { show: false }});';
 
 			print '</script>';
-		    }
-                  ?>
+			}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -602,16 +602,16 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
                 <?php
-                  $year_array = $Stats->countFatalitiesLast12Months();
-		    if (count($year_array) == 0) print _("No data available");
-		    else {
+				  $year_array = $Stats->countFatalitiesLast12Months();
+			if (count($year_array) == 0) print _("No data available");
+			else {
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
-                        $year_data = '';
+						$year_data = '';
 			$year_cnt = '';
 			foreach($year_array as $year_item)
 			{
-			    $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
-			    $year_cnt .= $year_item['count'].',';
+				$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
+				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
 			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
@@ -621,8 +621,8 @@ 
                 	     columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
                 	     axis: { x: { type: "timeseries",tick: { format: "%Y-%m"}}, y: { label: "# of Fatalities"}},legend: { show: false }});';
 			print '</script>';
-		    }
-                  ?>
+			}
+				  ?>
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
@@ -630,30 +630,30 @@ 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 <br/>
 <?php
-    }
+	}
 ?>
 
 <?php
-    if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') {
+	if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') {
 ?>
         <div class="row column">
         	<?php
-        	    //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
-        	    if ($year == '' && $month == '') {
-		        $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
-		    } else {
-        		$polar = $Stats->getStatsSource('polar',$year,$month);
-        	    }
-        	    if (!empty($polar)) {
-            		print '<h2>'._("Coverage pattern").'</h2>';
-        		foreach ($polar as $eachpolar) {
-        		    unset($polar_data);
-	        	    $Spotter = new Spotter();
-        		    $data = json_decode($eachpolar['source_data']);
-        		    foreach($data as $value => $key) {
-        			$direction = $Spotter->parseDirection(($value*22.5));
-        			$distance = $key;
-        			$unit = 'km';
+				//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
+				if ($year == '' && $month == '') {
+				$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
+			} else {
+				$polar = $Stats->getStatsSource('polar',$year,$month);
+				}
+				if (!empty($polar)) {
+					print '<h2>'._("Coverage pattern").'</h2>';
+				foreach ($polar as $eachpolar) {
+					unset($polar_data);
+					$Spotter = new Spotter();
+					$data = json_decode($eachpolar['source_data']);
+					foreach($data as $value => $key) {
+					$direction = $Spotter->parseDirection(($value*22.5));
+					$distance = $key;
+					$unit = 'km';
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 					$distance = round($distance*0.539957);
 					$unit = 'nm';
@@ -664,10 +664,10 @@ 
 					$distance = $distance;
 					$unit = 'km';
 				}
-        			if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        	    		else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-        		    }
-        	?>
+					if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+						else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+					}
+			?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
         	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
@@ -699,27 +699,27 @@ 
 		</script>
             </div>
             <?php
-        	    }
-        	}
-            ?>
+				}
+			}
+			?>
         </div>
         <div class="row column">
             <div class="col-md-6">
         	<?php
-        	    //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
-        	    if ($year == '' && $month == '') {
-        		$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
-        	    } else {
-        		$msg = $Stats->getStatsSource('msg',$year,$month);
-        	    }
-        	    if (!empty($msg)) {
-            		print '<h2>'._("Messages received").'</h2>';
-        		foreach ($msg as $eachmsg) {
-        		    //$eachmsg = $msg[0];
-        		    $data = $eachmsg['source_data'];
-        		    if ($data > 500) $max = (round(($data+100)/100))*100;
-        		    else $max = 500;
-        	?>
+				//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
+				if ($year == '' && $month == '') {
+				$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
+				} else {
+				$msg = $Stats->getStatsSource('msg',$year,$month);
+				}
+				if (!empty($msg)) {
+					print '<h2>'._("Messages received").'</h2>';
+				foreach ($msg as $eachmsg) {
+					//$eachmsg = $msg[0];
+					$data = $eachmsg['source_data'];
+					if ($data > 500) $max = (round(($data+100)/100))*100;
+					else $max = 500;
+			?>
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
@@ -735,9 +735,9 @@ 
 			  });
 		</script>
             <?php
-        	   }
-        	}
-            ?>
+			   }
+			}
+			?>
             </div>
         </div>
         <div class="row column">
@@ -775,26 +775,26 @@ 
 			//$hist_data = substr($hist_data, 0, -1);
 			$distance_data = "['x',".substr($distance_data, 0, -1)."]";
 			$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
-            ?>
+			?>
             <div class="col-md-6">
                 <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2>
                 <?php
-                    print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
-		    print 'c3.generate({
+					print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
+			print 'c3.generate({
 			bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
 			data: { x: "x",
 			columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
 			axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
-		    print '</script>';
-        	?>
+			print '</script>';
+			?>
     	    </div>
 	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
         	<?php
-                  }
-                ?>
+				  }
+				?>
         </div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>  

airline-statistics-departure-airport-country.php

Indentation +7 added lines, -7 removed lines

@@ -4,8 +4,8 @@ 
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airline'])) {
-        header('Location: '.$globalURL.'/airline');
-        die();
+		header('Location: '.$globalURL.'/airline');
+		die();
 }
 $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
@@ -76,11 +76,11 @@ 
 	}
 	$country_data = substr($country_data, 0, -1);
 	print $country_data;
-        print '];';
-        print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-        print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-        print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
-        print 'new Datamap({
+		print '];';
+		print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
+		print 'new Datamap({
 	    element: document.getElementById("chartCountry"),
 	    projection: "mercator", // big world map
 	    fills: { defaultFill: "#F5F5F5" },

aircraft-statistics-airline-country.php

Indentation +20 added lines, -20 removed lines

@@ -21,18 +21,18 @@ 
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
 	print '<select name="aircraft_type" class="selectpicker" data-live-search="true">';
-    	print '<option></option>';
-    	$Stats = new Stats();
-    	$aircraft_types = $Stats->getAllAircraftTypes();
-    	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-    	foreach($aircraft_types as $aircrafttype)
-    	{
-    		if($aircraft_type == $aircrafttype['aircraft_icao'])
-    		{
-    			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
-    		} else {
-    			print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
-    		}
+		print '<option></option>';
+		$Stats = new Stats();
+		$aircraft_types = $Stats->getAllAircraftTypes();
+		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+		foreach($aircraft_types as $aircrafttype)
+		{
+			if($aircraft_type == $aircrafttype['aircraft_icao'])
+			{
+				print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
+			} else {
+				print '<option value="'.$aircrafttype['aircraft_icao'].'">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
+			}
 	}
 	print '</select>';
 	print '<button type="submit"><i class="fa fa-angle-double-right"></i></button>';
@@ -61,18 +61,18 @@ 
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
-        $country_data = '';
+		$country_data = '';
 	foreach($airline_array as $airline_item)
 	{
 		$country_data .= '[ "'.$airline_item['airline_country_iso3'].'",'.$airline_item['airline_country_count'].'],';
 	}
-        $country_data = substr($country_data, 0, -1);
-        print $country_data;
-        print '];';
-        print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
-        print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
-        print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
-        print 'new Datamap({
+		$country_data = substr($country_data, 0, -1);
+		print $country_data;
+		print '];';
+		print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';
+		print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);';
+		print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});';
+		print 'new Datamap({
 	    element: document.getElementById("chartCountry"),
 	    projection: "mercator", // big world map
 	    fills: { defaultFill: "#F5F5F5" },