diff --git a/CONTROL/control b/CONTROL/control index 0d23555..be7990b 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.11.0-5 +Version: 0.12.0 Architecture: mipsel Maintainer: af123@hummypkg.org.uk -Depends: webif-channelicons(>=1.0.4-1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.6),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.10),hmt(>=1.1.10),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.05) +Depends: webif-channelicons(>=1.0.4-1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.10),hmt(>=1.1.12),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.05) Suggests: ffmpeg Description: An evolving web interface for the Humax. diff --git a/var/mongoose/cgi-bin/backup/backup.jim b/var/mongoose/cgi-bin/backup/backup.jim index faac176..3353ee5 100755 --- a/var/mongoose/cgi-bin/backup/backup.jim +++ b/var/mongoose/cgi-bin/backup/backup.jim @@ -7,11 +7,7 @@ require rsv.class set dir /mod/var/backup -puts "Content-Type: text/html" -puts "" - -cgi_input -#cgi_dump +httpheader set now [clock seconds] set file [file tail [cgi_get file \ diff --git a/var/mongoose/cgi-bin/backup/delete.jim b/var/mongoose/cgi-bin/backup/delete.jim index 799b80c..4005e77 100755 --- a/var/mongoose/cgi-bin/backup/delete.jim +++ b/var/mongoose/cgi-bin/backup/delete.jim @@ -5,20 +5,14 @@ source /mod/webif/lib/setup set dir /mod/var/backup -puts "Content-Type: text/html" -puts "Pragma: no-cache" -puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT" -puts "" +httpheader -cgi_input -#cgi_dump - -if {![dict exists $_cgi restore_file]} { +set file [file tail [cgi_get restore_file]] +if {$file == 0} { puts "No filename supplied." exit } -set file [file tail [dict get $_cgi restore_file]] set ffile "/$dir/$file.rbk" if {![file exists $ffile]} { diff --git a/var/mongoose/cgi-bin/backup/files.jim b/var/mongoose/cgi-bin/backup/files.jim index bc6ab95..d567495 100755 --- a/var/mongoose/cgi-bin/backup/files.jim +++ b/var/mongoose/cgi-bin/backup/files.jim @@ -1,11 +1,9 @@ #!/mod/bin/jimsh package require cgi +source /mod/webif/lib/setup -puts "Content-Type: text/html" -puts "Pragma: no-cache" -puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT" -puts "" +httpheader set dir "/mod/var/backup" diff --git a/var/mongoose/cgi-bin/backup/restore.jim b/var/mongoose/cgi-bin/backup/restore.jim index ed340a6..bea17ec 100755 --- a/var/mongoose/cgi-bin/backup/restore.jim +++ b/var/mongoose/cgi-bin/backup/restore.jim @@ -7,20 +7,14 @@ require rsv.class findhsvc system.class set dir /mod/var/backup -puts "Content-Type: text/html" -puts "" +httpheader -cgi_input -#cgi_dump - -#set _cgi(restore_file) "backup-2011-Jul-09-20:37" - -if {![dict exists $_cgi restore_file]} { +set file [file tail [cgi_get restore_file]] +if {$file == 0} { puts "No filename supplied." exit } -set file [file tail [dict get $_cgi restore_file]] set ffile "/$dir/$file.rbk" if {![file exists $ffile]} { diff --git a/var/mongoose/cgi-bin/backup/view.jim b/var/mongoose/cgi-bin/backup/view.jim index 1db8dd9..c0ac082 100755 --- a/var/mongoose/cgi-bin/backup/view.jim +++ b/var/mongoose/cgi-bin/backup/view.jim @@ -7,20 +7,14 @@ require rsv.class findhsvc set dir /mod/var/backup -puts "Content-Type: text/html" -puts "" +httpheader -cgi_input -#cgi_dump - -#set _cgi(restore_file) "backup-2011-Jul-09-20:37" - -if {![dict exists $_cgi restore_file]} { +set file [file tail [cgi_get restore_file]] +if {$file == 0} { puts "No filename supplied." exit } -set file [file tail [dict get $_cgi restore_file]] set ffile "/$dir/$file.rbk" if {![file exists $ffile]} { diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim index a5cfa2d..d3c0a6e 100755 --- a/var/mongoose/cgi-bin/browse.jim +++ b/var/mongoose/cgi-bin/browse.jim @@ -4,8 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size system.class settings.class escape browse.class -puts "Content-Type: text/html" -puts "" +header set nicesplice [system pkginst nicesplice] set flatten [system pkginst flatten] @@ -13,11 +12,9 @@ set flatten [system pkginst flatten] set ignore {.nts .thm .hmi} set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt} -cgi_input -#cgi_dump - if {![dict exists $env REQUEST_URI]} { set env(REQUEST_URI) "" + cgi_input set _cgi(dir) "/media/My Video/" } @@ -231,8 +228,6 @@ set dir [cgi_get dir [system mediaroot]] ###################################################################### # Render web page -header - puts { diff --git a/var/mongoose/cgi-bin/browse/audio/audio.jim b/var/mongoose/cgi-bin/browse/audio/audio.jim index 15d1961..e010d99 100755 --- a/var/mongoose/cgi-bin/browse/audio/audio.jim +++ b/var/mongoose/cgi-bin/browse/audio/audio.jim @@ -5,18 +5,13 @@ package require cgi source /mod/webif/lib/setup require ts.class system.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +header set rfile [cgi_get file] set ts [ts fetch $rfile] set dir [file dirname $rfile] set len [$ts duration 1] -header - puts " diff --git a/var/mongoose/cgi-bin/browse/audio/execute.jim b/var/mongoose/cgi-bin/browse/audio/execute.jim index 2fc4535..fc30adf 100755 --- a/var/mongoose/cgi-bin/browse/audio/execute.jim +++ b/var/mongoose/cgi-bin/browse/audio/execute.jim @@ -5,10 +5,7 @@ package require cgi source /mod/webif/lib/setup require ts.class system.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set rfile [cgi_get file] set ts [ts fetch $rfile] diff --git a/var/mongoose/cgi-bin/browse/audio/progress.jim b/var/mongoose/cgi-bin/browse/audio/progress.jim index 796eb91..29a7de1 100755 --- a/var/mongoose/cgi-bin/browse/audio/progress.jim +++ b/var/mongoose/cgi-bin/browse/audio/progress.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set tsfile [cgi_get file] set rfile [file normalize $tsfile] diff --git a/var/mongoose/cgi-bin/browse/chunk/chunk.jim b/var/mongoose/cgi-bin/browse/chunk/chunk.jim index ba15b55..4b856bf 100755 --- a/var/mongoose/cgi-bin/browse/chunk/chunk.jim +++ b/var/mongoose/cgi-bin/browse/chunk/chunk.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +header set rfile [cgi_get file] set ts [ts fetch $rfile] @@ -21,8 +18,6 @@ set len [$ts duration 1] set esttime $(int($len * 0.025)) if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) } -header - puts " diff --git a/var/mongoose/cgi-bin/browse/chunk/extract.jim b/var/mongoose/cgi-bin/browse/chunk/extract.jim index 2db9720..dfd18ae 100755 --- a/var/mongoose/cgi-bin/browse/chunk/extract.jim +++ b/var/mongoose/cgi-bin/browse/chunk/extract.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set rfile [cgi_get file] set part [cgi_get part -] diff --git a/var/mongoose/cgi-bin/browse/chunk/progress.jim b/var/mongoose/cgi-bin/browse/chunk/progress.jim index 619b97e..408f0e6 100755 --- a/var/mongoose/cgi-bin/browse/chunk/progress.jim +++ b/var/mongoose/cgi-bin/browse/chunk/progress.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +heepheader set file [cgi_get file] set part [cgi_get part] diff --git a/var/mongoose/cgi-bin/browse/clipboard.jim b/var/mongoose/cgi-bin/browse/clipboard.jim index 294b327..214f0f8 100755 --- a/var/mongoose/cgi-bin/browse/clipboard.jim +++ b/var/mongoose/cgi-bin/browse/clipboard.jim @@ -4,13 +4,9 @@ package require cgi source /mod/webif/lib/setup require clipboard.class ts.class -puts "Content-Type: text/html; no-cache" -puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT" -puts "Pragma: nocache" -puts "" +httpheader cgi_input 1 -#cgi_dump set cb [[clipboard new {path "/tmp/webif-browse.cb"}] load] diff --git a/var/mongoose/cgi-bin/browse/crop/crop.jim b/var/mongoose/cgi-bin/browse/crop/crop.jim index 1022e9f..43a0fb9 100755 --- a/var/mongoose/cgi-bin/browse/crop/crop.jim +++ b/var/mongoose/cgi-bin/browse/crop/crop.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +header set rfile [cgi_get file] set ts [ts fetch $rfile] @@ -15,8 +12,6 @@ set dir [file dirname $rfile] set len [$ts duration 1] -header - puts " diff --git a/var/mongoose/cgi-bin/browse/crop/execute.jim b/var/mongoose/cgi-bin/browse/crop/execute.jim index beec903..22beca2 100755 --- a/var/mongoose/cgi-bin/browse/crop/execute.jim +++ b/var/mongoose/cgi-bin/browse/crop/execute.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size system.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set rfile [cgi_get file] diff --git a/var/mongoose/cgi-bin/browse/crop/progress.jim b/var/mongoose/cgi-bin/browse/crop/progress.jim index a5a4429..852aa72 100755 --- a/var/mongoose/cgi-bin/browse/crop/progress.jim +++ b/var/mongoose/cgi-bin/browse/crop/progress.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set perc [cgi_get perc 100] set tsfile [file normalize [cgi_get file]] diff --git a/var/mongoose/cgi-bin/browse/decrypt/decrypt.jim b/var/mongoose/cgi-bin/browse/decrypt/decrypt.jim index 24f46fc..59b84a6 100755 --- a/var/mongoose/cgi-bin/browse/decrypt/decrypt.jim +++ b/var/mongoose/cgi-bin/browse/decrypt/decrypt.jim @@ -5,10 +5,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +header set rfile [cgi_get file] set ts [ts fetch $rfile] @@ -16,8 +13,6 @@ set dir [file dirname $rfile] set len [$ts duration 1] lassign [$ts dlnaloc] url -header - puts " diff --git a/var/mongoose/cgi-bin/browse/decrypt/execute.jim b/var/mongoose/cgi-bin/browse/decrypt/execute.jim index 652af5e..71a03b2 100755 --- a/var/mongoose/cgi-bin/browse/decrypt/execute.jim +++ b/var/mongoose/cgi-bin/browse/decrypt/execute.jim @@ -5,10 +5,7 @@ package require cgi source /mod/webif/lib/setup require ts.class system.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set rfile [cgi_get file] set ts [ts fetch $rfile] diff --git a/var/mongoose/cgi-bin/browse/decrypt/progress.jim b/var/mongoose/cgi-bin/browse/decrypt/progress.jim index b34a53c..d3a021e 100755 --- a/var/mongoose/cgi-bin/browse/decrypt/progress.jim +++ b/var/mongoose/cgi-bin/browse/decrypt/progress.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set tsfile [cgi_get file] set rfile [file normalize $tsfile] diff --git a/var/mongoose/cgi-bin/browse/delete.jim b/var/mongoose/cgi-bin/browse/delete.jim index f84164f..cf78a7b 100755 --- a/var/mongoose/cgi-bin/browse/delete.jim +++ b/var/mongoose/cgi-bin/browse/delete.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require safe_delete -puts "Content-Type: text/html\r\n" - -cgi_input -#cgi_dump +httpheader set dir [cgi_get dir] diff --git a/var/mongoose/cgi-bin/browse/download.jim b/var/mongoose/cgi-bin/browse/download.jim index c264572..41447e7 100755 --- a/var/mongoose/cgi-bin/browse/download.jim +++ b/var/mongoose/cgi-bin/browse/download.jim @@ -5,11 +5,6 @@ package require sqlite3 source /mod/webif/lib/setup require ts.class -#puts "Content-Type: text/plain\r\n\r\n" - -cgi_input -#cgi_dump - set file [cgi_get file] set urlbase [cgi_get base ""] diff --git a/var/mongoose/cgi-bin/browse/enc.jim b/var/mongoose/cgi-bin/browse/enc.jim index 2ca7101..8869aa5 100755 --- a/var/mongoose/cgi-bin/browse/enc.jim +++ b/var/mongoose/cgi-bin/browse/enc.jim @@ -1,17 +1,12 @@ #!/mod/bin/jimsh package require cgi -source /mod/webif/lib/ts.class +source /mod/webif/lib/setup +require ts.class -puts "Content-Type: text/html" -puts "" +httpheader -cgi_input -#cgi_dump - -#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts" - -set file [dict get $_cgi file] +set file [cgi_get file] set ts [ts fetch $file] if {[set ts [ts fetch $file]] != 0} { set action enc diff --git a/var/mongoose/cgi-bin/browse/epgtitle.jim b/var/mongoose/cgi-bin/browse/epgtitle.jim index 38595fa..d871c2f 100755 --- a/var/mongoose/cgi-bin/browse/epgtitle.jim +++ b/var/mongoose/cgi-bin/browse/epgtitle.jim @@ -1,18 +1,13 @@ #!/mod/bin/jimsh package require cgi -source /mod/webif/lib/ts.class +source /mod/webif/lib/setup +require ts.class -puts "Content-Type: application/json" -puts "" +httpheader "application/json" -cgi_input -#cgi_dump -#set _cgi(file) "/media/My Video/Doctor Who/6.13._The_Almost_People.ts" - -if {![dict exists $_cgi file]} { exit } - -set file [dict get $_cgi file] +set file [cgi_get file] +if {$file == 0} exit set ts [ts fetch $file] puts "{" diff --git a/var/mongoose/cgi-bin/browse/ffmpeg.jim b/var/mongoose/cgi-bin/browse/ffmpeg.jim index b7029b8..4b2357d 100755 --- a/var/mongoose/cgi-bin/browse/ffmpeg.jim +++ b/var/mongoose/cgi-bin/browse/ffmpeg.jim @@ -1,15 +1,12 @@ #!/mod/bin/jimsh package require cgi +source /mod/webif/lib/setup -puts "Content-Type: text/html" -puts "" - -cgi_input -#cgi_dump +httpheader if [file exists /mod/bin/ffmpeg] { - set file [dict get $_cgi file] + set file [cgi_get file] puts [exec /mod/webif/lib/bin/ffmpeg -i $file] } else { puts "Install ffmpeg package for more information..." diff --git a/var/mongoose/cgi-bin/browse/file.jim b/var/mongoose/cgi-bin/browse/file.jim index 1885edc..30f0b3b 100755 --- a/var/mongoose/cgi-bin/browse/file.jim +++ b/var/mongoose/cgi-bin/browse/file.jim @@ -4,18 +4,12 @@ package require cgi source /mod/webif/lib/setup require pretty_size -puts "Content-Type: text/html" -puts "" +httpheader -cgi_input -#cgi_dump +set file [cgi_get file] +set type [cgi_get type] -#set _cgi(file) "/media/My Video/Dangermouse/Series 1/01_rogue_robots.avi" - -if {![dict exists $_cgi file]} { exit } - -set file [dict get $_cgi file] -set type [dict get $_cgi type] +if {$file == 0} exit file stat $file st set sz [pretty_size $st(size)] diff --git a/var/mongoose/cgi-bin/browse/flagdir.jim b/var/mongoose/cgi-bin/browse/flagdir.jim index a80d38c..c67787f 100755 --- a/var/mongoose/cgi-bin/browse/flagdir.jim +++ b/var/mongoose/cgi-bin/browse/flagdir.jim @@ -3,11 +3,7 @@ package require cgi source /mod/webif/lib/setup -puts "Content-Type: text/html" -puts "" - -cgi_input -#cgi_dump +httpheader set dir [cgi_get dir] set flag [cgi_get flag] diff --git a/var/mongoose/cgi-bin/browse/iconset.jim b/var/mongoose/cgi-bin/browse/iconset.jim index bd974b5..cbf79ed 100755 --- a/var/mongoose/cgi-bin/browse/iconset.jim +++ b/var/mongoose/cgi-bin/browse/iconset.jim @@ -4,8 +4,7 @@ package require cgi source /mod/webif/lib/setup require browse.class -puts "Content-Type: text/html" -puts "" +httpheader set file [cgi_get file] diff --git a/var/mongoose/cgi-bin/browse/join/execute.jim b/var/mongoose/cgi-bin/browse/join/execute.jim index 66a97a9..2f1dbed 100755 --- a/var/mongoose/cgi-bin/browse/join/execute.jim +++ b/var/mongoose/cgi-bin/browse/join/execute.jim @@ -4,10 +4,9 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" +httpheader cgi_input 1 -#cgi_dump set joinstart [clock milliseconds] diff --git a/var/mongoose/cgi-bin/browse/join/join.jim b/var/mongoose/cgi-bin/browse/join/join.jim index 95111cd..0cd41aa 100755 --- a/var/mongoose/cgi-bin/browse/join/join.jim +++ b/var/mongoose/cgi-bin/browse/join/join.jim @@ -4,7 +4,6 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" header cgi_input 1 diff --git a/var/mongoose/cgi-bin/browse/join/progress.jim b/var/mongoose/cgi-bin/browse/join/progress.jim index 68d386a..e767d5b 100755 --- a/var/mongoose/cgi-bin/browse/join/progress.jim +++ b/var/mongoose/cgi-bin/browse/join/progress.jim @@ -1,12 +1,9 @@ #!/mod/bin/jimsh package require cgi -#source /mod/webif/lib/setup +source /mod/webif/lib/setup -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set expected [cgi_get esize 1] set file [file normalize [cgi_get file]] diff --git a/var/mongoose/cgi-bin/browse/lock.jim b/var/mongoose/cgi-bin/browse/lock.jim index 9055d1e..021de4b 100755 --- a/var/mongoose/cgi-bin/browse/lock.jim +++ b/var/mongoose/cgi-bin/browse/lock.jim @@ -4,15 +4,9 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html" -puts "" +httpheader -cgi_input -#cgi_dump - -#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts" - -set file [dict get $_cgi file] +set file [cgi_get file ""] set ts [ts fetch $file] if {[set ts [ts fetch $file]] != 0} { set action lock diff --git a/var/mongoose/cgi-bin/browse/mknewdir.jim b/var/mongoose/cgi-bin/browse/mknewdir.jim index 34ffe81..92e289f 100755 --- a/var/mongoose/cgi-bin/browse/mknewdir.jim +++ b/var/mongoose/cgi-bin/browse/mknewdir.jim @@ -1,12 +1,9 @@ #!/mod/bin/jimsh package require cgi +source /mod/webif/lib/setup -puts "Content-Type: text/html" -puts "" - -cgi_input -#cgi_dump +httpheader set dir [cgi_get dir -] set name [cgi_get newdirname "New Folder"] diff --git a/var/mongoose/cgi-bin/browse/mpg/execute.jim b/var/mongoose/cgi-bin/browse/mpg/execute.jim index eac9847..55b3443 100755 --- a/var/mongoose/cgi-bin/browse/mpg/execute.jim +++ b/var/mongoose/cgi-bin/browse/mpg/execute.jim @@ -5,10 +5,7 @@ package require cgi source /mod/webif/lib/setup require ts.class system.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set rfile [cgi_get file] set ts [ts fetch $rfile] diff --git a/var/mongoose/cgi-bin/browse/mpg/mpg.jim b/var/mongoose/cgi-bin/browse/mpg/mpg.jim index 92f0c7d..81e15dd 100755 --- a/var/mongoose/cgi-bin/browse/mpg/mpg.jim +++ b/var/mongoose/cgi-bin/browse/mpg/mpg.jim @@ -5,18 +5,13 @@ package require cgi source /mod/webif/lib/setup require ts.class system.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +header set rfile [cgi_get file] set ts [ts fetch $rfile] set dir [file dirname $rfile] set len [$ts duration 1] -header - puts " diff --git a/var/mongoose/cgi-bin/browse/mpg/progress.jim b/var/mongoose/cgi-bin/browse/mpg/progress.jim index 7073270..b77ba63 100755 --- a/var/mongoose/cgi-bin/browse/mpg/progress.jim +++ b/var/mongoose/cgi-bin/browse/mpg/progress.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set tsfile [cgi_get file] set rfile [file normalize $tsfile] diff --git a/var/mongoose/cgi-bin/browse/new.jim b/var/mongoose/cgi-bin/browse/new.jim index 338f5d1..de758bc 100755 --- a/var/mongoose/cgi-bin/browse/new.jim +++ b/var/mongoose/cgi-bin/browse/new.jim @@ -4,15 +4,9 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html" -puts "" +httpheader -cgi_input -#cgi_dump - -#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts" - -set file [dict get $_cgi file] +set file [cgi_get file] set ts [ts fetch $file] if {[set ts [ts fetch $file]] != 0} { set action new diff --git a/var/mongoose/cgi-bin/browse/newdir.jim b/var/mongoose/cgi-bin/browse/newdir.jim index 1f8ca40..185735b 100755 --- a/var/mongoose/cgi-bin/browse/newdir.jim +++ b/var/mongoose/cgi-bin/browse/newdir.jim @@ -2,16 +2,11 @@ package require cgi package require pack +source /mod/webif/lib/setup -puts "Content-Type: application/json" -puts "" +httpheader "application/json" -cgi_input -#cgi_dump - -#set _cgi(dir) "/media/My Video" - -set root [dict get $_cgi dir] +set root [cgi_get dir] # Strip double slashes regsub -all -- {\/+} "$root/*" "/" root diff --git a/var/mongoose/cgi-bin/browse/rename.jim b/var/mongoose/cgi-bin/browse/rename.jim index 21d7678..d618e9f 100755 --- a/var/mongoose/cgi-bin/browse/rename.jim +++ b/var/mongoose/cgi-bin/browse/rename.jim @@ -4,11 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html" -puts "" - -cgi_input -#cgi_dump +httpheader set file [cgi_get renamefile "-"] if {$file eq "-"} exit diff --git a/var/mongoose/cgi-bin/browse/resetnew.jim b/var/mongoose/cgi-bin/browse/resetnew.jim index d4d9ea4..a378f9c 100755 --- a/var/mongoose/cgi-bin/browse/resetnew.jim +++ b/var/mongoose/cgi-bin/browse/resetnew.jim @@ -5,11 +5,7 @@ package require pack source /mod/webif/lib/setup require ts.class hexdump -puts "Content-Type: text/html" -puts "" - -cgi_input -#cgi_dump +httpheader set dir [cgi_get dir] if {![file isdirectory $dir]} { exit } diff --git a/var/mongoose/cgi-bin/browse/savestream.jim b/var/mongoose/cgi-bin/browse/savestream.jim index b010c59..ef97731 100755 --- a/var/mongoose/cgi-bin/browse/savestream.jim +++ b/var/mongoose/cgi-bin/browse/savestream.jim @@ -4,11 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html" -puts "" - -cgi_input -#cgi_dump +httpheader set dir [cgi_get dir "/media/My Video"] set file [file tail [cgi_get savestream_name]] diff --git a/var/mongoose/cgi-bin/browse/shrunk.jim b/var/mongoose/cgi-bin/browse/shrunk.jim index 5f91827..0b98857 100755 --- a/var/mongoose/cgi-bin/browse/shrunk.jim +++ b/var/mongoose/cgi-bin/browse/shrunk.jim @@ -1,13 +1,9 @@ #!/mod/bin/jimsh package require cgi +source /mod/webif/lib/setup -#puts "Content-Type: text/plain" -puts "Content-Type: application/json" -puts "" - -cgi_input -#cgi_dump +httpheader "application/json" set dir [cgi_get dir "/media/My Video/Children"] diff --git a/var/mongoose/cgi-bin/browse/sizes.jim b/var/mongoose/cgi-bin/browse/sizes.jim index 428afec..3cea60c 100755 --- a/var/mongoose/cgi-bin/browse/sizes.jim +++ b/var/mongoose/cgi-bin/browse/sizes.jim @@ -1,17 +1,11 @@ #!/mod/bin/jimsh package require cgi +source /mod/webif/lib/setup -#puts "Content-Type: text/plain" -puts "Content-Type: application/json" -puts "" +httpheader "application/json" -cgi_input -#cgi_dump - -#set _cgi(dir) "/media/My Video" - -set dir [dict get $_cgi dir] +set dir [cgi_get dir] set dlen [string length "$dir/"] #9.4G /media/My Video/Archive diff --git a/var/mongoose/cgi-bin/browse/strip/analyse.jim b/var/mongoose/cgi-bin/browse/strip/analyse.jim index 027301a..e59b4b4 100755 --- a/var/mongoose/cgi-bin/browse/strip/analyse.jim +++ b/var/mongoose/cgi-bin/browse/strip/analyse.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set rfile [cgi_get file] set base [file rootname $rfile] diff --git a/var/mongoose/cgi-bin/browse/strip/execute.jim b/var/mongoose/cgi-bin/browse/strip/execute.jim index 1890706..85982b0 100755 --- a/var/mongoose/cgi-bin/browse/strip/execute.jim +++ b/var/mongoose/cgi-bin/browse/strip/execute.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set rfile [cgi_get file] set ts [ts fetch $rfile] diff --git a/var/mongoose/cgi-bin/browse/strip/progress.jim b/var/mongoose/cgi-bin/browse/strip/progress.jim index d565bd0..0032584 100755 --- a/var/mongoose/cgi-bin/browse/strip/progress.jim +++ b/var/mongoose/cgi-bin/browse/strip/progress.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +httpheader set tsfile [file normalize [cgi_get file]] set ntsfile "[file rootname $tsfile].nts" diff --git a/var/mongoose/cgi-bin/browse/strip/strip.jim b/var/mongoose/cgi-bin/browse/strip/strip.jim index eb1089f..07d5603 100755 --- a/var/mongoose/cgi-bin/browse/strip/strip.jim +++ b/var/mongoose/cgi-bin/browse/strip/strip.jim @@ -4,10 +4,7 @@ package require cgi source /mod/webif/lib/setup require ts.class pretty_size -puts "Content-Type: text/html\r\n\r\n" - -cgi_input -#cgi_dump +header set rfile [cgi_get file] set ts [ts fetch $rfile] @@ -17,8 +14,6 @@ set len [$ts duration 1] set esttime $([$ts size] / 5700000) -header - puts " diff --git a/var/mongoose/cgi-bin/channel.jim b/var/mongoose/cgi-bin/channel.jim index d10852b..a2c9a26 100755 --- a/var/mongoose/cgi-bin/channel.jim +++ b/var/mongoose/cgi-bin/channel.jim @@ -5,13 +5,8 @@ package require sqlite3 source /mod/webif/lib/setup require altrow progressbar epg.class -puts "Content-Type: text/html" -puts "" - header -cgi_input - proc f2c {frequency} { set ch int($((($frequency / 1000) - 303.25) / 8)) return [expr int($ch)] diff --git a/var/mongoose/cgi-bin/db.jim b/var/mongoose/cgi-bin/db.jim index e64909a..8972748 100755 --- a/var/mongoose/cgi-bin/db.jim +++ b/var/mongoose/cgi-bin/db.jim @@ -5,17 +5,11 @@ package require sqlite3 source /mod/webif/lib/setup require altrow -puts "Content-Type: text/html" -puts "" - set databases [glob /var/lib/humaxtv/*.db] lappend databases "/mnt/hd2/dms_cds.db" header -cgi_input -#cgi_dump - set ftab [cgi_get tab] set fdb [cgi_get db] @@ -24,7 +18,7 @@ if {$fdb != 0} { } proc db_info {db_file} { - global _cgi fdb ftab + global fdb ftab if {$fdb != 0 && [file tail $db_file] ne $fdb} { return } if {![file exists $db_file]} { return } diff --git a/var/mongoose/cgi-bin/env.jim b/var/mongoose/cgi-bin/env.jim index 34c629a..c033bb5 100755 --- a/var/mongoose/cgi-bin/env.jim +++ b/var/mongoose/cgi-bin/env.jim @@ -1,6 +1,7 @@ #!/mod/bin/jimsh -puts "Content-type: text/plain\n" +source /mod/webif/lib/setup +httpheader "text/plain" foreach f [dict keys $env] { puts "$f = $env($f)" diff --git a/var/mongoose/cgi-bin/epg/dump.jim b/var/mongoose/cgi-bin/epg/dump.jim index 6a9384b..8ce85a4 100755 --- a/var/mongoose/cgi-bin/epg/dump.jim +++ b/var/mongoose/cgi-bin/epg/dump.jim @@ -4,21 +4,11 @@ package require cgi source /mod/webif/lib/setup require epg.class -puts "Content-Type: text/html" -puts "" - header -cgi_input -#cgi_dump - -set service 0 -set service 4351 -catch { set service [dict get $_cgi service] } -set event 0 -catch { set event [dict get $_cgi event] } -set raw 0 -catch { set raw [dict get $_cgi raw] } +set service [cgi_get service] +set event [cgi_get event] +set raw [cgi_get raw] puts "
"
 if { $raw == 0 } {
diff --git a/var/mongoose/cgi-bin/epg/info.jim b/var/mongoose/cgi-bin/epg/info.jim
index 9c66a3f..bc8e184 100755
--- a/var/mongoose/cgi-bin/epg/info.jim
+++ b/var/mongoose/cgi-bin/epg/info.jim
@@ -4,15 +4,11 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set service [cgi_get service 0]
 set event [cgi_get event 0]
-if {! [dict exists $_cgi bare]} { header }
+if {![cgi_exists bare]} header
 
 set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
@@ -135,5 +131,5 @@ puts "
 puts "
"
 
 epg cleanup
-if {! [dict exists $_cgi bare]} { footer }
+if {![cgi_exists bare]} footer
 
diff --git a/var/mongoose/cgi-bin/epg/schedule.jim b/var/mongoose/cgi-bin/epg/schedule.jim
index af0b349..d40c313 100755
--- a/var/mongoose/cgi-bin/epg/schedule.jim
+++ b/var/mongoose/cgi-bin/epg/schedule.jim
@@ -4,22 +4,17 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class system.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
+set service [cgi_get service -]
+set event [cgi_get event -]
+set type [cgi_get type 1]
 
-if {![dict exists $_cgi service] || ![dict exists $_cgi event]} {
+if {$service eq "-" || $event eq "-"} {
 	puts "Error, insufficient parameters passed."
 	exit
 }
 
-set service $_cgi(service)
-set event $_cgi(event)
-set type 1
-if {[dict exists $_cgi type]} { set type $_cgi(type) }
-
 set event [lindex [epg fetch dump -service $service -event $event] 0]
 if {$event eq ""} {
 	puts "Error, cannot find event to schedule."
diff --git a/var/mongoose/cgi-bin/epg/search.jim b/var/mongoose/cgi-bin/epg/search.jim
index 9b35144..1555c9b 100755
--- a/var/mongoose/cgi-bin/epg/search.jim
+++ b/var/mongoose/cgi-bin/epg/search.jim
@@ -4,27 +4,18 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class spinner.class altrow
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
 require totop
 
 puts ""
 
-cgi_input
-#cgi_dump
+set ct [cgi_get ct 0]
+set crid [cgi_get crid ""]
+set scrid [cgi_get scrid ""]
 
-set ct 0
-catch { set ct [dict get $_cgi ct] }
-set crid ""
-catch { set crid [dict get $_cgi crid] }
-set scrid ""
-catch { set scrid [dict get $_cgi scrid] }
-
-if {[dict exists $_cgi term]} {
-	set lterm [dict get $_cgi term]
+if {[cgi_exists term]} {
+	set lterm [cgi_get term]
 
 	if {[string match {CRID:*} $lterm]} {
 		set crid [string range $lterm 5 end]
@@ -47,9 +38,6 @@ require epg_search
 
 require epg_popup
 
-#set _cgi [dict create term "doctor who"]
-#set env(REQUEST_URI) "test"
-
 set cmd "search"
 if {$searchfull} { set cmd "searchall" }
 
diff --git a/var/mongoose/cgi-bin/epg/service.jim b/var/mongoose/cgi-bin/epg/service.jim
index 05195cc..9b3e058 100755
--- a/var/mongoose/cgi-bin/epg/service.jim
+++ b/var/mongoose/cgi-bin/epg/service.jim
@@ -4,9 +4,6 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class spinner.class altrow
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
 require totop
@@ -17,9 +14,6 @@ require totop
 	style "margin: 1em;"
 	}] start
 
-cgi_input
-#cgi_dump
-
 require epg_popup
 
 set service [cgi_get service 4351]
diff --git a/var/mongoose/cgi-bin/restart.jim b/var/mongoose/cgi-bin/restart.jim
index aff2a8f..f673b8e 100755
--- a/var/mongoose/cgi-bin/restart.jim
+++ b/var/mongoose/cgi-bin/restart.jim
@@ -4,10 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require rsv.class system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
+httpheader
 
 if {[cgi_get act] eq "cancel"} {
 	file delete /tmp/.restartpending
diff --git a/var/mongoose/cgi-bin/restartblock.jim b/var/mongoose/cgi-bin/restartblock.jim
index e3de965..7355a8a 100755
--- a/var/mongoose/cgi-bin/restartblock.jim
+++ b/var/mongoose/cgi-bin/restartblock.jim
@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
-puts "Content-Type: text/html"
-puts ""
+source /mod/webif/lib/setup
+httpheader
 
 source /mod/webif/include/restart.jim
 
diff --git a/var/mongoose/cgi-bin/service.jim b/var/mongoose/cgi-bin/service.jim
index 784cb5e..5f10eb6 100755
--- a/var/mongoose/cgi-bin/service.jim
+++ b/var/mongoose/cgi-bin/service.jim
@@ -1,15 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
+source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
-cgi_input
-#cgi_dump
-
-catch { set service [dict get $_cgi service] }
-catch { set action [dict get $_cgi action] }
+set service [cgi_get service]
+set action [cgi_get action]
 
 catch { puts [exec /mod/bin/service $action $service] }
 
diff --git a/var/mongoose/cgi-bin/settings.jim b/var/mongoose/cgi-bin/settings.jim
index 961f70a..f10158f 100755
--- a/var/mongoose/cgi-bin/settings.jim
+++ b/var/mongoose/cgi-bin/settings.jim
@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require settings.class plugin system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 if {[cgi_get act] eq "https"} {
 	if {[cgi_get val off] eq "off"} {
diff --git a/var/mongoose/cgi-bin/status.jim b/var/mongoose/cgi-bin/status.jim
index daea8b8..5bd21e3 100755
--- a/var/mongoose/cgi-bin/status.jim
+++ b/var/mongoose/cgi-bin/status.jim
@@ -10,12 +10,8 @@ if {[string match {*jim} $argv0]} { set runmode cgi }
 set schedtime 1200 
 case $runmode {
     cgi {
-	cgi_input
 	set type [cgi_get type "full"]
-	puts "Content-Type: text/html"
-	puts "Pragma: no-cache"
-	puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-	puts ""
+	httpheader
     }
     cli {
 	set type "full"
diff --git a/var/mongoose/cgi-bin/streamsize.jim b/var/mongoose/cgi-bin/streamsize.jim
index 7133627..e2bfc50 100755
--- a/var/mongoose/cgi-bin/streamsize.jim
+++ b/var/mongoose/cgi-bin/streamsize.jim
@@ -2,7 +2,8 @@
 
 set stream "/mnt/hd3/Streamer_down_file"
 
-puts "Content-type: text/plain\n"
+source /mod/webif/lib/setup
+httpheader "text/plain"
 
 if {[file exists $stream]} {
 	puts -nonewline [file size $stream]
diff --git a/var/mongoose/cgi-bin/xepg.jim b/var/mongoose/cgi-bin/xepg.jim
index 53c0bd0..6d2f9f5 100755
--- a/var/mongoose/cgi-bin/xepg.jim
+++ b/var/mongoose/cgi-bin/xepg.jim
@@ -3,14 +3,10 @@
 package require cgi
 source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
 header
 
 require epg.class spinner.class altrow epg_search totop
 
-cgi_input
-
 puts {
 
 
diff --git a/var/mongoose/html/dedup/dedup.jim b/var/mongoose/html/dedup/dedup.jim
index 72ec64a..bdc10c1 100755
--- a/var/mongoose/html/dedup/dedup.jim
+++ b/var/mongoose/html/dedup/dedup.jim
@@ -4,20 +4,14 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size altrow
 
+header
+
 source normalise.jim
 source process.jim
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
 set dir [cgi_get dir "/media/My Video"]
 set doit [cgi_get doit 0]
 
-header
-
 puts ""
 
 puts "

diff --git a/var/mongoose/html/diag/clearlog.jim b/var/mongoose/html/diag/clearlog.jim
index 154074e..ff4e76d 100755
--- a/var/mongoose/html/diag/clearlog.jim
+++ b/var/mongoose/html/diag/clearlog.jim
@@ -3,15 +3,11 @@
 package require cgi
 source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
 set logdirs {/var/log /mod/tmp /mnt/hd3}
 set logext {.log}
 
-cgi_input
-#cgi_dump
-
 set log [cgi_get file 0]
 
 set ldir [file dirname $log]
diff --git a/var/mongoose/html/diag/diag.jim b/var/mongoose/html/diag/diag.jim
index e7dcebd..0e9e3cd 100755
--- a/var/mongoose/html/diag/diag.jim
+++ b/var/mongoose/html/diag/diag.jim
@@ -4,15 +4,12 @@ package require cgi
 source /mod/webif/lib/setup
 require pretty_size system.class pkg.class
 
-puts "Content-Type: text/html"
-puts ""
+header
 
 pkg loaddiagmeta
 
 set smv [system modversion 1]
 
-header
-
 puts {
 
 
diff --git a/var/mongoose/html/diag/disk.jim b/var/mongoose/html/diag/disk.jim
index 423b452..f2d816f 100755
--- a/var/mongoose/html/diag/disk.jim
+++ b/var/mongoose/html/diag/disk.jim
@@ -4,9 +4,6 @@ package require cgi
 source /mod/webif/lib/setup
 require system.class
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
 set space [system diskspace]
diff --git a/var/mongoose/html/dlna/dlna.jim b/var/mongoose/html/dlna/dlna.jim
index dddd00b..abe125d 100755
--- a/var/mongoose/html/dlna/dlna.jim
+++ b/var/mongoose/html/dlna/dlna.jim
@@ -5,11 +5,6 @@ package require sqlite3
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
 header
 
 #append dmsfile ".rr"
diff --git a/var/mongoose/html/dlna/reset.jim b/var/mongoose/html/dlna/reset.jim
index c0d8826..4f4a2cf 100755
--- a/var/mongoose/html/dlna/reset.jim
+++ b/var/mongoose/html/dlna/reset.jim
@@ -3,8 +3,7 @@
 source /mod/webif/lib/setup
 require system.class
 
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
 set menupath "Settings->System->Internet Setting->Content Share"
 set dbpath "/mnt/hd2/dms_cds.db"
diff --git a/var/mongoose/html/edit/create.jim b/var/mongoose/html/edit/create.jim
index 386161f..5334c84 100755
--- a/var/mongoose/html/edit/create.jim
+++ b/var/mongoose/html/edit/create.jim
@@ -3,14 +3,11 @@
 package require cgi
 source /mod/webif/lib/setup
 
-cgi_input
-#cgi_dump
+httpheader "text/plain"
 
 set file [cgi_get file "/tmp/hosts"]
 if {$file eq "-"} { exit }
 
-puts "Content-Type: text/plain\n"
-
 if {[file exists $file]} {
 	puts ">>> File already exists."
 	exit
diff --git a/var/mongoose/html/edit/edit.jim b/var/mongoose/html/edit/edit.jim
index 69fdbfe..799c0ef 100755
--- a/var/mongoose/html/edit/edit.jim
+++ b/var/mongoose/html/edit/edit.jim
@@ -4,13 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require plugin
 
-puts "Content-Type: text/html"
-puts ""
-
 header
 
-cgi_input
-#cgi_dump
 set file [cgi_get file "/tmp/hosts"]
 
 puts {
diff --git a/var/mongoose/html/edit/files.jim b/var/mongoose/html/edit/files.jim
index c233007..1961d5c 100755
--- a/var/mongoose/html/edit/files.jim
+++ b/var/mongoose/html/edit/files.jim
@@ -3,11 +3,7 @@
 package require cgi
 source /mod/webif/lib/setup
 
-cgi_input
-#cgi_dump
-
-puts "Content-Type: text/html"
-puts ""
+httpheader
 
 set root [cgi_get dir]
 
diff --git a/var/mongoose/html/edit/put.jim b/var/mongoose/html/edit/put.jim
index 66be68f..6c27c0c 100755
--- a/var/mongoose/html/edit/put.jim
+++ b/var/mongoose/html/edit/put.jim
@@ -3,11 +3,7 @@
 package require cgi
 source /mod/webif/lib/setup
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set file [cgi_get file "/tmp/testfile"]
 if {$file eq "-"} { exit }
diff --git a/var/mongoose/html/js/iajax.js b/var/mongoose/html/js/iajax.js
index 2b21942..81f2e0f 100644
--- a/var/mongoose/html/js/iajax.js
+++ b/var/mongoose/html/js/iajax.js
@@ -1,45 +1,38 @@
 
 jQuery.ajaxPrefilter(function(options, _, jqXHR) {
+    if (jQuery.isFunction(options.progress))
+    {
+	var xhrFactory = options.xhr;
+	var interval;
 
-    if (jQuery.isFunction(options.progress)) {
+	options.xhr = function() {
+		var xhr = xhrFactory.apply(this, arguments);
+		var partial = "";
+		var prevcount = 1;
 
-        var xhrFactory = options.xhr,
-            interval;
+		interval = setInterval(function() {
+			var responseText;
+			var jQueryPartial;
 
-        options.xhr = function() {
-            
-            var xhr = xhrFactory.apply(this, arguments),
-                partial = "",
-                prevcount = 1;
+			try {
+				responseText = xhr.responseText;
+	    
+				if (responseText &&
+				    responseText.length > partial.length)
+				{
+					options.progress(
+					    responseText.substring(
+					    partial.length));
+					partial = responseText;
+				}
+			} catch(e) {
+				if (window.console)
+					console.log(e);
+			}
+		}, options.progressInterval);
 
-            interval = setInterval(function() {
-
-                var responseText,
-                    jQueryPartial;
-
-                try {
-
-                    responseText = xhr.responseText;
-                    
-                    if (responseText && (responseText.length > partial.length))
-		    {
-
-                        partial = responseText;
-                        jQueryPartial = $(partial).filter("*")
-
-                        if (jQueryPartial.length > prevcount) {
-                            prevcount = jQueryPartial.length;
-                            options.progress(jQueryPartial.filter("*:not(:last)"));
-                        }
-                    }
-                } catch(e) {
-		    if (window.console)
-			    console.log(e);
-                }
-            }, options.progressInterval);
-
-            return xhr;
-        };
+		return xhr;
+	};
         function stop()
 	{
             if (interval)
diff --git a/var/mongoose/html/pkg/pkg.jim b/var/mongoose/html/pkg/pkg.jim
index f5eeafc..47c65f0 100755
--- a/var/mongoose/html/pkg/pkg.jim
+++ b/var/mongoose/html/pkg/pkg.jim
@@ -6,14 +6,7 @@ require settings.class pkg.class altrow
 
 if {[[settings] pkgdev]} { set filter 0 } else { set filter 1 }
 
-puts "Content-Type: text/html"
-puts "Pragma: no-cache"
-puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-puts ""
-
-cgi_input
-#cgi_dump
-if {![dict exists $_cgi type]} { set _cgi(type) avail }
+httpheader
 
 proc pkgrow {pkg} {
 	set name [$pkg get name]
@@ -60,7 +53,7 @@ proc pkgrow {pkg} {
 
 pkg loadmeta
 
-set type $_cgi(type)
+set type [cgi_get type "avail"]
 
 set pkgs [pkg $type]
 
diff --git a/var/mongoose/html/pkg/script.js b/var/mongoose/html/pkg/script.js
index 2df8e65..7248dbe 100644
--- a/var/mongoose/html/pkg/script.js
+++ b/var/mongoose/html/pkg/script.js
@@ -66,17 +66,19 @@ $(document).ready(function() {
 
 	function loaddata(data, isfinal)
 	{
-		//console.log('loaddata called, final=' + isfinal);
-		//console.log('Data: ' + data);
-		$('#dresults').append(data);
+		if (window.console)
+		{
+			console.log('loaddata called, final=' + isfinal);
+			console.log('Data: ' + data);
+		}
 		if (isfinal)
 		{
+			$('#dresults').text(data);
 			$('#dspinner').hide('slow');
-			if (!$('#dresults').text())
-				$('#dresults').append('Nothing to do.');
-			else
-				$('#complete').show('slow');
+			$('#complete').show('slow');
 		}
+		else
+			$('#dresults').append(data);
 	}
 
 	function execopkg(arg, pkg)
@@ -95,20 +97,16 @@ $(document).ready(function() {
 		$('#dialogue').attr('pkg', pkg);
 		$dialog.dialog('open');
 
-//		$('#dresults').load(opkg + arg, function() {
-//			$('#dspinner').hide('slow');
-//		});
-
 		$.ajax({
 			type: "GET",
 			url: opkg + arg,
 			progress: loaddata,
 			success: function(data) {
-				//console.log("ajax success");
 				loaddata(data, true);
 			},
 			error: function(_, _, e) {
-				//console.log("ajax error");
+				if (window.console)
+					console.log("ajax error");
 				alert(e);
 			}
 		});
diff --git a/var/mongoose/html/play/play.jim b/var/mongoose/html/play/play.jim
index ab68d9e..59dff87 100755
--- a/var/mongoose/html/play/play.jim
+++ b/var/mongoose/html/play/play.jim
@@ -4,11 +4,6 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
-puts "Content-Type: text/html\r\n"
-
-cgi_input
-#cgi_dump
-
 header
 
 set rfile [cgi_get file]
diff --git a/var/mongoose/html/sched/ar.jim b/var/mongoose/html/sched/ar.jim
index 405f964..e61bfa1 100755
--- a/var/mongoose/html/sched/ar.jim
+++ b/var/mongoose/html/sched/ar.jim
@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require rsv.class system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set slot [cgi_get slot 0]
 set table [cgi_get table TBL_RESERVATION] 
diff --git a/var/mongoose/html/sched/cancel.jim b/var/mongoose/html/sched/cancel.jim
index edd4b5e..1b05fc0 100755
--- a/var/mongoose/html/sched/cancel.jim
+++ b/var/mongoose/html/sched/cancel.jim
@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require rsv.class system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set slot [cgi_get slot 0]
 set table [cgi_get table TBL_RESERVATION] 
diff --git a/var/mongoose/html/sched/folder.jim b/var/mongoose/html/sched/folder.jim
index d975449..a378782 100755
--- a/var/mongoose/html/sched/folder.jim
+++ b/var/mongoose/html/sched/folder.jim
@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require rsv.class system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set slot [cgi_get sid 0]
 set table [cgi_get table TBL_RESERVATION] 
diff --git a/var/mongoose/html/sched/info.jim b/var/mongoose/html/sched/info.jim
index 2691754..929de5c 100755
--- a/var/mongoose/html/sched/info.jim
+++ b/var/mongoose/html/sched/info.jim
@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require rsv.class progressbar epg.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set table [cgi_get table TBL_RESERVATION]
 set slot [cgi_get slot 0]
diff --git a/var/mongoose/html/sched/pad.jim b/var/mongoose/html/sched/pad.jim
index 4e37066..72d4c49 100755
--- a/var/mongoose/html/sched/pad.jim
+++ b/var/mongoose/html/sched/pad.jim
@@ -4,11 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require rsv.class system.class
 
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
+httpheader
 
 set slot [cgi_get slot 0]
 set table [cgi_get table TBL_RESERVATION] 
diff --git a/var/mongoose/html/sched/sched.jim b/var/mongoose/html/sched/sched.jim
index 9bb75af..67c1341 100755
--- a/var/mongoose/html/sched/sched.jim
+++ b/var/mongoose/html/sched/sched.jim
@@ -4,8 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require altrow rsv.class progressbar epg.class system.class
 
-puts "Content-Type: text/html"
-puts ""
+header
 
 set svcmap {}
 lmap i \
@@ -14,8 +13,6 @@ lmap i \
 	set svcmap([lindex $i 1]) [lindex $i 3]
     }
 
-header
-
 require epg_popup
 
 puts {
diff --git a/var/mongoose/lib/chunked b/var/mongoose/lib/chunked
index 5ff5392..ff3427f 100755
--- a/var/mongoose/lib/chunked
+++ b/var/mongoose/lib/chunked
@@ -11,8 +11,7 @@ proc chunk_pad {{len 256}} {
 }
 
 proc start_chunked {{type "text/html"}} {
-	puts -nonewline "Content-Type: $type\r\n"
-	puts -nonewline "Transfer-Encoding: chunked\r\n\r\n"
+	httpheader $type 0 "Transfer-Encoding: chunked\r\n"
 }
 
 proc end_chunked {} {
diff --git a/var/mongoose/lib/setup b/var/mongoose/lib/setup
index 3fc06f8..70c913f 100644
--- a/var/mongoose/lib/setup
+++ b/var/mongoose/lib/setup
@@ -9,7 +9,23 @@ if {![exists -proc require]} {
 		}
 	}
 
-	proc header {} {
+	proc httpheader {{type "text/html"} {cache 0} {extra ""}} {{done 0}} {
+		if {$done} return
+		if {!$cache} {
+			puts -nonewline "Content-Type: $type; no-cache\r\n"
+			puts -nonewline "Expires: -1\r\n"
+			puts -nonewline "Pragma: no-cache\r\n"
+			puts -nonewline "Cache-Control: no-cache\r\n"
+		} else {
+			puts "Content-Type: $type\r\n"
+		}
+		puts -nonewline $extra
+		puts -nonewline "\r\n"
+		set done 1
+	}
+
+	proc header {{type "text/html"} {cache 0}} {
+		httpheader $type $cache
 		uplevel source /mod/webif/html/lib/header.jim
 	}
 
diff --git a/var/mongoose/lib/ts.class b/var/mongoose/lib/ts.class
index 426c235..2775de0 100644
--- a/var/mongoose/lib/ts.class
+++ b/var/mongoose/lib/ts.class
@@ -172,7 +172,7 @@ ts method settitle {newtitle} {
 }
 
 ts method setsynopsis {newsynopsis} {
-	if {[string length newsynopsis] > 48} { return }
+	if {[string length newsynopsis] > 252} { return }
 
 	exec /mod/bin/hmt "+setsynopsis=${newsynopsis}" $file
 }