From 3c327ff80d9b6e2ef6a556deb69ae5f316abaf36 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Fri, 9 Nov 2012 21:56:36 +0000
Subject: [PATCH] minor updates

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1212 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                 |  2 +-
 var/mongoose/cgi-bin/xepg.jim   |  5 +++--
 var/mongoose/html/diag/diag.jim |  6 +++++-
 var/mongoose/html/edit/edit.jim | 10 ++++++++++
 var/mongoose/html/play/play.jim |  3 ++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 905dea2..bc149fd 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 206564f..4e09edd 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 "<div id=buttons style=\"width: $eventpx; margin-left: ${chanpx}px;\">"
 
-but "&lt&lt; -1 Week" $($stt - 3600 * 24 * 7) $($stt - $now >= 3600 * 24 * 7)
-but "&lt&lt; -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 24)
+but "&lt&lt; -1 Week" $($stt - 3600 * 24 * 7) \
+    $($stt - $now + 1 >= 3600 * 24 * 7)
+but "&lt&lt; -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23)
 but "&lt;&lt; Earlier", $($stt - 3600 * 4) $($stt > $now)
 but "&lt; Now &gt;" $now $($current == 0)
 but "&gt;&gt; Later" $ett;
diff --git a/var/mongoose/html/diag/diag.jim b/var/mongoose/html/diag/diag.jim
index 5363bde..bb986d2 100755
--- a/var/mongoose/html/diag/diag.jim
+++ b/var/mongoose/html/diag/diag.jim
@@ -48,7 +48,11 @@ puts {
 
 <tr>
 <td colspan=2 align=center>
-<button id=diskdiag style="width: 48%">Hard Disc</button>
+}
+if {[system model] eq "HDR"} {
+	puts { <button id=diskdiag style="width: 48%">Hard Disc</button> }
+}
+puts {
 <button id=channelinfo style="width: 48%">Channel Information</button>
 </td>
 </tr>
diff --git a/var/mongoose/html/edit/edit.jim b/var/mongoose/html/edit/edit.jim
index 2f99f6e..69fdbfe 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 <i>Open</i> button below to begin.
 <ul>
 	<li><a href=# class=qfile>/mod/etc/anacrontab</a></li>
 	<li><a href=# class=qfile>/mod/var/spool/cron/crontabs/root</a></li>
+}
+
+proc quickedit {file} {
+	puts "<li><a href=# class=qfile>$file</a></li>"
+}
+
+eval_plugins quickedit
+
+puts {
 </ul>
 </fieldset>
 </div>
diff --git a/var/mongoose/html/play/play.jim b/var/mongoose/html/play/play.jim
index 08cf54e..ab68d9e 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
 	}
 }