View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( f6e401...19913c )
by Yannick
10:24
created
Status
Category
Toggle Patches
import/callback.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -9,7 +9,7 @@  discard block
 
 block discarded – undo
9 9 
 require_once(dirname(__FILE__).'/../require/class.Source.php');
10 10 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
11 11 
 require_once(dirname(__FILE__).'/../require/class.Common.php');
12 
-$Common=new Common();
12 
+$Common = new Common();
13 13 
 $authorize = false;
14 14 
 $params = array();
15 15 
 $userip = $Common->getUserIP();
 
@@ -20,7 +20,7 @@  discard block
 
 block discarded – undo
20 20 
 			$authorize = true;
21 21 
 			break;
22 22 
 		}
23 
-		if ($userip != '' && isset($cb['host']) && in_array($userip,explode(',',$cb['host'])) {
23 
+		if ($userip != '' && isset($cb['host']) && in_array($userip, explode(',', $cb['host'])) {
24 24 
 			$params = $globalSources[$key];
25 25 
 			$authorize = true;
26 26 
 			break;
 
@@ -46,14 +46,14 @@  discard block
 
 block discarded – undo
46 46
47 47 
 if (isset($globalServer) && $globalServer) {
48 48 
 	if ($globalDebug) echo "Using Server Mode\n";
49 
-	$SI=new SpotterServer();
50 
-} else $SI=new SpotterImport($Connection->db);
49 
+	$SI = new SpotterServer();
50 
+} else $SI = new SpotterImport($Connection->db);
51 51 
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
52 52 
 if (isset($globalMarine) && $globalMarine) {
53 53 
 	$AIS = new AIS();
54 54 
 	$MI = new MarineImport($Connection->db);
55 55 
 }
56 
-$Source=new Source($Connection->db);
56 
+$Source = new Source($Connection->db);
57 57 
 date_default_timezone_set('UTC');
58 58
59 59 
 $buffer = '';
 
@@ -66,7 +66,7 @@  discard block
 
 block discarded – undo
66 66 
 	$data['altitude'] = round($buffer['altitude']*3.28084);
67 67 
 	$data['speed'] = $buffer['speed'];
68 68 
 	//$data['heading'] = $buffer['cap']; // Only N/S/E/W
69 
-	$data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']);
69 
+	$data['datetime'] = date('Y-m-d H:i:s', $buffer['timestamp']);
70 70 
 	$data['comment'] = '';
71 71 
 	if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
72 72 
 	//if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' ';
Please login to merge, or discard this patch.
Braces   +39 added lines, -13 removed lines patch added patch discarded remove patch 
@@ -27,15 +27,21 @@  discard block
 
 block discarded – undo
27 27 
 		}
28 28 
 	}
29 29 
 }
30 
-if ($authorize === false) die;
30 
+if ($authorize === false) {
31 
+	die;
32 
+}
31 33
32 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
34 
+if (isset($globalTracker) && $globalTracker) {
35 
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
36 
+}
33 37 
 if (isset($globalMarine) && $globalMarine) {
34 38 
 	require_once(dirname(__FILE__).'/../require/class.AIS.php');
35 39 
 	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
36 40 
 }
37 41
38 
-if (!isset($globalDebug)) $globalDebug = FALSE;
42 
+if (!isset($globalDebug)) {
43 
+	$globalDebug = FALSE;
44 
+}
39 45
40 46 
 // Check if schema is at latest version
41 47 
 $Connection = new Connection();
 
@@ -45,10 +51,16 @@  discard block
 
 block discarded – undo
45 51 
 }
46 52
47 53 
 if (isset($globalServer) && $globalServer) {
48 
-	if ($globalDebug) echo "Using Server Mode\n";
54 
+	if ($globalDebug) {
55 
+		echo "Using Server Mode\n";
56 
+	}
49 57 
 	$SI=new SpotterServer();
50 
-} else $SI=new SpotterImport($Connection->db);
51 
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
58 
+} else {
59 
+	$SI=new SpotterImport($Connection->db);
60 
+}
61 
+if (isset($globalTracker) && $globalTracker) {
62 
+	$TI = new TrackerImport($Connection->db);
63 
+}
52 64 
 if (isset($globalMarine) && $globalMarine) {
53 65 
 	$AIS = new AIS();
54 66 
 	$MI = new MarineImport($Connection->db);
 
@@ -57,7 +69,9 @@  discard block
 
 block discarded – undo
57 69 
 date_default_timezone_set('UTC');
58 70
59 71 
 $buffer = '';
60 
-if (isset($_POST)) $buffer = $_POST;
72 
+if (isset($_POST)) {
73 
+	$buffer = $_POST;
74 
+}
61 75 
 $data = array();
62 76 
 if (isset($buffer['type_event']) && isset($buffer['lat']) && isset($buffer['lon'])) {
63 77 
 	$data['ident'] = $buffer['device_id'];
 
@@ -68,15 +82,27 @@  discard block
 
 block discarded – undo
68 82 
 	//$data['heading'] = $buffer['cap']; // Only N/S/E/W
69 83 
 	$data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']);
70 84 
 	$data['comment'] = '';
71 
-	if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
85 
+	if (isset($buffer['battery']) && $buffer['battery'] != '') {
86 
+		$data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
87 
+	}
72 88 
 	//if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' ';
73 
-	if (isset($buffer['temp']) && $buffer['temp'] != '') $data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
74 
-	if (isset($buffer['press']) && $buffer['press'] != '') $data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
89 
+	if (isset($buffer['temp']) && $buffer['temp'] != '') {
90 
+		$data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
91 
+	}
92 
+	if (isset($buffer['press']) && $buffer['press'] != '') {
93 
+		$data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
94 
+	}
75 95 
 	$TI->add($data);
76 96 
 	unset($data);
77 97 
 }
78 
-if (isset($SI)) $SI->checkAll();
79 
-if (isset($MI)) $MI->checkAll();
80 
-if (isset($TI)) $TI->checkAll();
98 
+if (isset($SI)) {
99 
+	$SI->checkAll();
100 
+}
101 
+if (isset($MI)) {
102 
+	$MI->checkAll();
103 
+}
104 
+if (isset($TI)) {
105 
+	$TI->checkAll();
106 
+}
81 107
82 108 
 ?>
Please login to merge, or discard this patch.