From f8c6ca1308eaa1fc1439e5139c48aca85d681be1 Mon Sep 17 00:00:00 2001 From: Julian Dittrich Date: Tue, 1 Jan 2008 15:12:37 +0000 Subject: [PATCH] inserted parentControl-functions into streaming, timer-edits and others --- webinterface/src/web-data/config.js | 2 +- webinterface/src/web-data/index.html | 4 ++- webinterface/src/web-data/objects.js | 2 +- webinterface/src/web-data/templates.js | 14 ++++---- webinterface/src/web-data/timer.js | 3 +- webinterface/src/web-data/tools.js | 46 +++++++++++--------------- 6 files changed, 32 insertions(+), 39 deletions(-) diff --git a/webinterface/src/web-data/config.js b/webinterface/src/web-data/config.js index e42d671c..b11b1bb9 100644 --- a/webinterface/src/web-data/config.js +++ b/webinterface/src/web-data/config.js @@ -1,4 +1,4 @@ -Version = '$Header$'; +// $Header$ var DBG = true; DBG = false; diff --git a/webinterface/src/web-data/index.html b/webinterface/src/web-data/index.html index 454eee6e..5fdc6f07 100644 --- a/webinterface/src/web-data/index.html +++ b/webinterface/src/web-data/index.html @@ -2,7 +2,7 @@ Enigma 2 Webinterface @@ -160,6 +160,8 @@ new Rico.Accordion( $('accordionMenue'), accordionOptions ); // do things to do at startup initVolumePanel(); initChannelList(); +getDreamboxSettings(); + //setBodyMainContent('BodyContentChannellist'); UpdateStreamReaderStart(); showhide('Event_Next_Extended_Description'); diff --git a/webinterface/src/web-data/objects.js b/webinterface/src/web-data/objects.js index e43755b5..1e02b912 100644 --- a/webinterface/src/web-data/objects.js +++ b/webinterface/src/web-data/objects.js @@ -1,4 +1,4 @@ - +// $Header$ // store all objects here //START class EPGList diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js index 0c006828..fdb51be8 100644 --- a/webinterface/src/web-data/templates.js +++ b/webinterface/src/web-data/templates.js @@ -21,8 +21,8 @@ var tplEPGListItem = ''; tplEPGListItem += ''; tplEPGListItem +=''; - tplEPGListItem +='  '; - tplEPGListItem +='  '; + tplEPGListItem +='  '; + tplEPGListItem +='  '; tplEPGListItem +='
'; tplEPGListItem +='
'; tplEPGListItem +='
'; @@ -52,9 +52,9 @@ var tplServiceListHeader = '
\n'; tplServiceListHeader += '\n'; var tplServiceListItem = '\n'; - tplServiceListItem += '
%(servicename)
'; - tplServiceListItem += '
\n'; - tplServiceListItem += '
\n'; + tplServiceListItem += '
%(servicename)
'; + tplServiceListItem += '
\n'; + tplServiceListItem += '
\n'; tplServiceListItem += '\n'; tplServiceListItem += ''; tplServiceListItem += '\n'; @@ -68,7 +68,7 @@ var tplServiceListEPGItem = '
%(starttime)
\n'; tplServiceListEPGItem += '
%(title)
\n'; tplServiceListEPGItem += '
%(length) min.
\n'; -var tplSubServiceListItem = '
%(servicename)
\n'; +var tplSubServiceListItem = '
%(servicename)
\n'; tplSubServiceListItem += '
\n'; tplSubServiceListItem += '
\n'; @@ -338,7 +338,7 @@ var tplAddTimerForm = ''; tplAddTimerForm += ''; tplAddTimerForm += ''; tplAddTimerForm += ''; - tplAddTimerForm += '
'; + tplAddTimerForm += ''; var tplAddTimerFormOptions = ''; diff --git a/webinterface/src/web-data/timer.js b/webinterface/src/web-data/timer.js index d93646ec..4c8c71c4 100644 --- a/webinterface/src/web-data/timer.js +++ b/webinterface/src/web-data/timer.js @@ -1,5 +1,4 @@ -// Versioning -Version = '$Header$'; +// $Header$ // TimerEdit variables: var addTimerEditFormObject = new Object(); diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js index 4d3f992e..fc3e0f80 100644 --- a/webinterface/src/web-data/tools.js +++ b/webinterface/src/web-data/tools.js @@ -1,4 +1,4 @@ -Version = '$Header$'; +// $Header$ var doRequestMemory = new Object(); var doRequestMemorySave = new Object(); @@ -170,8 +170,6 @@ function showhide(id){ o.display = (o.display!="none")? "none":""; } function set(element, value){ - //debug(element+"-"+value); -// MP3 File: /media/hdd/13-Placebo_Song_To_Say_Goodbye-Meds.mp3 if(element == "CurrentService") { if(value.search(/^MP3 File:/) != -1) { value = value.replace(/.*\//, ''); @@ -272,18 +270,19 @@ function getXML(request){ return xmlDoc; } function parentPin(servicereference) { + debug ("parentPin: parentControlList"); servicereference = decodeURIComponent(servicereference); - if(parentControlList == null || String(getSettingByName("config.ParentalControl.configured")) != "True") { + if(parentControlList == null || String(getSettingByName("config.ParentalControl.configured")) != "true") { return true; } - debug("parentPin " + parentControlList.length); + //debug("parentPin " + parentControlList.length); if(getParentControlByRef(servicereference) == servicereference) { if(String(getSettingByName("config.ParentalControl.type.value")) == "whitelist") { - debug("leaving here 1"); + debug("parentPin leaving here 1"); return true; } } else { - debug("leaving here 2"); + debug("parentPin leaving here 2"); return true; } debug("going to ask for PIN"); @@ -301,21 +300,16 @@ function parentPin(servicereference) { } function zap(servicereference){ - if(parentPin(servicereference)) { - new Ajax.Request( "/web/zap?sRef=" + servicereference, - { - asynchronous: true, - method: 'get' - } - ); - setTimeout("getSubServices()", 5000); - } - + new Ajax.Request( "/web/zap?sRef=" + servicereference, + { + asynchronous: true, + method: 'get' + } + ); + setTimeout("getSubServices()", 5000); } - //++++ SignalPanel ++++ - function openSignalDialog(){ openWindow("Signal Info",tplSignalPanel, 215, 100,620,40); } @@ -501,8 +495,6 @@ function initChannelList(){ var url = url_getServices+encodeURIComponent(bouqet_provider_radio); doRequest(url, incomingProviderRadioBouquetList, true); - - getSettings(); } var servicereftoloadepgnow = ""; @@ -737,15 +729,15 @@ function incomingRemoteControlResult(request){ } } -function getSettings(){ - doRequest(url_settings, incomingGetSettings, false); +function getDreamboxSettings(){ + doRequest(url_settings, incomingGetDreamboxSettings, false); } - -function incomingGetSettings(request){ +function incomingGetDreamboxSettings(request){ if(request.readyState == 4){ settings = new Settings(getXML(request)).getArray(); } - if(String(getSettingByName("config.ParentalControl.configured")) == "True") { + debug ("starte getParentControl " + getSettingByName("config.ParentalControl.configured")); + if(String(getSettingByName("config.ParentalControl.configured")) == "true") { getParentControl(); } } @@ -754,7 +746,7 @@ function getSettingByName(txt) { for(i = 0; i < settings.length; i++) { debug("("+settings[i].getSettingName()+") (" +settings[i].getSettingValue()+")"); if(String(settings[i].getSettingName()) == String(txt)) { - return settings[i].getSettingValue(); + return settings[i].getSettingValue().toLowerCase(); } } return ""; -- 2.20.1