df/webif
1
0
Fork 0
forked from hummypkg/webif
Code Issues Pull Requests Releases Wiki Activity

fix recording icon, use pid in multiple status

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3342 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-11-14 19:20:40 +00:00
parent 9e685245b9
commit 7edf787c28
3 changed files with 6 additions and 6 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.2-14 Version: 1.3.2-15
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.76-2),jim-oo,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.3),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.9),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95) Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,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.3),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.9),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95)

7
webif/cgi-bin/status.jim
View File

@ -116,6 +116,9 @@ proc add_output {icon mode name} {
global runmode output global runmode output
if {$runmode eq "cgi"} { if {$runmode eq "cgi"} {
if {[string first "/" $icon] == -1} {
set icon "/images/$icon"
}
lappend output [concat \ lappend output [concat \
"<span class=\"va stitem\">\n" \ "<span class=\"va stitem\">\n" \
" <img class=va src=$icon>\n" \ " <img class=va src=$icon>\n" \
@ -248,10 +251,6 @@ if {[llength $data]} {
} }
} }
if {[string first "/" $icon] == -1} {
set icon "/images/$icon"
}
add_output $icon $mode $name add_output $icon $mode $name
} }
} }

3
webif/lib/system.class
View File

@ -762,7 +762,8 @@ proc {system checkop} {op} {
proc {system startop} {args op file} { proc {system startop} {args op file} {
if {![regexp -nocase -- {^[a-z0-9]+$} $op]} { return 0 } if {![regexp -nocase -- {^[a-z0-9]+$} $op]} { return 0 }
if {"-multiple" in $args} { if {"-multiple" in $args} {
set i 1 set i 0
append op "[pid]."
while {[dict exists $::system::ops "$op$i"]} { incr i } while {[dict exists $::system::ops "$op$i"]} { incr i }
append op $i append op $i
} elseif {[dict exists $::system::ops $op]} { } elseif {[dict exists $::system::ops $op]} {