From 5f5250a9b693ea62075e9677b0efe53b6c4bc013 Mon Sep 17 00:00:00 2001
From: Alib <aliboba@free.fr>
Date: Sun, 28 Feb 2010 11:20:06 +0100
Subject: fixed back when coming from Home active session

---
 includes/inc_stream.php | 12 ++++++++++--
 includes/include.php    | 14 --------------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'includes')

diff --git a/includes/inc_stream.php b/includes/inc_stream.php
index d160263..d35a37e 100755
--- a/includes/inc_stream.php
+++ b/includes/inc_stream.php
@@ -16,6 +16,7 @@ switch ($type)
 		break;
 	// Recording
 	case 2:
+		$realname = $name;
 		list($title, $desc, $realname) = vdrgetinfostream($name, 0);
 		break;
 	// Media
@@ -97,7 +98,7 @@ foreach ($quality as $qname => $qparams)
 			print "    <input name=\"subdir\" type=\"hidden\" id=\"subdir\" value=\"{$subdir}\" />\r\n";
 			// NO BREAK
 		case 2:
-			print "    <input name=\"url\" type=\"hidden\" id=\"url\" value=\"{$name}\" />\r\n";
+			print "    <input name=\"url\" type=\"hidden\" id=\"url\" value=\"" . stripslashes($name) ."\" />\r\n";
 			break;
 	}
 	print "  </form>";
@@ -107,13 +108,20 @@ print "  <form name=\"getback\" id=\"getback\" method=\"post\" action=\"index.ph
 switch ($type)
 {
 	case 1:
+		if ($category==null)
+		{
+		print "    <input name=\"action\" type=\"hidden\" id=\"action\" value=\"listcategory\" />";
+		}
+		else
+		{
 		print "    <input name=\"action\" type=\"hidden\" id=\"action\" value=\"listchannels\" />";
 		print "    <input name=\"cat\"type=\"hidden\" id=\"cat\" value=\"{$category}\" />";
+		}
 		break;
 	case 2:
 		$dir = dirname($name);
 		print "    <input name=\"action\" type=\"hidden\" id=\"action\" value=\"recordings\" />";
-		print "    <input name=\"dir\"type=\"hidden\" id=\"dir\" value=\"{$dir}\" />";
+		print "    <input name=\"dir\"type=\"hidden\" id=\"dir\" value=\"" . stripslashes($dir) . "\" />";
 		break;
 	case 3:
 		$mediapath = $_REQUEST['mediapath'];
diff --git a/includes/include.php b/includes/include.php
index f33f9e9..05a2ce6 100755
--- a/includes/include.php
+++ b/includes/include.php
@@ -94,20 +94,6 @@ function selectpage()
 			set_timer($active, $channame, $date, $stime, $etime, $desc, $prevtimer);
 			include('includes/inc_timers.php');
 			break;
-		case ("startstream"):
-			$type = $_REQUEST['type'];
-			$name = $_REQUEST['name'];
-			$title = $_REQUEST['title'];
-			$desc = stripslashes ($_REQUEST['desc']);
-			$qname = $_REQUEST['qname'];
-			$qparams = $_REQUEST['qparams'];
-			$category = $_REQUEST['category'];
-			$url = $_REQUEST['url'];
-			$mediapath = $_REQUEST['mediapath'];
-			$subdir = $_REQUEST['subdir'];
-			$session = start_stream($type, $name, $title, $desc, $qname, $qparams, $category, $url, $mediapath, $subdir);
-			include('includes/inc_streaming.php');
-			break;
 		case ("playdir"):
 			include('includes/inc_mp3.php');
 			break;
-- 
cgit v1.2.3