Inspection of "Fix and better tracker support" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( aa8319...e96b22 )

by Yannick

created 2017-04-13 11:44 UTC

Status

Braces +74 added lines, -25 removed lines patch added patch discarded remove patch

@@ -29,7 +29,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) {
@@ -76,8 +78,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);
 		}
@@ -119,7 +124,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;
@@ -144,7 +151,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";
@@ -182,7 +191,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.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 AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' 
@@ -215,7 +226,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 {
@@ -243,7 +256,9 @@  discard block
 block discarded – undo
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -251,7 +266,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 {
@@ -271,7 +288,9 @@  discard block
 block discarded – undo
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -279,7 +298,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 
 			FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' AND tracker_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong."
@@ -472,11 +493,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';
 		}
 
@@ -571,7 +596,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).")");
@@ -818,7 +845,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -826,7 +855,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($altitude != '')
 		{
@@ -834,7 +865,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 
 		if ($heading != '')
 		{
@@ -842,7 +875,9 @@  discard block
 block discarded – undo
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -850,9 +885,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);
@@ -868,12 +907,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) 
@@ -888,10 +933,14 @@  discard block
 block discarded – undo
                 	return "error : ".$e->getMessage();
                 }
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
+		    if ($globalDebug) {
+		    	echo '(Add to SBS archive : ';
+		    }
 		    $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.

require/class.TrackerArchive.php 1 patch

Braces +26 added lines, -9 removed lines patch added patch discarded remove patch

@@ -26,7 +26,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) {
@@ -72,8 +74,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);
 		}
@@ -591,7 +596,9 @@  discard block
 block discarded – undo
 		    $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
 		    $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
 		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
+		    if ($translate != $q_item) {
+		    	$additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
+		    }
 		    $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
 		    $additional_query .= ")";
 		}
@@ -809,7 +816,9 @@  discard block
 block discarded – undo
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+	    } else {
+	    	$offset = '+00:00';
+	    }
 
 
 	    if ($date_array[1] != "")
@@ -1085,9 +1094,13 @@  discard block
 block discarded – undo
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);
@@ -1131,9 +1144,13 @@  discard block
 block discarded – undo
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND s.date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);

Please login to merge, or discard this patch.

		@@ -29,7 +29,9 @@ discard block
		block discarded – undo
29	29	if (isset($filter[0]['source'])) {
30	30	$filters = array_merge($filters,$filter);
31	31	}
32		- if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
	32	+ if (is_array($globalFilter)) {
	33	+ $filter = array_merge($filter,$globalFilter);
	34	+ }
33	35	$filter_query_join = '';
34	36	$filter_query_where = '';
35	37	foreach($filters as $flt) {
		@@ -76,8 +78,11 @@ discard block
		block discarded – undo
76	78	if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
77	79	$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
78	80	}
79		- if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
80		- elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
	81	+ if ($filter_query_where == '' && $where) {
	82	+ $filter_query_where = ' WHERE';
	83	+ } elseif ($filter_query_where != '' && $and) {
	84	+ $filter_query_where .= ' AND';
	85	+ }
81	86	if ($filter_query_where != '') {
82	87	$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
83	88	}
		@@ -119,7 +124,9 @@ discard block
		block discarded – undo
119	124	}
120	125	}
121	126
122		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	127	+ if (!isset($globalLiveInterval)) {
	128	+ $globalLiveInterval = '200';
	129	+ }
123	130	if ($globalDBdriver == 'mysql') {
124	131	//$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";
125	132	$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;
		@@ -144,7 +151,9 @@ discard block
		block discarded – undo
144	151
145	152	$filter_query = $this->getFilter($filter,true,true);
146	153
147		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	154	+ if (!isset($globalLiveInterval)) {
	155	+ $globalLiveInterval = '200';
	156	+ }
148	157	if ($globalDBdriver == 'mysql') {
149	158	$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
150	159	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";
		@@ -182,7 +191,9 @@ discard block
		block discarded – undo
182	191
183	192	$filter_query = $this->getFilter($filter,true,true);
184	193
185		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	194	+ if (!isset($globalLiveInterval)) {
	195	+ $globalLiveInterval = '200';
	196	+ }
186	197	if ($globalDBdriver == 'mysql') {
187	198	$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
188	199	FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0'
		@@ -215,7 +226,9 @@ discard block
		block discarded – undo
215	226	global $globalDBdriver, $globalLiveInterval;
216	227	$filter_query = $this->getFilter($filter,true,true);
217	228
218		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	229	+ if (!isset($globalLiveInterval)) {
	230	+ $globalLiveInterval = '200';
	231	+ }
219	232	if ($globalDBdriver == 'mysql') {
220	233	$query = 'SELECT COUNT(DISTINCT tracker_live.famtrackid) as nb FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
221	234	} else {
		@@ -243,7 +256,9 @@ discard block
		block discarded – undo
243	256	{
244	257	global $globalDBdriver, $globalLiveInterval;
245	258	$Spotter = new Spotter($this->db);
246		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	259	+ if (!isset($globalLiveInterval)) {
	260	+ $globalLiveInterval = '200';
	261	+ }
247	262	$filter_query = $this->getFilter($filter);
248	263
249	264	if (is_array($coord)) {
		@@ -251,7 +266,9 @@ discard block
		block discarded – undo
251	266	$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
252	267	$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
253	268	$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
254		- } else return array();
	269	+ } else {
	270	+ return array();
	271	+ }
255	272	if ($globalDBdriver == 'mysql') {
256	273	$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;
257	274	} else {
		@@ -271,7 +288,9 @@ discard block
		block discarded – undo
271	288	{
272	289	global $globalDBdriver, $globalLiveInterval;
273	290	$Spotter = new Spotter($this->db);
274		- if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
	291	+ if (!isset($globalLiveInterval)) {
	292	+ $globalLiveInterval = '200';
	293	+ }
275	294	$filter_query = $this->getFilter($filter);
276	295
277	296	if (is_array($coord)) {
		@@ -279,7 +298,9 @@ discard block
		block discarded – undo
279	298	$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
280	299	$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
281	300	$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
282		- } else return array();
	301	+ } else {
	302	+ return array();
	303	+ }
283	304	if ($globalDBdriver == 'mysql') {
284	305	$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
285	306	FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' AND tracker_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong."
		@@ -472,11 +493,15 @@ discard block
		block discarded – undo
472	493	//$query = self::$global_query.' WHERE tracker_live.famtrackid = :id ORDER BY date';
473	494	if ($globalDBdriver == 'mysql') {
474	495	$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
475		- if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
	496	+ if ($liveinterval) {
	497	+ $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
	498	+ }
476	499	$query .= ' ORDER BY date';
477	500	} else {
478	501	$query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id';
479		- if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
	502	+ if ($liveinterval) {
	503	+ $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
	504	+ }
480	505	$query .= ' ORDER BY date';
481	506	}
482	507
		@@ -571,7 +596,9 @@ discard block
		block discarded – undo
571	596	$i++;
572	597	$j++;
573	598	if ($j == 30) {
574		- if ($globalDebug) echo ".";
	599	+ if ($globalDebug) {
	600	+ echo ".";
	601	+ }
575	602	try {
576	603
577	604	$sth = $this->db->prepare(substr($query_delete,0,-1).")");
		@@ -818,7 +845,9 @@ discard block
		block discarded – undo
818	845	{
819	846	return false;
820	847	}
821		- } else return '';
	848	+ } else {
	849	+ return '';
	850	+ }
822	851
823	852	if ($longitude != '')
824	853	{
		@@ -826,7 +855,9 @@ discard block
		block discarded – undo
826	855	{
827	856	return false;
828	857	}
829		- } else return '';
	858	+ } else {
	859	+ return '';
	860	+ }
830	861
831	862	if ($altitude != '')
832	863	{
		@@ -834,7 +865,9 @@ discard block
		block discarded – undo
834	865	{
835	866	return false;
836	867	}
837		- } else $altitude = 0;
	868	+ } else {
	869	+ $altitude = 0;
	870	+ }
838	871
839	872	if ($heading != '')
840	873	{
		@@ -842,7 +875,9 @@ discard block
		block discarded – undo
842	875	{
843	876	return false;
844	877	}
845		- } else $heading = 0;
	878	+ } else {
	879	+ $heading = 0;
	880	+ }
846	881
847	882	if ($groundspeed != '')
848	883	{
		@@ -850,9 +885,13 @@ discard block
		block discarded – undo
850	885	{
851	886	return false;
852	887	}
853		- } else $groundspeed = 0;
	888	+ } else {
	889	+ $groundspeed = 0;
	890	+ }
854	891	date_default_timezone_set('UTC');
855		- if ($date == '') $date = date("Y-m-d H:i:s", time());
	892	+ if ($date == '') {
	893	+ $date = date("Y-m-d H:i:s", time());
	894	+ }
856	895
857	896
858	897	$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
		@@ -868,12 +907,18 @@ discard block
		block discarded – undo
868	907	$comment = filter_var($comment,FILTER_SANITIZE_STRING);
869	908	$type = filter_var($type,FILTER_SANITIZE_STRING);
870	909
871		- if ($groundspeed == '' \|\| $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
872		- if ($heading == '' \|\| $Common->isInteger($heading) === false ) $heading = 0;
	910	+ if ($groundspeed == '' \|\| $Common->isInteger($groundspeed) === false ) {
	911	+ $groundspeed = 0;
	912	+ }
	913	+ if ($heading == '' \|\| $Common->isInteger($heading) === false ) {
	914	+ $heading = 0;
	915	+ }
873	916
874	917	$query = '';
875	918	if ($globalArchive) {
876		- if ($globalDebug) echo '-- Delete previous data -- ';
	919	+ if ($globalDebug) {
	920	+ echo '-- Delete previous data -- ';
	921	+ }
877	922	$query .= 'DELETE FROM tracker_live WHERE famtrackid = :famtrackid;';
878	923	}
879	924	$query .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type)
		@@ -888,10 +933,14 @@ discard block
		block discarded – undo
888	933	return "error : ".$e->getMessage();
889	934	}
890	935	if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
891		- if ($globalDebug) echo '(Add to SBS archive : ';
	936	+ if ($globalDebug) {
	937	+ echo '(Add to SBS archive : ';
	938	+ }
892	939	$TrackerArchive = new TrackerArchive($this->db);
893	940	$result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
894		- if ($globalDebug) echo $result.')';
	941	+ if ($globalDebug) {
	942	+ echo $result.')';
	943	+ }
895	944	}
896	945
897	946	return "success";

		@@ -26,7 +26,9 @@ discard block
		block discarded – undo
26	26	if (isset($filter[0]['source'])) {
27	27	$filters = array_merge($filters,$filter);
28	28	}
29		- if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
	29	+ if (is_array($globalFilter)) {
	30	+ $filter = array_merge($filter,$globalFilter);
	31	+ }
30	32	$filter_query_join = '';
31	33	$filter_query_where = '';
32	34	foreach($filters as $flt) {
		@@ -72,8 +74,11 @@ discard block
		block discarded – undo
72	74	if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
73	75	$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
74	76	}
75		- if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
76		- elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
	77	+ if ($filter_query_where == '' && $where) {
	78	+ $filter_query_where = ' WHERE';
	79	+ } elseif ($filter_query_where != '' && $and) {
	80	+ $filter_query_where .= ' AND';
	81	+ }
77	82	if ($filter_query_where != '') {
78	83	$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
79	84	}
		@@ -591,7 +596,9 @@ discard block
		block discarded – undo
591	596	$additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
592	597	$additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
593	598	$translate = $Translation->ident2icao($q_item);
594		- if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
	599	+ if ($translate != $q_item) {
	600	+ $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
	601	+ }
595	602	$additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
596	603	$additional_query .= ")";
597	604	}
		@@ -809,7 +816,9 @@ discard block
		block discarded – undo
809	816	date_default_timezone_set($globalTimezone);
810	817	$datetime = new DateTime();
811	818	$offset = $datetime->format('P');
812		- } else $offset = '+00:00';
	819	+ } else {
	820	+ $offset = '+00:00';
	821	+ }
813	822
814	823
815	824	if ($date_array[1] != "")
		@@ -1085,9 +1094,13 @@ discard block
		block discarded – undo
1085	1094	$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1086	1095	}
1087	1096	}
1088		- if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
	1097	+ if ($sincedate != '') {
	1098	+ $query .= "AND date > '".$sincedate."' ";
	1099	+ }
1089	1100	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1090		- if ($limit) $query .= " LIMIT 0,10";
	1101	+ if ($limit) {
	1102	+ $query .= " LIMIT 0,10";
	1103	+ }
1091	1104
1092	1105
1093	1106	$sth = $this->db->prepare($query);
		@@ -1131,9 +1144,13 @@ discard block
		block discarded – undo
1131	1144	$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1132	1145	}
1133	1146	}
1134		- if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
	1147	+ if ($sincedate != '') {
	1148	+ $query .= "AND s.date > '".$sincedate."' ";
	1149	+ }
1135	1150	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1136		- if ($limit) $query .= " LIMIT 0,10";
	1151	+ if ($limit) {
	1152	+ $query .= " LIMIT 0,10";
	1153	+ }
1137	1154
1138	1155
1139	1156	$sth = $this->db->prepare($query);

Ysurac / FlightAirMap

Push — master ( aa8319...e96b22 )

Status

Category

Braces +74 added lines, -25 removed lines patch added patch discarded remove patch

Braces +26 added lines, -9 removed lines patch added patch discarded remove patch