Merge branch 'jquery' of projects.vdr-developer.org:istreamdev into jquery

4 files changed, 16 insertions, 7 deletions

diff --git a/bin/backend.php b/bin/backend.php
index 96f6abf..3ed2dcb 100755
--- a/bin/backend.php
+++ b/bin/backend.php
@@ -45,9 +45,9 @@ switch ($action)
 			break;
 		
 		case ("getRecInfo"):
-		$tree = file_get_contents("textfiles/getRecInfo.txt");
-       	        print $tree;
-		break;
+			$tree = getRecInfo($_REQUEST['rec']);
+	       	        print $tree;
+			break;
 		
 		case ("getVidInfo"):
 		$tree = file_get_contents("textfiles/getVidInfo.txt");
diff --git a/bin/files.php b/bin/files.php
index dfcda00..f39ee98 100755
--- a/bin/files.php
+++ b/bin/files.php
@@ -191,7 +191,6 @@ function filesgetlisting($dir)
 		switch ($type)
 		{
 			case 'audio':
-				// More info
 			case 'video':
 			case 'rec':
 			case 'folder':
diff --git a/bin/jsonapi.php b/bin/jsonapi.php
index eba9725..372c063 100755
--- a/bin/jsonapi.php
+++ b/bin/jsonapi.php
@@ -58,12 +58,23 @@ function getChanInfo($channum)
 {
 	$ret = array();
 	
-	$info = array();
 	$ret['program'] = vdrgetchaninfo($channum);
 
 	return json_encode($ret);
 }
 
+function getRecInfo($rec)
+{
+	$ret = array();
+
+	$info = array();
+	list($info['channel'], $info['name'], $info['desc']) = vdrgetrecinfo($rec);
+
+	$ret['program'] = $info;
+
+	return json_encode($ret);
+}
+
 function startBroadcast($type, $url, $mode)
 {
 	$ret = array();
diff --git a/bin/vdr.php b/bin/vdr.php
index e10a139..82960dc 100755
--- a/bin/vdr.php
+++ b/bin/vdr.php
@@ -316,8 +316,7 @@ function vdrgetrecinfo($rec)
 	if (!is_utf8($epgdesc))
 		$epgdesc = utf8_encode($epgdesc);
 
-
-	return array($channame, epgtitle, $epgdesc);
+	return array($channame, $epgtitle, $epgdesc);
 }