From 6797ee4416e69ea9985a51d3320c9f9af00af00c Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Mon, 5 Sep 2011 22:23:29 +0000
Subject: [PATCH] minor tweaks and fix system diskspace

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@364 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                         |  2 +-
 var/mongoose/cgi-bin/backup/restore.jim |  2 +-
 var/mongoose/include/sched.jim          | 17 +++++++++++------
 var/mongoose/lib/system.class           |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 0036516..eb9cd0b 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.6.8-1
+Version: 0.6.8-2
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.3),hmt(>=1.0.6),ssmtp
diff --git a/var/mongoose/cgi-bin/backup/restore.jim b/var/mongoose/cgi-bin/backup/restore.jim
index 7bc7e3f..b074b6a 100755
--- a/var/mongoose/cgi-bin/backup/restore.jim
+++ b/var/mongoose/cgi-bin/backup/restore.jim
@@ -117,7 +117,7 @@ foreach line $data {
 
 $rsvdb query {commit transaction;}
 
-close [open /tmp/.restartpending w]
+system restartpending
 
 close $fd
 rsv cleanup
diff --git a/var/mongoose/include/sched.jim b/var/mongoose/include/sched.jim
index b7ee1ed..3617dd8 100755
--- a/var/mongoose/include/sched.jim
+++ b/var/mongoose/include/sched.jim
@@ -91,8 +91,14 @@ $(document).ready(function() {
 </script>
 }
 
-proc eventheader {{table TBL_RESERVATION}} {
+proc eventheader {{table TBL_RESERVATION} note} {
 	puts {
+		<fieldset style="display: inline; padding: 1em">
+		<legend>
+	}
+	puts "<h3>$note</h3>"
+	puts {
+		</legend>
 		<table class="borders tablesorter">
 		<thead>
 		<tr>
@@ -199,13 +205,12 @@ proc eventrow {event {table TBL_RESERVATION}} {
 }
 
 proc eventfooter {} {
-	puts "</tbody></table>"
+	puts "</tbody></table></fieldset>"
 }
 
 set events [rsv list pending]
 if {[llength $events] > 0} {
-	puts "<h2>Pending Schedule Events</h2>"
-	eventheader pending
+	eventheader pending "Pending Scheduled Events"
 	foreach event $events {eventrow $event pending}
 	eventfooter
 	puts {
@@ -217,13 +222,13 @@ if {[llength $events] > 0} {
 	}
 }
 
-puts "<h2>Scheduled Events</h2>"
 set events [rsv list]
-eventheader
+eventheader "live" "Scheduled Events"
 foreach event $events {eventrow $event}
 eventfooter
 
 puts {
+	<br>
 	<small>
 	<button onclick="window.location='/backup.shtml';">
 		Backup/Restore Scheduled Recordings/Events
diff --git a/var/mongoose/lib/system.class b/var/mongoose/lib/system.class
index 57e1e37..f17873e 100644
--- a/var/mongoose/lib/system.class
+++ b/var/mongoose/lib/system.class
@@ -29,7 +29,7 @@ proc {system diskspace} {} {
 	set size 0
 	set used 0
 	set perc 0
-	foreach line [split [exec df -h $part 2>>/dev/null] "\n\r"] {
+	foreach line [split [exec /mod/bin/busybox/df -h $part 2>>/dev/null] "\n\r"] {
 		if {[string match "/*" $line]} {
 			regsub -all -- {[[:space:]]+} $line " " line
 			set fields [split $line]