hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases 1 Activity

more tweaks

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3568 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2017-01-16 22:23:00 +00:00
parent fa013cec91
commit 034e9c1598
7 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTROL/control
View File

@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.3.5-8 Version: 1.3.5-9
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hpkg.tv Maintainer: af123@hpkg.tv
Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.5),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.10),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.21-2),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95),sqlite3(>=3.15.1) Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.5),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.10),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.21-2),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95),sqlite3(>=3.15.1)

4
webif/cgi-bin/chanlist.jim
View File

@ -1,7 +1,7 @@
#!/mod/bin/jimsh #!/mod/bin/jimsh
source /mod/webif/lib/setup source /mod/webif/lib/setup
require epg.class require epg.class json
httpheader "application/json" httpheader "application/json"
@ -15,7 +15,7 @@ lmap i [$channeldb query "
"] { "] {
if {$::flag} { puts "," } else { incr ::flag } if {$::flag} { puts "," } else { incr ::flag }
lassign $i x lcn x name lassign $i x lcn x name
puts -nonewline " \"$lcn\": \"[system strip $name]\"" puts -nonewline " \"$lcn\": \"[jescape [system strip $name]]\""
} }
puts "\n}" puts "\n}"

19
webif/cgi-bin/favlist.jim Executable file
View File

@ -0,0 +1,19 @@
#!/mod/bin/jimsh
source /mod/webif/lib/setup
require epg.class json
httpheader "application/json"
puts "{"
set flag 0
set i 0
foreach grp [[settings] channel_groups] {
incr i
if {$::flag} { puts "," } else { incr ::flag }
puts -nonewline " \"$i\": \"[jescape $grp]\""
}
puts "\n}"

7
webif/html/browse/script.js
View File

@ -345,7 +345,7 @@ function prepareomenu(el, menu)
function fixdmenu(el, menu, flag, tag, descr, recurse) function fixdmenu(el, menu, flag, tag, descr, recurse)
{ {
var a = el.attr(flag); var a = el.attr(flag);
var b = el.attr(flag + 'r'); var b = el.attr(flag + 'R');
if (a == undefined) a = 0; if (a == undefined) a = 0;
if (b == undefined) b = 0; if (b == undefined) b = 0;
@ -359,13 +359,13 @@ function fixdmenu(el, menu, flag, tag, descr, recurse)
{ {
if (b > 0) if (b > 0)
{ {
$(menu).changeContextMenuItem(tag + 'r', $(menu).changeContextMenuItem(tag + 'R',
'Disable Recursive ' + descr); 'Disable Recursive ' + descr);
$(menu).disableContextMenuItems(tag); $(menu).disableContextMenuItems(tag);
} }
else else
{ {
$(menu).changeContextMenuItem(tag + 'r', $(menu).changeContextMenuItem(tag + 'R',
'Enable Recursive ' + descr); 'Enable Recursive ' + descr);
$(menu).enableContextMenuItems(tag); $(menu).enableContextMenuItems(tag);
} }
@ -403,7 +403,6 @@ function flagdir(file, flag, iconset, output, options)
.empty() .empty()
.html('<img src=/img/spin.gif> Updating...') .html('<img src=/img/spin.gif> Updating...')
.load('/browse/iconset.jim', { file: file }); .load('/browse/iconset.jim', { file: file });
flag = flag.toLowerCase();
if ($(options).attr(flag) == '1') if ($(options).attr(flag) == '1')
$(options).attr(flag, 0); $(options).attr(flag, 0);
else else

2
webif/lib/auto/deq
View File

@ -176,7 +176,7 @@ for {set qq [::auto::pending]} {[llength $qq]} {set qq [::auto::pending]} {
::auto::dsc ::auto::dsc
::auto::oktorun ::auto::oktorun
$q update RUNNING "Started" $q update RUNNING "Started at [::auto::date]"
set ologprefix $::auto::logprefix set ologprefix $::auto::logprefix
set ::auto::logprefix "$plugin:$::auto::logprefix" set ::auto::logprefix "$plugin:$::auto::logprefix"

4
webif/lib/browse.class
View File

@ -40,7 +40,7 @@ proc {dir iconset} {dir} {
set autoshrinkr 1 set autoshrinkr 1
lappend icons [_addicon "/img/compressr.png" \ lappend icons [_addicon "/img/compressr.png" \
"Recursive Auto-shrink"] "Recursive Auto-shrink"]
lappend attrs "autoshrinkr=1" lappend attrs "autoshrinkR=1"
} }
set autoshrink 0 set autoshrink 0
@ -62,7 +62,7 @@ proc {dir iconset} {dir} {
set autodecryptr 1 set autodecryptr 1
lappend icons [_addicon "/img/decryptr.png" \ lappend icons [_addicon "/img/decryptr.png" \
"Recursive Auto-decrypt"] "Recursive Auto-decrypt"]
lappend attrs "autodecryptr=1" lappend attrs "autodecryptR=1"
} }
set autodecrypt 0 set autodecrypt 0

6
webif/lib/settings.class
View File

@ -288,11 +288,7 @@ settings method channel_groups {} {
$db close $db close
foreach g $res { foreach g $res {
set g $g(itemText) set g $g(itemText)
if {[string index $g 0] == "\025"} { lappend ret [system strip $g]
lappend ret [string range $g 1 end]
} else {
lappend ret $g
}
} }
return $ret return $ret
} }