prpr/webif
1
0
Fork 0
forked from hummypkg/webif
Code Issues Pull Requests Projects Releases 1 Wiki Activity

fix go with trailing /, tweak pkg to sort final list rather than interim, improve maintenance mode wording

Browse Source 
git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2624 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2016-02-11 18:30:18 +00:00
parent 879d672a62
commit 687fc606a1
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTROL/control
View File

@ -1,10 +1,10 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.2.8-2 Version: 1.2.8-3
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.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: Suggests:
Description: An evolving web interface for the Humax. Description: An evolving web interface for the Humax.
Tags: http://hummy.tv/forum/threads/6484/ Tags: http://hummy.tv/forum/threads/6484/

2
webif/html/diag/assets.jim
View File

@ -77,7 +77,7 @@ puts {
</span> </span>
</div><div> </div><div>
Maintenance Mode allows you to start up your Humax 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. nor the custom firmware packages are running.
<br><br> <br><br>
This mode is primarily intended to be used for checking This mode is primarily intended to be used for checking

2
webif/html/go
View File

@ -3,7 +3,7 @@
source /mod/webif/lib/setup source /mod/webif/lib/setup
require system.class settings.class plugin require system.class settings.class plugin
set module [file tail $env(PATH_INFO)] set module [file tail [string trimright $env(PATH_INFO) /]]
set lastmodule "" set lastmodule ""
if {[dict exists $env HTTP_COOKIE]} { if {[dict exists $env HTTP_COOKIE]} {
regexp {webif_lastmod=([a-z_]+)} $env(HTTP_COOKIE) x lastmodule regexp {webif_lastmod=([a-z_]+)} $env(HTTP_COOKIE) x lastmodule

11
webif/html/pkg/pkg.jim
View File

@ -8,8 +8,6 @@ if {[[settings] pkgdev]} { set filter 0 } else { set filter 1 }
httpheader httpheader
set pkgdata [pkg getall]
proc pkgrow {name pkg} { proc pkgrow {name pkg} {
altrow "pkg=\"$name\"" altrow "pkg=\"$name\""
puts "<td nowrap>$name" puts "<td nowrap>$name"
@ -80,13 +78,12 @@ proc pkgrow {name pkg} {
puts "</tr>" puts "</tr>"
} }
set pkgdata [pkg getall]
pkg loadmeta pkg loadmeta
set type [cgi_get type "avail"] set type [cgi_get type "avail"]
set pkgs {} set pkgs {}
foreach pkg [lsort -nocase [dict keys $pkgdata]] { foreach {pkg data} $pkgdata {
set data $pkgdata($pkg)
switch $type { switch $type {
avail { avail {
if {$data(installed) eq "0"} { if {$data(installed) eq "0"} {
@ -107,8 +104,6 @@ foreach pkg [lsort -nocase [dict keys $pkgdata]] {
} }
} }
#set pkgs [pkg $type]
if {[llength $pkgs] > 0} { if {[llength $pkgs] > 0} {
puts "<table><tr><th>Package</th>" puts "<table><tr><th>Package</th>"
@ -128,7 +123,7 @@ if {[llength $pkgs] > 0} {
</tr> </tr>
" "
foreach pkg $pkgs { foreach pkg [lsort $pkgs] {
if {$type ne "upgr" && $filter && \ if {$type ne "upgr" && $filter && \
![dict exists $::pkgmeta $pkg]} continue ![dict exists $::pkgmeta $pkg]} continue
if {![dict exists $pkgdata $pkg]} continue if {![dict exists $pkgdata $pkg]} continue