fix slashes in dir

27 files changed, 23 insertions, 329 deletions

diff --git a/bin/backend.php b/bin/backend.php
index ca9917a..6cc15f8 100755
--- a/bin/backend.php
+++ b/bin/backend.php
@@ -51,12 +51,12 @@ switch ($action)
 			break;
 		
 		case ("getRecInfo"):
-			$tree = getRecInfo($_REQUEST['rec']);
+			$tree = getRecInfo(stripslashes($_REQUEST['rec']));
 	       	        print $tree;
 			break;
 		
 		case ("getVidInfo"):
-			$tree = getVidInfo($_REQUEST['file']);
+			$tree = getVidInfo(stripslashes($_REQUEST['file']));
         	        print $tree;
 			break;
 		
@@ -66,7 +66,7 @@ switch ($action)
 			break;
 		
 		case ("startBroadcast"):
-			$tree = startBroadcast($_REQUEST['type'], $_REQUEST['url'], $_REQUEST['mode']);
+			$tree = startBroadcast($_REQUEST['type'], stripslashes($_REQUEST['url']), $_REQUEST['mode']);
 			print $tree;
 			break;
 		
@@ -86,7 +86,7 @@ switch ($action)
 			break;
 		
 		case ("editTimer"):
-			$tree = editTimer($_REQUEST['id'], $_REQUEST['name'], $_REQUEST['active'], $_REQUEST['channumber'], $_REQUEST['date'], $_REQUEST['starttime'], $_REQUEST['endtime']);
+			$tree = editTimer($_REQUEST['id'], stripslashes($_REQUEST['name']), $_REQUEST['active'], $_REQUEST['channumber'], $_REQUEST['date'], $_REQUEST['starttime'], $_REQUEST['endtime']);
 			print $tree;
 			break;
 		
diff --git a/bin/textfiles/addTimer.txt b/bin/textfiles/addTimer.txt
deleted file mode 100644
index 728616e..0000000
--- a/bin/textfiles/addTimer.txt
+++ /dev/null
@@ -1 +0,0 @@
-{ "status": "Ok", "message":"Timer created successfully" }
diff --git a/bin/textfiles/browseFolder-aud.txt b/bin/textfiles/browseFolder-aud.txt
deleted file mode 100644
index e2e71be..0000000
--- a/bin/textfiles/browseFolder-aud.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"list":
-	[
-		{
-		"type": "folder",
-		"name": "album1",
-		"path": "/mnt/music/album1" 
-		},
-		{
-		"type": "folder",
-		"name": "album2",
-		"path": "/mnt/music/album2" 
-		},
-		{
-		"type": "audio",
-		"name": "audiofile.mp3",
-		"number": "1",
-		"length": "3.30",
-		"path": "/mnt/music/audiofile.mp3" 
-		},
-		{
-                "type": "audio",
-                "name": "audiofile2.mp3",
-                "number": "2",
-                "length": "2.27",
-                "path": "/mnt/music/audiofile2.mp3"
-                },
-		{
-                "type": "audio",
-                "name": "audiofile3.mp3",
-                "number": "3",
-                "length": "4.03",
-                "path": "/mnt/music/audiofile3.mp3"
-                }
-	]
-}
diff --git a/bin/textfiles/browseFolder-rec.txt b/bin/textfiles/browseFolder-rec.txt
deleted file mode 100644
index c3d721c..0000000
--- a/bin/textfiles/browseFolder-rec.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"list":
-	[
-		{
-		"type": "folder",
-		"name": "rec1",
-		"path": "/video/rec1" 
-		},
-		{
-		"type": "folder",
-		"name": "rec2",
-		"path": "/video/rec2" 
-		},
-		{
-		"type": "rec",
-		"name": "2010/02/25 at 23h21",
-		"path": "/video/rec1/2010-02-25.23.21.3-0.rec" 
-		}
-
-	]
-}
-
diff --git a/bin/textfiles/browseFolder-vid.txt b/bin/textfiles/browseFolder-vid.txt
deleted file mode 100644
index 62fecf3..0000000
--- a/bin/textfiles/browseFolder-vid.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"list":
-	[
-		{
-		"type": "folder",
-		"name": "movie1",
-		"path": "/mnt/videos/movie1" 
-		},
-		{    
-		"type": "folder",
-		"name": "movie2",
-		"path": "/mnt/videos/movie2" 
-		},
-		{    
-		"type": "video",
-		"name": "videofile.avi",
-		"path": "/mnt/videos/videofile.avi" 
-		}
-	]
-}
diff --git a/bin/textfiles/delTimer.txt b/bin/textfiles/delTimer.txt
deleted file mode 100644
index 9ab3b92..0000000
--- a/bin/textfiles/delTimer.txt
+++ /dev/null
@@ -1 +0,0 @@
-{ "status": "ok", "message":"Timer successfully deleted" }
diff --git a/bin/textfiles/editTimer.txt b/bin/textfiles/editTimer.txt
deleted file mode 100644
index bad3855..0000000
--- a/bin/textfiles/editTimer.txt
+++ /dev/null
@@ -1 +0,0 @@
-{ "status": "Ok", "message":"Timer edited successfully" }
diff --git a/bin/textfiles/getChanInfo.txt b/bin/textfiles/getChanInfo.txt
deleted file mode 100644
index 94f302d..0000000
--- a/bin/textfiles/getChanInfo.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"program": 
-	{
-		"name": "TF1",
-		"number": "1",
-		"now_time": "13h00-13h30",
-		"now_title": "Journal de 13h",
-		"now_desc":	"Les informations de 13h... Blahblah..",
-		"next_time": "13h35-13h45",
-		"next_title": "Météo",
-		"next_desc": "Le bulletin météo de la journée."
-	}
-}
-
diff --git a/bin/textfiles/getFullChanList.txt b/bin/textfiles/getFullChanList.txt
deleted file mode 100644
index 80e0495..0000000
--- a/bin/textfiles/getFullChanList.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-	"category":
-	[
-		{
-			"name": "Nationales&TNT",
-			"channel": 
-			[
-				{
-				"name": "TF1",
-				"number": "1"
-				},{
-				"name": "FRANCE 2",
-				"number": "2"
-				},{
-				"name": "FRANCE 3",
-				"number": "3"
-				}
-			]
-		},
-		{
-			"name":	"Divertissement",
-			"channel":
-			[
-				{
-				"name": "Paris Première",
-				"number": "10"
-				},{
-				"name": "RTL Télévision",
-				"number": "11"
-				}
-			]
-		}
-	]
-}
diff --git a/bin/textfiles/getGlobals.txt b/bin/textfiles/getGlobals.txt
deleted file mode 100644
index d4795e4..0000000
--- a/bin/textfiles/getGlobals.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-{ 
-	"streamdev_server": "http://127.0.0.1:3000",
-	"rec_path": "/video/",
-	"video_path": "/mnt/media/Videos/",
-	"audio_path": "/mnt/media/Music/"
-}
diff --git a/bin/textfiles/getRecInfo.txt b/bin/textfiles/getRecInfo.txt
deleted file mode 100644
index 6488ea7..0000000
--- a/bin/textfiles/getRecInfo.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"program":
-	{
-		"name": "Journal de 13h",
-		"channel": "TF1",
-		"recorded": "2010-02-02 at 19h30",
-		"desc": "Les informations de 13h..." 
-	}
-}
-
diff --git a/bin/textfiles/getRunningSessions.txt b/bin/textfiles/getRunningSessions.txt
deleted file mode 100644
index 39b02c8..0000000
--- a/bin/textfiles/getRunningSessions.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"broadcast":
-	[
-		{
-		"session": "1",
-		"name": "TF1",
-		"type": "tv", 
-		}, 
-		{
-                "session": "2",
-                "name": "Turbo",
-                "type": "rec",
-                },
-		{
-                "session": "3",
-                "name": "Movie.avi",
-                "type": "vid",
-                }	
-	]
-}
diff --git a/bin/textfiles/getStreamInfo-1.txt b/bin/textfiles/getStreamInfo-1.txt
deleted file mode 100644
index fe89488..0000000
--- a/bin/textfiles/getStreamInfo-1.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"stream":
-	{
-		"session": "1",
-		"type": "tv",
-		"name": "TF1",
-		"mode": "3G",
-		"now_time": "13h00-13h30",
-		"now_title": "Journal de 13h",
-		"now_desc":     "Les informations de 13h...",
-		"next_time": "13h35-13h45",
-		"next_title": "Météo",
-		"next_desc": "Le bulletin météo de la journée.",
-		"thumbwidth" : "80",
-		"thumbheight" : "80"
-	}
-}
diff --git a/bin/textfiles/getStreamInfo-2.txt b/bin/textfiles/getStreamInfo-2.txt
deleted file mode 100644
index f097b7f..0000000
--- a/bin/textfiles/getStreamInfo-2.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"stream":
-	{
-		"session": "2",
-		"type": "rec",
-		"name": "Journal de 13h",
-		"channel": "TF1",
-		"recorded": "2010-02-02 at 19h30",
-		"desc": "Les informations de 13h...",
-		"mode": "3G",
-		"thumbwidth": "80",
-		"thumbheight": "80" 
-	}
-}
-
-
diff --git a/bin/textfiles/getStreamInfo-3.txt b/bin/textfiles/getStreamInfo-3.txt
deleted file mode 100644
index a0f2558..0000000
--- a/bin/textfiles/getStreamInfo-3.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"stream":
-	{
-		"session": "3",
-		"type": "vid",
-		"name": "Mavideo.avi",
-		"desc": "",
-		"duration": "1:41:55",
-		"format": "avi",
-		"video": "XviD MPEG-4",
-		"audio": "MPEG Layer 3",
-		"resolution": "608x256", 
-		"mode": "3G",
-		"thumbwidth": "180",
-		"thumbheight": "100" 
-	}
-}
diff --git a/bin/textfiles/getStreamStatus.txt b/bin/textfiles/getStreamStatus.txt
deleted file mode 100644
index d14a003..0000000
--- a/bin/textfiles/getStreamStatus.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"status": "ready","message": "3G Broadcast ready", "url": "ram/session1/stream.m3u8"}
diff --git a/bin/textfiles/getTimers.txt b/bin/textfiles/getTimers.txt
deleted file mode 100644
index 103d110..0000000
--- a/bin/textfiles/getTimers.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"timer":
-	[
-		{
-		"id": "1",
-		"name": "Timername",
-		"active": "1",
-		"channumber": "2",
-		"channame": "FRANCE 2",
-		"date": "2010-03-10",
-		"starttime": "2030",
-		"endtime": "2230",
-		"running": "0" 
-		},
-		{
-		"id": "2",
-		"name": "Timername2",
-		"active": "0",
-		"channumber": "3",
-		"channame": "FRANCE 3",
-		"date": "2010-05-10",
-		"starttime": "1030",
-		"endtime": "1230",
-		"running": "0" 
-		},
-		{
-		"id": "3",
-		"name": "Timername3",
-		"active": "1",
-		"channumber": "4",
-		"channame": "Canal +",
-		"date": "2010-03-13",
-		"starttime": "2030",
-		"endtime": "2230",
-		"running": "1"
-		}
-	]
-}
diff --git a/bin/textfiles/getTvCat.txt b/bin/textfiles/getTvCat.txt
deleted file mode 100644
index 0d95dca..0000000
--- a/bin/textfiles/getTvCat.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"categories": 
-	[
-		{
-		"name": "Nationales&TNT",
-		"channels": "17"
-		},{
-		"name": "Divertissements",
-		"channels": "12"
-		},{
-		"name": "Information",
-		"channels": "6"
-		}
-	]
-}
-
diff --git a/bin/textfiles/getTvChan.txt b/bin/textfiles/getTvChan.txt
deleted file mode 100644
index 03d4840..0000000
--- a/bin/textfiles/getTvChan.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"channel": 
-	[
-		{
-		"name": "TF1",
-		"number": "1",
-		"now_title": "Journal de 13h",
-		},{
-		"name": "FRANCE 2",
-		"number": "2",
-		"now_title": "Tournez manège",
-		},{
-		"name": "FRANCE 3",
-		"number": "3",
-		"now_title": "Journal régional"
-		}
-	]
-}
-
diff --git a/bin/textfiles/getVidInfo.txt b/bin/textfiles/getVidInfo.txt
deleted file mode 100644
index 11a58f7..0000000
--- a/bin/textfiles/getVidInfo.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"program":
-	{
-		"name": "Mavideo.avi",
-		"desc": "",
-		"duration": "1:41:55",
-		"format": "avi",
-		"video": "XviD MPEG-4",
-		"audio": "MPEG Layer 3",
-		"resolution": "608x256" 
-	}
-}
-
diff --git a/bin/textfiles/startBroadcast-rec.txt b/bin/textfiles/startBroadcast-rec.txt
deleted file mode 100644
index e24cc29..0000000
--- a/bin/textfiles/startBroadcast-rec.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "session": "2" }
-
diff --git a/bin/textfiles/startBroadcast-tv.txt b/bin/textfiles/startBroadcast-tv.txt
deleted file mode 100644
index b34344a..0000000
--- a/bin/textfiles/startBroadcast-tv.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "session": "1" }
-
diff --git a/bin/textfiles/startBroadcast-vid.txt b/bin/textfiles/startBroadcast-vid.txt
deleted file mode 100644
index a1fffae..0000000
--- a/bin/textfiles/startBroadcast-vid.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-{ "session": "3" }
-
diff --git a/bin/textfiles/stopBroadcast.txt b/bin/textfiles/stopBroadcast.txt
deleted file mode 100644
index 0b99d06..0000000
--- a/bin/textfiles/stopBroadcast.txt
+++ /dev/null
@@ -1 +0,0 @@
-{ "status": "ok", "message": "Successfully stopped broadcast" }
diff --git a/bin/textfiles/streamAudio.txt b/bin/textfiles/streamAudio.txt
deleted file mode 100644
index ebf7d17..0000000
--- a/bin/textfiles/streamAudio.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	track:
-	[
-		{
-		"file": "http://alib.hd.free.fr/istreamdev2/playlist/track1.mp3" 
-		},
-		{    
-		"file": "http://alib.hd.free.fr/istreamdev2/playlist/track2.mp3" 
-		},
-		{    
-		"file": "http://alib.hd.free.fr/istreamdev2/playlist/track3.mp3" 
-		}
-	]
-}
diff --git a/js/functions.js b/js/functions.js
index eefbca9..98609cd 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -121,4 +121,17 @@ function str_pad (input, pad_length, pad_string, pad_type) {
     return input;

 }

 

-

+function addslashes(str) {

+str=str.replace(/\\/g,'\\\\');

+str=str.replace(/\'/g,'\\\'');

+str=str.replace(/\"/g,'\\"');

+str=str.replace(/\0/g,'\\0');

+return str;

+}

+function stripslashes(str) {

+str=str.replace(/\\'/g,'\'');

+str=str.replace(/\\"/g,'"');

+str=str.replace(/\\0/g,'\0');

+str=str.replace(/\\\\/g,'\\');

+return str;

+}

diff --git a/js/istreamdev.js b/js/istreamdev.js
index f788ca5..7628f5e 100644
--- a/js/istreamdev.js
+++ b/js/istreamdev.js
@@ -49,6 +49,7 @@ jQT = new $.jQTouch({
 // [GENERIC STUFF]

 // Global variable

 dataString = "action=getGlobals";

+showStatus( 0,"Getting configuration data" );

 $.getJSON("bin/backend.php",

 			dataString,

 			function(data){	

@@ -161,7 +162,7 @@ getRunningSessions();
 $(document).ready(function(e){ 

 $('#home').bind('pageAnimationStart', function(event, info){ 

 	if (info.direction == 'in') {

-		getRunningSessions()

+	getRunningSessions()

 		}  

 	})

 });

@@ -184,6 +185,7 @@ $('#streaming').bind('pageAnimationStart', function(event, info){
 });

 //preload logos

 function preloadLogos() {

+	showStatus( 0,"Preloading logo pictures" );

 	$.getJSON("bin/genlogolist.php",

 	dataString,

 	function(data){

@@ -270,6 +272,7 @@ $('#runningsessions li a').tap(function(event) {
 

 // Get Active broadcast & encoding sessions

 function getRunningSessions() {

+showStatus( 0,"Getting active sessions" );

 var dataString = "action=getRunningSessions";

 	$('#home #runningsessions').html('<li><span class="menutitle">SESSIONS</span></li>\n<li>Checking running session</li>');

 	//Json call to get category array

@@ -894,6 +897,7 @@ function gen_edittimer(id,name,active,channumber,channame,date,starttime,endtime
 }

 //get full chanlist for timer page ( doing it one time on document load ).

 function gen_formchanlist() {

+	showStatus( 0,"Getting VDR channels list" );

 	var dataString = 'action=getFullChanList';

 	$.getJSON("bin/backend.php",

 	dataString,