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

fix scheduling bug, add diagnostic confirmation, fix 404 page

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2603 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-02-09 00:37:53 +00:00
parent 943009252b
commit f29532b481
5 changed files with 16 additions and 7 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.2.7-3 Version: 1.2.7-4
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),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,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7) Depends: webif-channelicons(>=1.1.18),lighttpd(>=1.4.39-1),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),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,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)

7
webif/html/404.jim
View File

@ -7,13 +7,10 @@ set delay 5
httpheader "text/html" 0 "Refresh: $delay; url=/\r\n" httpheader "text/html" 0 "Refresh: $delay; url=/\r\n"
header header
puts { puts "
<div width=100%> <div width=100%>
<center> <center>
<div>
<h1>Page Not found</h1>
</div>
<div> <div>
<img src=/img/404.png> <img src=/img/404.png>
</div> </div>
@ -23,7 +20,7 @@ puts {
</center> </center>
</div> </div>
} "
footer footer

5
webif/html/diag/script.js
View File

@ -89,6 +89,11 @@ $('#safe,#reset,#rma').on('click', function(e) {
primary: "ui-icon-check" primary: "ui-icon-check"
}, },
click: function() { click: function() {
if (!confirm('Are you sure?'))
{
$d.dialog('close');
return;
}
$.get('/diag/rpc.jim?act=' + act + $.get('/diag/rpc.jim?act=' + act +
'&opt=' + opt, function() { '&opt=' + opt, function() {
$d.dialog('close'); $d.dialog('close');

2
webif/html/diag/style.css
View File

@ -11,6 +11,8 @@ img.button
height: 80px; height: 80px;
padding: 0 2em; padding: 0 2em;
border: 0; border: 0;
outline: none;
border: none;
} }
span.label span.label

7
webif/lib/rsv.class
View File

@ -500,6 +500,7 @@ proc {rsv construct} {event type} {
if {$ecrid ne ""} { if {$ecrid ne ""} {
set args(szCRID) "$ccrid$ecrid" set args(szCRID) "$ccrid$ecrid"
set args(szEventToRecord) "1$args(szCRID)|" set args(szEventToRecord) "1$args(szCRID)|"
set args(aulEventToRecordInfo) [rsv mkaul $event]
# Handle split events # Handle split events
if {[string match {*#?} $args(szCRID)]} { if {[string match {*#?} $args(szCRID)]} {
set args(ucRecKind) 2 set args(ucRecKind) 2
@ -523,10 +524,14 @@ proc {rsv construct} {event type} {
set args(szCRID) "$ccrid[$event get series_crid]" set args(szCRID) "$ccrid[$event get series_crid]"
set args(szFPBRecPath) "$args(szevtname)" set args(szFPBRecPath) "$args(szevtname)"
set events {} set events {}
set seen {}
set progs [lmap i [\ set progs [lmap i [\
epg dbfetch dump -scrid [$event get series_crid] \ epg dbfetch dump -scrid [$event get series_crid] \
-sort start] { -sort start] {
if {[set ecrid [$i get event_crid]] eq ""} { continue } if {[set ecrid [$i get event_crid]] eq ""} continue
if {$ecrid in $seen} continue
lappend seen $ecrid
if {[$i get start] < [$event get start]} continue
lappend events [rsv mkaul $i] lappend events [rsv mkaul $i]
list "1$::ccrid$ecrid" list "1$::ccrid$ecrid"
}] }]