View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 637022...8149d9 )
by Yannick
55:10 queued 27:13
created
Status
Category
Toggle Patches
require/class.MarineLive.php 1 patch
Braces   +119 added lines, -40 removed lines patch added patch discarded remove 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. (MarineLive)');
11 
+		if ($this->db === null) {
12 
+			die('Error: No DB connection. (MarineLive)');
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) {
 
@@ -80,8 +84,11 @@  discard block
 
 block discarded – undo
80 84 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
81 85 
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
82 86 
 		}
83 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
84 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
87 
+		if ($filter_query_where == '' && $where) {
88 
+			$filter_query_where = ' WHERE';
89 
+		} elseif ($filter_query_where != '' && $and) {
90 
+			$filter_query_where .= ' AND';
91 
+		}
85 92 
 		if ($filter_query_where != '') {
86 93 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
87 94 
 		}
 
@@ -122,9 +129,13 @@  discard block
 
 block discarded – undo
122 129 
 				$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
123 130 
 			}
124 131 
 		}
125 
-		if ($orderby_query == '') $orderby_query= ' ORDER BY date DESC';
132 
+		if ($orderby_query == '') {
133 
+			$orderby_query= ' ORDER BY date DESC';
134 
+		}
126 135
127 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
136 
+		if (!isset($globalLiveInterval)) {
137 
+			$globalLiveInterval = '200';
138 
+		}
128 139 
 		if ($globalDBdriver == 'mysql') {
129 140 
 			//$query  = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate";
130 141 
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query.$orderby_query;
 
@@ -149,7 +160,9 @@  discard block
 
 block discarded – undo
149 160
150 161 
 		$filter_query = $this->getFilter($filter,true,true);
151 162
152 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
163 
+		if (!isset($globalLiveInterval)) {
164 
+			$globalLiveInterval = '200';
165 
+		}
153 166 
 		if ($globalDBdriver == 'mysql') {
154 167 
 			$query  = 'SELECT marine_live.mmsi, marine_live.ident, marine_live.type,marine_live.fammarine_id, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source
155 168 
 			FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query." marine_live.latitude <> 0 AND marine_live.longitude <> 0";
 
@@ -190,48 +203,72 @@  discard block
 
 block discarded – undo
190 203 
 		}
191 204 
 		$filter_query = $this->getFilter($filter,true,true);
192 205
193 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
194 
-		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') $globalMap3DMarinesLimit = '300';
206 
+		if (!isset($globalLiveInterval)) {
207 
+			$globalLiveInterval = '200';
208 
+		}
209 
+		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') {
210 
+			$globalMap3DMarinesLimit = '300';
211 
+		}
195 212 
 		if ($globalDBdriver == 'mysql') {
196 213 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
197 214 
 				$query  = 'SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id,marine_archive.type, marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source
198 215 
 				    FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date) l ON l.fammarine_id = marine_archive.fammarine_id ";
199 
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
216 
+				if ($usecoord) {
217 
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
218 
+				}
200 219 
 				$query .= "UNION
201 220 
 				    SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source
202 221 
 				    FROM marine_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date";
203 
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
222 
+				if ($usecoord) {
223 
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
224 
+				}
204 225 
 				$query .= ") AS marine
205 226 
 				    WHERE latitude <> '0' AND longitude <> '0'
206 227 
 				    ORDER BY fammarine_id, date";
207 
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
228 
+				if ($limit) {
229 
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
230 
+				}
208 231 
 			} else {
209 232 
 				$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source
210 233 
 				    FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date ";
211 
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
234 
+				if ($usecoord) {
235 
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
236 
+				}
212 237 
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0'
213 238 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
214 
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
239 
+				if ($limit) {
240 
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
241 
+				}
215 242 
 			}
216 243 
 		} else {
217 244 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
218 245 
 				$query  = "SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.type,marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source
219 246 
 				    FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date) l ON l.fammarine_id = marine_archive.fammarine_id ";
220 
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
247 
+				if ($usecoord) {
248 
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
249 
+				}
221 250 
 				$query .= "UNION
222 251 
 				    SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source
223 252 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date";
224 
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
253 
+				if ($usecoord) {
254 
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
255 
+				}
225 256 
 				$query .= ") AS marine WHERE latitude <> '0' AND longitude <> '0' ";
226 257 
 				$query .= "ORDER BY fammarine_id, date";
227 
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
258 
+				if ($limit) {
259 
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
260 
+				}
228 261 
 			} else {
229 262 
 				$query  = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source
230 263 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date ";
231 
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
264 
+				if ($usecoord) {
265 
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
266 
+				}
232 267 
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0'
233 268 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
234 
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
269 
+				if ($limit) {
270 
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
271 
+				}
235 272 
 			}
236 273 
 		}
237 274 
 		try {
 
@@ -256,7 +293,9 @@  discard block
 
 block discarded – undo
256 293 
 		global $globalDBdriver, $globalLiveInterval;
257 294 
 		$filter_query = $this->getFilter($filter,true,true);
258 295
259 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
296 
+		if (!isset($globalLiveInterval)) {
297 
+			$globalLiveInterval = '200';
298 
+		}
260 299 
 		if ($globalDBdriver == 'mysql') {
261 300 
 			$query = 'SELECT COUNT(DISTINCT marine_live.fammarine_id) as nb FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
262 301 
 		} else {
 
@@ -284,7 +323,9 @@  discard block
 
 block discarded – undo
284 323 
 	{
285 324 
 		global $globalDBdriver, $globalLiveInterval;
286 325 
 		$Marine = new Marine($this->db);
287 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
326 
+		if (!isset($globalLiveInterval)) {
327 
+			$globalLiveInterval = '200';
328 
+		}
288 329 
 		$filter_query = $this->getFilter($filter);
289 330
290 331 
 		if (is_array($coord)) {
 
@@ -292,7 +333,9 @@  discard block
 
 block discarded – undo
292 333 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
293 334 
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
294 335 
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
295 
-		} else return array();
336 
+		} else {
337 
+			return array();
338 
+		}
296 339 
 		if ($globalDBdriver == 'mysql') {
297 340 
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query;
298 341 
 		} else {
 
@@ -312,7 +355,9 @@  discard block
 
 block discarded – undo
312 355 
 	{
313 356 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
314 357 
 		$Marine = new Marine($this->db);
315 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
358 
+		if (!isset($globalLiveInterval)) {
359 
+			$globalLiveInterval = '200';
360 
+		}
316 361 
 		$filter_query = $this->getFilter($filter,true,true);
317 362
318 363 
 		if (is_array($coord)) {
 
@@ -320,7 +365,9 @@  discard block
 
 block discarded – undo
320 365 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
321 366 
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
322 367 
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
323 
-		} else return array();
368 
+		} else {
369 
+			return array();
370 
+		}
324 371 
 		/*
325 372 
 		if ($globalDBdriver == 'mysql') {
326 373 
 			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
@@ -543,11 +590,15 @@  discard block
 
 block discarded – undo
543 590 
 		//$query  = self::$global_query.' WHERE marine_live.fammarine_id = :id ORDER BY date';
544 591 
 		if ($globalDBdriver == 'mysql') {
545 592 
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
546 
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
593 
+			if ($liveinterval) {
594 
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
595 
+			}
547 596 
 			$query .= ' ORDER BY date';
548 597 
 		} else {
549 598 
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
550 
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
599 
+			if ($liveinterval) {
600 
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
601 
+			}
551 602 
 			$query .= ' ORDER BY date';
552 603 
 		}
553 604 
 
@@ -642,7 +693,9 @@  discard block
 
 block discarded – undo
642 693 
 				$i++;
643 694 
 				$j++;
644 695 
 				if ($j == 30) {
645 
-					if ($globalDebug) echo ".";
696 
+					if ($globalDebug) {
697 
+						echo ".";
698 
+					}
646 699 
 				    	try {
647 700
648 701 
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 
@@ -922,7 +975,9 @@  discard block
 
 block discarded – undo
922 975 
 			{
923 976 
 				return false;
924 977 
 			}
925 
-		} else return '';
978 
+		} else {
979 
+			return '';
980 
+		}
926 981
927 982 
 		if ($longitude != '')
928 983 
 		{
 
@@ -930,7 +985,9 @@  discard block
 
 block discarded – undo
930 985 
 			{
931 986 
 				return false;
932 987 
 			}
933 
-		} else return '';
988 
+		} else {
989 
+			return '';
990 
+		}
934 991
935 992
936 993 
 		if ($heading != '')
 
@@ -939,7 +996,9 @@  discard block
 
 block discarded – undo
939 996 
 			{
940 997 
 				return false;
941 998 
 			}
942 
-		} else $heading = 0;
999 
+		} else {
1000 
+			$heading = 0;
1001 
+		}
943 1002
944 1003 
 		if ($groundspeed != '')
945 1004 
 		{
 
@@ -947,9 +1006,13 @@  discard block
 
 block discarded – undo
947 1006 
 			{
948 1007 
 				return false;
949 1008 
 			}
950 
-		} else $groundspeed = 0;
1009 
+		} else {
1010 
+			$groundspeed = 0;
1011 
+		}
951 1012 
 		date_default_timezone_set('UTC');
952 
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
1013 
+		if ($date == '') {
1014 
+			$date = date("Y-m-d H:i:s", time());
1015 
+		}
953 1016
954 1017
955 1018 
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
 
@@ -970,15 +1033,27 @@  discard block
 
 block discarded – undo
970 1033 
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
971 1034 
 		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
972 1035 
 		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
973 
-		if ($typeid == '') $typeid = NULL;
974 
-		if ($statusid == '') $statusid = NULL;
1036 
+		if ($typeid == '') {
1037 
+			$typeid = NULL;
1038 
+		}
1039 
+		if ($statusid == '') {
1040 
+			$statusid = NULL;
1041 
+		}
975 1042
976 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
977 
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
978 
-            	if ($arrival_date == '') $arrival_date = NULL;
1043 
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
1044 
+            		$groundspeed = 0;
1045 
+            	}
1046 
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
1047 
+            		$heading = 0;
1048 
+            	}
1049 
+            	if ($arrival_date == '') {
1050 
+            		$arrival_date = NULL;
1051 
+            	}
979 1052 
             	$query = '';
980 1053 
 		if ($globalArchive) {
981 
-			if ($globalDebug) echo '-- Delete previous data -- ';
1054 
+			if ($globalDebug) {
1055 
+				echo '-- Delete previous data -- ';
1056 
+			}
982 1057 
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';
983 1058 
 		}
984 1059 
 		$query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,type_id,status,status_id,imo,arrival_port_name,arrival_port_date) 
@@ -993,10 +1068,14 @@  discard block
 
 block discarded – undo
993 1068 
 		}
994 1069
995 1070 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
996 
-			if ($globalDebug) echo '(Add to Marine archive : ';
1071 
+			if ($globalDebug) {
1072 
+				echo '(Add to Marine archive : ';
1073 
+			}
997 1074 
 			$MarineArchive = new MarineArchive($this->db);
998 1075 
 			$result =  $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source, $source_name, $over_country);
999 
-			if ($globalDebug) echo $result.')';
1076 
+			if ($globalDebug) {
1077 
+				echo $result.')';
1078 
+			}
1000 1079 
 		}
1001 1080 
 		return "success";
1002 1081 
 	}
Please login to merge, or discard this patch.
marine-type-detailed.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -14,7 +14,7 @@
 
 block discarded – undo
14 14 
 		$limit_start = 0;
15 15 
 		$limit_end = 25;
16 16 
 		$absolute_difference = 25;
17 
-	}  else {
17 
+	} else {
18 18 
 		$limit_explode = explode(",", $_GET['limit']);
19 19 
 		$limit_start = $limit_explode[0];
20 20 
 		$limit_end = $limit_explode[1];
Please login to merge, or discard this patch.
statistics-type.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -6,7 +6,9 @@
 
 block discarded – undo
6 6 
 $title = _("Statistics").' - '._("Most common Vessel Type");
7 7
8 8 
 $type = 'marine';
9 
-if (!isset($filter_name)) $filter_name = '';
9 
+if (!isset($filter_name)) {
10 
+	$filter_name = '';
11 
+}
10 12 
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
11 13 
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
12 14
Please login to merge, or discard this patch.
require/class.Marine.php 1 patch
Braces   +206 added lines, -73 removed lines patch added patch discarded remove 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. (Marine)');
11 
+		if ($this->db === null) {
12 
+			die('Error: No DB connection. (Marine)');
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) {
 
@@ -72,8 +76,11 @@  discard block
 
 block discarded – undo
72 76 
 				$filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'";
73 77 
 			}
74 78 
 		}
75 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
76 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
79 
+		if ($filter_query_where == '' && $where) {
80 
+			$filter_query_where = ' WHERE';
81 
+		} elseif ($filter_query_where != '' && $and) {
82 
+			$filter_query_where .= ' AND';
83 
+		}
77 84 
 		if ($filter_query_where != '') {
78 85 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
79 86 
 		}
 
@@ -127,35 +134,63 @@  discard block
 
 block discarded – undo
127 134 
 				$temp_array['spotter_id'] = $row['spotter_archive_id'];
128 135 
 			} elseif (isset($row['spotter_archive_output_id'])) {
129 136 
 				$temp_array['spotter_id'] = $row['spotter_archive_output_id'];
130 
-			*/}
131 
-			elseif (isset($row['marineid'])) {
137 
+			*/} elseif (isset($row['marineid'])) {
132 138 
 				$temp_array['marine_id'] = $row['marineid'];
133 139 
 			} else {
134 140 
 				$temp_array['marine_id'] = '';
135 141 
 			}
136 
-			if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id'];
137 
-			if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi'];
138 
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
139 
-			if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id'];
140 
-			if (isset($row['status'])) $temp_array['status'] = $row['status'];
141 
-			if (isset($row['status_id'])) $temp_array['status_id'] = $row['status_id'];
142 
-			if (isset($row['ident'])) $temp_array['ident'] = $row['ident'];
143 
-			if (isset($row['arrival_port_name'])) $temp_array['arrival_port_name'] = $row['arrival_port_name'];
144 
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
145 
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
146 
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
142 
+			if (isset($row['fammarine_id'])) {
143 
+				$temp_array['fammarine_id'] = $row['fammarine_id'];
144 
+			}
145 
+			if (isset($row['mmsi'])) {
146 
+				$temp_array['mmsi'] = $row['mmsi'];
147 
+			}
148 
+			if (isset($row['type'])) {
149 
+				$temp_array['type'] = $row['type'];
150 
+			}
151 
+			if (isset($row['type_id'])) {
152 
+				$temp_array['type_id'] = $row['type_id'];
153 
+			}
154 
+			if (isset($row['status'])) {
155 
+				$temp_array['status'] = $row['status'];
156 
+			}
157 
+			if (isset($row['status_id'])) {
158 
+				$temp_array['status_id'] = $row['status_id'];
159 
+			}
160 
+			if (isset($row['ident'])) {
161 
+				$temp_array['ident'] = $row['ident'];
162 
+			}
163 
+			if (isset($row['arrival_port_name'])) {
164 
+				$temp_array['arrival_port_name'] = $row['arrival_port_name'];
165 
+			}
166 
+			if (isset($row['latitude'])) {
167 
+				$temp_array['latitude'] = $row['latitude'];
168 
+			}
169 
+			if (isset($row['longitude'])) {
170 
+				$temp_array['longitude'] = $row['longitude'];
171 
+			}
172 
+			if (isset($row['format_source'])) {
173 
+				$temp_array['format_source'] = $row['format_source'];
174 
+			}
147 175 
 			if (isset($row['heading'])) {
148 176 
 				$temp_array['heading'] = $row['heading'];
149 177 
 				$heading_direction = $this->parseDirection($row['heading']);
150 
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
178 
+				if (isset($heading_direction[0]['direction_fullname'])) {
179 
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
180 
+				}
181 
+			}
182 
+			if (isset($row['ground_speed'])) {
183 
+				$temp_array['ground_speed'] = $row['ground_speed'];
151 184 
 			}
152 
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
153 185
154 186 
 			if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
155 187 
 			{
156 188 
 				$Image = new Image($this->db);
157 
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
158 
-				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
189 
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') {
190 
+					$image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
191 
+				} else {
192 
+					$image_array = $Image->getMarineImage($temp_array['mmsi']);
193 
+				}
159 194 
 				unset($Image);
160 195 
 				if (count($image_array) > 0) {
161 196 
 					$temp_array['image'] = $image_array[0]['image'];
 
@@ -207,13 +242,21 @@  discard block
 
 block discarded – undo
207 242 
 			}
208 243
209 244 
 			$fromsource = NULL;
210 
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
211 
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
212 
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
245 
+			if (isset($row['source_name']) && $row['source_name'] != '') {
246 
+				$temp_array['source_name'] = $row['source_name'];
247 
+			}
248 
+			if (isset($row['over_country']) && $row['over_country'] != '') {
249 
+				$temp_array['over_country'] = $row['over_country'];
250 
+			}
251 
+			if (isset($row['distance']) && $row['distance'] != '') {
252 
+				$temp_array['distance'] = $row['distance'];
253 
+			}
213 254 
 			$temp_array['query_number_rows'] = $num_rows;
214 255 
 			$spotter_array[] = $temp_array;
215 256 
 		}
216 
-		if ($num_rows == 0) return array();
257 
+		if ($num_rows == 0) {
258 
+			return array();
259 
+		}
217 260 
 		$spotter_array[0]['query_number_rows'] = $num_rows;
218 261 
 		return $spotter_array;
219 262 
 	}	
@@ -239,8 +282,12 @@  discard block
 
 block discarded – undo
239 282 
 			{
240 283 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
241 284 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
242 
-			} else $limit_query = "";
243 
-		} else $limit_query = "";
285 
+			} else {
286 
+				$limit_query = "";
287 
+			}
288 
+		} else {
289 
+			$limit_query = "";
290 
+		}
244 291 
 		if ($sort != "")
245 292 
 		{
246 293 
 			$search_orderby_array = $this->getOrderBy();
 
@@ -264,7 +311,9 @@  discard block
 
 block discarded – undo
264 311 
 		global $global_query;
265 312
266 313 
 		date_default_timezone_set('UTC');
267 
-		if ($id == '') return array();
314 
+		if ($id == '') {
315 
+			return array();
316 
+		}
268 317 
 		$additional_query = "marine_output.fammarine_id = :id";
269 318 
 		$query_values = array(':id' => $id);
270 319 
 		$query  = $global_query." WHERE ".$additional_query." ";
 
@@ -460,8 +509,11 @@  discard block
 
 block discarded – undo
460 509 
 		$query .= " ORDER BY marine_output.source_name ASC";
461 510
462 511 
 		$sth = $this->db->prepare($query);
463 
-		if (!empty($query_values)) $sth->execute($query_values);
464 
-		else $sth->execute();
512 
+		if (!empty($query_values)) {
513 
+			$sth->execute($query_values);
514 
+		} else {
515 
+			$sth->execute();
516 
+		}
465 517
466 518 
 		$source_array = array();
467 519 
 		$temp_array = array();
 
@@ -516,8 +568,11 @@  discard block
 
 block discarded – undo
516 568 
 		$sth = $this->db->prepare($query);
517 569 
 		$sth->execute(array(':mmsi' => $mmsi));
518 570 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
519 
-		if (isset($result[0])) return $result[0];
520 
-		else return array();
571 
+		if (isset($result[0])) {
572 
+			return $result[0];
573 
+		} else {
574 
+			return array();
575 
+		}
521 576 
 	}
522 577
523 578 
 	/**
 
@@ -558,7 +613,9 @@  discard block
 
 block discarded – undo
558 613 
 			date_default_timezone_set($globalTimezone);
559 614 
 			$datetime = new DateTime();
560 615 
 			$offset = $datetime->format('P');
561 
-		} else $offset = '+00:00';
616 
+		} else {
617 
+			$offset = '+00:00';
618 
+		}
562 619
563 620 
 		if ($globalDBdriver == 'mysql') {
564 621 
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
 
@@ -804,11 +861,21 @@  discard block
 
 block discarded – undo
804 861 
 			$latitude = 0;
805 862 
 			$longitude = 0;
806 863 
 		}
807 
-		if ($type_id == '') $type_id = NULL;
808 
-		if ($status_id == '') $status_id = NULL;
809 
-		if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
810 
-		if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
811 
-		if ($arrival_date == '') $arrival_date = NULL;
864 
+		if ($type_id == '') {
865 
+			$type_id = NULL;
866 
+		}
867 
+		if ($status_id == '') {
868 
+			$status_id = NULL;
869 
+		}
870 
+		if ($heading == '' || $Common->isInteger($heading) === false) {
871 
+			$heading = 0;
872 
+		}
873 
+		if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
874 
+			$groundspeed = 0;
875 
+		}
876 
+		if ($arrival_date == '') {
877 
+			$arrival_date = NULL;
878 
+		}
812 879 
 		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date)
813 880 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date)";
814 881 
 
@@ -915,7 +982,9 @@  discard block
 
 block discarded – undo
915 982 
 		global $globalDBdriver, $globalArchive;
916 983 
 		//$filter_query = $this->getFilter($filters,true,true);
917 984 
 		$Connection= new Connection($this->db);
918 
-		if (!$Connection->tableExists('countries')) return array();
985 
+		if (!$Connection->tableExists('countries')) {
986 
+			return array();
987 
+		}
919 988 
 		require_once('class.SpotterLive.php');
920 989 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
921 990 
 			$MarineLive = new MarineLive($this->db);
 
@@ -959,7 +1028,9 @@  discard block
 
 block discarded – undo
959 1028 
 			$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT fammarine_id,over_country FROM marine_archive".$filter_query.") l ON c.iso2 = l.over_country ";
960 1029 
 		}
961 1030 
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
962 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1031 
+		if ($limit) {
1032 
+			$query .= " LIMIT 10 OFFSET 0";
1033 
+		}
963 1034
964 1035 
 		$sth = $this->db->prepare($query);
965 1036 
 		$sth->execute();
 
@@ -993,12 +1064,18 @@  discard block
 
 block discarded – undo
993 1064 
 		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
994 1065 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
995 1066 
 		 if ($olderthanmonths > 0) {
996 
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
997 
-			else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1067 
+			if ($globalDBdriver == 'mysql') {
1068 
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
1069 
+			} else {
1070 
+				$query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1071 
+			}
998 1072 
 		}
999 1073 
 		if ($sincedate != '') {
1000 
-			if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'";
1001 
-			else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
1074 
+			if ($globalDBdriver == 'mysql') {
1075 
+				$query .= " AND marine_output.date > '".$sincedate."'";
1076 
+			} else {
1077 
+				$query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
1078 
+			}
1002 1079 
 		}
1003 1080 
 		$query_values = array();
1004 1081 
 		if ($year != '') {
 
@@ -1029,7 +1106,9 @@  discard block
 
 block discarded – undo
1029 1106 
 			}
1030 1107 
 		}
1031 1108 
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
1032 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1109 
+		if ($limit) {
1110 
+			$query .= " LIMIT 10 OFFSET 0";
1111 
+		}
1033 1112
1034 1113 
 		$sth = $this->db->prepare($query);
1035 1114 
 		$sth->execute($query_values);
 
@@ -1064,7 +1143,9 @@  discard block
 
 block discarded – undo
1064 1143 
 			date_default_timezone_set($globalTimezone);
1065 1144 
 			$datetime = new DateTime();
1066 1145 
 			$offset = $datetime->format('P');
1067 
-		} else $offset = '+00:00';
1146 
+		} else {
1147 
+			$offset = '+00:00';
1148 
+		}
1068 1149
1069 1150 
 		if ($globalDBdriver == 'mysql') {
1070 1151 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1114,7 +1195,9 @@  discard block
 
 block discarded – undo
1114 1195 
 			date_default_timezone_set($globalTimezone);
1115 1196 
 			$datetime = new DateTime();
1116 1197 
 			$offset = $datetime->format('P');
1117 
-		} else $offset = '+00:00';
1198 
+		} else {
1199 
+			$offset = '+00:00';
1200 
+		}
1118 1201 
 		$filter_query = $this->getFilter($filters,true,true);
1119 1202 
 		if ($globalDBdriver == 'mysql') {
1120 1203 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1160,7 +1243,9 @@  discard block
 
 block discarded – undo
1160 1243 
 			date_default_timezone_set($globalTimezone);
1161 1244 
 			$datetime = new DateTime();
1162 1245 
 			$offset = $datetime->format('P');
1163 
-		} else $offset = '+00:00';
1246 
+		} else {
1247 
+			$offset = '+00:00';
1248 
+		}
1164 1249 
 		$filter_query = $this->getFilter($filters,true,true);
1165 1250 
 		if ($globalDBdriver == 'mysql') {
1166 1251 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1208,7 +1293,9 @@  discard block
 
 block discarded – undo
1208 1293 
 			date_default_timezone_set($globalTimezone);
1209 1294 
 			$datetime = new DateTime();
1210 1295 
 			$offset = $datetime->format('P');
1211 
-		} else $offset = '+00:00';
1296 
+		} else {
1297 
+			$offset = '+00:00';
1298 
+		}
1212 1299
1213 1300 
 		if ($globalDBdriver == 'mysql') {
1214 1301 
 			$query  = "SELECT YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
 
@@ -1257,7 +1344,9 @@  discard block
 
 block discarded – undo
1257 1344 
 			date_default_timezone_set($globalTimezone);
1258 1345 
 			$datetime = new DateTime();
1259 1346 
 			$offset = $datetime->format('P');
1260 
-		} else $offset = '+00:00';
1347 
+		} else {
1348 
+			$offset = '+00:00';
1349 
+		}
1261 1350 
 		$filter_query = $this->getFilter($filters,true,true);
1262 1351 
 		if ($globalDBdriver == 'mysql') {
1263 1352 
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 
@@ -1306,7 +1395,9 @@  discard block
 
 block discarded – undo
1306 1395 
 			date_default_timezone_set($globalTimezone);
1307 1396 
 			$datetime = new DateTime();
1308 1397 
 			$offset = $datetime->format('P');
1309 
-		} else $offset = '+00:00';
1398 
+		} else {
1399 
+			$offset = '+00:00';
1400 
+		}
1310 1401
1311 1402 
 		$orderby_sql = '';
1312 1403 
 		if ($orderby == "hour")
 
@@ -1375,7 +1466,9 @@  discard block
 
 block discarded – undo
1375 1466 
 			date_default_timezone_set($globalTimezone);
1376 1467 
 			$datetime = new DateTime($date);
1377 1468 
 			$offset = $datetime->format('P');
1378 
-		} else $offset = '+00:00';
1469 
+		} else {
1470 
+			$offset = '+00:00';
1471 
+		}
1379 1472
1380 1473 
 		if ($globalDBdriver == 'mysql') {
1381 1474 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1423,7 +1516,9 @@  discard block
 
 block discarded – undo
1423 1516 
 			date_default_timezone_set($globalTimezone);
1424 1517 
 			$datetime = new DateTime();
1425 1518 
 			$offset = $datetime->format('P');
1426 
-		} else $offset = '+00:00';
1519 
+		} else {
1520 
+			$offset = '+00:00';
1521 
+		}
1427 1522
1428 1523 
 		if ($globalDBdriver == 'mysql') {
1429 1524 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1488,8 +1583,11 @@  discard block
 
 block discarded – undo
1488 1583 
 				$query_values = array_merge($query_values,array(':month' => $month));
1489 1584 
 			}
1490 1585 
 		}
1491 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1492 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1586 
+		if (empty($query_values)) {
1587 
+			$queryi .= $this->getFilter($filters);
1588 
+		} else {
1589 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1590 
+		}
1493 1591
1494 1592 
 		$sth = $this->db->prepare($queryi);
1495 1593 
 		$sth->execute($query_values);
 
@@ -1526,8 +1624,11 @@  discard block
 
 block discarded – undo
1526 1624 
 				$query_values = array_merge($query_values,array(':month' => $month));
1527 1625 
 			}
1528 1626 
 		}
1529 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1530 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1627 
+		if (empty($query_values)) {
1628 
+			$queryi .= $this->getFilter($filters);
1629 
+		} else {
1630 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1631 
+		}
1531 1632
1532 1633 
 		$sth = $this->db->prepare($queryi);
1533 1634 
 		$sth->execute($query_values);
 
@@ -1549,7 +1650,9 @@  discard block
 
 block discarded – undo
1549 1650 
 			date_default_timezone_set($globalTimezone);
1550 1651 
 			$datetime = new DateTime();
1551 1652 
 			$offset = $datetime->format('P');
1552 
-		} else $offset = '+00:00';
1653 
+		} else {
1654 
+			$offset = '+00:00';
1655 
+		}
1553 1656
1554 1657 
 		if ($globalDBdriver == 'mysql') {
1555 1658 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1653,7 +1756,9 @@  discard block
 
 block discarded – undo
1653 1756 
 	*/
1654 1757 
 	public function parseDirection($direction = 0)
1655 1758 
 	{
1656 
-		if ($direction == '') $direction = 0;
1759 
+		if ($direction == '') {
1760 
+			$direction = 0;
1761 
+		}
1657 1762 
 		$direction_array = array();
1658 1763 
 		$temp_array = array();
1659 1764 
 
@@ -1742,7 +1847,9 @@  discard block
 
 block discarded – undo
1742 1847 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1743 1848
1744 1849 
 		$Connection = new Connection($this->db);
1745 
-		if (!$Connection->tableExists('countries')) return '';
1850 
+		if (!$Connection->tableExists('countries')) {
1851 
+			return '';
1852 
+		}
1746 1853
1747 1854 
 		try {
1748 1855 
 			/*
 
@@ -1762,9 +1869,13 @@  discard block
 
 block discarded – undo
1762 1869 
 			$sth->closeCursor();
1763 1870 
 			if (count($row) > 0) {
1764 1871 
 				return $row;
1765 
-			} else return '';
1872 
+			} else {
1873 
+				return '';
1874 
+			}
1766 1875 
 		} catch (PDOException $e) {
1767 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1876 
+			if (isset($globalDebug) && $globalDebug) {
1877 
+				echo 'Error : '.$e->getMessage()."\n";
1878 
+			}
1768 1879 
 			return '';
1769 1880 
 		}
1770 1881 
 	
@@ -1782,7 +1893,9 @@  discard block
 
 block discarded – undo
1782 1893 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1783 1894
1784 1895 
 		$Connection = new Connection($this->db);
1785 
-		if (!$Connection->tableExists('countries')) return '';
1896 
+		if (!$Connection->tableExists('countries')) {
1897 
+			return '';
1898 
+		}
1786 1899
1787 1900 
 		try {
1788 1901 
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
 
@@ -1794,9 +1907,13 @@  discard block
 
 block discarded – undo
1794 1907 
 			$sth->closeCursor();
1795 1908 
 			if (count($row) > 0) {
1796 1909 
 				return $row;
1797 
-			} else return '';
1910 
+			} else {
1911 
+				return '';
1912 
+			}
1798 1913 
 		} catch (PDOException $e) {
1799 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1914 
+			if (isset($globalDebug) && $globalDebug) {
1915 
+				echo 'Error : '.$e->getMessage()."\n";
1916 
+			}
1800 1917 
 			return '';
1801 1918 
 		}
1802 1919 
 	
@@ -1814,7 +1931,9 @@  discard block
 
 block discarded – undo
1814 1931 
 	{
1815 1932 
 		global $globalBitlyAccessToken;
1816 1933
1817 
-		if ($globalBitlyAccessToken == '') return $url;
1934 
+		if ($globalBitlyAccessToken == '') {
1935 
+			return $url;
1936 
+		}
1818 1937
1819 1938 
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
1820 1939 
 		
@@ -1890,7 +2009,9 @@  discard block
 
 block discarded – undo
1890 2009 
 			}
1891 2010 
 		}
1892 2011 
 		$query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC";
1893 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
2012 
+		if ($limit) {
2013 
+			$query .= " LIMIT 10 OFFSET 0";
2014 
+		}
1894 2015 
 		$sth = $this->db->prepare($query);
1895 2016 
 		$sth->execute($query_values);
1896 2017 
 		$marine_array = array();
 
@@ -1928,9 +2049,15 @@  discard block
 
 block discarded – undo
1928 2049 
 				foreach ($q_array as $q_item){
1929 2050 
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1930 2051 
 					$additional_query .= " AND (";
1931 
-					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
1932 
-					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
1933 
-					if (is_int($q_item)) $additional_query .= "(marine_output.imo = '".$q_item."') OR ";
2052 
+					if (is_int($q_item)) {
2053 
+						$additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
2054 
+					}
2055 
+					if (is_int($q_item)) {
2056 
+						$additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
2057 
+					}
2058 
+					if (is_int($q_item)) {
2059 
+						$additional_query .= "(marine_output.imo = '".$q_item."') OR ";
2060 
+					}
1934 2061 
 					$additional_query .= "(marine_output.ident like '%".$q_item."%') OR ";
1935 2062 
 					$additional_query .= ")";
1936 2063 
 				}
 
@@ -1978,7 +2105,9 @@  discard block
 
 block discarded – undo
1978 2105 
 				date_default_timezone_set($globalTimezone);
1979 2106 
 				$datetime = new DateTime();
1980 2107 
 				$offset = $datetime->format('P');
1981 
-			} else $offset = '+00:00';
2108 
+			} else {
2109 
+				$offset = '+00:00';
2110 
+			}
1982 2111 
 			if ($date_array[1] != "")
1983 2112 
 			{
1984 2113 
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 
@@ -2005,8 +2134,12 @@  discard block
 
 block discarded – undo
2005 2134 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
2006 2135 
 			{
2007 2136 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
2008 
-			} else $limit_query = "";
2009 
-		} else $limit_query = "";
2137 
+			} else {
2138 
+				$limit_query = "";
2139 
+			}
2140 
+		} else {
2141 
+			$limit_query = "";
2142 
+		}
2010 2143 
 		if ($sort != "")
2011 2144 
 		{
2012 2145 
 			$search_orderby_array = $this->getOrderBy();
Please login to merge, or discard this patch.
require/class.MarineImport.php 1 patch
Braces   +202 added lines, -69 removed lines patch added patch discarded remove patch 
@@ -54,7 +54,9 @@  discard block
 
 block discarded – undo
54 54 
     public function checkAll() {
55 55 
 	global $globalDebug, $globalNoDB;
56 56 
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
57 
-	    if ($globalDebug) echo "Update last seen tracked data...\n";
57 
+	    if ($globalDebug) {
58 
+	    	echo "Update last seen tracked data...\n";
59 
+	    }
58 60 
 	    foreach ($this->all_tracked as $key => $flight) {
59 61 
 		if (isset($this->all_tracked[$key]['id'])) {
60 62 
 		    //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
 
@@ -68,13 +70,17 @@  discard block
 
 block discarded – undo
68 70 
     public function del() {
69 71 
 	global $globalDebug, $globalNoDB, $globalNoImport;
70 72 
 	// Delete old infos
71 
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
73 
+	if ($globalDebug) {
74 
+		echo 'Delete old values and update latest data...'."\n";
75 
+	}
72 76 
 	foreach ($this->all_tracked as $key => $flight) {
73 77 
     	    if (isset($flight['lastupdate'])) {
74 78 
         	if ($flight['lastupdate'] < (time()-3000)) {
75 79 
             	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
76 80 
             		if (isset($this->all_tracked[$key]['id'])) {
77 
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
81 
+            		    if ($globalDebug) {
82 
+            		    	echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
83 
+            		    }
78 84 
 			    /*
79 85 
 			    $MarineLive = new MarineLive();
80 86 
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
 
@@ -84,7 +90,9 @@  discard block
 
 block discarded – undo
84 90 
             		    $Marine = new Marine($this->db);
85 91 
             		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
86 92 
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
87 
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
93 
+				if ($globalDebug && $result != 'success') {
94 
+					echo '!!! ERROR : '.$result."\n";
95 
+				}
88 96 
 			    }
89 97 
 			    // Put in archive
90 98 
 //				$Marine->db = null;
 
@@ -98,7 +106,9 @@  discard block
 
 block discarded – undo
98 106
99 107 
     public function add($line) {
100 108 
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
101 
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
109 
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
110 
+		$globalCoordMinChange = '0.02';
111 
+	}
102 112 
 	date_default_timezone_set('UTC');
103 113 
 	$dataFound = false;
104 114 
 	$send = false;
 
@@ -112,20 +122,30 @@  discard block
 
 block discarded – undo
112 122 
 		// Increment message number
113 123 
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
114 124 
 		    $current_date = date('Y-m-d');
115 
-		    if (isset($line['source_name'])) $source = $line['source_name'];
116 
-		    else $source = '';
117 
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
125 
+		    if (isset($line['source_name'])) {
126 
+		    	$source = $line['source_name'];
127 
+		    } else {
128 
+		    	$source = '';
129 
+		    }
130 
+		    if ($source == '' || $line['format_source'] == 'aprs') {
131 
+		    	$source = $line['format_source'];
132 
+		    }
118 133 
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
119 134 
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
120 135 
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
121 
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
136 
+		    } else {
137 
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
138 
+		    }
122 139 
 		}
123 140
124 141
125 142 
 		$Common = new Common();
126 143 
 		$AIS = new AIS();
127 
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
128 
-	        else $id = trim($line['id']);
144 
+	        if (!isset($line['id'])) {
145 
+	        	$id = trim($line['mmsi']);
146 
+	        } else {
147 
+	        	$id = trim($line['id']);
148 
+	        }
129 149
130 150 
 		if (!isset($this->all_tracked[$id])) {
131 151 
 		    $this->all_tracked[$id] = array();
 
@@ -133,10 +153,16 @@  discard block
 
 block discarded – undo
133 153 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
134 154 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
135 155 
 		    if (!isset($line['id'])) {
136 
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
156 
+			if (!isset($globalDaemon)) {
157 
+				$globalDaemon = TRUE;
158 
+			}
137 159 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
138 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
139 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
160 
+		     } else {
161 
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
162 
+		     }
163 
+		    if ($globalAllTracked !== FALSE) {
164 
+		    	$dataFound = true;
165 
+		    }
140 166 
 		}
141 167
142 168 
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
 
@@ -191,7 +217,9 @@  discard block
 
 block discarded – undo
191 217 
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
192 218 
 		    if (!isset($this->all_tracked[$id]['arrival_code'])) {
193 219 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
194 
-			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
220 
+			if ($globalDebug) {
221 
+				echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
222 
+			}
195 223 
 			if ($this->all_tracked[$id]['addedMarine'] != 0) {
196 224 
 			    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
197 225 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 
@@ -204,7 +232,9 @@  discard block
 
 block discarded – undo
204 232 
 			}
205 233 
 		    } elseif ($this->all_tracked[$id]['arrival_code'] != $line['arrival_code']) {
206 234 
 			$this->all_tracked[$id]['arrival_code'] = $line['arrival_code'];
207 
-			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
235 
+			if ($globalDebug) {
236 
+				echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
237 
+			}
208 238 
 			if (!isset($line['id'])) {
209 239 
 				$this->all_tracked[$id]['id'] = $id.'-'.date('YmdHi');
210 240 
 				$this->all_tracked[$id]['forcenew'] = 1;
 
@@ -213,7 +243,9 @@  discard block
 
 block discarded – undo
213 243 
 		    }
214 244 
 		}
215 245 
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
216 
-		    if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
246 
+		    if (strtotime($line['arrival_date']) > time()) {
247 
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
248 
+		    }
217 249 
 		}
218 250
219 251 
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
 
@@ -234,34 +266,49 @@  discard block
 
 block discarded – undo
234 266 
 				$Marine = new Marine($this->db);
235 267 
 				$fromsource = NULL;
236 268 
 				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
237 
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
269 
+				if ($globalDebug && $result != 'success') {
270 
+					echo '!!! ERROR : '.$result."\n";
271 
+				}
238 272 
 				$Marine->db = null;
239 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
273 
+				if ($globalDebugTimeElapsed) {
274 
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
275 
+				}
240 276 
 			    }
241 277 
 			}
242 278 
 		    }
243 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
279 
+		    if (!isset($this->all_tracked[$id]['id'])) {
280 
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
281 
+		    }
244 282 
 		}
245 283
246 284 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
247 285 
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
248 286 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
249 287 
 		    } else {
250 
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
251 
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
288 
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
289 
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
290 
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
291 
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
292 
+				}
252 293 
 				return '';
253 294 
 		    }
254 295 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
255 
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
296 
+			if ($globalDebug) {
297 
+				echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
298 
+			}
256 299 
 			return '';
257 300 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) >= time()+20*60) {
258 
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
301 
+			if ($globalDebug) {
302 
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
303 
+			}
259 304 
 			return '';
260 305 
 		} elseif (!isset($line['datetime'])) {
261 306 
 			date_default_timezone_set('UTC');
262 307 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
263 308 
 		} else {
264 
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!\n";
309 
+			if ($globalDebug) {
310 
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!\n";
311 
+			}
265 312 
 			return '';
266 313 
 		}
267 314 
 
@@ -274,14 +321,21 @@  discard block
 
 block discarded – undo
274 321 
 		    if ($distance > 1000 && $distance < 10000) {
275 322 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
276 323 
 			$speed = $speed*3.6;
277 
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
278 
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
324 
+			if ($speed < 1000) {
325 
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
326 
+			}
327 
+  			if ($globalDebug) {
328 
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
329 
+  			}
279 330 
 		    }
280 331 
 		}
281 332
282 333 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
283 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
284 
-	    	    else unset($timediff);
334 
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
335 
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
336 
+	    	    } else {
337 
+	    	    	unset($timediff);
338 
+	    	    }
285 339 
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
286 340 
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
287 341 
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
 
@@ -289,22 +343,32 @@  discard block
 
 block discarded – undo
289 343 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
290 344 
 				$this->all_tracked[$id]['putinarchive'] = true;
291 345
292 
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
346 
+				if ($globalDebug) {
347 
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
348 
+				}
293 349 
 				$timeelapsed = microtime(true);
294 350 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
295 351 
 				    $Marine = new Marine($this->db);
296 352 
 				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
297 
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
353 
+				    if (!empty($all_country)) {
354 
+				    	$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
355 
+				    }
298 356 
 				    $Marine->db = null;
299 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
357 
+				    if ($globalDebugTimeElapsed) {
358 
+				    	echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
359 
+				    }
300 360 
 				}
301 361 
 				$this->tmd = 0;
302 
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
362 
+				if ($globalDebug) {
363 
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
364 
+				}
303 365 
 			    }
304 366 
 			}
305 367
306 368 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
307 
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
369 
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
370 
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
371 
+				}
308 372 
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
309 373 
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
310 374 
 				    $dataFound = true;
 
@@ -313,8 +377,12 @@  discard block
 
 block discarded – undo
313 377 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
314 378 
 			}
315 379 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
316 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
317 
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
380 
+			    if ($line['longitude'] > 180) {
381 
+			    	$line['longitude'] = $line['longitude'] - 360;
382 
+			    }
383 
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
384 
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
385 
+				}
318 386 
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
319 387 
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
320 388 
 				    $dataFound = true;
 
@@ -332,7 +400,9 @@  discard block
 
 block discarded – undo
332 400 
 		    }
333 401 
 		}
334 402 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
335 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
403 
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
404 
+		    	$dataFound = true;
405 
+		    }
336 406 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
337 407 
 		}
338 408 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
 
@@ -346,15 +416,21 @@  discard block
 
 block discarded – undo
346 416 
 		}
347 417
348 418 
 		if (isset($line['heading']) && $line['heading'] != '') {
349 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
419 
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
420 
+		    	$this->all_tracked[$id]['putinarchive'] = true;
421 
+		    }
350 422 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
351 423 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
352 424 
 		    //$dataFound = true;
353 425 
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
354 426 
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
355 427 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
356 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
357 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
428 
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
429 
+		    	$this->all_tracked[$id]['putinarchive'] = true;
430 
+		    }
431 
+  		    if ($globalDebug) {
432 
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
433 
+  		    }
358 434 
   		}
359 435 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
360 436 
 
@@ -366,23 +442,38 @@  discard block
 
 block discarded – undo
366 442 
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
367 443 
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
368 444 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
369 
-				    if ($globalDebug) echo "Check if vessel is already in DB...";
445 
+				    if ($globalDebug) {
446 
+				    	echo "Check if vessel is already in DB...";
447 
+				    }
370 448 
 				    $timeelapsed = microtime(true);
371 449 
 				    $MarineLive = new MarineLive($this->db);
372 450 
 				    if (isset($line['id'])) {
373 451 
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
374 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
452 
+					if ($globalDebugTimeElapsed) {
453 
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
454 
+					}
375 455 
 				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
376 456 
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
377 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
457 
+					if ($globalDebugTimeElapsed) {
458 
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
459 
+					}
378 460 
 				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
379 461 
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
380 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
381 
-				    } else $recent_ident = '';
462 
+					if ($globalDebugTimeElapsed) {
463 
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
464 
+					}
465 
+				    } else {
466 
+				    	$recent_ident = '';
467 
+				    }
382 468 
 				    $MarineLive->db=null;
383 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
384 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
385 
-				} else $recent_ident = '';
469 
+				    if ($globalDebug && $recent_ident == '') {
470 
+				    	echo " Not in DB.\n";
471 
+				    } elseif ($globalDebug && $recent_ident != '') {
472 
+				    	echo " Already in DB.\n";
473 
+				    }
474 
+				} else {
475 
+					$recent_ident = '';
476 
+				}
386 477 
 			    } else {
387 478 
 				$recent_ident = '';
388 479 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
 
@@ -390,30 +481,44 @@  discard block
 
 block discarded – undo
390 481 
 			    //if there was no vessel with the same callsign within the last hour and go post it into the archive
391 482 
 			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
392 483 
 			    {
393 
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
484 
+				if ($globalDebug) {
485 
+					echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
486 
+				}
394 487 
 				//adds the spotter data for the archive
395 488 
 				    $highlight = '';
396 
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
489 
+				    if (!isset($this->all_tracked[$id]['id'])) {
490 
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
491 
+				    }
397 492 
 				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
398 493 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
399 494 
 					    $timeelapsed = microtime(true);
400 495 
 					    $Marine = new Marine($this->db);
401 496 
 					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
402 497 
 					    $Marine->db = null;
403 
-					    if ($globalDebug && isset($result)) echo $result."\n";
404 
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
498 
+					    if ($globalDebug && isset($result)) {
499 
+					    	echo $result."\n";
500 
+					    }
501 
+					    if ($globalDebugTimeElapsed) {
502 
+					    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
503 
+					    }
405 504 
 					}
406 505 
 				    }
407 506 
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
408 507 
 					// Add source stat in DB
409 508 
 					$Stats = new Stats($this->db);
410 509 
 					if (!empty($this->stats)) {
411 
-					    if ($globalDebug) echo 'Add source stats : ';
510 
+					    if ($globalDebug) {
511 
+					    	echo 'Add source stats : ';
512 
+					    }
412 513 
 				    	    foreach($this->stats as $date => $data) {
413 514 
 						foreach($data as $source => $sourced) {
414 515 
 					    	    //print_r($sourced);
415 
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
416 
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
516 
+				    	    	    if (isset($sourced['polar'])) {
517 
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
518 
+				    	    	    }
519 
+				    	    	    if (isset($sourced['hist'])) {
520 
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
521 
+				    	    	    }
417 522 
 				    		    if (isset($sourced['msg'])) {
418 523 
 				    			if (time() - $sourced['msg']['date'] > 10) {
419 524 
 				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
 
@@ -426,7 +531,9 @@  discard block
 
 block discarded – undo
426 531 
 			    			    unset($this->stats[$date]);
427 532 
 			    			}
428 533 
 				    	    }
429 
-				    	    if ($globalDebug) echo 'Done'."\n";
534 
+				    	    if ($globalDebug) {
535 
+				    	    	echo 'Done'."\n";
536 
+				    	    }
430 537 
 					}
431 538 
 					$Stats->db = null;
432 539 
 				    }
 
@@ -436,13 +543,17 @@  discard block
 
 block discarded – undo
436 543 
 				$this->all_tracked[$id]['addedMarine'] = 1;
437 544 
 				//print_r($this->all_tracked[$id]);
438 545 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
439 
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
546 
+				    if ($globalDebug) {
547 
+				    	echo "---- Deleting Live Marine data older than 9 hours...";
548 
+				    }
440 549 
 				    //MarineLive->deleteLiveMarineDataNotUpdated();
441 550 
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
442 551 
 					$MarineLive = new MarineLive($this->db);
443 552 
 					$MarineLive->deleteLiveMarineData();
444 553 
 					$MarineLive->db=null;
445 
-					if ($globalDebug) echo " Done\n";
554 
+					if ($globalDebug) {
555 
+						echo " Done\n";
556 
+					}
446 557 
 				    }
447 558 
 				    $this->last_delete = time();
448 559 
 				}
 
@@ -468,15 +579,21 @@  discard block
 
 block discarded – undo
468 579
469 580 
 		    if (!$ignoreImport) {
470 581 
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
471 
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
582 
+				if ($globalDebug) {
583 
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
584 
+				}
472 585 
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
473 586 
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
474 587 
 					$timeelapsed = microtime(true);
475 588 
 					$MarineLive = new MarineLive($this->db);
476 589 
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
477 590 
 					$MarineLive->db = null;
478 
-					if ($globalDebug) echo $result."\n";
479 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
591 
+					if ($globalDebug) {
592 
+						echo $result."\n";
593 
+					}
594 
+					if ($globalDebugTimeElapsed) {
595 
+						echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
596 
+					}
480 597 
 				    }
481 598 
 				}
482 599 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
 
@@ -488,7 +605,9 @@  discard block
 
 block discarded – undo
488 605
489 606 
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
490 607 
 					$source = $this->all_tracked[$id]['source_name'];
491 
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
608 
+					if ($source == '') {
609 
+						$source = $this->all_tracked[$id]['format_source'];
610 
+					}
492 611 
 					if (!isset($this->source_location[$source])) {
493 612 
 						$Location = new Source($this->db);
494 613 
 						$coord = $Location->getLocationInfobySourceName($source);
 
@@ -509,7 +628,9 @@  discard block
 
 block discarded – undo
509 628 
 					$stats_heading = round($stats_heading/22.5);
510 629 
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
511 630 
 					$current_date = date('Y-m-d');
512 
-					if ($stats_heading == 16) $stats_heading = 0;
631 
+					if ($stats_heading == 16) {
632 
+						$stats_heading = 0;
633 
+					}
513 634 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
514 635 
 						for ($i=0;$i<=15;$i++) {
515 636 
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 
@@ -527,7 +648,9 @@  discard block
 
 block discarded – undo
527 648 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
528 649 
 						    end($this->stats[$current_date][$source]['hist']);
529 650 
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
530 
-						} else $mini = 0;
651 
+						} else {
652 
+							$mini = 0;
653 
+						}
531 654 
 						for ($i=$mini;$i<=$distance;$i+=10) {
532 655 
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
533 656 
 						}
 
@@ -539,19 +662,27 @@  discard block
 
 block discarded – undo
539 662
540 663
541 664 
 				$this->all_tracked[$id]['lastupdate'] = time();
542 
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
543 
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
665 
+				if ($this->all_tracked[$id]['putinarchive']) {
666 
+					$send = true;
667 
+				}
668 
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
669 
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
670 
+			}
544 671 
 			//$this->del();
545 672
546 673
547 674 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
548 675 
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
549 
-				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
676 
+				if ($globalDebug) {
677 
+					echo "---- Deleting Live Marine data Not updated since 2 hour...";
678 
+				}
550 679 
 				$MarineLive = new MarineLive($this->db);
551 680 
 				$MarineLive->deleteLiveMarineDataNotUpdated();
552 681 
 				$MarineLive->db = null;
553 682 
 				//MarineLive->deleteLiveMarineData();
554 
-				if ($globalDebug) echo " Done\n";
683 
+				if ($globalDebug) {
684 
+					echo " Done\n";
685 
+				}
555 686 
 			    }
556 687 
 			    $this->last_delete_hourly = time();
557 688 
 			}
 
@@ -560,7 +691,9 @@  discard block
 
 block discarded – undo
560 691 
 		    //$ignoreImport = false;
561 692 
 		}
562 693 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
563 
-		if ($send) return $this->all_tracked[$id];
694 
+		if ($send) {
695 
+			return $this->all_tracked[$id];
696 
+		}
564 697 
 	    }
565 698 
 	}
566 699 
     }
Please login to merge, or discard this patch.
statistics.php 1 patch
Braces   +169 added lines, -80 removed lines patch added patch discarded remove patch 
@@ -22,11 +22,15 @@  discard block
 
 block discarded – undo
22 22 
 	require_once('require/class.Spotter.php');
23 23 
 }
24 24
25 
-if (!isset($filter_name)) $filter_name = '';
25 
+if (!isset($filter_name)) {
26 
+	$filter_name = '';
27 
+}
26 28 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
27 29 
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
28 
-	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
29 
-}
30 
+	if (isset($globalFilter['airline'])) {
31 
+		$airline_icao = $globalFilter['airline'][0];
32 
+	}
33 
+	}
30 34 
 if ($type == 'aircraft' && $airline_icao != '' && $airline_icao != 'all') {
31 35 
 	$Spotter = new Spotter();
32 36 
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
 
@@ -61,7 +65,12 @@  discard block
 
 block discarded – undo
61 65 
 <script type="text/javascript" src="<?php echo $globalURL; ?>/js/datamaps.world.min.js"></script>
62 66 
 <div class="column">
63 67 
     <div class="info">
64 
-            <h1><?php if (isset($airline_name)) echo _("Statistics for ").$airline_name; else echo _("Statistics"); ?></h1>
68 
+            <h1><?php if (isset($airline_name)) {
69 
+	echo _("Statistics for ").$airline_name;
70 
+} else {
71 
+	echo _("Statistics");
72 
+}
73 
+?></h1>
65 74 
 <?php
66 75 
 if ($type == 'aircraft') {
67 76 
 	$last_update = $Stats->getLastStatsUpdate();
 
@@ -73,7 +82,9 @@  discard block
 
 block discarded – undo
73 82 
 if (isset($last_update[0]['value'])) {
74 83 
 	date_default_timezone_set('UTC');
75 84 
 	$lastupdate = strtotime($last_update[0]['value']);
76 
-	if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
85 
+	if (isset($globalTimezone) && $globalTimezone != '') {
86 
+		date_default_timezone_set($globalTimezone);
87 
+	}
77 88 
 	print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
78 89 
 }
79 90 
 
@@ -158,8 +169,11 @@  discard block
 
 block discarded – undo
158 169 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
159 170 
 		$aircraft_data = '';
160 171 
 		foreach($aircraft_array as $aircraft_item) {
161 
-			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
162 
-			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
172 
+			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') {
173 
+				$aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
174 
+			} else {
175 
+				$aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
176 
+			}
163 177 
 		}
164 178 
 		$aircraft_data = substr($aircraft_data, 0, -1);
165 179 
 		print 'var series = ['.$aircraft_data.'];';
 
@@ -176,11 +190,17 @@  discard block
 
 block discarded – undo
176 190 
 <?php
177 191 
 	if ($year != '' && $month != '') {
178 192 
 ?>
179 
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
193 
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
194 
+	echo '/'.$airline_icao;
195 
+}
196 
+?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
180 197 
 <?php
181 198 
 	} else {
182 199 
 ?>
183 
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
200 
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
201 
+	echo '/'.$airline_icao;
202 
+}
203 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
184 204 
 <?php
185 205 
 	}
186 206 
 ?>
 
@@ -209,11 +229,15 @@  discard block
 
 block discarded – undo
209 229 
 			print '</script>';
210 230 
 			if ($year != '' && $month != '') {
211 231 
 				print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
212 
-				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
232 
+				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
233 
+					echo '/'.$airline_icao;
234 
+				}
213 235 
 				print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
214 236 
 			} else {
215 237 
 				print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
216 
-				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
238 
+				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
239 
+					echo '/'.$airline_icao;
240 
+				}
217 241 
 				print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
218 242 
 			}
219 243 
 			print '</div>';
 
@@ -233,8 +257,9 @@  discard block
 
 block discarded – undo
233 257 
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
234 258 
 <?php
235 259 
 	$marine_array = $Stats->countAllMarineTypes(true,$filter_name,$year,$month);
236 
-	if (count($marine_array) == 0) print _("No data available");
237 
-	else {
260 
+	if (count($marine_array) == 0) {
261 
+		print _("No data available");
262 
+	} else {
238 263 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
239 264 
 		$marine_data = '';
240 265 
 		foreach($marine_array as $marine_item) {
 
@@ -277,8 +302,9 @@  discard block
 
 block discarded – undo
277 302 
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
278 303 
 <?php
279 304 
 	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
280 
-	if (count($tracker_array) == 0) print _("No data available");
281 
-	else {
305 
+	if (count($tracker_array) == 0) {
306 
+		print _("No data available");
307 
+	} else {
282 308 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
283 309 
 		$tracker_data = '';
284 310 
 		foreach($tracker_array as $tracker_item) {
 
@@ -322,8 +348,9 @@  discard block
 
 block discarded – undo
322 348 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
323 349 
 <?php
324 350 
 		$owner_array = $Satellite->countAllOwners(true);
325 
-		if (count($owner_array) == 0) print _("No data available");
326 
-		else {
351 
+		if (count($owner_array) == 0) {
352 
+			print _("No data available");
353 
+		} else {
327 354 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
328 355 
 			$owner_data = '';
329 356 
 			foreach($owner_array as $owner_item) {
 
@@ -342,7 +369,10 @@  discard block
 
 block discarded – undo
342 369 
 ?>
343 370 
                <!--
344 371 
                 <div class="more">
345 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
372 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
373 
+	echo '/'.$airline_icao;
374 
+}
375 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
346 376 
                 </div>
347 377 
                 -->
348 378 
             </div>
 
@@ -351,8 +381,9 @@  discard block
 
 block discarded – undo
351 381 
                 <h2><?php echo _("Top 10 Most Common Countries Owners"); ?></h2>
352 382 
 <?php
353 383 
 		$countries_array = $Satellite->countAllCountriesOwners(true);
354 
-		if (count($countries_array) == 0) print _("No data available");
355 
-		else {
384 
+		if (count($countries_array) == 0) {
385 
+			print _("No data available");
386 
+		} else {
356 387 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
357 388 
 			$owner_data = '';
358 389 
 			foreach($countries_array as $owner_item) {
 
@@ -371,7 +402,10 @@  discard block
 
 block discarded – undo
371 402 
 ?>
372 403 
 	    <!--
373 404 
                 <div class="more">
374 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
405 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
406 
+	echo '/'.$airline_icao;
407 
+}
408 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
375 409 
                 </div>
376 410 
                 -->
377 411 
             </div>
 
@@ -383,8 +417,9 @@  discard block
 
 block discarded – undo
383 417 
                 <h2><?php echo _("Top 10 Most Common Launch Sites"); ?></h2>
384 418 
 <?php
385 419 
 		$launch_site_array = $Satellite->countAllLaunchSite(true);
386 
-		if (count($launch_site_array) == 0) print _("No data available");
387 
-		else {
420 
+		if (count($launch_site_array) == 0) {
421 
+			print _("No data available");
422 
+		} else {
388 423 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
389 424 
 			$launch_site_data = '';
390 425 
 			foreach($launch_site_array as $launch_site_item) {
 
@@ -403,7 +438,10 @@  discard block
 
 block discarded – undo
403 438 
 ?>
404 439 
                <!--
405 440 
                 <div class="more">
406 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
441 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
442 
+	echo '/'.$airline_icao;
443 
+}
444 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
407 445 
                 </div>
408 446 
                 -->
409 447 
             </div>
 
@@ -426,8 +464,9 @@  discard block
 
 block discarded – undo
426 464 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
427 465 
 <?php
428 466 
 		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
429 
-		if (count($pilot_array) == 0) print _("No data available");
430 
-		else {
467 
+		if (count($pilot_array) == 0) {
468 
+			print _("No data available");
469 
+		} else {
431 470 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
432 471 
 			$pilot_data = '';
433 472 
 			foreach($pilot_array as $pilot_item) {
 
@@ -445,7 +484,9 @@  discard block
 
 block discarded – undo
445 484 
 		}
446 485 
 		print '<div class="more">';
447 486 
 		print '<a href="'.$globalURL.'/statistics/pilot';
448 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
487 
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
488 
+			echo '/'.$airline_icao;
489 
+		}
449 490 
 		print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
450 491 
 		print '</div>';
451 492 
 ?>
 
@@ -461,8 +502,9 @@  discard block
 
 block discarded – undo
461 502 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
462 503 
 <?php
463 504 
 		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
464 
-		if (count($owner_array) == 0) print _("No data available");
465 
-		else {
505 
+		if (count($owner_array) == 0) {
506 
+			print _("No data available");
507 
+		} else {
466 508 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
467 509 
 			$owner_data = '';
468 510 
 			foreach($owner_array as $owner_item) {
 
@@ -480,7 +522,10 @@  discard block
 
 block discarded – undo
480 522 
 		}
481 523 
 ?>
482 524 
                 <div class="more">
483 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
525 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
526 
+	echo '/'.$airline_icao;
527 
+}
528 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
484 529 
                 </div>
485 530 
             </div>
486 531 
         
@@ -493,8 +538,9 @@  discard block
 
 block discarded – undo
493 538 
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
494 539 
 <?php
495 540 
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
496 
-		if (count($flightover_array) == 0) print _("No data available");
497 
-		else {
541 
+		if (count($flightover_array) == 0) {
542 
+			print _("No data available");
543 
+		} else {
498 544 
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
499 545 
 			print 'var series = [';
500 546 
 			$flightover_data = '';
 
@@ -536,7 +582,10 @@  discard block
 
 block discarded – undo
536 582 
 		}
537 583 
 ?>
538 584 
                 <div class="more">
539 
-                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
585 
+                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
586 
+	echo '/'.$airline_icao;
587 
+}
588 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
540 589 
                 </div>
541 590 
             </div>
542 591 
 <?php
 
@@ -554,8 +603,9 @@  discard block
 
 block discarded – undo
554 603 
 	<div class="col-md-6">
555 604 
             <h2><?php echo _("Top 20 Most Common Country a Vessel was inside"); ?></h2>
556 605 
 <?php
557 
-	if (count($flightover_array) == 0) print _("No data available");
558 
-	else {
606 
+	if (count($flightover_array) == 0) {
607 
+		print _("No data available");
608 
+	} else {
559 609 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
560 610 
 		print 'var series = [';
561 611 
 		$flightover_data = '';
 
@@ -612,8 +662,9 @@  discard block
 
 block discarded – undo
612 662 
 	<div class="col-md-6">
613 663 
             <h2><?php echo _("Top 20 Most Common Country a Tracker was inside"); ?></h2>
614 664 
 <?php
615 
-	if (count($flightover_array) == 0) print _("No data available");
616 
-	else {
665 
+	if (count($flightover_array) == 0) {
666 
+		print _("No data available");
667 
+	} else {
617 668 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
618 669 
 		print 'var series = [';
619 670 
 		$flightover_data = '';
 
@@ -719,7 +770,9 @@  discard block
 
 block discarded – undo
719 770 
 		});";
720 771 
 		print '</script>';
721 772 
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure';
722 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
773 
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
774 
+			echo '/'.$airline_icao;
775 
+		}
723 776 
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
724 777 
 	}
725 778 
 ?>
 
@@ -783,7 +836,9 @@  discard block
 
 block discarded – undo
783 836 
 		});";
784 837 
 		print '</script>';
785 838 
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
786 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
839 
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
840 
+			echo '/'.$airline_icao;
841 
+		}
787 842 
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
788 843 
 	}
789 844 
 ?>
 
@@ -802,8 +857,9 @@  discard block
 
 block discarded – undo
802 857 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
803 858 
 <?php
804 859 
 		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
805 
-		if (count($year_array) == 0) print _("No data available");
806 
-		else {
860 
+		if (count($year_array) == 0) {
861 
+			print _("No data available");
862 
+		} else {
807 863 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
808 864 
 			$year_data = '';
809 865 
 			$year_cnt = '';
 
@@ -822,7 +878,10 @@  discard block
 
 block discarded – undo
822 878 
 		}
823 879 
 ?>
824 880 
                 <div class="more">
825 
-                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
881 
+                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
882 
+	echo '/'.$airline_icao;
883 
+}
884 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
826 885 
                 </div>
827 886 
             </div>
828 887 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -830,8 +889,9 @@  discard block
 
 block discarded – undo
830 889 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
831 890 
 <?php
832 891 
 		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
833 
-		if (count($month_array) == 0) print _("No data available");
834 
-		else {
892 
+		if (count($month_array) == 0) {
893 
+			print _("No data available");
894 
+		} else {
835 895 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
836 896 
 			$month_data = '';
837 897 
 			$month_cnt = '';
 
@@ -850,7 +910,10 @@  discard block
 
 block discarded – undo
850 910 
 		}
851 911 
 ?>
852 912 
                 <div class="more">
853 
-                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
913 
+                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
914 
+	echo '/'.$airline_icao;
915 
+}
916 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
854 917 
                 </div>
855 918 
             </div>
856 919 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -859,8 +922,9 @@  discard block
 
 block discarded – undo
859 922 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
860 923 
 <?php
861 924 
 		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
862 
-		if (empty($date_array)) print _("No data available");
863 
-		else {
925 
+		if (empty($date_array)) {
926 
+			print _("No data available");
927 
+		} else {
864 928 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
865 929 
 			$date_data = '';
866 930 
 			$date_cnt = '';
 
@@ -879,7 +943,10 @@  discard block
 
 block discarded – undo
879 943 
 		}
880 944 
 ?>
881 945 
                 <div class="more">
882 
-                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
946 
+                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
947 
+	echo '/'.$airline_icao;
948 
+}
949 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
883 950 
                 </div>
884 951 
             </div>
885 952 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -887,8 +954,9 @@  discard block
 
 block discarded – undo
887 954 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
888 955 
 <?php
889 956 
 		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
890 
-		if (empty($hour_array)) print _("No data available");
891 
-		else {
957 
+		if (empty($hour_array)) {
958 
+			print _("No data available");
959 
+		} else {
892 960 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
893 961 
 			$hour_data = '';
894 962 
 			$hour_cnt = '';
 
@@ -907,7 +975,10 @@  discard block
 
 block discarded – undo
907 975 
 		}
908 976 
 ?>
909 977 
                 <div class="more">
910 
-                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
978 
+                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
979 
+	echo '/'.$airline_icao;
980 
+}
981 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
911 982 
                 </div>
912 983 
             </div>
913 984 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -927,8 +998,9 @@  discard block
 
 block discarded – undo
927 998 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
928 999 
 <?php
929 1000 
 		$year_array = $Stats->countAllMarineMonthsLastYear(true,$filter_name);
930 
-		if (count($year_array) == 0) print _("No data available");
931 
-		else {
1001 
+		if (count($year_array) == 0) {
1002 
+			print _("No data available");
1003 
+		} else {
932 1004 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
933 1005 
 			$year_data = '';
934 1006 
 			$year_cnt = '';
 
@@ -956,8 +1028,9 @@  discard block
 
 block discarded – undo
956 1028 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
957 1029 
 <?php
958 1030 
 		$month_array = $Stats->countAllMarineDatesLastMonth($filter_name);
959 
-		if (count($month_array) == 0) print _("No data available");
960 
-		else {
1031 
+		if (count($month_array) == 0) {
1032 
+			print _("No data available");
1033 
+		} else {
961 1034 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
962 1035 
 			$month_data = '';
963 1036 
 			$month_cnt = '';
 
@@ -985,8 +1058,9 @@  discard block
 
 block discarded – undo
985 1058 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
986 1059 
 <?php
987 1060 
 		$date_array = $Stats->countAllMarineDatesLast7Days($filter_name);
988 
-		if (empty($date_array)) print _("No data available");
989 
-		else {
1061 
+		if (empty($date_array)) {
1062 
+			print _("No data available");
1063 
+		} else {
990 1064 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
991 1065 
 			$date_data = '';
992 1066 
 			$date_cnt = '';
 
@@ -1013,8 +1087,9 @@  discard block
 
 block discarded – undo
1013 1087 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1014 1088 
 <?php
1015 1089 
 		$hour_array = $Stats->countAllMarineHours('hour',true,$filter_name);
1016 
-		if (empty($hour_array)) print _("No data available");
1017 
-		else {
1090 
+		if (empty($hour_array)) {
1091 
+			print _("No data available");
1092 
+		} else {
1018 1093 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
1019 1094 
 			$hour_data = '';
1020 1095 
 			$hour_cnt = '';
 
@@ -1053,8 +1128,9 @@  discard block
 
 block discarded – undo
1053 1128 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
1054 1129 
 <?php
1055 1130 
 		$year_array = $Stats->countAllTrackerMonthsLastYear(true);
1056 
-		if (count($year_array) == 0) print _("No data available");
1057 
-		else {
1131 
+		if (count($year_array) == 0) {
1132 
+			print _("No data available");
1133 
+		} else {
1058 1134 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
1059 1135 
 			$year_data = '';
1060 1136 
 			$year_cnt = '';
 
@@ -1082,8 +1158,9 @@  discard block
 
 block discarded – undo
1082 1158 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
1083 1159 
 <?php
1084 1160 
 		$month_array = $Stats->countAllTrackerDatesLastMonth();
1085 
-		if (count($month_array) == 0) print _("No data available");
1086 
-		else {
1161 
+		if (count($month_array) == 0) {
1162 
+			print _("No data available");
1163 
+		} else {
1087 1164 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
1088 1165 
 			$month_data = '';
1089 1166 
 			$month_cnt = '';
 
@@ -1111,8 +1188,9 @@  discard block
 
 block discarded – undo
1111 1188 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
1112 1189 
 <?php
1113 1190 
 		$date_array = $Stats->countAllTrackerDatesLast7Days();
1114 
-		if (empty($date_array)) print _("No data available");
1115 
-		else {
1191 
+		if (empty($date_array)) {
1192 
+			print _("No data available");
1193 
+		} else {
1116 1194 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
1117 1195 
 			$date_data = '';
1118 1196 
 			$date_cnt = '';
 
@@ -1139,8 +1217,9 @@  discard block
 
 block discarded – undo
1139 1217 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1140 1218 
 <?php
1141 1219 
 		$hour_array = $Stats->countAllTrackerHours('hour',true);
1142 
-		if (empty($hour_array)) print _("No data available");
1143 
-		else {
1220 
+		if (empty($hour_array)) {
1221 
+			print _("No data available");
1222 
+		} else {
1144 1223 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
1145 1224 
 			$hour_data = '';
1146 1225 
 			$hour_cnt = '';
 
@@ -1179,8 +1258,9 @@  discard block
 
 block discarded – undo
1179 1258 
                 <h2><?php echo _("Busiest Launch Months of the last 12 Months"); ?></h2>
1180 1259 
 <?php
1181 1260 
 		$year_array = $Satellite->countAllMonthsLastYear();
1182 
-		if (count($year_array) == 0) print _("No data available");
1183 
-		else {
1261 
+		if (count($year_array) == 0) {
1262 
+			print _("No data available");
1263 
+		} else {
1184 1264 
 			print '<div id="chart21" class="chart" width="100%"></div><script>';
1185 1265 
 			$year_data = '';
1186 1266 
 			$year_cnt = '';
 
@@ -1210,8 +1290,9 @@  discard block
 
 block discarded – undo
1210 1290 
                 <h2><?php echo _("Busiest Launch Years of the last 10 Years"); ?></h2>
1211 1291 
 <?php
1212 1292 
 		$year_array = $Satellite->countAllYears();
1213 
-		if (count($year_array) == 0) print _("No data available");
1214 
-		else {
1293 
+		if (count($year_array) == 0) {
1294 
+			print _("No data available");
1295 
+		} else {
1215 1296 
 			print '<div id="chart22" class="chart" width="100%"></div><script>';
1216 1297 
 			$year_data = '';
1217 1298 
 			$year_cnt = '';
 
@@ -1253,8 +1334,9 @@  discard block
 
 block discarded – undo
1253 1334 
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
1254 1335 
 <?php
1255 1336 
 		$year_array = $Stats->countFatalitiesByYear();
1256 
-		if (count($year_array) == 0) print _("No data available");
1257 
-		else {
1337 
+		if (count($year_array) == 0) {
1338 
+			print _("No data available");
1339 
+		} else {
1258 1340 
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
1259 1341 
 			$year_data = '';
1260 1342 
 			$year_cnt = '';
 
@@ -1283,8 +1365,9 @@  discard block
 
 block discarded – undo
1283 1365 
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
1284 1366 
 <?php
1285 1367 
 		$year_array = $Stats->countFatalitiesLast12Months();
1286 
-		if (count($year_array) == 0) print _("No data available");
1287 
-		else {
1368 
+		if (count($year_array) == 0) {
1369 
+			print _("No data available");
1370 
+		} else {
1288 1371 
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
1289 1372 
 			$year_data = '';
1290 1373 
 			$year_cnt = '';
 
@@ -1355,8 +1438,11 @@  discard block
 
 block discarded – undo
1355 1438 
 					$distance = $distance;
1356 1439 
 					$unit = 'km';
1357 1440 
 				}
1358 
-				if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1359 
-				else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1441 
+				if (!isset($polar_data)) {
1442 
+					$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1443 
+				} else {
1444 
+					$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1445 
+				}
1360 1446 
 			}
1361 1447 
 ?>
1362 1448 
             <div class="col-md-6">
 
@@ -1420,9 +1506,12 @@  discard block
 
 block discarded – undo
1420 1506 
 		foreach ($msg as $eachmsg) {
1421 1507 
 			//$eachmsg = $msg[0];
1422 1508 
 			$data = $eachmsg['source_data'];
1423 
-			if ($data > 500) $max = (round(($data+100)/100))*100;
1424 
-			else $max = 500;
1425 
-?>
1509 
+			if ($data > 500) {
1510 
+				$max = (round(($data+100)/100))*100;
1511 
+			} else {
1512 
+				$max = 500;
1513 
+			}
1514 
+			?>
1426 1515 
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
1427 1516 
         	<script>
1428 1517 
 		      var g = new JustGage({
Please login to merge, or discard this patch.
require/libs/SimplePie.compiled.php 1 patch
Braces   +661 added lines, -1229 removed lines patch added patch discarded remove patch 
@@ -765,8 +765,7 @@  discard block
 
 block discarded – undo
765 765 
 			{
766 766 
 				$this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
767 767 
 			}
768 
-		}
769 
-		else
768 
+		} else
770 769 
 		{
771 770 
 			$this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
772 771 
 			$this->permanent_url = $this->feed_url;
 
@@ -931,8 +930,7 @@  discard block
 
 block discarded – undo
931 930 
 		if ($encoding)
932 931 
 		{
933 932 
 			$this->input_encoding = (string) $encoding;
934 
-		}
935 
-		else
933 
+		} else
936 934 
 		{
937 935 
 			$this->input_encoding = false;
938 936 
 		}
 
@@ -1259,8 +1257,7 @@  discard block
 
 block discarded – undo
1259 1257 
 		if ($page !== false)
1260 1258 
 		{
1261 1259 
 			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
1262 
-		}
1263 
-		else
1260 
+		} else
1264 1261 
 		{
1265 1262 
 			$this->image_handler = '';
1266 1263 
 		}
 
@@ -1354,8 +1351,7 @@  discard block
 
 block discarded – undo
1354 1351 
 				$i++;
1355 1352 
 			}
1356 1353 
 			return (bool) $success;
1357 
-		}
1358 
-		elseif ($this->feed_url === null && $this->raw_data === null)
1354 
+		} elseif ($this->feed_url === null && $this->raw_data === null)
1359 1355 
 		{
1360 1356 
 			return false;
1361 1357 
 		}
 
@@ -1380,8 +1376,7 @@  discard block
 
 block discarded – undo
1380 1376 
 			if (($fetched = $this->fetch_data($cache)) === true)
1381 1377 
 			{
1382 1378 
 				return true;
1383 
-			}
1384 
-			elseif ($fetched === false) {
1379 
+			} elseif ($fetched === false) {
1385 1380 
 				return false;
1386 1381 
 			}
1387 1382 
 
@@ -1418,8 +1413,7 @@  discard block
 
 block discarded – undo
1418 1413 
 				}
1419 1414 
 				$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
1420 1415 
 				$encodings[] = 'UTF-8';
1421 
-			}
1422 
-			elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
1416 
+			} elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
1423 1417 
 			{
1424 1418 
 				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
1425 1419 
 				{
 
@@ -1483,8 +1477,7 @@  discard block
 
 block discarded – undo
1483 1477 
 			// We have an error, just set SimplePie_Misc::error to it and quit
1484 1478 
 			$this->error = $this->feed_url;
1485 1479 
 			$this->error .= sprintf(' is invalid XML, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
1486 
-		}
1487 
-		else
1480 
+		} else
1488 1481 
 		{
1489 1482 
 			$this->error = 'The data could not be converted to UTF-8.';
1490 1483 
 			if (!extension_loaded('mbstring') && !extension_loaded('iconv') && !class_exists('\UConverter')) {
 
@@ -1587,8 +1580,7 @@  discard block
 
 block discarded – undo
1587 1580 
 								$cache->touch();
1588 1581 
 								return true;
1589 1582 
 							}
1590 
-						}
1591 
-						else
1583 
+						} else
1592 1584 
 						{
1593 1585 
 							$this->check_modified = false;
1594 1586 
 							if($this->force_cache_fallback)
 
@@ -1621,8 +1613,7 @@  discard block
 
 block discarded – undo
1621 1613 
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
1622 1614 
 			{
1623 1615 
 				$file =& $this->file;
1624 
-			}
1625 
-			else
1616 
+			} else
1626 1617 
 			{
1627 1618 
 				$headers = array(
1628 1619 
 					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
 
@@ -1676,14 +1667,12 @@  discard block
 
 block discarded – undo
1676 1667 
 						if (isset($this->all_discovered_feeds)) {
1677 1668 
 							$this->all_discovered_feeds[] = $file;
1678 1669 
 						}
1679 
-					}
1680 
-					else
1670 
+					} else
1681 1671 
 					{
1682 1672 
 						if ($discovered)
1683 1673 
 						{
1684 1674 
 							$file = $discovered;
1685 
-						}
1686 
-						else
1675 
+						} else
1687 1676 
 						{
1688 1677 
 							// We need to unset this so that if SimplePie::set_file() has
1689 1678 
 							// been called that object is untouched
 
@@ -1693,8 +1682,7 @@  discard block
 
 block discarded – undo
1693 1682 
 							return false;
1694 1683 
 						}
1695 1684 
 					}
1696 
-				}
1697 
-				catch (SimplePie_Exception $e)
1685 
+				} catch (SimplePie_Exception $e)
1698 1686 
 				{
1699 1687 
 					// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
1700 1688 
 					unset($file);
 
@@ -1787,8 +1775,7 @@  discard block
 
 block discarded – undo
1787 1775 
 			if ($this->get_encoding())
1788 1776 
 			{
1789 1777 
 				$header .= ' charset=' . $this->get_encoding();
1790 
-			}
1791 
-			else
1778 
+			} else
1792 1779 
 			{
1793 1780 
 				$header .= ' charset=UTF-8';
1794 1781 
 			}
 
@@ -1830,12 +1817,10 @@  discard block
 
 block discarded – undo
1830 1817 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
1831 1818 
 			{
1832 1819 
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
1833 
-			}
1834 
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
1820 
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
1835 1821 
 			{
1836 1822 
 				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
1837 
-			}
1838 
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
1823 
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
1839 1824 
 			{
1840 1825 
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
1841 1826 
 				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
 
@@ -1851,8 +1836,7 @@  discard block
 
 block discarded – undo
1851 1836 
 				{
1852 1837 
 					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
1853 1838 
 				}
1854 
-			}
1855 
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
1839 
+			} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
1856 1840 
 			{
1857 1841 
 				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
1858 1842 
 				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
 
@@ -1893,8 +1877,7 @@  discard block
 
 block discarded – undo
1893 1877 
 							break;
1894 1878 
 					}
1895 1879 
 				}
1896 
-			}
1897 
-			else
1880 
+			} else
1898 1881 
 			{
1899 1882 
 				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
1900 1883 
 			}
 
@@ -1931,8 +1914,7 @@  discard block
 
 block discarded – undo
1931 1914 
 				                   $this->sanitize($this->permanent_url,
1932 1915 
 				                                   SIMPLEPIE_CONSTRUCT_IRI));
1933 1916 
 			}
1934 
-		}
1935 
-		else
1917 
+		} else
1936 1918 
 		{
1937 1919 
 			if ($this->feed_url !== null)
1938 1920 
 			{
 
@@ -2133,12 +2115,10 @@  discard block
 
 block discarded – undo
2133 2115 
 		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
2134 2116 
 		{
2135 2117 
 			return $element['xml_base'];
2136 
-		}
2137 
-		elseif ($this->get_link() !== null)
2118 
+		} elseif ($this->get_link() !== null)
2138 2119 
 		{
2139 2120 
 			return $this->get_link();
2140 
-		}
2141 
-		else
2121 
+		} else
2142 2122 
 		{
2143 2123 
 			return $this->subscribe_url();
2144 2124 
 		}
 
@@ -2159,8 +2139,7 @@  discard block
 
 block discarded – undo
2159 2139 
 		try
2160 2140 
 		{
2161 2141 
 			return $this->sanitize->sanitize($data, $type, $base);
2162 
-		}
2163 
-		catch (SimplePie_Exception $e)
2142 
+		} catch (SimplePie_Exception $e)
2164 2143 
 		{
2165 2144 
 			if (!$this->enable_exceptions)
2166 2145 
 			{
 
@@ -2186,32 +2165,25 @@  discard block
 
 block discarded – undo
2186 2165 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
2187 2166 
 		{
2188 2167 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
2189 
-		}
2190 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
2168 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
2191 2169 
 		{
2192 2170 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
2193 
-		}
2194 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
2171 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
2195 2172 
 		{
2196 2173 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
2197 
-		}
2198 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
2174 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
2199 2175 
 		{
2200 2176 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
2201 
-		}
2202 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
2177 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
2203 2178 
 		{
2204 2179 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
2205 
-		}
2206 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
2180 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
2207 2181 
 		{
2208 2182 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2209 
-		}
2210 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
2183 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
2211 2184 
 		{
2212 2185 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2213 
-		}
2214 
-		else
2186 
+		} else
2215 2187 
 		{
2216 2188 
 			return null;
2217 2189 
 		}
 
@@ -2230,8 +2202,7 @@  discard block
 
 block discarded – undo
2230 2202 
 		if (isset($categories[$key]))
2231 2203 
 		{
2232 2204 
 			return $categories[$key];
2233 
-		}
2234 
-		else
2205 
+		} else
2235 2206 
 		{
2236 2207 
 			return null;
2237 2208 
 		}
 
@@ -2276,8 +2247,7 @@  discard block
 
 block discarded – undo
2276 2247 
 			if (isset($category['attribs']['']['domain']))
2277 2248 
 			{
2278 2249 
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
2279 
-			}
2280 
-			else
2250 
+			} else
2281 2251 
 			{
2282 2252 
 				$scheme = null;
2283 2253 
 			}
 
@@ -2295,8 +2265,7 @@  discard block
 
 block discarded – undo
2295 2265 
 		if (!empty($categories))
2296 2266 
 		{
2297 2267 
 			return array_unique($categories);
2298 
-		}
2299 
-		else
2268 
+		} else
2300 2269 
 		{
2301 2270 
 			return null;
2302 2271 
 		}
 
@@ -2315,8 +2284,7 @@  discard block
 
 block discarded – undo
2315 2284 
 		if (isset($authors[$key]))
2316 2285 
 		{
2317 2286 
 			return $authors[$key];
2318 
-		}
2319 
-		else
2287 
+		} else
2320 2288 
 		{
2321 2289 
 			return null;
2322 2290 
 		}
 
@@ -2393,8 +2361,7 @@  discard block
 
 block discarded – undo
2393 2361 
 		if (!empty($authors))
2394 2362 
 		{
2395 2363 
 			return array_unique($authors);
2396 
-		}
2397 
-		else
2364 
+		} else
2398 2365 
 		{
2399 2366 
 			return null;
2400 2367 
 		}
 
@@ -2413,8 +2380,7 @@  discard block
 
 block discarded – undo
2413 2380 
 		if (isset($contributors[$key]))
2414 2381 
 		{
2415 2382 
 			return $contributors[$key];
2416 
-		}
2417 
-		else
2383 
+		} else
2418 2384 
 		{
2419 2385 
 			return null;
2420 2386 
 		}
 
@@ -2479,8 +2445,7 @@  discard block
 
 block discarded – undo
2479 2445 
 		if (!empty($contributors))
2480 2446 
 		{
2481 2447 
 			return array_unique($contributors);
2482 
-		}
2483 
-		else
2448 
+		} else
2484 2449 
 		{
2485 2450 
 			return null;
2486 2451 
 		}
 
@@ -2500,8 +2465,7 @@  discard block
 
 block discarded – undo
2500 2465 
 		if (isset($links[$key]))
2501 2466 
 		{
2502 2467 
 			return $links[$key];
2503 
-		}
2504 
-		else
2468 
+		} else
2505 2469 
 		{
2506 2470 
 			return null;
2507 2471 
 		}
 
@@ -2582,13 +2546,11 @@  discard block
 
 block discarded – undo
2582 2546 
 					{
2583 2547 
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
2584 2548 
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
2585 
-					}
2586 
-					else
2549 
+					} else
2587 2550 
 					{
2588 2551 
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
2589 2552 
 					}
2590 
-				}
2591 
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
2553 
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
2592 2554 
 				{
2593 2555 
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
2594 2556 
 				}
 
@@ -2601,12 +2563,10 @@  discard block
 
 block discarded – undo
2601 2563 
 		               $this->data['headers']['link'], $match))
2602 2564 
 		{
2603 2565 
 			return array($match[1]);
2604 
-		}
2605 
-		else if (isset($this->data['links'][$rel]))
2566 
+		} else if (isset($this->data['links'][$rel]))
2606 2567 
 		{
2607 2568 
 			return $this->data['links'][$rel];
2608 
-		}
2609 
-		else
2569 
+		} else
2610 2570 
 		{
2611 2571 
 			return null;
2612 2572 
 		}
 
@@ -2631,40 +2591,31 @@  discard block
 
 block discarded – undo
2631 2591 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
2632 2592 
 		{
2633 2593 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
2634 
-		}
2635 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
2594 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
2636 2595 
 		{
2637 2596 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
2638 
-		}
2639 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
2597 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
2640 2598 
 		{
2641 2599 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
2642 
-		}
2643 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
2600 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
2644 2601 
 		{
2645 2602 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
2646 
-		}
2647 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
2603 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
2648 2604 
 		{
2649 2605 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
2650 
-		}
2651 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
2606 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
2652 2607 
 		{
2653 2608 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2654 
-		}
2655 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
2609 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
2656 2610 
 		{
2657 2611 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2658 
-		}
2659 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
2612 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
2660 2613 
 		{
2661 2614 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
2662 
-		}
2663 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
2615 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
2664 2616 
 		{
2665 2617 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
2666 
-		}
2667 
-		else
2618 
+		} else
2668 2619 
 		{
2669 2620 
 			return null;
2670 2621 
 		}
 
@@ -2683,24 +2634,19 @@  discard block
 
 block discarded – undo
2683 2634 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
2684 2635 
 		{
2685 2636 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
2686 
-		}
2687 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
2637 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
2688 2638 
 		{
2689 2639 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
2690 
-		}
2691 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
2640 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
2692 2641 
 		{
2693 2642 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2694 
-		}
2695 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
2643 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
2696 2644 
 		{
2697 2645 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2698 
-		}
2699 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
2646 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
2700 2647 
 		{
2701 2648 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2702 
-		}
2703 
-		else
2649 
+		} else
2704 2650 
 		{
2705 2651 
 			return null;
2706 2652 
 		}
 
@@ -2719,32 +2665,25 @@  discard block
 
 block discarded – undo
2719 2665 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
2720 2666 
 		{
2721 2667 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2722 
-		}
2723 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
2668 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
2724 2669 
 		{
2725 2670 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2726 
-		}
2727 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
2671 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
2728 2672 
 		{
2729 2673 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2730 
-		}
2731 
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
2674 
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
2732 2675 
 		{
2733 2676 
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
2734 
-		}
2735 
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
2677 
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
2736 2678 
 		{
2737 2679 
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
2738 
-		}
2739 
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
2680 
+		} elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
2740 2681 
 		{
2741 2682 
 			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
2742 
-		}
2743 
-		elseif (isset($this->data['headers']['content-language']))
2683 
+		} elseif (isset($this->data['headers']['content-language']))
2744 2684 
 		{
2745 2685 
 			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
2746 
-		}
2747 
-		else
2686 
+		} else
2748 2687 
 		{
2749 2688 
 			return null;
2750 2689 
 		}
 
@@ -2768,12 +2707,10 @@  discard block
 
 block discarded – undo
2768 2707 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
2769 2708 
 		{
2770 2709 
 			return (float) $return[0]['data'];
2771 
-		}
2772 
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
2710 
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
2773 2711 
 		{
2774 2712 
 			return (float) $match[1];
2775 
-		}
2776 
-		else
2713 
+		} else
2777 2714 
 		{
2778 2715 
 			return null;
2779 2716 
 		}
 
@@ -2796,16 +2733,13 @@  discard block
 
 block discarded – undo
2796 2733 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
2797 2734 
 		{
2798 2735 
 			return (float) $return[0]['data'];
2799 
-		}
2800 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
2736 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
2801 2737 
 		{
2802 2738 
 			return (float) $return[0]['data'];
2803 
-		}
2804 
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
2739 
+		} elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
2805 2740 
 		{
2806 2741 
 			return (float) $match[2];
2807 
-		}
2808 
-		else
2742 
+		} else
2809 2743 
 		{
2810 2744 
 			return null;
2811 2745 
 		}
 
@@ -2825,24 +2759,19 @@  discard block
 
 block discarded – undo
2825 2759 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
2826 2760 
 		{
2827 2761 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2828 
-		}
2829 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
2762 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
2830 2763 
 		{
2831 2764 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2832 
-		}
2833 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
2765 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
2834 2766 
 		{
2835 2767 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2836 
-		}
2837 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
2768 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
2838 2769 
 		{
2839 2770 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2840 
-		}
2841 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
2771 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
2842 2772 
 		{
2843 2773 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
2844 
-		}
2845 
-		else
2774 
+		} else
2846 2775 
 		{
2847 2776 
 			return null;
2848 2777 
 		}
 
@@ -2864,28 +2793,22 @@  discard block
 
 block discarded – undo
2864 2793 
 		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
2865 2794 
 		{
2866 2795 
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
2867 
-		}
2868 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
2796 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
2869 2797 
 		{
2870 2798 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2871 
-		}
2872 
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
2799 
+		} elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
2873 2800 
 		{
2874 2801 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2875 
-		}
2876 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
2802 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
2877 2803 
 		{
2878 2804 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2879 
-		}
2880 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
2805 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
2881 2806 
 		{
2882 2807 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2883 
-		}
2884 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2808 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2885 2809 
 		{
2886 2810 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2887 
-		}
2888 
-		else
2811 
+		} else
2889 2812 
 		{
2890 2813 
 			return null;
2891 2814 
 		}
 
@@ -2907,16 +2830,13 @@  discard block
 
 block discarded – undo
2907 2830 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
2908 2831 
 		{
2909 2832 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2910 
-		}
2911 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
2833 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
2912 2834 
 		{
2913 2835 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2914 
-		}
2915 
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
2836 
+		} elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
2916 2837 
 		{
2917 2838 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
2918 
-		}
2919 
-		else
2839 
+		} else
2920 2840 
 		{
2921 2841 
 			return null;
2922 2842 
 		}
 
@@ -2937,12 +2857,10 @@  discard block
 
 block discarded – undo
2937 2857 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
2938 2858 
 		{
2939 2859 
 			return round($return[0]['data']);
2940 
-		}
2941 
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2860 
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2942 2861 
 		{
2943 2862 
 			return 88.0;
2944 
-		}
2945 
-		else
2863 
+		} else
2946 2864 
 		{
2947 2865 
 			return null;
2948 2866 
 		}
 
@@ -2963,12 +2881,10 @@  discard block
 
 block discarded – undo
2963 2881 
 		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
2964 2882 
 		{
2965 2883 
 			return round($return[0]['data']);
2966 
-		}
2967 
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2884 
+		} elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2968 2885 
 		{
2969 2886 
 			return 31.0;
2970 
-		}
2971 
-		else
2887 
+		} else
2972 2888 
 		{
2973 2889 
 			return null;
2974 2890 
 		}
 
@@ -2990,8 +2906,7 @@  discard block
 
 block discarded – undo
2990 2906 
 		if ($max === 0)
2991 2907 
 		{
2992 2908 
 			return $qty;
2993 
-		}
2994 
-		else
2909 
+		} else
2995 2910 
 		{
2996 2911 
 			return ($qty > $max) ? $max : $qty;
2997 2912 
 		}
 
@@ -3015,8 +2930,7 @@  discard block
 
 block discarded – undo
3015 2930 
 		if (isset($items[$key]))
3016 2931 
 		{
3017 2932 
 			return $items[$key];
3018 
-		}
3019 
-		else
2933 
+		} else
3020 2934 
 		{
3021 2935 
 			return null;
3022 2936 
 		}
 
@@ -3104,8 +3018,7 @@  discard block
 
 block discarded – undo
3104 3018 
 				usort($this->data['ordered_items'], array(get_class($this), 'sort_items'));
3105 3019 
 		 	}
3106 3020 
 			$items = $this->data['ordered_items'];
3107 
-		}
3108 
-		else
3021 
+		} else
3109 3022 
 		{
3110 3023 
 			$items = $this->data['items'];
3111 3024 
 		}
 
@@ -3113,8 +3026,7 @@  discard block
 
 block discarded – undo
3113 3026 
 		if ($end === 0)
3114 3027 
 		{
3115 3028 
 			return array_slice($items, $start);
3116 
-		}
3117 
-		else
3029 
+		} else
3118 3030 
 		{
3119 3031 
 			return array_slice($items, $start, $end);
3120 3032 
 		}
 
@@ -3227,8 +3139,7 @@  discard block
 
 block discarded – undo
3227 3139 
 				if ($arg instanceof SimplePie)
3228 3140 
 				{
3229 3141 
 					$items = array_merge($items, $arg->get_items(0, $limit));
3230 
-				}
3231 
-				else
3142 
+				} else
3232 3143 
 				{
3233 3144 
 					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
3234 3145 
 				}
 
@@ -3239,13 +3150,11 @@  discard block
 
 block discarded – undo
3239 3150 
 			if ($end === 0)
3240 3151 
 			{
3241 3152 
 				return array_slice($items, $start);
3242 
-			}
3243 
-			else
3153 
+			} else
3244 3154 
 			{
3245 3155 
 				return array_slice($items, $start, $end);
3246 3156 
 			}
3247 
-		}
3248 
-		else
3157 
+		} else
3249 3158 
 		{
3250 3159 
 			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
3251 3160 
 			return array();
 
@@ -3277,8 +3186,7 @@  discard block
 
 block discarded – undo
3277 3186 
 				{
3278 3187 
 					$file->headers['link'] = ', ';
3279 3188 
 				}
3280 
-			}
3281 
-			else
3189 
+			} else
3282 3190 
 			{
3283 3191 
 				$file->headers['link'] = '';
3284 3192 
 			}
 
@@ -3362,8 +3270,7 @@  discard block
 
 block discarded – undo
3362 3270 
 		if ($this->name !== null)
3363 3271 
 		{
3364 3272 
 			return $this->name;
3365 
-		}
3366 
-		else
3273 
+		} else
3367 3274 
 		{
3368 3275 
 			return null;
3369 3276 
 		}
 
@@ -3379,8 +3286,7 @@  discard block
 
 block discarded – undo
3379 3286 
 		if ($this->link !== null)
3380 3287 
 		{
3381 3288 
 			return $this->link;
3382 
-		}
3383 
-		else
3289 
+		} else
3384 3290 
 		{
3385 3291 
 			return null;
3386 3292 
 		}
 
@@ -3396,8 +3302,7 @@  discard block
 
 block discarded – undo
3396 3302 
 		if ($this->email !== null)
3397 3303 
 		{
3398 3304 
 			return $this->email;
3399 
-		}
3400 
-		else
3305 
+		} else
3401 3306 
 		{
3402 3307 
 			return null;
3403 3308 
 		}
 
@@ -3607,20 +3512,16 @@  discard block
 
 block discarded – undo
3607 3512 
 			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
3608 3513 
 			{
3609 3514 
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
3610 
-			}
3611 
-			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
3515 
+			} elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
3612 3516 
 			{
3613 3517 
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
3614 
-			}
3615 
-			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
3518 
+			} elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
3616 3519 
 			{
3617 3520 
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
3618 
-			}
3619 
-			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
3521 
+			} elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
3620 3522 
 			{
3621 3523 
 				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
3622 
-			}
3623 
-			else
3524 
+			} else
3624 3525 
 			{
3625 3526 
 				$channel = null;
3626 3527 
 			}
 
@@ -4109,8 +4010,7 @@  discard block
 
 block discarded – undo
4109 4010 
 		try
4110 4011 
 		{
4111 4012 
 			$this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
4112 
-		}
4113 
-		catch (PDOException $e)
4013 
+		} catch (PDOException $e)
4114 4014 
 		{
4115 4015 
 			$this->mysql = null;
4116 4016 
 			return;
 
@@ -4195,8 +4095,7 @@  discard block
 
 block discarded – undo
4195 4095 
 						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
4196 4096 
 						$query = $this->mysql->prepare($sql);
4197 4097 
 						$query->bindValue(':items', $items);
4198 
-					}
4199 
-					else
4098 
+					} else
4200 4099 
 					{
4201 4100 
 						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
4202 4101 
 						$query = $this->mysql->prepare($sql);
 
@@ -4209,8 +4108,7 @@  discard block
 
 block discarded – undo
4209 4108 
 					{
4210 4109 
 						return false;
4211 4110 
 					}
4212 
-				}
4213 
-				else
4111 
+				} else
4214 4112 
 				{
4215 4113 
 					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
4216 4114 
 					$query->bindValue(':feed', $this->id);
 
@@ -4263,14 +4161,12 @@  discard block
 
 block discarded – undo
4263 4161 
 						}
4264 4162 
 						return true;
4265 4163 
 					}
4266 
-				}
4267 
-				else
4164 
+				} else
4268 4165 
 				{
4269 4166 
 					return true;
4270 4167 
 				}
4271 4168 
 			}
4272 
-		}
4273 
-		else
4169 
+		} else
4274 4170 
 		{
4275 4171 
 			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
4276 4172 
 			$query->bindValue(':feed', $this->id);
 
@@ -4286,8 +4182,7 @@  discard block
 
 block discarded – undo
4286 4182 
 					{
4287 4183 
 						return true;
4288 4184 
 					}
4289 
-				}
4290 
-				else
4185 
+				} else
4291 4186 
 				{
4292 4187 
 					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
4293 4188 
 					$query->bindValue(':id', $this->id);
 
@@ -4324,8 +4219,7 @@  discard block
 
 block discarded – undo
4324 4219 
 			if (isset($this->options['items'][0]))
4325 4220 
 			{
4326 4221 
 				$items = (int) $this->options['items'][0];
4327 
-			}
4328 
-			else
4222 
+			} else
4329 4223 
 			{
4330 4224 
 				$items = (int) $row[0];
4331 4225 
 			}
 
@@ -4335,20 +4229,16 @@  discard block
 
 block discarded – undo
4335 4229 
 				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
4336 4230 
 				{
4337 4231 
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
4338 
-				}
4339 
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
4232 
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
4340 4233 
 				{
4341 4234 
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
4342 
-				}
4343 
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
4235 
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
4344 4236 
 				{
4345 4237 
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
4346 
-				}
4347 
-				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
4238 
+				} elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
4348 4239 
 				{
4349 4240 
 					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
4350 
-				}
4351 
-				else
4241 
+				} else
4352 4242 
 				{
4353 4243 
 					$feed = null;
4354 4244 
 				}
 
@@ -4369,8 +4259,7 @@  discard block
 
 block discarded – undo
4369 4259 
 						{
4370 4260 
 							$feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
4371 4261 
 						}
4372 
-					}
4373 
-					else
4262 
+					} else
4374 4263 
 					{
4375 4264 
 						return false;
4376 4265 
 					}
 
@@ -4398,8 +4287,7 @@  discard block
 
 block discarded – undo
4398 4287 
 		if ($query->execute() && ($time = $query->fetchColumn()))
4399 4288 
 		{
4400 4289 
 			return $time;
4401 
-		}
4402 
-		else
4290 
+		} else
4403 4291 
 		{
4404 4292 
 			return false;
4405 4293 
 		}
 
@@ -4423,8 +4311,7 @@  discard block
 
 block discarded – undo
4423 4311 
 		if ($query->execute() && $query->rowCount() > 0)
4424 4312 
 		{
4425 4313 
 			return true;
4426 
-		}
4427 
-		else
4314 
+		} else
4428 4315 
 		{
4429 4316 
 			return false;
4430 4317 
 		}
 
@@ -4449,8 +4336,7 @@  discard block
 
 block discarded – undo
4449 4336 
 		if ($query->execute() && $query2->execute())
4450 4337 
 		{
4451 4338 
 			return true;
4452 
-		}
4453 
-		else
4339 
+		} else
4454 4340 
 		{
4455 4341 
 			return false;
4456 4342 
 		}
 
@@ -4699,8 +4585,7 @@  discard block
 
 block discarded – undo
4699 4585 
 		if ($this->endTime !== null)
4700 4586 
 		{
4701 4587 
 			return $this->endTime;
4702 
-		}
4703 
-		else
4588 
+		} else
4704 4589 
 		{
4705 4590 
 			return null;
4706 4591 
 		}
 
@@ -4717,8 +4602,7 @@  discard block
 
 block discarded – undo
4717 4602 
 		if ($this->lang !== null)
4718 4603 
 		{
4719 4604 
 			return $this->lang;
4720 
-		}
4721 
-		else
4605 
+		} else
4722 4606 
 		{
4723 4607 
 			return null;
4724 4608 
 		}
 
@@ -4734,8 +4618,7 @@  discard block
 
 block discarded – undo
4734 4618 
 		if ($this->startTime !== null)
4735 4619 
 		{
4736 4620 
 			return $this->startTime;
4737 
-		}
4738 
-		else
4621 
+		} else
4739 4622 
 		{
4740 4623 
 			return null;
4741 4624 
 		}
 
@@ -4751,8 +4634,7 @@  discard block
 
 block discarded – undo
4751 4634 
 		if ($this->text !== null)
4752 4635 
 		{
4753 4636 
 			return $this->text;
4754 
-		}
4755 
-		else
4637 
+		} else
4756 4638 
 		{
4757 4639 
 			return null;
4758 4640 
 		}
 
@@ -4768,8 +4650,7 @@  discard block
 
 block discarded – undo
4768 4650 
 		if ($this->type !== null)
4769 4651 
 		{
4770 4652 
 			return $this->type;
4771 
-		}
4772 
-		else
4653 
+		} else
4773 4654 
 		{
4774 4655 
 			return null;
4775 4656 
 		}
 
@@ -4950,8 +4831,7 @@  discard block
 
 block discarded – undo
4950 4831 
 			if (($pos = strpos($this->file->headers['content-type'], ';')) !== false)
4951 4832 
 			{
4952 4833 
 				$official = substr($this->file->headers['content-type'], 0, $pos);
4953 
-			}
4954 
-			else
4834 
+			} else
4955 4835 
 			{
4956 4836 
 				$official = $this->file->headers['content-type'];
4957 4837 
 			}
 
@@ -4961,34 +4841,28 @@  discard block
 
 block discarded – undo
4961 4841 
 				|| $official === 'application/unknown')
4962 4842 
 			{
4963 4843 
 				return $this->unknown();
4964 
-			}
4965 
-			elseif (substr($official, -4) === '+xml'
4844 
+			} elseif (substr($official, -4) === '+xml'
4966 4845 
 				|| $official === 'text/xml'
4967 4846 
 				|| $official === 'application/xml')
4968 4847 
 			{
4969 4848 
 				return $official;
4970 
-			}
4971 
-			elseif (substr($official, 0, 6) === 'image/')
4849 
+			} elseif (substr($official, 0, 6) === 'image/')
4972 4850 
 			{
4973 4851 
 				if ($return = $this->image())
4974 4852 
 				{
4975 4853 
 					return $return;
4976 
-				}
4977 
-				else
4854 
+				} else
4978 4855 
 				{
4979 4856 
 					return $official;
4980 4857 
 				}
4981 
-			}
4982 
-			elseif ($official === 'text/html')
4858 
+			} elseif ($official === 'text/html')
4983 4859 
 			{
4984 4860 
 				return $this->feed_or_html();
4985 
-			}
4986 
-			else
4861 
+			} else
4987 4862 
 			{
4988 4863 
 				return $official;
4989 4864 
 			}
4990 
-		}
4991 
-		else
4865 
+		} else
4992 4866 
 		{
4993 4867 
 			return $this->unknown();
4994 4868 
 		}
 
@@ -5007,12 +4881,10 @@  discard block
 
 block discarded – undo
5007 4881 
 			|| substr($this->file->body, 0, 3) === "\xEF\xBB\xBF")
5008 4882 
 		{
5009 4883 
 			return 'text/plain';
5010 
-		}
5011 
-		elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
4884 
+		} elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
5012 4885 
 		{
5013 4886 
 			return 'application/octect-stream';
5014 
-		}
5015 
-		else
4887 
+		} else
5016 4888 
 		{
5017 4889 
 			return 'text/plain';
5018 4890 
 		}
 
@@ -5031,37 +4903,29 @@  discard block
 
 block discarded – undo
5031 4903 
 			|| strtolower(substr($this->file->body, $ws, 7)) === '<script')
5032 4904 
 		{
5033 4905 
 			return 'text/html';
5034 
-		}
5035 
-		elseif (substr($this->file->body, 0, 5) === '%PDF-')
4906 
+		} elseif (substr($this->file->body, 0, 5) === '%PDF-')
5036 4907 
 		{
5037 4908 
 			return 'application/pdf';
5038 
-		}
5039 
-		elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
4909 
+		} elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
5040 4910 
 		{
5041 4911 
 			return 'application/postscript';
5042 
-		}
5043 
-		elseif (substr($this->file->body, 0, 6) === 'GIF87a'
4912 
+		} elseif (substr($this->file->body, 0, 6) === 'GIF87a'
5044 4913 
 			|| substr($this->file->body, 0, 6) === 'GIF89a')
5045 4914 
 		{
5046 4915 
 			return 'image/gif';
5047 
-		}
5048 
-		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
4916 
+		} elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
5049 4917 
 		{
5050 4918 
 			return 'image/png';
5051 
-		}
5052 
-		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
4919 
+		} elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
5053 4920 
 		{
5054 4921 
 			return 'image/jpeg';
5055 
-		}
5056 
-		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
4922 
+		} elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
5057 4923 
 		{
5058 4924 
 			return 'image/bmp';
5059 
-		}
5060 
-		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
4925 
+		} elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
5061 4926 
 		{
5062 4927 
 			return 'image/vnd.microsoft.icon';
5063 
-		}
5064 
-		else
4928 
+		} else
5065 4929 
 		{
5066 4930 
 			return $this->text_or_binary();
5067 4931 
 		}
 
@@ -5078,24 +4942,19 @@  discard block
 
 block discarded – undo
5078 4942 
 			|| substr($this->file->body, 0, 6) === 'GIF89a')
5079 4943 
 		{
5080 4944 
 			return 'image/gif';
5081 
-		}
5082 
-		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
4945 
+		} elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
5083 4946 
 		{
5084 4947 
 			return 'image/png';
5085 
-		}
5086 
-		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
4948 
+		} elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
5087 4949 
 		{
5088 4950 
 			return 'image/jpeg';
5089 
-		}
5090 
-		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
4951 
+		} elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
5091 4952 
 		{
5092 4953 
 			return 'image/bmp';
5093 
-		}
5094 
-		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
4954 
+		} elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
5095 4955 
 		{
5096 4956 
 			return 'image/vnd.microsoft.icon';
5097 
-		}
5098 
-		else
4957 
+		} else
5099 4958 
 		{
5100 4959 
 			return false;
5101 4960 
 		}
 
@@ -5136,44 +4995,36 @@  discard block
 
 block discarded – undo
5136 4995 
 				if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false)
5137 4996 
 				{
5138 4997 
 					$pos += 3;
5139 
-				}
5140 
-				else
4998 
+				} else
5141 4999 
 				{
5142 5000 
 					return 'text/html';
5143 5001 
 				}
5144 
-			}
5145 
-			elseif (substr($this->file->body, $pos, 1) === '!')
5002 
+			} elseif (substr($this->file->body, $pos, 1) === '!')
5146 5003 
 			{
5147 5004 
 				if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false)
5148 5005 
 				{
5149 5006 
 					$pos++;
5150 
-				}
5151 
-				else
5007 
+				} else
5152 5008 
 				{
5153 5009 
 					return 'text/html';
5154 5010 
 				}
5155 
-			}
5156 
-			elseif (substr($this->file->body, $pos, 1) === '?')
5011 
+			} elseif (substr($this->file->body, $pos, 1) === '?')
5157 5012 
 			{
5158 5013 
 				if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false)
5159 5014 
 				{
5160 5015 
 					$pos += 2;
5161 
-				}
5162 
-				else
5016 
+				} else
5163 5017 
 				{
5164 5018 
 					return 'text/html';
5165 5019 
 				}
5166 
-			}
5167 
-			elseif (substr($this->file->body, $pos, 3) === 'rss'
5020 
+			} elseif (substr($this->file->body, $pos, 3) === 'rss'
5168 5021 
 				|| substr($this->file->body, $pos, 7) === 'rdf:RDF')
5169 5022 
 			{
5170 5023 
 				return 'application/rss+xml';
5171 
-			}
5172 
-			elseif (substr($this->file->body, $pos, 4) === 'feed')
5024 
+			} elseif (substr($this->file->body, $pos, 4) === 'feed')
5173 5025 
 			{
5174 5026 
 				return 'application/atom+xml';
5175 
-			}
5176 
-			else
5027 
+			} else
5177 5028 
 			{
5178 5029 
 				return 'text/html';
5179 5030 
 			}
 
@@ -5244,8 +5095,7 @@  discard block
 
 block discarded – undo
5244 5095 
 		if ($this->url !== null)
5245 5096 
 		{
5246 5097 
 			return $this->url;
5247 
-		}
5248 
-		else
5098 
+		} else
5249 5099 
 		{
5250 5100 
 			return null;
5251 5101 
 		}
 
@@ -5261,8 +5111,7 @@  discard block
 
 block discarded – undo
5261 5111 
 		if ($this->label !== null)
5262 5112 
 		{
5263 5113 
 			return $this->label;
5264 
-		}
5265 
-		else
5114 
+		} else
5266 5115 
 		{
5267 5116 
 			return null;
5268 5117 
 		}
 
@@ -5353,8 +5202,7 @@  discard block
 
 block discarded – undo
5353 5202 
 		if ($this->role !== null)
5354 5203 
 		{
5355 5204 
 			return $this->role;
5356 
-		}
5357 
-		else
5205 
+		} else
5358 5206 
 		{
5359 5207 
 			return null;
5360 5208 
 		}
 
@@ -5370,8 +5218,7 @@  discard block
 
 block discarded – undo
5370 5218 
 		if ($this->scheme !== null)
5371 5219 
 		{
5372 5220 
 			return $this->scheme;
5373 
-		}
5374 
-		else
5221 
+		} else
5375 5222 
 		{
5376 5223 
 			return null;
5377 5224 
 		}
 
@@ -5387,8 +5234,7 @@  discard block
 
 block discarded – undo
5387 5234 
 		if ($this->name !== null)
5388 5235 
 		{
5389 5236 
 			return $this->name;
5390 
-		}
5391 
-		else
5237 
+		} else
5392 5238 
 		{
5393 5239 
 			return null;
5394 5240 
 		}
 
@@ -5469,8 +5315,7 @@  discard block
 
 block discarded – undo
5469 5315 
 		{
5470 5316 
 			$this->consumed .= $this->data[$this->position];
5471 5317 
 			return $this->data[$this->position++];
5472 
-		}
5473 
-		else
5318 
+		} else
5474 5319 
 		{
5475 5320 
 			return false;
5476 5321 
 		}
 
@@ -5491,8 +5336,7 @@  discard block
 
 block discarded – undo
5491 5336 
 			$this->consumed .= $data;
5492 5337 
 			$this->position += $len;
5493 5338 
 			return $data;
5494 
-		}
5495 
-		else
5339 
+		} else
5496 5340 
 		{
5497 5341 
 			return false;
5498 5342 
 		}
 
@@ -5551,8 +5395,7 @@  discard block
 
 block discarded – undo
5551 5395 
 					if ($hex)
5552 5396 
 					{
5553 5397 
 						$codepoint = hexdec($codepoint);
5554 
-					}
5555 
-					else
5398 
+					} else
5556 5399 
 					{
5557 5400 
 						$codepoint = intval($codepoint);
5558 5401 
 					}
 
@@ -5560,8 +5403,7 @@  discard block
 
 block discarded – undo
5560 5403 
 					if (isset($windows_1252_specials[$codepoint]))
5561 5404 
 					{
5562 5405 
 						$replacement = $windows_1252_specials[$codepoint];
5563 
-					}
5564 
-					else
5406 
+					} else
5565 5407 
 					{
5566 5408 
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
5567 5409 
 					}
 
@@ -6206,8 +6048,7 @@  discard block
 
 block discarded – undo
6206 6048 
 		if ($this->bitrate !== null)
6207 6049 
 		{
6208 6050 
 			return $this->bitrate;
6209 
-		}
6210 
-		else
6051 
+		} else
6211 6052 
 		{
6212 6053 
 			return null;
6213 6054 
 		}
 
@@ -6225,8 +6066,7 @@  discard block
 
 block discarded – undo
6225 6066 
 		if (isset($captions[$key]))
6226 6067 
 		{
6227 6068 
 			return $captions[$key];
6228 
-		}
6229 
-		else
6069 
+		} else
6230 6070 
 		{
6231 6071 
 			return null;
6232 6072 
 		}
 
@@ -6242,8 +6082,7 @@  discard block
 
 block discarded – undo
6242 6082 
 		if ($this->captions !== null)
6243 6083 
 		{
6244 6084 
 			return $this->captions;
6245 
-		}
6246 
-		else
6085 
+		} else
6247 6086 
 		{
6248 6087 
 			return null;
6249 6088 
 		}
 
@@ -6261,8 +6100,7 @@  discard block
 
 block discarded – undo
6261 6100 
 		if (isset($categories[$key]))
6262 6101 
 		{
6263 6102 
 			return $categories[$key];
6264 
-		}
6265 
-		else
6103 
+		} else
6266 6104 
 		{
6267 6105 
 			return null;
6268 6106 
 		}
 
@@ -6278,8 +6116,7 @@  discard block
 
 block discarded – undo
6278 6116 
 		if ($this->categories !== null)
6279 6117 
 		{
6280 6118 
 			return $this->categories;
6281 
-		}
6282 
-		else
6119 
+		} else
6283 6120 
 		{
6284 6121 
 			return null;
6285 6122 
 		}
 
@@ -6295,8 +6132,7 @@  discard block
 
 block discarded – undo
6295 6132 
 		if ($this->channels !== null)
6296 6133 
 		{
6297 6134 
 			return $this->channels;
6298 
-		}
6299 
-		else
6135 
+		} else
6300 6136 
 		{
6301 6137 
 			return null;
6302 6138 
 		}
 
@@ -6312,8 +6148,7 @@  discard block
 
 block discarded – undo
6312 6148 
 		if ($this->copyright !== null)
6313 6149 
 		{
6314 6150 
 			return $this->copyright;
6315 
-		}
6316 
-		else
6151 
+		} else
6317 6152 
 		{
6318 6153 
 			return null;
6319 6154 
 		}
 
@@ -6331,8 +6166,7 @@  discard block
 
 block discarded – undo
6331 6166 
 		if (isset($credits[$key]))
6332 6167 
 		{
6333 6168 
 			return $credits[$key];
6334 
-		}
6335 
-		else
6169 
+		} else
6336 6170 
 		{
6337 6171 
 			return null;
6338 6172 
 		}
 
@@ -6348,8 +6182,7 @@  discard block
 
 block discarded – undo
6348 6182 
 		if ($this->credits !== null)
6349 6183 
 		{
6350 6184 
 			return $this->credits;
6351 
-		}
6352 
-		else
6185 
+		} else
6353 6186 
 		{
6354 6187 
 			return null;
6355 6188 
 		}
 
@@ -6365,8 +6198,7 @@  discard block
 
 block discarded – undo
6365 6198 
 		if ($this->description !== null)
6366 6199 
 		{
6367 6200 
 			return $this->description;
6368 
-		}
6369 
-		else
6201 
+		} else
6370 6202 
 		{
6371 6203 
 			return null;
6372 6204 
 		}
 
@@ -6386,13 +6218,11 @@  discard block
 
 block discarded – undo
6386 6218 
 			{
6387 6219 
 				$time = SimplePie_Misc::time_hms($this->duration);
6388 6220 
 				return $time;
6389 
-			}
6390 
-			else
6221 
+			} else
6391 6222 
 			{
6392 6223 
 				return $this->duration;
6393 6224 
 			}
6394 
-		}
6395 
-		else
6225 
+		} else
6396 6226 
 		{
6397 6227 
 			return null;
6398 6228 
 		}
 
@@ -6408,8 +6238,7 @@  discard block
 
 block discarded – undo
6408 6238 
 		if ($this->expression !== null)
6409 6239 
 		{
6410 6240 
 			return $this->expression;
6411 
-		}
6412 
-		else
6241 
+		} else
6413 6242 
 		{
6414 6243 
 			return 'full';
6415 6244 
 		}
 
@@ -6443,8 +6272,7 @@  discard block
 
 block discarded – undo
6443 6272 
 		if ($this->framerate !== null)
6444 6273 
 		{
6445 6274 
 			return $this->framerate;
6446 
-		}
6447 
-		else
6275 
+		} else
6448 6276 
 		{
6449 6277 
 			return null;
6450 6278 
 		}
 
@@ -6473,8 +6301,7 @@  discard block
 
 block discarded – undo
6473 6301 
 		if (isset($hashes[$key]))
6474 6302 
 		{
6475 6303 
 			return $hashes[$key];
6476 
-		}
6477 
-		else
6304 
+		} else
6478 6305 
 		{
6479 6306 
 			return null;
6480 6307 
 		}
 
@@ -6490,8 +6317,7 @@  discard block
 
 block discarded – undo
6490 6317 
 		if ($this->hashes !== null)
6491 6318 
 		{
6492 6319 
 			return $this->hashes;
6493 
-		}
6494 
-		else
6320 
+		} else
6495 6321 
 		{
6496 6322 
 			return null;
6497 6323 
 		}
 
@@ -6507,8 +6333,7 @@  discard block
 
 block discarded – undo
6507 6333 
 		if ($this->height !== null)
6508 6334 
 		{
6509 6335 
 			return $this->height;
6510 
-		}
6511 
-		else
6336 
+		} else
6512 6337 
 		{
6513 6338 
 			return null;
6514 6339 
 		}
 
@@ -6525,8 +6350,7 @@  discard block
 
 block discarded – undo
6525 6350 
 		if ($this->lang !== null)
6526 6351 
 		{
6527 6352 
 			return $this->lang;
6528 
-		}
6529 
-		else
6353 
+		} else
6530 6354 
 		{
6531 6355 
 			return null;
6532 6356 
 		}
 
@@ -6544,8 +6368,7 @@  discard block
 
 block discarded – undo
6544 6368 
 		if (isset($keywords[$key]))
6545 6369 
 		{
6546 6370 
 			return $keywords[$key];
6547 
-		}
6548 
-		else
6371 
+		} else
6549 6372 
 		{
6550 6373 
 			return null;
6551 6374 
 		}
 
@@ -6561,8 +6384,7 @@  discard block
 
 block discarded – undo
6561 6384 
 		if ($this->keywords !== null)
6562 6385 
 		{
6563 6386 
 			return $this->keywords;
6564 
-		}
6565 
-		else
6387 
+		} else
6566 6388 
 		{
6567 6389 
 			return null;
6568 6390 
 		}
 
@@ -6578,8 +6400,7 @@  discard block
 
 block discarded – undo
6578 6400 
 		if ($this->length !== null)
6579 6401 
 		{
6580 6402 
 			return $this->length;
6581 
-		}
6582 
-		else
6403 
+		} else
6583 6404 
 		{
6584 6405 
 			return null;
6585 6406 
 		}
 
@@ -6595,8 +6416,7 @@  discard block
 
 block discarded – undo
6595 6416 
 		if ($this->link !== null)
6596 6417 
 		{
6597 6418 
 			return urldecode($this->link);
6598 
-		}
6599 
-		else
6419 
+		} else
6600 6420 
 		{
6601 6421 
 			return null;
6602 6422 
 		}
 
@@ -6613,8 +6433,7 @@  discard block
 
 block discarded – undo
6613 6433 
 		if ($this->medium !== null)
6614 6434 
 		{
6615 6435 
 			return $this->medium;
6616 
-		}
6617 
-		else
6436 
+		} else
6618 6437 
 		{
6619 6438 
 			return null;
6620 6439 
 		}
 
@@ -6631,8 +6450,7 @@  discard block
 
 block discarded – undo
6631 6450 
 		if ($this->player !== null)
6632 6451 
 		{
6633 6452 
 			return $this->player;
6634 
-		}
6635 
-		else
6453 
+		} else
6636 6454 
 		{
6637 6455 
 			return null;
6638 6456 
 		}
 
@@ -6650,8 +6468,7 @@  discard block
 
 block discarded – undo
6650 6468 
 		if (isset($ratings[$key]))
6651 6469 
 		{
6652 6470 
 			return $ratings[$key];
6653 
-		}
6654 
-		else
6471 
+		} else
6655 6472 
 		{
6656 6473 
 			return null;
6657 6474 
 		}
 
@@ -6667,8 +6484,7 @@  discard block
 
 block discarded – undo
6667 6484 
 		if ($this->ratings !== null)
6668 6485 
 		{
6669 6486 
 			return $this->ratings;
6670 
-		}
6671 
-		else
6487 
+		} else
6672 6488 
 		{
6673 6489 
 			return null;
6674 6490 
 		}
 
@@ -6686,8 +6502,7 @@  discard block
 
 block discarded – undo
6686 6502 
 		if (isset($restrictions[$key]))
6687 6503 
 		{
6688 6504 
 			return $restrictions[$key];
6689 
-		}
6690 
-		else
6505 
+		} else
6691 6506 
 		{
6692 6507 
 			return null;
6693 6508 
 		}
 
@@ -6703,8 +6518,7 @@  discard block
 
 block discarded – undo
6703 6518 
 		if ($this->restrictions !== null)
6704 6519 
 		{
6705 6520 
 			return $this->restrictions;
6706 
-		}
6707 
-		else
6521 
+		} else
6708 6522 
 		{
6709 6523 
 			return null;
6710 6524 
 		}
 
@@ -6720,8 +6534,7 @@  discard block
 
 block discarded – undo
6720 6534 
 		if ($this->samplingrate !== null)
6721 6535 
 		{
6722 6536 
 			return $this->samplingrate;
6723 
-		}
6724 
-		else
6537 
+		} else
6725 6538 
 		{
6726 6539 
 			return null;
6727 6540 
 		}
 
@@ -6738,8 +6551,7 @@  discard block
 
 block discarded – undo
6738 6551 
 		if ($length !== null)
6739 6552 
 		{
6740 6553 
 			return round($length/1048576, 2);
6741 
-		}
6742 
-		else
6554 
+		} else
6743 6555 
 		{
6744 6556 
 			return null;
6745 6557 
 		}
 
@@ -6757,8 +6569,7 @@  discard block
 
 block discarded – undo
6757 6569 
 		if (isset($thumbnails[$key]))
6758 6570 
 		{
6759 6571 
 			return $thumbnails[$key];
6760 
-		}
6761 
-		else
6572 
+		} else
6762 6573 
 		{
6763 6574 
 			return null;
6764 6575 
 		}
 
@@ -6774,8 +6585,7 @@  discard block
 
 block discarded – undo
6774 6585 
 		if ($this->thumbnails !== null)
6775 6586 
 		{
6776 6587 
 			return $this->thumbnails;
6777 
-		}
6778 
-		else
6588 
+		} else
6779 6589 
 		{
6780 6590 
 			return null;
6781 6591 
 		}
 
@@ -6791,8 +6601,7 @@  discard block
 
 block discarded – undo
6791 6601 
 		if ($this->title !== null)
6792 6602 
 		{
6793 6603 
 			return $this->title;
6794 
-		}
6795 
-		else
6604 
+		} else
6796 6605 
 		{
6797 6606 
 			return null;
6798 6607 
 		}
 
@@ -6809,8 +6618,7 @@  discard block
 
 block discarded – undo
6809 6618 
 		if ($this->type !== null)
6810 6619 
 		{
6811 6620 
 			return $this->type;
6812 
-		}
6813 
-		else
6621 
+		} else
6814 6622 
 		{
6815 6623 
 			return null;
6816 6624 
 		}
 
@@ -6826,8 +6634,7 @@  discard block
 
 block discarded – undo
6826 6634 
 		if ($this->width !== null)
6827 6635 
 		{
6828 6636 
 			return $this->width;
6829 
-		}
6830 
-		else
6637 
+		} else
6831 6638 
 		{
6832 6639 
 			return null;
6833 6640 
 		}
 
@@ -6911,8 +6718,7 @@  discard block
 
 block discarded – undo
6911 6718 
 		if (is_array($options))
6912 6719 
 		{
6913 6720 
 			extract($options);
6914 
-		}
6915 
-		else
6721 
+		} else
6916 6722 
 		{
6917 6723 
 			$options = explode(',', $options);
6918 6724 
 			foreach($options as $option)
 
@@ -6979,17 +6785,14 @@  discard block
 
 block discarded – undo
6979 6785 
 				if ($height === 'auto')
6980 6786 
 				{
6981 6787 
 					$width = 480;
6982 
-				}
6983 
-				elseif ($widescreen)
6788 
+				} elseif ($widescreen)
6984 6789 
 				{
6985 6790 
 					$width = round((intval($height)/9)*16);
6986 
-				}
6987 
-				else
6791 
+				} else
6988 6792 
 				{
6989 6793 
 					$width = round((intval($height)/3)*4);
6990 6794 
 				}
6991 
-			}
6992 
-			else
6795 
+			} else
6993 6796 
 			{
6994 6797 
 				$width = '100%';
6995 6798 
 			}
 
@@ -7000,35 +6803,29 @@  discard block
 
 block discarded – undo
7000 6803 
 			if ($mime === 'audio')
7001 6804 
 			{
7002 6805 
 				$height = 0;
7003 
-			}
7004 
-			elseif ($mime === 'video')
6806 
+			} elseif ($mime === 'video')
7005 6807 
 			{
7006 6808 
 				if ($width === 'auto')
7007 6809 
 				{
7008 6810 
 					if ($widescreen)
7009 6811 
 					{
7010 6812 
 						$height = 270;
7011 
-					}
7012 
-					else
6813 
+					} else
7013 6814 
 					{
7014 6815 
 						$height = 360;
7015 6816 
 					}
7016 
-				}
7017 
-				elseif ($widescreen)
6817 
+				} elseif ($widescreen)
7018 6818 
 				{
7019 6819 
 					$height = round((intval($width)/16)*9);
7020 
-				}
7021 
-				else
6820 
+				} else
7022 6821 
 				{
7023 6822 
 					$height = round((intval($width)/4)*3);
7024 6823 
 				}
7025 
-			}
7026 
-			else
6824 
+			} else
7027 6825 
 			{
7028 6826 
 				$height = 376;
7029 6827 
 			}
7030 
-		}
7031 
-		elseif ($mime === 'audio')
6828 
+		} elseif ($mime === 'audio')
7032 6829 
 		{
7033 6830 
 			$height = 0;
7034 6831 
 		}
 
@@ -7037,8 +6834,7 @@  discard block
 
 block discarded – undo
7037 6834 
 		if ($mime === 'audio')
7038 6835 
 		{
7039 6836 
 			$placeholder = $audio;
7040 
-		}
7041 
-		elseif ($mime === 'video')
6837 
+		} elseif ($mime === 'video')
7042 6838 
 		{
7043 6839 
 			$placeholder = $video;
7044 6840 
 		}
 
@@ -7051,8 +6847,7 @@  discard block
 
 block discarded – undo
7051 6847 
 			if ($native)
7052 6848 
 			{
7053 6849 
 				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
7054 
-			}
7055 
-			else
6850 
+			} else
7056 6851 
 			{
7057 6852 
 				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
7058 6853 
 			}
 
@@ -7066,8 +6861,7 @@  discard block
 
 block discarded – undo
7066 6861 
 			if ($native)
7067 6862 
 			{
7068 6863 
 				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
7069 
-			}
7070 
-			else
6864 
+			} else
7071 6865 
 			{
7072 6866 
 				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
7073 6867 
 			}
 
@@ -7083,13 +6877,11 @@  discard block
 
 block discarded – undo
7083 6877 
 				if ($placeholder !== '')
7084 6878 
 				{
7085 6879 
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
7086 
-				}
7087 
-				else
6880 
+				} else
7088 6881 
 				{
7089 6882 
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
7090 6883 
 				}
7091 
-			}
7092 
-			else
6884 
+			} else
7093 6885 
 			{
7094 6886 
 				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
7095 6887 
 			}
 
@@ -7102,15 +6894,16 @@  discard block
 
 block discarded – undo
7102 6894 
 			if ($native)
7103 6895 
 			{
7104 6896 
 				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
7105 
-			}
7106 
-			else
6897 
+			} else
7107 6898 
 			{
7108 6899 
 				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
7109 6900 
 			}
7110 6901 
 		}
7111 6902
7112 6903 
 		// Everything else
7113 
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
6904 
+		else {
6905 
+			$embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
6906 
+		}
7114 6907
7115 6908 
 		return $embed;
7116 6909 
 	}
 
@@ -7138,8 +6931,7 @@  discard block
 
 block discarded – undo
7138 6931 
 		if ($this->get_type() !== null)
7139 6932 
 		{
7140 6933 
 			$type = strtolower($this->type);
7141 
-		}
7142 
-		else
6934 
+		} else
7143 6935 
 		{
7144 6936 
 			$type = null;
7145 6937 
 		}
 
@@ -7273,29 +7065,23 @@  discard block
 
 block discarded – undo
7273 7065 
 			if (in_array($type, $types_flash))
7274 7066 
 			{
7275 7067 
 				return 'flash';
7276 
-			}
7277 
-			elseif (in_array($type, $types_fmedia))
7068 
+			} elseif (in_array($type, $types_fmedia))
7278 7069 
 			{
7279 7070 
 				return 'fmedia';
7280 
-			}
7281 
-			elseif (in_array($type, $types_quicktime))
7071 
+			} elseif (in_array($type, $types_quicktime))
7282 7072 
 			{
7283 7073 
 				return 'quicktime';
7284 
-			}
7285 
-			elseif (in_array($type, $types_wmedia))
7074 
+			} elseif (in_array($type, $types_wmedia))
7286 7075 
 			{
7287 7076 
 				return 'wmedia';
7288 
-			}
7289 
-			elseif (in_array($type, $types_mp3))
7077 
+			} elseif (in_array($type, $types_mp3))
7290 7078 
 			{
7291 7079 
 				return 'mp3';
7292 
-			}
7293 
-			else
7080 
+			} else
7294 7081 
 			{
7295 7082 
 				return null;
7296 7083 
 			}
7297 
-		}
7298 
-		else
7084 
+		} else
7299 7085 
 		{
7300 7086 
 			return $type;
7301 7087 
 		}
 
@@ -7398,8 +7184,7 @@  discard block
 
 block discarded – undo
7398 7184 
 				{
7399 7185 
 					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
7400 7186 
 					$this->success = false;
7401 
-				}
7402 
-				else
7187 
+				} else
7403 7188 
 				{
7404 7189 
 					// Use the updated url provided by curl_getinfo after any redirects.
7405 7190 
 					if ($info = curl_getinfo($fp)) {
 
@@ -7424,8 +7209,7 @@  discard block
 
 block discarded – undo
7424 7209 
 						}
7425 7210 
 					}
7426 7211 
 				}
7427 
-			}
7428 
-			else
7212 
+			} else
7429 7213 
 			{
7430 7214 
 				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
7431 7215 
 				$url_parts = parse_url($url);
 
@@ -7444,8 +7228,7 @@  discard block
 
 block discarded – undo
7444 7228 
 				{
7445 7229 
 					$this->error = 'fsockopen error: ' . $errstr;
7446 7230 
 					$this->success = false;
7447 
-				}
7448 
-				else
7231 
+				} else
7449 7232 
 				{
7450 7233 
 					stream_set_timeout($fp, $timeout);
7451 7234 
 					if (isset($url_parts['path']))
 
@@ -7453,13 +7236,11 @@  discard block
 
 block discarded – undo
7453 7236 
 						if (isset($url_parts['query']))
7454 7237 
 						{
7455 7238 
 							$get = "$url_parts[path]?$url_parts[query]";
7456 
-						}
7457 
-						else
7239 
+						} else
7458 7240 
 						{
7459 7241 
 							$get = $url_parts['path'];
7460 7242 
 						}
7461 
-					}
7462 
-					else
7243 
+					} else
7463 7244 
 					{
7464 7245 
 						$get = '/';
7465 7246 
 					}
 
@@ -7519,8 +7300,7 @@  discard block
 
 block discarded – undo
7519 7300 
 										{
7520 7301 
 											$this->error = 'Unable to decode HTTP "gzip" stream';
7521 7302 
 											$this->success = false;
7522 
-										}
7523 
-										else
7303 
+										} else
7524 7304 
 										{
7525 7305 
 											$this->body = trim($decoder->data);
7526 7306 
 										}
 
@@ -7530,16 +7310,13 @@  discard block
 
 block discarded – undo
7530 7310 
 										if (($decompressed = gzinflate($this->body)) !== false)
7531 7311 
 										{
7532 7312 
 											$this->body = $decompressed;
7533 
-										}
7534 
-										else if (($decompressed = gzuncompress($this->body)) !== false)
7313 
+										} else if (($decompressed = gzuncompress($this->body)) !== false)
7535 7314 
 										{
7536 7315 
 											$this->body = $decompressed;
7537 
-										}
7538 
-										else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
7316 
+										} else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
7539 7317 
 										{
7540 7318 
 											$this->body = $decompressed;
7541 
-										}
7542 
-										else
7319 
+										} else
7543 7320 
 										{
7544 7321 
 											$this->error = 'Unable to decode HTTP "deflate" stream';
7545 7322 
 											$this->success = false;
 
@@ -7552,8 +7329,7 @@  discard block
 
 block discarded – undo
7552 7329 
 								}
7553 7330 
 							}
7554 7331 
 						}
7555 
-					}
7556 
-					else
7332 
+					} else
7557 7333 
 					{
7558 7334 
 						$this->error = 'fsocket timed out';
7559 7335 
 						$this->success = false;
 
@@ -7561,8 +7337,7 @@  discard block
 
 block discarded – undo
7561 7337 
 					fclose($fp);
7562 7338 
 				}
7563 7339 
 			}
7564 
-		}
7565 
-		else
7340 
+		} else
7566 7341 
 		{
7567 7342 
 			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
7568 7343 
 			if (empty($url) || !($this->body = trim(file_get_contents($url))))
 
@@ -7686,8 +7461,7 @@  discard block
 
 block discarded – undo
7686 7461 
 		if ($this->state === 'emit' || $this->state === 'body')
7687 7462 
 		{
7688 7463 
 			return true;
7689 
-		}
7690 
-		else
7464 
+		} else
7691 7465 
 		{
7692 7466 
 			$this->http_version = '';
7693 7467 
 			$this->status_code = '';
 
@@ -7737,13 +7511,11 @@  discard block
 
 block discarded – undo
7737 7511 
 				$this->http_version = (float) $this->http_version;
7738 7512 
 				$this->position += strspn($this->data, "\x09\x20", $this->position);
7739 7513 
 				$this->state = 'status';
7740 
-			}
7741 
-			else
7514 
+			} else
7742 7515 
 			{
7743 7516 
 				$this->state = false;
7744 7517 
 			}
7745 
-		}
7746 
-		else
7518 
+		} else
7747 7519 
 		{
7748 7520 
 			$this->state = false;
7749 7521 
 		}
 
@@ -7759,8 +7531,7 @@  discard block
 
 block discarded – undo
7759 7531 
 			$this->status_code = (int) substr($this->data, $this->position, $len);
7760 7532 
 			$this->position += $len;
7761 7533 
 			$this->state = 'reason';
7762 
-		}
7763 
-		else
7534 
+		} else
7764 7535 
 		{
7765 7536 
 			$this->state = false;
7766 7537 
 		}
 
@@ -7790,8 +7561,7 @@  discard block
 
 block discarded – undo
7790 7561 
 			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
7791 7562 
 			{
7792 7563 
 				$this->headers[$this->name] .= ', ' . $this->value;
7793 
-			}
7794 
-			else
7564 
+			} else
7795 7565 
 			{
7796 7566 
 				$this->headers[$this->name] = $this->value;
7797 7567 
 			}
 
@@ -7802,13 +7572,11 @@  discard block
 
 block discarded – undo
7802 7572 
 		{
7803 7573 
 			$this->position += 2;
7804 7574 
 			$this->state = 'body';
7805 
-		}
7806 
-		elseif ($this->data[$this->position] === "\x0A")
7575 
+		} elseif ($this->data[$this->position] === "\x0A")
7807 7576 
 		{
7808 7577 
 			$this->position++;
7809 7578 
 			$this->state = 'body';
7810 
-		}
7811 
-		else
7579 
+		} else
7812 7580 
 		{
7813 7581 
 			$this->state = 'name';
7814 7582 
 		}
 
@@ -7826,15 +7594,13 @@  discard block
 
 block discarded – undo
7826 7594 
 			{
7827 7595 
 				$this->position += $len;
7828 7596 
 				$this->state = 'new_line';
7829 
-			}
7830 
-			else
7597 
+			} else
7831 7598 
 			{
7832 7599 
 				$this->name = substr($this->data, $this->position, $len);
7833 7600 
 				$this->position += $len + 1;
7834 7601 
 				$this->state = 'value';
7835 7602 
 			}
7836 
-		}
7837 
-		else
7603 
+		} else
7838 7604 
 		{
7839 7605 
 			$this->state = false;
7840 7606 
 		}
 
@@ -7850,8 +7616,7 @@  discard block
 
 block discarded – undo
7850 7616 
 			if (substr($this->data, $this->position, 2) === "\x0D\x0A")
7851 7617 
 			{
7852 7618 
 				$this->position += 2;
7853 
-			}
7854 
-			elseif ($this->data[$this->position] === "\x0A")
7619 
+			} elseif ($this->data[$this->position] === "\x0A")
7855 7620 
 			{
7856 7621 
 				$this->position++;
7857 7622 
 			}
 
@@ -7868,8 +7633,7 @@  discard block
 
 block discarded – undo
7868 7633 
 		if ($this->is_linear_whitespace())
7869 7634 
 		{
7870 7635 
 			$this->linear_whitespace();
7871 
-		}
7872 
-		else
7636 
+		} else
7873 7637 
 		{
7874 7638 
 			switch ($this->data[$this->position])
7875 7639 
 			{
 
@@ -7918,8 +7682,7 @@  discard block
 
 block discarded – undo
7918 7682 
 		if ($this->is_linear_whitespace())
7919 7683 
 		{
7920 7684 
 			$this->linear_whitespace();
7921 
-		}
7922 
-		else
7685 
+		} else
7923 7686 
 		{
7924 7687 
 			switch ($this->data[$this->position])
7925 7688 
 			{
 
@@ -7976,8 +7739,7 @@  discard block
 
 block discarded – undo
7976 7739 
 		{
7977 7740 
 			unset($this->headers['transfer-encoding']);
7978 7741 
 			$this->state = 'chunked';
7979 
-		}
7980 
-		else
7742 
+		} else
7981 7743 
 		{
7982 7744 
 			$this->state = 'emit';
7983 7745 
 		}
 
@@ -8157,8 +7919,7 @@  discard block
 
 block discarded – undo
8157 7919 
 		if (method_exists($this, 'set_' . $name))
8158 7920 
 		{
8159 7921 
 			call_user_func(array($this, 'set_' . $name), $value);
8160 
-		}
8161 
-		elseif (
7922 
+		} elseif (
8162 7923 
 			   $name === 'iauthority'
8163 7924 
 			|| $name === 'iuserinfo'
8164 7925 
 			|| $name === 'ihost'
 
@@ -8191,8 +7952,7 @@  discard block
 
 block discarded – undo
8191 7952 
 		)
8192 7953 
 		{
8193 7954 
 			$return = $this->{"get_$name"}();
8194 
-		}
8195 
-		elseif (array_key_exists($name, $props))
7955 
+		} elseif (array_key_exists($name, $props))
8196 7956 
 		{
8197 7957 
 			$return = $this->$name;
8198 7958 
 		}
 
@@ -8207,8 +7967,7 @@  discard block
 
 block discarded – undo
8207 7967 
 		{
8208 7968 
 			$name = $prop;
8209 7969 
 			$return = $this->$prop;
8210 
-		}
8211 
-		else
7970 
+		} else
8212 7971 
 		{
8213 7972 
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
8214 7973 
 			$return = null;
 
@@ -8217,8 +7976,7 @@  discard block
 
 block discarded – undo
8217 7976 
 		if ($return === null && isset($this->normalization[$this->scheme][$name]))
8218 7977 
 		{
8219 7978 
 			return $this->normalization[$this->scheme][$name];
8220 
-		}
8221 
-		else
7979 
+		} else
8222 7980 
 		{
8223 7981 
 			return $return;
8224 7982 
 		}
 
@@ -8235,8 +7993,7 @@  discard block
 
 block discarded – undo
8235 7993 
 		if (method_exists($this, 'get_' . $name) || isset($this->$name))
8236 7994 
 		{
8237 7995 
 			return true;
8238 
-		}
8239 
-		else
7996 
+		} else
8240 7997 
 		{
8241 7998 
 			return false;
8242 7999 
 		}
 
@@ -8292,12 +8049,10 @@  discard block
 
 block discarded – undo
8292 8049 
 		if (!$relative->is_valid())
8293 8050 
 		{
8294 8051 
 			return false;
8295 
-		}
8296 
-		elseif ($relative->scheme !== null)
8052 
+		} elseif ($relative->scheme !== null)
8297 8053 
 		{
8298 8054 
 			return clone $relative;
8299 
-		}
8300 
-		else
8055 
+		} else
8301 8056 
 		{
8302 8057 
 			if (!($base instanceof SimplePie_IRI))
8303 8058 
 			{
 
@@ -8311,8 +8066,7 @@  discard block
 
 block discarded – undo
8311 8066 
 					{
8312 8067 
 						$target = clone $relative;
8313 8068 
 						$target->scheme = $base->scheme;
8314 
-					}
8315 
-					else
8069 
+					} else
8316 8070 
 					{
8317 8071 
 						$target = new SimplePie_IRI;
8318 8072 
 						$target->scheme = $base->scheme;
 
@@ -8324,46 +8078,39 @@  discard block
 
 block discarded – undo
8324 8078 
 							if ($relative->ipath[0] === '/')
8325 8079 
 							{
8326 8080 
 								$target->ipath = $relative->ipath;
8327 
-							}
8328 
-							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
8081 
+							} elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
8329 8082 
 							{
8330 8083 
 								$target->ipath = '/' . $relative->ipath;
8331 
-							}
8332 
-							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
8084 
+							} elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
8333 8085 
 							{
8334 8086 
 								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
8335 
-							}
8336 
-							else
8087 
+							} else
8337 8088 
 							{
8338 8089 
 								$target->ipath = $relative->ipath;
8339 8090 
 							}
8340 8091 
 							$target->ipath = $target->remove_dot_segments($target->ipath);
8341 8092 
 							$target->iquery = $relative->iquery;
8342 
-						}
8343 
-						else
8093 
+						} else
8344 8094 
 						{
8345 8095 
 							$target->ipath = $base->ipath;
8346 8096 
 							if ($relative->iquery !== null)
8347 8097 
 							{
8348 8098 
 								$target->iquery = $relative->iquery;
8349 
-							}
8350 
-							elseif ($base->iquery !== null)
8099 
+							} elseif ($base->iquery !== null)
8351 8100 
 							{
8352 8101 
 								$target->iquery = $base->iquery;
8353 8102 
 							}
8354 8103 
 						}
8355 8104 
 						$target->ifragment = $relative->ifragment;
8356 8105 
 					}
8357 
-				}
8358 
-				else
8106 
+				} else
8359 8107 
 				{
8360 8108 
 					$target = clone $base;
8361 8109 
 					$target->ifragment = null;
8362 8110 
 				}
8363 8111 
 				$target->scheme_normalization();
8364 8112 
 				return $target;
8365 
-			}
8366 
-			else
8113 
+			} else
8367 8114 
 			{
8368 8115 
 				return false;
8369 8116 
 			}
 
@@ -8402,8 +8149,7 @@  discard block
 
 block discarded – undo
8402 8149 
 				$match['fragment'] = null;
8403 8150 
 			}
8404 8151 
 			return $match;
8405 
-		}
8406 
-		else
8152 
+		} else
8407 8153 
 		{
8408 8154 
 			// This can occur when a paragraph is accidentally parsed as a URI
8409 8155 
 			return false;
 
@@ -8425,8 +8171,7 @@  discard block
 
 block discarded – undo
8425 8171 
 			if (strpos($input, '../') === 0)
8426 8172 
 			{
8427 8173 
 				$input = substr($input, 3);
8428 
-			}
8429 
-			elseif (strpos($input, './') === 0)
8174 
+			} elseif (strpos($input, './') === 0)
8430 8175 
 			{
8431 8176 
 				$input = substr($input, 2);
8432 8177 
 			}
 
@@ -8434,8 +8179,7 @@  discard block
 
 block discarded – undo
8434 8179 
 			elseif (strpos($input, '/./') === 0)
8435 8180 
 			{
8436 8181 
 				$input = substr($input, 2);
8437 
-			}
8438 
-			elseif ($input === '/.')
8182 
+			} elseif ($input === '/.')
8439 8183 
 			{
8440 8184 
 				$input = '/';
8441 8185 
 			}
 
@@ -8444,8 +8188,7 @@  discard block
 
 block discarded – undo
8444 8188 
 			{
8445 8189 
 				$input = substr($input, 3);
8446 8190 
 				$output = substr_replace($output, '', strrpos($output, '/'));
8447 
-			}
8448 
-			elseif ($input === '/..')
8191 
+			} elseif ($input === '/..')
8449 8192 
 			{
8450 8193 
 				$input = '/';
8451 8194 
 				$output = substr_replace($output, '', strrpos($output, '/'));
 
@@ -8460,8 +8203,7 @@  discard block
 
 block discarded – undo
8460 8203 
 			{
8461 8204 
 				$output .= substr($input, 0, $pos);
8462 8205 
 				$input = substr_replace($input, '', 0, $pos);
8463 
-			}
8464 
-			else
8206 
+			} else
8465 8207 
 			{
8466 8208 
 				$output .= $input;
8467 8209 
 				$input = '';
 
@@ -8555,8 +8297,7 @@  discard block
 
 block discarded – undo
8555 8297 
 							break;
8556 8298 
 						}
8557 8299 
 					}
8558 
-				}
8559 
-				else
8300 
+				} else
8560 8301 
 				{
8561 8302 
 					$position = $strlen - 1;
8562 8303 
 					$valid = false;
 
@@ -8590,8 +8331,9 @@  discard block
 
 block discarded – undo
8590 8331 
 			)
8591 8332 
 			{
8592 8333 
 				// If we were a character, pretend we weren't, but rather an error.
8593 
-				if ($valid)
8594 
-					$position--;
8334 
+				if ($valid) {
8335 
+									$position--;
8336 
+				}
8595 8337
8596 8338 
 				for ($j = $start; $j <= $position; $j++)
8597 8339 
 				{
 
@@ -8723,8 +8465,7 @@  discard block
 
 block discarded – undo
8723 8465 
 					{
8724 8466 
 						$string .= '%' . strtoupper($bytes[$j]);
8725 8467 
 					}
8726 
-				}
8727 
-				else
8468 
+				} else
8728 8469 
 				{
8729 8470 
 					for ($j = $start; $j <= $i; $j++)
8730 8471 
 					{
 
@@ -8783,20 +8524,28 @@  discard block
 
 block discarded – undo
8783 8524 
 	 */
8784 8525 
 	public function is_valid()
8785 8526 
 	{
8786 
-		if ($this->ipath === '') return true;
8527 
+		if ($this->ipath === '') {
8528 
+			return true;
8529 
+		}
8787 8530
8788 8531 
 		$isauthority = $this->iuserinfo !== null || $this->ihost !== null ||
8789 8532 
 			$this->port !== null;
8790 
-		if ($isauthority && $this->ipath[0] === '/') return true;
8533 
+		if ($isauthority && $this->ipath[0] === '/') {
8534 
+			return true;
8535 
+		}
8791 8536
8792 
-		if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) return false;
8537 
+		if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) {
8538 
+			return false;
8539 
+		}
8793 8540
8794 8541 
 		// Relative urls cannot have a colon in the first path segment (and the
8795 8542 
 		// slashes themselves are not included so skip the first character).
8796 8543 
 		if (!$this->scheme && !$isauthority &&
8797 8544 
 		    strpos($this->ipath, ':') !== false &&
8798 8545 
 		    strpos($this->ipath, '/', 1) !== false &&
8799 
-		    strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false;
8546 
+		    strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) {
8547 
+			return false;
8548 
+		}
8800 8549
8801 8550 
 		return true;
8802 8551 
 	}
 
@@ -8824,8 +8573,7 @@  discard block
 
 block discarded – undo
8824 8573 
 		if ($iri === null)
8825 8574 
 		{
8826 8575 
 			return true;
8827 
-		}
8828 
-		elseif (isset($cache[$iri]))
8576 
+		} elseif (isset($cache[$iri]))
8829 8577 
 		{
8830 8578 
 			list($this->scheme,
8831 8579 
 				 $this->iuserinfo,
 
@@ -8836,8 +8584,7 @@  discard block
 
 block discarded – undo
8836 8584 
 				 $this->ifragment,
8837 8585 
 				 $return) = $cache[$iri];
8838 8586 
 			return $return;
8839 
-		}
8840 
-		else
8587 
+		} else
8841 8588 
 		{
8842 8589 
 			$parsed = $this->parse_iri((string) $iri);
8843 8590 
 			if (!$parsed)
 
@@ -8875,13 +8622,11 @@  discard block
 
 block discarded – undo
8875 8622 
 		if ($scheme === null)
8876 8623 
 		{
8877 8624 
 			$this->scheme = null;
8878 
-		}
8879 
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
8625 
+		} elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
8880 8626 
 		{
8881 8627 
 			$this->scheme = null;
8882 8628 
 			return false;
8883 
-		}
8884 
-		else
8629 
+		} else
8885 8630 
 		{
8886 8631 
 			$this->scheme = strtolower($scheme);
8887 8632 
 		}
 
@@ -8903,8 +8648,9 @@  discard block
 
 block discarded – undo
8903 8648 
 			$cache = null;
8904 8649 
 			return;
8905 8650 
 		}
8906 
-		if (!$cache)
8907 
-			$cache = array();
8651 
+		if (!$cache) {
8652 
+					$cache = array();
8653 
+		}
8908 8654
8909 8655 
 		if ($authority === null)
8910 8656 
 		{
 
@@ -8912,8 +8658,7 @@  discard block
 
 block discarded – undo
8912 8658 
 			$this->ihost = null;
8913 8659 
 			$this->port = null;
8914 8660 
 			return true;
8915 
-		}
8916 
-		elseif (isset($cache[$authority]))
8661 
+		} elseif (isset($cache[$authority]))
8917 8662 
 		{
8918 8663 
 			list($this->iuserinfo,
8919 8664 
 				 $this->ihost,
 
@@ -8921,16 +8666,14 @@  discard block
 
 block discarded – undo
8921 8666 
 				 $return) = $cache[$authority];
8922 8667
8923 8668 
 			return $return;
8924 
-		}
8925 
-		else
8669 
+		} else
8926 8670 
 		{
8927 8671 
 			$remaining = $authority;
8928 8672 
 			if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
8929 8673 
 			{
8930 8674 
 				$iuserinfo = substr($remaining, 0, $iuserinfo_end);
8931 8675 
 				$remaining = substr($remaining, $iuserinfo_end + 1);
8932 
-			}
8933 
-			else
8676 
+			} else
8934 8677 
 			{
8935 8678 
 				$iuserinfo = null;
8936 8679 
 			}
 
@@ -8941,8 +8684,7 @@  discard block
 
 block discarded – undo
8941 8684 
 					$port = null;
8942 8685 
 				}
8943 8686 
 				$remaining = substr($remaining, 0, $port_start);
8944 
-			}
8945 
-			else
8687 
+			} else
8946 8688 
 			{
8947 8689 
 				$port = null;
8948 8690 
 			}
 
@@ -8971,8 +8713,7 @@  discard block
 
 block discarded – undo
8971 8713 
 		if ($iuserinfo === null)
8972 8714 
 		{
8973 8715 
 			$this->iuserinfo = null;
8974 
-		}
8975 
-		else
8716 
+		} else
8976 8717 
 		{
8977 8718 
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
8978 8719 
 			$this->scheme_normalization();
 
@@ -8994,20 +8735,17 @@  discard block
 
 block discarded – undo
8994 8735 
 		{
8995 8736 
 			$this->ihost = null;
8996 8737 
 			return true;
8997 
-		}
8998 
-		elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
8738 
+		} elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
8999 8739 
 		{
9000 8740 
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
9001 8741 
 			{
9002 8742 
 				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
9003 
-			}
9004 
-			else
8743 
+			} else
9005 8744 
 			{
9006 8745 
 				$this->ihost = null;
9007 8746 
 				return false;
9008 8747 
 			}
9009 
-		}
9010 
-		else
8748 
+		} else
9011 8749 
 		{
9012 8750 
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
9013 8751 
 
@@ -9021,8 +8759,7 @@  discard block
 
 block discarded – undo
9021 8759 
 				if ($ihost[$position] === '%')
9022 8760 
 				{
9023 8761 
 					$position += 3;
9024 
-				}
9025 
-				else
8762 
+				} else
9026 8763 
 				{
9027 8764 
 					$ihost[$position] = strtolower($ihost[$position]);
9028 8765 
 					$position++;
 
@@ -9050,14 +8787,12 @@  discard block
 
 block discarded – undo
9050 8787 
 		{
9051 8788 
 			$this->port = null;
9052 8789 
 			return true;
9053 
-		}
9054 
-		elseif (strspn($port, '0123456789') === strlen($port))
8790 
+		} elseif (strspn($port, '0123456789') === strlen($port))
9055 8791 
 		{
9056 8792 
 			$this->port = (int) $port;
9057 8793 
 			$this->scheme_normalization();
9058 8794 
 			return true;
9059 
-		}
9060 
-		else
8795 
+		} else
9061 8796 
 		{
9062 8797 
 			$this->port = null;
9063 8798 
 			return false;
 
@@ -9088,8 +8823,7 @@  discard block
 
 block discarded – undo
9088 8823 
 		if (isset($cache[$ipath]))
9089 8824 
 		{
9090 8825 
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
9091 
-		}
9092 
-		else
8826 
+		} else
9093 8827 
 		{
9094 8828 
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
9095 8829 
 			$removed = $this->remove_dot_segments($valid);
 
@@ -9113,8 +8847,7 @@  discard block
 
 block discarded – undo
9113 8847 
 		if ($iquery === null)
9114 8848 
 		{
9115 8849 
 			$this->iquery = null;
9116 
-		}
9117 
-		else
8850 
+		} else
9118 8851 
 		{
9119 8852 
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
9120 8853 
 			$this->scheme_normalization();
 
@@ -9133,8 +8866,7 @@  discard block
 
 block discarded – undo
9133 8866 
 		if ($ifragment === null)
9134 8867 
 		{
9135 8868 
 			$this->ifragment = null;
9136 
-		}
9137 
-		else
8869 
+		} else
9138 8870 
 		{
9139 8871 
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
9140 8872 
 			$this->scheme_normalization();
 
@@ -9191,8 +8923,7 @@  discard block
 
 block discarded – undo
9191 8923 
 		if ($this->ipath !== '')
9192 8924 
 		{
9193 8925 
 			$iri .= $this->ipath;
9194 
-		}
9195 
-		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
8926 
+		} elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
9196 8927 
 		{
9197 8928 
 			$iri .= $this->normalization[$this->scheme]['ipath'];
9198 8929 
 		}
 
@@ -9241,8 +8972,7 @@  discard block
 
 block discarded – undo
9241 8972 
 				$iauthority .= ':' . $this->port;
9242 8973 
 			}
9243 8974 
 			return $iauthority;
9244 
-		}
9245 
-		else
8975 
+		} else
9246 8976 
 		{
9247 8977 
 			return null;
9248 8978 
 		}
 
@@ -9256,10 +8986,11 @@  discard block
 
 block discarded – undo
9256 8986 
 	protected function get_authority()
9257 8987 
 	{
9258 8988 
 		$iauthority = $this->get_iauthority();
9259 
-		if (is_string($iauthority))
9260 
-			return $this->to_uri($iauthority);
9261 
-		else
9262 
-			return $iauthority;
8989 
+		if (is_string($iauthority)) {
8990 
+					return $this->to_uri($iauthority);
8991 
+		} else {
8992 
+					return $iauthority;
8993 
+		}
9263 8994 
 	}
9264 8995 
 }
9265 8996 
 
@@ -9367,8 +9098,7 @@  discard block
 
 block discarded – undo
9367 9098 
 		if (isset($this->data['child'][$namespace][$tag]))
9368 9099 
 		{
9369 9100 
 			return $this->data['child'][$namespace][$tag];
9370 
-		}
9371 
-		else
9101 
+		} else
9372 9102 
 		{
9373 9103 
 			return null;
9374 9104 
 		}
 
@@ -9437,24 +9167,19 @@  discard block
 
 block discarded – undo
9437 9167 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
9438 9168 
 			{
9439 9169 
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9440 
-			}
9441 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
9170 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
9442 9171 
 			{
9443 9172 
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9444 
-			}
9445 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
9173 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
9446 9174 
 			{
9447 9175 
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9448 
-			}
9449 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
9176 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
9450 9177 
 			{
9451 9178 
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9452 
-			}
9453 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
9179 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
9454 9180 
 			{
9455 9181 
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9456 
-			}
9457 
-			elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
9182 
+			} elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
9458 9183 
 			{
9459 9184 
 				return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
9460 9185 
 			}
 
@@ -9462,8 +9187,7 @@  discard block
 
 block discarded – undo
9462 9187 
 		if ($fn === false)
9463 9188 
 		{
9464 9189 
 			return null;
9465 
-		}
9466 
-		elseif (!is_callable($fn))
9190 
+		} elseif (!is_callable($fn))
9467 9191 
 		{
9468 9192 
 			trigger_error('User-supplied function $fn must be callable', E_USER_WARNING);
9469 9193 
 			$fn = 'md5';
 
@@ -9487,32 +9211,25 @@  discard block
 
 block discarded – undo
9487 9211 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
9488 9212 
 			{
9489 9213 
 				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
9490 
-			}
9491 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
9214 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
9492 9215 
 			{
9493 9216 
 				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
9494 
-			}
9495 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
9217 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
9496 9218 
 			{
9497 9219 
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
9498 
-			}
9499 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
9220 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
9500 9221 
 			{
9501 9222 
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
9502 
-			}
9503 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
9223 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
9504 9224 
 			{
9505 9225 
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
9506 
-			}
9507 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
9226 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
9508 9227 
 			{
9509 9228 
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9510 
-			}
9511 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
9229 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
9512 9230 
 			{
9513 9231 
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9514 
-			}
9515 
-			else
9232 
+			} else
9516 9233 
 			{
9517 9234 
 				$this->data['title'] = null;
9518 9235 
 			}
 
@@ -9541,53 +9258,42 @@  discard block
 
 block discarded – undo
9541 9258 
 		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
9542 9259 
 		{
9543 9260 
 			return $return;
9544 
-		}
9545 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
9261 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
9546 9262 
 		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
9547 9263 
 		{
9548 9264 
 			return $return;
9549 
-		}
9550 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
9265 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
9551 9266 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0]))))
9552 9267 
 		{
9553 9268 
 			return $return;
9554 
-		}
9555 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
9269 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
9556 9270 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
9557 9271 
 		{
9558 9272 
 			return $return;
9559 
-		}
9560 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
9273 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
9561 9274 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
9562 9275 
 		{
9563 9276 
 			return $return;
9564 
-		}
9565 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
9277 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
9566 9278 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
9567 9279 
 		{
9568 9280 
 			return $return;
9569 
-		}
9570 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
9281 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
9571 9282 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
9572 9283 
 		{
9573 9284 
 			return $return;
9574 
-		}
9575 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
9285 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
9576 9286 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
9577 9287 
 		{
9578 9288 
 			return $return;
9579 
-		}
9580 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
9289 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
9581 9290 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)))
9582 9291 
 		{
9583 9292 
 			return $return;
9584 
-		}
9585 
-
9586 
-		elseif (!$description_only)
9293 
+		} elseif (!$description_only)
9587 9294 
 		{
9588 9295 
 			return $this->get_content(true);
9589 
-		}
9590 
-		else
9296 
+		} else
9591 9297 
 		{
9592 9298 
 			return null;
9593 9299 
 		}
 
@@ -9613,22 +9319,18 @@  discard block
 
 block discarded – undo
9613 9319 
 		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
9614 9320 
 		{
9615 9321 
 			return $return;
9616 
-		}
9617 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
9322 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
9618 9323 
 		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
9619 9324 
 		{
9620 9325 
 			return $return;
9621 
-		}
9622 
-		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
9326 
+		} elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
9623 9327 
 		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
9624 9328 
 		{
9625 9329 
 			return $return;
9626 
-		}
9627 
-		elseif (!$content_only)
9330 
+		} elseif (!$content_only)
9628 9331 
 		{
9629 9332 
 			return $this->get_description(true);
9630 
-		}
9631 
-		else
9333 
+		} else
9632 9334 
 		{
9633 9335 
 			return null;
9634 9336 
 		}
 
@@ -9649,8 +9351,7 @@  discard block
 
 block discarded – undo
9649 9351 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
9650 9352 
 			{
9651 9353 
 				$this->data['thumbnail'] = $return[0]['attribs'][''];
9652 
-			}
9653 
-			else
9354 
+			} else
9654 9355 
 			{
9655 9356 
 				$this->data['thumbnail'] = null;
9656 9357 
 			}
 
@@ -9671,8 +9372,7 @@  discard block
 
 block discarded – undo
9671 9372 
 		if (isset($categories[$key]))
9672 9373 
 		{
9673 9374 
 			return $categories[$key];
9674 
-		}
9675 
-		else
9375 
+		} else
9676 9376 
 		{
9677 9377 
 			return null;
9678 9378 
 		}
 
@@ -9718,8 +9418,7 @@  discard block
 
 block discarded – undo
9718 9418 
 			if (isset($category['attribs']['']['domain']))
9719 9419 
 			{
9720 9420 
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
9721 
-			}
9722 
-			else
9421 
+			} else
9723 9422 
 			{
9724 9423 
 				$scheme = null;
9725 9424 
 			}
 
@@ -9739,8 +9438,7 @@  discard block
 
 block discarded – undo
9739 9438 
 		if (!empty($categories))
9740 9439 
 		{
9741 9440 
 			return array_unique($categories);
9742 
-		}
9743 
-		else
9441 
+		} else
9744 9442 
 		{
9745 9443 
 			return null;
9746 9444 
 		}
 
@@ -9759,8 +9457,7 @@  discard block
 
 block discarded – undo
9759 9457 
 		if (isset($authors[$key]))
9760 9458 
 		{
9761 9459 
 			return $authors[$key];
9762 
-		}
9763 
-		else
9460 
+		} else
9764 9461 
 		{
9765 9462 
 			return null;
9766 9463 
 		}
 
@@ -9779,8 +9476,7 @@  discard block
 
 block discarded – undo
9779 9476 
 		if (isset($contributors[$key]))
9780 9477 
 		{
9781 9478 
 			return $contributors[$key];
9782 
-		}
9783 
-		else
9479 
+		} else
9784 9480 
 		{
9785 9481 
 			return null;
9786 9482 
 		}
 
@@ -9845,8 +9541,7 @@  discard block
 
 block discarded – undo
9845 9541 
 		if (!empty($contributors))
9846 9542 
 		{
9847 9543 
 			return array_unique($contributors);
9848 
-		}
9849 
-		else
9544 
+		} else
9850 9545 
 		{
9851 9546 
 			return null;
9852 9547 
 		}
 
@@ -9927,16 +9622,13 @@  discard block
 
 block discarded – undo
9927 9622 
 		if (!empty($authors))
9928 9623 
 		{
9929 9624 
 			return array_unique($authors);
9930 
-		}
9931 
-		elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
9625 
+		} elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
9932 9626 
 		{
9933 9627 
 			return $authors;
9934 
-		}
9935 
-		elseif ($authors = $this->feed->get_authors())
9628 
+		} elseif ($authors = $this->feed->get_authors())
9936 9629 
 		{
9937 9630 
 			return $authors;
9938 
-		}
9939 
-		else
9631 
+		} else
9940 9632 
 		{
9941 9633 
 			return null;
9942 9634 
 		}
 
@@ -9955,16 +9647,13 @@  discard block
 
 block discarded – undo
9955 9647 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
9956 9648 
 		{
9957 9649 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
9958 
-		}
9959 
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
9650 
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
9960 9651 
 		{
9961 9652 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9962 
-		}
9963 
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
9653 
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
9964 9654 
 		{
9965 9655 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
9966 
-		}
9967 
-		else
9656 
+		} else
9968 9657 
 		{
9969 9658 
 			return null;
9970 9659 
 		}
 
@@ -9991,32 +9680,25 @@  discard block
 
 block discarded – undo
9991 9680 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
9992 9681 
 			{
9993 9682 
 				$this->data['date']['raw'] = $return[0]['data'];
9994 
-			}
9995 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
9683 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
9996 9684 
 			{
9997 9685 
 				$this->data['date']['raw'] = $return[0]['data'];
9998 
-			}
9999 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
9686 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
10000 9687 
 			{
10001 9688 
 				$this->data['date']['raw'] = $return[0]['data'];
10002 
-			}
10003 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
9689 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
10004 9690 
 			{
10005 9691 
 				$this->data['date']['raw'] = $return[0]['data'];
10006 
-			}
10007 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
9692 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
10008 9693 
 			{
10009 9694 
 				$this->data['date']['raw'] = $return[0]['data'];
10010 
-			}
10011 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
9695 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
10012 9696 
 			{
10013 9697 
 				$this->data['date']['raw'] = $return[0]['data'];
10014 
-			}
10015 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
9698 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
10016 9699 
 			{
10017 9700 
 				$this->data['date']['raw'] = $return[0]['data'];
10018 
-			}
10019 
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
9701 
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
10020 9702 
 			{
10021 9703 
 				$this->data['date']['raw'] = $return[0]['data'];
10022 9704 
 			}
 
@@ -10025,8 +9707,7 @@  discard block
 
 block discarded – undo
10025 9707 
 			{
10026 9708 
 				$parser = $this->registry->call('Parse_Date', 'get');
10027 9709 
 				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
10028 
-			}
10029 
-			else
9710 
+			} else
10030 9711 
 			{
10031 9712 
 				$this->data['date'] = null;
10032 9713 
 			}
 
@@ -10045,8 +9726,7 @@  discard block
 
 block discarded – undo
10045 9726 
 				default:
10046 9727 
 					return date($date_format, $this->data['date']['parsed']);
10047 9728 
 			}
10048 
-		}
10049 
-		else
9729 
+		} else
10050 9730 
 		{
10051 9731 
 			return null;
10052 9732 
 		}
 
@@ -10076,8 +9756,7 @@  discard block
 
 block discarded – undo
10076 9756 
 			{
10077 9757 
 				$parser = $this->registry->call('Parse_Date', 'get');
10078 9758 
 				$this->data['updated']['parsed'] = $parser->parse($this->data['updated']['raw']);
10079 
-			}
10080 
-			else
9759 
+			} else
10081 9760 
 			{
10082 9761 
 				$this->data['updated'] = null;
10083 9762 
 			}
 
@@ -10096,8 +9775,7 @@  discard block
 
 block discarded – undo
10096 9775 
 				default:
10097 9776 
 					return date($date_format, $this->data['updated']['parsed']);
10098 9777 
 			}
10099 
-		}
10100 
-		else
9778 
+		} else
10101 9779 
 		{
10102 9780 
 			return null;
10103 9781 
 		}
 
@@ -10121,12 +9799,10 @@  discard block
 
 block discarded – undo
10121 9799 
 		if (!$date_format)
10122 9800 
 		{
10123 9801 
 			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
10124 
-		}
10125 
-		elseif (($date = $this->get_date('U')) !== null && $date !== false)
9802 
+		} elseif (($date = $this->get_date('U')) !== null && $date !== false)
10126 9803 
 		{
10127 9804 
 			return strftime($date_format, $date);
10128 
-		}
10129 
-		else
9805 
+		} else
10130 9806 
 		{
10131 9807 
 			return null;
10132 9808 
 		}
 
@@ -10185,12 +9861,10 @@  discard block
 
 block discarded – undo
10185 9861 
 		if ($link !== null)
10186 9862 
 		{
10187 9863 
 			return $link;
10188 
-		}
10189 
-		elseif ($enclosure !== null)
9864 
+		} elseif ($enclosure !== null)
10190 9865 
 		{
10191 9866 
 			return $enclosure->get_link();
10192 
-		}
10193 
-		else
9867 
+		} else
10194 9868 
 		{
10195 9869 
 			return null;
10196 9870 
 		}
 
@@ -10210,8 +9884,7 @@  discard block
 
 block discarded – undo
10210 9884 
 		if ($links[$key] !== null)
10211 9885 
 		{
10212 9886 
 			return $links[$key];
10213 
-		}
10214 
-		else
9887 
+		} else
10215 9888 
 		{
10216 9889 
 			return null;
10217 9890 
 		}
 
@@ -10277,13 +9950,11 @@  discard block
 
 block discarded – undo
10277 9950 
 					{
10278 9951 
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
10279 9952 
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
10280 
-					}
10281 
-					else
9953 
+					} else
10282 9954 
 					{
10283 9955 
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
10284 9956 
 					}
10285 
-				}
10286 
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
9957 
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
10287 9958 
 				{
10288 9959 
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
10289 9960 
 				}
 
@@ -10293,8 +9964,7 @@  discard block
 
 block discarded – undo
10293 9964 
 		if (isset($this->data['links'][$rel]))
10294 9965 
 		{
10295 9966 
 			return $this->data['links'][$rel];
10296 
-		}
10297 
-		else
9967 
+		} else
10298 9968 
 		{
10299 9969 
 			return null;
10300 9970 
 		}
 
@@ -10316,8 +9986,7 @@  discard block
 
 block discarded – undo
10316 9986 
 		if (isset($enclosures[$key]))
10317 9987 
 		{
10318 9988 
 			return $enclosures[$key];
10319 
-		}
10320 
-		else
9989 
+		} else
10321 9990 
 		{
10322 9991 
 			return null;
10323 9992 
 		}
 
@@ -10393,8 +10062,7 @@  discard block
 
 block discarded – undo
10393 10062 
 					}
10394 10063 
 					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
10395 10064 
 				}
10396 
-			}
10397 
-			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
10065 
+			} elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
10398 10066 
 			{
10399 10067 
 				foreach ($captions as $caption)
10400 10068 
 				{
 
@@ -10444,8 +10112,7 @@  discard block
 
 block discarded – undo
10444 10112 
 				if (isset($category['attribs']['']['scheme']))
10445 10113 
 				{
10446 10114 
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
10447 
-				}
10448 
-				else
10115 
+				} else
10449 10116 
 				{
10450 10117 
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
10451 10118 
 				}
 
@@ -10467,8 +10134,7 @@  discard block
 
 block discarded – undo
10467 10134 
 				if (isset($category['attribs']['']['scheme']))
10468 10135 
 				{
10469 10136 
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
10470 
-				}
10471 
-				else
10137 
+				} else
10472 10138 
 				{
10473 10139 
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
10474 10140 
 				}
 
@@ -10520,8 +10186,7 @@  discard block
 
 block discarded – undo
10520 10186 
 					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
10521 10187 
 				}
10522 10188 
 				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
10523 
-			}
10524 
-			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
10189 
+			} elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
10525 10190 
 			{
10526 10191 
 				$copyright_url = null;
10527 10192 
 				$copyright_label = null;
 
@@ -10551,8 +10216,7 @@  discard block
 
 block discarded – undo
10551 10216 
 					if (isset($credit['attribs']['']['scheme']))
10552 10217 
 					{
10553 10218 
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
10554 
-					}
10555 
-					else
10219 
+					} else
10556 10220 
 					{
10557 10221 
 						$credit_scheme = 'urn:ebu';
10558 10222 
 					}
 
@@ -10562,8 +10226,7 @@  discard block
 
 block discarded – undo
10562 10226 
 					}
10563 10227 
 					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
10564 10228 
 				}
10565 
-			}
10566 
-			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
10229 
+			} elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
10567 10230 
 			{
10568 10231 
 				foreach ($credits as $credit)
10569 10232 
 				{
 
@@ -10577,8 +10240,7 @@  discard block
 
 block discarded – undo
10577 10240 
 					if (isset($credit['attribs']['']['scheme']))
10578 10241 
 					{
10579 10242 
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
10580 
-					}
10581 
-					else
10243 
+					} else
10582 10244 
 					{
10583 10245 
 						$credit_scheme = 'urn:ebu';
10584 10246 
 					}
 
@@ -10601,8 +10263,7 @@  discard block
 
 block discarded – undo
10601 10263 
 				{
10602 10264 
 					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
10603 10265 
 				}
10604 
-			}
10605 
-			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
10266 
+			} elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
10606 10267 
 			{
10607 10268 
 				if (isset($description_parent[0]['data']))
10608 10269 
 				{
 
@@ -10652,15 +10313,13 @@  discard block
 
 block discarded – undo
10652 10313 
 					if (isset($hash['attribs']['']['algo']))
10653 10314 
 					{
10654 10315 
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
10655 
-					}
10656 
-					else
10316 
+					} else
10657 10317 
 					{
10658 10318 
 						$algo = 'md5';
10659 10319 
 					}
10660 10320 
 					$hashes_parent[] = $algo.':'.$value;
10661 10321 
 				}
10662 
-			}
10663 
-			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
10322 
+			} elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
10664 10323 
 			{
10665 10324 
 				foreach ($hashes_iterator as $hash)
10666 10325 
 				{
 
@@ -10673,8 +10332,7 @@  discard block
 
 block discarded – undo
10673 10332 
 					if (isset($hash['attribs']['']['algo']))
10674 10333 
 					{
10675 10334 
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
10676 
-					}
10677 
-					else
10335 
+					} else
10678 10336 
 					{
10679 10337 
 						$algo = 'md5';
10680 10338 
 					}
 
@@ -10698,8 +10356,7 @@  discard block
 
 block discarded – undo
10698 10356 
 					}
10699 10357 
 				}
10700 10358 
 				unset($temp);
10701 
-			}
10702 
-			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
10359 
+			} elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
10703 10360 
 			{
10704 10361 
 				if (isset($keywords[0]['data']))
10705 10362 
 				{
 
@@ -10710,8 +10367,7 @@  discard block
 
 block discarded – undo
10710 10367 
 					}
10711 10368 
 				}
10712 10369 
 				unset($temp);
10713 
-			}
10714 
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
10370 
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
10715 10371 
 			{
10716 10372 
 				if (isset($keywords[0]['data']))
10717 10373 
 				{
 
@@ -10722,8 +10378,7 @@  discard block
 
 block discarded – undo
10722 10378 
 					}
10723 10379 
 				}
10724 10380 
 				unset($temp);
10725 
-			}
10726 
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
10381 
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
10727 10382 
 			{
10728 10383 
 				if (isset($keywords[0]['data']))
10729 10384 
 				{
 
@@ -10747,8 +10402,7 @@  discard block
 
 block discarded – undo
10747 10402 
 				{
10748 10403 
 					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
10749 10404 
 				}
10750 
-			}
10751 
-			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
10405 
+			} elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
10752 10406 
 			{
10753 10407 
 				if (isset($player_parent[0]['attribs']['']['url']))
10754 10408 
 				{
 
@@ -10766,8 +10420,7 @@  discard block
 
 block discarded – undo
10766 10420 
 					if (isset($rating['attribs']['']['scheme']))
10767 10421 
 					{
10768 10422 
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
10769 
-					}
10770 
-					else
10423 
+					} else
10771 10424 
 					{
10772 10425 
 						$rating_scheme = 'urn:simple';
10773 10426 
 					}
 
@@ -10777,8 +10430,7 @@  discard block
 
 block discarded – undo
10777 10430 
 					}
10778 10431 
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
10779 10432 
 				}
10780 
-			}
10781 
-			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
10433 
+			} elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
10782 10434 
 			{
10783 10435 
 				foreach ($ratings as $rating)
10784 10436 
 				{
 
@@ -10790,8 +10442,7 @@  discard block
 
 block discarded – undo
10790 10442 
 					}
10791 10443 
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
10792 10444 
 				}
10793 
-			}
10794 
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
10445 
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
10795 10446 
 			{
10796 10447 
 				foreach ($ratings as $rating)
10797 10448 
 				{
 
@@ -10800,8 +10451,7 @@  discard block
 
 block discarded – undo
10800 10451 
 					if (isset($rating['attribs']['']['scheme']))
10801 10452 
 					{
10802 10453 
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
10803 
-					}
10804 
-					else
10454 
+					} else
10805 10455 
 					{
10806 10456 
 						$rating_scheme = 'urn:simple';
10807 10457 
 					}
 
@@ -10811,8 +10461,7 @@  discard block
 
 block discarded – undo
10811 10461 
 					}
10812 10462 
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
10813 10463 
 				}
10814 
-			}
10815 
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
10464 
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
10816 10465 
 			{
10817 10466 
 				foreach ($ratings as $rating)
10818 10467 
 				{
 
@@ -10852,8 +10501,7 @@  discard block
 
 block discarded – undo
10852 10501 
 					}
10853 10502 
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
10854 10503 
 				}
10855 
-			}
10856 
-			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
10504 
+			} elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
10857 10505 
 			{
10858 10506 
 				foreach ($restrictions as $restriction)
10859 10507 
 				{
 
@@ -10866,8 +10514,7 @@  discard block
 
 block discarded – undo
10866 10514 
 					}
10867 10515 
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
10868 10516 
 				}
10869 
-			}
10870 
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
10517 
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
10871 10518 
 			{
10872 10519 
 				foreach ($restrictions as $restriction)
10873 10520 
 				{
 
@@ -10888,8 +10535,7 @@  discard block
 
 block discarded – undo
10888 10535 
 					}
10889 10536 
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
10890 10537 
 				}
10891 
-			}
10892 
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
10538 
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
10893 10539 
 			{
10894 10540 
 				foreach ($restrictions as $restriction)
10895 10541 
 				{
 
@@ -10906,8 +10552,7 @@  discard block
 
 block discarded – undo
10906 10552 
 			if (is_array($restrictions_parent))
10907 10553 
 			{
10908 10554 
 				$restrictions_parent = array_values(array_unique($restrictions_parent));
10909 
-			}
10910 
-			else
10555 
+			} else
10911 10556 
 			{
10912 10557 
 				$restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
10913 10558 
 			}
 
@@ -10922,8 +10567,7 @@  discard block
 
 block discarded – undo
10922 10567 
 						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
10923 10568 
 					}
10924 10569 
 				}
10925 
-			}
10926 
-			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
10570 
+			} elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
10927 10571 
 			{
10928 10572 
 				foreach ($thumbnails as $thumbnail)
10929 10573 
 				{
 
@@ -10941,8 +10585,7 @@  discard block
 
 block discarded – undo
10941 10585 
 				{
10942 10586 
 					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
10943 10587 
 				}
10944 
-			}
10945 
-			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
10588 
+			} elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
10946 10589 
 			{
10947 10590 
 				if (isset($title_parent[0]['data']))
10948 10591 
 				{
 
@@ -11035,8 +10678,7 @@  discard block
 
 block discarded – undo
11035 10678 
 							if (isset($content['attribs']['']['duration']))
11036 10679 
 							{
11037 10680 
 								$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
11038 
-							}
11039 
-							else
10681 
+							} else
11040 10682 
 							{
11041 10683 
 								$duration = $duration_parent;
11042 10684 
 							}
 
@@ -11116,8 +10758,7 @@  discard block
 
 block discarded – undo
11116 10758 
 								{
11117 10759 
 									$captions = array_values(array_unique($captions));
11118 10760 
 								}
11119 
-							}
11120 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
10761 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
11121 10762 
 							{
11122 10763 
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
11123 10764 
 								{
 
@@ -11152,8 +10793,7 @@  discard block
 
 block discarded – undo
11152 10793 
 								{
11153 10794 
 									$captions = array_values(array_unique($captions));
11154 10795 
 								}
11155 
-							}
11156 
-							else
10796 
+							} else
11157 10797 
 							{
11158 10798 
 								$captions = $captions_parent;
11159 10799 
 							}
 
@@ -11173,8 +10813,7 @@  discard block
 
 block discarded – undo
11173 10813 
 									if (isset($category['attribs']['']['scheme']))
11174 10814 
 									{
11175 10815 
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11176 
-									}
11177 
-									else
10816 
+									} else
11178 10817 
 									{
11179 10818 
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
11180 10819 
 									}
 
@@ -11199,8 +10838,7 @@  discard block
 
 block discarded – undo
11199 10838 
 									if (isset($category['attribs']['']['scheme']))
11200 10839 
 									{
11201 10840 
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11202 
-									}
11203 
-									else
10841 
+									} else
11204 10842 
 									{
11205 10843 
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
11206 10844 
 									}
 
@@ -11214,12 +10852,10 @@  discard block
 
 block discarded – undo
11214 10852 
 							if (is_array($categories) && is_array($categories_parent))
11215 10853 
 							{
11216 10854 
 								$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
11217 
-							}
11218 
-							elseif (is_array($categories))
10855 
+							} elseif (is_array($categories))
11219 10856 
 							{
11220 10857 
 								$categories = array_values(array_unique($categories));
11221 
-							}
11222 
-							elseif (is_array($categories_parent))
10858 
+							} elseif (is_array($categories_parent))
11223 10859 
 							{
11224 10860 
 								$categories = array_values(array_unique($categories_parent));
11225 10861 
 							}
 
@@ -11238,8 +10874,7 @@  discard block
 
 block discarded – undo
11238 10874 
 									$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11239 10875 
 								}
11240 10876 
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
11241 
-							}
11242 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
10877 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
11243 10878 
 							{
11244 10879 
 								$copyright_url = null;
11245 10880 
 								$copyright_label = null;
 
@@ -11252,8 +10887,7 @@  discard block
 
 block discarded – undo
11252 10887 
 									$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11253 10888 
 								}
11254 10889 
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
11255 
-							}
11256 
-							else
10890 
+							} else
11257 10891 
 							{
11258 10892 
 								$copyrights = $copyrights_parent;
11259 10893 
 							}
 
@@ -11273,8 +10907,7 @@  discard block
 
 block discarded – undo
11273 10907 
 									if (isset($credit['attribs']['']['scheme']))
11274 10908 
 									{
11275 10909 
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11276 
-									}
11277 
-									else
10910 
+									} else
11278 10911 
 									{
11279 10912 
 										$credit_scheme = 'urn:ebu';
11280 10913 
 									}
 
@@ -11288,8 +10921,7 @@  discard block
 
 block discarded – undo
11288 10921 
 								{
11289 10922 
 									$credits = array_values(array_unique($credits));
11290 10923 
 								}
11291 
-							}
11292 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
10924 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
11293 10925 
 							{
11294 10926 
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
11295 10927 
 								{
 
@@ -11303,8 +10935,7 @@  discard block
 
 block discarded – undo
11303 10935 
 									if (isset($credit['attribs']['']['scheme']))
11304 10936 
 									{
11305 10937 
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11306 
-									}
11307 
-									else
10938 
+									} else
11308 10939 
 									{
11309 10940 
 										$credit_scheme = 'urn:ebu';
11310 10941 
 									}
 
@@ -11318,8 +10949,7 @@  discard block
 
 block discarded – undo
11318 10949 
 								{
11319 10950 
 									$credits = array_values(array_unique($credits));
11320 10951 
 								}
11321 
-							}
11322 
-							else
10952 
+							} else
11323 10953 
 							{
11324 10954 
 								$credits = $credits_parent;
11325 10955 
 							}
 
@@ -11328,12 +10958,10 @@  discard block
 
 block discarded – undo
11328 10958 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
11329 10959 
 							{
11330 10960 
 								$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11331 
-							}
11332 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
10961 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
11333 10962 
 							{
11334 10963 
 								$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11335 
-							}
11336 
-							else
10964 
+							} else
11337 10965 
 							{
11338 10966 
 								$description = $description_parent;
11339 10967 
 							}
 
@@ -11352,8 +10980,7 @@  discard block
 
 block discarded – undo
11352 10980 
 									if (isset($hash['attribs']['']['algo']))
11353 10981 
 									{
11354 10982 
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
11355 
-									}
11356 
-									else
10983 
+									} else
11357 10984 
 									{
11358 10985 
 										$algo = 'md5';
11359 10986 
 									}
 
@@ -11363,8 +10990,7 @@  discard block
 
 block discarded – undo
11363 10990 
 								{
11364 10991 
 									$hashes = array_values(array_unique($hashes));
11365 10992 
 								}
11366 
-							}
11367 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
10993 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
11368 10994 
 							{
11369 10995 
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
11370 10996 
 								{
 
@@ -11377,8 +11003,7 @@  discard block
 
 block discarded – undo
11377 11003 
 									if (isset($hash['attribs']['']['algo']))
11378 11004 
 									{
11379 11005 
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
11380 
-									}
11381 
-									else
11006 
+									} else
11382 11007 
 									{
11383 11008 
 										$algo = 'md5';
11384 11009 
 									}
 
@@ -11388,8 +11013,7 @@  discard block
 
 block discarded – undo
11388 11013 
 								{
11389 11014 
 									$hashes = array_values(array_unique($hashes));
11390 11015 
 								}
11391 
-							}
11392 
-							else
11016 
+							} else
11393 11017 
 							{
11394 11018 
 								$hashes = $hashes_parent;
11395 11019 
 							}
 
@@ -11410,8 +11034,7 @@  discard block
 
 block discarded – undo
11410 11034 
 								{
11411 11035 
 									$keywords = array_values(array_unique($keywords));
11412 11036 
 								}
11413 
-							}
11414 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
11037 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
11415 11038 
 							{
11416 11039 
 								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
11417 11040 
 								{
 
@@ -11426,8 +11049,7 @@  discard block
 
 block discarded – undo
11426 11049 
 								{
11427 11050 
 									$keywords = array_values(array_unique($keywords));
11428 11051 
 								}
11429 
-							}
11430 
-							else
11052 
+							} else
11431 11053 
 							{
11432 11054 
 								$keywords = $keywords_parent;
11433 11055 
 							}
 
@@ -11436,12 +11058,10 @@  discard block
 
 block discarded – undo
11436 11058 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
11437 11059 
 							{
11438 11060 
 								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
11439 
-							}
11440 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
11061 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
11441 11062 
 							{
11442 11063 
 								$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
11443 
-							}
11444 
-							else
11064 
+							} else
11445 11065 
 							{
11446 11066 
 								$player = $player_parent;
11447 11067 
 							}
 
@@ -11456,8 +11076,7 @@  discard block
 
 block discarded – undo
11456 11076 
 									if (isset($rating['attribs']['']['scheme']))
11457 11077 
 									{
11458 11078 
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11459 
-									}
11460 
-									else
11079 
+									} else
11461 11080 
 									{
11462 11081 
 										$rating_scheme = 'urn:simple';
11463 11082 
 									}
 
@@ -11471,8 +11090,7 @@  discard block
 
 block discarded – undo
11471 11090 
 								{
11472 11091 
 									$ratings = array_values(array_unique($ratings));
11473 11092 
 								}
11474 
-							}
11475 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
11093 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
11476 11094 
 							{
11477 11095 
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
11478 11096 
 								{
 
@@ -11481,8 +11099,7 @@  discard block
 
 block discarded – undo
11481 11099 
 									if (isset($rating['attribs']['']['scheme']))
11482 11100 
 									{
11483 11101 
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11484 
-									}
11485 
-									else
11102 
+									} else
11486 11103 
 									{
11487 11104 
 										$rating_scheme = 'urn:simple';
11488 11105 
 									}
 
@@ -11496,8 +11113,7 @@  discard block
 
 block discarded – undo
11496 11113 
 								{
11497 11114 
 									$ratings = array_values(array_unique($ratings));
11498 11115 
 								}
11499 
-							}
11500 
-							else
11116 
+							} else
11501 11117 
 							{
11502 11118 
 								$ratings = $ratings_parent;
11503 11119 
 							}
 
@@ -11528,8 +11144,7 @@  discard block
 
 block discarded – undo
11528 11144 
 								{
11529 11145 
 									$restrictions = array_values(array_unique($restrictions));
11530 11146 
 								}
11531 
-							}
11532 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
11147 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
11533 11148 
 							{
11534 11149 
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
11535 11150 
 								{
 
@@ -11554,8 +11169,7 @@  discard block
 
 block discarded – undo
11554 11169 
 								{
11555 11170 
 									$restrictions = array_values(array_unique($restrictions));
11556 11171 
 								}
11557 
-							}
11558 
-							else
11172 
+							} else
11559 11173 
 							{
11560 11174 
 								$restrictions = $restrictions_parent;
11561 11175 
 							}
 
@@ -11571,8 +11185,7 @@  discard block
 
 block discarded – undo
11571 11185 
 								{
11572 11186 
 									$thumbnails = array_values(array_unique($thumbnails));
11573 11187 
 								}
11574 
-							}
11575 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
11188 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
11576 11189 
 							{
11577 11190 
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
11578 11191 
 								{
 
@@ -11582,8 +11195,7 @@  discard block
 
 block discarded – undo
11582 11195 
 								{
11583 11196 
 									$thumbnails = array_values(array_unique($thumbnails));
11584 11197 
 								}
11585 
-							}
11586 
-							else
11198 
+							} else
11587 11199 
 							{
11588 11200 
 								$thumbnails = $thumbnails_parent;
11589 11201 
 							}
 
@@ -11592,12 +11204,10 @@  discard block
 
 block discarded – undo
11592 11204 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
11593 11205 
 							{
11594 11206 
 								$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11595 
-							}
11596 
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
11207 
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
11597 11208 
 							{
11598 11209 
 								$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11599 
-							}
11600 
-							else
11210 
+							} else
11601 11211 
 							{
11602 11212 
 								$title = $title_parent;
11603 11213 
 							}
 
@@ -11657,8 +11267,7 @@  discard block
 
 block discarded – undo
11657 11267 
 						if (isset($content['attribs']['']['duration']))
11658 11268 
 						{
11659 11269 
 							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
11660 
-						}
11661 
-						else
11270 
+						} else
11662 11271 
 						{
11663 11272 
 							$duration = $duration_parent;
11664 11273 
 						}
 
@@ -11740,8 +11349,7 @@  discard block
 
 block discarded – undo
11740 11349 
 							{
11741 11350 
 								$captions = array_values(array_unique($captions));
11742 11351 
 							}
11743 
-						}
11744 
-						else
11352 
+						} else
11745 11353 
 						{
11746 11354 
 							$captions = $captions_parent;
11747 11355 
 						}
 
@@ -11761,8 +11369,7 @@  discard block
 
 block discarded – undo
11761 11369 
 								if (isset($category['attribs']['']['scheme']))
11762 11370 
 								{
11763 11371 
 									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11764 
-								}
11765 
-								else
11372 
+								} else
11766 11373 
 								{
11767 11374 
 									$scheme = 'http://search.yahoo.com/mrss/category_schema';
11768 11375 
 								}
 
@@ -11776,16 +11383,13 @@  discard block
 
 block discarded – undo
11776 11383 
 						if (is_array($categories) && is_array($categories_parent))
11777 11384 
 						{
11778 11385 
 							$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
11779 
-						}
11780 
-						elseif (is_array($categories))
11386 
+						} elseif (is_array($categories))
11781 11387 
 						{
11782 11388 
 							$categories = array_values(array_unique($categories));
11783 
-						}
11784 
-						elseif (is_array($categories_parent))
11389 
+						} elseif (is_array($categories_parent))
11785 11390 
 						{
11786 11391 
 							$categories = array_values(array_unique($categories_parent));
11787 
-						}
11788 
-						else
11392 
+						} else
11789 11393 
 						{
11790 11394 
 							$categories = null;
11791 11395 
 						}
 
@@ -11804,8 +11408,7 @@  discard block
 
 block discarded – undo
11804 11408 
 								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11805 11409 
 							}
11806 11410 
 							$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
11807 
-						}
11808 
-						else
11411 
+						} else
11809 11412 
 						{
11810 11413 
 							$copyrights = $copyrights_parent;
11811 11414 
 						}
 
@@ -11825,8 +11428,7 @@  discard block
 
 block discarded – undo
11825 11428 
 								if (isset($credit['attribs']['']['scheme']))
11826 11429 
 								{
11827 11430 
 									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11828 
-								}
11829 
-								else
11431 
+								} else
11830 11432 
 								{
11831 11433 
 									$credit_scheme = 'urn:ebu';
11832 11434 
 								}
 
@@ -11840,8 +11442,7 @@  discard block
 
 block discarded – undo
11840 11442 
 							{
11841 11443 
 								$credits = array_values(array_unique($credits));
11842 11444 
 							}
11843 
-						}
11844 
-						else
11445 
+						} else
11845 11446 
 						{
11846 11447 
 							$credits = $credits_parent;
11847 11448 
 						}
 
@@ -11850,8 +11451,7 @@  discard block
 
 block discarded – undo
11850 11451 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
11851 11452 
 						{
11852 11453 
 							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
11853 
-						}
11854 
-						else
11454 
+						} else
11855 11455 
 						{
11856 11456 
 							$description = $description_parent;
11857 11457 
 						}
 
@@ -11870,8 +11470,7 @@  discard block
 
 block discarded – undo
11870 11470 
 								if (isset($hash['attribs']['']['algo']))
11871 11471 
 								{
11872 11472 
 									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
11873 
-								}
11874 
-								else
11473 
+								} else
11875 11474 
 								{
11876 11475 
 									$algo = 'md5';
11877 11476 
 								}
 
@@ -11881,8 +11480,7 @@  discard block
 
 block discarded – undo
11881 11480 
 							{
11882 11481 
 								$hashes = array_values(array_unique($hashes));
11883 11482 
 							}
11884 
-						}
11885 
-						else
11483 
+						} else
11886 11484 
 						{
11887 11485 
 							$hashes = $hashes_parent;
11888 11486 
 						}
 
@@ -11903,8 +11501,7 @@  discard block
 
 block discarded – undo
11903 11501 
 							{
11904 11502 
 								$keywords = array_values(array_unique($keywords));
11905 11503 
 							}
11906 
-						}
11907 
-						else
11504 
+						} else
11908 11505 
 						{
11909 11506 
 							$keywords = $keywords_parent;
11910 11507 
 						}
 
@@ -11915,8 +11512,7 @@  discard block
 
 block discarded – undo
11915 11512 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'])) {
11916 11513 
 								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
11917 11514 
 							}
11918 
-						}
11919 
-						else
11515 
+						} else
11920 11516 
 						{
11921 11517 
 							$player = $player_parent;
11922 11518 
 						}
 
@@ -11931,8 +11527,7 @@  discard block
 
 block discarded – undo
11931 11527 
 								if (isset($rating['attribs']['']['scheme']))
11932 11528 
 								{
11933 11529 
 									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
11934 
-								}
11935 
-								else
11530 
+								} else
11936 11531 
 								{
11937 11532 
 									$rating_scheme = 'urn:simple';
11938 11533 
 								}
 
@@ -11946,8 +11541,7 @@  discard block
 
 block discarded – undo
11946 11541 
 							{
11947 11542 
 								$ratings = array_values(array_unique($ratings));
11948 11543 
 							}
11949 
-						}
11950 
-						else
11544 
+						} else
11951 11545 
 						{
11952 11546 
 							$ratings = $ratings_parent;
11953 11547 
 						}
 
@@ -11978,8 +11572,7 @@  discard block
 
 block discarded – undo
11978 11572 
 							{
11979 11573 
 								$restrictions = array_values(array_unique($restrictions));
11980 11574 
 							}
11981 
-						}
11982 
-						else
11575 
+						} else
11983 11576 
 						{
11984 11577 
 							$restrictions = $restrictions_parent;
11985 11578 
 						}
 
@@ -11997,8 +11590,7 @@  discard block
 
 block discarded – undo
11997 11590 
 							{
11998 11591 
 								$thumbnails = array_values(array_unique($thumbnails));
11999 11592 
 							}
12000 
-						}
12001 
-						else
11593 
+						} else
12002 11594 
 						{
12003 11595 
 							$thumbnails = $thumbnails_parent;
12004 11596 
 						}
 
@@ -12007,8 +11599,7 @@  discard block
 
 block discarded – undo
12007 11599 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
12008 11600 
 						{
12009 11601 
 							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
12010 
-						}
12011 
-						else
11602 
+						} else
12012 11603 
 						{
12013 11604 
 							$title = $title_parent;
12014 11605 
 						}
 
@@ -12050,8 +11641,7 @@  discard block
 
 block discarded – undo
12050 11641 
 					if (isset($link['attribs']['']['title']))
12051 11642 
 					{
12052 11643 
 						$title = $this->sanitize($link['attribs']['']['title'], SIMPLEPIE_CONSTRUCT_TEXT);
12053 
-					}
12054 
-					else
11644 
+					} else
12055 11645 
 					{
12056 11646 
 						$title = $title_parent;
12057 11647 
 					}
 
@@ -12142,8 +11732,7 @@  discard block
 
 block discarded – undo
12142 11732 
 		if (!empty($this->data['enclosures']))
12143 11733 
 		{
12144 11734 
 			return $this->data['enclosures'];
12145 
-		}
12146 
-		else
11735 
+		} else
12147 11736 
 		{
12148 11737 
 			return null;
12149 11738 
 		}
 
@@ -12166,12 +11755,10 @@  discard block
 
 block discarded – undo
12166 11755 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
12167 11756 
 		{
12168 11757 
 			return (float) $return[0]['data'];
12169 
-		}
12170 
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
11758 
+		} elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
12171 11759 
 		{
12172 11760 
 			return (float) $match[1];
12173 
-		}
12174 
-		else
11761 
+		} else
12175 11762 
 		{
12176 11763 
 			return null;
12177 11764 
 		}
 
@@ -12194,16 +11781,13 @@  discard block
 
 block discarded – undo
12194 11781 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
12195 11782 
 		{
12196 11783 
 			return (float) $return[0]['data'];
12197 
-		}
12198 
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
11784 
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
12199 11785 
 		{
12200 11786 
 			return (float) $return[0]['data'];
12201 
-		}
12202 
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
11787 
+		} elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
12203 11788 
 		{
12204 11789 
 			return (float) $match[2];
12205 
-		}
12206 
-		else
11790 
+		} else
12207 11791 
 		{
12208 11792 
 			return null;
12209 11793 
 		}
 
@@ -12220,8 +11804,7 @@  discard block
 
 block discarded – undo
12220 11804 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
12221 11805 
 		{
12222 11806 
 			return $this->registry->create('Source', array($this, $return[0]));
12223 
-		}
12224 
-		else
11807 
+		} else
12225 11808 
 		{
12226 11809 
 			return null;
12227 11810 
 		}
 
@@ -12265,8 +11848,7 @@  discard block
 
 block discarded – undo
12265 11848 
 			set_error_handler(array('SimplePie_Misc', 'silence_errors'));
12266 11849 
 			$this->dom->loadHTML($this->file->body);
12267 11850 
 			restore_error_handler();
12268 
-		}
12269 
-		else
11851 
+		} else
12270 11852 
 		{
12271 11853 
 			$this->dom = null;
12272 11854 
 		}
 
@@ -12344,17 +11926,14 @@  discard block
 
 block discarded – undo
12344 11926 
 			if (in_array($sniffed, $mime_types))
12345 11927 
 			{
12346 11928 
 				return true;
12347 
-			}
12348 
-			else
11929 
+			} else
12349 11930 
 			{
12350 11931 
 				return false;
12351 11932 
 			}
12352 
-		}
12353 
-		elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
11933 
+		} elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
12354 11934 
 		{
12355 11935 
 			return true;
12356 
-		}
12357 
-		else
11936 
+		} else
12358 11937 
 		{
12359 11938 
 			return false;
12360 11939 
 		}
 
@@ -12396,8 +11975,7 @@  discard block
 
 block discarded – undo
12396 11975 
 		if (!empty($feeds))
12397 11976 
 		{
12398 11977 
 			return array_values($feeds);
12399 
-		}
12400 
-		else
11978 
+		} else
12401 11979 
 		{
12402 11980 
 			return null;
12403 11981 
 		}
 
@@ -12425,8 +12003,7 @@  discard block
 
 block discarded – undo
12425 12003 
 				if ($this->base_location < $line)
12426 12004 
 				{
12427 12005 
 					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
12428 
-				}
12429 
-				else
12006 
+				} else
12430 12007 
 				{
12431 12008 
 					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
12432 12009 
 				}
 
@@ -12473,8 +12050,7 @@  discard block
 
 block discarded – undo
12473 12050 
 					if (method_exists($link, 'getLineNo') && $this->base_location < $link->getLineNo())
12474 12051 
 					{
12475 12052 
 						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
12476 
-					}
12477 
-					else
12053 
+					} else
12478 12054 
 					{
12479 12055 
 						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
12480 12056 
 					}
 
@@ -12488,8 +12064,7 @@  discard block
 
 block discarded – undo
12488 12064 
 					if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority'])
12489 12065 
 					{
12490 12066 
 						$this->local[] = $href;
12491 
-					}
12492 
-					else
12067 
+					} else
12493 12068 
 					{
12494 12069 
 						$this->elsewhere[] = $href;
12495 12070 
 					}
 
@@ -12534,8 +12109,7 @@  discard block
 
 block discarded – undo
12534 12109 
 						$this->registry->call('Misc', 'absolutize_url',
12535 12110 
 						                      array(trim($link->getAttribute('href')),
12536 12111 
 						                            $this->base));
12537 
-				}
12538 
-				else
12112 
+				} else
12539 12113 
 				{
12540 12114 
 					$href =
12541 12115 
 						$this->registry->call('Misc', 'absolutize_url',
 
@@ -12575,8 +12149,7 @@  discard block
 
 block discarded – undo
12575 12149 
 				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
12576 12150 
 				{
12577 12151 
 					return array($feed);
12578 
-				}
12579 
-				else
12152 
+				} else
12580 12153 
 				{
12581 12154 
 					unset($array[$key]);
12582 12155 
 				}
 
@@ -12603,8 +12176,7 @@  discard block
 
 block discarded – undo
12603 12176 
 				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
12604 12177 
 				{
12605 12178 
 					return array($feed);
12606 
-				}
12607 
-				else
12179 
+				} else
12608 12180 
 				{
12609 12181 
 					unset($array[$key]);
12610 12182 
 				}
 
@@ -12681,8 +12253,7 @@  discard block
 
 block discarded – undo
12681 12253 
 				if (strlen($matches[$i][3][0]) <= 2)
12682 12254 
 				{
12683 12255 
 					$return[$i]['self_closing'] = true;
12684 
-				}
12685 
-				else
12256 
+				} else
12686 12257 
 				{
12687 12258 
 					$return[$i]['self_closing'] = false;
12688 12259 
 					$return[$i]['content'] = $matches[$i][4][0];
 
@@ -12715,8 +12286,7 @@  discard block
 
 block discarded – undo
12715 12286 
 		if ($element['self_closing'])
12716 12287 
 		{
12717 12288 
 			$full .= ' />';
12718 
-		}
12719 
-		else
12289 
+		} else
12720 12290 
 		{
12721 12291 
 			$full .= ">$element[content]</$element[tag]>";
12722 12292 
 		}
 
@@ -12781,16 +12351,13 @@  discard block
 
 block discarded – undo
12781 12351 
 		if ($http === 2 && $parsed['scheme'] !== '')
12782 12352 
 		{
12783 12353 
 			return "feed:$url";
12784 
-		}
12785 
-		elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
12354 
+		} elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
12786 12355 
 		{
12787 12356 
 			return substr_replace($url, 'podcast', 0, 4);
12788 
-		}
12789 
-		elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
12357 
+		} elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
12790 12358 
 		{
12791 12359 
 			return substr_replace($url, 'itpc', 0, 4);
12792 
-		}
12793 
-		else
12360 
+		} else
12794 12361 
 		{
12795 12362 
 			return $url;
12796 12363 
 		}
 
@@ -12803,8 +12370,7 @@  discard block
 
 block discarded – undo
12803 12370 
 			if (is_array($value))
12804 12371 
 			{
12805 12372 
 				$array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
12806 
-			}
12807 
-			else
12373 
+			} else
12808 12374 
 			{
12809 12375 
 				$array1[$key] = $value;
12810 12376 
 			}            
@@ -12848,8 +12414,7 @@  discard block
 
 block discarded – undo
12848 12414 
 		if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E)
12849 12415 
 		{
12850 12416 
 			return chr($integer);
12851 
-		}
12852 
-		else
12417 
+		} else
12853 12418 
 		{
12854 12419 
 			return strtoupper($match[0]);
12855 12420 
 		}
 
@@ -14306,16 +13871,13 @@  discard block
 
 block discarded – undo
14306 13871 
 		if (is_array($curl = curl_version()))
14307 13872 
 		{
14308 13873 
 			$curl = $curl['version'];
14309 
-		}
14310 
-		elseif (substr($curl, 0, 5) === 'curl/')
13874 
+		} elseif (substr($curl, 0, 5) === 'curl/')
14311 13875 
 		{
14312 13876 
 			$curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
14313 
-		}
14314 
-		elseif (substr($curl, 0, 8) === 'libcurl/')
13877 
+		} elseif (substr($curl, 0, 8) === 'libcurl/')
14315 13878 
 		{
14316 13879 
 			$curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
14317 
-		}
14318 
-		else
13880 
+		} else
14319 13881 
 		{
14320 13882 
 			$curl = 0;
14321 13883 
 		}
 
@@ -14337,8 +13899,7 @@  discard block
 
 block discarded – undo
14337 13899 
 			if (($end = strpos($data, '-->', $start)) !== false)
14338 13900 
 			{
14339 13901 
 				$data = substr_replace($data, '', 0, $end + 3);
14340 
-			}
14341 
-			else
13902 
+			} else
14342 13903 
 			{
14343 13904 
 				$data = '';
14344 13905 
 			}
 
@@ -14394,8 +13955,7 @@  discard block
 
 block discarded – undo
14394 13955 
 					{
14395 13956 
 						$position++;
14396 13957 
 						continue;
14397 
-					}
14398 
-					elseif (isset($string[$position]))
13958 
+					} elseif (isset($string[$position]))
14399 13959 
 					{
14400 13960 
 						switch ($string[$position])
14401 13961 
 						{
 
@@ -14408,14 +13968,12 @@  discard block
 
 block discarded – undo
14408 13968 
 								break;
14409 13969 
 						}
14410 13970 
 						$position++;
14411 
-					}
14412 
-					else
13971 
+					} else
14413 13972 
 					{
14414 13973 
 						break;
14415 13974 
 					}
14416 13975 
 				}
14417 
-			}
14418 
-			else
13976 
+			} else
14419 13977 
 			{
14420 13978 
 				$output .= '(';
14421 13979 
 			}
 
@@ -14430,8 +13988,7 @@  discard block
 
 block discarded – undo
14430 13988 
 		if (($pos = strpos($mime, ';')) === false)
14431 13989 
 		{
14432 13990 
 			return trim($mime);
14433 
-		}
14434 
-		else
13991 
+		} else
14435 13992 
 		{
14436 13993 
 			return trim(substr($mime, 0, $pos));
14437 13994 
 		}
 
@@ -14442,8 +13999,7 @@  discard block
 
 block discarded – undo
14442 13999 
 		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
14443 14000 
 		{
14444 14001 
 			$mode = SIMPLEPIE_CONSTRUCT_BASE64;
14445 
-		}
14446 
-		else
14002 
+		} else
14447 14003 
 		{
14448 14004 
 			$mode = SIMPLEPIE_CONSTRUCT_NONE;
14449 14005 
 		}
 
@@ -14466,8 +14022,7 @@  discard block
 
 block discarded – undo
14466 14022 
 				default:
14467 14023 
 					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
14468 14024 
 			}
14469 
-		}
14470 
-		else
14025 
+		} else
14471 14026 
 		{
14472 14027 
 			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
14473 14028 
 		}
 
@@ -14514,13 +14069,11 @@  discard block
 
 block discarded – undo
14514 14069 
 			if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/')
14515 14070 
 			{
14516 14071 
 				return SIMPLEPIE_CONSTRUCT_NONE;
14517 
-			}
14518 
-			else
14072 
+			} else
14519 14073 
 			{
14520 14074 
 				return SIMPLEPIE_CONSTRUCT_BASE64;
14521 14075 
 			}
14522 
-		}
14523 
-		else
14076 
+		} else
14524 14077 
 		{
14525 14078 
 			return SIMPLEPIE_CONSTRUCT_TEXT;
14526 14079 
 		}
 
@@ -14563,24 +14116,19 @@  discard block
 
 block discarded – undo
14563 14116 
 		if ($codepoint < 0)
14564 14117 
 		{
14565 14118 
 			return false;
14566 
-		}
14567 
-		else if ($codepoint <= 0x7f)
14119 
+		} else if ($codepoint <= 0x7f)
14568 14120 
 		{
14569 14121 
 			return chr($codepoint);
14570 
-		}
14571 
-		else if ($codepoint <= 0x7ff)
14122 
+		} else if ($codepoint <= 0x7ff)
14572 14123 
 		{
14573 14124 
 			return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
14574 
-		}
14575 
-		else if ($codepoint <= 0xffff)
14125 
+		} else if ($codepoint <= 0xffff)
14576 14126 
 		{
14577 14127 
 			return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
14578 
-		}
14579 
-		else if ($codepoint <= 0x10ffff)
14128 
+		} else if ($codepoint <= 0x10ffff)
14580 14129 
 		{
14581 14130 
 			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
14582 
-		}
14583 
-		else
14131 
+		} else
14584 14132 
 		{
14585 14133 
 			// U+FFFD REPLACEMENT CHARACTER
14586 14134 
 			return "\xEF\xBF\xBD";
 
@@ -14608,8 +14156,7 @@  discard block
 
 block discarded – undo
14608 14156 
 			{
14609 14157 
 				list($name, $value) = explode('=', $section, 2);
14610 14158 
 				$return[urldecode($name)][] = urldecode($value);
14611 
-			}
14612 
-			else
14159 
+			} else
14613 14160 
 			{
14614 14161 
 				$return[urldecode($section)][] = null;
14615 14162 
 			}
 
@@ -14771,8 +14318,7 @@  discard block
 
 block discarded – undo
14771 14318 
 		if (file_exists($root . '/.git/index'))
14772 14319 
 		{
14773 14320 
 			return filemtime($root . '/.git/index');
14774 
-		}
14775 
-		elseif (file_exists($root . '/SimplePie'))
14321 
+		} elseif (file_exists($root . '/SimplePie'))
14776 14322 
 		{
14777 14323 
 			$time = 0;
14778 14324 
 			foreach (glob($root . '/SimplePie/*.php') as $file)
 
@@ -14783,12 +14329,10 @@  discard block
 
 block discarded – undo
14783 14329 
 				}
14784 14330 
 			}
14785 14331 
 			return $time;
14786 
-		}
14787 
-		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
14332 
+		} elseif (file_exists(dirname(__FILE__) . '/Core.php'))
14788 14333 
 		{
14789 14334 
 			return filemtime(dirname(__FILE__) . '/Core.php');
14790 
-		}
14791 
-		else
14335 
+		} else
14792 14336 
 		{
14793 14337 
 			return filemtime(__FILE__);
14794 14338 
 		}
 
@@ -14804,8 +14348,7 @@  discard block
 
 block discarded – undo
14804 14348 
 		if ($sp->error() !== null)
14805 14349 
 		{
14806 14350 
 			$info .= 'Error occurred: ' . $sp->error() . "\n";
14807 
-		}
14808 
-		else
14351 
+		} else
14809 14352 
 		{
14810 14353 
 			$info .= "No error found.\n";
14811 14354 
 		}
 
@@ -14835,8 +14378,7 @@  discard block
 
 block discarded – undo
14835 14378 
 						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
14836 14379 
 						break;
14837 14380 
 				}
14838 
-			}
14839 
-			else
14381 
+			} else
14840 14382 
 			{
14841 14383 
 				$info .= "    $ext not loaded\n";
14842 14384 
 			}
 
@@ -14893,16 +14435,14 @@  discard block
 
 block discarded – undo
14893 14435 
 			if ($ip1 === '')
14894 14436 
 			{
14895 14437 
 				$c1 = -1;
14896 
-			}
14897 
-			else
14438 
+			} else
14898 14439 
 			{
14899 14440 
 				$c1 = substr_count($ip1, ':');
14900 14441 
 			}
14901 14442 
 			if ($ip2 === '')
14902 14443 
 			{
14903 14444 
 				$c2 = -1;
14904 
-			}
14905 
-			else
14445 
+			} else
14906 14446 
 			{
14907 14447 
 				$c2 = substr_count($ip2, ':');
14908 14448 
 			}
 
@@ -14980,8 +14520,7 @@  discard block
 
 block discarded – undo
14980 14520 
 		if ($ip_parts[1] !== '')
14981 14521 
 		{
14982 14522 
 			return implode(':', $ip_parts);
14983 
-		}
14984 
-		else
14523 
+		} else
14985 14524 
 		{
14986 14525 
 			return $ip_parts[0];
14987 14526 
 		}
 
@@ -15007,8 +14546,7 @@  discard block
 
 block discarded – undo
15007 14546 
 			$ipv6_part = substr($ip, 0, $pos);
15008 14547 
 			$ipv4_part = substr($ip, $pos + 1);
15009 14548 
 			return array($ipv6_part, $ipv4_part);
15010 
-		}
15011 
-		else
14549 
+		} else
15012 14550 
 		{
15013 14551 
 			return array($ip, '');
15014 14552 
 		}
 
@@ -15033,35 +14571,39 @@  discard block
 
 block discarded – undo
15033 14571 
 			foreach ($ipv6 as $ipv6_part)
15034 14572 
 			{
15035 14573 
 				// The section can't be empty
15036 
-				if ($ipv6_part === '')
15037 
-					return false;
14574 
+				if ($ipv6_part === '') {
14575 
+									return false;
14576 
+				}
15038 14577
15039 14578 
 				// Nor can it be over four characters
15040 
-				if (strlen($ipv6_part) > 4)
15041 
-					return false;
14579 
+				if (strlen($ipv6_part) > 4) {
14580 
+									return false;
14581 
+				}
15042 14582
15043 14583 
 				// Remove leading zeros (this is safe because of the above)
15044 14584 
 				$ipv6_part = ltrim($ipv6_part, '0');
15045 
-				if ($ipv6_part === '')
15046 
-					$ipv6_part = '0';
14585 
+				if ($ipv6_part === '') {
14586 
+									$ipv6_part = '0';
14587 
+				}
15047 14588
15048 14589 
 				// Check the value is valid
15049 14590 
 				$value = hexdec($ipv6_part);
15050 
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
15051 
-					return false;
14591 
+				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
14592 
+									return false;
14593 
+				}
15052 14594 
 			}
15053 14595 
 			if (count($ipv4) === 4)
15054 14596 
 			{
15055 14597 
 				foreach ($ipv4 as $ipv4_part)
15056 14598 
 				{
15057 14599 
 					$value = (int) $ipv4_part;
15058 
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
15059 
-						return false;
14600 
+					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
14601 
+											return false;
14602 
+					}
15060 14603 
 				}
15061 14604 
 			}
15062 14605 
 			return true;
15063 
-		}
15064 
-		else
14606 
+		} else
15065 14607 
 		{
15066 14608 
 			return false;
15067 14609 
 		}
 
@@ -15660,8 +15202,7 @@  discard block
 
 block discarded – undo
15660 15202 
 		if (is_callable($callback))
15661 15203 
 		{
15662 15204 
 			$this->user[] = $callback;
15663 
-		}
15664 
-		else
15205 
+		} else
15665 15206 
 		{
15666 15207 
 			trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
15667 15208 
 		}
 
@@ -15723,8 +15264,7 @@  discard block
 
 block discarded – undo
15723 15264 
 				{
15724 15265 
 					$timezone = 0 - $timezone;
15725 15266 
 				}
15726 
-			}
15727 
-			else
15267 
+			} else
15728 15268 
 			{
15729 15269 
 				$timezone = 0;
15730 15270 
 			}
 
@@ -15733,8 +15273,7 @@  discard block
 
 block discarded – undo
15733 15273 
 			$second = round((int)$match[6] + (int)$match[7] / pow(10, strlen($match[7])));
15734 15274
15735 15275 
 			return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
15736 
-		}
15737 
-		else
15276 
+		} else
15738 15277 
 		{
15739 15278 
 			return false;
15740 15279 
 		}
 
@@ -15770,8 +15309,7 @@  discard block
 
 block discarded – undo
15770 15309 
 					{
15771 15310 
 						$position++;
15772 15311 
 						continue;
15773 
-					}
15774 
-					elseif (isset($string[$position]))
15312 
+					} elseif (isset($string[$position]))
15775 15313 
 					{
15776 15314 
 						switch ($string[$position])
15777 15315 
 						{
 
@@ -15784,14 +15322,12 @@  discard block
 
 block discarded – undo
15784 15322 
 								break;
15785 15323 
 						}
15786 15324 
 						$position++;
15787 
-					}
15788 
-					else
15325 
+					} else
15789 15326 
 					{
15790 15327 
 						break;
15791 15328 
 					}
15792 15329 
 				}
15793 
-			}
15794 
-			else
15330 
+			} else
15795 15331 
 			{
15796 15332 
 				$output .= '(';
15797 15333 
 			}
 
@@ -15870,8 +15406,7 @@  discard block
 
 block discarded – undo
15870 15406 
 			if ($match[4] < 50)
15871 15407 
 			{
15872 15408 
 				$match[4] += 2000;
15873 
-			}
15874 
-			elseif ($match[4] < 1000)
15409 
+			} elseif ($match[4] < 1000)
15875 15410 
 			{
15876 15411 
 				$match[4] += 1900;
15877 15412 
 			}
 
@@ -15880,15 +15415,13 @@  discard block
 
 block discarded – undo
15880 15415 
 			if ($match[7] !== '')
15881 15416 
 			{
15882 15417 
 				$second = $match[7];
15883 
-			}
15884 
-			else
15418 
+			} else
15885 15419 
 			{
15886 15420 
 				$second = 0;
15887 15421 
 			}
15888 15422
15889 15423 
 			return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
15890 
-		}
15891 
-		else
15424 
+		} else
15892 15425 
 		{
15893 15426 
 			return false;
15894 15427 
 		}
 
@@ -15945,15 +15478,13 @@  discard block
 
 block discarded – undo
15945 15478 
 			if ($match[4] < 50)
15946 15479 
 			{
15947 15480 
 				$match[4] += 2000;
15948 
-			}
15949 
-			else
15481 
+			} else
15950 15482 
 			{
15951 15483 
 				$match[4] += 1900;
15952 15484 
 			}
15953 15485
15954 15486 
 			return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
15955 
-		}
15956 
-		else
15487 
+		} else
15957 15488 
 		{
15958 15489 
 			return false;
15959 15490 
 		}
 
@@ -15994,8 +15525,7 @@  discard block
 
 block discarded – undo
15994 15525
15995 15526 
 			$month = $this->month[strtolower($match[2])];
15996 15527 
 			return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
15997 
-		}
15998 
-		else
15528 
+		} else
15999 15529 
 		{
16000 15530 
 			return false;
16001 15531 
 		}
 
@@ -16013,8 +15543,7 @@  discard block
 
 block discarded – undo
16013 15543 
 		if ($strtotime === -1 || $strtotime === false)
16014 15544 
 		{
16015 15545 
 			return false;
16016 
-		}
16017 
-		else
15546 
+		} else
16018 15547 
 		{
16019 15548 
 			return $strtotime;
16020 15549 
 		}
 
@@ -16074,8 +15603,7 @@  discard block
 
 block discarded – undo
16074 15603 
 		if (strtoupper($encoding) === 'US-ASCII')
16075 15604 
 		{
16076 15605 
 			$this->encoding = 'UTF-8';
16077 
-		}
16078 
-		else
15606 
+		} else
16079 15607 
 		{
16080 15608 
 			$this->encoding = $encoding;
16081 15609 
 		}
 
@@ -16114,8 +15642,7 @@  discard block
 
 block discarded – undo
16114 15642 
 			{
16115 15643 
 				$data = substr($data, $pos + 2);
16116 15644 
 				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
16117 
-			}
16118 
-			else
15645 
+			} else
16119 15646 
 			{
16120 15647 
 				$this->error_string = 'SimplePie bug! Please report this!';
16121 15648 
 				return false;
 
@@ -16155,8 +15682,7 @@  discard block
 
 block discarded – undo
16155 15682 
 			$this->current_byte = xml_get_current_byte_index($xml);
16156 15683 
 			xml_parser_free($xml);
16157 15684 
 			return $return;
16158 
-		}
16159 
-		else
15685 
+		} else
16160 15686 
 		{
16161 15687 
 			libxml_clear_errors();
16162 15688 
 			$xml = new XMLReader();
 
@@ -16170,8 +15696,7 @@  discard block
 
 block discarded – undo
16170 15696 
 						if ($xml->namespaceURI !== '')
16171 15697 
 						{
16172 15698 
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
16173 
-						}
16174 
-						else
15699 
+						} else
16175 15700 
 						{
16176 15701 
 							$tagName = $xml->localName;
16177 15702 
 						}
 
@@ -16182,8 +15707,7 @@  discard block
 
 block discarded – undo
16182 15707 
 						if ($xml->namespaceURI !== '')
16183 15708 
 						{
16184 15709 
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
16185 
-						}
16186 
-						else
15710 
+						} else
16187 15711 
 						{
16188 15712 
 							$tagName = $xml->localName;
16189 15713 
 						}
 
@@ -16193,8 +15717,7 @@  discard block
 
 block discarded – undo
16193 15717 
 							if ($xml->namespaceURI !== '')
16194 15718 
 							{
16195 15719 
 								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
16196 
-							}
16197 
-							else
15720 
+							} else
16198 15721 
 							{
16199 15722 
 								$attrName = $xml->localName;
16200 15723 
 							}
 
@@ -16220,8 +15743,7 @@  discard block
 
 block discarded – undo
16220 15743 
 				$this->current_line = $error->line;
16221 15744 
 				$this->current_column = $error->column;
16222 15745 
 				return false;
16223 
-			}
16224 
-			else
15746 
+			} else
16225 15747 
 			{
16226 15748 
 				return true;
16227 15749 
 			}
 
@@ -16277,8 +15799,7 @@  discard block
 
 block discarded – undo
16277 15799 
 				$this->xml_base[] = $base;
16278 15800 
 				$this->xml_base_explicit[] = true;
16279 15801 
 			}
16280 
-		}
16281 
-		else
15802 
+		} else
16282 15803 
 		{
16283 15804 
 			$this->xml_base[] = end($this->xml_base);
16284 15805 
 			$this->xml_base_explicit[] = end($this->xml_base_explicit);
 
@@ -16287,8 +15808,7 @@  discard block
 
 block discarded – undo
16287 15808 
 		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
16288 15809 
 		{
16289 15810 
 			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
16290 
-		}
16291 
-		else
15811 
+		} else
16292 15812 
 		{
16293 15813 
 			$this->xml_lang[] = end($this->xml_lang);
16294 15814 
 		}
 
@@ -16308,8 +15828,7 @@  discard block
 
 block discarded – undo
16308 15828 
 				}
16309 15829 
 				$this->data['data'] .= '>';
16310 15830 
 			}
16311 
-		}
16312 
-		else
15831 
+		} else
16313 15832 
 		{
16314 15833 
 			$this->datas[] =& $this->data;
16315 15834 
 			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
 
@@ -16330,8 +15849,7 @@  discard block
 
 block discarded – undo
16330 15849 
 		if ($this->current_xhtml_construct >= 0)
16331 15850 
 		{
16332 15851 
 			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
16333 
-		}
16334 
-		else
15852 
+		} else
16335 15853 
 		{
16336 15854 
 			$this->data['data'] .= $cdata;
16337 15855 
 		}
 
@@ -16389,8 +15907,7 @@  discard block
 
 block discarded – undo
16389 15907 
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
16390 15908 
 				}
16391 15909 
 				$cache[$string] = array($namespace, $local_name);
16392 
-			}
16393 
-			else
15910 
+			} else
16394 15911 
 			{
16395 15912 
 				$cache[$string] = array('', $string);
16396 15913 
 			}
 
@@ -16410,8 +15927,7 @@  discard block
 
 block discarded – undo
16410 15927 
 				$link = $data['properties']['url'][0];
16411 15928 
 				if ($name === '') {
16412 15929 
 					$name = $link;
16413 
-				}
16414 
-				else {
15930 
+				} else {
16415 15931 
 					// can't have commas in categories.
16416 15932 
 					$name = str_replace(',', '', $name);
16417 15933 
 				}
 
@@ -16437,19 +15953,24 @@  discard block
 
 block discarded – undo
16437 15953 
 				break;
16438 15954 
 			}
16439 15955 
 			// Also look for h-feed or h-entry in the children of each top level item.
16440 
-			if (!isset($mf_item['children'][0]['type'])) continue;
15956 
+			if (!isset($mf_item['children'][0]['type'])) {
15957 
+				continue;
15958 
+			}
16441 15959 
 			if (in_array('h-feed', $mf_item['children'][0]['type'])) {
16442 15960 
 				$h_feed = $mf_item['children'][0];
16443 15961 
 				// In this case the parent of the h-feed may be an h-card, so use it as
16444 15962 
 				// the feed_author.
16445 
-				if (in_array('h-card', $mf_item['type'])) $feed_author = $mf_item;
15963 
+				if (in_array('h-card', $mf_item['type'])) {
15964 
+					$feed_author = $mf_item;
15965 
+				}
16446 15966 
 				break;
16447 
-			}
16448 
-			else if (in_array('h-entry', $mf_item['children'][0]['type'])) {
15967 
+			} else if (in_array('h-entry', $mf_item['children'][0]['type'])) {
16449 15968 
 				$entries = $mf_item['children'];
16450 15969 
 				// In this case the parent of the h-entry list may be an h-card, so use
16451 15970 
 				// it as the feed_author.
16452 
-				if (in_array('h-card', $mf_item['type'])) $feed_author = $mf_item;
15971 
+				if (in_array('h-card', $mf_item['type'])) {
15972 
+					$feed_author = $mf_item;
15973 
+				}
16453 15974 
 				break;
16454 15975 
 			}
16455 15976 
 		}
 
@@ -16462,8 +15983,7 @@  discard block
 
 block discarded – undo
16462 15983 
 			if (isset($mf['items'][0]['properties']['author'][0])) {
16463 15984 
 				$feed_author = $mf['items'][0]['properties']['author'][0];
16464 15985 
 			}
16465 
-		}
16466 
-		else if (count($entries) === 0) {
15986 
+		} else if (count($entries) === 0) {
16467 15987 
 			$entries = $mf['items'];
16468 15988 
 		}
16469 15989 
 		for ($i = 0; $i < count($entries); $i++) {
 
@@ -16474,17 +15994,23 @@  discard block
 
 block discarded – undo
16474 15994 
 				$description = '';
16475 15995 
 				if (isset($entry['properties']['url'][0])) {
16476 15996 
 					$link = $entry['properties']['url'][0];
16477 
-					if (isset($link['value'])) $link = $link['value'];
15997 
+					if (isset($link['value'])) {
15998 
+						$link = $link['value'];
15999 
+					}
16478 16000 
 					$item['link'] = array(array('data' => $link));
16479 16001 
 				}
16480 16002 
 				if (isset($entry['properties']['uid'][0])) {
16481 16003 
 					$guid = $entry['properties']['uid'][0];
16482 
-					if (isset($guid['value'])) $guid = $guid['value'];
16004 
+					if (isset($guid['value'])) {
16005 
+						$guid = $guid['value'];
16006 
+					}
16483 16007 
 					$item['guid'] = array(array('data' => $guid));
16484 16008 
 				}
16485 16009 
 				if (isset($entry['properties']['name'][0])) {
16486 16010 
 					$title = $entry['properties']['name'][0];
16487 
-					if (isset($title['value'])) $title = $title['value'];
16011 
+					if (isset($title['value'])) {
16012 
+						$title = $title['value'];
16013 
+					}
16488 16014 
 					$item['title'] = array(array('data' => $title));
16489 16015 
 				}
16490 16016 
 				if (isset($entry['properties']['author'][0]) || isset($feed_author)) {
 
@@ -16495,12 +16021,10 @@  discard block
 
 block discarded – undo
16495 16021 
 						$entry['properties']['author'][0] : $feed_author;
16496 16022 
 					if (!is_string($author)) {
16497 16023 
 						$author = $this->parse_hcard($author);
16498 
-					}
16499 
-					else if (strpos($author, 'http') === 0) {
16024 
+					} else if (strpos($author, 'http') === 0) {
16500 16025 
 						if (isset($author_cache[$author])) {
16501 16026 
 							$author = $author_cache[$author];
16502 
-						}
16503 
-						else {
16027 
+						} else {
16504 16028 
 							$mf = Mf2\fetch($author);
16505 16029 
 							foreach ($mf['items'] as $hcard) {
16506 16030 
 								// Only interested in an h-card by itself in this case.
 
@@ -16550,8 +16074,7 @@  discard block
 
 block discarded – undo
16550 16074 
 								'<img src="'.$photo_list[$j].'"></a>';
16551 16075 
 						}
16552 16076 
 						$description .= '<br><b>'.$count.' photos</b></p>';
16553 
-					}
16554 
-					else if ($count == 1) {
16077 
+					} else if ($count == 1) {
16555 16078 
 						$description = '<p><img src="'.$photo_list[0].'"></p>';
16556 16079 
 					}
16557 16080 
 				}
 
@@ -16568,8 +16091,7 @@  discard block
 
 block discarded – undo
16568 16091 
 						$in_reply_to = '';
16569 16092 
 						if (is_string($entry['properties']['in-reply-to'][0])) {
16570 16093 
 							$in_reply_to = $entry['properties']['in-reply-to'][0];
16571 
-						}
16572 
-						else if (isset($entry['properties']['in-reply-to'][0]['value'])) {
16094 
+						} else if (isset($entry['properties']['in-reply-to'][0]['value'])) {
16573 16095 
 							$in_reply_to = $entry['properties']['in-reply-to'][0]['value'];
16574 16096 
 						}
16575 16097 
 						if ($in_reply_to !== '') {
 
@@ -16583,12 +16105,13 @@  discard block
 
 block discarded – undo
16583 16105 
 					$category_csv = '';
16584 16106 
 					// Categories can also contain h-cards.
16585 16107 
 					foreach ($entry['properties']['category'] as $category) {
16586 
-						if ($category_csv !== '') $category_csv .= ', ';
16108 
+						if ($category_csv !== '') {
16109 
+							$category_csv .= ', ';
16110 
+						}
16587 16111 
 						if (is_string($category)) {
16588 16112 
 							// Can't have commas in categories.
16589 16113 
 							$category_csv .= str_replace(',', '', $category);
16590 
-						}
16591 
-						else {
16114 
+						} else {
16592 16115 
 							$category_csv .= $this->parse_hcard($category, true);
16593 16116 
 						}
16594 16117 
 					}
 
@@ -16619,8 +16142,7 @@  discard block
 
 block discarded – undo
16619 16142 
 		// Use the name given for the h-feed, or get the title from the html.
16620 16143 
 		if ($feed_title !== '') {
16621 16144 
 			$feed_title = array(array('data' => htmlspecialchars($feed_title)));
16622 
-		}
16623 
-		else if ($position = strpos($data, '<title>')) {
16145 
+		} else if ($position = strpos($data, '<title>')) {
16624 16146 
 			$start = $position < 200 ? 0 : $position - 200;
16625 16147 
 			$check = substr($data, $start, 400);
16626 16148 
 			$matches = array();
 
@@ -16705,8 +16227,7 @@  discard block
 
 block discarded – undo
16705 16227 
 		if ($this->scheme !== null)
16706 16228 
 		{
16707 16229 
 			return $this->scheme;
16708 
-		}
16709 
-		else
16230 
+		} else
16710 16231 
 		{
16711 16232 
 			return null;
16712 16233 
 		}
 
@@ -16722,8 +16243,7 @@  discard block
 
 block discarded – undo
16722 16243 
 		if ($this->value !== null)
16723 16244 
 		{
16724 16245 
 			return $this->value;
16725 
-		}
16726 
-		else
16246 
+		} else
16727 16247 
 		{
16728 16248 
 			return null;
16729 16249 
 		}
 
@@ -16865,8 +16385,7 @@  discard block
 
 block discarded – undo
16865 16385 
 		if (!method_exists($class, '__construct'))
16866 16386 
 		{
16867 16387 
 			$instance = new $class;
16868 
-		}
16869 
-		else
16388 
+		} else
16870 16389 
 		{
16871 16390 
 			$reflector = new ReflectionClass($class);
16872 16391 
 			$instance = $reflector->newInstanceArgs($parameters);
 
@@ -16982,8 +16501,7 @@  discard block
 
 block discarded – undo
16982 16501 
 		if ($this->relationship !== null)
16983 16502 
 		{
16984 16503 
 			return $this->relationship;
16985 
-		}
16986 
-		else
16504 
+		} else
16987 16505 
 		{
16988 16506 
 			return null;
16989 16507 
 		}
 
@@ -16999,8 +16517,7 @@  discard block
 
 block discarded – undo
16999 16517 
 		if ($this->type !== null)
17000 16518 
 		{
17001 16519 
 			return $this->type;
17002 
-		}
17003 
-		else
16520 
+		} else
17004 16521 
 		{
17005 16522 
 			return null;
17006 16523 
 		}
 
@@ -17016,8 +16533,7 @@  discard block
 
 block discarded – undo
17016 16533 
 		if ($this->value !== null)
17017 16534 
 		{
17018 16535 
 			return $this->value;
17019 
-		}
17020 
-		else
16536 
+		} else
17021 16537 
 		{
17022 16538 
 			return null;
17023 16539 
 		}
 
@@ -17071,8 +16587,7 @@  discard block
 
 block discarded – undo
17071 16587 
 		if ($page)
17072 16588 
 		{
17073 16589 
 			$this->image_handler = (string) $page;
17074 
-		}
17075 
-		else
16590 
+		} else
17076 16591 
 		{
17077 16592 
 			$this->image_handler = false;
17078 16593 
 		}
 
@@ -17126,13 +16641,11 @@  discard block
 
 block discarded – undo
17126 16641 
 			if (is_array($tags))
17127 16642 
 			{
17128 16643 
 				$this->strip_htmltags = $tags;
17129 
-			}
17130 
-			else
16644 
+			} else
17131 16645 
 			{
17132 16646 
 				$this->strip_htmltags = explode(',', $tags);
17133 16647 
 			}
17134 
-		}
17135 
-		else
16648 
+		} else
17136 16649 
 		{
17137 16650 
 			$this->strip_htmltags = false;
17138 16651 
 		}
 
@@ -17150,13 +16663,11 @@  discard block
 
 block discarded – undo
17150 16663 
 			if (is_array($attribs))
17151 16664 
 			{
17152 16665 
 				$this->strip_attributes = $attribs;
17153 
-			}
17154 
-			else
16666 
+			} else
17155 16667 
 			{
17156 16668 
 				$this->strip_attributes = explode(',', $attribs);
17157 16669 
 			}
17158 
-		}
17159 
-		else
16670 
+		} else
17160 16671 
 		{
17161 16672 
 			$this->strip_attributes = false;
17162 16673 
 		}
 
@@ -17169,13 +16680,11 @@  discard block
 
 block discarded – undo
17169 16680 
 			if (is_array($attribs))
17170 16681 
 			{
17171 16682 
 				$this->add_attributes = $attribs;
17172 
-			}
17173 
-			else
16683 
+			} else
17174 16684 
 			{
17175 16685 
 				$this->add_attributes = explode(',', $attribs);
17176 16686 
 			}
17177 
-		}
17178 
-		else
16687 
+		} else
17179 16688 
 		{
17180 16689 
 			$this->add_attributes = false;
17181 16690 
 		}
 
@@ -17234,8 +16743,7 @@  discard block
 
 block discarded – undo
17234 16743 
 				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
17235 16744 
 				{
17236 16745 
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
17237 
-				}
17238 
-				else
16746 
+				} else
17239 16747 
 				{
17240 16748 
 					$type |= SIMPLEPIE_CONSTRUCT_TEXT;
17241 16749 
 				}
 
@@ -17323,8 +16831,7 @@  discard block
 
 block discarded – undo
17323 16831 
 							if ($cache->load())
17324 16832 
 							{
17325 16833 
 								$img->setAttribute('src', $this->image_handler . $image_url);
17326 
-							}
17327 
-							else
16834 
+							} else
17328 16835 
 							{
17329 16836 
 								$file = $this->registry->create('File', array($img->getAttribute('src'), $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
17330 16837 
 								$headers = $file->headers;
 
@@ -17334,8 +16841,7 @@  discard block
 
 block discarded – undo
17334 16841 
 									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
17335 16842 
 									{
17336 16843 
 										$img->setAttribute('src', $this->image_handler . $image_url);
17337 
-									}
17338 
-									else
16844 
+									} else
17339 16845 
 									{
17340 16846 
 										trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
17341 16847 
 									}
 
@@ -17351,8 +16857,7 @@  discard block
 
 block discarded – undo
17351 16857 
 				if (version_compare(PHP_VERSION, '5.3.6', '>='))
17352 16858 
 				{
17353 16859 
 					$data = trim($document->saveHTML($div));
17354 
-				}
17355 
-				else
16860 
+				} else
17356 16861 
 				{
17357 16862 
 					$data = trim($document->saveXML($div));
17358 16863 
 				}
 
@@ -17361,8 +16866,7 @@  discard block
 
 block discarded – undo
17361 16866 
 				{
17362 16867 
 					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
17363 16868 
 					$data = preg_replace('/<\/div>$/', '', $data);
17364 
-				}
17365 
-				else
16869 
+				} else
17366 16870 
 				{
17367 16871 
 					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
17368 16872 
 				}
 
@@ -17401,8 +16905,7 @@  discard block
 
 block discarded – undo
17401 16905 
 			$html = '<div>' . $html . '</div>';
17402 16906 
 			$ret .= '<!DOCTYPE html>';
17403 16907 
 			$content_type = 'text/html';
17404 
-		}
17405 
-		else
16908 
+		} else
17406 16909 
 		{
17407 16910 
 			$ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
17408 16911 
 			$content_type = 'application/xhtml+xml';
 
@@ -17450,17 +16953,14 @@  discard block
 
 block discarded – undo
17450 16953 
 				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
17451 16954 
 				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
17452 16955 
 				return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
17453 
-			}
17454 
-			else
16956 
+			} else
17455 16957 
 			{
17456 16958 
 				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
17457 16959 
 			}
17458 
-		}
17459 
-		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
16960 
+		} elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
17460 16961 
 		{
17461 16962 
 			return $match[4];
17462 
-		}
17463 
-		else
16963 
+		} else
17464 16964 
 		{
17465 16965 
 			return '';
17466 16966 
 		}
 
@@ -17523,8 +17023,7 @@  discard block
 
 block discarded – undo
17523 17023 
 			}
17524 17024
17525 17025 
 			return;
17526 
-		}
17527 
-		elseif (in_array($tag, array('script', 'style')))
17026 
+		} elseif (in_array($tag, array('script', 'style')))
17528 17027 
 		{
17529 17028 
 			foreach ($elements as $element)
17530 17029 
 			{
 
@@ -17532,8 +17031,7 @@  discard block
 
 block discarded – undo
17532 17031 
 			}
17533 17032
17534 17033 
 			return;
17535 
-		}
17536 
-		else
17034 
+		} else
17537 17035 
 		{
17538 17036 
 			foreach ($elements as $element)
17539 17037 
 			{
 
@@ -17610,8 +17108,7 @@  discard block
 
 block discarded – undo
17610 17108 
 		if (isset($this->data['child'][$namespace][$tag]))
17611 17109 
 		{
17612 17110 
 			return $this->data['child'][$namespace][$tag];
17613 
-		}
17614 
-		else
17111 
+		} else
17615 17112 
 		{
17616 17113 
 			return null;
17617 17114 
 		}
 
@@ -17637,32 +17134,25 @@  discard block
 
 block discarded – undo
17637 17134 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
17638 17135 
 		{
17639 17136 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
17640 
-		}
17641 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
17137 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
17642 17138 
 		{
17643 17139 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
17644 
-		}
17645 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
17140 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
17646 17141 
 		{
17647 17142 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
17648 
-		}
17649 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
17143 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
17650 17144 
 		{
17651 17145 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
17652 
-		}
17653 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
17146 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
17654 17147 
 		{
17655 17148 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
17656 
-		}
17657 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
17149 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
17658 17150 
 		{
17659 17151 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
17660 
-		}
17661 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
17152 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
17662 17153 
 		{
17663 17154 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
17664 
-		}
17665 
-		else
17155 
+		} else
17666 17156 
 		{
17667 17157 
 			return null;
17668 17158 
 		}
 
@@ -17674,8 +17164,7 @@  discard block
 
 block discarded – undo
17674 17164 
 		if (isset($categories[$key]))
17675 17165 
 		{
17676 17166 
 			return $categories[$key];
17677 
-		}
17678 
-		else
17167 
+		} else
17679 17168 
 		{
17680 17169 
 			return null;
17681 17170 
 		}
 
@@ -17712,8 +17201,7 @@  discard block
 
 block discarded – undo
17712 17201 
 			if (isset($category['attribs']['']['domain']))
17713 17202 
 			{
17714 17203 
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
17715 
-			}
17716 
-			else
17204 
+			} else
17717 17205 
 			{
17718 17206 
 				$scheme = null;
17719 17207 
 			}
 
@@ -17731,8 +17219,7 @@  discard block
 
 block discarded – undo
17731 17219 
 		if (!empty($categories))
17732 17220 
 		{
17733 17221 
 			return array_unique($categories);
17734 
-		}
17735 
-		else
17222 
+		} else
17736 17223 
 		{
17737 17224 
 			return null;
17738 17225 
 		}
 
@@ -17744,8 +17231,7 @@  discard block
 
 block discarded – undo
17744 17231 
 		if (isset($authors[$key]))
17745 17232 
 		{
17746 17233 
 			return $authors[$key];
17747 
-		}
17748 
-		else
17234 
+		} else
17749 17235 
 		{
17750 17236 
 			return null;
17751 17237 
 		}
 
@@ -17814,8 +17300,7 @@  discard block
 
 block discarded – undo
17814 17300 
 		if (!empty($authors))
17815 17301 
 		{
17816 17302 
 			return array_unique($authors);
17817 
-		}
17818 
-		else
17303 
+		} else
17819 17304 
 		{
17820 17305 
 			return null;
17821 17306 
 		}
 
@@ -17827,8 +17312,7 @@  discard block
 
 block discarded – undo
17827 17312 
 		if (isset($contributors[$key]))
17828 17313 
 		{
17829 17314 
 			return $contributors[$key];
17830 
-		}
17831 
-		else
17315 
+		} else
17832 17316 
 		{
17833 17317 
 			return null;
17834 17318 
 		}
 
@@ -17885,8 +17369,7 @@  discard block
 
 block discarded – undo
17885 17369 
 		if (!empty($contributors))
17886 17370 
 		{
17887 17371 
 			return array_unique($contributors);
17888 
-		}
17889 
-		else
17372 
+		} else
17890 17373 
 		{
17891 17374 
 			return null;
17892 17375 
 		}
 
@@ -17898,8 +17381,7 @@  discard block
 
 block discarded – undo
17898 17381 
 		if (isset($links[$key]))
17899 17382 
 		{
17900 17383 
 			return $links[$key];
17901 
-		}
17902 
-		else
17384 
+		} else
17903 17385 
 		{
17904 17386 
 			return null;
17905 17387 
 		}
 
@@ -17963,13 +17445,11 @@  discard block
 
 block discarded – undo
17963 17445 
 					{
17964 17446 
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
17965 17447 
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
17966 
-					}
17967 
-					else
17448 
+					} else
17968 17449 
 					{
17969 17450 
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
17970 17451 
 					}
17971 
-				}
17972 
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
17452 
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
17973 17453 
 				{
17974 17454 
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
17975 17455 
 				}
 
@@ -17980,8 +17460,7 @@  discard block
 
 block discarded – undo
17980 17460 
 		if (isset($this->data['links'][$rel]))
17981 17461 
 		{
17982 17462 
 			return $this->data['links'][$rel];
17983 
-		}
17984 
-		else
17463 
+		} else
17985 17464 
 		{
17986 17465 
 			return null;
17987 17466 
 		}
 
@@ -17992,40 +17471,31 @@  discard block
 
 block discarded – undo
17992 17471 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
17993 17472 
 		{
17994 17473 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
17995 
-		}
17996 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
17474 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
17997 17475 
 		{
17998 17476 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
17999 
-		}
18000 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
17477 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
18001 17478 
 		{
18002 17479 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
18003 
-		}
18004 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
17480 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
18005 17481 
 		{
18006 17482 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
18007 
-		}
18008 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
17483 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
18009 17484 
 		{
18010 17485 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
18011 
-		}
18012 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
17486 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
18013 17487 
 		{
18014 17488 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18015 
-		}
18016 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
17489 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
18017 17490 
 		{
18018 17491 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18019 
-		}
18020 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
17492 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
18021 17493 
 		{
18022 17494 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
18023 
-		}
18024 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
17495 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
18025 17496 
 		{
18026 17497 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
18027 
-		}
18028 
-		else
17498 
+		} else
18029 17499 
 		{
18030 17500 
 			return null;
18031 17501 
 		}
 
@@ -18036,24 +17506,19 @@  discard block
 
 block discarded – undo
18036 17506 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
18037 17507 
 		{
18038 17508 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
18039 
-		}
18040 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
17509 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
18041 17510 
 		{
18042 17511 
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
18043 
-		}
18044 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
17512 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
18045 17513 
 		{
18046 17514 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18047 
-		}
18048 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
17515 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
18049 17516 
 		{
18050 17517 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18051 
-		}
18052 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
17518 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
18053 17519 
 		{
18054 17520 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18055 
-		}
18056 
-		else
17521 
+		} else
18057 17522 
 		{
18058 17523 
 			return null;
18059 17524 
 		}
 
@@ -18064,20 +17529,16 @@  discard block
 
 block discarded – undo
18064 17529 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
18065 17530 
 		{
18066 17531 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18067 
-		}
18068 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
17532 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
18069 17533 
 		{
18070 17534 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18071 
-		}
18072 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
17535 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
18073 17536 
 		{
18074 17537 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
18075 
-		}
18076 
-		elseif (isset($this->data['xml_lang']))
17538 
+		} elseif (isset($this->data['xml_lang']))
18077 17539 
 		{
18078 17540 
 			return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
18079 
-		}
18080 
-		else
17541 
+		} else
18081 17542 
 		{
18082 17543 
 			return null;
18083 17544 
 		}
 
@@ -18088,12 +17549,10 @@  discard block
 
 block discarded – undo
18088 17549 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
18089 17550 
 		{
18090 17551 
 			return (float) $return[0]['data'];
18091 
-		}
18092 
-		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
17552 
+		} elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
18093 17553 
 		{
18094 17554 
 			return (float) $match[1];
18095 
-		}
18096 
-		else
17555 
+		} else
18097 17556 
 		{
18098 17557 
 			return null;
18099 17558 
 		}
 
@@ -18104,16 +17563,13 @@  discard block
 
 block discarded – undo
18104 17563 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
18105 17564 
 		{
18106 17565 
 			return (float) $return[0]['data'];
18107 
-		}
18108 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
17566 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
18109 17567 
 		{
18110 17568 
 			return (float) $return[0]['data'];
18111 
-		}
18112 
-		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
17569 
+		} elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
18113 17570 
 		{
18114 17571 
 			return (float) $match[2];
18115 
-		}
18116 
-		else
17572 
+		} else
18117 17573 
 		{
18118 17574 
 			return null;
18119 17575 
 		}
 
@@ -18124,16 +17580,13 @@  discard block
 
 block discarded – undo
18124 17580 
 		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
18125 17581 
 		{
18126 17582 
 			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
18127 
-		}
18128 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
17583 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
18129 17584 
 		{
18130 17585 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
18131 
-		}
18132 
-		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
17586 
+		} elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
18133 17587 
 		{
18134 17588 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
18135 
-		}
18136 
-		else
17589 
+		} else
18137 17590 
 		{
18138 17591 
 			return null;
18139 17592 
 		}
 
@@ -18233,8 +17686,7 @@  discard block
 
 block discarded – undo
18233 17686 
 		if ($this->state === 'emit')
18234 17687 
 		{
18235 17688 
 			return true;
18236 
-		}
18237 
-		else
17689 
+		} else
18238 17690 
 		{
18239 17691 
 			$this->version = '';
18240 17692 
 			$this->encoding = '';
 
@@ -18291,8 +17743,7 @@  discard block
 
 block discarded – undo
18291 17743 
 		if ($this->skip_whitespace())
18292 17744 
 		{
18293 17745 
 			$this->state = 'version_name';
18294 
-		}
18295 
-		else
17746 
+		} else
18296 17747 
 		{
18297 17748 
 			$this->state = false;
18298 17749 
 		}
 
@@ -18305,8 +17756,7 @@  discard block
 
 block discarded – undo
18305 17756 
 			$this->position += 7;
18306 17757 
 			$this->skip_whitespace();
18307 17758 
 			$this->state = 'version_equals';
18308 
-		}
18309 
-		else
17759 
+		} else
18310 17760 
 		{
18311 17761 
 			$this->state = false;
18312 17762 
 		}
 
@@ -18319,8 +17769,7 @@  discard block
 
 block discarded – undo
18319 17769 
 			$this->position++;
18320 17770 
 			$this->skip_whitespace();
18321 17771 
 			$this->state = 'version_value';
18322 
-		}
18323 
-		else
17772 
+		} else
18324 17773 
 		{
18325 17774 
 			$this->state = false;
18326 17775 
 		}
 
@@ -18334,13 +17783,11 @@  discard block
 
 block discarded – undo
18334 17783 
 			if ($this->has_data())
18335 17784 
 			{
18336 17785 
 				$this->state = 'encoding_name';
18337 
-			}
18338 
-			else
17786 
+			} else
18339 17787 
 			{
18340 17788 
 				$this->state = 'emit';
18341 17789 
 			}
18342 
-		}
18343 
-		else
17790 
+		} else
18344 17791 
 		{
18345 17792 
 			$this->state = false;
18346 17793 
 		}
 
@@ -18353,8 +17800,7 @@  discard block
 
 block discarded – undo
18353 17800 
 			$this->position += 8;
18354 17801 
 			$this->skip_whitespace();
18355 17802 
 			$this->state = 'encoding_equals';
18356 
-		}
18357 
-		else
17803 
+		} else
18358 17804 
 		{
18359 17805 
 			$this->state = 'standalone_name';
18360 17806 
 		}
 
@@ -18367,8 +17813,7 @@  discard block
 
 block discarded – undo
18367 17813 
 			$this->position++;
18368 17814 
 			$this->skip_whitespace();
18369 17815 
 			$this->state = 'encoding_value';
18370 
-		}
18371 
-		else
17816 
+		} else
18372 17817 
 		{
18373 17818 
 			$this->state = false;
18374 17819 
 		}
 
@@ -18382,13 +17827,11 @@  discard block
 
 block discarded – undo
18382 17827 
 			if ($this->has_data())
18383 17828 
 			{
18384 17829 
 				$this->state = 'standalone_name';
18385 
-			}
18386 
-			else
17830 
+			} else
18387 17831 
 			{
18388 17832 
 				$this->state = 'emit';
18389 17833 
 			}
18390 
-		}
18391 
-		else
17834 
+		} else
18392 17835 
 		{
18393 17836 
 			$this->state = false;
18394 17837 
 		}
 
@@ -18401,8 +17844,7 @@  discard block
 
 block discarded – undo
18401 17844 
 			$this->position += 10;
18402 17845 
 			$this->skip_whitespace();
18403 17846 
 			$this->state = 'standalone_equals';
18404 
-		}
18405 
-		else
17847 
+		} else
18406 17848 
 		{
18407 17849 
 			$this->state = false;
18408 17850 
 		}
 
@@ -18415,8 +17857,7 @@  discard block
 
 block discarded – undo
18415 17857 
 			$this->position++;
18416 17858 
 			$this->skip_whitespace();
18417 17859 
 			$this->state = 'standalone_value';
18418 
-		}
18419 
-		else
17860 
+		} else
18420 17861 
 		{
18421 17862 
 			$this->state = false;
18422 17863 
 		}
 
@@ -18445,13 +17886,11 @@  discard block
 
 block discarded – undo
18445 17886 
 			if ($this->has_data())
18446 17887 
 			{
18447 17888 
 				$this->state = false;
18448 
-			}
18449 
-			else
17889 
+			} else
18450 17890 
 			{
18451 17891 
 				$this->state = 'emit';
18452 17892 
 			}
18453 
-		}
18454 
-		else
17893 
+		} else
18455 17894 
 		{
18456 17895 
 			$this->state = false;
18457 17896 
 		}
 
@@ -18676,8 +18115,7 @@  discard block
 
 block discarded – undo
18676 18115 
 					// Set the extra field to the given data
18677 18116 
 					$this->extra_field = substr($this->compressed_data, $this->position, $len);
18678 18117 
 					$this->position += $len;
18679 
-				}
18680 
-				else
18118 
+				} else
18681 18119 
 				{
18682 18120 
 					return false;
18683 18121 
 				}
 
@@ -18696,8 +18134,7 @@  discard block
 
 block discarded – undo
18696 18134 
 					// Set the original filename to the given string
18697 18135 
 					$this->filename = substr($this->compressed_data, $this->position, $len);
18698 18136 
 					$this->position += $len + 1;
18699 
-				}
18700 
-				else
18137 
+				} else
18701 18138 
 				{
18702 18139 
 					return false;
18703 18140 
 				}
 
@@ -18716,8 +18153,7 @@  discard block
 
 block discarded – undo
18716 18153 
 					// Set the original comment to the given string
18717 18154 
 					$this->comment = substr($this->compressed_data, $this->position, $len);
18718 18155 
 					$this->position += $len + 1;
18719 
-				}
18720 
-				else
18156 
+				} else
18721 18157 
 				{
18722 18158 
 					return false;
18723 18159 
 				}
 
@@ -18737,13 +18173,11 @@  discard block
 
 block discarded – undo
18737 18173 
 					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
18738 18174 
 					{
18739 18175 
 						$this->position += 2;
18740 
-					}
18741 
-					else
18176 
+					} else
18742 18177 
 					{
18743 18178 
 						return false;
18744 18179 
 					}
18745 
-				}
18746 
-				else
18180 
+				} else
18747 18181 
 				{
18748 18182 
 					return false;
18749 18183 
 				}
 
@@ -18753,8 +18187,7 @@  discard block
 
 block discarded – undo
18753 18187 
 			if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
18754 18188 
 			{
18755 18189 
 				return false;
18756 
-			}
18757 
-			else
18190 
+			} else
18758 18191 
 			{
18759 18192 
 				$this->position = $this->compressed_size - 8;
18760 18193 
 			}
 
@@ -18777,8 +18210,7 @@  discard block
 
 block discarded – undo
18777 18210
18778 18211 
 			// Wow, against all odds, we've actually got a valid gzip string
18779 18212 
 			return true;
18780 
-		}
18781 
-		else
18213 
+		} else
18782 18214 
 		{
18783 18215 
 			return false;
18784 18216 
 		}
Please login to merge, or discard this patch.
news.php 1 patch
Braces   +21 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -7,11 +7,17 @@  discard block
 
 block discarded – undo
7 7 
 $title = _("News");
8 8 
 require_once('header.php');
9 9
10 
-if (isset($_GET['tracker'])) $type = 'tracker';
11 
-elseif (isset($_GET['marine'])) $type = 'marine';
12 
-elseif (isset($_GET['aircraft'])) $type = 'aircraft';
13 
-elseif (isset($_GET['satellite'])) $type = 'satellite';
14 
-else $type = 'global';
10 
+if (isset($_GET['tracker'])) {
11 
+	$type = 'tracker';
12 
+} elseif (isset($_GET['marine'])) {
13 
+	$type = 'marine';
14 
+} elseif (isset($_GET['aircraft'])) {
15 
+	$type = 'aircraft';
16 
+} elseif (isset($_GET['satellite'])) {
17 
+	$type = 'satellite';
18 
+} else {
19 
+	$type = 'global';
20 
+}
15 21
16 22 
 //calculuation for the pagination
17 23 
 if(!isset($_GET['limit']))
 
@@ -19,7 +25,7 @@  discard block
 
 block discarded – undo
19 25 
   $limit_start = 0;
20 26 
   $limit_end = 25;
21 27 
   $absolute_difference = 25;
22 
-}  else {
28 
+} else {
23 29 
 	$limit_explode = explode(",", $_GET['limit']);
24 30 
 	$limit_start = $limit_explode[0];
25 31 
 	$limit_end = $limit_explode[1];
 
@@ -46,9 +52,12 @@  discard block
 
 block discarded – undo
46 52 
 	$feeds = $globalNewsFeeds[$type];
47 53 
 } else {
48 54 
 	$lg = $lang[1];
49 
-	if (isset($globalNewsFeeds[$type][$lg])) $feeds = $globalNewsFeeds[$type][$lg];
50 
-	else $feeds = array_shift($globalNewsFeeds[$type]);
51 
-}
55 
+	if (isset($globalNewsFeeds[$type][$lg])) {
56 
+		$feeds = $globalNewsFeeds[$type][$lg];
57 
+	} else {
58 
+		$feeds = array_shift($globalNewsFeeds[$type]);
59 
+	}
60 
+	}
52 61
53 62 
 $SimplePie->set_feed_url($feeds);
54 63 
 $SimplePie->set_cache_duration(3600);
 
@@ -60,7 +69,9 @@  discard block
 
 block discarded – undo
60 69 
 {
61 70 
 	$j = 0;
62 71 
 	foreach($anews as $news) {
63 
-		if ($j > 10) break;
72 
+		if ($j > 10) {
73 
+			break;
74 
+		}
64 75 
 		$j++;
65 76 
 		print '<div class="news">';
66 77 
 		print '<h4><a href="'.$news->get_permalink().'">'.$news->get_title().'</a> <span>('.$news->get_date('j M Y, g:i a').')</span></h4>'."\n";
Please login to merge, or discard this patch.
live-czml.php 1 patch
Braces   +122 added lines, -44 removed lines patch added patch discarded remove patch 
@@ -16,8 +16,12 @@  discard block
 
 block discarded – undo
16 16 
 }
17 17 
 $tracker = false;
18 18 
 $marine = false;
19 
-if (isset($_GET['tracker'])) $tracker = true;
20 
-if (isset($_GET['marine'])) $marine = true;
19 
+if (isset($_GET['tracker'])) {
20 
+	$tracker = true;
21 
+}
22 
+if (isset($_GET['marine'])) {
23 
+	$marine = true;
24 
+}
21 25 
 if ($tracker) {
22 26 
 	require_once('require/class.Tracker.php');
23 27 
 	require_once('require/class.TrackerLive.php');
 
@@ -74,24 +78,49 @@  discard block
 
 block discarded – undo
74 78 
 }
75 79 
 header('Content-Type: text/javascript');
76 80
77 
-if (!isset($globalJsonCompress)) $compress = true;
78 
-else $compress = $globalJsonCompress;
81 
+if (!isset($globalJsonCompress)) {
82 
+	$compress = true;
83 
+} else {
84 
+	$compress = $globalJsonCompress;
85 
+}
79 86
80 87 
 $from_archive = false;
81 88 
 $min = false;
82 89 
 $allhistory = false;
83 90 
 $filter['source'] = array();
84 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
85 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
86 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
87 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
88 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
89 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
90 
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
91 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
92 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
93 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
94 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
91 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
92 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
93 
+}
94 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
95 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
96 
+}
97 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
98 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
99 
+}
100 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
101 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
102 
+}
103 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
104 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
105 
+}
106 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
107 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
108 
+}
109 
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
110 
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
111 
+}
112 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
113 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
114 
+}
115 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
116 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
117 
+}
118 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
119 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
120 
+}
121 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
122 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
123 
+}
95 124 
 /*
96 125 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
97 126 
 	$min = true;
 
@@ -200,8 +229,12 @@  discard block
 
 block discarded – undo
200 229 
 	} else {
201 230 
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
202 231 
 	}
203 
-	if ($flightcnt == '') $flightcnt = 0;
204 
-} else $flightcnt = 0;
232 
+	if ($flightcnt == '') {
233 
+		$flightcnt = 0;
234 
+	}
235 
+	} else {
236 
+	$flightcnt = 0;
237 
+}
205 238
206 239 
 $sqltime = round(microtime(true)-$begintime,2);
207 240 
 $minitime = time();
 
@@ -237,7 +270,9 @@  discard block
 
 block discarded – undo
237 270 
 $prev_flightaware_id = '';
238 271 
 $speed = 1;
239 272 
 $gltf2 = false;
240 
-if (isset($archivespeed)) $speed = $archivespeed;
273 
+if (isset($archivespeed)) {
274 
+	$speed = $archivespeed;
275 
+}
241 276 
 $output = '[';
242 277 
 if ($tracker) {
243 278 
 	$output .= '{"id" : "document", "name" : "tracker","version" : "1.0"';
 
@@ -273,9 +308,13 @@  discard block
 
 block discarded – undo
273 308 
 			$image = "images/placeholder_thumb.png";
274 309 
 		}
275 310
276 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
277 
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
278 
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
311 
+                if (isset($spotter_item['flightaware_id'])) {
312 
+                	$id = $spotter_item['flightaware_id'];
313 
+                } elseif (isset($spotter_item['famtrackid'])) {
314 
+                	$id = $spotter_item['famtrackid'];
315 
+                } elseif (isset($spotter_item['fammarine_id'])) {
316 
+                	$id = $spotter_item['fammarine_id'];
317 
+                }
279 318 
                 if ($prev_flightaware_id != $id) {
280 319 
 			if ($prev_flightaware_id != '') {
281 320 
 				/*
 
@@ -301,7 +340,9 @@  discard block
 
 block discarded – undo
301 340 
 			$output .= '"flightcnt": "'.$flightcnt.'",';
302 341 
 			$output .= '"onground": %onground%,';
303 342 
 			$output .= '"lastupdate": "'.$lastupdate.'",';
304 
-			if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
343 
+			if (isset($spotter_item['format_source'])) {
344 
+				$output .= '"format": "'.$spotter_item['format_source'].'",';
345 
+			}
305 346 
 			if ($tracker) {
306 347 
 				$output.= '"type": "tracker"';
307 348 
 			} elseif ($marine) {
 
@@ -323,7 +364,9 @@  discard block
 
 block discarded – undo
323 364 
 							}
324 365 
 						}
325 366 
 					}
326 
-					if ($ident != '') $output.= '"ident": "'.$ident.'",';
367 
+					if ($ident != '') {
368 
+						$output.= '"ident": "'.$ident.'",';
369 
+					}
327 370 
 				}
328 371 
 				$output.= '"gltf2": %gltf2%,';
329 372 
 				$output.= '"type": "flight"';
 
@@ -355,7 +398,9 @@  discard block
 
 block discarded – undo
355 398 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
356 399 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
357 400 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
358 
-						} else $aircraft_shadow = '';
401 
+						} else {
402 
+							$aircraft_shadow = '';
403 
+						}
359 404 
 	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
360 405 
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
361 406 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 
@@ -363,7 +408,9 @@  discard block
 
 block discarded – undo
363 408 
 						}
364 409 
 						$output .= '},';
365 410 
 					}
366 
-				} else $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
411 
+				} else {
412 
+					$output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
413 
+				}
367 414 
 			} elseif ($one3dmodel) {
368 415 
 				if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') {
369 416 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -403,7 +450,9 @@  discard block
 
 block discarded – undo
403 450 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
404 451 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
405 452 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
406 
-						} else $aircraft_shadow = '';
453 
+						} else {
454 
+							$aircraft_shadow = '';
455 
+						}
407 456 
 						if ($aircraft_shadow != '') {
408 457 
 							if (isset($modelsdb[$aircraft_shadow])) {
409 458 
 								$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -540,7 +589,9 @@  discard block
 
 block discarded – undo
540 589 
 								}
541 590 
 								$output .= '},';
542 591 
 								//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
543 
-								if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
592 
+								if ($spotter_item['aircraft_icao'] != '') {
593 
+									$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
594 
+								}
544 595 
 								$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
545 596 
 							}
546 597 
 						} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
 
@@ -562,7 +613,9 @@  discard block
 
 block discarded – undo
562 613 
 							}
563 614 
 							$output .= '},';
564 615 
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
565 
-							if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
616 
+							if ($spotter_item['aircraft_icao'] != '') {
617 
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
618 
+							}
566 619 
 							$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
567 620 
 						}
568 621 
 					} else {
 
@@ -575,7 +628,9 @@  discard block
 
 block discarded – undo
575 628 
 						}
576 629 
 						$output .= '},';
577 630 
 						//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
578 
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
631 
+						if ($spotter_item['aircraft_icao'] != '') {
632 
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
633 
+						}
579 634 
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
580 635 
 					}
581 636 
 				} elseif ($tracker && isset($spotter_item['type'])) {
 
@@ -679,8 +734,11 @@  discard block
 
 block discarded – undo
679 734 
 					$output .= '},';
680 735 
 				}
681 736 
 			}
682 
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
683 
-			else $output = str_replace('%onground%','false',$output);
737 
+			if (isset($onground) && $onground) {
738 
+				$output = str_replace('%onground%','true',$output);
739 
+			} else {
740 
+				$output = str_replace('%onground%','false',$output);
741 
+			}
684 742
685 743 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
686 744 
 			//$output .= '"heightReference": "'.$heightrelative.'",';
 
@@ -693,8 +751,12 @@  discard block
 
 block discarded – undo
693 751 
 	//		$output .= '"interpolationDegree" : 5,';
694 752 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
695 753 
 			$output .= '"cartographicDegrees": [';
696 
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
697 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
754 
+			if ($minitime > strtotime($spotter_item['date'])) {
755 
+				$minitime = strtotime($spotter_item['date']);
756 
+			}
757 
+			if ($maxitime < strtotime($spotter_item['date'])) {
758 
+				$maxitime = strtotime($spotter_item['date']);
759 
+			}
698 760 
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
699 761 
 			$output .= $spotter_item['longitude'].', ';
700 762 
 			$output .= $spotter_item['latitude'];
 
@@ -717,7 +779,9 @@  discard block
 
 block discarded – undo
717 779 
 					$output .= ', '.round($spotter_item['altitude']*30.48);
718 780 
 					$prevalt = round($spotter_item['altitude']*30.48);
719 781 
 				}
720 
-			} else $output .= ', 0';
782 
+			} else {
783 
+				$output .= ', 0';
784 
+			}
721 785 
 			//$orientation = '"orientation" : { ';
722 786 
 			//$orientation .= '"unitQuaternion": [';
723 787 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 
@@ -725,13 +789,18 @@  discard block
 
 block discarded – undo
725 789 
 		} else {
726 790 
 			$nblatlong = $nblatlong+1;
727 791 
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
728 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
792 
+			if ($maxitime < strtotime($spotter_item['date'])) {
793 
+				$maxitime = strtotime($spotter_item['date']);
794 
+			}
729 795 
 			if ($spotter_item['ground_speed'] == 0) {
730 796 
 				$output .= $prevlong.', ';
731 797 
 				$output .= $prevlat;
732 798 
 				//if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt;
733 
-				if (!$marine) $output .= ', '.$prevalt;
734 
-				else $output .= ', 0';
799 
+				if (!$marine) {
800 
+					$output .= ', '.$prevalt;
801 
+				} else {
802 
+					$output .= ', 0';
803 
+				}
735 804 
 			} else {
736 805 
 				$output .= $spotter_item['longitude'].', ';
737 806 
 				$output .= $spotter_item['latitude'];
 
@@ -744,14 +813,17 @@  discard block
 
 block discarded – undo
744 813 
 							$output .= ', 0';
745 814 
 						}
746 815 
 					} else {
747 
-						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048);
748 
-						elseif ($tracker) {
816 
+						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
817 
+							$output .= ', '.round($spotter_item['real_altitude']*0.3048);
818 
+						} elseif ($tracker) {
749 819 
 							$output .= ', '.round($spotter_item['altitude']*0.3048);
750 820 
 						} else {
751 821 
 							$output .= ', '.round($spotter_item['altitude']*30.48);
752 822 
 						}
753 823 
 					}
754 
-				} else $output .= ', 0';
824 
+				} else {
825 
+					$output .= ', 0';
826 
+				}
755 827 
 			}
756 828 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
757 829 
 			//$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 
@@ -770,11 +842,17 @@  discard block
 
 block discarded – undo
770 842 
 		} else {
771 843 
 			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
772 844 
 		}
845 
+	} else {
846 
+		$output = str_replace('%minitime%',date("c",$minitime),$output);
773 847 
 	}
774 
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
775 
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
848 
+	} else {
849 
+	$output = str_replace('%minitime%',date("c",$minitime),$output);
850 
+}
776 851 
 $output = str_replace('%maxitime%',date("c",$maxitime),$output);
777 
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
778 
-else $output = str_replace('%gltf2%','false',$output);
852 
+if ($gltf2) {
853 
+	$output = str_replace('%gltf2%','true',$output);
854 
+} else {
855 
+	$output = str_replace('%gltf2%','false',$output);
856 
+}
779 857 
 print $output;
780 858 
 ?>
Please login to merge, or discard this patch.