From e88b9742377c3bb0db9768ff9f35652aace136e6 Mon Sep 17 00:00:00 2001 From: mvoelkel Date: Mon, 7 Dec 2015 15:03:44 +0100 Subject: [PATCH] Some cleanup in lua scripts --- octoserve/var/www/btvchannels.lua | 55 ---------------------------- octoserve/var/www/lnbsettings.lua | 6 --- octoserve/var/www/scifsettings.lua | 2 - octoserve/var/www/systeminfo.lua | 4 -- octoserve/var/www/systemsettings.lua | 1 - 5 files changed, 68 deletions(-) diff --git a/octoserve/var/www/btvchannels.lua b/octoserve/var/www/btvchannels.lua index d72cc58..b32db66 100644 --- a/octoserve/var/www/btvchannels.lua +++ b/octoserve/var/www/btvchannels.lua @@ -46,7 +46,6 @@ for _,c in ipairs(db.ChannelList) do local f = SourceList[c.refid] if f then table.insert(f.ChannelList,c) - -- http_print("// " .. c.refid .. " " .. c.title .. " " .. c.request .. " " .. c.tracks ) end end @@ -96,57 +95,3 @@ for _,f in pairs(SourceList) do end end --- var ChannelListSat = new Array(); - --- ChannelListSat[0] = new Object(); --- ChannelListSat[0].name = "Astra 19E: Das Erste HD"; --- ChannelListSat[0].request = "?src=1&freq=11494&pol=h&msys=dvbs&sr=22000&pids=0,5100,5101,5102,5103,5106,5104,5105"; --- ChannelListSat[0].tracks = new Array( 5102, 5103, 5106 ); - --- ChannelListSat[1] = new Object(); --- ChannelListSat[1].name = "Astra 19E: ZDF HD"; --- ChannelListSat[1].request = "?src=1&freq=11362&pol=h&msys=dvbs&sr=22000&pids=0,6100,6110,6120,6121,6122,6123,6131,6130"; --- ChannelListSat[1].tracks = new Array( 6120, 6121, 6123, 6122 ); - --- ChannelListSat[2] = new Object(); --- ChannelListSat[2].name = "Eutelsat 9E: TF1 HD Suisse"; --- ChannelListSat[2].request = "?src=1&freq=12034&pol=v&msys=dvbs&sr=27500&pids=0,800,810,820,821,822,850,814,815"; --- ChannelListSat[2].tracks = new Array( 820, 821, 822 ); - --- ChannelListSat[3] = new Object(); --- ChannelListSat[3].name = "Eutelsat 9E: FTV HD Europe"; --- ChannelListSat[3].request = "?src=1&freq=11881&pol=v&msys=dvbs&sr=27500&pids=0,1001,2001,3001,4001"; --- ChannelListSat[3].tracks = new Array( 3001, 4001 ); - - --- var ChannelListCable = new Array(); - --- ChannelListCable[0] = new Object(); --- ChannelListCable[0].name = "KabelBW: Das Erste HD"; --- ChannelListCable[0].request = "?freq=362&msys=dvbc&sr=6900&mtype=256qam&pids=0,6000,6010,6020,6021,6030,6022,6031"; --- ChannelListCable[0].tracks = new Array( 6020, 6021, 6022 ); - --- ChannelListCable[1] = new Object(); --- ChannelListCable[1].name = "KabelBW: ZDF HD"; --- ChannelListCable[1].request = "?freq=370&msys=dvbc&sr=6900&mtype=256qam&pids=0,6100,6110,6120,6121,6123,6130,6122,6131"; --- ChannelListCable[1].tracks = new Array( 6120, 6121, 6123, 6122 ); - --- ChannelListCable[2] = new Object(); --- ChannelListCable[2].name = "UnityMedia: Das Erste HD"; --- ChannelListCable[2].request = "?freq=418&msys=dvbc&sr=6900&mtype=256qam&pids=0,6000,6010,6020,6021,6030,6022,6031"; --- ChannelListCable[2].tracks = new Array( 6020, 6021, 6022 ); - --- ChannelListCable[3] = new Object(); --- ChannelListCable[3].name = "UnityMedia: ZDF HD"; --- ChannelListCable[3].request = "?freq=394&msys=dvbc&sr=6900&mtype=256qam&pids=0,0,6100,6110,6120,6121,6123,6130,6122,6131"; --- ChannelListCable[3].tracks = new Array( 6120, 6121, 6123, 6122 ); - --- ChannelListCable[4] = new Object(); --- ChannelListCable[4].name = "KDG: Das Erste HD"; --- ChannelListCable[4].request = "?freq=330&msys=dvbc&sr=6900&mtype=256qam&pids=0,5100,5101,5102,5103,5105,5104"; --- ChannelListCable[4].tracks = new Array( 5102, 5103 ); - --- ChannelListCable[5] = new Object(); --- ChannelListCable[5].name = "KDG: ZDF HD"; --- ChannelListCable[5].request = "?freq=450&msys=dvbc&sr=6900&mtype=256qam&pids=0,6100,6110,6120,6121,6130,6123,6131"; --- ChannelListCable[5].tracks = new Array( 6120, 6121, 6123 ); diff --git a/octoserve/var/www/lnbsettings.lua b/octoserve/var/www/lnbsettings.lua index 0525acf..252aba3 100644 --- a/octoserve/var/www/lnbsettings.lua +++ b/octoserve/var/www/lnbsettings.lua @@ -190,12 +190,6 @@ else i = i + 1 end - -- http_print("LNBList[0] = new Object();") - -- http_print("LNBList[0].Tuner = 0;") - -- http_print("LNBList[0].Source = 0;") - -- http_print("LNBList[0].LOF1 = 9750;") - -- http_print("LNBList[0].LOF2 = 10600;") - -- http_print("LNBList[0].LOFS = 11700;") end diff --git a/octoserve/var/www/scifsettings.lua b/octoserve/var/www/scifsettings.lua index 5dd37a3..86efc4c 100644 --- a/octoserve/var/www/scifsettings.lua +++ b/octoserve/var/www/scifsettings.lua @@ -83,8 +83,6 @@ if query ~= "" then http_print("Location: http://"..host.."/wait.html?5") http_print() - -- print(string.format("Set Unicable %s", query )) - local Values = "" Values = Values.."# SCIF Settings\n" diff --git a/octoserve/var/www/systeminfo.lua b/octoserve/var/www/systeminfo.lua index aedcb70..3800653 100644 --- a/octoserve/var/www/systeminfo.lua +++ b/octoserve/var/www/systeminfo.lua @@ -40,7 +40,6 @@ http_print("HTTP/1.1 200") http_print("Pragma: no-cache") http_print("Cache-Control: no-cache") http_print("Content-Type: application/x-javascript") ---http_print("Content-Type: text/plain") http_print() dev0 = tonumber(readattr("devid0"),16) @@ -50,9 +49,6 @@ local tmp = io.popen("uname -r -m","r") local tmp1 = tmp:read() tmp:close() --- local uname = string.match(tmp1,"Linux (%.+)") --- http_print(tmp1) --- http_print(uname) local uname = tmp1 tmp = io.popen("ls /config/*.img","r") diff --git a/octoserve/var/www/systemsettings.lua b/octoserve/var/www/systemsettings.lua index f9b3d7a..cb3e4c4 100644 --- a/octoserve/var/www/systemsettings.lua +++ b/octoserve/var/www/systemsettings.lua @@ -92,7 +92,6 @@ if query ~= "" then name,value = string.match(v,"(%w+)%=(%d+)") if( WriteSetting(name,value == "1") ) then if name == "telnet" then ---~ os.rename("/etc/securetty","/etc/securetty.bak"); -- temp fix to allow root login on telnet os.execute("/etc/init.d/S91telnet restart") end if name == "vlan" then restart = 1 end