Ysurac / FlightAirMap

require/libs/Predict/Predict/TLE.php

Indentation +192 added lines, -192 removed lines

@@ -12,221 +12,221 @@
  */
 class Predict_TLE
 {
-    public $header;     /* Header line of TLE file */
-    public $line1;      /* Line 1 of TLE */
-    public $line2;      /* Line 2 of TLE */
-    public $epoch;      /*!< Epoch Time in NORAD TLE format YYDDD.FFFFFFFF */
-    public $epoch_year; /*!< Epoch: year */
-    public $epoch_day;  /*!< Epoch: day of year */
-    public $epoch_fod;  /*!< Epoch: Fraction of day. */
-    public $xndt2o;     /*!< 1. time derivative of mean motion */
-    public $xndd6o;     /*!< 2. time derivative of mean motion */
-    public $bstar;      /*!< Bstar drag coefficient. */
-    public $xincl;      /*!< Inclination */
-    public $xnodeo;     /*!< R.A.A.N. */
-    public $eo;         /*!< Eccentricity */
-    public $omegao;     /*!< argument of perigee */
-    public $xmo;        /*!< mean anomaly */
-    public $xno;        /*!< mean motion */
-
-    public $catnr;      /*!< Catalogue Number.  */
-    public $elset;      /*!< Element Set number. */
-    public $revnum;     /*!< Revolution Number at epoch. */
-
-    public $sat_name;   /*!< Satellite name string. */
-    public $idesg;      /*!< International Designator. */
-    public $status;     /*!< Operational status. */
-
-    /* values needed for squint calculations */
-    public $xincl1;
-    public $xnodeo1;
-    public $omegao1;
-
-
-    /* Converts the strings in a raw two-line element set  */
-    /* to their intended numerical values. No processing   */
-    /* of these values is done, e.g. from deg to rads etc. */
-    /* This is done in the select_ephemeris() function.    */
-    public function __construct($header, $line1, $line2)
-    {
-        if (!$this->Good_Elements($line1, $line2)) {
-            throw new Predict_Exception('Invalid TLE contents');
-        }
-
-        $this->header = $header;
-        $this->line1  = $line1;
-        $this->line2  = $line2;
-
-        /** Decode Card 1 **/
-        /* Satellite's catalogue number */
-        $this->catnr = (int) substr($line1, 2, 5);
-
-        /* International Designator for satellite */
-        $this->idesg = substr($line1, 9, 8);
-
-        /* Epoch time; this is the complete, unconverted epoch. */
-        /* Replace spaces with 0 before casting, as leading spaces are allowed */
-        $this->epoch = (float) str_replace(' ', '0', substr($line1, 18, 14));
-
-        /* Now, convert the epoch time into year, day
+	public $header;     /* Header line of TLE file */
+	public $line1;      /* Line 1 of TLE */
+	public $line2;      /* Line 2 of TLE */
+	public $epoch;      /*!< Epoch Time in NORAD TLE format YYDDD.FFFFFFFF */
+	public $epoch_year; /*!< Epoch: year */
+	public $epoch_day;  /*!< Epoch: day of year */
+	public $epoch_fod;  /*!< Epoch: Fraction of day. */
+	public $xndt2o;     /*!< 1. time derivative of mean motion */
+	public $xndd6o;     /*!< 2. time derivative of mean motion */
+	public $bstar;      /*!< Bstar drag coefficient. */
+	public $xincl;      /*!< Inclination */
+	public $xnodeo;     /*!< R.A.A.N. */
+	public $eo;         /*!< Eccentricity */
+	public $omegao;     /*!< argument of perigee */
+	public $xmo;        /*!< mean anomaly */
+	public $xno;        /*!< mean motion */
+
+	public $catnr;      /*!< Catalogue Number.  */
+	public $elset;      /*!< Element Set number. */
+	public $revnum;     /*!< Revolution Number at epoch. */
+
+	public $sat_name;   /*!< Satellite name string. */
+	public $idesg;      /*!< International Designator. */
+	public $status;     /*!< Operational status. */
+
+	/* values needed for squint calculations */
+	public $xincl1;
+	public $xnodeo1;
+	public $omegao1;
+
+
+	/* Converts the strings in a raw two-line element set  */
+	/* to their intended numerical values. No processing   */
+	/* of these values is done, e.g. from deg to rads etc. */
+	/* This is done in the select_ephemeris() function.    */
+	public function __construct($header, $line1, $line2)
+	{
+		if (!$this->Good_Elements($line1, $line2)) {
+			throw new Predict_Exception('Invalid TLE contents');
+		}
+
+		$this->header = $header;
+		$this->line1  = $line1;
+		$this->line2  = $line2;
+
+		/** Decode Card 1 **/
+		/* Satellite's catalogue number */
+		$this->catnr = (int) substr($line1, 2, 5);
+
+		/* International Designator for satellite */
+		$this->idesg = substr($line1, 9, 8);
+
+		/* Epoch time; this is the complete, unconverted epoch. */
+		/* Replace spaces with 0 before casting, as leading spaces are allowed */
+		$this->epoch = (float) str_replace(' ', '0', substr($line1, 18, 14));
+
+		/* Now, convert the epoch time into year, day
            and fraction of day, according to:
 
            YYDDD.FFFFFFFF
         */
 
-        // Adjust for 2 digit year through 2056
-        $this->epoch_year = (int) substr($line1, 18, 2);
-        if ($this->epoch_year > 56) {
-            $this->epoch_year = $this->epoch_year + 1900;
-        } else {
-            $this->epoch_year = $this->epoch_year + 2000;
-        }
+		// Adjust for 2 digit year through 2056
+		$this->epoch_year = (int) substr($line1, 18, 2);
+		if ($this->epoch_year > 56) {
+			$this->epoch_year = $this->epoch_year + 1900;
+		} else {
+			$this->epoch_year = $this->epoch_year + 2000;
+		}
 
-        /* Epoch day */
-        $this->epoch_day = (int) substr($line1, 20, 3);
+		/* Epoch day */
+		$this->epoch_day = (int) substr($line1, 20, 3);
 
-        /* Epoch fraction of day */
-        $this->epoch_fod = (float) substr($line1, 23, 9);
+		/* Epoch fraction of day */
+		$this->epoch_fod = (float) substr($line1, 23, 9);
 
 
-        /* Satellite's First Time Derivative */
-        $this->xndt2o = (float) substr($line1, 33, 10);
+		/* Satellite's First Time Derivative */
+		$this->xndt2o = (float) substr($line1, 33, 10);
 
-        /* Satellite's Second Time Derivative */
-        $this->xndd6o = (float) (substr($line1, 44, 1) . '.' . substr($line1, 45, 5) . 'E' . substr($line1, 50, 2));
+		/* Satellite's Second Time Derivative */
+		$this->xndd6o = (float) (substr($line1, 44, 1) . '.' . substr($line1, 45, 5) . 'E' . substr($line1, 50, 2));
 
-        /* Satellite's bstar drag term
+		/* Satellite's bstar drag term
            FIXME: How about buff[0] ????
         */
-        $this->bstar = (float) (substr($line1, 53, 1) . '.' . substr($line1, 54, 5) . 'E' . substr($line1, 59, 2));
+		$this->bstar = (float) (substr($line1, 53, 1) . '.' . substr($line1, 54, 5) . 'E' . substr($line1, 59, 2));
 
-        /* Element Number */
-        $this->elset = (int) substr($line1, 64, 4);
+		/* Element Number */
+		$this->elset = (int) substr($line1, 64, 4);
 
-        /** Decode Card 2 **/
-        /* Satellite's Orbital Inclination (degrees) */
-        $this->xincl = (float) substr($line2, 8, 8);
+		/** Decode Card 2 **/
+		/* Satellite's Orbital Inclination (degrees) */
+		$this->xincl = (float) substr($line2, 8, 8);
 
-        /* Satellite's RAAN (degrees) */
-        $this->xnodeo = (float) substr($line2, 17, 8);
+		/* Satellite's RAAN (degrees) */
+		$this->xnodeo = (float) substr($line2, 17, 8);
 
-        /* Satellite's Orbital Eccentricity */
-        $this->eo = (float) ('.' . substr($line2, 26, 7));
+		/* Satellite's Orbital Eccentricity */
+		$this->eo = (float) ('.' . substr($line2, 26, 7));
 
-        /* Satellite's Argument of Perigee (degrees) */
-        $this->omegao = (float) substr($line2, 34, 8);
+		/* Satellite's Argument of Perigee (degrees) */
+		$this->omegao = (float) substr($line2, 34, 8);
 
-        /* Satellite's Mean Anomaly of Orbit (degrees) */
-        $this->xmo = (float) substr($line2, 43, 8);
+		/* Satellite's Mean Anomaly of Orbit (degrees) */
+		$this->xmo = (float) substr($line2, 43, 8);
 
-        /* Satellite's Mean Motion (rev/day) */
-        $this->xno = (float) substr($line2, 52, 11);
+		/* Satellite's Mean Motion (rev/day) */
+		$this->xno = (float) substr($line2, 52, 11);
 
-        /* Satellite's Revolution number at epoch */
-        $this->revnum = (float) substr($line2, 63, 5);
-    }
+		/* Satellite's Revolution number at epoch */
+		$this->revnum = (float) substr($line2, 63, 5);
+	}
 
-    /* Calculates the checksum mod 10 of a line from a TLE set and */
-    /* returns true if it compares with checksum in column 68, else false.*/
-    /* tle_set is a character string holding the two lines read    */
-    /* from a text file containing NASA format Keplerian elements. */
-    /* NOTE!!! The stuff about two lines is not quite true.
+	/* Calculates the checksum mod 10 of a line from a TLE set and */
+	/* returns true if it compares with checksum in column 68, else false.*/
+	/* tle_set is a character string holding the two lines read    */
+	/* from a text file containing NASA format Keplerian elements. */
+	/* NOTE!!! The stuff about two lines is not quite true.
        The function assumes that tle_set[0] is the begining
        of the line and that there are 68 elements - see the consumer
     */
-    public function Checksum_Good($tle_set)
-    {
-        if (strlen($tle_set) < 69) {
-            return false;
-        }
-
-        $checksum = 0;
-
-        for ($i = 0; $i < 68; $i++) {
-            if (($tle_set[$i] >= '0') && ($tle_set[$i] <= '9')) {
-                $value = $tle_set[$i] - '0';
-            } else if ($tle_set[$i] == '-' ) {
-                $value = 1;
-            } else {
-                $value = 0;
-            }
-
-            $checksum += $value;
-        }
-
-        $checksum   %= 10;
-        $check_digit = $tle_set[68] - '0';
-
-        return $checksum == $check_digit;
-    }
-
-    /* Carries out various checks on a TLE set to verify its validity */
-    /* $line1 is the first line of the TLE, $line2 is the second line */
-    /* from a text file containing NASA format Keplerian elements. */
-    public function Good_Elements($line1, $line2)
-    {
-        /* Verify checksum of both lines of a TLE set */
-        if (!$this->Checksum_Good($line1) || !$this->Checksum_Good($line2)) {
-            return false;
-        }
-
-        /* Check the line number of each line */
-        if (($line1[0] != '1') || ($line2[0] != '2')) {
-            return false;
-        }
-
-        /* Verify that Satellite Number is same in both lines */
-        if (strncmp($line1[2], $line2[2], 5) != 0) {
-            return false;
-        }
-
-        /* Check that various elements are in the right place */
-        if (($line1[23] != '.') ||
-            ($line1[34] != '.') ||
-            ($line2[11] != '.') ||
-            ($line2[20] != '.') ||
-            ($line2[37] != '.') ||
-            ($line2[46] != '.') ||
-            ($line2[54] != '.') ||
-            (strncmp(substr($line1, 61), ' 0 ', 3) != 0)) {
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * A function to allow checksum creation of a line.  This is driven by
-     * the fact that some TLEs from SpaceTrack are missing checksum numbers.
-     * You can use this to create a checksum for a line, but you should
-     * probably have confidence that the TLE data itself is good.  YMMV.
-     *
-     * @throws Predict_Exception if the line is not exactly 68 chars
-     * @return string
-     */
-    static public function createChecksum($line)
-    {
-        if (strlen($line) != 68) {
-            throw Predict_Exception('Invalid line, needs to e 68 chars');
-        }
-
-        $checksum = 0;
-
-        for ($i = 0; $i < 68; $i++) {
-            if (($line[$i] >= '0') && ($line[$i] <= '9')) {
-                $value = (int) $line[$i];
-            } else if ($line[$i] == '-' ) {
-                $value = 1;
-            } else {
-                $value = 0;
-            }
-
-            $checksum += $value;
-        }
-
-        $checksum %= 10;
-
-        return $checksum;
-    }
+	public function Checksum_Good($tle_set)
+	{
+		if (strlen($tle_set) < 69) {
+			return false;
+		}
+
+		$checksum = 0;
+
+		for ($i = 0; $i < 68; $i++) {
+			if (($tle_set[$i] >= '0') && ($tle_set[$i] <= '9')) {
+				$value = $tle_set[$i] - '0';
+			} else if ($tle_set[$i] == '-' ) {
+				$value = 1;
+			} else {
+				$value = 0;
+			}
+
+			$checksum += $value;
+		}
+
+		$checksum   %= 10;
+		$check_digit = $tle_set[68] - '0';
+
+		return $checksum == $check_digit;
+	}
+
+	/* Carries out various checks on a TLE set to verify its validity */
+	/* $line1 is the first line of the TLE, $line2 is the second line */
+	/* from a text file containing NASA format Keplerian elements. */
+	public function Good_Elements($line1, $line2)
+	{
+		/* Verify checksum of both lines of a TLE set */
+		if (!$this->Checksum_Good($line1) || !$this->Checksum_Good($line2)) {
+			return false;
+		}
+
+		/* Check the line number of each line */
+		if (($line1[0] != '1') || ($line2[0] != '2')) {
+			return false;
+		}
+
+		/* Verify that Satellite Number is same in both lines */
+		if (strncmp($line1[2], $line2[2], 5) != 0) {
+			return false;
+		}
+
+		/* Check that various elements are in the right place */
+		if (($line1[23] != '.') ||
+			($line1[34] != '.') ||
+			($line2[11] != '.') ||
+			($line2[20] != '.') ||
+			($line2[37] != '.') ||
+			($line2[46] != '.') ||
+			($line2[54] != '.') ||
+			(strncmp(substr($line1, 61), ' 0 ', 3) != 0)) {
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * A function to allow checksum creation of a line.  This is driven by
+	 * the fact that some TLEs from SpaceTrack are missing checksum numbers.
+	 * You can use this to create a checksum for a line, but you should
+	 * probably have confidence that the TLE data itself is good.  YMMV.
+	 *
+	 * @throws Predict_Exception if the line is not exactly 68 chars
+	 * @return string
+	 */
+	static public function createChecksum($line)
+	{
+		if (strlen($line) != 68) {
+			throw Predict_Exception('Invalid line, needs to e 68 chars');
+		}
+
+		$checksum = 0;
+
+		for ($i = 0; $i < 68; $i++) {
+			if (($line[$i] >= '0') && ($line[$i] <= '9')) {
+				$value = (int) $line[$i];
+			} else if ($line[$i] == '-' ) {
+				$value = 1;
+			} else {
+				$value = 0;
+			}
+
+			$checksum += $value;
+		}
+
+		$checksum %= 10;
+
+		return $checksum;
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -12,30 +12,30 @@ 
  */
 class Predict_TLE
 {
-    public $header;     /* Header line of TLE file */
-    public $line1;      /* Line 1 of TLE */
-    public $line2;      /* Line 2 of TLE */
-    public $epoch;      /*!< Epoch Time in NORAD TLE format YYDDD.FFFFFFFF */
+    public $header; /* Header line of TLE file */
+    public $line1; /* Line 1 of TLE */
+    public $line2; /* Line 2 of TLE */
+    public $epoch; /*!< Epoch Time in NORAD TLE format YYDDD.FFFFFFFF */
     public $epoch_year; /*!< Epoch: year */
-    public $epoch_day;  /*!< Epoch: day of year */
-    public $epoch_fod;  /*!< Epoch: Fraction of day. */
-    public $xndt2o;     /*!< 1. time derivative of mean motion */
-    public $xndd6o;     /*!< 2. time derivative of mean motion */
-    public $bstar;      /*!< Bstar drag coefficient. */
-    public $xincl;      /*!< Inclination */
-    public $xnodeo;     /*!< R.A.A.N. */
-    public $eo;         /*!< Eccentricity */
-    public $omegao;     /*!< argument of perigee */
-    public $xmo;        /*!< mean anomaly */
-    public $xno;        /*!< mean motion */
-
-    public $catnr;      /*!< Catalogue Number.  */
-    public $elset;      /*!< Element Set number. */
-    public $revnum;     /*!< Revolution Number at epoch. */
-
-    public $sat_name;   /*!< Satellite name string. */
-    public $idesg;      /*!< International Designator. */
-    public $status;     /*!< Operational status. */
+    public $epoch_day; /*!< Epoch: day of year */
+    public $epoch_fod; /*!< Epoch: Fraction of day. */
+    public $xndt2o; /*!< 1. time derivative of mean motion */
+    public $xndd6o; /*!< 2. time derivative of mean motion */
+    public $bstar; /*!< Bstar drag coefficient. */
+    public $xincl; /*!< Inclination */
+    public $xnodeo; /*!< R.A.A.N. */
+    public $eo; /*!< Eccentricity */
+    public $omegao; /*!< argument of perigee */
+    public $xmo; /*!< mean anomaly */
+    public $xno; /*!< mean motion */
+
+    public $catnr; /*!< Catalogue Number.  */
+    public $elset; /*!< Element Set number. */
+    public $revnum; /*!< Revolution Number at epoch. */
+
+    public $sat_name; /*!< Satellite name string. */
+    public $idesg; /*!< International Designator. */
+    public $status; /*!< Operational status. */
 
     /* values needed for squint calculations */
     public $xincl1;
@@ -93,12 +93,12 @@ 
         $this->xndt2o = (float) substr($line1, 33, 10);
 
         /* Satellite's Second Time Derivative */
-        $this->xndd6o = (float) (substr($line1, 44, 1) . '.' . substr($line1, 45, 5) . 'E' . substr($line1, 50, 2));
+        $this->xndd6o = (float) (substr($line1, 44, 1).'.'.substr($line1, 45, 5).'E'.substr($line1, 50, 2));
 
         /* Satellite's bstar drag term
            FIXME: How about buff[0] ????
         */
-        $this->bstar = (float) (substr($line1, 53, 1) . '.' . substr($line1, 54, 5) . 'E' . substr($line1, 59, 2));
+        $this->bstar = (float) (substr($line1, 53, 1).'.'.substr($line1, 54, 5).'E'.substr($line1, 59, 2));
 
         /* Element Number */
         $this->elset = (int) substr($line1, 64, 4);
@@ -111,7 +111,7 @@ 
         $this->xnodeo = (float) substr($line2, 17, 8);
 
         /* Satellite's Orbital Eccentricity */
-        $this->eo = (float) ('.' . substr($line2, 26, 7));
+        $this->eo = (float) ('.'.substr($line2, 26, 7));
 
         /* Satellite's Argument of Perigee (degrees) */
         $this->omegao = (float) substr($line2, 34, 8);
@@ -145,7 +145,7 @@ 
         for ($i = 0; $i < 68; $i++) {
             if (($tle_set[$i] >= '0') && ($tle_set[$i] <= '9')) {
                 $value = $tle_set[$i] - '0';
-            } else if ($tle_set[$i] == '-' ) {
+            } else if ($tle_set[$i] == '-') {
                 $value = 1;
             } else {
                 $value = 0;
@@ -216,7 +216,7 @@ 
         for ($i = 0; $i < 68; $i++) {
             if (($line[$i] >= '0') && ($line[$i] <= '9')) {
                 $value = (int) $line[$i];
-            } else if ($line[$i] == '-' ) {
+            } else if ($line[$i] == '-') {
                 $value = 1;
             } else {
                 $value = 0;

require/libs/Predict/Predict/Geodetic.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
  */
 class Predict_Geodetic
 {
-    public $lat; /*!< Lattitude [rad] */
-    public $lon; /*!< Longitude [rad] */
-    public $alt; /*!< Altitude [km] */
-    public $theta;
+	public $lat; /*!< Lattitude [rad] */
+	public $lon; /*!< Longitude [rad] */
+	public $alt; /*!< Altitude [km] */
+	public $theta;
 }

require/libs/Predict/Predict/SGSDPStatic.php

Indentation +28 added lines, -28 removed lines

@@ -8,32 +8,32 @@
  */
 class Predict_SGSDPStatic
 {
-    public $aodp;
-    public $aycof;
-    public $c1;
-    public $c4;
-    public $c5;
-    public $cosio;
-    public $d2;
-    public $d3;
-    public $d4;
-    public $delmo;
-    public $omgcof;
-    public $eta;
-    public $omgdot;
-    public $sinio;
-    public $xnodp;
-    public $sinmo;
-    public $t2cof;
-    public $t3cof;
-    public $t4cof;
-    public $t5cof;
-    public $x1mth2;
-    public $x3thm1;
-    public $x7thm1;
-    public $xmcof;
-    public $xmdot;
-    public $xnodcf;
-    public $xnodot;
-    public $xlcof;
+	public $aodp;
+	public $aycof;
+	public $c1;
+	public $c4;
+	public $c5;
+	public $cosio;
+	public $d2;
+	public $d3;
+	public $d4;
+	public $delmo;
+	public $omgcof;
+	public $eta;
+	public $omgdot;
+	public $sinio;
+	public $xnodp;
+	public $sinmo;
+	public $t2cof;
+	public $t3cof;
+	public $t4cof;
+	public $t5cof;
+	public $x1mth2;
+	public $x3thm1;
+	public $x7thm1;
+	public $xmcof;
+	public $xmdot;
+	public $xnodcf;
+	public $xnodot;
+	public $xlcof;
 }

require/libs/Predict/Predict/QTH.php

Indentation +9 added lines, -9 removed lines

@@ -7,14 +7,14 @@
  */
 class Predict_QTH
 {
-     public $name;   /*!< Name, eg. callsign. */
-     public $loc;    /*!< Location, eg City, Country. */
-     public $desc;   /*!< Short description. */
-     public $lat;    /*!< Latitude in dec. deg. North. */
-     public $lon;    /*!< Longitude in dec. deg. East. */
-     public $alt;    /*!< Altitude above sea level in meters. */
-     public $qra;    /*!< QRA locator */
-     public $wx;     /*!< Weather station code (4 chars). */
+	 public $name;   /*!< Name, eg. callsign. */
+	 public $loc;    /*!< Location, eg City, Country. */
+	 public $desc;   /*!< Short description. */
+	 public $lat;    /*!< Latitude in dec. deg. North. */
+	 public $lon;    /*!< Longitude in dec. deg. East. */
+	 public $alt;    /*!< Altitude above sea level in meters. */
+	 public $qra;    /*!< QRA locator */
+	 public $wx;     /*!< Weather station code (4 chars). */
 
-     public $data;   /*!< Raw data from cfg file. */
+	 public $data;   /*!< Raw data from cfg file. */
 }

Spacing +9 added lines, -9 removed lines

@@ -7,14 +7,14 @@
  */
 class Predict_QTH
 {
-     public $name;   /*!< Name, eg. callsign. */
-     public $loc;    /*!< Location, eg City, Country. */
-     public $desc;   /*!< Short description. */
-     public $lat;    /*!< Latitude in dec. deg. North. */
-     public $lon;    /*!< Longitude in dec. deg. East. */
-     public $alt;    /*!< Altitude above sea level in meters. */
-     public $qra;    /*!< QRA locator */
-     public $wx;     /*!< Weather station code (4 chars). */
+     public $name; /*!< Name, eg. callsign. */
+     public $loc; /*!< Location, eg City, Country. */
+     public $desc; /*!< Short description. */
+     public $lat; /*!< Latitude in dec. deg. North. */
+     public $lon; /*!< Longitude in dec. deg. East. */
+     public $alt; /*!< Altitude above sea level in meters. */
+     public $qra; /*!< QRA locator */
+     public $wx; /*!< Weather station code (4 chars). */
 
-     public $data;   /*!< Raw data from cfg file. */
+     public $data; /*!< Raw data from cfg file. */
 }

require/libs/Predict/Predict/Vector.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
  */
 class Predict_Vector
 {
-    public $x = 0;
-    public $y = 0;
-    public $z = 0;
-    public $w = 0;
+	public $x = 0;
+	public $y = 0;
+	public $z = 0;
+	public $w = 0;
 }

require/class.Satellite.php

Spacing +17 added lines, -17 removed lines

@@ -19,7 +19,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':name' => $name));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -31,7 +31,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -43,7 +43,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -55,7 +55,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':type' => $type));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -63,27 +63,27 @@ 
 		else return array();
 	}
 	
-	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all($timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names();
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			$result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			$result = array_merge($position, $result);
 		}
 		return $result;
 	}
 
-	public function position_all_type($type,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position_all_type($type, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$all_sat = $this->get_tle_names_type($type);
 		$result = array();
 		foreach ($all_sat as $sat) {
-			$position = $this->position($sat['tle_name'],$timestamp_begin,$timestamp_end,$second);
-			$result = array_merge($position,$result);
+			$position = $this->position($sat['tle_name'], $timestamp_begin, $timestamp_end, $second);
+			$result = array_merge($position, $result);
 		}
 		return $result;
 	}
 	
-	public function position($name,$timestamp_begin = '',$timestamp_end = '',$second = 10) {
+	public function position($name, $timestamp_begin = '', $timestamp_end = '', $second = 10) {
 		$qth = new Predict_QTH();
 		$qth->lat = 37.790252;
 		$qth->lon = -122.419968;
@@ -91,7 +91,7 @@ 
 		$tle_file = $this->get_tle($name);
 		//print_r($tle_file);
 		$type = $tle_file['tle_type'];
-		$tle = new Predict_TLE($tle_file['tle_name'],$tle_file['tle_tle1'],$tle_file['tle_tle2']);
+		$tle = new Predict_TLE($tle_file['tle_name'], $tle_file['tle_tle1'], $tle_file['tle_tle2']);
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
@@ -99,15 +99,15 @@ 
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			//echo $now;
-			$predict->predict_calc($sat,$qth,$now);
-			return array('name' => $name, 'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp_begin,'type' => $type);
+			$predict->predict_calc($sat, $qth, $now);
+			return array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp_begin, 'type' => $type);
 		} else {
-			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp=$timestamp+$second) {
+			for ($timestamp = $timestamp_begin; $timestamp <= $timestamp_end; $timestamp = $timestamp + $second) {
 				//echo $timestamp."\n";
 				$now = Predict_Time::unix2daynum($timestamp);
 				//echo $now;
-				$predict->predict_calc($sat,$qth,$now);
-				$result[] = array('name' => $name,'latitude' => $sat->ssplat,'longitude' => $sat->ssplon, 'altitude' => $sat->alt,'speed' => $sat->velo*60*60,'timestamp' => $timestamp,'type' => $type);
+				$predict->predict_calc($sat, $qth, $now);
+				$result[] = array('name' => $name, 'latitude' => $sat->ssplat, 'longitude' => $sat->ssplon, 'altitude' => $sat->alt, 'speed' => $sat->velo*60*60, 'timestamp' => $timestamp, 'type' => $type);
 			}
 			return $result;
 		}

Braces +23 added lines, -9 removed lines

@@ -23,8 +23,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_types() {
 		$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
@@ -35,8 +38,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names() {
 		$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
@@ -47,8 +53,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names_type($type) {
 		$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
@@ -59,8 +68,11 @@ 
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	
 	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
@@ -95,7 +107,9 @@ 
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
-		if ($timestamp_begin == '') $timestamp_begin = time();
+		if ($timestamp_begin == '') {
+			$timestamp_begin = time();
+		}
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			//echo $now;

space-data.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING);
+$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING);
 $sat = urldecode($sat);
 
 if ($sat == 'ISS (ZARYA)') {
@@ -42,7 +42,7 @@ 
 	$aircraft_name = 'INTEGRAL';
 //	$ground_speed = 14970;
 	$launch_date = '17 October 2002';
-} elseif (strpos($sat,'IRIDIUM') !== false) {
+} elseif (strpos($sat, 'IRIDIUM') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg';
 	$image_copyright = 'Cliff';
 	$ident = 'Iridium satellite constellation';
@@ -50,15 +50,15 @@ 
 	$aircraft_name = $sat;
 //	$ground_speed = 14970;
 //	$launch_date = '29 september 2011';
-} elseif (strpos($sat,'ORBCOMM') !== false) {
+} elseif (strpos($sat, 'ORBCOMM') !== false) {
 	$ident = 'Orbcomm';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)';
 	$aircraft_name = $sat;
-} elseif (strpos($sat,'GLOBALSTAR') !== false) {
+} elseif (strpos($sat, 'GLOBALSTAR') !== false) {
 	$ident = 'Globalstar';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar';
 	$aircraft_name = $sat;
-} elseif (strpos($sat,'OSCAR 7') !== false) {
+} elseif (strpos($sat, 'OSCAR 7') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg';
 	$image_copyright = 'Amsat.org';
 	$ident = 'AMSAT-OSCAR 7';

install/populate_all.php

Indentation +31 added lines, -31 removed lines

@@ -1,48 +1,48 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.update_db.php');
-    echo "Populate all tables...\n";
-    update_db::update_all();
-    echo "\nInstall waypoints...(VERY slow!)";
-    update_db::update_waypoints();
-    echo "Done !\n";
-    echo "Install airspace...";
-    update_db::update_airspace();
-    echo "Done !\n";
-    echo "Install countries...";
-    update_db::update_countries();
-    echo "Done !\n";
-    if (isset($globalOwner) && $globalOwner) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.update_db.php');
+	echo "Populate all tables...\n";
+	update_db::update_all();
+	echo "\nInstall waypoints...(VERY slow!)";
+	update_db::update_waypoints();
+	echo "Done !\n";
+	echo "Install airspace...";
+	update_db::update_airspace();
+	echo "Done !\n";
+	echo "Install countries...";
+	update_db::update_countries();
+	echo "Done !\n";
+	if (isset($globalOwner) && $globalOwner) {
 	echo "Install private owners...";
 	update_db::update_owner();
-        echo "Done !\n";
-    }
-    /*
+		echo "Done !\n";
+	}
+	/*
     if (isset($globalIVAO) && $globalIVAO) {
         echo "Install IVAO airlines and logos...";
         update_db::update_IVAO();
 	echo "Done !\n";
     }
     */
-    if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
+	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	echo "Install NOTAM from notaminfo.com...";
-        update_db:update_notam();
-        echo "Done !\n";
-    }
-    if (isset($globalMap3D) && $globalMap3D) {
+		update_db:update_notam();
+		echo "Done !\n";
+	}
+	if (isset($globalMap3D) && $globalMap3D) {
 	echo "Install 3D models...";
 	update_db::update_models();
 	echo "Done !\n";
 	if (isset($globalMapSatellites) && $globalMapSatellites) {
-	    echo "Install Space 3D models...";
-	    update_db::update_space_models();
-	    echo "Done !\n";
-        }
-    }
+		echo "Install Space 3D models...";
+		update_db::update_space_models();
+		echo "Done !\n";
+		}
+	}
 
 ?>
\ No newline at end of file

header.php

Braces +32 added lines, -7 removed lines

@@ -5,8 +5,11 @@ 
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
 $current_page = $file_path['filename'];
 date_default_timezone_set($globalTimezone);
-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
-else $MapType = $globalMapProvider;
+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
+	$MapType = $_COOKIE['MapType'];
+} else {
+	$MapType = $globalMapProvider;
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -181,7 +184,13 @@ 
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -235,7 +244,13 @@ 
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -308,7 +323,12 @@ 
         <span class="icon-bar"></span>
       </button>
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a>
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
+	print '/';
+} else {
+	print $globalURL;
+}
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
     </div>
     <div class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
@@ -386,7 +406,9 @@ 
   		        $alllang = $Language->getLanguages();
   		        foreach ($alllang as $key => $lang) {
   		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
+  		            	print ' selected ';
+  		            }
   		            print '>'.$lang[0].'</option>';
   		        }
   		    ?>
@@ -533,4 +555,7 @@ 
 
 ?>
 
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
+	print 'index ';
+}
+?>clear">

Spacing +22 added lines, -22 removed lines

@@ -8,31 +8,31 @@ 
 if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
 else $MapType = $globalMapProvider;
 if (isset($_GET['3d'])) {
-	setcookie('MapFormat','3d');
+	setcookie('MapFormat', '3d');
 } else if (isset($_GET['2d'])) {
-	setcookie('MapFormat','2d');
+	setcookie('MapFormat', '2d');
 }
 
 if (isset($_POST['archive'])) {
-	setcookie('archive','true');
-	setcookie('archive_begin',strtotime($_POST['start_date']));
-	setcookie('archive_end',strtotime($_POST['end_date']));
-	setcookie('archive_speed',$_POST['archivespeed']);
+	setcookie('archive', 'true');
+	setcookie('archive_begin', strtotime($_POST['start_date']));
+	setcookie('archive_end', strtotime($_POST['end_date']));
+	setcookie('archive_speed', $_POST['archivespeed']);
 }
 if (isset($_POST['noarchive'])) {
-	setcookie('archive','false',-1);
-	setcookie('archive_begin','',-1);
-	setcookie('archive_end','',-1);
-	setcookie('archive_speed','',-1);
+	setcookie('archive', 'false', -1);
+	setcookie('archive_begin', '', -1);
+	setcookie('archive_end', '', -1);
+	setcookie('archive_speed', '', -1);
 }
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
-	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+	$allfilters = array_filter(array_keys($_COOKIE), function($key) {
+	    return strpos($key, 'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
-		setcookie($filt,null,-1);
+		setcookie($filt, null, -1);
 	}
 }
 
@@ -216,7 +216,7 @@ 
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -270,7 +270,7 @@ 
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if (isset($latitude)) print '&latitude='.$latitude; ?><?php if (isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -433,7 +433,7 @@ 
 ?>
       <div class="search">
       <form action="<?php print $globalURL; ?>/search" method="get">
-		<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
+		<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
 	</form>
 	</div>
   	<div class="social">
@@ -451,14 +451,14 @@ 
 	print '</div>';
 }
 
-if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') {
+if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') {
 ?>
     <div class="top-header clear" role="main">
     <div id="archive-map"></div>
     </div>
 <?php
 }
-if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
+if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) || (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false))
 {
     ?>
     <div class="top-header clear" role="main">
@@ -471,15 +471,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+    if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+    } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -487,7 +487,7 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php

Indentation +42 added lines, -42 removed lines

@@ -28,7 +28,7 @@ 
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+		return strpos($key,'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
@@ -167,16 +167,16 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
 <?php    
-	    }
-    } else {
+		}
+	} else {
 ?>
 <?php
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -188,18 +188,18 @@ 
 */
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 <script src="<?php print $globalURL; ?>/js/leaflet-playback.js"></script>
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>"></script>
 <?php
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -359,23 +359,23 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
             <?php
-        	    } else {
-    	    ?>
+				} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	    }
-        	}
-    	    ?>
+				}
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -417,14 +417,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -455,18 +455,18 @@ 
 ?>
     <div class="top-header clear" role="main">
 <?php
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
 ?>
     <div id="archive-map"></div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -477,15 +477,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -493,22 +493,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -519,7 +519,7 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -527,7 +527,7 @@ 
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -536,7 +536,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -545,27 +545,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    }
+	}
 ?>
         </script>
     </div>