From 687fc606a169a6fe1b70812c79aa3f24cff4930a Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Thu, 11 Feb 2016 18:30:18 +0000
Subject: [PATCH] fix go with trailing /, tweak pkg to sort final list rather
 than interim, improve maintenance mode wording

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2624 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control            |  4 ++--
 webif/html/diag/assets.jim |  2 +-
 webif/html/go              |  2 +-
 webif/html/pkg/pkg.jim     | 11 +++--------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 0f4cf3e..09ddd0b 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.8-2
+Version: 1.2.8-3
 Architecture: mipsel
 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.20),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)
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/6484/
diff --git a/webif/html/diag/assets.jim b/webif/html/diag/assets.jim
index 91d3e4f..5402ba9 100755
--- a/webif/html/diag/assets.jim
+++ b/webif/html/diag/assets.jim
@@ -77,7 +77,7 @@ puts {
 		</span>
 	</div><div>
 		Maintenance Mode allows you to start up your Humax
-		into a mode where the neither the standard Humax software
+		in a mode where neither the standard Humax software
 		nor the custom firmware packages are running. 
 		<br><br>
 		This mode is primarily intended to be used for checking
diff --git a/webif/html/go b/webif/html/go
index 7be8bf2..870ab69 100755
--- a/webif/html/go
+++ b/webif/html/go
@@ -3,7 +3,7 @@
 source /mod/webif/lib/setup
 require system.class settings.class plugin
 
-set module [file tail $env(PATH_INFO)]
+set module [file tail [string trimright $env(PATH_INFO) /]]
 set lastmodule ""
 if {[dict exists $env HTTP_COOKIE]} {
 	regexp {webif_lastmod=([a-z_]+)} $env(HTTP_COOKIE) x lastmodule
diff --git a/webif/html/pkg/pkg.jim b/webif/html/pkg/pkg.jim
index 0eb3bdb..b176a94 100755
--- a/webif/html/pkg/pkg.jim
+++ b/webif/html/pkg/pkg.jim
@@ -8,8 +8,6 @@ if {[[settings] pkgdev]} { set filter 0 } else { set filter 1 }
 
 httpheader
 
-set pkgdata [pkg getall]
-
 proc pkgrow {name pkg} {
 	altrow "pkg=\"$name\""
 	puts "<td nowrap>$name"
@@ -80,13 +78,12 @@ proc pkgrow {name pkg} {
 	puts "</tr>"
 }
 
+set pkgdata [pkg getall]
 pkg loadmeta
-
 set type [cgi_get type "avail"]
 
 set pkgs {}
-foreach pkg [lsort -nocase [dict keys $pkgdata]] {
-	set data $pkgdata($pkg)
+foreach {pkg data} $pkgdata {
 	switch $type {
 		avail {
 			if {$data(installed) eq "0"} {
@@ -107,8 +104,6 @@ foreach pkg [lsort -nocase [dict keys $pkgdata]] {
 	}
 }
 
-#set pkgs [pkg $type]
-
 if {[llength $pkgs] > 0} {
 	puts "<table><tr><th>Package</th>"
 
@@ -128,7 +123,7 @@ if {[llength $pkgs] > 0} {
 		</tr>
 	"
 
-	foreach pkg $pkgs {
+	foreach pkg [lsort $pkgs] {
 		if {$type ne "upgr" && $filter && \
 		    ![dict exists $::pkgmeta $pkg]} continue
 		if {![dict exists $pkgdata $pkg]} continue