diff --git a/CONTROL/control b/CONTROL/control index 905dea2c..bc149fd9 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.10.0-1 +Version: 0.10.0-2 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.0.3),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools diff --git a/var/mongoose/cgi-bin/xepg.jim b/var/mongoose/cgi-bin/xepg.jim index 206564f5..4e09edda 100755 --- a/var/mongoose/cgi-bin/xepg.jim +++ b/var/mongoose/cgi-bin/xepg.jim @@ -80,8 +80,9 @@ proc but {label time {active 1}} { puts "
" -but "<< -1 Week" $($stt - 3600 * 24 * 7) $($stt - $now >= 3600 * 24 * 7) -but "<< -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 24) +but "<< -1 Week" $($stt - 3600 * 24 * 7) \ + $($stt - $now + 1 >= 3600 * 24 * 7) +but "<< -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23) but "<< Earlier", $($stt - 3600 * 4) $($stt > $now) but "< Now >" $now $($current == 0) but ">> Later" $ett; diff --git a/var/mongoose/html/diag/diag.jim b/var/mongoose/html/diag/diag.jim index 5363bde8..bb986d25 100755 --- a/var/mongoose/html/diag/diag.jim +++ b/var/mongoose/html/diag/diag.jim @@ -48,7 +48,11 @@ puts { - +} +if {[system model] eq "HDR"} { + puts { } +} +puts { diff --git a/var/mongoose/html/edit/edit.jim b/var/mongoose/html/edit/edit.jim index 2f99f6ea..69fdbfeb 100755 --- a/var/mongoose/html/edit/edit.jim +++ b/var/mongoose/html/edit/edit.jim @@ -2,6 +2,7 @@ package require cgi source /mod/webif/lib/setup +require plugin puts "Content-Type: text/html" puts "" @@ -49,6 +50,15 @@ Use the Open button below to begin.
diff --git a/var/mongoose/html/play/play.jim b/var/mongoose/html/play/play.jim index 08cf54ed..ab68d9e4 100755 --- a/var/mongoose/html/play/play.jim +++ b/var/mongoose/html/play/play.jim @@ -23,7 +23,8 @@ if {![$ts flag "ODEncrypted"]} { } else { lassign [$ts dlnaloc] url if {$url eq ""} { - alert("Media is encrypted and not indexed by the DLNA Server."); + puts "Media is encrypted and not indexed by the DLNA Server." + exit } }