From 2426652089532de407e1332768127f739ad1674b Mon Sep 17 00:00:00 2001
From: root <root@mediaserver.Belkin>
Date: Thu, 18 Feb 2010 08:38:49 +0100
Subject: corrected back from streaming page

---
 includes/inc_rec.php    |  2 +-
 includes/inc_stream.php | 15 +++++++--------
 includes/inc_vdr.php    |  6 +++---
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/includes/inc_rec.php b/includes/inc_rec.php
index 42ab455..96d6088 100755
--- a/includes/inc_rec.php
+++ b/includes/inc_rec.php
@@ -40,7 +40,7 @@ while ($recname = readdir($dir_handle))
 		print "<form name=\"$recname\" id=\"$recname\" method=\"post\" action=\"index.php\">";
 		print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"stream\"/>";
                 print "   <input name=\"type\" type=\"hidden\" id=\"type\" value=2 />";
-                print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$subdir}/{$recname}\" />";
+                print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$dir}/{$recname}\" />";
 		print "</form>\r\n";
 	}
 	else
diff --git a/includes/inc_stream.php b/includes/inc_stream.php
index 84d621f..58bfa1e 100755
--- a/includes/inc_stream.php
+++ b/includes/inc_stream.php
@@ -1,6 +1,6 @@
 <?php
 
-global $vdrstreamdev, $vdrrecpath, $quality;
+global $vdrstreamdev, $quality;
 
 // Check if we are running
 if (infostreamexist())
@@ -44,17 +44,16 @@ if (infostreamexist())
 
 	print " <form name=\"stopstream\" id=\"stopstream\" method=\"post\" action=\"index.php\">";
 	print "    <input name =\"action\" type=\"hidden\" id=\"action\" value=\"stopstream\" />";
+	print "    <input name =\"actionafterstop\" type=\"hidden\" id=\"actionafterstop\" value=\"stream\" />";
+	print "    <input name=\"type\" type=\"hidden\" id=\"type\" value={$type} />";
 	switch ($type)
 	{
 		case 1:
-			print "    <input name =\"actionafterstop\" type=\"hidden\" id=\"actionafterstop\" value=\"listchannels\" />";
-			print "    <input name =\"cat\"type=\"hidden\" id=\"cat\" value=\"{$category}\" />";
+			print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$realname}\" />";
 			break;
 		default:
 		case 2:
-			$dir = dirname($url);
-			print "    <input name =\"actionafterstop\" type=\"hidden\" id=\"actionafterstop\" value=\"recordings\" />";
-			print "    <input name =\"dir\"type=\"hidden\" id=\"dir\" value=\"{$dir}\" />";
+			print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$url}\" />";
 			break;
 	}
 	print " </form>\r\n";
@@ -150,7 +149,7 @@ else
 				break;
 			case 2:
 			default:
-				print "         <input name =\"url\" type=\"hidden\" id=\"url\" value=\"{$vdrrecpath}{$name}\" />\r\n";
+				print "         <input name =\"url\" type=\"hidden\" id=\"url\" value=\"{$name}\" />\r\n";
 				break;
 		}
 		print " </form>";
@@ -165,7 +164,7 @@ else
                         break;
                 default:
                 case 2:
-			$dir = dirname($vdrrecpath .$name);
+			$dir = dirname($name);
 			print "    <input name =\"action\" type=\"hidden\" id=\"action\" value=\"recordings\" />";
                         print "    <input name =\"dir\"type=\"hidden\" id=\"dir\" value=\"{$dir}\" />";
                         break;
diff --git a/includes/inc_vdr.php b/includes/inc_vdr.php
index d36c8cc..a90d80f 100755
--- a/includes/inc_vdr.php
+++ b/includes/inc_vdr.php
@@ -3,7 +3,7 @@ include ('includes/inc_svdrp.php');
 
 function vdrgetinfostream($stream = "NULL", $ischan = 1)
 {
-	global $allepg, $allepgfilled, $svdrpip, $svdrpport, $vdrrecpath;
+	global $allepg, $allepgfilled, $svdrpip, $svdrpport;
 
 	if ($ischan)
 	{
@@ -21,12 +21,12 @@ function vdrgetinfostream($stream = "NULL", $ischan = 1)
 	}
 	else
 	{
-		$infofile = $vdrrecpath .$stream ."/info"; 
+		$infofile = $stream ."/info"; 
 		if (file_exists($infofile))
 			$info= file_get_contents($infofile);
 		else
 		{
-			$infofile = $vdrrecpath .$stream ."/info.vdr";
+			$infofile = $stream ."/info.vdr";
 			if (file_exists($infofile))
 				$info= file_get_contents($infofile);
 			else
-- 
cgit v1.2.3