rozhuk-im / ssdpd

www/upnp/control/ContentDirectory.php

Braces +101 added lines, -58 removed lines

@@ -158,8 +158,9 @@ 
 /* "urn:schemas-upnp-org:service:ContentDirectory:1#Browse" */
 $http_hdr_soapact = $_SERVER['HTTP_SOAPACTION'];
 $soap_shemas = strpos($http_hdr_soapact, 'urn:schemas-upnp-org:service:ContentDirectory:');
-if (false === $soap_shemas)
+if (false === $soap_shemas) {
 	return (500);
+}
 $soap_service_ver = substr($http_hdr_soapact, ($soap_shemas + 46), 1);
 $soap_service_func = substr($http_hdr_soapact, ($soap_shemas + 48), -1);
 
@@ -209,8 +210,9 @@ 
 function upnp_url_encode($url) {
 
 	if ('http://' !== substr($url, 0, 7) ||
-	    false === ($url_path_off = strrpos($url, '/', 8)))
-		return (implode('/', array_map('rawurlencode', explode('/', $url))));
+	    false === ($url_path_off = strrpos($url, '/', 8))) {
+			return (implode('/', array_map('rawurlencode', explode('/', $url))));
+	}
 		//return (xml_encode(implode('/', array_map('rawurlencode', explode('/', $url)))));
 		//return (xml_encode($url));
 		//return ('<![CDATA[' . xml_encode($url) . ']]');
@@ -225,14 +227,18 @@ 
 function upnp_get_class($file, $def) {
 	global $file_class;
 
-	if (!isset($file))
-		return ($def);
+	if (!isset($file)) {
+			return ($def);
+	}
 	$dot = strrpos($file, '.');
-	if (false === $dot)
-		return ($def);
+	if (false === $dot) {
+			return ($def);
+	}
 	$ext = strtolower(substr($file, ($dot + 1)));
-	if (isset($file_class[$ext])) /* Skip unsupported file type. */
+	if (isset($file_class[$ext])) {
+		/* Skip unsupported file type. */
 		return ($file_class[$ext]);
+	}
 
 	return ($def);
 }
@@ -241,15 +247,18 @@ 
 function get_named_val($name, $buf) { /* ...val_name="value"... */
 
 	$st_off = strpos($buf, $name);
-	if (false === $st_off)
-		return (null);
+	if (false === $st_off) {
+			return (null);
+	}
 	$st_off += strlen($name);
-	if ('="' !== substr($buf, $st_off, 2))
-		return (null);
+	if ('="' !== substr($buf, $st_off, 2)) {
+			return (null);
+	}
 	$st_off += 2;
 	$en_off = strpos($buf, '"', $st_off);
-	if (false === $en_off)
-		return (null);
+	if (false === $en_off) {
+			return (null);
+	}
 
 	return (substr($buf, $st_off, ($en_off - $st_off)));
 }
@@ -259,15 +268,19 @@ 
 
 	$items_count = 0;
 	$fd = fopen($filename, 'r');
-	if (false === $fd)
-		return ($items_count);
+	if (false === $fd) {
+			return ($items_count);
+	}
 	while (!feof($fd)) { /* Read the file line by line... */
 		$buffer = trim(fgets($fd));
-		if (false === strpos($buffer, '#EXTINF:')) /* Skip empty/bad lines. */
+		if (false === strpos($buffer, '#EXTINF:')) {
+			/* Skip empty/bad lines. */
 			continue;
+		}
 		$entry = trim(fgets($fd));
-		if (false === strpos($entry, '://'))
-			continue;
+		if (false === strpos($entry, '://')) {
+					continue;
+		}
 		$items_count++;
 	} 
 	fclose($fd);
@@ -315,16 +328,21 @@ 
 			continue;
 		}
 		$entry = trim(fgets($fd));
-		if (false === strpos($entry, '://'))
-			continue;
+		if (false === strpos($entry, '://')) {
+					continue;
+		}
 		/* Ok, item matched and may be returned. */
 		$TotalMatches++;
 		if (0 < $StartingIndex &&
-		    $TotalMatches < $StartingIndex)
-			continue; /* Skip first items. */
+		    $TotalMatches < $StartingIndex) {
+					continue;
+		}
+		/* Skip first items. */
 		if (0 < $RequestedCount &&
-		    $NumberReturned >= $RequestedCount)
-			continue; /* Do not add more than requested. */
+		    $NumberReturned >= $RequestedCount) {
+					continue;
+		}
+		/* Do not add more than requested. */
 		$NumberReturned++;
 		/* Add item to result. */
 		$title = xml_encode(trim(substr($buffer, (strpos($buffer, ',') + 1))));
@@ -370,11 +388,13 @@ 
 
 	$def = 'video/mpeg';
 
-	if (!isset($filename))
-		return ($def);
+	if (!isset($filename)) {
+			return ($def);
+	}
 	$dot = strrpos($filename, '.');
-	if (false === $dot)
-		return ($def);
+	if (false === $dot) {
+			return ($def);
+	}
 	$ext = strtolower(substr($filename, ($dot + 1)));
 	if (array_key_exists($ext, $mime_types)) {
 		return ($mime_types[$ext]);
@@ -574,8 +594,9 @@ 
 			$dirnames = explode('/', $dir);
 			$dirnames_size = sizeof($dirnames);
 			for ($di = 0; $di < $dirnames_size; $di++) {
-				if ('.' === $dirnames[$di])
-					continue;
+				if ('.' === $dirnames[$di]) {
+									continue;
+				}
 				if ('..' === $dirnames[$di]) {
 					$dir = '';
 					break;
@@ -622,16 +643,22 @@ 
 	foreach ($entries as $entry) {
 		$filename = $basedir.$dir.$entry;
 		if ('.' === substr($entry, 0, 1) ||
-		    !is_dir($filename)) /* Skip files. */
+		    !is_dir($filename)) {
+			/* Skip files. */
 			continue;
+		}
 		/* Ok, item matched and may be returned. */
 		$TotalMatches++;
 		if (0 < $StartingIndex &&
-		    $TotalMatches < $StartingIndex)
-			continue; /* Skip first items. */
+		    $TotalMatches < $StartingIndex) {
+					continue;
+		}
+		/* Skip first items. */
 		if (0 < $RequestedCount &&
-		    $NumberReturned >= $RequestedCount)
-			continue; /* Do not add more than requested. */
+		    $NumberReturned >= $RequestedCount) {
+					continue;
+		}
+		/* Do not add more than requested. */
 		$NumberReturned++;
 		/* Add item to result. */
 		if (is_writable($filename)) {
@@ -651,19 +678,27 @@ 
 	/* Add files to play list. */
 	foreach ($entries as $entry) {
 		$filename = $basedir.$dir.$entry;
-		if (is_dir($filename)) /* Skip dirs. */
+		if (is_dir($filename)) {
+			/* Skip dirs. */
 			continue;
+		}
 		$iclass = upnp_get_class($entry, null);
-		if (null === $iclass) /* Skip unsupported file type. */
+		if (null === $iclass) {
+			/* Skip unsupported file type. */
 			continue;
+		}
 		/* Ok, item matched and may be returned. */
 		$TotalMatches++;
 		if (0 < $StartingIndex &&
-		    $TotalMatches < $StartingIndex)
-			continue; /* Skip first items. */
+		    $TotalMatches < $StartingIndex) {
+					continue;
+		}
+		/* Skip first items. */
 		if (0 < $RequestedCount &&
-		    $NumberReturned >= $RequestedCount)
-			continue; /* Do not add more than requested. */
+		    $NumberReturned >= $RequestedCount) {
+					continue;
+		}
+		/* Do not add more than requested. */
 		$NumberReturned++;
 		/* Add item to result. */
 		if (is_writable($filename)) {
@@ -827,38 +862,46 @@ 
 
 function get_resp_tag_name($sxml) {
 	$tag_st = strpos($sxml, '<SOAP-ENV:Body><SOAP-ENV:');
-	if (false === $tag_st)
-		return (false);
+	if (false === $tag_st) {
+			return (false);
+	}
 	$tag_st += 25;
 	$tag_end = strpos($sxml, '>', $tag_st);
-	if (false === $tag_end)
-		return (false);
+	if (false === $tag_end) {
+			return (false);
+	}
 	return (substr($sxml, $tag_st, ($tag_end - $tag_st)));
 }
 
 function get_tag_ns($req, $tag) {
 	$rreq = strrev($req);
 	$ns_st = strpos($rreq, strrev(":$tag>"));
-	if (false === $ns_st)
-		return (false);
+	if (false === $ns_st) {
+			return (false);
+	}
 	$ns_st += (strlen($tag) + 2);
 	$ns_end = strpos($rreq, '/<', $ns_st);
-	if (false === $ns_end)
-		return (false);
+	if (false === $ns_end) {
+			return (false);
+	}
 	return (strrev(substr($rreq, $ns_st, ($ns_end - $ns_st))));
 }
 
 function tag_ns_replace($req, $sxml, $tag, $ns = false) {
-	if (false === $tag)
-		return ($sxml);
-	if (false === $ns)
-		$ns = get_tag_ns($req, $tag);
-	if (false === $ns)
-		return ($sxml);
+	if (false === $tag) {
+			return ($sxml);
+	}
+	if (false === $ns) {
+			$ns = get_tag_ns($req, $tag);
+	}
+	if (false === $ns) {
+			return ($sxml);
+	}
 	while ($tag_st = strpos($sxml, "<SOAP-ENV:$tag")) {
 		$tag_end = strpos($sxml, '>', $tag_st);
-		if (false === $tag_end)
-			return ($sxml);
+		if (false === $tag_end) {
+					return ($sxml);
+		}
 		$old_tag_data = substr($sxml, $tag_st, ($tag_end - $tag_st));
 		$new_tag_data = str_replace('SOAP-ENV', $ns, $old_tag_data);
 		$sxml = str_replace($old_tag_data, $new_tag_data, $sxml);