tag 0.7.1

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/tags/0.7.1@411 2a923420-c742-0410-a762-8d5b09965624

CONTROL/control

@@ -1,9 +1,11 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.10.0
+Version: 0.7.1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.0.3),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2)
-Suggests: ffmpeg
+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
+Replaces: af123-webif
+Conflicts: af123-webif
+Suggests: ffmpeg,webif-iphone
 Description: An evolving web interface for the Humax.

CONTROL/postinst

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-export tmpf=/tmp/cronf.$$
-
-# Add cron jobs
-
-crond=$PKG_ROOT/var/spool/cron/crontabs
-[ -d $crond ] || exit 1
-
-cronf=$crond/root
-grep -v webif/lib/bin/auto $cronf > $tmpf
-(
-	cat $tmpf
-	echo '*/10 * * * * /mod/webif/lib/bin/auto >> /tmp/webif_auto.log 2>&1'
-) > $cronf
-
-# Add anacron jobs
-
-ana=$PKG_ROOT/etc/anacrontab
-grep -v 'backup/backup.jim' $ana > $tmpf
-(
-	cat $tmpf
-	echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim"
-) > $ana
-
-$PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
-
-exit 0
-

CONTROL/prerm

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-export tmpf=/tmp/cronf.$$
-
-cronf=$PKG_ROOT/var/spool/cron/crontabs/root
-if [ -f $cronf ]; then
-	grep -v webif/lib/bin/auto $cronf > $tmpf
-	cp $tmpf $cronf
-	[ -s $cronf ] || rm -f $cronf
-fi
-
-ana=/mod/etc/anacrontab
-grep -v 'backup/backup.jim' $ana > $tmpf
-cp $tmpf $ana
-
-exit 0
-

bin/status

@@ -1 +0,0 @@
-../webif/cgi-bin/status.jim

etc/init.d/S60parseepg

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ -f /mnt/hd1/dvbepg/epg.dat ]; then
-	epg=/mnt/hd1/dvbepg/epg.dat
-	epgdb=/mnt/hd1/epg.db
-else
-	epg=/media/drive1/epgsavedata
-	epgdb=/media/drive1/epg.db
-fi
-
-case "$1" in
-	start)
-		/mod/bin/epg -f $epg sqlitedumpd $epgdb > /tmp/epgd.log &
-		;;
-	stop)
-		killall -q epg
-		;;
-	*)
-		exit 1
-		;;
-esac
-
-exit 0
-

var/mongoose/cgi-bin/backup/backup.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 
 require rsv.class
 
@@ -13,23 +13,12 @@ puts ""
 cgi_input
 #cgi_dump
 
-set now [clock seconds]
-set file [file tail [cgi_get file \
-    [clock format $now -format "auto-%Y-%b-%d-%H:%M"]]]
-
-if {[string match {auto-*} $file]} {
-	# Delete any automatic backups over 7 days old.
-	set mt $(15 * 86400)
-	foreach af [glob -nocomplain "$dir/auto-*"] {
-		set aft [file mtime $af]
-		set diff $($now - $aft)
-		if {$diff > $mt} {
-			puts "Removing $af"
-			file delete $af 
-		}
-	}
+if {![dict exists $_cgi file]} {
+	puts "No filename supplied."
+	exit
 }
 
+set file [file tail [dict get $_cgi file]]
 set ffile "/$dir/$file.rbk"
 
 if {[file exists $ffile]} {
@@ -68,17 +57,16 @@ set grp 0
 foreach res [$rsvdb query {
 	select	eFavGroup,
 		TBL_FAV.eSvcType,
-		substr(szSvcName, 2) as szSvcName,
-		favIdx
+		substr(szSvcName, 2) as szSvcName
 	from TBL_FAV join TBL_SVC using (hSvc)
-	order by eFavGroup, favIdx
+	order by eFavGroup
     }] {
 	if {$res(eFavGroup) != $grp} {
 		set grp $res(eFavGroup)
 		puts "  Group $grp"
 	}
 	puts "    $res(szSvcName)"
-	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)\t$res(favIdx)"
+	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)"
 }
 puts "Done."
 

var/mongoose/cgi-bin/backup/backup.js

@@ -7,8 +7,6 @@ function refresh_files()
 			    .button('option', 'disabled', false);
 			$('#delete_button').removeAttr('disabled')
 			    .button('option', 'disabled', false);
-			$('#view_button').removeAttr('disabled')
-			    .button('option', 'disabled', false);
 		});
 	});
 }
@@ -29,7 +27,7 @@ $(document).ready(function() {
 		});
 	});
 	$('#delete_button').click(function() {
-		var backup = $('input.restore:checked').val();
+		var backup = $('input.restore').val();
 		if (confirm('Confirm deletion of ' + backup))
 		{
 			$('#results').load('/cgi-bin/backup/delete.jim?' +
@@ -40,17 +38,8 @@ $(document).ready(function() {
 			});
 		}
 	});
-	$('#view_button').click(function() {
-		var backup = $('input.restore:checked').val();
-		$('#results').load('/cgi-bin/backup/view.jim?' +
-		    $('input.restore').serialize(), function() {
-			$('#results').slideDown(function() {
-				refresh_files();
-			});
-		});
-	});
 	$('#restore_button').click(function() {
-		var backup = $('input.restore:checked').val();
+		var backup = $('input.restore').val();
 		if (confirm('!!!!!!!!!!!!!!!!!!!!!!!!! PLEASE CONFIRM !!!!!!!!!!!!!!!!!!!!!!!!!\n\nAre you sure you wish to erase all scheduled recordings and favourite channels and then restore them from\n' + backup + '?'))
 		{
 			$('#restore_working').slideDown();

var/mongoose/cgi-bin/backup/delete.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 
 set dir /mod/var/backup
 

var/mongoose/cgi-bin/backup/files.jim

@@ -20,18 +20,7 @@ if {![file isdirectory $dir]} {
 	exit
 }
 
-proc s_time {a b} {
-	file stat $a l
-	set at $l(ctime)
-	file stat $b l
-	set bt $l(ctime)
-
-	if {$at < $bt} { return -1 }
-	if {$at > $bt} { return 1 }
-	return 0
-}
-
-set backups [lsort -command s_time [glob -nocomplain "$dir/*.rbk"]]
+set backups [glob -nocomplain "$dir/*.rbk"]
 
 if {![llength $backups]} {
 	empty

var/mongoose/cgi-bin/backup/restore.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 
 require rsv.class findhsvc system.class
 
@@ -53,9 +53,6 @@ foreach line $data {
 		lappend vars $f [lindex $vals $i]
 	}
 
-	# Don't restore DSO events.
-	if {$vars(ersvtype) == 11} { continue }
-
 	set rsv [rsv new $vars]
 
 	# Need to fix up channel and CRID mappings in case something has
@@ -92,14 +89,6 @@ puts "Restoring favourite channels..."
 $rsvdb query {begin transaction;}
 $rsvdb query {delete from channel.TBL_FAV}
 
-$rsvdb query {drop table if exists pending.fav}
-$rsvdb query {create table pending.fav (
-		favIdx integer primary key autoincrement unique,
-		hSvc integer(4),
-		eFavGroup integer(4),
-		[eSvcType] integer(4)
-	)}
-
 set grp 0
 foreach line $data {
 	set vals [split $line "\t"]
@@ -108,8 +97,6 @@ foreach line $data {
 	set group [lindex $vals 1]
 	set type [lindex $vals 2]
 	set chan [lindex $vals 3]
-	set idx [lindex $vals 4]
-	if {$idx eq ""} { set idx 0 }
 	set hsvc [get_channel_attr $chan]
 
 	if {$grp != $group} {
@@ -119,14 +106,14 @@ foreach line $data {
 
 	puts "    $chan"
 
-	if {$hsvc eq ""} {
+	if {!$hsvc} {
 		puts "        Cannot map channel name to service."
 		continue
 	}
 
 	set query "
-		insert into pending.fav(favIdx, hSvc, eFavGroup, eSvcType)
-		values($idx, $hsvc, $group, $type);
+		insert into channel.TBL_FAV(hSvc, eFavGroup, eSvcType)
+		values($hsvc, $group, $type);
 	"
 
 	$rsvdb query $query

var/mongoose/cgi-bin/backup/view.jim

@@ -1,60 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-require rsv.class findhsvc
-
-set dir /mod/var/backup
-
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
-#set _cgi(restore_file) "backup-2011-Jul-09-20:37"
-
-if {![dict exists $_cgi restore_file]} {
-	puts "No filename supplied."
-	exit
-}
-
-set file [file tail [dict get $_cgi restore_file]]
-set ffile "/$dir/$file.rbk"
-
-if {![file exists $ffile]} {
-	puts "Backup file <i>$file</i> does not exist."
-	exit
-}
-
-if {[catch { set fd [open $ffile r] } msg]} {
-	puts "Error opening <i>$file</i> - $msg"
-	exit
-}
-
-puts "Listing scheduled events from <i>$file</i>..."
-
-set fields [lsort [[rsv] vars]]
-
-set data [split [read $fd] "\n"]
-
-foreach line $data {
-	set vals [split $line "\t"]
-	if {[lindex $vals 0] ne "event"} { continue }
-	set vars {}
-	set i 0
-	foreach f $fields {
-		if {$f eq "aulEventToRecordInfo"} { continue }
-		incr i
-		lappend vars $f [lindex $vals $i]
-	}
-
-	set rsv [rsv new $vars]
-
-	puts "  [$rsv name] ([$rsv channel_name])"
-}
-
-close $fd
-rsv cleanup
-

var/mongoose/cgi-bin/browse.jim

@@ -1,93 +1,45 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size system.class settings.class escape browse.class
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
 
 puts "Content-Type: text/html"
 puts ""
 
-set nicesplice [system pkginst nicesplice]
-set flatten [system pkginst flatten]
-
-set ignore {.nts .thm .hmi}
-set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}
+set ignore {.nts .thm .hmt .hmi}
+set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
 
 cgi_input
 #cgi_dump
 
-if {![dict exists $env REQUEST_URI]} {
-	set env(REQUEST_URI) ""
-	set _cgi(dir) "/media/My Video/"
-}
+#set env(REQUEST_URI) ''
+#set _cgi(dir) "/media/My Video/Chuggington"
 
-if {![dict exists $env QUERY_STRING]} { set env(QUERY_STRING) "root" }
-
-set order [cgi_get order -]
-if {$order eq "-"} {
-	set order [[settings new] sortorder]
-} else {
-	[settings new] sortorder $order
-}
-
-set model [system model]
-set dustbin [system dustbin 1]
-
-proc icon {img {hover ""} {extra ""} {class "va"}} {
-	puts -nonewline "<img src=$img class=\"$class\" height=21 $extra"
-	if {$hover ne ""} {
-		puts -nonewline " alt=\"$hover\" title=\"$hover\""
-	}
-	puts ">"
-}
-
-proc directory {file bfile tbfile} {
+proc directory {file bfile} {
+	regsub -all " +" $bfile "" tbfile
 	puts "<div class=va>"
-	set img "/images/711_1_09_Media_Folder.png"
-	if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" }
-	puts "<img border=0 class=va id=\"img$tbfile\" src=$img>"
-	puts "<input class=\"fs fsdir\" type=checkbox>"
-	puts "<a class=dbf
-	    href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
-	    file=\"[cgi_quote_url $file]\">"
+	puts "<a href=$::env(REQUEST_URI)?dir=[cgi_quote_url $file]>"
+	puts "<img border=0 class=va id=\"img$tbfile\"
+	    src=/images/711_1_09_Media_Folder.png>"
 	puts "$bfile</a><span class=filesize id=\"$tbfile\">
-		</span>"
-
-	lassign [{dir iconset} $file] icons attrs
-
-	puts [join $icons ""]
-
-	puts -nonewline "
-	      <a href=#>
-		<img class=\"dopt va\" border=0 width=45 "
-	puts -nonewline [join $attrs " "]
-	puts "
-		    src=/images/181_1_00_Help5_OPT_Plus.png>
-	      </a>
-	"
-
-	puts "
-	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
-	"
-	puts "</div>"
+		</span></div>"
 }
 
 proc entry {file} {{i 0}} {
 	set bfile [file tail $file]
-	regsub -all " +" $bfile "" tbfile
 	if {[string index $bfile 0] == "\025"} {
 		set bfile [string range $bfile 1 end]
 	}
 	if [file isdirectory "$file"] {
-		directory $file $bfile $tbfile
-		return
+		directory $file $bfile
+		continue
 	}
 	set ext [file extension $file]
-	if {$ext in $::ignore || $ext ni $::include} { return }
+	if {$ext in $::ignore || $ext ni $::include} { continue }
 
 	file stat $file st
-	set rsz $st(size)
-	set sz [pretty_size $rsz]
+	set sz [pretty_size $st(size)]
 
 	set base [file rootname $file]
 
@@ -95,45 +47,31 @@ proc entry {file} {{i 0}} {
 		set type ts
 		set ts [ts fetch $file 1]
 		set img Video_TS
-		set omenu opt
-	} elseif {$ext eq ".hmt"} {
-		if {[file exists "${base}.ts"]} { continue }
-		# Sole hmt file indicates failure to track.
-		set type bad
-		set ts 0
-		set img Video_Failed
-		set omenu oopt
 	} else {
 		set type gen
 		set ts 0
 		set img Video_Other
-		set omenu oopt
-	}
-
-	set new 0
-	if {$type eq "ts"} {
-		if {[$ts flag "New"] > 0} { set new 1 }
-	} elseif {$type eq "gen"} {
-		if {![file exists "${base}.hmi"]} { set new 1 }
-	}
-
-	if {$new} { append img _New }
-
-	set fscl "fs"
-	set synopsis ""
-	if {$type eq "ts"} {
-		set fscl "fs fsts"
-		set synopsis [cgi_quote_html [$ts get synopsis]]
 	}
 
 	puts "
 	    <div class=\"va bf\" id=[incr i]>
-		<img class=va border=0 src=/img/$img.png>
-		<input class=\"$fscl\" type=checkbox>
-		<a class=bf title=\"$synopsis\"
-		    file=\"[cgi_quote_url $file]\" type=$type href=#>
-		    $bfile
-	        </a>
+	      <a class=bf file=\"$file\" type=$type href=#>
+	"
+
+	set new 0
+	if {$type eq "ts"} {
+		if {[$ts flag "New"] > 0} { set new 1 }
+	} else {
+		if {![file exists "[file rootname $file].hmi"]} { set new 1 }
+	}
+
+	if {$new} { append img _New }
+
+	puts "<img class=va border=0 src=/img/$img.png>"
+
+	puts "
+		$bfile
+	      </a>
 	"
 
 	# Size
@@ -143,10 +81,7 @@ proc entry {file} {{i 0}} {
 
 	set locked 0
 	set encd 0
-	set odencd 1
 	set def unknown
-	set bx 0
-	set dlna 0
 	if {$type eq "ts"} {
 		# HD / SD
 		if {[$ts get definition] eq "HD"} {
@@ -156,53 +91,37 @@ proc entry {file} {{i 0}} {
 			set def SD
 			set img "172_1_26_SD"
 		}
-		icon "/images/$img.png"
+		puts "<img class=va src=/images/$img.png height=21>"
 
 		# Locked
 		if {[$ts flag "Locked"] > 0} {
 			set locked 1
-			icon "/images/178_1_00_Icon_Lock.png" "Locked"
+			puts "<img class=va src=/images/178_1_00_Icon_Lock.png
+			    height=21>"
 		}
 
 		# Encrypted
 		if {[$ts flag "Encrypted"] > 0} {
 			set encd 1
-			icon "/images/749_1_26_Video_Encryption.png" ""
-		}
-		if {![$ts flag "ODEncrypted"]} {
-			set odencd 0
-			icon "/img/Decrypted.png" "Decrypted"
+			puts "<img class=va
+			    src=/images/749_1_26_Video_Encryption.png
+			    height=21>"
 		}
 
 		# Guidance
 		if {[$ts flag "Guidance"] > 0} {
-			icon "/images/174_1_26_GuidancePolicy.png"
+			puts "<img class=va
+			    src=/images/174_1_26_GuidancePolicy.png
+			    height=21>"
 		}
-
-		# Indexed
-		if {$::model eq "HDR" && [llength [$ts dlnaloc]]} {
-			icon "/img/dlna.png" "Indexed by DLNA Server"
-			set dlna 1
-		}
-
-		# Shrunk (shown when necessary via Ajax)
-		icon "/img/compress.png" "Shrunk" \
-		    "id=\"sp_$tbfile\"" "va hidden"
-		# Timeshifted (shown when necessary via Ajax)
-		icon "/img/clock.png" "Time-shifted Recording" \
-		    "id=\"tsr_$tbfile\"" "va hidden"
-
-		set bx [$ts get bookmarks]
 	}
 
 	# Opt+ button
 
 	puts "
 	      <a href=#>
-		<img class=\"$omenu va\" border=0 width=45 type=$type did=$i
-		    locked=$locked encd=$encd def=$def new=$new bx=$bx
-		    rsize=$rsz
-		    odencd=$odencd dlna=$dlna
+		<img class=\"opt va\" border=0 width=45 type=$type did=$i
+		    locked=$locked encd=$encd def=$def new=$new
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
 	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
@@ -210,7 +129,11 @@ proc entry {file} {{i 0}} {
 	puts "</div>"
 }
 
-set dir [cgi_get dir [system mediaroot]]
+if {[dict exists $_cgi dir]} {
+	set dir [dict get $_cgi dir]
+} else {
+	set dir "/media/My Video"
+}
 
 ######################################################################
 # Render web page
@@ -219,23 +142,66 @@ header
 
 puts { 
 	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
-	<script type=text/javascript src=/js/jquery.contextMenu.js></script>
-	<link href=/css/jquery.bar.css rel=stylesheet type=text/css />
-	<script type=text/javascript src=/js/jquery.bar.js></script>
-	<script type=text/javascript src=/js/enadis.js></script>
+	<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
+
+	<ul id=optmenu class=contextMenu>
+		<li><a href=#delete>Delete</a></li>
+		<li><a href=#lock>Toggle Lock</a></li>
+		<li><a href=#enc>Toggle Enc</a></li>
+		<li><a href=#new>Toggle New</a></li>
+		<li><a href=#rename>Rename</a></li>
+		<li><a href=#download>Download</a></li>
+	</ul>
+
+	<div id=renameform title="Rename media file" style="display: none">
+		<form id=renameform_form>
+		<input type=hidden name="renameorig" id="renameorig" value="">
+		<input type=hidden name="titleorig" id="titleorig" value="">
+		<table border=0>
+		<tr>
+		<th>
+			<label for="rename">
+				<b>New Filename</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="rename" id="rename"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<th>
+			<label for="renametitle" style="padding-top: 0.5em">
+				<b>New EPG Title</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="renametitle" id="renametitle"
+			    value="" size=70 maxlength=48
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<td colspan=2 id=synopsis style="font-style: italic"></td>
+		</tr>
+		</table>
+		</form>
+	</div>
+
+	<div id=dialogue></div>
+	<div id=confirm title="Confirmation Required"></div>
+
 	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
-	<link type=text/css rel=stylesheet href=/cgi-bin/browse/style.css />
 }
 
-source browse/assets.jim
-
-puts "
-	<span style=\"display:none\" id=dir>$dir</span>
-      <fieldset class=cleft style=\"margin: 0 1em 1em 1em\">
-      <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
-"
+puts "<span style=\"display:none\" id=dir>$dir</span>"
 
 # Breadcrumb path
+puts "
+      <fieldset style=\"margin: 1em\">
+      <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
+"
 set stub ""
 foreach part [split $dir /] {
 	if {$stub eq "/"} { set name $part } else { set name "/$part" }
@@ -257,113 +223,14 @@ if {$parent ne ""} {
 	"
 }
 
-proc s_time {a b} {
-	global dir
+# Strip double slashes
+regsub -all -- {\/+} "$dir/*" "/" dir
 
-	set a "$dir/$a"
-	set b "$dir/$b"
-
-	set ad [file isdirectory $a]
-	set bd [file isdirectory $b]
-
-	if {$ad && !$bd} { return -1 }
-	if {$bd && !$ad} { return 1 }
-	if {$ad && $bd} {
-		if {$a < $b} { return -1 }
-		if {$a > $b} { return 1 }
-		return 0
-	}
-
-	if {[catch {file stat $a l}]} { return 0}
-	set at $l(ctime)
-	if {[catch {file stat $b l}]} { return 0}
-	set bt $l(ctime)
-
-	if {$at < $bt} { return -1 }
-	if {$at > $bt} { return 1 }
-	return 0
+foreach file [lsort [glob -nocomplain "$dir"]] {
+	entry $file
 }
 
-set files [readdir -nocomplain $dir]
-switch $order {
-	1 {		set files [lsort -command s_time $files] }
-	default {	set files [lsort $files] }
-}
-
-foreach file $files { entry "$dir/$file" }
-
-puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
-
-# Sort icons
-puts "<div id=sortdiv>"
-set sortlist {{0 sort_name name} {1 sort_date date}}
-foreach sl $sortlist {
-	lassign $sl index img descr
-
-	if {$index} { puts "  |  " }
-
-	set tag "Currently sorting"
-	if {$order != $index} {
-		puts "
-		    <a href=$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index>"
-		set tag "Sort"
-	}
-	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"
-	if {$order != $index} {
-		puts "</a>"
-	}
-}
-puts "</div>"
-
 puts "</fieldset>"
 
-puts {
-<fieldset class=left style="margin: 0 1em 1em 1em">
-<legend style="font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em; color: #1e5bbd;">
-File Clipboard
-</legend>
-<div id=clipboard>
-<img src=/img/loading.gif> <i>Loading...</i>
-</div>
-</fieldset>
-}
-
-puts "<div class=brow>"
-
-puts {
-<button id=copy>Copy</button>
-<button id=cut>Cut</button>
-<button id=delete>Delete</button>
-<button id=newdir>New Folder</button>
-<div id=deletewait class=blood style="display: none">
-<img src=/img/loading.gif>Deleting may take some time, please be patient...
-</div>
-}
-
-# Join
-if $nicesplice {
-	puts { <button id=join>Join</button> }
-}
-
-puts "</div><div class=brow style=\"margin-top: 3px\">"
-
-# De-duplicate
-
-puts {
-	<button id=dedup>De-duplicate/tidy this folder</button>
-}
-
-# Streamer file
-
-if {[file exists /mnt/hd3/Streamer_down_file]} {
-		puts {
-	<button id=save_stream file=/mnt/hd3/Streamer_down_file>
-		Save last streamed content (e.g. iPlayer/YouTube)
-	</button>
-	}
-}
-
-puts "</div>"
-
 footer
 

var/mongoose/cgi-bin/browse/assets.jim

@@ -1,184 +0,0 @@
-#!/mod/bin/jimsh
-
-puts {
-
-<div id=jbar></div>
-
-<ul id=optmenu class=contextMenu style="width: 160px">
-	<li class=delete><a href=#delete>Delete</a></li>
-	<li class=cut><a href=#cut>Cut to clipboard</a></li>
-	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
-
-	<li class=separator><a href=#rename>Rename</a></li>
-	<li><a href=#download>Download</a></li>
-
-}
-if {$model eq "HDR"} {
-	puts { <li class="separator decrypt"><a href=#decrypt>Decrypt</a></li> }
-	puts { <li class="compress"><a href=#strip>Shrink</a></li> }
-} else {
-	puts { <li class="compress separator"><a href=#strip>Shrink</a></li> }
-}
-if {[system pkginst ffmpeg]} {
-	puts {
-		<li><a href=#audio>Extract Audio</a></li>
-		<li><a href=#mpg>Extract to MPG</a></li>
-	}
-}
-if $nicesplice {
-	puts {
-		<li class="cut"><a href=#crop>Crop</a></li>
-		<li class="cut"><a href=#chunk>Split (45m parts)</a></li>
-	}
-}
-puts {
-	<li class=separator><a href=#lock>Toggle Lock</a></li>
-	<li><a href=#new>Toggle New</a></li>
-</ul>
-
-<ul id=ooptmenu class=contextMenu style="width: 160px">
-	<li class=delete><a href=#delete>Delete</a></li>
-	<li class=cut><a href=#cut>Cut to clipboard</a></li>
-	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
-
-	<li class=separator><a href=#rename>Rename</a></li>
-	<li><a href=#download>Download</a></li>
-</ul>
-
-<ul id=doptmenu class=contextMenu style="width: 180px">
-	<li class=delete><a href=#delete>Delete</a></li>
-	<li class=cut><a href=#cut>Cut to clipboard</a></li>
-	<li class=pwcopy><a href=#copy>Copy to clipboard</a></li>
-	<li class=pwpaste><a href=#paste>Paste to folder</a></li>
-	<li class=separator><a href=#rename>Rename</a></li>
-	<li class=separator><a href=#resetnew>Reset new flag</a></li>
-	<li class="separator compress"><a href=#shrink>Auto-Shrink</a></li>
-	<li class=dedup><a href=#dedup>Auto-Dedup</a></li>
-}
-if {$model eq "HDR"} {
-	puts { <li class=decrypt><a href=#decrypt>Auto-Decrypt</a></li> }
-}
-if $flatten {
-	puts { <li class="separator"><a href=#flat>No-Flatten</a></li> }
-}
-
-puts {
-</ul>
-
-<div id=renameform title="Rename media file" style="display: none">
-	<form id=renameform_form>
-	<input type=hidden name="renameorig" id="renameorig" value="">
-	<input type=hidden name="titleorig" id="titleorig" value="">
-	<table border=0>
-	<tr>
-	<th>
-		<label for="rename">
-			<b>New Filename</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="rename" id="rename"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	<tr style="display: none" class=tstype>
-	<th>
-		<label for="renametitle" style="padding-top: 0.5em">
-			<b>New Medialist Title</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="renametitle" id="renametitle"
-		    value="" size=70 maxlength=48
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	<tr style="display: none" class=tstype>
-	<td colspan=2 id=synopsis style="font-style: italic"></td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=drenameform title="Rename directory" style="display: none">
-	<form id=drenameform_form>
-	<input type=hidden name="renameorig" id="drenameorig" value="">
-	<table border=0>
-	<tr>
-	<th>
-		<label for="drename">
-			<b>New Directory Name</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="rename" id="drename"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=savestreamform title="Save streamed content"
-    style="display: none">
-	<div class=pre id=savestream_detail></div>
-	<form id=savestream_form>
-}
-puts "<input type=hidden name=dir value=\"$dir\">"
-puts {
-	<table border=0>
-	<tr>
-	<th>
-		<label for="savestream_name">
-			<b>Filename</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="savestream_name"
-		    id="savestream_name"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-		<img id=savestream_spin src=/img/loading.gif>
-	</td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=newdirform title="New Folder" style="display: none">
-	<form id=newdirform_form>
-}
-puts "<input type=hidden name=dir value=\"$dir\">"
-puts {
-	<table border=0>
-	<tr>
-	<th>
-		<label for="newdirname">
-			<b>New Folder Name</b>
-		</label>
-	</th>
-	<td>
-		<input type=text name="newdirname" id="newdirname"
-		    value="" size=70 maxlength=255
-		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
-	</table>
-	</form>
-</div>
-
-<div id=dialogue></div>
-<div id=confirm title="Confirmation Required"></div>
-<div id=pwdialogue style="display: none">
-<center>
-<img src=/img/loading.gif>
-<br><br>
-Please wait...
-<div id=pwfeedback></div>
-</center>
-</div>
-
-}
-

var/mongoose/cgi-bin/browse/audio/audio.jim

@@ -1,52 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=audio.js></script>
-
-<fieldset class=cleft>
-<legend>Audio Extraction</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-</table>
-
-<span class=hidden id=params
-    dir=\"[cgi_quote_url $dir]\"
-    rfile=\"[cgi_quote_url $rfile]\"
-></span>
-
-<div id=audiodiv style=\"padding: 1em\">
-<button id=audioit>Perform audio extraction</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Extracting audio: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

var/mongoose/cgi-bin/browse/audio/audio.js

@@ -1,35 +0,0 @@
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim?file=' + $('#params').attr('rfile'),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#audioit').button().click(function() {
-	$('#audiodiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load('execute.jim?file=' + $('#params').attr('rfile'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

var/mongoose/cgi-bin/browse/audio/execute.jim

@@ -1,39 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-set xstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set shname [file tail $base]
-puts "Processing $shname"
-
-puts [exec /mod/bin/ffmpeg -y -benchmark -v 0 \
-    -i $rfile -f mp3 \
-    -vn -acodec copy "${base}.mp3"]
-
-if {[system pkginst id3v2]} {
-	puts [exec /mod/bin/id3v2 \
-	    --song "[$ts get title]" \
-	    --comment "[$ts get synopsis]" \
-	    --album "[$ts get channel_name]" \
-	    --year "[clock format [$ts get start] -format {%Y}]" \
-	    "${base}.mp3"]
-}
-
-set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
-puts "Time taken: $xtime"
-

var/mongoose/cgi-bin/browse/audio/progress.jim

@@ -1,26 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-set bfile [file rootname $rfile]
-
-if {![file exists "${bfile}.mp3"]} {
-	puts "0"
-} else {
-	set sz [file size $rfile]
-	set nsz [expr [file size "${bfile}.mp3"] / 0.3]
-
-	set perc [expr $nsz * 100 / $sz]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/cgi-bin/browse/browse.js

@@ -1,77 +1,4 @@
 
-var dir;
-
-function disableall()
-{
-	$('button,a,input').disable();
-}
-
-function pastedialogue()
-{
-	$('#pwdialogue').dialog({
-		title: "Pasting from clipboard",
-		modal: true, autoOpen: true,
-		height: 'auto', width: 'auto',
-		show: 'scale', hide: 'fade',
-		draggable: false, resizable: false,
-		closeOnEscape: false,
-		open: function() {
-		    $('.ui-dialog-titlebar-close').hide();
-		}
-	});
-}
-
-function reloadclipboard()
-{
-	$('#clipboard')
-	    .empty()
-	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
-	    .load('/cgi-bin/browse/clipboard.jim', function() {
-
-// Start Clipboard post-load actions
-
-if ($('#clipclear').length)
-{
-	$('#paste').enable();
-	$('#doptmenu').enableContextMenuItems('#paste');
-}
-else
-{
-	$('#paste').disable();
-	$('#doptmenu').disableContextMenuItems('#paste');
-}
-
-$('#clipclear').button().click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=clear', function() {
-		reloadclipboard();
-	});
-});
-
-$('a.clipdel').click(function() {
-	$.get('/cgi-bin/browse/clipboard.jim?act=remove&path=' +
-	    $(this).attr('path'), function() {
-		reloadclipboard();
-	});
-});
-
-$('#paste').button()
-    .click(function() {
-	disableall();
-	pastedialogue();
-	$('#pwfeedback').load(
-	    '/cgi-bin/browse/clipboard.jim?act=paste&dir='
-	    + encodeURIComponent(dir), function() {
-		$('#pwdialogue').dialog('close');
-		window.location.reload(true);
-	});
-});
-
-
-// End Clipboard post-load actions
-
-	});
-}
-
 function epginfo_callback(data, status, xhr)
 {
 	var width = 85;
@@ -95,14 +22,10 @@ function insert_folder_size(folder, size)
 	folder = folder.replace(/ /g, '');
 	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	//console.log("Folder: (%s) = (%s)", folder, size);
-	if (size.search(/\d$/) == -1)
-		size += 'iB';
-	else
-		size += ' bytes';
 	if (folder == "")
-		$('#dirsize').text(' (' + size + ')');
+		$('#dirsize').text(' (' + size + 'iB)');
 	else
-		$('#' + folder).text(' (' + size + ')');
+		$('#' + folder).text(' (' + size + 'iB)');
 }
 
 function folder_size_callback(data, status, xhr)
@@ -127,35 +50,13 @@ function new_folder_callback(data, status, xhr)
 	$.each(data, set_folder_new);
 }
 
-function insert_shrunk(file, perc)
-{
-	if (perc == 0)
-	{
-		file = file.replace(/[ ]/g, '');
-		file = file.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
-		//console.log("File: (%s) = (%s)", file, perc);
-		$('#sp_' + file).show();
-	}
-}
-
-function shrunk_callback(data, status, xhr)
-{
-	//console.log("Status: %s", status);
-	//console.dir(data);
-	$.each(data, insert_shrunk);
-}
-
-function delete_callback(file, dir, id)
+function delete_callback(file, type, id)
 {
 	var el = 'div.bf#' + id;
 	var results = el + ' .results';
-	$(results)
-	    .html('<img src=/img/loading.gif>Deleting, please wait...')
-	    .slideDown('slow')
-	    .load('/cgi-bin/browse/delete.jim', {
-		'dir': dir,
-		'files': [decodeURIComponent(file)]
-		}, function() {
+	var url = '/cgi-bin/browse/delete.jim?file=' +
+	    encodeURIComponent(file) + '&type=' + type;
+	$(results).load(url, function() {
 		$(el).delay(3000).slideUp(300, function() {
 			$(el).remove();
 		});
@@ -164,19 +65,19 @@ function delete_callback(file, dir, id)
 
 function lock_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/lock.jim?file=' + file;
+	var url = '/cgi-bin/browse/lock.jim?file=' + encodeURIComponent(file);
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function enc_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/enc.jim?file=' + file;
+	var url = '/cgi-bin/browse/enc.jim?file=' + encodeURIComponent(file);
 	$.get(url, function() { window.location.reload(true); });
 }
 
 function new_callback(file, type, id)
 {
-	var url = '/cgi-bin/browse/new.jim?file=' + file;
+	var url = '/cgi-bin/browse/new.jim?file=' + encodeURIComponent(file);
 	$.get(url, function() { window.location.reload(true); });
 }
 
@@ -187,32 +88,6 @@ function rename_submit()
 	    function() { window.location.reload(true); });
 }
 
-function drename_submit()
-{
-	var s = $('#drenameform_form').serialize();
-	$.get('/cgi-bin/browse/rename.jim?' + s,
-	    function() { window.location.reload(true); });
-}
-
-function newdir_submit()
-{
-	var s = $('#newdirform_form').serialize();
-	$.get('/cgi-bin/browse/mknewdir.jim?' + s,
-	    function() { window.location.reload(true); });
-}
-
-function savestream_submit()
-{
-	var s = $('#savestream_form').serialize();
-	var sf = $('#save_stream').attr('file');
-	$('#savestream_spin').show();
-	$.get('/cgi-bin/browse/savestream.jim?sfile=' +
-	    encodeURIComponent(sf) + '&' + s,
-	    function() {
-		window.location.reload(true);
-	    });
-}
-
 var $confirm;	// Populated after DOM is loaded.
 
 function confirm_action(action, callback, file, type, id)
@@ -226,7 +101,7 @@ function confirm_action(action, callback, file, type, id)
 	});
 	$('#confirm').empty().html(
 	    'Are you sure you wish to ' + action + '<br>' +
-	    '<i>' + decodeURIComponent(bfile) + '</i> ?'
+	    '<i>' + bfile + '</i> ?'
 	);
 	$confirm.dialog('open');
 }
@@ -235,123 +110,51 @@ function preparemenu(el, menu)
 {
 	if (el.attr('type') == 'ts')
 	{
-//		if (el.attr('def') == 'HD')
-//		{
-//			$(menu).enableContextMenuItems('#enc');
-//			if (el.attr('encd') == 1)
-//				$(menu).changeContextMenuItem('#enc',
-//				    'Remove Enc');
-//			else
-//				$(menu).changeContextMenuItem('#enc',
-//				    'Set Enc');
-//		}
-
-		if (el.attr('bx') > 0)
-			$(menu).enableContextMenuItems('#crop');
-		else
-			$(menu).disableContextMenuItems('#crop');
-
-/*
 		if (el.attr('def') == 'HD')
-			$(menu).disableContextMenuItems('#strip');
+		{
+			$('#optmenu').enableContextMenuItems('#enc');
+			if (el.attr('encd') == 1)
+				$(menu).changeContextMenuItem('#enc',
+				    'Remove ENC');
+			else
+				$(menu).changeContextMenuItem('#enc',
+				    'Set ENC');
+		}
 		else
-*/
-			$(menu).enableContextMenuItems('#strip');
+			$('#optmenu').disableContextMenuItems('#enc');
 
-		if (el.attr('rsize') > 4294967296)
-			$(menu).enableContextMenuItems('#chunk');
-		else
-			$(menu).disableContextMenuItems('#chunk');
-
-		$(menu).enableContextMenuItems('#new');
+		$('#optmenu').enableContextMenuItems('#new');
 		if (el.attr('new') == 1)
 			$(menu).changeContextMenuItem('#new', 'Mark watched');
 		else
 			$(menu).changeContextMenuItem('#new', 'Mark new');
 
 
-		$(menu).enableContextMenuItems('#lock');
+		$('#optmenu').enableContextMenuItems('#lock');
 		if (el.attr('locked') == 1)
 		{
 			$(menu).changeContextMenuItem('#lock', 'Unlock');
-			$(menu).disableContextMenuItems('#delete');
+			$('#optmenu').disableContextMenuItems('#delete');
 		}
 		else
 		{
 			$(menu).changeContextMenuItem('#lock', 'Lock');
-			$(menu).enableContextMenuItems('#delete');
-		}
-
-		if (el.attr('odencd') == 1 && el.attr('dlna') == 1 &&
-		    el.attr('encd') == 0)
-			$(menu).enableContextMenuItems('#decrypt');
-		else
-			$(menu).disableContextMenuItems('#decrypt');
-
-		if (el.attr('odencd') == 1)
-		{
-			$(menu).disableContextMenuItems('#audio');
-			$(menu).disableContextMenuItems('#mpg');
-		}
-		else
-		{
-			$(menu).enableContextMenuItems('#audio');
-			$(menu).enableContextMenuItems('#mpg');
+			$('#optmenu').enableContextMenuItems('#delete');
 		}
 	}
 	else
 	{
-		$(menu).enableContextMenuItems('#delete');
-		$(menu).disableContextMenuItems('#lock');
-		//$(menu).disableContextMenuItems('#enc');
-		$(menu).disableContextMenuItems('#new');
+		$('#optmenu').enableContextMenuItems('#delete');
+		$('#optmenu').disableContextMenuItems('#lock');
+		$('#optmenu').disableContextMenuItems('#enc');
+		$('#optmenu').disableContextMenuItems('#new');
 	}
 
 }
 
-function preparedmenu(el, menu)
-{
-	if (el.attr('noflat') != undefined)
-	{
-		if (el.attr('noflat') > 0)
-			$(menu).changeContextMenuItem('#flat', 'Allow Flatten');
-		else
-			$(menu).changeContextMenuItem('#flat',
-			    'Prevent Flatten');
-	}
-	if (el.attr('autoshrink') != undefined)
-	{
-		if (el.attr('autoshrink') > 0)
-			$(menu).changeContextMenuItem('#shrink',
-			    'Disable Auto-shrink');
-		else
-			$(menu).changeContextMenuItem('#shrink',
-			    'Enable Auto-shrink');
-	}
-	if (el.attr('autodedup') != undefined)
-	{
-		if (el.attr('autodedup') > 0)
-			$(menu).changeContextMenuItem('#dedup',
-			    'Disable Auto-dedup');
-		else
-			$(menu).changeContextMenuItem('#dedup',
-			    'Enable Auto-dedup');
-	}
-	if (el.attr('autodecrypt') != undefined)
-	{
-		if (el.attr('autodecrypt') > 0)
-			$(menu).changeContextMenuItem('#decrypt',
-			    'Disable Auto-decrypt');
-		else
-			$(menu).changeContextMenuItem('#decrypt',
-			    'Enable Auto-decrypt');
-	}
-}
 
 $(document).ready(function() {
 
-dir = $('#dir').text();
-
 var menuclick = function(action, el, pos)
 {
 	var file = $(el).parent().prevAll('a.bf').last().attr('file');
@@ -363,18 +166,7 @@ var menuclick = function(action, el, pos)
 	{
 	    case 'delete':
 		confirm_action('delete', delete_callback, file,
-		    dir, id);
-		break;
-
-	    case 'copy':
-		if (!confirm('Are you sure? Copying recordings takes a long time!'))
-			break;
-		// Fallthrough
-	    case 'cut':
-		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
-		    '&path=' + file, function() {
-			reloadclipboard();
-		    });
+		    type, id);
 		break;
 
 	    case 'lock':
@@ -382,10 +174,10 @@ var menuclick = function(action, el, pos)
 		    file, type, id);
 		break;
 
-//	    case 'enc':
-//		confirm_action('change the ENC flag on', enc_callback,
-//		    file, type, id);
-//		break;
+	    case 'enc':
+		confirm_action('change the ENC flag on', enc_callback,
+		    file, type, id);
+		break;
 
 	    case 'new':
 		confirm_action('change the New flag on', new_callback,
@@ -393,8 +185,8 @@ var menuclick = function(action, el, pos)
 		break;
 
 	    case 'rename':
-		$('#rename').val(decodeURIComponent(bfile));
-		$('#renameorig').val(decodeURIComponent(file));
+		$('#rename').val(bfile);
+		$('#renameorig').val(file);
 
 		$('#titleorig').val('');
 		$('#renametitle').val('');
@@ -404,7 +196,7 @@ var menuclick = function(action, el, pos)
 		if (type == 'ts')
 		{
 			$.getJSON('/cgi-bin/browse/epgtitle.jim?file=' +
-			    file, epginfo_callback);
+			    encodeURIComponent(file), epginfo_callback);
 		}
 
 		$('#renameform').dialog('open');
@@ -412,131 +204,7 @@ var menuclick = function(action, el, pos)
 
 	    case 'download':
 		window.location.href = '/cgi-bin/browse/download.jim?file=' +
-		    file + '&base=' +
-		    encodeURIComponent(document.URL.match(/:\/\/(.[^/]+)/)[1]);
-		break;
-
-	    case 'crop':
-		window.location.href = '/cgi-bin/browse/crop/crop.jim?file=' +
-		    file;
-		break;
-
-	    case 'strip':
-		window.location.href = '/cgi-bin/browse/strip/strip.jim?file=' +
-		    file;
-		break;
-
-	    case 'chunk':
-		window.location.href = '/cgi-bin/browse/chunk/chunk.jim?file=' +
-		    file;
-		break;
-
-	    case 'decrypt':
-		window.location.href =
-		    '/cgi-bin/browse/decrypt/decrypt.jim?file=' + file;
-		break;
-
-	    case 'audio':
-		window.location.href = '/cgi-bin/browse/audio/audio.jim?file=' +
-		    file;
-		break;
-
-	    case 'mpg':
-		window.location.href = '/cgi-bin/browse/mpg/mpg.jim?file=' +
-		    file;
-		break;
-
-	    default:
-		alert('Unhandled action: ' + action);
-		break;
-	}
-};
-
-var dmenuclick = function(action, el, pos)
-{
-	var direl = $(el).parent().parent();
-	var file = $(el).parent().prevAll('a.dbf').last().attr('file');
-	var bfile = file.replace(/.*\//g, '');
-	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
-	var results = $(el).parent().next('div.results');
-
-	switch (action)
-	{
-	    case 'paste':
-		pastedialogue();
-		$('#pwfeedback').load(
-		    '/cgi-bin/browse/clipboard.jim?act=paste&dir=' +
-		    file, function() {
-			$('#pwdialogue').dialog('close');
-			reloadclipboard();
-		});
-		break;
-
-	    case 'delete':
-
-		if (confirm('Are you sure you wish to delete "' +
-		    decodeURIComponent(file) +
-		    '" and all files within it?'))
-		{
-			$(results)
-			    .html('<img src=/img/loading.gif>' +
-			    'Deleting, please wait...')
-			    .slideDown('slow')
-			    .load('/cgi-bin/browse/delete.jim', {
-				'dir': dir,
-				'files': [decodeURIComponent(file)]
-				}, function() {
-				$(direl).delay(3000).slideUp(300, function() {
-					$(direl).remove();
-				});
-			});
-		}
-		break;
-
-	    case 'copy':
-		if (!confirm('Are you sure? Copying directories can take a very long time!'))
-			break;
-		// Fallthrough
-	    case 'cut':
-		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
-		    '&path=' + file, function() {
-			reloadclipboard();
-		    });
-		break;
-
-	    case 'rename':
-		$('#drename').val(decodeURIComponent(bfile));
-		$('#drenameorig').val(decodeURIComponent(file));
-		$('#drenameform').dialog('open');
-		break;
-
-	    case 'flat':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=noflatten';
-		$.get(url, function() { window.location.reload(true); });
-		break;
-
-	    case 'dedup':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autodedup';
-		$.get(url, function() { window.location.reload(true); });
-		break;
-
-	    case 'shrink':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autoshrink';
-		$.get(url, function() { window.location.reload(true); });
-		break;
-
-	    case 'decrypt':
-		var url = '/cgi-bin/browse/flagdir.jim?dir=' + file +
-		    '&flag=autodecrypt';
-		$.get(url, function() { window.location.reload(true); });
-		break;
-
-	    case 'resetnew':
-		var url = '/cgi-bin/browse/resetnew.jim?dir=' + file;
-		$.get(url, function() { window.location.reload(true); });
+		    encodeURIComponent(file);
 		break;
 
 	    default:
@@ -555,35 +223,9 @@ var dmenuclick = function(action, el, pos)
 		menuclick
 	);
 
-	// Bind context menu to opt+ image
-	$('img.oopt').contextMenu(
-		{
-			menu: 'ooptmenu',
-			leftButton: true,
-			beforeShow: preparemenu
-		},
-		menuclick
-	);
-
-	$('img.dopt').contextMenu(
-		{
-			menu: 'doptmenu',
-			leftButton: true,
-			beforeShow: preparedmenu
-		},
-		dmenuclick
-	);
-
 	// Disable items which are not yet implemented.
 	$('#optmenu').disableContextMenuItems('#title');
 
-	var $buttons = {
-	    "Close" : function() {$(this).dialog('close');}
-	};
-	var $buttonsp = $.extend(
-	    {"Play" : function() { doplay(); }},
-	    $buttons);
-
 	// Create reusable dialogue.
 	var $dialog = $('#dialogue').dialog({
 		title: "Media Details",
@@ -591,43 +233,23 @@ var dmenuclick = function(action, el, pos)
 		height: 600, width: 700,
 		show: 'scale', hide: 'fade',
 		draggable: true, resizable: true,
-		buttons: $buttons,
+		buttons: {
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
 		close: function(e,u) { $('#dialogue').empty().html(
 		    '<img src="/img/loading.gif" alt="loading">'); }
 	});
 
-	function doplay()
-	{
-		var file = $dialog.attr('file');
-		var type = $dialog.attr('type');
-
-		disableall();
-
-		window.location = '/play/play.jim?' +
-		    'dir=' + encodeURIComponent(dir) +
-		    '&file=' + file;
-	}
-
 	// Bind dialogue open to filenames.
 	$('a.bf').click(function(e) {
 		e.preventDefault();
-
 		var file = $(this).attr('file');
 		var type = $(this).attr('type');
-		var opt = $(this).nextAll('a').find('img.opt');
-
-		var url = '/cgi-bin/browse/file.jim?file=' + file
-		    + '&type=' + type;
-		$dialog.load(url);
-
-		$dialog.attr('file', file);
-		$dialog.attr('type', type);
-
-		if (type == 'ts' &&
-		    (opt.attr('odencd') == 0 || opt.attr('dlna') == 1))
-			$dialog.dialog("option", "buttons", $buttonsp);
-		else
-			$dialog.dialog("option", "buttons", $buttons);
+		var url = '/cgi-bin/browse/file.jim?file=' +
+		    encodeURIComponent(file) + '&type=' + type;
+		$('#dialogue').load(url);
 		$dialog.dialog('open');
 	});
 
@@ -644,32 +266,6 @@ var dmenuclick = function(action, el, pos)
 		close: function() { $('#rename').val(''); }
 	});
 
-	$('#drenameform').dialog({
-		autoOpen: false,
-		height: 'auto', width: 'auto',
-		modal: true,
-		buttons: {
-			"Update": drename_submit,
-			"Close": function() {
-				$(this).dialog('close');
-			}
-		},
-		close: function() { $('#drename').val(''); }
-	});
-
-	$('#savestreamform').dialog({
-		autoOpen: false,
-		height: 'auto', width: 'auto',
-		modal: true,
-		buttons: {
-			"Save": savestream_submit,
-			"Cancel": function() {
-				$(this).dialog('close');
-			}
-		},
-		close: function() { $('#savestream_name').val(''); }
-	});
-
 	// Create re-usable confirmation dialogue.
 	$confirm = $('#confirm').dialog({
 		modal: true, autoOpen: false,
@@ -677,150 +273,15 @@ var dmenuclick = function(action, el, pos)
 		show: 'fade', hide: 'fade',
 		draggable: false, resizable: false
 	});
+	
+	var dir = $('#dir').text();
 
 	// Load folder sizes
 	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
 		folder_size_callback);
 
-	// Flag shrunk recordings
-	$.getJSON('/cgi-bin/browse/shrunk.jim?dir=' + encodeURIComponent(dir),
-		shrunk_callback);
-
 	// Flag folders with unwatched items
 	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
 		new_folder_callback);
-
-	// Load clipboard
-	reloadclipboard();
-
-	// Uncheck everything
-	$('input.fs:checked').attr('checked', false);
-
-	// Buttons
-
-	$('#dedup').button().click(function() {
-		window.location = '/dedup/dedup.jim?dir='
-		    + encodeURIComponent(dir);
-	});
-
-	$('#save_stream').button().click(function() {
-		$('#savestream_spin').hide();
-		$('#savestreamform').dialog('open');
-		$('#savestream_detail').load(
-		    '/cgi-bin/browse/ffmpeg.jim?file=' +
-		    encodeURIComponent($('#save_stream').attr('file')));
-	});
-
-	$('#selectall').click(function(e) {
-		e.preventDefault();
-		$('input.fs').attr('checked', true).trigger('change');
-	});
-	$('#deselectall').click(function(e) {
-		e.preventDefault();
-		$('input.fs:checked').attr('checked', false).trigger('change');
-	});
-
-	$('#join').button().disable()
-	    .click(function() {
-		var files = new Array();
-		var els = $('input.fsts:checked + a').each(function() {
-			files.push($(this).attr('file'));
-		});
-		//console.log("%o", files);
-		window.location.href = '/cgi-bin/browse/join/join.jim?files=' +
-		    files.join();
-	    });
-
-	$('#delete').button().disable()
-	    .click(function() {
-		var files = new Array();
-		var els = $('input.fs:checked + a').each(function() {
-			files.push(decodeURIComponent($(this).attr('file')));
-		});
-		//console.log("%o", files);
-		var str = 'Are you sure you want to delete ' + files.length +
-		    ' file';
-		if (files.length != 1) str += 's';
-		str += '?';
-		if (confirm(str))
-		{
-			disableall();
-			$('#deletewait').slideDown('slow');
-
-			$('#pwdialogue').dialog({
-				title: "Deleting",
-				modal: true, autoOpen: true,
-				height: 'auto', width: 'auto',
-				show: 'scale', hide: 'fade',
-				draggable: false, resizable: false,
-				closeOnEscape: false,
-				open: function() {
-				    $('.ui-dialog-titlebar-close').hide();
-				}
-			});
-			$('#pwfeedback').load(
-			    '/cgi-bin/browse/delete.jim', {
-				'dir': dir,
-				'files': files
-				}, function() {
-				$('#pwdialogue').dialog('close');
-				window.location.reload(true);
-			});
-		}
-	    });
-
-	$('#copy,#cut').button().disable()
-	    .click(function() {
-		var files = new Array();
-		var els = $('input.fs:checked + a').each(function() {
-			files.push(decodeURIComponent($(this).attr('file')));
-		});
-		//console.log("%o", files);
-		var action = $(this).attr('id');
-		if (action == 'copy' && !confirm('Are you sure? ' +
-		    'Copying recordings can take a very long time!'))
-			return;
-
-		$.post('/cgi-bin/browse/clipboard.jim', {
-		    'act': 'add',
-		    'dir': dir,
-		    'mode': action,
-		    'path': files
-		    }, function() {
-			reloadclipboard();
-			$('input.fs:checked').attr('checked', false);
-		    });
-	    });
-
-	$('#newdir').button().click(function() {
-		$('#newdirform').dialog({
-			autoOpen: true,
-			height: 'auto', width: 'auto',
-			modal: true,
-			buttons: {
-				"Create": newdir_submit,
-				"Cancel": function() {
-					$(this).dialog('close');
-				}
-			},
-			close: function() { $('#newdirname').val(''); }
-		});
-	});
-
-	$('input.fs').change(function() {
-		var num = $('input.fs:checked').size();
-		if (num > 0)
-			$('#delete,#cut,#copy').enable();
-		else
-			$('#delete,#cut,#copy').disable();
-
-		var num = $('input.fsts:checked').size();
-		if (num > 1)
-			$('#join').enable();
-		else
-			$('#join').disable();
-
-	});
-
 });
 

var/mongoose/cgi-bin/browse/chunk/chunk.css

@@ -1,6 +0,0 @@
-
-div.progressbar
-{
-	width: 200px;
-}
-

var/mongoose/cgi-bin/browse/chunk/chunk.jim

@@ -1,72 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-
-# 45 minute chunks
-set max $(45 * 60)
-
-set len [$ts duration 1]
-
-set esttime $(int($len * 0.025))
-if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
-
-header
-
-puts "
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=chunk.js></script>
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<link href=chunk.css rel=stylesheet type=text/css />
-
-<fieldset class=cleft>
-<legend>Split recording into 45 minute segments</legend>
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
-<tr><th>Time:</th>
-<td>Splitting will take around [clock format $esttime -format "%T"]</td></tr>
-"
-
-set bytesperminute $([$ts size] / ($len / 60))
-
-while {$len > 0} {
-	incr part
-	incr len -$max
-	puts "<tr class=\"part hidden\">
-		<th>Part $part</th><td>
-		    <div id=progresspart$part class=progressbar></div>
-		    <div id=progressstat$part class=also>waiting...</div>
-		</td></tr>"
-}
-
-puts "
-</table>
-<span class=hidden id=params parts=$part bpm=$bytesperminute
-    file=\"[cgi_quote_url $rfile]\">
-</span>
-
-<div id=chunkdiv style=\"padding: 1em\">
-<button id=chunkit>Split recording into $part parts</button>
-</div>
-
-<div id=findiv style=\"padding: 1em\" class=hidden>
-<button id=back dir=\"[cgi_quote_url [file dirname $rfile]]\">
-Back to Media Browser
-</button>
-</div>
-
-</fieldset>
-"
-

var/mongoose/cgi-bin/browse/chunk/chunk.js

@@ -1,76 +0,0 @@
-var handle;
-var currentpart = 0;
-var stime = 0;
-
-function xprogress()
-{
-	var file = $('#params').attr('file');
-	var bpm = $('#params').attr('bpm');
-
-	if (currentpart > 0)
-		$.get('progress.jim?part=' + currentpart + '&file=' + file,
-		    function(data) {
-			if (currentpart > 0)
-			{
-				perc = (data / bpm) * 100 / 45;
-				$('#progresspart' + currentpart)
-				    .reportprogress(perc);
-			}
-		    });
-}
-
-function xpart(part)
-{
-	var parts = $('#params').attr('parts');
-	var file = $('#params').attr('file');
-
-	if (part++ < parts)
-	{
-		currentpart = part;
-		$('#progressstat' + part)
-		    .text('extracting...')
-		    .addClass('blood');
-		stime = new Date().getTime();
-		$.get('extract.jim?parts=' + parts +
-		    '&part=' + part +
-		    '&file=' + file,
-		    function(data) {
-			var taken = (new Date().getTime() - stime) / 1000;
-			$('#progressstat' + part)
-			    .text('done... (' + taken + ' seconds)')
-			    .removeClass('blood');
-			currentpart = 0;
-			$('#progresspart' + part)
-			    .reportprogress(100);
-			xpart(part);
-		});
-	}
-	else
-	{
-		clearInterval(handle);
-		$('#findiv').show('slow');
-	}
-}
-
-$(function() {
-
-$('div.progressbar').reportprogress(0);
-
-$('#chunkit').button().click(function(e) {
-	e.preventDefault();
-	$('#chunkdiv').hide('slow');
-	$('tr.part').show('slow');
-
-	handle = setInterval("xprogress()", 1000);
-	xpart(0);
-});
-
-$('#back').button().click(function(e) {
-	e.preventDefault();
-	var dir = $(this).attr('dir');
-
-	window.location = '/cgi-bin/browse.jim?dir=' + dir;
-});
-
-});
-

var/mongoose/cgi-bin/browse/chunk/extract.jim

@@ -1,38 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-
-set rfile [cgi_get file]
-set part [cgi_get part -]
-set parts [cgi_get parts "?"]
-
-if {$part eq "-"} exit
-
-set start $(($part - 1) * 45 * 600 - 600)
-set end $($part * 45 * 600 + 600)
-
-puts "START: $start"
-puts "END: $end"
-
-set ts [ts fetch $rfile]
-
-set base [file rootname $rfile]
-
-set cmd [list /mod/bin/nicesplice -in $base -out "$base.part$part"]
-if {$start > 0} { lappend cmd -cut 0 $start }
-lappend cmd -cut $end 9999999
-
-puts "CMD: ($cmd)"
-
-puts [exec {*}$cmd]
-
-set ts [ts fetch "$base.part$part.ts"]
-$ts settitle "$part/$parts. [string range [ts get $title] 0 40]"
-

var/mongoose/cgi-bin/browse/chunk/progress.jim

@@ -1,17 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set file [cgi_get file]
-set part [cgi_get part]
-
-set rfile "[file rootname $file].part$part"
-puts [file size $rfile]
-

var/mongoose/cgi-bin/browse/clipboard.jim

@@ -1,123 +0,0 @@
-#!/mod/bin/jimsh
-
-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 ""
-
-cgi_input 1
-#cgi_dump
-
-set cb [[clipboard new {path "/tmp/webif-browse.cb"}] load]
-
-set action [cgi_get act list]
-
-switch $action {
-    list {
-	if {![$cb size]} {
-		puts "<i>Clipboard is empty</i>"
-		break
-	}
-	puts "<div class=cliplist>"
-	foreach file [$cb get items] {
-		set img "page_white_copy"
-		if {[$file get action] eq "cut"} {
-			set img "cut"
-		}
-		set path [$file get path]
-		set xpath [cgi_quote_html $path]
-		puts "<span title=\"$xpath\" alt=\"$xpath\">"
-		puts "<img src=/img/context/$img.png>"
-		set dfile [file tail $path]
-		if {[string length $dfile] > 25} {
-			set dfile "[string range $dfile 0 22]..."
-		}
-		if {[file isdirectory $path]} {
-			puts "<img height=16
-			    src=/images/711_1_09_Media_Folder.png>"
-		}
-		puts [cgi_quote_html $dfile]
-		puts "<a class=clipdel href=# alt=\"Remove\" title=\"Remove\"
-		    path=\"[cgi_quote_url $path]\">
-		    <img border=0 src=/img/close.png height=16></a>"
-		puts "</span>"
-	}
-	puts "</div>"
-	puts "<button id=paste>Paste to current folder</button>"
-	puts "<button id=clipclear>Empty clipboard</button>"
-    }
-    add {
-	if {[set path [cgi_get path]] eq "0"} {
-		puts "No path."
-		exit
-	}
-	set dir [cgi_unquote_input [cgi_get dir]]
-	set mode [cgi_get mode copy]
-	foreach p $path {
-		set p [cgi_unquote_input $p]
-		if {$dir ne "0" && [string first "$dir/" $p] != 0} {
-			puts "$p not in directory<br>"
-			continue
-		}
-		if {![$cb present $p]} {
-			$cb add $mode $p
-			puts "Added $p for $mode<br>"
-		}
-	}
-	$cb save
-    }
-    remove {
-	$cb remove [cgi_unquote_input [cgi_get path]]
-	$cb save
-    }
-    clear {
-	$cb clear
-	$cb save
-    }
-    paste {
-	set dir [cgi_unquote_input [cgi_get dir]]
-	foreach item [$cb get items] {
-		set path [$item get path]
-		set file [file tail $path]
-		set mode [$item get action]
-
-		puts "Pasting $file"
-
-		if {[file isdirectory $path]} {
-			# Directory
-			if {$mode eq "cut"} {
-				catch {file rename $path "$dir/$file"}
-			} else {
-				catch {puts [exec /mod/bin/busybox/cp -r \
-				    $path $dir]}
-			}
-		} elseif {[string match {*.ts} $path]} {
-			set ts [ts fetch $path]
-			if {![catch {$ts get file}]} {
-				foreach f [$ts fileset] {
-					if {$mode eq "cut"} {
-						catch {file rename $f \
-						    "$dir/[file tail $f]"}
-					} else {
-						catch {file copy $f \
-						    "$dir/[file tail $f]"}
-					}
-				}
-			}
-		} else {
-			if {$mode eq "cut"} {
-				catch {file rename $path "$dir/[file tail $f]"}
-			} else {
-				catch {file copy $path "$dir/[file tail $f]"}
-			}
-		}
-	}
-	$cb clear
-	$cb save
-    }
-}
-

var/mongoose/cgi-bin/browse/crop/crop.jim

@@ -1,117 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-
-set len [$ts duration 1]
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=crop.js></script>
-
-<fieldset class=cleft>
-<legend>Crop recording</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format \"%T\"]</td></tr>
-<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
-<tr><th>Bookmarks:</th><td>[$ts get bookmarks] @ "
-
-set flag 0
-foreach b [$ts bookmarks] {
-	if $flag { puts -nonewline ", " }
-	incr flag
-	puts -nonewline [clock format $b -format "%T"]
-}
-
-puts "</td></tr><tr><th>File</th><td>"
-
-puts "<div style=\"position: relative; top: -10px\">"
-
-proc div {type left right} {
-	set width $($right - $left)
-	puts "<div class=$type style=\"left: ${left}px; width: ${width}px\">
-	    $type</div>"
-}
-
-set keeping 0
-set last 0
-set start -1
-foreach b [$ts bookmarks] {
-	if {$start < 0} {
-		set start $b
-		continue
-	}
-	set end $b
-
-	incr keeping $($end - $start)
-
-	set left $($start * 500 / $len)
-	set right $($end * 500 / $len)
-
-	div cut $last $($left - 1)
-	div keep $left $($right - 1)
-
-	set last $right
-
-	set start -1
-}
-
-if {$start > 0} {
-	incr keeping $($len - $start)
-	set left $($start * 500 / $len)
-	div cut $last $($left - 1)
-	div keep $left 500
-} else {
-	div cut $last 500
-}
-
-set keepperc $($keeping * 100.0 / $len)
-set esttime $(int($keeping * 0.025))
-if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
-
-puts "
-</div>
-</td></tr>
-<tr><th>Keeping:</th><td>
-[clock format $keeping -format "%T"] ([format "%.2f" $keepperc]%)
-</td></tr>
-<tr><th>Time:</th>
-<td>Cropping will take around [clock format $esttime -format "%T"]</td></tr>
-</table>
-
-<span class=hidden id=params
-    file=\"[cgi_quote_url $rfile]\"
-    perc=\"$keepperc\"
-    dir=\"[cgi_quote_url $dir]\"
-></span>
-
-<div id=cropdiv style=\"padding: 1em\">
-<button id=cropit>Perform crop operation</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Cropping: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

var/mongoose/cgi-bin/browse/crop/crop.js

@@ -1,38 +0,0 @@
-var handle = 0;
-
-function update()
-{
-	var perc = $('#params').attr('perc');
-	var file = $('#params').attr('file');
-
-	$.get('progress.jim' + '?perc=' + perc + '&file=' + file,
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#cropit').button().click(function() {
-	$('#cropdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').text('Please do not interrupt...')
-	    .load('execute.jim?file=' + $('#params').attr('file'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

var/mongoose/cgi-bin/browse/crop/execute.jim

@@ -1,58 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-
-set rfile [cgi_get file]
-
-if {[system inuse $rfile]} {
-	puts "This file is in use. Cannot process at the moment."
-	exit
-}
-
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-
-set len [$ts duration 1]
-
-set cropstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set origdir "$dir/_original"
-if {![file exists $origdir]} { file mkdir $origdir }
-
-set shname [file tail $base]
-puts "Processing $shname"
-
-if {[file exists "$origdir/$shname.ts"]} {
-	puts "This recording already exists within _original"
-	puts "Cannot continue."
-	exit
-}
-
-puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
-	set tail [file tail $f]
-	puts "  $tail"
-	file rename $f "$origdir/$tail"
-}
-
-puts [exec /mod/bin/nicesplice \
-    -in "$origdir/$shname" \
-    -out "$dir/$shname" \
-    -cutBookMarks]
-
-set newname "$shname-[clock seconds]"
-puts "Renaming file group to $newname"
-ts renamegroup "$dir/$shname.ts" $newname
-exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
-
-set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
-puts "Time taken: $croptime"
-

var/mongoose/cgi-bin/browse/crop/progress.jim

@@ -1,29 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set perc [cgi_get perc 100]
-set tsfile [file normalize [cgi_get file]]
-
-set origfile "[file dirname $tsfile]/_original/[file tail $tsfile]"
-set newfile [file rootname $tsfile]
-
-if {![file exists $newfile]} {
-	puts "0"
-} else {
-	set sz [file size $origfile]
-	set expected $($sz / 100 * $perc)
-	set nsz [file size $newfile]
-
-	set perc [expr $nsz * 100 / $expected]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/cgi-bin/browse/decrypt/decrypt.jim

@@ -1,72 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-lassign [$ts dlnaloc] url
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=decrypt.js></script>
-
-<fieldset class=cleft>
-<legend>Decrypt in-place</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-<tr><th>DLNA URL</th><td>$url</td></tr>
-</table>
-"
-
-if {$url eq ""} {
-	puts "This file has not been indexed by the media server.
-	    Cannot decrypt."
-	puts "Have you enabled <i>Content Sharing</i> in the Humax menus?"
-	exit
-}
-
-if {![system is_listening 9000]} {
-	puts "The Humax media server is not running, cannot decrypt."
-	puts "Have you enabled <i>Content Sharing</i> in the Humax menus?"
-	puts "It can sometimes turn itself off so it's worth double checking."
-	puts "If it is on then try turning sharing off and on again."
-	exit
-}
-
-puts "
-
-<span class=hidden id=params
-    dir=\"[cgi_quote_url $dir]\"
-    file=\"[cgi_quote_url $rfile]\"
-></span>
-
-<div id=decryptdiv style=\"padding: 1em\">
-<button id=decryptit>Perform decryption</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Decrypting: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

var/mongoose/cgi-bin/browse/decrypt/decrypt.js

@@ -1,35 +0,0 @@
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim?file=' + $('#params').attr('file'),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#decryptit').button().click(function() {
-	$('#decryptdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load('execute.jim?file=' + $('#params').attr('file'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

var/mongoose/cgi-bin/browse/decrypt/execute.jim

@@ -1,71 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-lassign [$ts dlnaloc] url
-
-if {$url eq ""} {
-	puts "This file has not been indexed by the media server.
-	    Cannot decrypt."
-	exit
-}
-
-if {[system inuse $rfile]} {
-	puts "This file is in use. Cannot decrypt at the moment."
-	exit
-}
-
-set xstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set origdir "$dir/_original"
-if {![file exists $origdir]} { file mkdir $origdir }
-
-set shname [file tail $base]
-puts "Processing $shname"
-
-if {[file exists "$origdir/$shname.ts"]} {
-	puts "The file already exists in _original, cannot decrypt."
-	exit
-}
-
-exec wget -O "$rfile.decrypting" $url
-
-puts "Moving recording to $origdir"
-
-foreach f [glob -nocomplain "${base}.*"] {
-	if {[file extension $f] eq ".decrypting"} { continue }
-	set tail [file tail $f]
-	puts "  $tail"
-	file rename $f "${origdir}/$tail"
-}
-
-file rename "$rfile.decrypting" $rfile
-
-foreach ext {nts hmt thm} {
-	set sidecar "$shname.$ext"
-	if {[file exists "$origdir/$sidecar"]} {
-		puts "Copying back sidecar $ext"
-		file copy "$origdir/$sidecar" "$dir/$sidecar"
-	}
-}
-
-if {[file exists "$dir/$shname.hmt"]} {
-	exec /mod/bin/hmt -encrypted "$dir/$shname.hmt"
-}
-
-set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
-puts "Time taken: $xtime"
-

var/mongoose/cgi-bin/browse/decrypt/progress.jim

@@ -1,23 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-
-if {![file exists "$rfile.decrypting"]} {
-	puts "0"
-} else {
-	set sz [file size $rfile]
-	set nsz [file size "$rfile.decrypting"]
-
-	puts [expr $nsz * 100 / $sz]
-}
-

var/mongoose/cgi-bin/browse/delete.jim

@@ -1,102 +1,27 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size system.class tdelete
+source /mod/var/mongoose/lib/ts.class
 
-puts "Content-Type: text/html\r\n"
+puts "Content-Type: text/html"
+puts ""
 
 cgi_input
 #cgi_dump
 
-set dir [cgi_get dir]
+set file [dict get $_cgi file]
+set type [dict get $_cgi type]
 
-#puts "DIR: ($dir)"
-
-if {[system pkginst undelete]} {
-	set dustbin [system dustbin]
-} else {
-	set dustbin ""
-}
-
-proc bindir {file} {
-	global dustbin
-	set dir [file dirname $file]
-	regsub "^[system mediaroot]" $dir $dustbin ndir
-	if {$dir eq $ndir} { set ndir $dustbin }
-	system mkdir_p $ndir
-	return $ndir
-}
-
-proc touch {file} {
-	exec /mod/bin/busybox/touch $file
-}
-
-puts "<div id=deleting class=blood><img src=/img/loading.gif>Deleting...</div>"
-puts "<ul style=\"list-style-type: square\">"
-
-foreach file [cgi_get files] {
-
-	puts -nonewline "<li>\"$file\"..."
-
-	if {[string first "$dir/" $file] != 0} {
-		puts "Error - outside directory."
-		continue
-	}
-
-	if {$dustbin ne "" && [string first $dustbin $file] > -1} {
-		set ldustbin ""
+if {$type eq "ts"} {
+	set ts [ts fetch $file]
+	if {[$ts delete]} {
+		puts "Successfully deleted $file."
 	} else {
-		set ldustbin $dustbin
+		puts "Problem deleting $file, [$ts get error]"
 	}
-
-	set done 0
-	if {[file isdirectory $file]} {
-		puts -nonewline "Directory..."
-		if {$ldustbin ne ""} {
-			set ndir "[bindir $file]/[file tail $file]"
-			while {[file isdirectory $ndir]} {
-				append ndir "_"
-			}
-			file rename $file $ndir
-			touch $ndir
-		} else {
-			tdelete $file
-		}
-		puts -nonewline "Done..."
-		set done 1
-	} elseif {[string match {*.ts} $file]} {
-		set ts [ts fetch $file]
-
-		# Check TS validity
-		if {![catch {$ts get file}]} {
-			if {$ldustbin ne ""} {
-				$ts move [bindir $file] 1 1
-			} else {
-				if {[$ts delete]} {
-					puts "Successfully deleted $file."
-				} else {
-					puts "Problem deleting $file, [$ts get error]"
-				}
-			}
-			set done 1
-		}
-		# else treat as normal file.
-	}
-
-	if {!$done} {
-		if {$ldustbin ne ""} {
-			set nfile "[bindir $file]/[file tail $file]"
-			file rename $file $nfile
-			touch $nfile
-		} else {
-			tdelete $file
-		}
-		catch {file delete "[file rootname $file].hmi"}
-		puts -nonewline "Done..."
-	}
-
-	puts "</li>"
+	exit
 }
-puts "</ul>"
+
+file delete $file
+puts "Successfully deleted $file."
 

var/mongoose/cgi-bin/browse/download.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 package require sqlite3
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require ts.class
 
 #puts "Content-Type: text/plain\r\n\r\n"
@@ -10,24 +10,25 @@ require ts.class
 cgi_input
 #cgi_dump
 
-set file [cgi_get file]
-set urlbase [cgi_get base ""]
+set file [dict get $_cgi file]
+set rfile [file normalize $file]
+set ts [ts fetch $file]
+
+set dmsfile /mnt/hd2/dms_cds.db
 
-# Default to just downloading the raw file.
 set url $file
 set mime "video/ts"
-
-if {[string match {*.ts} $file]} {
-	if {![catch {set ts [ts fetch $file]}]} {
-
-		# If it's encrypted on disk and the DLNA option is available,
-		# then use the server to perform decryption on the fly.
-		if {[$ts flag "ODEncrypted"] > 0} {
-			set dlna [$ts dlnaloc $urlbase]
-			if {[llength $dlna]} { lassign $dlna url mime }
-
-			#puts "DLNA: $dlna"
-		}
+if {[file exists $dmsfile]} {
+	set db [sqlite3.open /mnt/hd2/dms_cds.db]
+	set muri [$db query "
+		select tblresource.mimetype, contenturi
+		from tblresource join tblmedia using (mediaid)
+		where localurl = '%s'" $rfile]
+	if {$muri != ""} {
+		set rec [lindex $muri 0]
+		set xuri [lindex $rec 3]
+		set mime [lindex $rec 1]
+		set url "http://$env(HTTP_HOST):9000/web/$xuri"
 	}
 }
 

var/mongoose/cgi-bin/browse/enc.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/ts.class
+source /mod/var/mongoose/lib/ts.class
 
 puts "Content-Type: text/html"
 puts ""

var/mongoose/cgi-bin/browse/epgtitle.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/ts.class
+source /mod/var/mongoose/lib/ts.class
 
 puts "Content-Type: application/json"
 puts ""

var/mongoose/cgi-bin/browse/ffmpeg.jim

@@ -10,7 +10,7 @@ cgi_input
 
 if [file exists /mod/bin/ffmpeg] {
 	set file [dict get $_cgi file]
-	puts [exec /mod/webif/lib/bin/ffmpeg -i $file]
+	puts [exec /mod/var/mongoose/lib/ffmpeg -i $file]
 } else {
 	puts "Install ffmpeg package for more information..."
 }

var/mongoose/cgi-bin/browse/file.jim

@@ -1,8 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require pretty_size
+source /mod/var/mongoose/lib/pretty_size
 
 puts "Content-Type: text/html"
 puts ""
@@ -21,7 +20,8 @@ file stat $file st
 set sz [pretty_size $st(size)]
 
 if {$type eq "ts"} {
-	require epg.class ts.class
+	source /mod/var/mongoose/lib/epg.class
+	source /mod/var/mongoose/lib/ts.class
 
 	set ts [ts fetch $file]
 
@@ -65,71 +65,24 @@ if {$type eq "ts"} {
 	<th>Start Time</th>
 	<td>"
 	puts [clock format [$ts get start] -format "%c %Z"]
-	puts "<font class=also>(Scheduled: [
-	    clock format [$ts get schedstart] -format "%c %Z"])</font>"
 	puts "</td>
 </tr><tr>
 	<th>End Time</th>
 	<td>"
 	puts [clock format [$ts get end] -format "%c %Z"]
-	puts "<font class=also>(Scheduled: [clock format \
-	    [expr [$ts get schedstart] + [$ts get scheddur]] \
-	    -format "%c %Z"])</font>"
 	puts "</td>
 </tr><tr>
 	<th>Duration</th>
-	<td>[$ts duration] minute(s).
-	    <font class=also>(Scheduled: [expr [$ts get scheddur] / 60])
-	    </font></td>
+	<td>[$ts duration] minute(s).</td>
 </tr><tr>
 	<th>Size</th>
 	<td>$sz</td>
-"
-lassign [$ts dlnaloc] url
-if {$url ne ""} {
-	puts "</tr><tr><th>DLNA&nbsp;URL</th>
-	   <td><a href=\"$url\">$url</a></td>"
-}
-puts "
-</tr><tr>
-	<th>Files</th>
-	<td>
-"
-
-set fileset [$ts fileset]
-puts -nonewline "<img id=xfileset class=va src=/img/tree/plusonly.png>"
-puts -nonewline "[llength $fileset] file"
-if {[llength $fileset] != 1} { puts -nonewline "s" }
-puts -nonewline " in set."
-puts "<div id=fileset class=hidden><ul>"
-foreach f $fileset {
-	puts "<li>[file tail $f] ([pretty_size [file size $f]])</li>" 
-}
-puts "</ul></div>"
-
-puts "</td>
 </tr><tr>
 	<th>Flags</th>
-	<td>[$ts get flags]
-"
-if {[$ts get bookmarks]} {
-		puts " \[Bookmarks: [$ts get bookmarks]\]"
-}
-
-	puts "</tr>"
-	puts "</table>"
-	puts {
-<script type=text/javascript>
-$('#xfileset').click(function() {
-	$('#fileset').slideToggle('slow', function() {
-		if ($('#fileset').is(':visible'))
-			$('#xfileset').attr('src', '/img/tree/minustop.png');
-		else
-			$('#xfileset').attr('src', '/img/tree/plusonly.png');
-	});
-});
-</script>
-	}
+	<td>[$ts get flags]</td>
+</tr>
+</table>
+	"
 	exit
 }
 

var/mongoose/cgi-bin/browse/flagdir.jim

@@ -1,22 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get dir]
-set flag [cgi_get flag]
-if {![file isdirectory $dir]} { exit }
-if {[file exists "$dir/.$flag"]} {
-	file delete "$dir/.$flag"
-	puts "Unflagged directory as $flag."
-} else {
-	close [open "$dir/.$flag" w]
-	puts "Flagged directory as $flag."
-}
-

var/mongoose/cgi-bin/browse/join/execute.jim

@@ -1,32 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input 1
-#cgi_dump
-
-set joinstart [clock milliseconds]
-
-set cmd {/mod/bin/nicesplice}
-set dst [file rootname [cgi_get dest "joined"]]
-
-foreach file [split [cgi_get files] ","] {
-	set file [cgi_unquote_input $file]
-	lappend cmd "-in" [file rootname $file]
-	set dir [file dirname $file]
-}
-lappend cmd "-out" "$dir/$dst"
-
-puts "($cmd)"
-puts [exec {*}$cmd]
-
-set ts [ts fetch "$dir/$dst.ts"]
-$ts settitle $dst
-
-set jointime [expr [expr [clock milliseconds] - $joinstart] / 1000.0]
-puts "Time taken: $jointime"
-

var/mongoose/cgi-bin/browse/join/join.css

@@ -1,6 +0,0 @@
-#filelist { list-style-type: none; margin: 0; padding: 0; }
-#filelist li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em;
-	height: 35px; }
-#filelist li span { position: absolute; margin-left: -1.3em; }
-span.pl { padding-left: 2em; }
-

var/mongoose/cgi-bin/browse/join/join.jim

@@ -1,65 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-#cgi_dump
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<link href=join.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=/js/touchbridge.js></script>
-<script type/text/javascript src=join.js></script>
-
-<p><b>
-Drag the files below into order, enter a name for the resulting file and then
-click the <i>Join</i> button.</b>
-"
-
-puts "<ul id=filelist>"
-set esize 0
-foreach file [split [cgi_get files] ","] {
-	set file [cgi_unquote_input $file]
-	set dir [file dirname $file]
-	set ts [ts fetch $file]
-	puts "<li class=\"va ui-state-default\" id=\"$file\"><span
-	    class=\"va ui-icon ui-icon-arrowthick-2-n-s\"></span>
-	    <img class=va src=/img/Video_TS.png>
-	    <span class=pl>
-	    $file ([clock format [$ts duration 1] -format "%T"])
-	    \[[pretty_size [$ts size]]\]
-	    <br><i style=\"font-size: 0.8em\">[$ts get title]</i>
-	    </span>
-	</li>"
-	incr esize [$ts size]
-}
-puts "</ul>"
-
-puts "
-<br><br>
-
-<div id=joindiv>
-Name for joined file:
-    <input id=dest name=dfile class=\"text ui-widget-content ui-corner-all\"
-    length=20 maxlength=50>
-<button id=dojoin>Join</button>
-</div>
-
-<div id=progressdiv style=\"display: none\">
-Joining: <div id=progressbar></div>
-<button id=back
-    dir=\"[cgi_quote_url $dir]\"
-    esize=\"$esize\"
-    style=\"display: none\">Back to media list</button>
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</div>
-"
-
-footer
-

var/mongoose/cgi-bin/browse/join/join.js

@@ -1,62 +0,0 @@
-
-$('#filelist li').hover(
-    function() { $(this).css('cursor', 'pointer'); },
-    function() { $(this).css('cursor', 'auto'); }
-);
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim'
-	    + '?esize=' + $('#back').attr('esize')
-	    + '&file=' + $('#back').attr('dir') + '/' + $('#dest').val(),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
-});
-
-$('#filelist').sortable().disableSelection();
-
-$('#dojoin').button().attr('disabled', true).addClass('ui-state-disabled')
-    .click(function() {
-	var files = $('#filelist').sortable('toArray');
-	var sfiles = new Array();
-	for (x in files)
-		sfiles.push(encodeURIComponent(files[x]));
-
-	$('#joindiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-
-	$('#output').text('Please do not interrupt...')
-	    .load('execute.jim?files=' +
-	    sfiles.join() + '&dest=' + $('#dest').val(),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-$('#dest').val('').keyup(function() {
-	if ($(this).val().length > 0)
-		$('#dojoin')
-		    .removeProp('disabled').removeClass('ui-state-disabled');
-	else
-		$('#dojoin')
-		    .prop('disabled', true).addClass('ui-state-disabled');
-});
-
-});
-

var/mongoose/cgi-bin/browse/join/progress.jim

@@ -1,23 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-#source /mod/webif/lib/setup
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set expected [cgi_get esize 1]
-set file [file normalize [cgi_get file]]
-
-if {![file exists $file]} {
-	puts "0"
-} else {
-	set sz [file size $file]
-
-	set perc [expr $sz * 100 / $expected]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/cgi-bin/browse/lock.jim

@@ -1,8 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class
+source /mod/var/mongoose/lib/ts.class
 
 puts "Content-Type: text/html"
 puts ""

var/mongoose/cgi-bin/browse/mknewdir.jim

@@ -1,15 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get dir -]
-set name [cgi_get newdirname "New Folder"]
-
-file mkdir "$dir/$name"
-

var/mongoose/cgi-bin/browse/mpg/execute.jim

@@ -1,31 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-set xstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set shname [file tail $base]
-puts "Processing $shname"
-
-puts [exec /mod/bin/ffmpeg -y -benchmark -v 0 \
-    -i $rfile \
-    -map 0:0 -map 0:1 \
-    -vcodec copy -acodec copy "${base}.mpg"]
-
-set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
-puts "Time taken: $xtime"
-

var/mongoose/cgi-bin/browse/mpg/mpg.jim

@@ -1,52 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=mpg.js></script>
-
-<fieldset class=cleft>
-<legend>Extract to MPG</legend>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-</table>
-
-<span class=hidden id=params
-    dir=\"[cgi_quote_url $dir]\"
-    rfile=\"[cgi_quote_url $rfile]\"
-></span>
-
-<div id=mpgdiv style=\"padding: 1em\">
-<button id=mpgit>Perform mpg extraction</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Extracting mpg: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-
-"
-

var/mongoose/cgi-bin/browse/mpg/mpg.js

@@ -1,35 +0,0 @@
-
-var handle = 0;
-
-function update()
-{
-	$.get('progress.jim?file=' + $('#params').attr('rfile'),
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#mpgit').button().click(function() {
-	$('#mpgdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load('execute.jim?file=' + $('#params').attr('rfile'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

var/mongoose/cgi-bin/browse/mpg/progress.jim

@@ -1,26 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set tsfile [cgi_get file]
-set rfile [file normalize $tsfile]
-set bfile [file rootname $rfile]
-
-if {![file exists "${bfile}.mpg"]} {
-	puts "0"
-} else {
-	set sz [file size $rfile]
-	set nsz [expr [file size "${bfile}.mpg"] / 0.75]
-
-	set perc [expr $nsz * 100 / $sz]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/cgi-bin/browse/new.jim

@@ -1,8 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class
+source /mod/var/mongoose/lib/ts.class
 
 puts "Content-Type: text/html"
 puts ""

var/mongoose/cgi-bin/browse/rename.jim

@@ -1,8 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class
+source /mod/var/mongoose/lib/ts.class
 
 puts "Content-Type: text/html"
 puts ""

var/mongoose/cgi-bin/browse/resetnew.jim

@@ -1,49 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-package require pack
-source /mod/webif/lib/setup
-require ts.class hexdump
-
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get dir]
-if {![file isdirectory $dir]} { exit }
-if {![file exists "$dir/.series"]} { exit }
-
-set tot 0
-set watched 0
-foreach file [readdir -nocomplain $dir] {
-	if {![string match {*.ts} $file]} { continue }
-	#puts "FILE: $file"
-	incr tot
-	if {[set ts [ts fetch "$dir/$file"]] != 0} {
-		if {![$ts flag "New"]} { incr watched }
-	}
-}
-
-set fd [open "$dir/.series"]
-set bytes [read $fd]
-close $fd
-set recs [unpack $bytes -uintle 0 32]
-set played [unpack $bytes -uintle 32 32]
-
-puts "Current: $played/$recs"
-
-#hexdump $bytes
-
-puts "Calculated: $watched/$tot"
-
-pack bytes $tot -intle 32 0 
-pack bytes $watched -intle 32 32
-
-#hexdump $bytes
-
-set fd [open "$dir/.series" "w"]
-puts -nonewline $fd $bytes
-close $fd
-

var/mongoose/cgi-bin/browse/savestream.jim

@@ -1,22 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html"
-puts ""
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get dir "/media/My Video"]
-set file [file tail [cgi_get savestream_name]]
-set sfile [cgi_get savestream_source "/mnt/hd3/Streamer_down_file"]
-if {$file == "0"} { exit }
-if {[string length [string trim $file]] == 0} { exit }
-
-if {[file extension $file] ne ".mp4"} { append file ".mp4" }
-
-file copy $sfile "$dir/$file"
-

var/mongoose/cgi-bin/browse/shrunk.jim

@@ -1,27 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-
-#puts "Content-Type: text/plain"
-puts "Content-Type: application/json"
-puts ""
-
-cgi_input
-#cgi_dump
-
-set dir [cgi_get dir "/media/My Video/Children"]
-
-puts "{"
-foreach file [readdir -nocomplain $dir] {
-	if {![string match {*.ts} $file]} { continue }
-
-	set xfile [file rootname $file]
-	if {[catch {set eit [exec /mod/bin/stripts -cq "$dir/$xfile"]}]} {
-		continue
-	}
-
-	puts " \"$file\": $eit,"
-}
-puts " \"dummy\": 0"
-puts "}"
-

var/mongoose/cgi-bin/browse/sizes.jim

@@ -12,20 +12,20 @@ cgi_input
 #set _cgi(dir) "/media/My Video"
 
 set dir [dict get $_cgi dir]
-set dlen [string length "$dir/"]
 
 #9.4G	/media/My Video/Archive
 #1.4G	/media/My Video/CSI_ Crime Scene Investigation
 puts "{"
-foreach line [split [exec /mod/bin/busybox/du -h -d 1 "$dir/"] "\n"] {
-	lassign [split $line "\t"] size node
-	set node [string range $node $dlen end]
+foreach line [split [exec /mod/bin/busybox/du -h "$dir/"] "\n"] {
+	set fields [split $line "\t"]
+	set size [lindex $fields 0]
+	set node [file tail [lindex $fields 1]]
+#	set node [lindex [split [lindex $fields 1] /] end]
 	puts "\"$node\" : \"$size\","
 }
 
 # Handle symbolic links.
-foreach file [readdir $dir] {
-	set file "$dir/$file"
+foreach file [glob -nocomplain "$dir/*"] {
 	if {[catch {set lk [file readlink $file]}]} continue
 
 	if {![string match "/*" $lk]} { set lk "$dir/$lk" }

var/mongoose/cgi-bin/browse/strip/analyse.jim

@@ -1,16 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-
-set rfile [cgi_get file]
-set base [file rootname $rfile]
-
-puts [exec /mod/bin/stripts -aq $base]
-

var/mongoose/cgi-bin/browse/strip/execute.jim

@@ -1,52 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-
-set len [$ts duration 1]
-
-set stripstart [clock milliseconds]
-
-set base [file rootname $rfile]
-set origdir "$dir/_original"
-if {![file exists $origdir]} { file mkdir $origdir }
-
-set shname [file tail $base]
-puts "Processing $shname"
-
-if {[file exists "$origdir/$shname.ts"]} {
-	puts "This recording already exists within _original"
-	puts "Cannot continue."
-	exit
-}
-
-puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
-	set tail [file tail $f]
-	puts "  $tail"
-	file rename $f "$origdir/$tail"
-}
-
-puts [exec /mod/bin/stripts \
-    "$origdir/$shname" \
-    "$dir/$shname" \
-    ]
-
-set newname "$shname-[clock seconds]"
-puts "Renaming file group to $newname"
-ts renamegroup "$dir/$shname.ts" $newname
-exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
-
-set striptime [expr [expr [clock milliseconds] - $stripstart] / 1000.0]
-puts "Time taken: $striptime"
-

var/mongoose/cgi-bin/browse/strip/progress.jim

@@ -1,27 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set tsfile [file normalize [cgi_get file]]
-set ntsfile "[file rootname $tsfile].nts"
-
-set origfile "[file dirname $tsfile]/_original/[file tail $ntsfile]"
-
-if {![file exists $ntsfile]} {
-	puts "0"
-} else {
-	set sz [file size $origfile]
-	set nsz [file size $ntsfile]
-
-	set perc [expr $nsz * 100 / $sz]
-	if {$perc > 100} { set perc 100 }
-	puts $perc
-}
-

var/mongoose/cgi-bin/browse/strip/strip.jim

@@ -1,66 +0,0 @@
-#!/mod/bin/jimsh
-
-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
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-
-set len [$ts duration 1]
-
-set esttime $([$ts size] / 5700000)
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=strip.js></script>
-
-<fieldset class=cleft>
-<legend>Make recordings smaller by removing unecessary frames</legend>
-
-<p><i>This process will remove freeview EPG data from the recording.<br>
-These data are not required and can increase the size of the
-recording file by as much as 20%.<br>
-Your original recording files will be retained in a folder called _original.
-</i>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format %T]</td></tr>
-<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
-<tr><th>Time:</th>
-<td>Shrinking will take around [clock format $esttime -format "%T"]</td></tr>
-<tr><th>Estimated Saving:</th>
-<td class=va><span id=analysis class=va>
-	<img class=va src=/img/loading.gif> Analysing file, please wait...
-</span></td></tr>
-</table>
-
-<span class=hidden id=params
-    file=\"[cgi_quote_url $rfile]\"
-    dir=\"[cgi_quote_url $dir]\"
-></span>
-
-<div id=stripdiv class=hidden style=\"padding: 1em\">
-<button id=stripit>Shrink recording</button>
-</div>
-
-<div id=progressdiv class=hidden>
-Shrinking: <div id=progressbar></div>
-</div>
-
-<button id=back class=hidden>Back to media list</button>
-
-<div id=output class=pre style=\"margin-top: 10px\"></div>
-</fieldset>
-"
-

var/mongoose/cgi-bin/browse/strip/strip.js

@@ -1,48 +0,0 @@
-var handle = 0;
-
-function update()
-{
-	var file = $('#params').attr('file');
-
-	$.get('progress.jim' + '?file=' + file,
-	    function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#analysis').load('analyse.jim?file=' + $('#params').attr('file'),
-	function(t) {
-		if ($.trim(t) == '0%')
-		{
-			$('#output').text('Recording is already stripped.');
-			$('#back').slideDown();
-		}
-		else
-			$('#stripdiv').slideDown();
-	});
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $('#params').attr('dir');
-});
-
-$('#stripit').button().click(function() {
-	$('#stripdiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').text('Please do not interrupt...')
-	    .load('execute.jim?file=' + $('#params').attr('file'),
-	    function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-

var/mongoose/cgi-bin/browse/style.css

@@ -1,17 +0,0 @@
-
-div.brow
-{
-	float: left;
-	clear: left;
-}
-
-div.cliplist span
-{
-	display: block;
-}
-
-#clipclear
-{
-	margin-top: 1em;
-}
-

var/mongoose/cgi-bin/cat.jim

@@ -1,25 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require system.class chunked pretty_size
-
-cgi_input
-#cgi_dump
-
-set file [cgi_get file "-"]
-if {$file eq "-"} { exit }
-
-start_chunked
-
-if {![file exists $file]} {
-	chunk ">>> File $file does not exist.\r\n"
-} else {
-	chunk ">>> Contents of $file [pretty_size [file size $file]]\r\n"
-	set fp [open $file r]
-	chunk [read $fp]
-	close $fp
-}
-
-end_chunked
-

var/mongoose/cgi-bin/cfwreset.cgi

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo "Content-Type: text/plain"
-echo
-
-touch /var/lib/humaxtv/mod/_RESET_CUSTOM_FIRMWARE_ENVIRONMENT
-

var/mongoose/cgi-bin/channel.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 package require sqlite3
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require altrow progressbar epg.class
 
 puts "Content-Type: text/html"
@@ -32,19 +32,15 @@ puts "
 		<th>Frequency</th>
 		<th>Signal Strength</th>
 		<th>Signal Quality</th>
-		<th>Network</th>
-		<th>Mux</th>
 		<th>Channels</th>
-		<th>&gt;799</th>
 	</tr>
 "
 foreach tw [$db query {
-		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel, ucQuality
-		from TBL_TS join TBL_NET using (netIdx)
+		select tsIdx, usTsID, ulFrequency, ucLevel, ucQuality
+		from TBL_TS
 		order by ulFrequency
 	}] {
-	lassign $tw \
-	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality
+	lassign $tw x tsIdx x usTsID x ulFrequency x ucLevel x ucQuality
 
 	altrow
 	puts "
@@ -53,7 +49,6 @@ foreach tw [$db query {
 	"
 	puts "<td>[progressbar $ucLevel]</td>"
 	puts "<td>[progressbar $ucQuality]</td>"
-	puts "<td>[string range $netName 3 end]</td>"
 
 	set channels [$db query {
 		select usLcn, szSvcName, szPrvName, aucDefaultAuthority
@@ -61,32 +56,12 @@ foreach tw [$db query {
 		where tsIdx = %s
 		order by usLcn
 		} $tsIdx]
-
-	set mux "Local"
-	set ehs 0
-	foreach chan $channels {
-		lassign $chan x lcn x name
-		set name [string range $name 1 end]
-		if {$lcn >= 800} { incr ehs }
-		switch $name {
-			"BBC ONE" { set mux "PSB1/BBC A" }
-			"ITV1" { set mux "PSB2/D3&amp;4" }
-			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
-			"ITV3" { set mux "COM4/SDN" }
-			"Dave" { set mux "COM5/ARQ A" }
-			"Film4" { set mux "COM6/ARQ B" }
-			"Movies4Men" { set mux "Local" }
-		}
-	}
-	puts "<td>$mux</td>"
-
 	puts "<td>[llength $channels]
 		<a class=mchan ts=$tsIdx href=#>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			    view
 		</a></td>"
-	puts "<td>$ehs</th>"
 	puts "</tr>"
 	puts "<tr id=mchan_$tsIdx class=mchan style=\"display: none\">
 		<td colspan=5>"

var/mongoose/cgi-bin/db.jim

@@ -2,14 +2,19 @@
 
 package require cgi
 package require sqlite3
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require altrow
 
 puts "Content-Type: text/html"
 puts ""
 
-set databases [glob /var/lib/humaxtv/*.db]
-lappend databases "/mnt/hd2/dms_cds.db"
+set databases {
+	/var/lib/humaxtv/rsvp.db
+	/var/lib/humaxtv/rsv.db
+	/var/lib/humaxtv/setup.db
+	/var/lib/humaxtv/channel.db
+	/mnt/hd2/dms_cds.db
+}
 
 header
 

var/mongoose/cgi-bin/env.jim

@@ -1,8 +0,0 @@
-#!/mod/bin/jimsh
-
-puts "Content-type: text/plain\n"
-
-foreach f [dict keys $env] {
-	puts "$f = $env($f)"
-}
-

var/mongoose/cgi-bin/epg/db.jim

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-PATH=$PATH:/mod/bin export PATH
- 
-echo "Content-Type: text/plain"
-echo ""
-
-[ -n "$QUERY_STRING" ] && data="${QUERY_STRING##*=}" || data=epg
-
-case $data in
-	channels)
-		sqlite3 -header -batch -separator '	' \
-		    /var/lib/humaxtv/channel.db '
-			select * from TBL_SVC;
-		'
-		;;
-
-
-	*) /mod/bin/epg -p dump ;;
-esac
-
-exit 0
-

var/mongoose/cgi-bin/epg_dump.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require epg.class
 
 puts "Content-Type: text/html"

var/mongoose/cgi-bin/epg_info.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require epg.class
 
 puts "Content-Type: text/html"
@@ -18,6 +18,18 @@ set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
 set others [$record othertimes]
 
+puts {
+	<style type=text/css>
+	font.also
+	{
+		font-size: 0.9em;
+		font-style: italic;
+		color: #333;
+		background: transparent;
+	}
+	</style>
+}
+
 puts "
 	<table class=keyval>
 	<tr>
@@ -79,7 +91,7 @@ if {[$record get event_crid] != ""} {
 	puts "
 	<tr>
 		<th>CRID</th><td>
-		<a href=/cgi-bin/epg/search.jim?crid=[$record get event_crid]>
+		<a href=/cgi-bin/epg_search.jim?crid=[$record get event_crid]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$record get channel_crid][$record get event_crid]
@@ -93,7 +105,7 @@ if {[$record get series_crid] != ""} {
 	puts "
 	<tr>
 		<th nowrap>Series CRID</th><td>
-		<a href=/cgi-bin/epg/search.jim?scrid=[$record get series_crid]>
+		<a href=/cgi-bin/epg_search.jim?scrid=[$record get series_crid]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$record get channel_crid][$record get series_crid]
@@ -107,7 +119,7 @@ if {[$record get rec_crid] != ""} {
 	set rec [$record recommended]
 	if {$rec != ""} {
 		puts "<tr><th>Recommends</th><td>
-			<a href=/cgi-bin/epg/search.jim?crid=[$rec get event_crid]>
+			<a href=/cgi-bin/epg_search.jim?crid=[$rec get event_crid]>
 			<img border=0 height=14
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			[$rec get name]
@@ -126,7 +138,7 @@ puts "
 	</tr>
 	</table>
 
-	<a class=footnote href=/cgi-bin/epg/dump.jim?service=[$record get service_id]&event=[$record get event_id]&raw=1>
+	<a class=footnote href=/cgi-bin/epg_dump.jim?service=[$record get service_id]&event=[$record get event_id]&raw=1>
 		<img border=0 src=/images/532_1_00_Find_Path_Arrow.png>
 		Show raw EPG info
 	</a>

var/mongoose/cgi-bin/epg_schedule.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require epg.class system.class
 
 puts "Content-Type: text/html"

var/mongoose/cgi-bin/epg_search.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require epg.class spinner.class altrow
 
 puts "Content-Type: text/html"
@@ -60,7 +60,7 @@ if {$ct > 0 } {
 } elseif {$scrid ne ""} {
 	set records [epg fetch dump -scrid $scrid]
 } elseif {$searchterm ne ""} { 
-	set records [epg dbfetch $cmd -term $searchterm]
+	set records [epg fetch $cmd -extra $searchterm]
 } else {
 	set records {}
 }
@@ -108,7 +108,7 @@ foreach record [lsort -command rsort $records] {
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>
-	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
+	    <a href=/cgi-bin/epg_service.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]

var/mongoose/cgi-bin/epg_service.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require epg.class spinner.class altrow
 
 puts "Content-Type: text/html"
@@ -53,7 +53,7 @@ puts {
 set i 0
 foreach record $records {
 	altrow
-	#$record get_channel_info
+	$record get_channel_info
 	set ended [$record ended]
 	if {[$record showing]} {
 	    puts "<td><img src=/images/111_1_00_Cursor_2R_Arrow.png></td>"

var/mongoose/cgi-bin/opkg.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require pkg.class chunked
 
 cgi_input
@@ -9,24 +9,17 @@ cgi_input
 
 set cmd [cgi_get cmd update]
 
-proc opkg {cmd} {
-	chunk ">>> opkg $cmd\r\n"
-	set bcmd "|/mod/webif/lib/bin/opkg $cmd"
-	set fd [open $bcmd r]
-	while {[gets $fd line] >= 0} {
-		chunk "$line\r\n"
-		#chunk_pad
-	}
-	close $fd
-	chunk "\r\n"
-}
-
 start_chunked
 
-if {$cmd eq "upgrade"} { opkg update }
-opkg $cmd
+set bcmd "|/mod/var/mongoose/lib/opkg $cmd"
+set fd [open $bcmd r]
+while {[gets $fd line] >= 0} {
+	chunk "$line\r\n"
+	#chunk_pad
+}
+close $fd
 
-if {$cmd eq "update" || $cmd eq "upgrade"} {
+if {$cmd eq "update"} {
 	chunk "Updating package meta information\r\n"
 	pkg fetchmeta
 	chunk "Done.\r\n"

var/mongoose/cgi-bin/pkg.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require settings.class pkg.class altrow
 
 if {[[settings] pkgdev]} { set filter 0 } else { set filter 1 }
@@ -17,15 +17,10 @@ if {![dict exists $_cgi type]} { set _cgi(type) avail }
 
 proc pkgrow {pkg} {
 	set name [$pkg get name]
-	altrow "pkg=\"$name\""
-	puts "<td nowrap>$name"
-	if {$::type eq "inst"} {
-		puts "<br><a href=# class=depends>&nbsp;&nbsp;
-		    <img class=va border=0
-		    src=/images/421_1_00_CH_Title_2R_Arrow.png height=14>
-		    <span class=\"va footnote\">Info</span></a>"
-	}
-	puts "</td>"
+	altrow
+	puts "
+		<td nowrap>$name</td>
+	"
 
 	if {$::type eq "avail"} {
 		puts "<td nowrap>[$pkg get latest]</td>"
@@ -51,9 +46,9 @@ proc pkgrow {pkg} {
 		set type Remove
 	}
 
-	puts "<td align=center><small><button id=\"$name\"
+	puts "<td align=center><small><button id=\"[$pkg get name]\"
 	    action=[string tolower $type]
-	    class=\"va [string tolower $type]\">$type</button></small></td>"
+	    class=[string tolower $type]>$type</button></small></td>"
 
 	puts "</tr>"
 }
@@ -84,8 +79,7 @@ if {[llength $pkgs] > 0} {
 	"
 
 	foreach pkg $pkgs {
-		if {$type ne "upgr" && $filter && \
-		    ![dict exists $::pkgmeta $pkg]} { continue }
+		if {$filter && ![dict exists $::pkgmeta $pkg]} { continue }
 		pkgrow [pkg load $pkg]
 	}
 	puts "</table>"
@@ -96,7 +90,7 @@ if {[llength $pkgs] > 0} {
 	puts "<i>No packages "
 	switch $type {
 		inst { puts "are installed." }
-		upgr { puts "are available for upgrade; try updating the package list from the Internet using the button above." }
+		upgr { puts "are available for upgrade." }
 		avail { puts "are available for installation." }
 	}
 	puts "</i>"

var/mongoose/cgi-bin/restart.jim

@@ -1,19 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require rsv.class system.class
 
 puts "Content-Type: text/html"
 puts ""
 
 cgi_input
-
-if {[cgi_get act] eq "cancel"} {
-	file delete /tmp/.restartpending
-	exit
-}
-
 if {[cgi_get now] eq "yes"} {
 	# - Busybox reboot does sync the disk but may still not be clean enough.
 	puts "Restarting."
@@ -49,7 +43,7 @@ puts {
 
 	$(document).ready(function() {
 		$('#progressbar').reportprogress(0);
-		handle = setInterval("update()", 350);
+		handle = setInterval("update()", 300);
 		$.get('/cgi-bin/restart.jim?now=yes');
 	});
 </script>

var/mongoose/cgi-bin/restartblock.jim

@@ -3,5 +3,5 @@
 puts "Content-Type: text/html"
 puts ""
 
-source /mod/webif/include/restart.jim
+source /mod/var/mongoose/include/restart.jim
 

var/mongoose/cgi-bin/sched_cancel.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require rsv.class system.class
 
 puts "Content-Type: text/html"

var/mongoose/cgi-bin/sched_info.jim

@@ -1,8 +1,8 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require rsv.class progressbar epg.class
+source /mod/var/mongoose/lib/setup
+require rsv.class progressbar
 
 puts "Content-Type: text/html"
 puts ""
@@ -15,17 +15,35 @@ set slot [cgi_get slot 0]
 
 set event [rsv slot $table $slot]
 
+set rsvicon [$event icon]
+if {$rsvicon ne ""} {
+	set rsvicon "<img src='images/$rsvicon' height=20>
+}
+
+set RKIcon [$event RKIcon]
+if {$RKIcon ne ""} {
+	set RKIcon "<img src='images/$RKIcon' height=20>
+}
+
+if {[$event get ucRecKind] == 4} {
+	set series 1
+} else {
+	set series 0
+}
+
 puts "
 	<table class=keyval>
 	<tr>
 		<th>Event [$event get ulslot]</th>
-		<td class=va>[join [$event iconset] ""]</td>
+		<td class=va>$rsvicon $RKIcon</td>
 	</tr><tr>
 		<th>Channel</th>
 		<td class=va>
 "
 if {[$event get usLcn] ne ""} {
-	puts "[epg channelicon [$event channel_name] 50]
+	puts "
+		<img class=va width=50
+		    src=\"/img/channels/[$event channel_name].png\">
 		- [$event get usLcn] - [$event channel_name]
 	"
 }
@@ -34,12 +52,7 @@ puts "
 		</td>
 	</tr><tr>
 		<th>Event Name</th>
-		<td>[$event name]"
-if {[$event get ucRecKind] == 4 && [$event name] ne [$event folder]} {
-	puts "<span class=also>(Folder: [$event folder])</span>"
-}
-
-puts "</td>
+		<td>[$event name]</td>
 	</tr><tr>
 		<th>Start</th>
 "
@@ -75,10 +88,10 @@ puts "
 set crid [join [lrange [split [$event get szCRID] /] 1 end]]
 if {$crid != ""} {
 	puts "<tr><th>"
-	if {[$event isseries]} { puts "Series" } else { puts "Event" }
+	if $series { puts "Series" } else { puts "Event" }
 	puts " CRID</th><td>"
-	puts -nonewline "<a href=/cgi-bin/epg/search.jim?"
-	if {[$event isseries]} { puts -nonewline "s" }
+	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	if $series { puts -nonewline "s" }
 	puts "crid=/$crid>
 	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
 	    height=14>
@@ -93,7 +106,7 @@ foreach ev [split [$event get szEventToRecord] "|"] {
 	if {$flag} { puts "<br>" }
 	incr flag
 	set crid [join [lrange [split $ev /] 1 end]]
-	puts -nonewline "<a href=/cgi-bin/epg/search.jim?"
+	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
 	puts "crid=/$crid>
 	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
 	    height=14> 
@@ -102,7 +115,7 @@ foreach ev [split [$event get szEventToRecord] "|"] {
 }
 puts "</td></tr>"
 puts "<tr><th>Accepted</th><td>"
-if {[$event get aulEventToRecordInfo] ne ""} {
+if {[$event get aulEventToRecordInfo] != ""} {
 	puts "Yes"
 }
 puts "</td></tr>"

var/mongoose/cgi-bin/settings.jim

@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require settings.class
 require plugin
 
@@ -11,26 +11,12 @@ puts ""
 cgi_input
 #cgi_dump
 
-if {[cgi_get act] eq "https"} {
-	if {[cgi_get val off] eq "off"} {
-		file delete /mod/etc/mongoose.cert
-		puts "HTTPS Server will be disabled after next reboot."
-	} else {
-		exec /mod/sbin/mongoose_mkcert
-		puts "HTTPS Server will be enabled after next reboot."
-	}
-	exit
-}
-
 set settings [settings new]
 
 set hostname [$settings hostname]
 set smtp_server [$settings smtp_server]
 set channel_group [$settings channel_group]
-set epg_style [$settings epg_style]
 set pkgdev [$settings pkgdev]
-set notoolbar [$settings notoolbar]
-set nomobile [$settings nomobile]
 
 # Handle updates
 
@@ -65,51 +51,39 @@ proc handle_str_update {var old {text "Value"}} {
 handle_str_update hostname $hostname Hostname
 _handle_update ascii smtp_server $smtp_server "SMTP Server"
 handle_int_update channel_group $channel_group "Channel Group"
-handle_str_update epg_style $epg_style "EPG Type"
+if {[dict exists $_cgi pkgdevoff] && ![dict exists $_cgi pkgdev]} {
+	set _cgi(pkgdev) 0
+}
 handle_int_update pkgdev $pkgdev "Development Package Display"
-handle_int_update notoolbar $notoolbar "Disable toolbar"
-handle_int_update nomobile $nomobile "Disable mobile link"
-
-set acluser [cgi_get acluser "-"]
-set aclpass [cgi_get aclpass "-"]
-set aclpassc [cgi_get aclpassc "-"]
-if {$acluser ne "-" && $aclpass ne "-"} {
-	if {![string length $acluser]} {
-		puts "No username provided."
-		exit
-	}
-	if {$aclpass ne $aclpassc} {
-		puts "Passwords do not match."
-		exit
-	}
-	if {[string length $aclpass] < 4} {
-		puts "Password is too short (< 4 characters)"
-		exit
-	}
-	puts [$settings addacluser $acluser $aclpass]
-	exit
-}
-
-set aclact [cgi_get aclact "-"]
-if {$aclact ne "-" && $acluser ne "-"} {
-	switch $aclact {
-		"del" { puts [$settings delacluser $acluser] }
-	}
-	exit
-}
 
 header
 
+puts {<script type="text/javascript" src="/js/jquery.form.js"></script>}
+
 puts {
-<script type="text/javascript" src="/cgi-bin/settings.js"></script>
-<script type="text/javascript" src="/js/jquery.form.js"></script>
-<script type="text/javascript" src="/js/jconfirmaction.jquery.js"></script>
-<link href=/css/jconfirmaction.jquery.css rel=stylesheet type=text/css />
-<script type="text/javascript" src="/js/iphone-style-checkboxes.js"></script>
-<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+	<script type=text/javascript>
+	$(document).ready(function () {
+		$(":submit").button();
+		$('form.auto').each(function(i, el) {
+			var id = $(this).attr('id');
+			var output = '#' + id + '_output'
+			$(this).ajaxForm({
+				target: output,
+				success: function() {
+				    $(output).css('font-style', 'italic');
+				    $(output).show('slow');
+				    $(output).delay(2000).fadeOut('slow');
+				}
+			});
+		});
+	});
+	</script>
 }
 
 puts "
+<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/iphone-style-checkboxes.js\">
+</script>
 	<fieldset style=\"display: inline\">
 		<legend>
 			General Settings
@@ -133,69 +107,13 @@ puts "
 	</tr>
 "
 
-puts -nonewline "
-	<tr>
-		<th class=key>HTTPS web server?</th>
-		<td><input id=https_toggle name=https type=checkbox value=yes"
-if {[file exists /mod/etc/mongoose.cert]} { puts -nonewline " checked" }
-puts ">
-		    <div id=https_output></div>
-		</td>
-	</tr>
-"
-
-puts -nonewline "
-	<tr>
-		<th class=key>Slide-down toolbar?</th>
-		<td><input id=toolbar_toggle name=toolbar type=checkbox value=yes"
-if {$notoolbar == 0} { puts -nonewline " checked" }
-puts ">
-		    <div id=toolbar_output></div>
-		</td>
-	</tr>
-"
-
-puts -nonewline "
-	<tr>
-		<th class=key>Mobile link on main page?</th>
-		<td><input id=mobile_toggle name=mobile type=checkbox value=yes"
-if {$nomobile == 0} { puts -nonewline " checked" }
-puts ">
-		    <div id=mobile_output></div>
-		</td>
-	</tr>
-"
-
-puts "
-	<tr>
-	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
-		<th class=key>Default Now/Next style</th>
-		<td><select id=epg_style name=epg_style
-		    class=\"text ui-widget-content ui-corner-all\">
-"
-puts "<option value=standard"
-if {$epg_style ne "grid"} { puts " selected" }
-puts ">Standard\n"
-puts "<option value=grid"
-if {$epg_style eq "grid"} { puts " selected" }
-puts ">Grid\n"
-puts "
-		</select>
-		<small>
-		<input name=epg_style value=\"set\" type=submit>
-		</small>
-		<div id=epg_style_output></div>
-		</td>
-	</form>
-	</tr>
-"
-
 puts "
 	<tr>
 	<form class=auto id=channel_group method=get action=$env(REQUEST_URI)>
 		<th class=key>Channel Group for EPG</th>
 		<td><select id=channel_group name=channel_group
-		    class=\"text ui-widget-content ui-corner-all\">
+		    class=\"text ui-widget-content ui-corner-all\"
+		    value=[$settings channel_group]>
 "
 
 set i 0
@@ -248,114 +166,33 @@ puts "
 puts "
 	</table>
 	</fieldset>
-"
-
-puts "
-	<br><br>
-	<fieldset style=\"display: inline\">
-	<legend> Web Interface User Access Control </legend>
-	<table>
-"
-
-set aclusers [$settings aclusers]
-if {[llength $aclusers]} {
-	puts "<tr><th colspan=5 class=odd>Existing Users</th></tr>"
-	foreach user [$settings aclusers] {
-		lassign $user user
-		puts "<tr><td align=center style=\"font-weight: bold\">
-		    $user</td>"
-		puts "<th class=key>New password:
-	        <input
-		  class=\"aclpass text ui-widget-content ui-corner-all\"
-		  type=password size=20 maxlength=50><br>"
-		puts "Again:
-	        <input
-		  class=\"aclpassc text ui-widget-content ui-corner-all\"
-		  type=password size=20 maxlength=50></td>"
-		puts "<th class=key><button class=pwchange>
-		    Change</button></td>"
-		puts "<th class=key><button class=userdel>
-		    Delete User</button></td>"
-		puts "</tr>"
-	}
-	puts "<tr><td colspan=5 id=aclusermod_output>&nbsp;</td></tr>"
-	puts "<tr><td colspan=5>&nbsp;</td></tr>"
-} else {
-	puts "<tr><td colspan=5 class=blood><b>
-	    Add a user to enable authentication.</b></td></tr>"
-}
-
-puts "<tr><th colspan=5 class=odd>Add New User</th></tr>"
-puts "
-	<form id=aclnewuser method=get action=$env(REQUEST_URI)>
-	<tr><th class=key>New User:</th><td>
-	    <input
-		class=\"text ui-widget-content ui-corner-all\"
-		id=acluser name=acluser size=20 maxlength=50></td></tr>
-	<tr><th class=key>Password:</th><td>
-	    <input type=password
-		class=\"text ui-widget-content ui-corner-all\"
-		id=aclpass name=aclpass size=20 maxlength=50></td></tr>
-	<tr><th class=key>Password (confirm):</th><td>
-	    <input type=password
-		class=\"text ui-widget-content ui-corner-all\"
-		id=aclpassc name=aclpassc size=20 maxlength=50></td></tr>
-	<tr><td><input id=aclnewuser_submit value=\"Add User\" type=submit>
-	    </td></tr>
-	</form>
-	</table>
-	<div id=aclnewuser_output></div>
-	</fieldset>
-"
-
-puts {
-<script type=text/javascript>
-$('#aclnewuser').ajaxForm({
-	target: '#aclnewuser_output',
-	success: function(txt) {
-		if (txt.indexOf('Success') >= 0)
-			window.location.reload(true);
-	}
-});
-
-$('button.userdel').click(function(el) {
-	var user = $('td:first', $(this).parents('tr')).text().trim();
-	$('#aclusermod_output').load(
-	    '/cgi-bin/settings.jim?aclact=del&acluser=' +
-	    encodeURIComponent(user), function(txt) {
-		if (txt.indexOf('Success') >= 0)
-			window.location.reload(true);
-	});
-});
-
-$('button.pwchange').click(function(el) {
-	var tr = $(this).parents('tr');
-	var user = $('td:first', $(tr)).text().trim();
-	var pass = $(tr).find('input.aclpass').val();
-	var passc = $(tr).find('input.aclpassc').val();
-	$('#aclusermod_output').load('/cgi-bin/settings.jim?' +
-	    'acluser=' + encodeURIComponent(user) + '&' +
-	    'aclpass=' + encodeURIComponent(pass) + '&' +
-	    'aclpassc=' + encodeURIComponent(passc));
-});
-</script>
-}
-
-puts -nonewline "
 	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
-	<tr>
-		<th class=key>Show development and advanced packages?</th>
-		<td><input name=pkgdev id=pkgdev value=1 type=checkbox
 "
-if {$pkgdev} { puts -nonewline " checked" }
-puts ">
+
+puts "
+	<tr>
+	<form class=auto id=pkgdev method=get action=$env(REQUEST_URI)>
+		<th class=key>Show development and advanced packages?</th>
+		<td><input name=pkgdevoff value=0 type=hidden>
+		    <input name=pkgdev id=pkgdev value=1 type=checkbox
+"
+if {$pkgdev} { puts " checked" }
+puts {
+		>
+		    <small>
+		    <input id=pkgdev_submit value="save" type=submit>
+		    </small>
+		    <div id=pkgdev_output></div>
 		</td>
+	</form>
 	</tr>
+}
+
+puts "
 	</table>
-	<div id=pkgdev_output></div>
 	</fieldset>
 "
 

var/mongoose/cgi-bin/settings.js

@@ -1,117 +0,0 @@
-(function($)
-{
-	$.fn.enable = function()
-	{
-		return this.each(function() {
-			$(this)
-			    .removeClass('ui-state-disabled')
-			    .removeProp('disabled');
-		});
-	};
-
-	$.fn.disable = function()
-	{
-		return this.each(function() {
-			$(this)
-			    .addClass('ui-state-disabled')
-			    .prop('disabled', true);
-		});
-	};
-})(jQuery);
-
-$(document).ready(function () {
-	$(":submit").button();
-	$(":checkbox").iphoneStyle();
-	$('form.auto').each(function(i, el) {
-		var id = $(this).attr('id');
-		var output = '#' + id + '_output';
-		$(this).ajaxForm({
-			target: output,
-			success: function() {
-			    $(output)
-				.css('font-style', 'italic')
-			    	.show('slow')
-			    	.delay(2000)
-				.fadeOut('slow');
-			}
-		});
-	});
-
-	$('#pkgdev').change(function() {
-		var arg = '0';
-		if ($(this).attr('checked'))
-			arg = '1';
-
-		$(this).disable();
-
-		$('#pkgdev_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?pkgdev=' + arg,
-		        function() {
-				$('#pkgdev').enable();
-				$('#pkgdev_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#https_toggle').change(function() {
-		var arg = 'off';
-		if ($(this).attr('checked'))
-			arg = 'on';
-
-		$(this).disable();
-
-		$('#https_output')
-		    .empty()
-		    .html('<img src=/img/loading.gif>Please Wait...')
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?act=https&val=' + arg,
-		        function() {
-				$('#https_toggle').enable();
-				$('#https_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#toolbar_toggle').change(function() {
-		var arg = '1';
-		if ($(this).attr('checked'))
-			arg = '0';
-
-		$(this).disable();
-
-		$('#toolbar_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?notoolbar=' + arg,
-		        function() {
-				$('#toolbar_toggle').enable();
-				$('#toolbar_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#mobile_toggle').change(function() {
-		var arg = '1';
-		if ($(this).attr('checked'))
-			arg = '0';
-
-		$(this).disable();
-
-		$('#mobile_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?nomobile=' + arg,
-		        function() {
-				$('#mobile_toggle').enable();
-				$('#mobile_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-});
-

var/mongoose/cgi-bin/status.jim

@@ -1,156 +1,49 @@
 #!/mod/bin/jimsh
 
-package require cgi
-source /mod/webif/lib/setup
-require system.class findhsvc epg.class
+puts "Content-Type: text/html"
+puts ""
 
-set runmode cli
-if {[string match {*jim} $argv0]} { set runmode cgi }
+if {[catch {set pid [exec pgrep humaxtv]}]} { exit }
 
-cgi_input
-
-set type [cgi_get type "full"]
-
-if {$runmode eq "cgi"} {
-	puts "Content-Type: text/html"
-	puts "Pragma: no-cache"
-	puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
-	puts ""
+if {[catch {set data [exec lsof -p $pid | grep Video | fgrep .ts]} ]} {
+        exit
 }
 
-if {[catch {set pid [exec pgrep humaxtv]}]} {
-	puts "Cannot find humaxtv process."
-	exit
+set lines [split $data "\n"]
+foreach line $lines {
+	regsub -all -- {[[:space:]]+} $line " " line
+	set fields [split $line " "]
+	set name [lindex [split $line "/"] end]
+	set size($name) [lindex $fields 6]
+	set seen($name) 0
 }
 
-proc get_data {} {
-	global pid
+sleep 2
 
-	set ret {}
-	if {[catch {set data \
-	    [exec /mod/bin/lsof -p $pid | grep Video | fgrep .ts]} ]} {
-		set ret {}
+set data [exec lsof -p $pid | grep Video | fgrep .ts]
+regsub -all -- {[[:space:]]+} $line " " line
+set lines [split $data "\n"]
+foreach line $lines {
+	regsub -all -- {[[:space:]]+} $line " " line
+	set fields [split $line " "]
+	set name [lindex [split $line "/"] end]
+	set size2 [lindex $fields 6]
+
+	if { $size2 > $size($name) && $seen($name) < 1 } {
+		set mode "Recording"
+		set icon "745_1_11_Video_1REC.png"
 	} else {
-		foreach line [split $data "\n"] {
-			regsub -all -- {[[:space:]]+} $line " " line
-			set name [file rootname [file tail $line]]
-			if {[dict exists $ret $name]} {
-				set ret($name) -1
-			} else {
-				set size [lindex [split $line " "] 6]
-				set ret($name) $size
-			}
-		}
+		set mode "Watching"
+		set icon "745_1_10_Video_2Live.png"
 	}
-	return $ret
-}
 
-set play 0
-set rec 0
-set seen {}
-set output {}
+	incr seen($name)
 
-if {$type eq "full"} {
-	set data [get_data]
-} else {
-	set data {}
-}
-
-if {[llength $data]} {
-	sleep 3
-	set ndata [get_data]
-	foreach name [array names ndata] {
-		if {![dict exists $seen $name]} { set seen($name) 0 }
-		if {![dict exists $data $name]} { set data($name) 0 }
-		if {$ndata($name) == -1} {
-			incr rec
-			incr play
-			set mode "Chase Playing"
-			set icon "745_1_11_Video_3REC_Live.png"
-		} elseif {$ndata($name) > $data($name) && $seen($name) < 1} {
-			incr rec
-			set mode "Recording"
-			set icon "745_1_11_Video_1REC.png"
-		} else {
-			incr play
-			set mode "Playing"
-			set icon "745_1_10_Video_2Live.png"
-		}
-
-		incr seen($name)
-
-		if {$runmode eq "cgi"} {
-			lappend output [concat \
-			    "<span class=\"va stitem\">\n" \
-			    "  <img class=va src=/images/$icon>\n" \
-			    "  <span>$mode&nbsp;<i>$name</i></span>\n" \
-			    "</span>\n" \
-			    ]
-		} else {
-			lappend output "$mode $name"
-		}
-	}
-}
-
-if {![system instandby] && $play < 1} {
-	set hsvc [system param CUR_SVC Value USERCONFIG]
-
-	set ff [$rsvdb query "
-		select usSvcid as svcid, usLcn as lcn,
-		substr(szSvcName, 2) as name
-		from channel.TBL_SVC
-		where hSvc = $hsvc
-		limit 1
-	"]
-
-	if {[llength $ff] == 1} {
-		lassign [lindex $ff 0] x svcid x lcn x name
-		set epgs [epg dbfetch get \
-		    -service $svcid \
-		    -time [clock seconds]\
-		]
-		set prog ""
-		if {[llength $epgs] == 1} {
-			lassign $epgs epg
-			set prog "- [$epg get name] ("
-			append prog "[clock format [$epg get start] -format %H:%M] - "
-			append prog "[clock format $([$epg get start] + [$epg get duration]) -format %H:%M]"
-			append prog ") \[[$epg percent]%\]"
-		}
-
-		if {$runmode eq "cgi"} {
-			lappend output [concat \
-			    "<span class=\"va stitem\">\n" \
-			    "  [epg channelicon $name 30 \
-			    {vertical-align: middle; padding: 0 4px 0 2px}]\n" \
-			    "  <span>Watching <i>$lcn: $name $prog</i></span>\n" \
-			    "</span>\n" \
-			    ]
-		} else {
-			lappend output "Watching $lcn: $name $prog"
-		}
-	}
-}
-
-if {[system instandby]} {
-	if {$runmode eq "cgi"} {
-		lappend output [concat \
-		    "<span class=\"va stitem\">\n" \
-		    "  <img class=va width=28 style=\"padding: 0 4px\"" \
-		    "src=/img/standby.png>\n" \
-		    "  <span>System is in standby.</span>\n" \
-		    "</span>" \
-		]
-	} else {
-		lappend output "System is in standby."
-	}
+	lappend output "<img class=va src=/images/$icon><span class=va>
+	    $mode&nbsp;$name</span><br>"
 }
 
 if {[llength $output]} {
-	if {$runmode eq "cgi"} {
-		puts [join $output "\n<br>\n"]
-	} else {
-		puts [join $output "\n"]
-	}
+	puts [join $output " "]
 }
 

var/mongoose/cgi-bin/transmission.jim

@@ -0,0 +1,13 @@
+#!/mod/bin/jimsh
+
+set url "http://$env(HTTP_HOST):9091/"
+
+puts "Content-Type: text/html
+Location: $url
+
+<meta http-equiv=refresh content=\"0; url=$url\">
+
+Transmission is available <a href=$url>here</a>
+
+"
+

var/mongoose/cgi-bin/xepg.jim

@@ -1,232 +0,0 @@
-#!/mod/bin/jimsh
-
-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 {<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />}
-
-[spinner new {
-	text "Loading Now/Next Information..."
-	size "1.2em"
-	style "margin: 1em;"
-	}] start
-
-require epg_popup
-
-set stt [cgi_get stt [clock seconds]]
-if {$stt <= [clock seconds]} {
-	set stt [clock seconds]
-	set current 1
-} else {
-	set current 0
-}
-
-set favgroup [[settings] channel_group]
-
-set hours 4.0
-set seconds $($hours * 3600)
-
-set ostt $stt
-set stt [expr int($stt / 1800.0) * 1800]
-
-set ett $(int($stt + $seconds))
-set offset $(($ostt - $stt) / 1800.0)
-
-set chanpx 120
-set eventpx 1000
-set totalpx $($chanpx + $eventpx)
-set contwidth $($totalpx + 50)
-
-set hourpx $($eventpx / $hours)
-set minpx $($hourpx / 60.0)
-set secpx $($minpx / 60.0)
-
-set start [clock milliseconds]
-if {$::qepg} {
-	if {$favgroup} {
-		set records [epg dbfetch dump \
-		    -trange "$stt:$ett" -fav $favgroup]
-	} else {
-		set records [epg dbfetch dump -trange "$stt:$ett"]
-	}
-
-} else {
-	require channelsort
-	set records [channelsort [epg fetch dump -trange "$stt:$ett"]]
-}
-set got [clock milliseconds]
-
-puts "<div id=buttons style=\"width: $eventpx; margin-left: ${chanpx}px;\">"
-if {$stt > [clock seconds]} {
-	puts "<button id=earlier>&lt;&lt;&lt; Earlier</button>"
-}
-puts "<button id=later>Later &gt;&gt;&gt;</button>"
-puts "</div>"
-
-puts "
-<div id=xepg style=\"min-width: ${contwidth}px; overflow: auto\">
-<div id=xepgnow></div>
-<div id=xegrid>
-"
-
-puts "<div id=epgdate style=\"width: ${eventpx}px; margin-left: ${chanpx}px;\">"
-puts [clock format $stt -format {%a %D}]
-puts "</div>"
-
-puts "<div class=xechan style=\"width: ${chanpx}px;\">&nbsp;</div>"
-for {set i 0} {$i < $hours * 2} {incr i} {
-	puts "<div class=xetime id=xe$i
-	    style=\"width: [expr $minpx * 30]px\">"
-	puts "[clock format $($stt + 1800 * $i) -format "%H:%M"]</div>"
-}
-
-set lim 0
-set lcn 0
-set bg "odd"
-
-foreach e $records {
-	set chnum [$e get channel_num]
-	if {$chnum == 0} { continue }
-
-	if {$chnum != $lcn} {
-		puts "<div class=xechan style=\"width: ${chanpx}px;\">"
-
-		puts "[$e channel_icon 30]&nbsp;"
-		puts "$chnum
-	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
-		title=\"[$e get channel_name]\">
-	    [$e get channel_name]
-	    </a></div>"
-
-		set lcn $chnum
-		set le 0
-		set pos 0
-		if {$bg eq "odd"} { set bg "even" } else { set bg "odd" }
-	}
-
-	set es [$e get start]
-	set ee [expr $es + [$e get duration]]
-
-	if {$es < $le} continue
-
-	if {$es < $stt} { set es $stt }
-	if {$ee > $ett} { set ee $ett }
-	set le $ee
-
-	set left [expr int(($es - $stt) * $secpx)]
-	set right [expr int(($ee - $stt - 1) * $secpx)]
-	set px $($right - $left)
-	if {$pos < $left} {
-		set px $($px + $left - $pos - 1)
-	} elseif {$pos > $left} {
-		set px $($px - ($pos - $left - 1))
-	}
-	incr pos $px
-
-	$e process_sched
-
-	set recopts 1
-	if {[$e get series_crid] ne ""} { set recopts 2 }
-
-	set perc [$e percent]
-	set showing 0
-	if {$perc > 0 && $perc < 100} { set showing 1 }
-
-	set txt "[cgi_quote_html [$e get name]] <span>([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append txt " ($perc%)" }
-	append txt "</span>"
-
-	set htxt "[cgi_quote_html [$e get name]] ([\
-	    clock format $es -format "%H:%M"] - [\
-	    clock format $ee -format "%H:%M"])"
-	if {$showing} { append hxt " ($perc%)" }
-
-	puts "<div class=\"xeprog $bg\"
-	    style=\"width: [expr $px - 4]px;\" title=\"$htxt\">
-	    <a class=event href=# xs=[$e get service_id]
-		xe=[$e get event_id] sch=[$e get sched_type]
-		rec=$recopts>"
-	puts $txt
-	puts "</a>"
-	puts "</div>"
-}
-puts "<div id=keypos style=\"float: left; clear: left;\"></div>"
-puts "</div>"
-puts "</div>"
-
-set earlier $($stt - 3600 * 4)
-
-puts "
-
-<div style=\"clear: both;\">
-<small><button id=epgswitch>
-	Switch to standard now/next display.
-</button></small>
-</div>
-
-<script type=text/javascript>
-\$(document).ready(function() {
-
-\$('#epgswitch').button().click(function() {
-	window.location = '/epg.shtml';
-});
-\$('#earlier').button().click(function() {
-	window.location = '/cgi-bin/xepg.jim?stt=$earlier';
-});
-\$('#later').button().click(function() {
-	window.location = '/cgi-bin/xepg.jim?stt=$ett';
-});
-"
-
-if {$current} {
-	puts {
-
-var kt = $('#xe0');
-var ktpos = kt.position();
-
-var height = $('#keypos').position().top - ktpos.top;
-
-	}
-	puts "var nowpos = ktpos.left + (kt.width() * $offset);"
-	puts {
-if (window.console)
-	console.log('NOWPOS: %d', nowpos);
-$('#xepgnow')
-	.css('left', nowpos + 'px')
-	.css('top', ktpos.top)
-	.height(height)
-	.show('slow');
-	}
-}
-
-puts "
-});
-</script>
-"
-
-puts "
-	<a href=/cgi-bin/settings.jim>
-	<img border=0 height=14 src=/images/421_1_00_CH_Title_2R_Arrow.png>
-	Visit settings to change EPG options.
-	</a><br>
-"
-
-epg cleanup
-
-set end [clock milliseconds]
-puts "<font class=footnote>
-    Retrieved in: [expr [expr $got - $start] / 1000.0] seconds.
-    </font>"
-
-footer
-

var/mongoose/html/backup.shtml

@@ -1,4 +1,4 @@
 <!--#include virtual="/lib/header.shtml" -->
-<!--#exec cmd="/mod/webif/include/backup.jim" -->
+<!--#exec cmd="/mod/var/mongoose/include/backup.jim" -->
 <!--#include virtual="/lib/footer.shtml" -->
 

var/mongoose/html/css/jconfirmaction.jquery.css

@@ -1,37 +0,0 @@
-
-.jcaquestion {
-	position: absolute;
-	display: inline;
-	text-align: center;
-	width: 174px;
-	height: 78px;
-	font-size: 13px;
-	line-height: 1.5em;
-	background: url('/img/bubble.png') left top no-repeat;
-	padding: 10px 0 0 0;
-	text-shadow: 0px 1px 0px #fff;
-	margin-left: -7em;
-	margin-top: -6em;
-	opacity: 0;
-}
-
-.jcayes, .jcacancel {
-	margin-top: .5em;
-	margin-right: .5em;
-	cursor: pointer;
-	display: inline-block;
-	width: 63px;
-	height: 21px;
-	color: #fff;
-	text-shadow: 0px 1px 0px #000;
-	background: url('/img/button.png') left top no-repeat;
-}
-
-.jcatitle {
-	font-size: 30px;
-	margin-bottom: 1.5em;
-	font-weight: bold;
-	font-style: italic;
-	text-shadow: 0px 2px 0px #fff;
-}
-

var/mongoose/html/css/jquery-ui.css

@@ -1,7 +1,7 @@
-/*!
- * jQuery UI CSS Framework 1.8.24
+/*
+ * jQuery UI CSS Framework 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -13,9 +13,12 @@
 .ui-helper-hidden { display: none; }
 .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
+.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
+.ui-helper-clearfix { display: inline-block; }
+/* required comment for clearfix to work in Opera \*/
+* html .ui-helper-clearfix { height:1%; }
+.ui-helper-clearfix { display:block; }
+/* end clearfix */
 .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
 
 
@@ -38,16 +41,16 @@
 .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
 
 
-/*!
- * jQuery UI CSS Framework 1.8.24
+/*
+ * jQuery UI CSS Framework 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming/API
  *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=ccff99&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=000000&iconColorHeader=554e34&bgColorContent=ffffcc&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=ccff99&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=000000&iconColorHeader=554e34&bgColorContent=ffffcc&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
  */
 
 
@@ -56,26 +59,26 @@
 .ui-widget { font-family: Segoe UI, Arial, sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Segoe UI, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #8e846b; background: #ffffcc url(images/ui-bg_highlight-soft_100_ffffcc_1x100.png) 50% top repeat-x; color: #383838; }
+.ui-widget-content { border: 1px solid #8e846b; background: #ffffcc url(/img/ui/ui-bg_highlight-soft_100_ffffcc_1x100.png) 50% top repeat-x; color: #383838; }
 .ui-widget-content a { color: #383838; }
-.ui-widget-header { border: 1px solid #494437; background: #ccff99 url(images/ui-bg_gloss-wave_45_ccff99_500x100.png) 50% 50% repeat-x; color: #000000; font-weight: bold; }
+.ui-widget-header { border: 1px solid #494437; background: #ccff99 url(/img/ui/ui-bg_gloss-wave_45_ccff99_500x100.png) 50% 50% repeat-x; color: #000000; font-weight: bold; }
 .ui-widget-header a { color: #000000; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d19405; background: #fece2f url(images/ui-bg_gloss-wave_60_fece2f_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #4c3000; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #4c3000; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #a45b13; background: #ffdd57 url(images/ui-bg_gloss-wave_70_ffdd57_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #381f00; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d19405; background: #fece2f url(/img/ui/ui-bg_gloss-wave_60_fece2f_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #4c3000; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1e5bbd; text-decoration: none; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #a45b13; background: #ffdd57 url(/img/ui/ui-bg_gloss-wave_70_ffdd57_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #381f00; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #381f00; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #655e4e; background: #ffffff url(images/ui-bg_inset-soft_30_ffffff_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #0074c7; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #0074c7; text-decoration: none; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #655e4e; background: #ffffff url(/img/ui/ui-bg_inset-soft_30_ffffff_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #0074c7; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #1e5bbd; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #eeb420; background: #fff9e5 url(images/ui-bg_gloss-wave_90_fff9e5_500x100.png) 50% top repeat-x; color: #1f1f1f; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #eeb420; background: #fff9e5 url(/img/ui/ui-bg_gloss-wave_90_fff9e5_500x100.png) 50% top repeat-x; color: #1f1f1f; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #1f1f1f; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #ffb73d; background: #d34d17 url(images/ui-bg_diagonals-medium_20_d34d17_40x40.png) 50% 50% repeat; color: #ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #ffb73d; background: #d34d17 url(/img/ui/ui-bg_diagonals-medium_20_d34d17_40x40.png) 50% 50% repeat; color: #ffffff; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -86,14 +89,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_d19405_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_d19405_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_554e34_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_3d3d3d_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_bd7b00_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_eb990f_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_ed9f26_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffe180_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(/img/ui/ui-icons_d19405_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(/img/ui/ui-icons_d19405_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(/img/ui/ui-icons_554e34_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(/img/ui/ui-icons_3d3d3d_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(/img/ui/ui-icons_bd7b00_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(/img/ui/ui-icons_eb990f_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(/img/ui/ui-icons_ed9f26_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(/img/ui/ui-icons_ffe180_256x240.png); }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -277,24 +280,34 @@
 ----------------------------------*/
 
 /* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; -khtml-border-top-left-radius: 8px; border-top-left-radius: 8px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; -khtml-border-top-right-radius: 8px; border-top-right-radius: 8px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; -khtml-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; -khtml-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
+.ui-corner-tl { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; border-top-left-radius: 8px; }
+.ui-corner-tr { -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; border-top-right-radius: 8px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; }
+.ui-corner-br { -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
+.ui-corner-top { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; border-top-left-radius: 8px; -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; border-top-right-radius: 8px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
+.ui-corner-right {  -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; border-top-right-radius: 8px; -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
+.ui-corner-left { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; border-top-left-radius: 8px; -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; }
+.ui-corner-all { -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #5c5c5c url(images/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
-.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(images/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
- * jQuery UI Resizable 1.8.24
+.ui-widget-overlay { background: #5c5c5c url(/img/ui/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
+.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(/img/ui/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Resizable#theming
  */
 .ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;
+	/* http://bugs.jqueryui.com/ticket/7233
+	 - Resizable: resizable handles fail to work in IE if transparent and content overlaps
+	*/
+	background-image:url(data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=);
+}
 .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
 .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
 .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
@@ -303,20 +316,20 @@
 .ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
 .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
 .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
- * jQuery UI Selectable 1.8.24
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Selectable#theming
  */
 .ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*!
- * jQuery UI Accordion 1.8.24
+/*
+ * jQuery UI Accordion 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -332,10 +345,10 @@
 .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
 .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
 .ui-accordion .ui-accordion-content-active { display: block; }
-/*!
- * jQuery UI Autocomplete 1.8.24
+/*
+ * jQuery UI Autocomplete 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -347,7 +360,7 @@
 * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
 
 /*
- * jQuery UI Menu 1.8.24
+ * jQuery UI Menu 1.8.13
  *
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -385,10 +398,10 @@
 	font-weight: normal;
 	margin: -1px;
 }
-/*!
- * jQuery UI Button 1.8.24
+/*
+ * jQuery UI Button 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -423,10 +436,10 @@ input.ui-button { padding: .4em 1em; }
 
 /* workarounds */
 button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*!
- * jQuery UI Dialog 1.8.24
+/*
+ * jQuery UI Dialog 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -444,10 +457,10 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
 .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*!
- * jQuery UI Slider 1.8.24
+/*
+ * jQuery UI Slider 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -467,10 +480,10 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
 .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
 .ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
- * jQuery UI Tabs 1.8.24
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -485,10 +498,10 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tabs .ui-tabs-hide { display: none !important; }
-/*!
- * jQuery UI Datepicker 1.8.24
+/*
+ * jQuery UI Datepicker 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
@@ -526,7 +539,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
 .ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
 .ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
+.ui-datepicker-row-break { clear:both; width:100%; }
 
 /* RTL support */
 .ui-datepicker-rtl { direction: rtl; }
@@ -543,6 +556,8 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 
 /* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
 .ui-datepicker-cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
     position: absolute; /*must have*/
     z-index: -1; /*must have*/
     filter: mask(); /*must have*/
@@ -550,14 +565,14 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}/*!
- * jQuery UI Progressbar 1.8.24
+}/*
+ * jQuery UI Progressbar 1.8.13
  *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Progressbar#theming
  */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+.ui-progressbar { height:2em; text-align: left; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }

var/mongoose/html/css/jquery.alerts.css

@@ -1,57 +0,0 @@
-#popup_container {
-	font-family: Arial, sans-serif;
-	font-size: 12px;
-	min-width: 300px; /* Dialog will be no smaller than this */
-	max-width: 600px; /* Dialog will wrap after this width */
-	background: #FFF;
-	border: solid 5px #999;
-	color: #000;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-#popup_title {
-	font-size: 14px;
-	font-weight: bold;
-	text-align: center;
-	line-height: 1.75em;
-	color: #666;
-	background: #CCC url(/img/jalert/title.gif) top repeat-x;
-	border: solid 1px #FFF;
-	border-bottom: solid 1px #999;
-	cursor: default;
-	padding: 0em;
-	margin: 0em;
-}
-
-#popup_content {
-	background: 16px 16px no-repeat url(/img/jalert/info.gif);
-	padding: 1em 1.75em;
-	margin: 0em;
-}
-
-#popup_content.alert {
-	background-image: url(/img/jalert/info.gif);
-}
-
-#popup_content.confirm {
-	background-image: url(/img/jalert/important.gif);
-}
-
-#popup_content.prompt {
-	background-image: url(/img/jalert/help.gif);
-}
-
-#popup_message {
-	padding-left: 48px;
-}
-
-#popup_panel {
-	text-align: center;
-	margin: 1em 0em 0em 1em;
-}
-
-#popup_prompt {
-	margin: .5em 0em;
-}

var/mongoose/html/css/jquery.bar.css

@@ -1,48 +0,0 @@
-.jbar{
-	height:50px;
-	width:100%;
-	background-color: #ffffcc;
-	color: #ff4000;
-	position:fixed;
-	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=95); 
-	opacity: 0.95;
-	-moz-opacity: 0.95;
-	text-align:center;
-	left:0px;
-	z-index:9999999;
-	margin:0px;
-	padding:0px;
-}
-.jbar-top{
-	top:0px;
-	border-top:2px solid #fff;
-	border-bottom: 1px solid #ebebeb;
-}
-.jbar-bottom{
-	bottom:0px;
-	border-bottom:2px solid #fff;
-	border-top: 1px solid #ebebeb;
-	color:#777;
-}
-.jbar-content{
-	line-height:46px;
-	font-size: 18px;
-	font-family:'Lucida Grande',sans-serif;
-}
-a.jbar-cross{
-	position:absolute;
-	width:31px;
-	height:31px;
-	background:transparent url(/images/cross.png) no-repeat top left;	
-	cursor:pointer;
-	right:10px;
-}
-a.jbar-cross:hover{
-	background-image: url(/images/cross_hover.png)
-}
-.jbar-top a.jbar-cross{
-	top:8px;	
-}
-.jbar-bottom a.jbar-cross{
-	bottom:8px;
-}

var/mongoose/html/css/jquery.contextMenu.css

@@ -54,18 +54,9 @@
 	classes to the respective LI element(s)
 */
 
-.contextMenu LI.pwedit A { background-image: url(/img/context/page_white_edit.png); }
-.contextMenu LI.pwcopy A { background-image: url(/img/context/page_white_copy.png); }
-.contextMenu LI.pwpaste A { background-image: url(/img/context/page_white_paste.png); }
-.contextMenu LI.pwdelete A { background-image: url(/img/context/page_white_delete.png); }
-.contextMenu LI.edit A { background-image: url(/img/context/edit.png); }
-.contextMenu LI.copy A { background-image: url(/img/context/copy.png); }
-.contextMenu LI.paste A { background-image: url(/img/context/paste.png); }
-.contextMenu LI.delete A { background-image: url(/img/context/delete.png); }
-.contextMenu LI.cut A { background-image: url(/img/context/cut.png); }
-.contextMenu LI.quit A { background-image: url(/img/context/door.png); }
-.contextMenu LI.compress A { background-image: url(/img/context/compress.png); }
-.contextMenu LI.dedup A { background-image: url(/img/context/dedup.png); }
-.contextMenu LI.decrypt A { background-image: url(/img/context/decrypt.png); }
-
-
+.contextMenu LI.edit A { background-image: url(images/page_white_edit.png); }
+.contextMenu LI.cut A { background-image: url(images/cut.png); }
+.contextMenu LI.copy A { background-image: url(images/page_white_copy.png); }
+.contextMenu LI.paste A { background-image: url(images/page_white_paste.png); }
+.contextMenu LI.delete A { background-image: url(images/page_white_delete.png); }
+.contextMenu LI.quit A { background-image: url(images/door.png); }

var/mongoose/html/css/jquery.progressbar.css

@@ -1,6 +1,6 @@
 
 /* progress bar container */
-.progressbar, #progressbar{
+#progressbar{
 	border:1px solid black;
 	width:200px;
 	height:20px;
@@ -8,7 +8,7 @@
 	color:black; 
 }
 /* color bar */
-.progressbar div.progress,#progressbar div.progress{
+#progressbar div.progress{
 	position:absolute;
 	width:0;
 	height:100%;
@@ -16,13 +16,13 @@
 	background-color:#369;
 }
 /* text on bar */
-.progressbar div.progress .text,#progressbar div.progress .text{
+#progressbar div.progress .text{
 	position:absolute;
 	text-align:center;
 	color:white;
 }
 /* text off bar */
-.progressbar div.text,#progressbar div.text{
+#progressbar div.text{
 	position:absolute;
 	width:100%;
 	height:100%;

var/mongoose/html/css/jqueryFileTree.css

@@ -1,91 +0,0 @@
-UL.jqueryFileTree {
-	font-family: Verdana, sans-serif;
-	font-size: 11px;
-	line-height: 18px;
-	padding: 0px;
-	margin: 0px;
-}
-
-UL.jqueryFileTree LI {
-	list-style: none;
-	padding: 0px;
-	padding-left: 20px;
-	margin: 0px;
-	white-space: nowrap;
-}
-
-UL.jqueryFileTree A {
-	color: #333;
-	text-decoration: none;
-	display: block;
-	padding: 0px 2px;
-}
-
-UL.jqueryFileTree A:hover {
-	background: #BDF;
-}
-
-/* Core Styles */
-.jqueryFileTree LI.directory { background: url(/img/filetree/directory.png) left top no-repeat; }
-.jqueryFileTree LI.expanded { background: url(/img/filetree/folder_open.png) left top no-repeat; }
-.jqueryFileTree LI.file { background: url(/img/filetree/file.png) left top no-repeat; }
-.jqueryFileTree LI.wait { background: url(/img/filetree/spinner.gif) left top no-repeat; }
-/* File Extensions*/
-.jqueryFileTree LI.ext_3gp { background: url(/img/filetree/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_afp { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_afpa { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_asp { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_aspx { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_avi { background: url(/img/filetree/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_bat { background: url(/img/filetree/application.png) left top no-repeat; }
-.jqueryFileTree LI.ext_bmp { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_c { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_cfm { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_cgi { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_com { background: url(/img/filetree/application.png) left top no-repeat; }
-.jqueryFileTree LI.ext_cpp { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_css { background: url(/img/filetree/css.png) left top no-repeat; }
-.jqueryFileTree LI.ext_doc { background: url(/img/filetree/doc.png) left top no-repeat; }
-.jqueryFileTree LI.ext_exe { background: url(/img/filetree/application.png) left top no-repeat; }
-.jqueryFileTree LI.ext_gif { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_fla { background: url(/img/filetree/flash.png) left top no-repeat; }
-.jqueryFileTree LI.ext_h { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_htm { background: url(/img/filetree/html.png) left top no-repeat; }
-.jqueryFileTree LI.ext_html { background: url(/img/filetree/html.png) left top no-repeat; }
-.jqueryFileTree LI.ext_jar { background: url(/img/filetree/java.png) left top no-repeat; }
-.jqueryFileTree LI.ext_jpg { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_jpeg { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_js { background: url(/img/filetree/script.png) left top no-repeat; }
-.jqueryFileTree LI.ext_lasso { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_log { background: url(/img/filetree/txt.png) left top no-repeat; }
-.jqueryFileTree LI.ext_m4p { background: url(/img/filetree/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mov { background: url(/img/filetree/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mp3 { background: url(/img/filetree/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mp4 { background: url(/img/filetree/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mpg { background: url(/img/filetree/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_mpeg { background: url(/img/filetree/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_ogg { background: url(/img/filetree/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_pcx { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_pdf { background: url(/img/filetree/pdf.png) left top no-repeat; }
-.jqueryFileTree LI.ext_php { background: url(/img/filetree/php.png) left top no-repeat; }
-.jqueryFileTree LI.ext_png { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_ppt { background: url(/img/filetree/ppt.png) left top no-repeat; }
-.jqueryFileTree LI.ext_psd { background: url(/img/filetree/psd.png) left top no-repeat; }
-.jqueryFileTree LI.ext_pl { background: url(/img/filetree/script.png) left top no-repeat; }
-.jqueryFileTree LI.ext_py { background: url(/img/filetree/script.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rb { background: url(/img/filetree/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rbx { background: url(/img/filetree/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rhtml { background: url(/img/filetree/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_rpm { background: url(/img/filetree/linux.png) left top no-repeat; }
-.jqueryFileTree LI.ext_ruby { background: url(/img/filetree/ruby.png) left top no-repeat; }
-.jqueryFileTree LI.ext_sql { background: url(/img/filetree/db.png) left top no-repeat; }
-.jqueryFileTree LI.ext_swf { background: url(/img/filetree/flash.png) left top no-repeat; }
-.jqueryFileTree LI.ext_tif { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_tiff { background: url(/img/filetree/picture.png) left top no-repeat; }
-.jqueryFileTree LI.ext_txt { background: url(/img/filetree/txt.png) left top no-repeat; }
-.jqueryFileTree LI.ext_vb { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_wav { background: url(/img/filetree/music.png) left top no-repeat; }
-.jqueryFileTree LI.ext_wmv { background: url(/img/filetree/film.png) left top no-repeat; }
-.jqueryFileTree LI.ext_xls { background: url(/img/filetree/xls.png) left top no-repeat; }
-.jqueryFileTree LI.ext_xml { background: url(/img/filetree/code.png) left top no-repeat; }
-.jqueryFileTree LI.ext_zip { background: url(/img/filetree/zip.png) left top no-repeat; }

var/mongoose/html/css/style.css

@@ -13,19 +13,6 @@ html>body
 	font-size: small;
 }
 
-.left, .cleft
-{
-	float: left;
-}
-.cleft
-{
-	clear: left;
-}
-fieldset.left, fieldset.cleft
-{
-	display: inline;
-}
-
 div.container
 {
 	position: relative;
@@ -83,24 +70,18 @@ table.borders, table.borders td, table.borders th
 	empty-cells: show;
 }
 
-.odd
+table tr.odd, table td.odd, table th.odd
 {
 	background: #ccff99;
 	color: black;
 }
 
-.even
+table tr.even, table td.even, table th.even
 {
 	background: #ffffcc;
 	color: black;
 }
 
-.hover
-{
-	background: #f6ff5b;
-	color: black;
-}
-
 table td,table th
 {
 	font-size: small;
@@ -127,7 +108,7 @@ table.keyval td
 	color: black;
 }
 
-pre, .pre, .prelike
+pre, .pre
 {
         font-family: Consolas, 'Courier New', Courier, monospace;
         color: black;
@@ -145,10 +126,7 @@ pre, .pre, .prelike
         -webkit-border-top-right-radius: 4px;
         -moz-border-radius-topright: 4px;
         -khtml-border-top-right-radius: 4px;
-}
 
-pre, .pre
-{
 	white-space: pre-wrap;
 	white-space: -moz-pre-wrap !important;
 	white-space: -pre-wrap;
@@ -247,12 +225,6 @@ pre, .pre
 	color: black;
 }
 
-.redshade
-{
-	background: #ff4000;
-	color: white;
-}
-
 img.progress
 {
 	background: transparent url(/img/percentback.png) top left no-repeat;
@@ -286,117 +258,3 @@ input.text
 	background-color: yellow;
 }
 
-.focused
-{
-	border: 2px solid red;
-}
-
-div.cut, div.keep
-{
-	position: absolute;
-	top: 0px;
-	text-align: center;
-	overflow: hidden;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-}
-
-div.keep
-{
-	background: green;
-	color: white;
-}
-
-div.cut
-{
-	background: #ff4000;
-	color: black;
-}
-
-.ui-button-text
-{
-	font-size: inherit !important;
-}
-
-.ui-button, .ui-button-text
-{
-	padding: 0;
-	font-size: 12px;
-}
-
-.also
-{
-	font-size: 0.9em;
-	font-style: italic;
-	color: #333;
-	background: transparent;
-}
-
-div.toolbarouter
-{
-	position: relative;
-}
-
-div.toolbar
-{
-	position: absolute;
-	top: -20px;
-	left: 30px;
-	z-index: 29;
-	display: none;
-	width: 80%;
-	border: 1px solid #899caa;
-	box-shadow: 2px 2px 11px #666;
-	-moz-box-shadow: 2px 2px 11px #666;
-	-webkit-box-shadow: 2px 2px 11px #666;
-	border-radius: 5px;
-	-moz-border-radius: 5px;
-	margin-top: -1px;
-	background: #d2e0ea;
-	padding: 6px;
-}
-
-span.toolbarcell
-{
-	float: left;
-	border-right: 1px solid #ccc;
-	text-align: center;
-	padding: 0 1em;
-}
-
-.tbhover
-{
-	background: #dfe8ef;
-	border-top: solid 1px #ccc;
-	border-left: solid 1px #ccc;
-}
-
-#tbstatus
-{
-	width: 100%;
-	border-top: 1px solid #ccc;
-	margin: 1em 0;
-	padding-top: 1em;
-}
-
-button.blue
-{
-	background: url(/img/gloss_wave_blue.png) repeat-x center;
-	border: 1px solid blue;
-	color: #ffffff;
-}
-
-button.green
-{
-	background: url(/img/gloss_wave_green.png) repeat-x center;
-	border: 1px solid green;
-	color: #ffffff;
-}
-
-button.red
-{
-	background: url(/img/gloss_wave_red.png) repeat-x center;
-	border: 1px solid green;
-	color: #ffffff;
-}
-

var/mongoose/html/css/tsort.css

@@ -10,16 +10,6 @@ table.tablesorter .header {
 	height: auto;
 }
 
-table.tablesorter .headerplain {
-	background-image: url(/img/tsort/bgplain.png);
-	background-repeat: no-repeat;
-	border-left: 1px solid #FFF;
-	border-right: 1px solid #000;
-	border-top: 1px solid #FFF;
-	padding-top: 8px;
-	height: auto;
-}
-
 table.tablesorter .headerSortUp {
 	background-image: url(/img/tsort/asc.png);
 	background-repeat: no-repeat;

var/mongoose/html/css/xepg.css

@@ -1,113 +0,0 @@
-div#xepg
-{
-	position: relative;
-}
-
-div#xepgnow
-{
-	display: none;
-	position: absolute;
-	width: 2px;
-	height: 100%;
-	background: yellow;
-	top: 0px;
-	left: 0px;
-	z-index: 9999;
-	box-shadow: 2px 2px 11px #666;
-	-moz-box-shadow: 2px 2px 11px #666;
-	-webkit-box-shadow: 2px 2px 11px #666;
-	opacity:0.7;
-	/*filter:alpha(opacity=70);*/
-}
-
-div.xetick
-{
-	display: none;
-	position: absolute;
-	width: 1px;
-	height: 100%;
-	background: #ccc;
-	top: 0px;
-	left: 0px;
-/*
-	z-index: 9999;
-	box-shadow: 2px 2px 11px #666;
-	-moz-box-shadow: 2px 2px 11px #666;
-	-webkit-box-shadow: 2px 2px 11px #666;
-	opacity:0.7;
-*/
-	/*filter:alpha(opacity=70);*/
-}
-
-div#epgdate
-{
-	border-left: 1px solid #669933;
-	border-right: 1px solid #669933;
-	border-top: 1px solid #669933;
-	clear: left;
-	float: left;
-}
-
-/*
-div#xegrid
-{
-}
-*/
-
-div.xerow
-{
-}
-
-div.xechan
-{
-	vertical-align: middle;
-	float: left;
-	clear: left;
-	white-space: nowrap;
-	overflow: hidden;
-	height: 25px;
-	padding: 3px 0;
-	margin: 3px 0;
-}
-
-div.xechan img
-{
-	vertical-align: middle;
-}
-
-div.xetime
-{
-	float: left;
-	border-left: 1px solid #669933;
-}
-
-div.xeprog
-{
-	overflow: hidden;
-	white-space: nowrap;
-	float: left;
-	vertical-align: middle;
-	height: 25px;
-	padding: 4px 0 3px 2px;
-	margin: 3px 0 3px 2px;
-	border: 1px solid #ccc;
-	border-radius: 10px;
-	-moz-border-radius: 10px;
-}
-
-div.xeprog span
-{
-	font-style: italic;
-	font-size: 0.7em;
-}
-
-div#buttons
-{
-	padding: 0.5em;
-}
-
-button#later
-{
-	margin-left: 2em;
-}
-

var/mongoose/html/dedup/dedup

@@ -1,78 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require ts.class
-
-source /mod/webif/html/dedup/normalise.jim
-source /mod/webif/html/dedup/process.jim
-
-set dirs {}
-
-set doit 0
-foreach arg $argv {
-	if {$arg eq "-yes"} {
-		set doit 1
-	} else {
-		lappend dirs $arg
-	}
-}
-if {![llength $dirs]} { lappend dirs [exec pwd] }
-
-foreach dir $dirs {
-	if {[string index $dir end] eq "/"} {
-		set dir [string range $dir 0 end-1]
-	}
-	puts "\[$dir\]"
-	loadseries $dir
-
-	foreach file [readdir $dir] {
-		if {[file extension $file] ne ".hmt"} { continue }
-
-		set file "$dir/$file"
-
-		set base [file tail [file rootname $file]]
-		lassign [dedupprocess $file] stat ts syn fn
-
-		puts -nonewline "$base -> "
-
-		switch $stat {
-		    inuse {
-			puts -nonewline "In Use"
-		    }
-		    dup {
-			puts -nonewline "Duplicate"
-			if {$doit} {
-				set dupdir "$dir/_duplicates"
-				if {![file exists $dupdir]} {
-					file mkdir $dupdir
-				}
-				while {[file exists $dupdir/$fn.hmt]} {
-					append fn "~"
-				}
-				ts renamegroup $file "_duplicates/$fn"
-				puts -nonewline " - Renamed to _duplicates/$fn"
-			}
-		    }
-		    error {
-			puts -nonewline "Cannot process"
-		    }
-		    nothing {
-			puts -nonewline "Nothing to do"
-		    }
-		    preserve {
-			puts -nonewline "Preserving"
-		    }
-		    ok {
-			puts -nonewline $fn
-			if {$doit} {
-				# Dooooo, it.
-				$ts settitle $syn
-				ts renamegroup $file $fn
-				puts -nonewline " ... Done"
-			}
-		    }
-		}
-		puts ""
-	}
-}
-

var/mongoose/html/dedup/dedup.jim

@@ -1,102 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-require ts.class pretty_size altrow
-
-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 "<script type=text/javascript src=script.js></script>"
-
-puts "<fieldset style=\"display: inline\">
-<legend>De-duplicate <span id=dir>$dir</span></legend>
-<table class=borders>
-<tr>
-	<th>File</th>
-	<th>Proposed Filename</th>
-	<th>Proposed Title</th>
-	<th>Status</th>
-</tr>
-"
-
-loadseries $dir
-foreach file [readdir $dir] {
-	set file "$dir/$file"
-	if {[file extension $file] ne ".hmt"} { continue }
-
-	set base [file tail [file rootname $file]]
-	lassign [dedupprocess $file] stat ts syn fn
-
-	altrow
-	puts "<td nowrap>$base</td>"
-	puts "<td>$fn</td>"
-	puts "<td>$syn</td>"
-	puts "<td>"
-	switch $stat {
-	    inuse {
-		puts -nonewline "In Use"
-	    }
-	    dup {
-		puts -nonewline "Duplicate"
-		if {$doit} {
-			set dupdir "$dir/_duplicates"
-			if {![file exists $dupdir]} { file mkdir $dupdir }
-			while {[file exists $dupdir/$fn.hmt]} {
-				append fn "~"
-			}
-			ts renamegroup $file "_duplicates/$fn"
-			puts -nonewline " - Renamed to _duplicates/$fn"
-		}
-	    }
-	    error {
-		puts -nonewline "Cannot process"
-	    }
-	    nothing {
-		puts -nonewline "Nothing to do"
-	    }
-	    preserve {
-		puts -nonewline "Preserving"
-	    }
-	    ok {
-		if {$doit} {
-			# Dooooo, it.
-			$ts settitle $syn
-			ts renamegroup $file $fn
-			puts -nonewline "Done"
-		}
-	    }
-	}
-	
-	puts "</td>"
-	puts "</tr>"
-}
-
-puts {
-</table>
-</fieldset>
-<div style="padding-top: 2em">
-<small>
-<button id=browse>Back to media browser</button>
-}
-
-if {!$doit} { puts "<button id=dedup>Process folder</button>" }
-
-puts {
-</small>
-</div>
-}
-
-footer
-

var/mongoose/html/dedup/normalise.jim

@@ -1,83 +0,0 @@
-#!/mod/bin/jimsh
-
-set dedup_prefixes {
-	{^new series\.* *}
-	{^cbeebies\.* *}
-	{^cbbc\.* *}
-	{^brand new series *-* *}
-	{^\.+}
-}
-
-proc loadseries {dir} {
-	global seriesmap
-	set seriesmap [dict create]
-
-	if {![file exists "$dir/series.info"]} { return }
-
-	if {[catch {set fd [open "$dir/series.info" "r"]} msg]} {
-		puts "Error opening series.info: $msg"
-		return
-	}
-
-	foreach line [split [read $fd] "\n\r"] {
-		set i [string first " ==> " $line]
-		if {$i == -1} { continue }
-		set name [string range $line 0 $($i - 1)]
-		set prefix [string range $line $($i + 5) end]
-		if {$prefix eq ""} { continue }
-		dict set seriesmap $name $prefix
-		regsub -all -- {[[:space:]]+} [string tolower $name] "" name
-		dict set seriesmap $name $prefix
-	}
-	$fd close
-}
-
-proc dedupnormalise {title {reserve ""}} {
-	global dedup_prefixes seriesmap
-
-	# Strip common prefixes
-	foreach prefix $dedup_prefixes {
-		regsub -nocase -all -- $prefix $title "" title
-	}
-
-	# Strip anything following a colon.
-	regsub -all -- { *[:].*$} $title "" title
-
-	# If the resulting string is longer than 40 characters then
-	# split around . and take the left hand side if appropriate.
-	if {[string length $title] > 40} {
-		lassign [split $title "."] v w
-		set title $v
-		if {[string length $title] < 6 && [string length $w] < 6} {
-			append title "_$w"
-		}
-	}
-
-	# if still short, add the reserve string.
-	if {[string length $title] < 10} {
-		if {[string match "${title}*" $reserve]} {
-			set title $reserve
-		} else {
-			append title " $reserve"
-		}
-	}
-
-	if {[dict exists $seriesmap $title]} {
-		set ntitle "$seriesmap($title): $title"
-		set title $ntitle
-	} else {
-		# Try lower case without spaces
-		regsub -all -- {[[:space:]]+} [string tolower $title] "" ntitle
-		if {[dict exists $seriesmap $ntitle]} {
-			set title "$seriesmap($ntitle): $title"
-		}
-	}
-
-	# Shorten if too long.
-	if {[string length $title] > 40} {
-		set title [string range $title 0 39]
-	}
-
-	return $title
-}
-

var/mongoose/html/dedup/process.jim

@@ -1,31 +0,0 @@
-#!/mod/bin/jimsh
-
-require system.class
-
-proc dedupprocess {file} {{seen {}}} {
-	set ts [ts fetch $file 1]
-	set dir [file dirname $file]
-	set base [file tail [file rootname $file]]
-	set syn [dedupnormalise [$ts get synopsis] [$ts get title]]
-	# Escape special characters to create the filename.
-	regsub -all -- {[\/ &]} $syn "_" fn
-	regsub -all -- {[?]} $fn "" fn
-
-	set stat ok
-	if {[system inuse [file rootname $file]]} {
-		set stat inuse
-	} elseif {$fn in $seen} {
-		set stat dup
-	} elseif {[string length $syn] > 40} {
-		set stat error
-	} elseif {$base eq $fn} {
-		set stat nothing
-	} elseif {[file exists "$dir/$fn.ts"]} {
-		set stat preserve
-	}
-
-	lappend seen $fn
-
-	return [list $stat $ts $syn $fn]
-}
-

var/mongoose/html/dedup/script.js

@@ -1,14 +0,0 @@
-
-$(function() {
-
-$('#browse').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' +
-	    encodeURIComponent($('#dir').text());
-});
-
-$('#dedup').button().click(function() {
-	window.location = window.location + '&doit=1';
-});
-
-});
-