Ysurac / FlightAirMap

js/map-tracker.3d.js.php

Braces +12 added lines, -2 removed lines

@@ -53,7 +53,12 @@ 
 	} else {
 		for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) {
 			var entity = viewer.dataSources.get(dsn).entities.values[i];
-			if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 			} else {
 				//console.log(parseInt(entity.lastupdate)+' > '+Math.floor(Date.now()-100));
@@ -127,7 +132,12 @@ 
 		function(){
 			updateTrackerData();
 		}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 } else {
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);

getImages.php

Braces +5 added lines, -2 removed lines

@@ -96,8 +96,11 @@
     } elseif (isset($_GET['marine'])) {
         readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename);
     } else {
-        if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename);
-	else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename);
+        if ($color == 'FF0000') {
+        	readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename);
+        } else {
+		readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename);
+	}
     }
 }
 ?>
\ No newline at end of file

marine-data.php

Braces +3 added lines, -1 removed lines

@@ -63,7 +63,9 @@
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-	} else $image = $spotter_item['image_thumbnail'];
+	} else {
+		$image = $spotter_item['image_thumbnail'];
+	}
 
 }
 /* else {

tracker-data.php

Braces +3 added lines, -1 removed lines

@@ -63,7 +63,9 @@
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-	} else $image = $spotter_item['image_thumbnail'];
+	} else {
+		$image = $spotter_item['image_thumbnail'];
+	}
 
 }
 /* else {

accident.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
+if ($date == '') {
+	$date = date('Y-m-d');
+}
 header('Location: '.$globalURL.'/accident/'.$date);
 ?>
\ No newline at end of file

statistics-route-waypoint.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
 $Spotter = new Spotter();
 $title = _("Statistics").' - '._("Most common Route by Waypoint");
 require_once('header.php');
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 include('statistics-sub-menu.php'); 
 
 print '<div class="info">

statistics-route-airport.php

Braces +3 added lines, -1 removed lines

@@ -5,7 +5,9 @@
 $Spotter = new Spotter();
 $title = _("Statistics").' - '._("Most common Route by Airport");
 require_once('header.php');
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 include('statistics-sub-menu.php'); 
 
 print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

require/class.Connection.php

Braces +80 added lines, -31 removed lines

@@ -72,8 +72,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $globalDBuser;
 				$globalDBSpass = $globalDBpass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			} else {
 				$DBname = 'default';
 				$globalDBSdriver = $globalDBdriver;
@@ -81,8 +84,11 @@ 
 				$globalDBSname = $globalDBname;
 				$globalDBSuser = $user;
 				$globalDBSpass = $pass;
-				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306;
-				else $globalDBSport = $globalDBport;
+				if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') {
+					$globalDBSport = 3306;
+				} else {
+					$globalDBSport = $globalDBport;
+				}
 			}
 		} else {
 			$globalDBSdriver = $globalDB[$DBname]['driver'];
@@ -90,11 +96,16 @@ 
 			$globalDBSname = $globalDB[$DBname]['name'];
 			$globalDBSuser = $globalDB[$DBname]['user'];
 			$globalDBSpass = $globalDB[$DBname]['pass'];
-			if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port'];
-			else $globalDBSport = 3306;
+			if (isset($globalDB[$DBname]['port'])) {
+				$globalDBSport = $globalDB[$DBname]['port'];
+			} else {
+				$globalDBSport = 3306;
+			}
 		}
 		// Set number of try to connect to DB
-		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5;
+		if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) {
+			$globalDBretry = 5;
+		}
 		$i = 0;
 		while (true) {
 			try {
@@ -103,10 +114,16 @@ 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -120,23 +137,35 @@ 
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					if (!isset($globalDBTimeOut)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
+					}
+					if (!isset($globalDBPersistent)) {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
+					} else {
+						$this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					}
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
 			} catch(PDOException $e) {
 				$i++;
-				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				if (isset($globalDebug) && $globalDebug) {
+					echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
+				}
 				//exit;
-				if ($i > $globalDBretry) return false;
+				if ($i > $globalDBretry) {
+					return false;
+				}
 				//return false;
 			}
 		}
-		if ($DBname === 'default') $this->db = $this->dbs['default'];
+		if ($DBname === 'default') {
+			$this->db = $this->dbs['default'];
+		}
 		return true;
 	}
 
@@ -148,7 +177,9 @@ 
 		} else {
 			$query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'";
 		}
-		if ($this->db == NULL) return false;
+		if ($this->db == NULL) {
+			return false;
+		}
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
@@ -157,21 +188,28 @@ 
 		}
 		if($results->rowCount()>0) {
 		    return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	public function connectionExists()
 	{
 		global $globalDBdriver, $globalDBCheckConnection;
-		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true;
+		if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) {
+			return true;
+		}
 		$query = "SELECT 1 + 1";
-		if ($this->db === null) return false;
+		if ($this->db === null) {
+			return false;
+		}
 		try {
 			$sum = @$this->db->query($query);
 			if ($sum instanceof \PDOStatement) {
 				$sum = $sum->fetchColumn(0);
-			} else $sum = 0;
+			} else {
+				$sum = 0;
+			}
 			if (intval($sum) !== 2) {
 			     return false;
 			}
@@ -206,8 +244,9 @@ 
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
 		if($nb[0]['nb'] > 0) {
 			return true; 
+		} else {
+			return false;
 		}
-		else return false;
 	}
 
 	/*
@@ -257,9 +296,12 @@ 
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 			$sth->closeCursor();
-			if ($result['nb'] > 0) return true;
-			else return false;
-/*		} else {
+			if ($result['nb'] > 0) {
+				return true;
+			} else {
+				return false;
+			}
+			/*		} else {
 			$query = "SELECT * FROM ".$table." LIMIT 0";
 			try {
 				$results = $this->db->query($query);
@@ -298,7 +340,9 @@ 
 				$sth->closeCursor();
 				return $result['value'];
 			}
-		} else return $version;
+		} else {
+			return $version;
+		}
 	}
 	
 	/*
@@ -307,9 +351,14 @@ 
 	*/
 	public function latest() {
 	    global $globalNoDB;
-	    if (isset($globalNoDB) && $globalNoDB === TRUE) return true;
-	    if ($this->check_schema_version() == $this->latest_schema) return true;
-	    else return false;
+	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
+	    	return true;
+	    }
+	    if ($this->check_schema_version() == $this->latest_schema) {
+	    	return true;
+	    } else {
+	    	return false;
+	    }
 	}
 
 }

incident.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 require_once(dirname(__FILE__).'/require/settings.php');
 $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING);
-if ($date == '') $date = date('Y-m-d');
+if ($date == '') {
+	$date = date('Y-m-d');
+}
 header('Location: '.$globalURL.'/incident/'.$date);
 ?>
\ No newline at end of file