diff --git a/CONTROL/control b/CONTROL/control index d08cf36..b2cab10 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -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/ diff --git a/webif/html/sched/index.jim b/webif/html/sched/index.jim index 79d7ce8..fd02de1 100755 --- a/webif/html/sched/index.jim +++ b/webif/html/sched/index.jim @@ -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] diff --git a/webif/html/sched/info.jim b/webif/html/sched/info.jim index 929de5c..2926d05 100755 --- a/webif/html/sched/info.jim +++ b/webif/html/sched/info.jim @@ -40,7 +40,7 @@ puts " Start " -set s [$event get nsttime] +set s [$event start] set d [$event get nduration] set e $($s + $d) set n [clock seconds] diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index f6ff023..52460ba 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -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 {