Inspection of "fix" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3b3f2b...8704ae )

by Yannick

created 2017-07-25 15:30 UTC

Status

Braces +110 added lines, -37 removed lines patch added patch discarded remove patch

@@ -8,7 +8,9 @@  discard block
 block discarded – undo
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 
@@ -30,7 +32,9 @@  discard block
 block discarded – undo
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -77,8 +81,11 @@  discard block
 block discarded – undo
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -120,7 +127,9 @@  discard block
 block discarded – undo
 			}
 		}
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate";
 			$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query.$orderby_query;
@@ -145,7 +154,9 @@  discard block
 block discarded – undo
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT tracker_live.ident, tracker_live.type,tracker_live.famtrackid, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 			FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query." tracker_live.latitude <> 0 AND tracker_live.longitude <> 0";
@@ -190,50 +201,74 @@  discard block
 block discarded – undo
 		}
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-		if (!isset($globalMap3DTrackersLimit) || $globalMap3DTrackersLimit == '') $globalMap3DTrackersLimit = '300';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
+		if (!isset($globalMap3DTrackersLimit) || $globalMap3DTrackersLimit == '') {
+			$globalMap3DTrackersLimit = '300';
+		}
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive) {
 				$query  = "SELECT * FROM (
 					SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source 
 					FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
-				if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 					SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 					FROM tracker_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date ";
-				if ($usecoord) $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS tracker
 				    WHERE latitude <> '0' AND longitude <> '0' 
 				    ORDER BY famtrackid, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DTrackersLimit;
+				}
 			} else {
 				$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 				    FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date ";
-				if ($usecoord) $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' 
 				    ORDER BY tracker_live.famtrackid, tracker_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DTrackersLimit;
+				}
 			}
 		} else {
 			if (isset($globalArchive) && $globalArchive) {
 				$query  = "SELECT * FROM (
 					SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source 
 					FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
-				if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 					SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 					FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date";
-				if ($usecoord) $query .= " AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS tracker
 				    WHERE latitude <> '0' AND longitude <> '0' 
 				    ORDER BY famtrackid, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DTrackersLimit;
+				}
 			} else {
 				$query  = "SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 				    FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' ";
-				if ($usecoord) $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "ORDER BY tracker_live.famtrackid, tracker_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DTrackersLimit;
+				}
 			}
 		}
 
@@ -259,7 +294,9 @@  discard block
 block discarded – undo
 		global $globalDBdriver, $globalLiveInterval;
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT tracker_live.famtrackid) as nb FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
 		} else {
@@ -287,7 +324,9 @@  discard block
 block discarded – undo
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Tracker = new Tracker($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -295,7 +334,9 @@  discard block
 block discarded – undo
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY tracker_live.famtrackid'.$filter_query;
 		} else {
@@ -315,7 +356,9 @@  discard block
 block discarded – undo
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Tracker = new Tracker($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter,true,true);
 
 		if (is_array($coord)) {
@@ -323,7 +366,9 @@  discard block
 block discarded – undo
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		/*
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
@@ -557,11 +602,15 @@  discard block
 block discarded – undo
 		//$query  = self::$global_query.' WHERE tracker_live.famtrackid = :id ORDER BY date';
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			if ($liveinterval) {
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			}
 			$query .= ' ORDER BY date';
 		} else {
 			$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			if ($liveinterval) {
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			}
 			$query .= ' ORDER BY date';
 		}
 
@@ -656,7 +705,9 @@  discard block
 block discarded – undo
 				$i++;
 				$j++;
 				if ($j == 30) {
-					if ($globalDebug) echo ".";
+					if ($globalDebug) {
+						echo ".";
+					}
 				    	try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
@@ -903,7 +954,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -911,7 +964,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($altitude != '')
 		{
@@ -919,7 +974,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 
 		if ($heading != '')
 		{
@@ -927,7 +984,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -935,9 +994,13 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else $groundspeed = 0;
+		} else {
+			$groundspeed = 0;
+		}
 		date_default_timezone_set('UTC');
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
+		if ($date == '') {
+			$date = date("Y-m-d H:i:s", time());
+		}
 
         
 		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
@@ -953,12 +1016,18 @@  discard block
 block discarded – undo
 		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
 		$type = filter_var($type,FILTER_SANITIZE_STRING);
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
+            		$groundspeed = 0;
+            	}
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
+            		$heading = 0;
+            	}
             	
 		$query = '';
 		if ($globalArchive) {
-			if ($globalDebug) echo '-- Delete previous data -- ';
+			if ($globalDebug) {
+				echo '-- Delete previous data -- ';
+			}
 			$query .= 'DELETE FROM tracker_live WHERE famtrackid = :famtrackid;';
 		}
 		$query  .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
@@ -977,10 +1046,14 @@  discard block
 block discarded – undo
                 echo 'noarchive : '.$noarchive."\n";
                 */
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to Tracker archive '.$famtrackid.' : ';
+		    if ($globalDebug) {
+		    	echo '(Add to Tracker archive '.$famtrackid.' : ';
+		    }
 		    $TrackerArchive = new TrackerArchive($this->db);
 		    $result =  $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+		    if ($globalDebug) {
+		    	echo $result.')';
+		    }
 		}
 
 		return "success";

Please login to merge, or discard this patch.

		@@ -8,7 +8,9 @@ discard block
		block discarded – undo
8	8	public function __construct($dbc = null) {
9	9	$Connection = new Connection($dbc);
10	10	$this->db = $Connection->db();
11		- if ($this->db === null) die('Error: No DB connection.');
	11	+ if ($this->db === null) {
	12	+ die('Error: No DB connection.');
	13	+ }
12	14	}
13	15
14	16
		@@ -30,7 +32,9 @@ discard block
		block discarded – undo
30	32	if (isset($filter[0]['source'])) {
31	33	$filters = array_merge($filters,$filter);
32	34	}
33		- if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
	35	+ if (is_array($globalFilter)) {
	36	+ $filter = array_merge($filter,$globalFilter);
	37	+ }
34	38	$filter_query_join = '';
35	39	$filter_query_where = '';
36	40	foreach($filters as $flt) {
		@@ -77,8 +81,11 @@ discard block
		block discarded – undo
77	81	if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
78	82	$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
79	83	}
80		- if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
81		- elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
	84	+ if ($filter_query_where == '' && $where) {
	85	+ $filter_query_where = ' WHERE';
	86	+ } elseif ($filter_query_where != '' && $and) {
	87	+ $filter_query_where .= ' AND';
	88	+ }
82	89	if ($filter_query_where != '') {
83	90	$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
84	91	}
		@@ -120,7 +127,9 @@ discard block
		block discarded – undo
120	127	}
121	128	}
122	129
123		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	130	+ if (!isset($globalLiveInterval)) {
	131	+ $globalLiveInterval = '200';
	132	+ }
124	133	if ($globalDBdriver == 'mysql') {
125	134	//$query = "SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate";
126	135	$query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query.$orderby_query;
		@@ -145,7 +154,9 @@ discard block
		block discarded – undo
145	154
146	155	$filter_query = $this->getFilter($filter,true,true);
147	156
148		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	157	+ if (!isset($globalLiveInterval)) {
	158	+ $globalLiveInterval = '200';
	159	+ }
149	160	if ($globalDBdriver == 'mysql') {
150	161	$query = 'SELECT tracker_live.ident, tracker_live.type,tracker_live.famtrackid, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
151	162	FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query." tracker_live.latitude <> 0 AND tracker_live.longitude <> 0";
		@@ -190,50 +201,74 @@ discard block
		block discarded – undo
190	201	}
191	202	$filter_query = $this->getFilter($filter,true,true);
192	203
193		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
194		- if (!isset($globalMap3DTrackersLimit) \|\| $globalMap3DTrackersLimit == '') $globalMap3DTrackersLimit = '300';
	204	+ if (!isset($globalLiveInterval)) {
	205	+ $globalLiveInterval = '200';
	206	+ }
	207	+ if (!isset($globalMap3DTrackersLimit) \|\| $globalMap3DTrackersLimit == '') {
	208	+ $globalMap3DTrackersLimit = '300';
	209	+ }
195	210	if ($globalDBdriver == 'mysql') {
196	211	if (isset($globalArchive) && $globalArchive) {
197	212	$query = "SELECT * FROM (
198	213	SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source
199	214	FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
200		- if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	215	+ if ($usecoord) {
	216	+ $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	217	+ }
201	218	$query .= "UNION
202	219	SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
203	220	FROM tracker_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date ";
204		- if ($usecoord) $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
	221	+ if ($usecoord) {
	222	+ $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
	223	+ }
205	224	$query .= ") AS tracker
206	225	WHERE latitude <> '0' AND longitude <> '0'
207	226	ORDER BY famtrackid, date";
208		- if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
	227	+ if ($limit) {
	228	+ $query .= " LIMIT ".$globalMap3DTrackersLimit;
	229	+ }
209	230	} else {
210	231	$query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
211	232	FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date ";
212		- if ($usecoord) $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	233	+ if ($usecoord) {
	234	+ $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	235	+ }
213	236	$query .= "AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0'
214	237	ORDER BY tracker_live.famtrackid, tracker_live.date";
215		- if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
	238	+ if ($limit) {
	239	+ $query .= " LIMIT ".$globalMap3DTrackersLimit;
	240	+ }
216	241	}
217	242	} else {
218	243	if (isset($globalArchive) && $globalArchive) {
219	244	$query = "SELECT * FROM (
220	245	SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source
221	246	FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
222		- if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	247	+ if ($usecoord) {
	248	+ $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	249	+ }
223	250	$query .= "UNION
224	251	SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
225	252	FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date";
226		- if ($usecoord) $query .= " AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
	253	+ if ($usecoord) {
	254	+ $query .= " AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
	255	+ }
227	256	$query .= ") AS tracker
228	257	WHERE latitude <> '0' AND longitude <> '0'
229	258	ORDER BY famtrackid, date";
230		- if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
	259	+ if ($limit) {
	260	+ $query .= " LIMIT ".$globalMap3DTrackersLimit;
	261	+ }
231	262	} else {
232	263	$query = "SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
233	264	FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' ";
234		- if ($usecoord) $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	265	+ if ($usecoord) {
	266	+ $query .= "AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
	267	+ }
235	268	$query .= "ORDER BY tracker_live.famtrackid, tracker_live.date";
236		- if ($limit) $query .= " LIMIT ".$globalMap3DTrackersLimit;
	269	+ if ($limit) {
	270	+ $query .= " LIMIT ".$globalMap3DTrackersLimit;
	271	+ }
237	272	}
238	273	}
239	274
		@@ -259,7 +294,9 @@ discard block
		block discarded – undo
259	294	global $globalDBdriver, $globalLiveInterval;
260	295	$filter_query = $this->getFilter($filter,true,true);
261	296
262		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	297	+ if (!isset($globalLiveInterval)) {
	298	+ $globalLiveInterval = '200';
	299	+ }
263	300	if ($globalDBdriver == 'mysql') {
264	301	$query = 'SELECT COUNT(DISTINCT tracker_live.famtrackid) as nb FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
265	302	} else {
		@@ -287,7 +324,9 @@ discard block
		block discarded – undo
287	324	{
288	325	global $globalDBdriver, $globalLiveInterval;
289	326	$Tracker = new Tracker($this->db);
290		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	327	+ if (!isset($globalLiveInterval)) {
	328	+ $globalLiveInterval = '200';
	329	+ }
291	330	$filter_query = $this->getFilter($filter);
292	331
293	332	if (is_array($coord)) {
		@@ -295,7 +334,9 @@ discard block
		block discarded – undo
295	334	$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
296	335	$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
297	336	$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
298		- } else return array();
	337	+ } else {
	338	+ return array();
	339	+ }
299	340	if ($globalDBdriver == 'mysql') {
300	341	$query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY tracker_live.famtrackid'.$filter_query;
301	342	} else {
		@@ -315,7 +356,9 @@ discard block
		block discarded – undo
315	356	{
316	357	global $globalDBdriver, $globalLiveInterval;
317	358	$Tracker = new Tracker($this->db);
318		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	359	+ if (!isset($globalLiveInterval)) {
	360	+ $globalLiveInterval = '200';
	361	+ }
319	362	$filter_query = $this->getFilter($filter,true,true);
320	363
321	364	if (is_array($coord)) {
		@@ -323,7 +366,9 @@ discard block
		block discarded – undo
323	366	$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
324	367	$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
325	368	$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
326		- } else return array();
	369	+ } else {
	370	+ return array();
	371	+ }
327	372	/*
328	373	if ($globalDBdriver == 'mysql') {
329	374	$query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source
		@@ -557,11 +602,15 @@ discard block
		block discarded – undo
557	602	//$query = self::$global_query.' WHERE tracker_live.famtrackid = :id ORDER BY date';
558	603	if ($globalDBdriver == 'mysql') {
559	604	$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
560		- if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
	605	+ if ($liveinterval) {
	606	+ $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
	607	+ }
561	608	$query .= ' ORDER BY date';
562	609	} else {
563	610	$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
564		- if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
	611	+ if ($liveinterval) {
	612	+ $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
	613	+ }
565	614	$query .= ' ORDER BY date';
566	615	}
567	616
		@@ -656,7 +705,9 @@ discard block
		block discarded – undo
656	705	$i++;
657	706	$j++;
658	707	if ($j == 30) {
659		- if ($globalDebug) echo ".";
	708	+ if ($globalDebug) {
	709	+ echo ".";
	710	+ }
660	711	try {
661	712
662	713	$sth = $this->db->prepare(substr($query_delete,0,-1).")");
		@@ -903,7 +954,9 @@ discard block
		block discarded – undo
903	954	{
904	955	return false;
905	956	}
906		- } else return '';
	957	+ } else {
	958	+ return '';
	959	+ }
907	960
908	961	if ($longitude != '')
909	962	{
		@@ -911,7 +964,9 @@ discard block
		block discarded – undo
911	964	{
912	965	return false;
913	966	}
914		- } else return '';
	967	+ } else {
	968	+ return '';
	969	+ }
915	970
916	971	if ($altitude != '')
917	972	{
		@@ -919,7 +974,9 @@ discard block
		block discarded – undo
919	974	{
920	975	return false;
921	976	}
922		- } else $altitude = 0;
	977	+ } else {
	978	+ $altitude = 0;
	979	+ }
923	980
924	981	if ($heading != '')
925	982	{
		@@ -927,7 +984,9 @@ discard block
		block discarded – undo
927	984	{
928	985	return false;
929	986	}
930		- } else $heading = 0;
	987	+ } else {
	988	+ $heading = 0;
	989	+ }
931	990
932	991	if ($groundspeed != '')
933	992	{
		@@ -935,9 +994,13 @@ discard block
		block discarded – undo
935	994	{
936	995	return false;
937	996	}
938		- } else $groundspeed = 0;
	997	+ } else {
	998	+ $groundspeed = 0;
	999	+ }
939	1000	date_default_timezone_set('UTC');
940		- if ($date == '') $date = date("Y-m-d H:i:s", time());
	1001	+ if ($date == '') {
	1002	+ $date = date("Y-m-d H:i:s", time());
	1003	+ }
941	1004
942	1005
943	1006	$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
		@@ -953,12 +1016,18 @@ discard block
		block discarded – undo
953	1016	$comment = filter_var($comment,FILTER_SANITIZE_STRING);
954	1017	$type = filter_var($type,FILTER_SANITIZE_STRING);
955	1018
956		- if ($groundspeed == '' \|\| $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
957		- if ($heading == '' \|\| $Common->isInteger($heading) === false ) $heading = 0;
	1019	+ if ($groundspeed == '' \|\| $Common->isInteger($groundspeed) === false ) {
	1020	+ $groundspeed = 0;
	1021	+ }
	1022	+ if ($heading == '' \|\| $Common->isInteger($heading) === false ) {
	1023	+ $heading = 0;
	1024	+ }
958	1025
959	1026	$query = '';
960	1027	if ($globalArchive) {
961		- if ($globalDebug) echo '-- Delete previous data -- ';
	1028	+ if ($globalDebug) {
	1029	+ echo '-- Delete previous data -- ';
	1030	+ }
962	1031	$query .= 'DELETE FROM tracker_live WHERE famtrackid = :famtrackid;';
963	1032	}
964	1033	$query .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type)
		@@ -977,10 +1046,14 @@ discard block
		block discarded – undo
977	1046	echo 'noarchive : '.$noarchive."\n";
978	1047	*/
979	1048	if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
980		- if ($globalDebug) echo '(Add to Tracker archive '.$famtrackid.' : ';
	1049	+ if ($globalDebug) {
	1050	+ echo '(Add to Tracker archive '.$famtrackid.' : ';
	1051	+ }
981	1052	$TrackerArchive = new TrackerArchive($this->db);
982	1053	$result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
983		- if ($globalDebug) echo $result.')';
	1054	+ if ($globalDebug) {
	1055	+ echo $result.')';
	1056	+ }
984	1057	}
985	1058
986	1059	return "success";

Ysurac / FlightAirMap

Push — master ( 3b3f2b...8704ae )

Status

Category

Braces +110 added lines, -37 removed lines patch added patch discarded remove patch