1 files changed, 40 insertions, 15 deletions

diff --git a/includes/inc_media.php b/includes/inc_media.php
index 3d1f820..53788c2 100755
--- a/includes/inc_media.php
+++ b/includes/inc_media.php
@@ -1,11 +1,18 @@
 <?php
 
-global $mediapath;
+global $mediapath, $videotypes, $audiotypes;
 
 $dir = $_REQUEST['dir'];
 if ($dir == "")
 	$dir = $mediapath;
 
+/* Add last slash to dirs */
+if ($mediapath[strlen($mediapath)-1] != '/')
+	$mediapath = $mediapath .'/';
+
+if ($dir[strlen($dir)-1] != '/')
+	$dir = $dir .'/';
+
 // Get current subdir
 $subdir = preg_replace("'" .quotemeta($mediapath) ."'", '', $dir);
 
@@ -16,8 +23,11 @@ if ($dir == $mediapath)
 	print "<a href=\"index.php\"><img alt=\"home\" src=\"images/home.png\" /></a></div>\r\n";
 else
 	print "<a href=\"javascript:sendForm('getback')\">Back</a></div>\r\n";
+if ($dir != $mediapath)
+{
 print "<div id=\"rightnav\">\r\n";
 print "<a href=\"index.php\"><img alt=\"home\" src=\"images/home.png\" /></a></div>\r\n";
+}
 print "<div id=\"title\">iStreamdev</div>\r\n";
 print "</div>\r\n";
 print "<div id=\"content\">\r\n";
@@ -26,38 +36,53 @@ print "<br>";
 print " <span class=\"graytitle\">{$subdir}</span>\r\n";
 print " <ul class=\"pageitem\">";
 
-$dir_handle = @opendir($dir) or die("Unable to open $dir");
-
-while ($medianame = readdir($dir_handle))
+$dir_handle = @opendir($dir);
+if (!$dir_handle)
+{
+	print "Unable to open $dir";
+}
+else while ($medianame = readdir($dir_handle))
 {
 	if($medianame == "." || $medianame == ".." || $medianame == 'lost+found')
 		continue;
-	
+
 	$medianame2=addslashes($medianame);
 
-	if (strstr($medianame, ".avi") == ".avi")
+	// Directories
+	if (is_dir($dir ."/" .$medianame))
 	{
 		print "<li class=\"menu\"><a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\"><span class=\"name\">$medianame</span><span class=\"arrow\"></span></a></li>\r\n";
 		print "<form name=\"$medianame\" id=\"$medianame\" method=\"post\" action=\"index.php\">";
-		print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"stream\"/>";
-                print "   <input name=\"type\" type=\"hidden\" id=\"type\" value=3 />";
-                print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$dir}/{$medianame}\" />";
+		print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/>";
+		print "   <input name=\"dir\" type=\"hidden\" id=\"dir\" value=\"{$dir}{$medianame}/\" />";
 		print "</form>\r\n";
 	}
 	else
 	{
-		print "<li class=\"menu\"><a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\"><span class=\"name\">$medianame</span><span class=\"arrow\"></span></a></li>\r\n";
-		print "<form name=\"$medianame\" id=\"$medianame\" method=\"post\" action=\"index.php\">";
-		print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/>";
-		print "   <input name=\"dir\" type=\"hidden\" id=\"dir\" value=\"{$dir}/{$medianame}\" />";
-		print "</form>\r\n";
+		// Get file extension
+		$fileext = end(explode(".", $medianame));
+
+		// Check if it is supported
+		if (	preg_match("'" .$fileext ." '", $videotypes)
+		    ||	preg_match("'" .$fileext ." $'", $videotypes)
+		   )
+		{
+			print "<li class=\"menu\"><a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\"><img src=\"images/pictos/media.png\" /><span class=\"name\">$medianame</span><span class=\"arrow\"></span></a></li>\r\n";
+			print "<form name=\"$medianame\" id=\"$medianame\" method=\"post\" action=\"index.php\">";
+			print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"stream\"/>";
+	                print "   <input name=\"type\" type=\"hidden\" id=\"type\" value=3 />";
+        	        print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$dir}{$medianame}\" />";
+			print "</form>\r\n";
+		}
 	}
 }
 
 $updir = dirname($dir);
 
 print "<form name=\"getback\" id=\"getback\" method=\"post\" action=\"index.php\"><input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/><input name=\"dir\" type=\"hidden\" id=\"dir\" value=\"{$updir}/\" /></form>\r\n";
-closedir($dir_handle);
+
+if ($dir_handle)
+	closedir($dir_handle);
 
 print "</ul></div>\r\n";
 ?>