1 files changed, 7 insertions, 146 deletions
diff --git a/includes/inc_media.php b/includes/inc_media.php
index eaed547..e0f7cb9 100755
--- a/includes/inc_media.php
+++ b/includes/inc_media.php
@@ -1,156 +1,17 @@
 <?php
 
-global $videotypes;
-$audiotypes='mp3 aac';
-
-$subdir = $_REQUEST['subdir'];
 $mediapath = $_REQUEST['mediapath'];
+$subdir = $_REQUEST['subdir'];
 
 /* Add last slash to dirs */
 if ($mediapath[strlen($mediapath)-1] != '/')
-	$mediapath = $mediapath .'/';
+        $mediapath = $mediapath .'/';
 if ($subdir[strlen($subdir)-1] != '/')
-	$subdir = $subdir .'/';
+        $subdir = $subdir .'/';
 
-print "<body onorientationchange=\"updateOrientation();\" onload=\"updateOrientation();\">\r\n";
-print "<div id=\"topbar\" class=\"transparent\">\r\n";
-print "<div id=\"leftnav\">\r\n";
-
-if ($subdir == '/')
-	print "<a href=\"index.php\"><img alt=\"home\" src=\"images/home.png\" /></a></div>\r\n";
+// Use the right media type 
+if (mediadirhasaudio($mediapath .$subdir))
+	include ('includes/inc_audio.php');
 else
-{
-	print "<a href=\"javascript:sendForm('getback')\">Back</a></div>\r\n";
-	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";
-print "  <span class=\"graytitle\">Media</span>\r\n";
-print "  <br>";
-print "  <ul class=\"pageitem\">";
-print "  <li class=\"textbox\"><span class=\"header\">Current path:</span><p>{$subdir}</p></li>";
-
-// Option to play dir
-$audioextarray = explode(' ', $audiotypes);
-$playlist = 0;
-foreach ($audioextarray as $num => $audioext)
-{
-	if (glob($mediapath .$subdir .'*.' .$audioext))
-		$playlist = 1;
-}
-
-if ($playlist)
-{
-	print "  <li class=\"menu\">\r\n";
-	print "  <a class=\"noeffect\" href=\"javascript:sendForm('track_all');\">\r\n"; 
-	print "      <img src=\"images/pictos/playlist.png\" />\r\n";
-	print "      <span class=\"name\">Play current dir</span>\r\n";
-	print "      <span class=\"arrow\"></span>\r\n";
-	print "      </a>\r\n";
-	print "  </li>\r\n";
-	print "<form name=\"track_all\" id=\"track_all\" method=\"post\" action=\"index.php\">";
-        print "  <input name=\"action\" type=\"hidden\" id=\"action\" value=\"playdir\"/>";
-         print "  <input name=\"mediapath\" type=\"hidden\" id=\"mediapath\" value=\"{$mediapath}\" />";
-        print "  <input name=\"subdir\" type=\"hidden\" id=\"subdir\" value=\"{$subdir}\" />";
-        print "  <input name=\"play\" type=\"hidden\" id=\"play\" value= />";
-        print "</form>";
-}
-
-$dir_handle = @opendir($mediapath .$subdir);
-if (!$dir_handle)
-{
-	print "Unable to open $mediapath .$subdir";
-}
-else while ($medianame = readdir($dir_handle))
-{
-	if($medianame == "." || $medianame == ".." || $medianame == 'lost+found')
-		continue;
-
-	$medianame_array[] = $medianame;
-}
-
-if ($medianame_array[0])
-{
-	// Alphabetical sorting
-	sort($medianame_array);
-
-	$audiocnt=0;
-	
-	foreach($medianame_array as $value)
-	{	
-		$medianame2=addslashes($value);
-
-		// Directories
-		if (is_dir($mediapath .$subdir .$value))
-		{
-			print "<li class=\"menu\">\r\n";
-			print "  <a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\">\r\n";
-			print "    <span class=\"name\">$value</span><span class=\"arrow\"></span>\r\n";
-			print "  </a>\r\n";
-			print "</li>\r\n";
-			print "<form name=\"$value\" id=\"$value\" method=\"post\" action=\"index.php\">";
-			print "  <input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/>";
-			print "  <input name=\"mediapath\" type=\"hidden\" id=\"mediapath\" value=\"{$mediapath}\" />";
-			print "  <input name=\"subdir\" type=\"hidden\" id=\"subdir\" value=\"{$subdir}{$value}\" />\r\n";
-			print "</form>\r\n";
-		}
-		else
-		{
-			// Get file extension
-			$fileext = end(explode(".", $value));
-
-			// Check if it is supported
-			if ( preg_match("/" .$fileext ." /", $videotypes) || preg_match("/" .$fileext ." $/", $videotypes) )
-			{
-				print "<li class=\"menu\">\r\n";
-				print "  <a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\">\r\n";
-				print "    <img src=\"images/pictos/video.png\" />\r\n";
-				print "    <span class=\"name\">$value</span><span class=\"arrow\"></span>\r\n";
-				print "  </a>\r\n";
-				print "</li>\r\n";
-				print "<form name=\"$value\" id=\"$value\" 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=\"mediapath\" type=\"hidden\" id=\"mediapath\" value=\"{$mediapath}\" />";
-				print "  <input name=\"subdir\" type=\"hidden\" id=\"subdir\" value=\"{$subdir}\" />\r\n";
-        		        print "  <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$mediapath}{$subdir}{$value}\" />";
-				print "</form>\r\n";
-			}
-			else if ( preg_match("/" .$fileext ." /", $audiotypes) || preg_match("/" .$fileext ."$/", $audiotypes) )
-			{
-				$audiocnt++;
-
-				print "<li class=\"menu\">\r\n";
-				print "  <a class=\"noeffect\" href=\"javascript:sendForm('track_{$audiocnt}');\">\r\n";
-				print "    <img src=\"images/pictos/audio.png\" />\r\n";
-				print "    <span class=\"name\">$value</span><span class=\"arrow\"></span>\r\n";
-				print "  </a>\r\n";
-				print "</li>\r\n";
-				print "<form name=\"track_{$audiocnt}\" id=\"track_{$audiocnt}\" method=\"post\" action=\"index.php\">";
-				print "  <input name=\"action\" type=\"hidden\" id=\"action\" value=\"playdir\"/>";
-				print "  <input name=\"mediapath\" type=\"hidden\" id=\"mediapath\" value=\"{$mediapath}\" />";
-				print "  <input name=\"subdir\" type=\"hidden\" id=\"subdir\" value=\"{$subdir}\" />";
-				print "  <input name=\"play\" type=\"hidden\" id=\"play\" value={$audiocnt} />";
-				print "</form>";
-			}
-		}
-	}
-}
-
-$upsubdir = dirname($subdir);
-
-print "<form name=\"getback\" id=\"getback\" method=\"post\" action=\"index.php\">\r\n";
-print "  <input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/>\r\n";
-print "  <input name=\"mediapath\" type=\"hidden\" id=\"mediapath\" value=\"{$mediapath}\" />\r\n";
-print "  <input name=\"subdir\" type=\"hidden\" id=\"subdir\" value=\"{$upsubdir}\" />\r\n";
-print "</form>\r\n";
-
-if ($dir_handle)
-	closedir($dir_handle);
-
-print "</ul></div>\r\n";
+	include ('includes/inc_video.php');
 ?>