some refactoring

diff --git a/webinterface/src/web-data/config.js b/webinterface/src/web-data/config.js
deleted file mode 100644 (file)
index 2e87c68..0000000
--- a/webinterface/src/web-data/config.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Header$
-
-var DBG = true;
-DBG = false;
-
-var url_tpl = '/web-data/tpl/default/';
-
-var url_getcurrent = '/web/getcurrent';
-
-var url_getvolume = '/web/vol?set=state'; 
-var url_setvolume = '/web/vol?set=set'; // plus new value eg: set=set15
-var url_volumeup = '/web/vol?set=up';
-var url_volumedown = '/web/vol?set=down';
-var url_volumemute = '/web/vol?set=mute';
-
-var url_epgservice = "/web/epgservice?sRef="; // plus serviceRef
-var url_epgsearch = "/web/epgsearch?search="; // plus serviceRef
-var url_epgservicenow = "/web/epgservicenow?sRef="; // plus serviceRef
-var url_epgservicenext = "/web/epgservicenext?sRef="; // plus serviceRef
-var url_epgnow = "/web/epgnow?bRef="; // plus bouquetRev
-var url_epgnext = "/web/epgnext?bRef="; // plus bouquetRev
-
-var url_getServices = "/web/getservices?sRef="; // plus serviceref
-var url_subservices = "/web/subservices"; // subservices for current service
-var url_streamsubservices = "/web/streamsubservices?sRef="; // subservices for streaming service
-
-var url_updates= "/web/updates.html";
-
-var url_movielist= "/web/movielist"; // plus dirname,tag
-
-var url_about= "/web/about";
-
-var url_settings= "/web/settings";
-
-var url_parentcontrol= "/web/parentcontrollist";
-
-var url_moviedelete= "/web/moviedelete"; // plus serviceref
-
-var url_mediaplayerlist= "/web/mediaplayerlist?types=audio&path="; // plus full qualified path
-var url_mediaplayerplay= "/web/mediaplayerplay?file="; // plus file-serviceref
-var url_mediaplayerremove= "/web/mediaplayerremove?file="; // plus file-serviceref
-var url_mediaplayercmd= "/web/mediaplayercmd?command="; // plus command
-var url_mediaplayerwrite= "/web/mediaplayerwrite?filename="; // plus filename
-
-var url_filelist = "/web/mediaplayerlist?path="; // plus full qualified path
-
-var url_timerlist= "/web/timerlist";
-var url_recordnow= "/web/recordnow";
-var url_timeradd= "/web/timeradd"; // plus serviceref,begin,end,name,description,dirname,tags,eit,disabled,justplay,afterevent
-var url_timerchange= "/web/timerchange"; // plus serviceref,begin,end,name,description,dirname,tags,eit,disabled,justplay,afterevent
-var url_timeraddbyeventid= "/web/timeraddbyeventid"; // plus serviceref,eventid
-var url_timerdelete= "/web/timerdelete"; // plus serviceref,begin,end
-var url_timerlistwrite="/web/timerlistwrite?write=saveWriteNow";
-var url_timercleanup="/web/timercleanup?cleanup=true";
-
-var url_getcurrlocation="/web/getcurrlocation";
-var url_getlocations="/web/getlocations";
-var url_gettags="/web/gettags";
-
-var url_message = "/web/message"; // plus text,type,timeout
-var url_messageanswer = "/web/messageanswer?getanswer=now"; 
-
-var url_powerstate = "/web/powerstate"; // plus new powerstate
-var url_remotecontrol = "/web/remotecontrol"; // plus command
-var url_signal = "/web/signal";
-var url_deviceinfo = "/web/deviceinfo";
-
-var bouquetsTv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195) || (type == 25) FROM BOUQUET "bouquets.tv" ORDER BY bouquet';
-var bouquetsRadio = '1:7:2:0:0:0:0:0:0:0:(type == 2)FROM BOUQUET "bouquets.radio" ORDER BY bouquet';
-var providerTv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195) || (type == 25) FROM PROVIDERS ORDER BY name';
-var providerRadio ='1:7:2:0:0:0:0:0:0:0:(type == 2) FROM PROVIDERS ORDER BY name';
-var satellitesTv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195) || (type == 25) FROM SATELLITES ORDER BY name';
-var satellitesRadio ='1:7:2:0:0:0:0:0:0:0:(type == 2) FROM SATELLITES ORDER BY name';
-var allTv = '1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 195) || (type == 25) ORDER BY name';
-var allRadio = '1:7:2:0:0:0:0:0:0:0:(type == 2) ORDER BY name';

diff --git a/webinterface/src/web-data/statics.js b/webinterface/src/web-data/statics.js
index 1bbe171..56ab3f5 100644 (file)
--- a/webinterface/src/web-data/statics.js
+++ b/webinterface/src/web-data/statics.js
@@ -18,7 +18,7 @@ function url() {
        this.epgnow = "/web/epgnow?bRef="; // plus bouquetRev
        this.epgnext = "/web/epgnext?bRef="; // plus bouquetRev
        
-       this.getServices = "/web/getservices?sRef="; // plus serviceref
+       this.getservices = "/web/getservices?sRef="; // plus serviceref
        this.subservices = "/web/subservices"; // subservices for current service
        this.streamsubservices = "/web/streamsubservices?sRef="; // subservices for streaming service
        

diff --git a/webinterface/src/web-data/streaminterface.html b/webinterface/src/web-data/streaminterface.html
index 81dbaf2..0ea2d3a 100644 (file)
--- a/webinterface/src/web-data/streaminterface.html
+++ b/webinterface/src/web-data/streaminterface.html
@@ -17,7 +17,7 @@
                
        <!-- our stuff //-->
        <script type="text/javascript" src="/web-data/objects.js" ></script>
-       <script type="text/javascript" src="/web-data/config.js" ></script>
+       <script type="text/javascript" src="/web-data/statics.js" ></script>
        <script type="text/javascript" src="/web-data/tools.js" ></script>
        <script type="text/javascript" src="/web-data/timer.js" ></script>
        <script type="text/javascript" src="/web-data/vlcplayer.js" ></script>

diff --git a/webinterface/src/web-data/timer.js b/webinterface/src/web-data/timer.js
index f992123..d2c9727 100644 (file)
--- a/webinterface/src/web-data/timer.js
+++ b/webinterface/src/web-data/timer.js
@@ -93,7 +93,7 @@ function addTimerFormChangeChannel(newchannel) {
                // bouquet selected, update menu
                servicereftoloadepgnow = service.servicereference;
                if (typeof (loadedChannellist[servicereftoloadepgnow]) == "undefined") {
-                       doRequest(URL.getServices + servicereftoloadepgnow,
+                       doRequest(URL.getservices + servicereftoloadepgnow,
                                        incomingAddTimerFormChangeChannel, true);
                } else {
                        incomingAddTimerFormChangeChannel();
@@ -413,7 +413,7 @@ function loadTimerFormChannels() {
                        addTimerEditFormArray.RadioListFilled === 0) {
                addTimerListFormatTV();
        } else {
-               doRequest(URL.getServices + encodeURIComponent(bouquetsTv),
+               doRequest(URL.getservices + encodeURIComponent(bouquetsTv),
                                addTimerListFormatTV, false);
        }
 }
@@ -436,7 +436,7 @@ function addTimerListFormatTV(request) {
        if (addTimerEditFormArray.RadioListFilled == 1) {
                loadTimerForm();
        } else {
-               doRequest(URL.getServices + encodeURIComponent(bouquetsRadio),
+               doRequest(URL.getservices + encodeURIComponent(bouquetsRadio),
                                addTimerListFormatRadio, false);
        }
 }

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index 19a7981..adc2926 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -797,7 +797,7 @@ function loadBouquet(servicereference, name){
 
        startUpdateBouquetItemsPoller();
 
-       doRequest(URL.getServices+servicereference, incomingChannellist, true);
+       doRequest(URL.getservices+servicereference, incomingChannellist, true);
 }
 
 
@@ -825,7 +825,7 @@ function incomingBouquetList(request){
 
 
 function initChannelList(){
-       var url = URL.getServices+encodeURIComponent(bouquetsTv);
+       var url = URL.getservices+encodeURIComponent(bouquetsTv);
        currentBouquet = bouquetsTv;
 
        doRequest(url, incomingBouquetListInitial, true);
@@ -1379,7 +1379,7 @@ function getCurrent(){
  * load
  */
 function getBouquets(sRef){    
-       var url = URL.getServices+encodeURIComponent(sRef);
+       var url = URL.getservices+encodeURIComponent(sRef);
        doRequest(url, incomingBouquetList, true);
 }
 

diff --git a/webinterface/src/web-data/tpl/default/index.html b/webinterface/src/web-data/tpl/default/index.html
index 57d39f4..ff3fb68 100644 (file)
--- a/webinterface/src/web-data/tpl/default/index.html
+++ b/webinterface/src/web-data/tpl/default/index.html
@@ -23,7 +23,7 @@
                
        <!-- our stuff //-->
        <script type="text/javascript" src="/web-data/objects.js" ></script>
-       <script type="text/javascript" src="/web-data/config.js" ></script>
+       <script type="text/javascript" src="/web-data/statics.js" ></script>
        <script type="text/javascript" src="/web-data/tools.js" ></script>
        <script type="text/javascript" src="/web-data/timer.js" ></script>
 

diff --git a/webinterface/src/web-data/vlcplayer.js b/webinterface/src/web-data/vlcplayer.js
index 5552508..fcf4170 100644 (file)
--- a/webinterface/src/web-data/vlcplayer.js
+++ b/webinterface/src/web-data/vlcplayer.js
@@ -241,7 +241,7 @@ function setStreamTarget(servicereference) {
 }
 
 function loadVLCBouquets() {
-       url = URL.getServices + bouquetsTv;
+       url = URL.getservices + bouquetsTv;
        doRequest(url, incomingVLCBouquetList);
        
 }