diff --git a/CONTROL/control b/CONTROL/control index e0433be..76b53f6 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.8.11-1 +Version: 0.8.12 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.5),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron +Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.5),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron,trm Suggests: ffmpeg,webif-iphone,nicesplice,id3v2 Description: An evolving web interface for the Humax. diff --git a/var/mongoose/cgi-bin/browse/delete.jim b/var/mongoose/cgi-bin/browse/delete.jim index 4387b84..f5e4596 100755 --- a/var/mongoose/cgi-bin/browse/delete.jim +++ b/var/mongoose/cgi-bin/browse/delete.jim @@ -2,7 +2,7 @@ package require cgi source /mod/var/mongoose/lib/setup -require ts.class system.class +require ts.class system.class tdelete puts "Content-Type: text/html" puts "" @@ -46,14 +46,14 @@ if {$type eq "ts"} { while {[file isdirectory $ndir]} { append ndir "_" } file rename $file $ndir } else { - puts [exec /mod/bin/busybox/rm -rf $file] + tdelete $file } puts -nonewline "Done..." } else { if {$dustbin ne ""} { file rename $file "[bindir $file]/[file tail $file]" } else { - file delete $file + tdelete $file } catch {file delete "[file rootname $file].hmi"} diff --git a/var/mongoose/cgi-bin/browse/mdelete.jim b/var/mongoose/cgi-bin/browse/mdelete.jim index 845a0ae..25bf252 100755 --- a/var/mongoose/cgi-bin/browse/mdelete.jim +++ b/var/mongoose/cgi-bin/browse/mdelete.jim @@ -2,7 +2,7 @@ package require cgi source /mod/var/mongoose/lib/setup -require ts.class pretty_size system.class +require ts.class pretty_size system.class tdelete puts "Content-Type: text/html\r\n\r\n" @@ -44,7 +44,7 @@ foreach file [cgi_get files] { while {[file isdirectory $ndir]} { append ndir "_" } file rename $file $ndir } else { - puts [exec /mod/bin/busybox/rm -rf $file] + tdelete $file } puts -nonewline "Done..." } elseif {[string match {*.ts} $file]} { @@ -62,7 +62,7 @@ foreach file [cgi_get files] { if {$dustbin ne ""} { file rename $file "[bindir $file]/[file tail $file]" } else { - file delete $file + tdelete $file } catch {file delete "[file rootname $file].hmi"} puts -nonewline "Done..." diff --git a/var/mongoose/cgi-bin/channel.jim b/var/mongoose/cgi-bin/channel.jim index ed4c8ba..05b99e3 100755 --- a/var/mongoose/cgi-bin/channel.jim +++ b/var/mongoose/cgi-bin/channel.jim @@ -59,7 +59,7 @@ foreach tw [$db query { order by usLcn } $tsIdx] - set mux "???" + set mux "Local" set ehs 0 foreach chan $channels { lassign $chan x lcn x name @@ -72,6 +72,7 @@ foreach tw [$db query { "ITV3" { set mux "COM4/SDN" } "Dave" { set mux "COM5/ARQ A" } "Film4" { set mux "COM6/ARQ B" } + "Movies4Men" { set mux "Local" } } } puts "$mux" diff --git a/var/mongoose/lib/altrow b/var/mongoose/lib/altrow index 00a2023..e098d04 100644 --- a/var/mongoose/lib/altrow +++ b/var/mongoose/lib/altrow @@ -1,5 +1,5 @@ -if {[expr ! [exists -proc altrow ]]} { +if {![exists -proc altrow]} { proc altrow {} {{i 0}} { if { $i == 0 } { puts "" diff --git a/var/mongoose/lib/cat b/var/mongoose/lib/cat index ca79dd6..229d6b3 100644 --- a/var/mongoose/lib/cat +++ b/var/mongoose/lib/cat @@ -1,5 +1,5 @@ -if {[expr ! [exists -proc cat ]]} { +if {![exists -proc cat]} { proc cat {file} { if {[catch {set fp [open $file r}]} { return } puts [read $fp] diff --git a/var/mongoose/lib/classdump b/var/mongoose/lib/classdump index 3179bcd..38f3c4e 100644 --- a/var/mongoose/lib/classdump +++ b/var/mongoose/lib/classdump @@ -1,5 +1,5 @@ -if {[expr ! [exists -proc classdump]]} { +if {![exists -proc classdump]} { proc classdump {o} { foreach var [$o vars] { puts [format {%20s %s} $var [$o get $var]] diff --git a/var/mongoose/lib/clipboard.class b/var/mongoose/lib/clipboard.class index 25c4eae..4cf6340 100644 --- a/var/mongoose/lib/clipboard.class +++ b/var/mongoose/lib/clipboard.class @@ -1,5 +1,5 @@ -if {![exists -proc class ]} { package require oo } +if {![exists -proc class]} { package require oo } class clipboard { path "/tmp/webif.cb" diff --git a/var/mongoose/lib/epg.class b/var/mongoose/lib/epg.class index 3de6612..ad27ee5 100644 --- a/var/mongoose/lib/epg.class +++ b/var/mongoose/lib/epg.class @@ -1,7 +1,7 @@ source /mod/var/mongoose/lib/setup -if {![exists -proc class ]} { package require oo } -if {![exists -proc sqlite3.open ]} { package require sqlite3 } +if {![exists -proc class]} { package require oo } +if {![exists -proc sqlite3.open]} { package require sqlite3 } require settings.class progressbar rsv.class diff --git a/var/mongoose/lib/escape b/var/mongoose/lib/escape index 1ba6dc2..4e1afbc 100644 --- a/var/mongoose/lib/escape +++ b/var/mongoose/lib/escape @@ -1,5 +1,5 @@ -if {[expr ! [exists -proc escape]]} { +if {![exists -proc escape]} { proc escape {str} { regsub -all -- {"} "$str" "\\\"" str return $str diff --git a/var/mongoose/lib/pkg.class b/var/mongoose/lib/pkg.class index 2b71444..5864bb5 100755 --- a/var/mongoose/lib/pkg.class +++ b/var/mongoose/lib/pkg.class @@ -1,5 +1,5 @@ -if {[expr ! [exists -proc class ]]} { package require oo } +if {![exists -proc class]} { package require oo } class pkg { name "" diff --git a/var/mongoose/lib/pretty_size b/var/mongoose/lib/pretty_size index 6dc84f5..15e7c5c 100644 --- a/var/mongoose/lib/pretty_size +++ b/var/mongoose/lib/pretty_size @@ -1,5 +1,5 @@ -if {[expr ! [exists -proc pretty_size ]]} { +if {![exists -proc pretty_size]} { proc pretty_size {size} { set units {bytes KiB MiB GiB TiB} diff --git a/var/mongoose/lib/progressbar b/var/mongoose/lib/progressbar index 9763595..c2a3364 100644 --- a/var/mongoose/lib/progressbar +++ b/var/mongoose/lib/progressbar @@ -1,5 +1,5 @@ -if {[expr ! [exists -proc progressbar ]]} { +if {![exists -proc progressbar]} { proc progressbar {percent} { set pos [expr 118 - $percent / 100.0 * 118] return "" - file delete $f } return 1 }