From 2b1358884535497eebd6d2ad9a768b56e1953af6 Mon Sep 17 00:00:00 2001 From: Alib Date: Sun, 28 Mar 2010 14:59:33 +0200 Subject: fix slashes in dir --- js/functions.js | 15 ++++++++++++++- js/istreamdev.js | 6 +++++- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'js') 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('
  • SESSIONS
  • \n
  • Checking running session
  • '); //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, -- cgit v1.2.3