rozhuk-im / ssdpd

www/upnp/control/ContentDirectory.php

Spacing +116 added lines, -116 removed lines

@@ -41,14 +41,14 @@ 
 
  
 /* Config.*/
-$basedir = dirname(__FILE__) . '/../../upnpdata'; /* File system path. */
-$baseurl = '/upnpdata';				/* WEB URL path. */
+$basedir = dirname(__FILE__).'/../../upnpdata'; /* File system path. */
+$baseurl = '/upnpdata'; /* WEB URL path. */
 
 date_default_timezone_set('UTC');
 
 
 /* File types. */
-$file_class = array (
+$file_class = array(
 	'm3u' => 'object.container.storageFolder',
 	'xspf' => 'object.container.storageFolder',
 	'xml' => 'object.container.storageFolder',
@@ -118,12 +118,12 @@ 
 
 
 if (substr($basedir, -1, 1) !== '/') {
-	$basedir = $basedir . '/';
+	$basedir = $basedir.'/';
 }
 $baseurl = implode('/', array_map('rawurlencode', explode('/', $baseurl)));
-$baseurlpatch = 'http://' . $_SERVER['HTTP_HOST'] . $baseurl;
+$baseurlpatch = 'http://'.$_SERVER['HTTP_HOST'].$baseurl;
 if ('/' !== substr($baseurlpatch, -1, 1)) {
-	$baseurlpatch = $baseurlpatch . '/';
+	$baseurlpatch = $baseurlpatch.'/';
 }
 /**
  * Apply workaround for the libxml PHP bugs:
@@ -136,7 +136,7 @@ 
 
 # $server = new SoapServer(null, array('uri' => "urn:schemas-upnp-org:service:ContentDirectory:3"));
 $server = new SoapServer(dirname(__FILE__)."/../descr/ContentDirectory.wdsl",
-		array(	'cache_wsdl' => WSDL_CACHE_MEMORY,
+		array('cache_wsdl' => WSDL_CACHE_MEMORY,
 			'soap_version' => SOAP_1_2,
 			'trace' => true
 		));
@@ -145,16 +145,16 @@ 
 function xml_encode($string) {
 
 	return (str_replace(
-	    array("&",		"<",	">",	/*'"',*/	"'"),
-	    array("&amp;",	"&lt;",	"&gt;",	/*"&quot;",*/	"&apos;"), 
+	    array("&", "<", ">", /*'"',*/	"'"),
+	    array("&amp;", "&lt;", "&gt;", /*"&quot;",*/	"&apos;"), 
 	    $string));
 }
 
 function xml_decode($string) {
 
 	return (str_replace(
-	    array("&amp;",	"&lt;",	"&gt;",	"&quot;",	"&apos;"), 
-	    array("&",		"<",	">",	'"',		"'"),
+	    array("&amp;", "&lt;", "&gt;", "&quot;", "&apos;"), 
+	    array("&", "<", ">", '"', "'"),
 	    $string));
 }
 
@@ -168,7 +168,7 @@ 
 		//return (xml_encode($url));
 		//return ('<![CDATA[' . xml_encode($url) . ']]');
 
-	return (substr($url, 0, $url_path_off) . implode('/', array_map('rawurlencode', explode('/', substr($url, $url_path_off)))));
+	return (substr($url, 0, $url_path_off).implode('/', array_map('rawurlencode', explode('/', substr($url, $url_path_off)))));
 	//return (substr($url, 0, $url_path_off) . xml_encode(implode('/', array_map('rawurlencode', explode('/', substr($url, $url_path_off))))));
 	//return (substr($url, 0, $url_path_off) . xml_encode(substr($url, $url_path_off)));
 	//return ('<![CDATA[$url]]');
@@ -221,9 +221,9 @@ 
 		$entry = trim(fgets($fd));
 		if (false === strpos($entry, '://'))
 			continue;
-		$items_count ++;
+		$items_count++;
 	} 
-	fclose ($fd);
+	fclose($fd);
 
 	return ($items_count);
 }
@@ -303,7 +303,7 @@ 
 	$res = date('Y-m-d', $timedate);
 
 	if (1 === $format) {
-		$res = $res . 'T' . date('H:i:s', $timedate);
+		$res = $res.'T'.date('H:i:s', $timedate);
 	}
 
 	return ($res);
@@ -364,14 +364,14 @@ 
 function Browse($ObjectID, $BrowseFlag, $Filter, $StartingIndex,
     $RequestedCount, $SortCriteria) {
 	global $basedir, $baseurl, $baseurlpatch;
-	$Result =   '<DIDL-Lite' .
-		    ' xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"' .
-		    ' xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/"' .
-		    ' xmlns:dc="http://purl.org/dc/elements/1.1/"' .
-		    ' xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/"' .
-		    ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-		    ' xsi:schemaLocation="' .
-			'urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/ http://www.upnp.org/schemas/av/didl-lite.xsd ' .
+	$Result = '<DIDL-Lite'.
+		    ' xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"'.
+		    ' xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/"'.
+		    ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
+		    ' xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/"'.
+		    ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
+		    ' xsi:schemaLocation="'.
+			'urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/ http://www.upnp.org/schemas/av/didl-lite.xsd '.
 			'urn:schemas-upnp-org:metadata-1-0/upnp/ http://www.upnp.org/schemas/av/upnp.xsd">';
 	$ParentID = '-1';
 	$NumberReturned = 0;
@@ -395,12 +395,12 @@ 
 		} else {
 			$dir = rawurldecode(xml_decode($ObjectID));
 			if ('/' !== substr($dir, -1, 1)) {
-				$dir = $dir . '/';
+				$dir = $dir.'/';
 			}
 			/* Sec check: .. in path */
 			$dotdotdir = '';
 			$dirnames = explode('/', $dir);
-			for ($di = 0; $di < sizeof($dirnames); $di ++) {
+			for ($di = 0; $di < sizeof($dirnames); $di++) {
 				if ('.' === $dirnames[$di])
 					continue;
 				if ('..' === $dirnames[$di]) {
@@ -408,7 +408,7 @@ 
 					break;
 				}
 				if ((sizeof($dirnames) - 1) > $di) {
-					$dotdotdir = $dotdotdir . $dirnames[$di] . '/';
+					$dotdotdir = $dotdotdir.$dirnames[$di].'/';
 				}
 			}
 			$dir = $dotdotdir;
@@ -431,7 +431,7 @@ 
 		/* Is file/dir exist? */
 		$stat = stat($filename);
 		if (false === $stat) { /* No such file/dir. */
-			return (array(	'Result' => '',
+			return (array('Result' => '',
 					'NumberReturned' => 0,
 					'TotalMatches' => 0,
 					'UpdateID' => $UpdateID));
@@ -459,45 +459,45 @@ 
 			$StorageFree = disk_free_space($filename);
 			$StorageUsed = ($StorageTotal - $StorageFree);
 			$ChildCount = (count(scandir($filename)) - 2);
-			$Result = $Result .
-			    "<container id=\"$ObjectID\" parentID=\"$ParentID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">" .
-				"<dc:title>$title</dc:title>" .
-				'<upnp:class>object.container.storageFolder</upnp:class>' .
-				"<upnp:storageTotal>$StorageTotal</upnp:storageTotal>" .
-				"<upnp:storageFree>$StorageFree</upnp:storageFree>" .
-				"<upnp:storageUsed>$StorageUsed</upnp:storageUsed>" .
+			$Result = $Result.
+			    "<container id=\"$ObjectID\" parentID=\"$ParentID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">".
+				"<dc:title>$title</dc:title>".
+				'<upnp:class>object.container.storageFolder</upnp:class>'.
+				"<upnp:storageTotal>$StorageTotal</upnp:storageTotal>".
+				"<upnp:storageFree>$StorageFree</upnp:storageFree>".
+				"<upnp:storageUsed>$StorageUsed</upnp:storageUsed>".
 				"<upnp:writeStatus>$WriteStatus</upnp:writeStatus>";
 			if ('0' === $ObjectID) {
-				$Result = $Result .
-					'<upnp:searchClass includeDerived="1">object.item.audioItem</upnp:searchClass>' .
-					'<upnp:searchClass includeDerived="1">object.item.imageItem</upnp:searchClass>' .
+				$Result = $Result.
+					'<upnp:searchClass includeDerived="1">object.item.audioItem</upnp:searchClass>'.
+					'<upnp:searchClass includeDerived="1">object.item.imageItem</upnp:searchClass>'.
 					'<upnp:searchClass includeDerived="1">object.item.videoItem</upnp:searchClass>';
 			}
-			$Result = $Result . '</container>';
+			$Result = $Result.'</container>';
 		} else { /* File or playlist. */
 			$iclass = upnp_get_class($basefilename, 'object.item.videoItem');
 			if ('object.container.storageFolder' === $iclass) { /* Play list as folder! */
 				$ChildCount = m3u_calc_items_count($filename);
-				$Result = $Result .
-				    "<container id=\"$ObjectID\" parentID=\"$ParentID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">" .
-					"<dc:title>$title</dc:title>" .
-					'<upnp:class>object.container.storageFolder</upnp:class>' .
+				$Result = $Result.
+				    "<container id=\"$ObjectID\" parentID=\"$ParentID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">".
+					"<dc:title>$title</dc:title>".
+					'<upnp:class>object.container.storageFolder</upnp:class>'.
 				    '</container>';
 			} else {
 				$date = upnp_date(filectime($filename), 1);
 				$size = filesize($filename);
 				$mimetype = upnp_mime_content_type($filename);
-				$Result = $Result .
-				    "<item id=\"$ObjectID\" parentID=\"$ParentID\" restricted=\"$Restricted\">" .
-					"<dc:title>$title</dc:title>" .
-					"<dc:date>$date</dc:date>" .
-					"<upnp:class>$iclass</upnp:class>" .
-					"<res size=\"$size\" protocolInfo=\"http-get:*:$mimetype:*\">$ObjectID</res>" .
+				$Result = $Result.
+				    "<item id=\"$ObjectID\" parentID=\"$ParentID\" restricted=\"$Restricted\">".
+					"<dc:title>$title</dc:title>".
+					"<dc:date>$date</dc:date>".
+					"<upnp:class>$iclass</upnp:class>".
+					"<res size=\"$size\" protocolInfo=\"http-get:*:$mimetype:*\">$ObjectID</res>".
 				    '</item>';
 			}
 		}
-		$Result = $Result . '</DIDL-Lite>';
-		return (array(	'Result' => $Result,
+		$Result = $Result.'</DIDL-Lite>';
+		return (array('Result' => $Result,
 				'NumberReturned' => 1,
 				'TotalMatches' => 1,
 				'UpdateID' => $UpdateID));
@@ -515,7 +515,7 @@ 
 		$filename = $basedir.$dir;
 		$fd = fopen($filename, 'r');
 		if (false === $fd) {
-			return (array(	'Result' => '',
+			return (array('Result' => '',
 					'NumberReturned' => 0,
 					'TotalMatches' => 0,
 					'UpdateID' => $UpdateID));
@@ -550,14 +550,14 @@ 
 			if (false === strpos($entry, '://'))
 				continue;
 			/* Ok, item matched and may be returned. */
-			$TotalMatches ++;
+			$TotalMatches++;
 			if (0 < $StartingIndex &&
 			    $TotalMatches < $StartingIndex)
 				continue; /* Skip first items. */
 			if (0 < $RequestedCount &&
 			    $NumberReturned >= $RequestedCount)
 				continue; /* Do not add more than requested. */
-			$NumberReturned ++;
+			$NumberReturned++;
 			/* Add item to result. */
 			$title = xml_encode(trim(substr($buffer, (strpos($buffer, ',') + 1))));
 			//$en_entry = upnp_url_encode($entry);
@@ -565,10 +565,10 @@ 
 			$iclass = upnp_get_class($entry, 'object.item.videoItem.videoBroadcast');
 			$mimetype = 'video/mpeg';
 			if ('object.container.storageFolder' === $iclass) { /* Play list as folder! */
-				$Result = $Result .
-				    "<container id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\">" .
-					"<dc:title>$title</dc:title>" .
-					'<upnp:class>object.container.storageFolder</upnp:class>' .
+				$Result = $Result.
+				    "<container id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\">".
+					"<dc:title>$title</dc:title>".
+					'<upnp:class>object.container.storageFolder</upnp:class>'.
 				    '</container>';
 			} else {
 				//$logo = get_named_val("tvg-logo", $buffer);
@@ -576,21 +576,21 @@ 
 				//	$logo = trim(substr($buffer, (strpos($buffer, ',') + 1)));
 				//}
 				//$icon_url = upnp_url_encode($logo_url_path . mb_convert_case($logo, MB_CASE_LOWER, "UTF-8") . '.png');
-				$Result = $Result .
-				    "<item id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\">" .
-					"<dc:title>$title</dc:title>" .
-					"<dc:date>$date</dc:date>" .
+				$Result = $Result.
+				    "<item id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\">".
+					"<dc:title>$title</dc:title>".
+					"<dc:date>$date</dc:date>".
 					//"<upnp:albumArtURI dlna:profileID=\"JPEG_TN\" xmlns:dlna=\"urn:schemas-dlna-org:metadata-1-0\">$icon_url</upnp:albumArtURI>" .
 					//"<upnp:icon>$icon_url</upnp:icon>" .
-					"<upnp:class>$iclass</upnp:class>" .
-					"<res protocolInfo=\"http-get:*:$mimetype:*\">$en_entry</res>" .
+					"<upnp:class>$iclass</upnp:class>".
+					"<res protocolInfo=\"http-get:*:$mimetype:*\">$en_entry</res>".
 				    '</item>';
 			}
 		} 
-		fclose ($fd);
+		fclose($fd);
 
-		$Result = $Result . '</DIDL-Lite>';
-		return (array(	'Result' => $Result,
+		$Result = $Result.'</DIDL-Lite>';
+		return (array('Result' => $Result,
 				'NumberReturned' => $NumberReturned,
 				'TotalMatches' => $TotalMatches,
 				'UpdateID' => $UpdateID));
@@ -605,14 +605,14 @@ 
 		    !is_dir($filename)) /* Skip files. */
 			continue;
 		/* Ok, item matched and may be returned. */
-		$TotalMatches ++;
+		$TotalMatches++;
 		if (0 < $StartingIndex &&
 		    $TotalMatches < $StartingIndex)
 			continue; /* Skip first items. */
 		if (0 < $RequestedCount &&
 		    $NumberReturned >= $RequestedCount)
 			continue; /* Do not add more than requested. */
-		$NumberReturned ++;
+		$NumberReturned++;
 		/* Add item to result. */
 		if (is_writable($filename)) {
 			$Restricted = '0';
@@ -622,10 +622,10 @@ 
 		$title = xml_encode($entry);
 		$en_entry = upnp_url_encode($dir.$entry);
 		$ChildCount = (count(scandir($filename)) - 2);
-		$Result = $Result .
-		    "<container id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">" .
-			"<dc:title>$title</dc:title>" .
-			'<upnp:class>object.container.storageFolder</upnp:class>' .
+		$Result = $Result.
+		    "<container id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">".
+			"<dc:title>$title</dc:title>".
+			'<upnp:class>object.container.storageFolder</upnp:class>'.
 		    '</container>';
 	}
 	/* Add files to play list. */
@@ -637,14 +637,14 @@ 
 		if (null === $iclass) /* Skip unsupported file type. */
 			continue;
 		/* Ok, item matched and may be returned. */
-		$TotalMatches ++;
+		$TotalMatches++;
 		if (0 < $StartingIndex &&
 		    $TotalMatches < $StartingIndex)
 			continue; /* Skip first items. */
 		if (0 < $RequestedCount &&
 		    $NumberReturned >= $RequestedCount)
 			continue; /* Do not add more than requested. */
-		$NumberReturned ++;
+		$NumberReturned++;
 		/* Add item to result. */
 		if (is_writable($filename)) {
 			$Restricted = '0';
@@ -655,38 +655,38 @@ 
 		$en_entry = upnp_url_encode($dir.$entry);
 		if ('object.container.storageFolder' === $iclass) { /* Play list as folder! */
 			$ChildCount = m3u_calc_items_count($filename);
-			$Result = $Result .
-			    "<container id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">" .
-				"<dc:title>$title</dc:title>" .
-				'<upnp:class>object.container.storageFolder</upnp:class>' .
+			$Result = $Result.
+			    "<container id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\" searchable=\"1\" childCount=\"$ChildCount\">".
+				"<dc:title>$title</dc:title>".
+				'<upnp:class>object.container.storageFolder</upnp:class>'.
 			    '</container>';
 		} else {
 			$date = upnp_date(filectime($filename), 1);
 			$size = filesize($filename);
 			$mimetype = upnp_mime_content_type($filename);
 			$res_info_ex = '';
-			$Result = $Result .
-			    "<item id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\">" .
-				"<dc:title>$title</dc:title>" .
-				"<dc:date>$date</dc:date>" .
+			$Result = $Result.
+			    "<item id=\"$en_entry\" parentID=\"$ObjectID\" restricted=\"$Restricted\">".
+				"<dc:title>$title</dc:title>".
+				"<dc:date>$date</dc:date>".
 				"<upnp:class>$iclass</upnp:class>";
 			if ('object.item.imageItem' === substr($iclass, 0, 21)) {
-				$Result = $Result .
-				    "<upnp:albumArtURI>$baseurlpatch$en_entry</upnp:albumArtURI>" .
+				$Result = $Result.
+				    "<upnp:albumArtURI>$baseurlpatch$en_entry</upnp:albumArtURI>".
 				    "<upnp:icon>$baseurlpatch$en_entry</upnp:icon>";
 				$img_info = getimagesize($filename);
 				if (false !== $img_info) {
-					$res_info_ex = ' resolution="' . $img_info[0] . 'x' . $img_info[1] . '"';
+					$res_info_ex = ' resolution="'.$img_info[0].'x'.$img_info[1].'"';
 				}
 			}
-			$Result = $Result .
-				"<res size=\"$size\"$res_info_ex protocolInfo=\"http-get:*:$mimetype:*\">$baseurlpatch$en_entry</res>" .
+			$Result = $Result.
+				"<res size=\"$size\"$res_info_ex protocolInfo=\"http-get:*:$mimetype:*\">$baseurlpatch$en_entry</res>".
 			    '</item>';
 		}
 	}
 
-	$Result = $Result . '</DIDL-Lite>';
-	return (array(	'Result' => $Result,
+	$Result = $Result.'</DIDL-Lite>';
+	return (array('Result' => $Result,
 			'NumberReturned' => $NumberReturned,
 			'TotalMatches' => $TotalMatches,
 			'UpdateID' => $UpdateID));
@@ -696,22 +696,22 @@ 
 function Search($ContainerID, $SearchCriteria, $Filter, $StartingIndex,
     $RequestedCount, $SortCriteria) {
 	global $basedir, $baseurl, $baseurlpatch;
-	$Result =   '<DIDL-Lite' .
-		    ' xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"' .
-		    ' xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/"' .
-		    ' xmlns:dc="http://purl.org/dc/elements/1.1/"' .
-		    ' xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/"' .
-		    ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-		    ' xsi:schemaLocation="' .
-			'urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/ http://www.upnp.org/schemas/av/didl-lite.xsd ' .
+	$Result = '<DIDL-Lite'.
+		    ' xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/"'.
+		    ' xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/"'.
+		    ' xmlns:dc="http://purl.org/dc/elements/1.1/"'.
+		    ' xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/"'.
+		    ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
+		    ' xsi:schemaLocation="'.
+			'urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/ http://www.upnp.org/schemas/av/didl-lite.xsd '.
 			'urn:schemas-upnp-org:metadata-1-0/upnp/ http://www.upnp.org/schemas/av/upnp.xsd">';
 	$NumberReturned = 0;
 	$TotalMatches = 0;
 	$UpdateID = 1;
 
-	$Result = $Result . '</DIDL-Lite>';
+	$Result = $Result.'</DIDL-Lite>';
 
-	return (array(	'Result' => $Result,
+	return (array('Result' => $Result,
 			'NumberReturned' => $NumberReturned,
 			'TotalMatches' => $TotalMatches,
 			'UpdateID' => $UpdateID));
@@ -722,7 +722,7 @@ 
 	$ObjectID = '';
 	$Result = '';
 
-	return (array(	'ObjectID' => $ObjectID,
+	return (array('ObjectID' => $ObjectID,
 			'Result' => $Result));
 }
 
@@ -742,19 +742,19 @@ 
 /* Samsung private. */
 function X_GetFeatureList() {
 	$FeatureList = 
-		'<?xml version="1.0" encoding="UTF-8"?>' .
-		'<Features' .
-		' xmlns="urn:schemas-upnp-org:av:avs"' .
-		' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-		' xmlns:sec="http://www.sec.co.kr/dlna"' .
-		' xsi:schemaLocation="urn:schemas-upnp-org:av:avs http://www.upnp.org/schemas/av/avs.xsd">' .
-			'<Feature name="samsung.com_BASICVIEW" version="1">' .
-			    '<container id="A" type="object.item.audioItem"/>' .
-			    '<container id="I" type="object.item.imageItem"/>' .
-			    '<container id="V" type="object.item.videoItem"/>' .
-			    '<container id="P" type="object.item.playlistItem"/>' .
-			    '<container id="T" type="object.item.textItem"/>' .
-			'</Feature>' .
+		'<?xml version="1.0" encoding="UTF-8"?>'.
+		'<Features'.
+		' xmlns="urn:schemas-upnp-org:av:avs"'.
+		' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
+		' xmlns:sec="http://www.sec.co.kr/dlna"'.
+		' xsi:schemaLocation="urn:schemas-upnp-org:av:avs http://www.upnp.org/schemas/av/avs.xsd">'.
+			'<Feature name="samsung.com_BASICVIEW" version="1">'.
+			    '<container id="A" type="object.item.audioItem"/>'.
+			    '<container id="I" type="object.item.imageItem"/>'.
+			    '<container id="V" type="object.item.videoItem"/>'.
+			    '<container id="P" type="object.item.playlistItem"/>'.
+			    '<container id="T" type="object.item.textItem"/>'.
+			'</Feature>'.
 		'</Features>';
 
 	return ($FeatureList);
@@ -773,7 +773,7 @@ 
 
 $request_body = @file_get_contents('php://input');
 try {
-	$server->addFunction(array(	'GetSearchCapabilities',
+	$server->addFunction(array('GetSearchCapabilities',
 					'GetSortCapabilities',
 					'GetSortExtensionCapabilities',
 					'GetFeatureList',
@@ -823,7 +823,7 @@ 
 	return (strrev(substr($rreq, $ns_st, ($ns_end - $ns_st))));
 }
 
-function tag_ns_replace($req, $sxml, $tag, $ns=false) {
+function tag_ns_replace($req, $sxml, $tag, $ns = false) {
 	if (false === $tag)
 		return ($sxml);
 	if (false === $ns)
@@ -855,7 +855,7 @@ 
 $soapXml = tag_ns_replace($request_body, $soapXml, $soap_act_resp_tag, get_tag_ns($request_body, $soap_service_func));
 
 $length = strlen($soapXml);
-header('Content-Length: ' . $length);
+header('Content-Length: '.$length);
 echo $soapXml;
 
 ?>

Braces +101 added lines, -58 removed lines

@@ -111,8 +111,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);
 
@@ -162,8 +163,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) . ']]');
@@ -178,14 +180,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);
 }
@@ -194,15 +200,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)));
 }
@@ -212,15 +221,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);
@@ -277,11 +290,13 @@ 
 		'ts' => 'video/MP2T',
 		'webm' => 'video/webm',
 	);
-	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]);
@@ -401,8 +416,9 @@ 
 			$dotdotdir = '';
 			$dirnames = explode('/', $dir);
 			for ($di = 0; $di < sizeof($dirnames); $di ++) {
-				if ('.' === $dirnames[$di])
-					continue;
+				if ('.' === $dirnames[$di]) {
+									continue;
+				}
 				if ('..' === $dirnames[$di]) {
 					$dir = '';
 					break;
@@ -547,16 +563,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))));
@@ -602,16 +623,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)) {
@@ -631,19 +658,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)) {
@@ -802,38 +837,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);