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

Use szsttime if populated

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2820 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-03-28 16:58:56 +00:00
parent 76308b9489
commit b044418869
4 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTROL/control
View File

@ -1,10 +1,10 @@
Package: webif
Priority: optional
Section: web
Version: 1.2.8-12
Version: 1.2.8-13
Architecture: mipsel
Maintainer: af123@hummypkg.org.uk
Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-2),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),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)
Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-3),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),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)
Suggests:
Description: An evolving web interface for the Humax.
Tags: http://hummy.tv/forum/threads/6484/

2
webif/html/sched/index.jim
View File

@ -67,7 +67,7 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
set name [$event name]
set s [$event get nsttime]
set s [$event start]
set d [$event get nduration]
set e $($s + $d)
set n [clock seconds]

2
webif/html/sched/info.jim
View File

@ -40,7 +40,7 @@ puts "</td>
<th>Start</th>
"
set s [$event get nsttime]
set s [$event start]
set d [$event get nduration]
set e $($s + $d)
set n [clock seconds]

19
webif/lib/rsv.class
View File

@ -137,6 +137,25 @@ rsv method channel_name {} {
return [string range $szSvcName 1 end]
}
rsv method szsttime_stamp {} {
set spaced [regsub {^(....)(..)(..)(..)(..)(..).*} \
$szsttime {\1 \2 \3 \4 \5 \6}]
if {[catch {
set stamp [clock scan $spaced -format "%Y %m %d %H %M %S"]
}]} {
return 0
}
return $stamp
}
rsv method start {} {
if {[string range $szsttime 0 3] eq "0000"} { return $nsttime }
set tm [$self szsttime_stamp]
if {$tm > 0} { return $tm }
return $nsttime
}
rsv method icon {} {
set rsvicon ""
switch $ersvtype {