tag 0.8.8

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

CONTROL/conffiles

@@ -1,6 +0,0 @@
-webif/html/css/EXTRA.css
-webif/html/favicon.ico
-webif/html/img/fav/57.png
-webif/html/img/fav/72.png
-webif/html/img/fav/114.png
-webif/html/img/fav/144.png

CONTROL/control

@@ -1,10 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.1
+Version: 0.8.8-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.1.14),lighttpd(>=1.4.35-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.3),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,mongoose,recmon(>=2.0.2)
-Suggests:
+Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.2),ssmtp,anacron
+Suggests: ffmpeg,webif-iphone,nicesplice,id3v2
 Description: An evolving web interface for the Humax.
-Tags: http://hummy.tv/forum/threads/5866/

CONTROL/postinst

@@ -1,60 +1,17 @@
 #!/bin/sh
 
-# Relocate any stray files in /mod/var/mongoose
-
-if [ -d /mod/var/mongoose -a ! -h /mod/var/mongoose ]; then
-	(
-		cd /mod/var/mongoose
-		find . | cpio -pmud /mod/webif
-		cd /mod/var
-		rm -rf mongoose
-		ln -s ../webif mongoose
-	)
-fi
-
 export tmpf=/tmp/cronf.$$
 
-# Add cron jobs
-
-crontab=$PKG_ROOT/bin/crontab
-if [ -x $crontab ]; then
-	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
-	cat $tmpf - << EOM | $crontab -
-*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1
-EOM
-fi
-
 # Add anacron jobs
 
 ana=$PKG_ROOT/etc/anacrontab
-egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
-cat $tmpf - << EOM > $ana
-1 8 sched_backup /mod/webif/html/backup/backup.jim
-1 5 diskattrs /mod/webif/lib/bin/diskattrs
-EOM
+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 &
 
-[ -f /tmp/webif_auto.log ] && rm -f /tmp/webif_auto.log
-
-if [ ! -f /mod/webif/.strip-updated ]; then
-	echo "*********************************"
-	echo "* Please wait while any shrunk recordings are flagged..."
-	echo "*********************************"
-	/mod/webif/lib/bin/strip-update
-
-	touch /mod/webif/.strip-updated
-fi
-
-/mod/webif/lib/bin/diskattrs
-#/mod/webif/lib/bin/resetnew
-
-# Remove hook script placed by the legacy rt3070 package which does not work
-# with CFW >= 3.00
-hook=/mod/boot/xinit.d/rt3070
-[ -f $hook ] && rm -f $hook
-
-[ -f $tmpf ] && rm -f $tmpf
-
 exit 0
 

CONTROL/preinst

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# Handle moving the legacy /var/mongoose directory to /webif..
-
-if [ -h /mod/webif -a -d /mod/var/mongoose -a ! -h /mod/var/mongoose ]; then
-	echo "Relocating web interface files..."
-
-	cd /mod
-	rm webif || exit 1
-	mv var/mongoose webif || exit 1
-	cd var
-	ln -s ../webif mongoose
-fi
-
-exit 0
-

CONTROL/prerm

@@ -2,17 +2,9 @@
 
 export tmpf=/tmp/cronf.$$
 
-crontab=$PKG_ROOT/bin/crontab
-if [ -x $crontab ]; then
-	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
-	[ -s $tmpf ] && $crontab $tmpf || $crontab -r
-fi
-
 ana=/mod/etc/anacrontab
-egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
+grep -v 'backup/backup.jim' $ana > $tmpf
 cp $tmpf $ana
 
-[ -f $tmpf ] && rm -f $tmpf
-
 exit 0
 

bin/status

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

bin/version

@@ -1,21 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require system.class
-
-set modver [system modversion]
-set modbuild [system modbuild]
-if {$modbuild > 0} {
-	append modver " (build $modbuild)"
-}
-catch {set fhtcpversion [system fhtcpversion]}
-catch {set kernelver [system kernelver]}
-
-puts "
-Humax [system model] Fox T2 ([system hostname])
-  Humax Version: $fhtcpversion (kernel $kernelver)
-  Custom firmware version: $modver
-  Web interface version: [system pkgver webif]
-  Serial Number: [system serialno]
-"
-

etc/init.d/S60parseepg

@@ -1,16 +1,16 @@
 #!/bin/sh
 
-if [ "`cat /etc/model`" = HD ]; then
-	epg=/media/drive1/epgsavedata
-	epgdb=/media/drive1/epg.db
-else
+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 2>&1 &
+		/mod/bin/epg -f $epg sqlitedumpd $epgdb > /tmp/epgd.log &
 		;;
 	stop)
 		killall -q epg

etc/recmon.d/webiflog

@@ -1,24 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require ts.class system.class
-
-set file [lindex $argv 0]
-set ts [ts fetch "$file.ts"]
-set root [system mediaroot]
-
-set dir [file dirname $file]
-if {[string match "$root*" $dir]} {
-	set dir [string range $dir $([string length $root] + 1) end]
-}
-set ch [$ts get channel_name]
-set dur [$ts duration]
-set title [$ts get title]
-
-set msg "Recorded: $dir/$title ($dur minutes - $ch)"
-set logfd [open "/mod/tmp/record.log" "a+"]
-puts $logfd "[\
-    clock format [clock seconds] -format "%d/%m/%Y %H:%M"\
-    ] - $msg"
-$logfd close
-

var/mongoose

@@ -1 +0,0 @@
-../webif

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

@@ -0,0 +1,86 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+require rsv.class
+
+set dir /mod/var/backup
+
+puts "Content-Type: text/html"
+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 $(7 * 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 
+		}
+	}
+}
+
+set ffile "/$dir/$file.rbk"
+
+if {[file exists $ffile]} {
+	puts "Backup file <i>$file</i> already exists."
+	exit
+}
+
+if {[catch { set fd [open $ffile w] } msg]} {
+	puts "Error creating backup file. - $msg"
+	exit
+}
+
+puts "Backing up scheduled recordings and events..."
+
+set events [rsv list]
+
+set fields [lsort [[rsv] vars]]
+
+#puts $fd "# [join $fields "\t"]"
+
+foreach event $events {
+	puts "  Backing up scheduled event '[$event name]'"
+	puts -nonewline $fd "event\t"
+
+	foreach f $fields {
+		if {$f eq "aulEventToRecordInfo"} { continue }
+		puts -nonewline $fd "[$event get $f]\t"
+	}
+	puts $fd ""
+}
+puts "Done."
+
+puts "Backing up channel favourites..."
+
+set grp 0
+foreach res [$rsvdb query {
+	select	eFavGroup,
+		TBL_FAV.eSvcType,
+		substr(szSvcName, 2) as szSvcName
+	from TBL_FAV join TBL_SVC using (hSvc)
+	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)"
+}
+puts "Done."
+
+close $fd
+rsv cleanup
+

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

@@ -1,14 +1,12 @@
 
 function refresh_files()
 {
-	$('#backup_files').load('files.jim', function() {
+	$('#backup_files').load('/cgi-bin/backup/files.jim', function() {
 		$('input.restore').change(function() {
 			$('#restore_button').removeAttr('disabled')
 			    .button('option', 'disabled', false);
 			$('#delete_button').removeAttr('disabled')
 			    .button('option', 'disabled', false);
-			$('#view_button').removeAttr('disabled')
-			    .button('option', 'disabled', false);
 		});
 	});
 }
@@ -20,7 +18,7 @@ $(document).ready(function() {
 
 	$('#backup_button').click(function() {
 		$('#backup_working').slideDown();
-		$('#results').load('backup.jim?' +
+		$('#results').load('/cgi-bin/backup/backup.jim?' +
 		    $('#backup_name').serialize(), function() {
 			$('#results').slideDown(function() {
 				$('#backup_working').slideUp();
@@ -32,7 +30,7 @@ $(document).ready(function() {
 		var backup = $('input.restore:checked').val();
 		if (confirm('Confirm deletion of ' + backup))
 		{
-			$('#results').load('delete.jim?' +
+			$('#results').load('/cgi-bin/backup/delete.jim?' +
 			    $('input.restore').serialize(), function() {
 				$('#results').slideDown(function() {
 					refresh_files();
@@ -40,21 +38,12 @@ $(document).ready(function() {
 			});
 		}
 	});
-	$('#view_button').click(function() {
-		var backup = $('input.restore:checked').val();
-		$('#results').load('view.jim?' +
-		    $('input.restore').serialize(), function() {
-			$('#results').slideDown(function() {
-				refresh_files();
-			});
-		});
-	});
 	$('#restore_button').click(function() {
 		var backup = $('input.restore:checked').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();
-			$('#results').load('restore.jim?' +
+			$('#results').load('/cgi-bin/backup/restore.jim?' +
 			    $('input.restore').serialize(), function() {
 				$('#results').slideDown(function() {
 					$('#restore_working').slideUp();

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

@@ -1,18 +1,24 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 
 set dir /mod/var/backup
 
-httpheader
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
 
-set file [file tail [cgi_get restore_file]]
-if {$file == 0} {
+cgi_input
+#cgi_dump
+
+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]} {

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

@@ -1,9 +1,11 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
 
-httpheader
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
 
 set dir "/mod/var/backup"
 

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

@@ -0,0 +1,128 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+
+require rsv.class findhsvc system.class
+
+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 "Restoring scheduled events from <i>$file</i>..."
+
+$rsvdb query {begin transaction;}
+$rsvdb query {delete from TBL_RESERVATION;}
+
+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]
+
+	# Need to fix up channel and CRID mappings in case something has
+	# changed during a channel scan.
+
+	puts "  Restoring [$rsv name]"
+
+	set bad 0
+	# First, the service number
+	set ohsvc [$rsv get hsvc]
+	if {$ohsvc > 0} {
+		set hsvc [$rsv fix_hsvc]
+		if {$hsvc == 0} {
+			puts "    Cannot find channel, restore failed."
+			set bad 1
+		} elseif {$hsvc != $ohsvc} {
+			puts -nonewline "    Service number has "
+			puts "changed $ohsvc -> $hsvc, fixing."
+		} else {
+			puts "    No change in channel service."
+		}
+	}
+
+	if {!$bad} {
+		if {[catch {$rsv insert pending 1} msg]} {
+			puts "    Error inserting event, $msg"
+		}
+	}
+}
+
+$rsvdb query {commit transaction;}
+
+puts "Restoring favourite channels..."
+$rsvdb query {begin transaction;}
+$rsvdb query {delete from channel.TBL_FAV}
+
+set grp 0
+foreach line $data {
+	set vals [split $line "\t"]
+	if {[lindex $vals 0] ne "fav"} { continue }
+
+	set group [lindex $vals 1]
+	set type [lindex $vals 2]
+	set chan [lindex $vals 3]
+	set hsvc [get_channel_attr $chan]
+
+	if {$grp != $group} {
+		set grp $group
+		puts "  Group $grp"
+	}
+
+	puts "    $chan"
+
+	if {!$hsvc} {
+		puts "        Cannot map channel name to service."
+		continue
+	}
+
+	set query "
+		insert into channel.TBL_FAV(hSvc, eFavGroup, eSvcType)
+		values($hsvc, $group, $type);
+	"
+
+	$rsvdb query $query
+}
+
+$rsvdb query {commit transaction;}
+
+system restartpending
+
+close $fd
+rsv cleanup
+

var/mongoose/cgi-bin/browse.jim

@@ -0,0 +1,444 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size system.class settings.class escape
+
+puts "Content-Type: text/html"
+puts ""
+
+set nicesplice [system pkginst nicesplice]
+set flatten [system pkginst flatten]
+
+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/"
+}
+
+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
+}
+
+proc directory {file bfile} {
+	global flatten
+
+	regsub -all " +" $bfile "" tbfile
+	puts "<div class=va>"
+	puts "<img border=0 class=va id=\"img$tbfile\"
+	    src=/images/711_1_09_Media_Folder.png>"
+	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 "$bfile</a><span class=filesize id=\"$tbfile\">
+		</span>"
+
+	set noflat 0
+	if $flatten {
+		if {[string match {\[*\]} [file tail $file]]} { set noflat 1 }
+		if {[file exists "$file/.noflatten"]} {
+			set noflat 1
+		}
+
+		if $noflat {
+			puts "<img alt=\"No-flatten\" title=\"No-flatten\"
+			    class=va src=/img/flat-tyre.png height=21>"
+		}
+	}
+
+	puts -nonewline "
+	      <a href=#>
+		<img class=\"dopt va\" border=0 width=45 "
+	if $flatten { puts -nonewline "noflat=$noflat " }
+	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>"
+}
+
+proc entry {file} {{i 0}} {
+	set bfile [file tail $file]
+	if {[string index $bfile 0] == "\025"} {
+		set bfile [string range $bfile 1 end]
+	}
+	if [file isdirectory "$file"] {
+		directory $file $bfile
+		continue
+	}
+	set ext [file extension $file]
+	if {$ext in $::ignore || $ext ni $::include} { continue }
+
+	file stat $file st
+	set sz [pretty_size $st(size)]
+
+	set base [file rootname $file]
+
+	if {$ext eq ".ts" && [file exists "${base}.nts"]} {
+		set type ts
+		set ts [ts fetch $file 1]
+		set img Video_TS
+	} else {
+		set type gen
+		set ts 0
+		set img Video_Other
+	}
+
+	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 }
+
+	set fscl "fs"
+	if {$type eq "ts"} {
+		set fscl "fs fsts"
+	}
+
+	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 file=\"[cgi_quote_url $file]\" type=$type href=#>
+		    $bfile
+	        </a>
+	"
+
+	# Size
+	puts "<span class=filesize> ($sz) </span>"
+
+	# Icons
+
+	set locked 0
+	set encd 0
+	set odencd 1
+	set def unknown
+	set bx 0
+	if {$type eq "ts"} {
+		# HD / SD
+		if {[$ts get definition] eq "HD"} {
+			set def HD
+			set img "172_1_00_HD"
+		} else {
+			set def SD
+			set img "172_1_26_SD"
+		}
+		puts "<img class=va src=/images/$img.png height=21>"
+
+		# Locked
+		if {[$ts flag "Locked"] > 0} {
+			set locked 1
+			puts "<img class=va src=/images/178_1_00_Icon_Lock.png
+			    height=21>"
+		}
+
+		# Encrypted
+		if {[$ts flag "Encrypted"] > 0} {
+			set encd 1
+			puts "<img class=va
+			    src=/images/749_1_26_Video_Encryption.png
+			    height=21>"
+		}
+		if {![$ts flag "ODEncrypted"]} {
+			puts "<img class=va src=/img/Decrypted.png height=21>"
+			set odencd 0
+		}
+
+		# Guidance
+		if {[$ts flag "Guidance"] > 0} {
+			puts "<img class=va
+			    src=/images/174_1_26_GuidancePolicy.png
+			    height=21>"
+		}
+
+		set bx [$ts get bookmarks]
+	}
+
+	# Opt+ button
+
+	puts "
+	      <a href=#>
+		<img class=\"opt va\" border=0 width=45 type=$type did=$i
+		    locked=$locked encd=$encd def=$def new=$new bx=$bx
+		    odencd=$odencd
+		    src=/images/181_1_00_Help5_OPT_Plus.png>
+	      </a>
+	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
+	"
+	puts "</div>"
+}
+
+set dir [cgi_get dir [system mediaroot]]
+
+######################################################################
+# Render web page
+
+header
+
+puts { 
+	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
+	<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
+
+	<ul id=optmenu class=contextMenu>
+		<li class=delete><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>
+}
+if {[system model] eq "HDR"} {
+	puts { <li class="separator"><a href=#decrypt>Decrypt</a></li> }
+}
+if {[system pkginst ffmpeg]} {
+	puts { <li><a href=#audio>Extract Audio</a></li> }
+}
+if $nicesplice {
+	puts { <li class="cut separator"><a href=#crop>Crop</a></li> }
+}
+puts {
+	</ul>
+
+	<ul id=doptmenu class=contextMenu>
+		<li class=delete><a href=#delete>Delete</a></li>
+		<li><a href=#rename>Rename</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=dialogue></div>
+	<div id=confirm title="Confirmation Required"></div>
+
+	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
+}
+
+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" }
+	append stub $name
+	puts "<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $stub]>$name</a>
+}
+puts "<span class=filesize id=dirsize></span>"
+puts "</legend>"
+
+# Parent directory
+set parent [join [lrange [split $dir /] 0 end-1] /]
+if {$parent ne ""} {
+	puts "
+	    <div class=va>
+		<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $parent]>
+		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
+			\[parent directory\]</a>
+	    </div>
+	"
+}
+
+# Strip double slashes
+regsub -all -- {\/+} "$dir/*" "/" dir
+
+# Escape square brackets (for glob)
+regsub -all {([\\[])} $dir {\\\1} dir
+
+proc s_time {a 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
+	}
+
+	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 files [glob -nocomplain $dir]
+switch $order {
+	1 {		set files [lsort -command s_time $files] }
+	default {	set files [lsort $files] }
+}
+
+foreach file $files { entry $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 "<div class=brow>"
+
+puts {
+<button id=delete>Delete</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/audio.jim

@@ -0,0 +1,109 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/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]
+
+if {[cgi_get do] eq "it"} {
+	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"
+
+	exit
+}
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
+
+<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>
+"
+
+puts {
+
+<div style="margin-top: 10px"></div>
+<div id=audiodiv><button id=audioit>Perform audio extraction</button></div>
+<div id=progressdiv style="display: none">
+Extracting audio: <div id=progressbar></div>
+}
+puts "<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+    style=\"display: none\">Back to media list</button>"
+puts {
+<div id=output class=pre style="margin-top: 10px"></div>
+</div>
+
+<script type=text/javascript>
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/audio_progress.jim?file='
+	    + $('#back').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=' + $(this).attr('dir');
+});
+
+$('#audioit').button().click(function() {
+	$('#audiodiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').load(document.URL + '&do=it', function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+</script>
+</div>
+
+}
+

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

@@ -1,10 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require ts.class
 
-httpheader
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
 
 set tsfile [cgi_get file]
 set rfile [file normalize $tsfile]

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

@@ -0,0 +1,536 @@
+(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);
+
+function disableall()
+{
+	$('button,a,input').disable();
+}
+
+function epginfo_callback(data, status, xhr)
+{
+	var width = 85;
+
+	if (status != 'success')
+		return;
+
+	//console.log(status);
+	//console.dir(data);
+
+	$('#titleorig').val(data.title);
+	$('#renametitle').val(data.title);
+	if (data.synopsis.length > width)
+		data.synopsis = data.synopsis.substring(0, width) + '...';
+	$('#synopsis').html(data.synopsis);
+	$('tr.tstype').show('slow');
+}
+
+function insert_folder_size(folder, size)
+{
+	folder = folder.replace(/ /g, '');
+	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+	//console.log("Folder: (%s) = (%s)", folder, size);
+	if (folder == "")
+		$('#dirsize').text(' (' + size + 'iB)');
+	else
+		$('#' + folder).text(' (' + size + 'iB)');
+}
+
+function folder_size_callback(data, status, xhr)
+{
+	//console.log("Status: %s", status);
+	//console.dir(data);
+	$.each(data, insert_folder_size);
+}
+
+function set_folder_new(folder, cnt)
+{
+	folder = folder.replace(/ /g, '');
+	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
+	//console.log("Folder: (%s) = (%s)", folder, cnt);
+	$('#img' + folder).attr('src', '/img/Folder_New.png');
+}
+
+function new_folder_callback(data, status, xhr)
+{
+	//console.log("Status: %s", status);
+	//console.dir(data);
+	$.each(data, set_folder_new);
+}
+
+function delete_callback(file, type, id)
+{
+	var el = 'div.bf#' + id;
+	var results = el + ' .results';
+	var url = '/cgi-bin/browse/delete.jim?file=' + file +
+	    '&type=' + type;
+	$(results)
+	    .html('<img src=/img/loading.gif>Deleting, please wait...')
+	    .slideDown('slow')
+	    .load(url, function() {
+		$(el).delay(3000).slideUp(300, function() {
+			$(el).remove();
+		});
+	});
+}
+
+function lock_callback(file, type, id)
+{
+	var url = '/cgi-bin/browse/lock.jim?file=' + file;
+	$.get(url, function() { window.location.reload(true); });
+}
+
+function enc_callback(file, type, id)
+{
+	var url = '/cgi-bin/browse/enc.jim?file=' + file;
+	$.get(url, function() { window.location.reload(true); });
+}
+
+function new_callback(file, type, id)
+{
+	var url = '/cgi-bin/browse/new.jim?file=' + file;
+	$.get(url, function() { window.location.reload(true); });
+}
+
+function rename_submit()
+{
+	var s = $('#renameform_form').serialize();
+	$.get('/cgi-bin/browse/rename.jim?' + s,
+	    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 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)
+{
+	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	$confirm.dialog('option', 'buttons', {
+		'Yes': function() { $(this).dialog('close');
+			callback(file, type, id); },
+		'No':  function() {$(this).dialog('close');}
+
+	});
+	$('#confirm').empty().html(
+	    'Are you sure you wish to ' + action + '<br>' +
+	    '<i>' + decodeURIComponent(bfile) + '</i> ?'
+	);
+	$confirm.dialog('open');
+}
+
+function preparemenu(el, menu)
+{
+	if (el.attr('type') == 'ts')
+	{
+		if (el.attr('def') == 'HD')
+		{
+			$('#optmenu').enableContextMenuItems('#enc');
+			if (el.attr('encd') == 1)
+				$(menu).changeContextMenuItem('#enc',
+				    'Remove Enc');
+			else
+				$(menu).changeContextMenuItem('#enc',
+				    'Set Enc');
+		}
+
+		if (el.attr('bx') > 0)
+			$('#optmenu').enableContextMenuItems('#crop');
+		else
+			$('#optmenu').disableContextMenuItems('#crop');
+
+		$('#optmenu').enableContextMenuItems('#new');
+		if (el.attr('new') == 1)
+			$(menu).changeContextMenuItem('#new', 'Mark watched');
+		else
+			$(menu).changeContextMenuItem('#new', 'Mark new');
+
+
+		$('#optmenu').enableContextMenuItems('#lock');
+		if (el.attr('locked') == 1)
+		{
+			$(menu).changeContextMenuItem('#lock', 'Unlock');
+			$('#optmenu').disableContextMenuItems('#delete');
+		}
+		else
+		{
+			$(menu).changeContextMenuItem('#lock', 'Lock');
+			$('#optmenu').enableContextMenuItems('#delete');
+		}
+
+		if (el.attr('odencd') == 1)
+		{
+			$('#optmenu').enableContextMenuItems('#decrypt');
+			$('#optmenu').disableContextMenuItems('#audio');
+		}
+		else
+		{
+			$('#optmenu').disableContextMenuItems('#decrypt');
+			$('#optmenu').enableContextMenuItems('#audio');
+		}
+	
+	}
+	else
+	{
+		$('#optmenu').enableContextMenuItems('#delete');
+		$('#optmenu').disableContextMenuItems('#lock');
+		$('#optmenu').disableContextMenuItems('#enc');
+		$('#optmenu').disableContextMenuItems('#new');
+		$('#optmenu').disableContextMenuItems('#decrypt');
+		$('#optmenu').disableContextMenuItems('#audio');
+		$('#optmenu').disableContextMenuItems('#crop');
+	}
+
+}
+
+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');
+	}
+}
+
+$(document).ready(function() {
+
+var menuclick = function(action, el, pos)
+{
+	var file = $(el).parent().prevAll('a.bf').last().attr('file');
+	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
+	var type = $(el).attr('type');
+	var id = $(el).attr('did');
+	switch (action)
+	{
+	    case 'delete':
+		confirm_action('delete', delete_callback, file,
+		    type, id);
+		break;
+
+	    case 'lock':
+		confirm_action('change the lock on', lock_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,
+		    file, type, id);
+		break;
+
+	    case 'rename':
+		$('#rename').val(decodeURIComponent(bfile));
+		$('#renameorig').val(decodeURIComponent(file));
+
+		$('#titleorig').val('');
+		$('#renametitle').val('');
+		$('#synopsis').val('');
+		$('tr.tstype').css('display', 'none');
+
+		if (type == 'ts')
+		{
+			$.getJSON('/cgi-bin/browse/epgtitle.jim?file=' +
+			    file, epginfo_callback);
+		}
+
+		$('#renameform').dialog('open');
+		break;
+
+	    case 'download':
+		window.location.href = '/cgi-bin/browse/download.jim?file=' +
+		    file;
+		break;
+
+	    case 'crop':
+		window.location.href = '/cgi-bin/browse/crop.jim?file=' +
+		    file;
+		break;
+
+	    case 'decrypt':
+		window.location.href = '/cgi-bin/browse/decrypt.jim?file=' +
+		    file;
+		break;
+
+	    case 'audio':
+		window.location.href = '/cgi-bin/browse/audio.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 'delete':
+		var url = '/cgi-bin/browse/delete.jim?file=' + file +
+		    '&type=dir';
+
+		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(url, function() {
+				$(direl).delay(3000).slideUp(300, function() {
+					$(direl).remove();
+				});
+			});
+		}
+		break;
+
+	    case 'rename':
+		$('#drename').val(decodeURIComponent(bfile));
+		$('#drenameorig').val(decodeURIComponent(file));
+		$('#drenameform').dialog('open');
+		break;
+
+	    case 'flat':
+		var url = '/cgi-bin/browse/flat.jim?file=' + file;
+		$.get(url, function() { window.location.reload(true); });
+		break;
+
+	    default:
+		alert('Unhandled action: ' + action);
+		break;
+	}
+};
+
+	// Bind context menu to opt+ image
+	$('img.opt').contextMenu(
+		{
+			menu: 'optmenu',
+			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');
+
+	// Create reusable dialogue.
+	var $dialog = $('#dialogue').dialog({
+		title: "Media Details",
+		modal: false, autoOpen: false,
+		height: 600, width: 700,
+		show: 'scale', hide: 'fade',
+		draggable: true, resizable: true,
+		buttons: {
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function(e,u) { $('#dialogue').empty().html(
+		    '<img src="/img/loading.gif" alt="loading">'); }
+	});
+
+	// Bind dialogue open to filenames.
+	$('a.bf').click(function(e) {
+		e.preventDefault();
+		var file = $(this).attr('file');
+		var type = $(this).attr('type');
+		var url = '/cgi-bin/browse/file.jim?file=' + file
+		    + '&type=' + type;
+		$('#dialogue').load(url);
+		$dialog.dialog('open');
+	});
+
+	$('#renameform').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Update": rename_submit,
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		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,
+		height: 160, width: 500,
+		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 folders with unwatched items
+	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
+		new_folder_callback);
+
+	// Uncheck everything
+	$('input.fs:checked').attr('checked', false);
+
+	// Buttons
+
+	$('#dedup').button().click(function() {
+		window.location = '/cgi-bin/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(encodeURIComponent($(this).attr('file')));
+		});
+		//console.log("%o", files);
+		window.location.href = '/cgi-bin/browse/join.jim?files=' +
+		    files.join();
+	    });
+
+	$('#delete').button().disable()
+	    .click(function() {
+		var files = new Array();
+		var els = $('input.fs:checked + a').each(function() {
+			files.push($(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');
+			window.location.href =
+			    '/cgi-bin/browse/mdelete.jim?dir=' +
+			    encodeURIComponent(dir) + '&files=' +
+		    	    files.join();
+		}
+	    });
+
+	$('input.fs').change(function() {
+		var num = $('input.fs:checked').size();
+		if (num > 0)
+			$('#delete').enable();
+		else
+			$('#delete').disable();
+	
+		var num = $('input.fsts:checked').size();
+		if (num > 1)
+			$('#join').enable();
+		else
+			$('#join').disable();
+
+	});
+
+});
+

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

@@ -0,0 +1,191 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/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]
+
+if {[cgi_get do] eq "it"} {
+
+	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"
+
+	exit
+}
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
+
+<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>
+"
+
+puts "
+<div id=cropdiv>
+<button id=cropit>Perform crop operation</button>
+</div>
+<div id=progressdiv style=\"display: none\">
+Cropping: <div id=progressbar></div>
+<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+    perc=\"$keepperc\"
+    style=\"display: none\">Back to media list</button>"
+puts {
+<div id=output class=pre style="margin-top: 10px"></div>
+</div>
+
+<script type=text/javascript>
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/crop_progress.jim'
+	    + '?perc=' + $('#back').attr('perc')
+	    + '&file=' + $('#back').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=' + $(this).attr('dir');
+});
+
+$('#cropit').button().click(function() {
+	$('#cropdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').text('Please do not interrupt...')
+	    .load(document.URL + '&do=it',
+	    function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+</script>
+</div>
+
+}
+

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

@@ -1,13 +1,16 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require ts.class
 
-httpheader
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
 
 set perc [cgi_get perc 100]
-set tsfile [cgi_get file]
+set tsfile [file normalize [cgi_get file]]
 
 set origfile "[file dirname $tsfile]/_original/[file tail $tsfile]"
 set newfile [file rootname $tsfile]

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

@@ -0,0 +1,132 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/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
+
+if {[cgi_get do] eq "it"} {
+	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"
+
+	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"
+
+	exit
+}
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
+
+<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."
+	exit
+}
+
+puts {
+
+<div style="margin-top: 10px"></div>
+<div id=decryptdiv><button id=decryptit>Perform decryption</button></div>
+<div id=progressdiv style="display: none">
+Decrypting: <div id=progressbar></div>
+}
+puts "<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+    style=\"display: none\">Back to media list</button>"
+puts {
+<div id=output class=pre style="margin-top: 10px"></div>
+</div>
+
+<script type=text/javascript>
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/decrypt_progress.jim?file='
+	    + $('#back').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=' + $(this).attr('dir');
+});
+
+$('#decryptit').button().click(function() {
+	$('#decryptdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').load(document.URL + '&do=it', function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+</script>
+</div>
+
+}
+

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

@@ -1,10 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require ts.class
 
-httpheader
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
 
 set tsfile [cgi_get file]
 set rfile [file normalize $tsfile]

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

@@ -0,0 +1,32 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set file [dict get $_cgi file]
+set type [dict get $_cgi type]
+
+if {$type eq "ts"} {
+	set ts [ts fetch $file]
+	if {[$ts delete]} {
+		puts "Successfully deleted $file."
+	} else {
+		puts "Problem deleting $file, [$ts get error]"
+	}
+	exit
+} elseif {$type eq "dir"} {
+	puts -nonewline "Directory..."
+	puts [exec /mod/bin/busybox/rm -rf $file]
+	puts -nonewline "Done..."
+} else {
+	file delete $file
+	file delete "[file rootname $file].hmi"
+	puts "Successfully deleted $file."
+}
+

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

@@ -2,11 +2,15 @@
 
 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"
+
+cgi_input
+#cgi_dump
+
 set file [cgi_get file]
-set urlbase [cgi_get base ""]
 
 # Default to just downloading the raw file.
 set url $file
@@ -18,7 +22,7 @@ if {[string match {*.ts} $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]
+			set dlna [$ts dlnaloc]
 			if {[llength $dlna]} { lassign $dlna url mime }
 
 			#puts "DLNA: $dlna"

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

@@ -1,12 +1,17 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class
+source /mod/var/mongoose/lib/ts.class
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
 
-set file [cgi_get file]
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
+
+set file [dict get $_cgi file]
 set ts [ts fetch $file]
 if {[set ts [ts fetch $file]] != 0} {
 	set action enc

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

@@ -0,0 +1,22 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: application/json"
+puts ""
+
+cgi_input
+#cgi_dump
+#set _cgi(file) "/media/My Video/Doctor Who/6.13._The_Almost_People.ts"
+
+if {![dict exists $_cgi file]} { exit }
+
+set file [dict get $_cgi file]
+set ts [ts fetch $file]
+
+puts "{"
+puts "\"title\" : \"[$ts get title]\","
+puts "\"synopsis\" : \"[$ts get synopsis]\""
+puts "}"
+

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

@@ -0,0 +1,17 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+if [file exists /mod/bin/ffmpeg] {
+	set file [dict get $_cgi 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

@@ -0,0 +1,127 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/pretty_size
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/Dangermouse/Series 1/01_rogue_robots.avi"
+
+if {![dict exists $_cgi file]} { exit }
+
+set file [dict get $_cgi file]
+set type [dict get $_cgi type]
+
+file stat $file st
+set sz [pretty_size $st(size)]
+
+if {$type eq "ts"} {
+	source /mod/var/mongoose/lib/epg.class
+	source /mod/var/mongoose/lib/ts.class
+
+	set ts [ts fetch $file]
+
+	puts "
+<table class=keyval>
+<tr>
+	<th>Title</th>
+	<td>[$ts get title]</td>
+</tr><tr>
+	<th>Synopsis</th>
+	<td>[$ts get synopsis]</td>
+</tr><tr>
+	"
+
+	if {[$ts flag "Guidance"] > 0} {
+		puts "
+			<th>Guidance</th>
+			<td><img class=va
+			    src=/images/174_1_26_GuidancePolicy.png height=21>
+			    [$ts get guidance]
+			</td>
+			</tr><tr>
+		"
+	}
+
+	puts "
+	<th>Definition</th>
+	<td>
+	"
+	if {[$ts get definition] eq "HD"} {
+		puts "<img class=va src=/images/172_1_00_HD.png height=21>"
+	} else {
+		puts "<img class=va src=/images/172_1_26_SD.png height=21>"
+	}
+	puts "</td>
+</tr><tr>
+	<th>Channel</th>
+	<td>[epg channelicon [$ts get channel_name] 50 "vertical-align: middle"]
+	    [$ts get channel_num] - [$ts get channel_name]</td>
+</tr><tr>
+	<th>Start Time</th>
+	<td>"
+	puts [clock format [$ts get start] -format "%c %Z"]
+	puts "</td>
+</tr><tr>
+	<th>End Time</th>
+	<td>"
+	puts [clock format [$ts get end] -format "%c %Z"]
+	puts "</td>
+</tr><tr>
+	<th>Duration</th>
+	<td>[$ts duration] minute(s).</td>
+</tr><tr>
+	<th>Size</th>
+	<td>$sz</td>
+"
+set dlna [$ts dlnaloc]
+lassign $dlna url
+if {[llength $dlna]} {
+	puts "</tr><tr><th>DLNA&nbsp;URL</th>
+	   <td><a href=\"$url\">$url</a></td>"
+}
+puts "
+</tr><tr>
+	<th>Flags</th>
+	<td>[$ts get flags]
+"
+if {[$ts get bookmarks]} {
+		puts " \[Bookmarks: [$ts get bookmarks]\]"
+}
+
+	puts "</tr>"
+	puts "</table>"
+	exit
+}
+
+# Otherwise, for a general file.
+
+puts "
+<table class=keyval>
+<tr>
+	<th>File</th>
+	<td>$file</td>
+</tr><tr>
+	<th>Size</th>
+	<td>$sz</td>
+</tr><tr>
+	<th>Info</th>
+	<td class=pre id=ffmpeg>
+		<img src=/img/loading.gif><i>Loading...</i>
+	</td>
+</tr>
+</table>
+"
+
+set url "/cgi-bin/browse/ffmpeg.jim?file=[cgi_quote_url $file]"
+puts { <script type="text/javascript"> }
+puts "var url = \"$url\";"
+puts {
+	$('#ffmpeg').load(url);
+</script>
+}
+

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

@@ -0,0 +1,28 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set dir [cgi_get file]
+if {![file isdirectory $dir]} { exit }
+set noflat 0
+if {[string match {\[*\]} [file tail $dir]]} { 
+	set ndir [string range [file tail $dir] 1 end-1]
+	file rename $dir "[file dirname $dir]/$ndir"
+	puts "Unflagged directory as noflatten."
+	exit
+}
+if {[file exists "$dir/.noflatten"]} {
+	file delete "$dir/.noflatten"
+	puts "Unflagged directory as noflatten."
+} else {
+	close [open "$dir/.noflatten" w]
+	puts "Flagged directory as noflatten."
+}
+

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

@@ -0,0 +1,137 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+header
+
+cgi_input 1
+#cgi_dump
+
+puts {
+<style>
+#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; }
+</style>
+
+<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="/js/touchbridge.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>
+"
+
+puts {
+<script type=text/javascript>
+
+$('#filelist li').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+);
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/join_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('/cgi-bin/browse/join_backend.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');
+});
+
+});
+</script>
+}
+
+footer
+

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

@@ -1,12 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require ts.class pretty_size
 
-httpheader
+puts "Content-Type: text/html\r\n\r\n"
 
 cgi_input 1
+#cgi_dump
 
 set joinstart [clock milliseconds]
 

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

@@ -1,9 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+#source /mod/var/mongoose/lib/setup
 
-httpheader
+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]]

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

@@ -1,12 +1,17 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class
+source /mod/var/mongoose/lib/ts.class
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
 
-set file [cgi_get file ""]
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
+
+set file [dict get $_cgi file]
 set ts [ts fetch $file]
 if {[set ts [ts fetch $file]] != 0} {
 	set action lock

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

@@ -0,0 +1,55 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+header
+
+cgi_input 1
+#cgi_dump
+set dir [cgi_unquote_input [cgi_get dir]]
+
+puts "<div id=deleting class=blood><img src=/img/loading.gif>Deleting...</div>"
+puts "<ul style=\"list-style-type: square\">"
+foreach file [split [cgi_get files] ","] {
+	set file [cgi_unquote_input $file]
+	puts -nonewline "<li>\"$file\"..."
+
+	if {[file isdirectory $file]} {
+		puts -nonewline "Directory..."
+		puts [exec /mod/bin/busybox/rm -rf $file]
+		puts -nonewline "Done..."
+	} elseif {[string match {*.ts} $file]} {
+		set ts [ts fetch $file]
+		if {[catch {$ts delete} msg]} {
+			puts -nonewline "Error loading TS file..."
+		} else {
+			puts -nonewline "Done..."
+		}
+	} else {
+		if {[catch {file delete $file} msg]} {
+			puts -nonewline "Error: $msg"
+		} else {
+			catch {file delete "[file rootname $file].hmi"}
+			puts -nonewline "Done..."
+		}
+	}
+	puts "</li>"
+}
+puts "</ul>"
+puts "<button id=back dir=\"$dir\">Back to media list</button>";
+
+puts {
+<script type=text/javascript>
+$('#deleting').slideUp('slow');
+$('#back').button().click(function() {
+	window.location.href = '/cgi-bin/browse.jim?dir=' +
+	    encodeURIComponent($('#back').attr('dir'));
+});
+</script>
+}
+
+footer
+

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

@@ -1,12 +1,17 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class
+source /mod/var/mongoose/lib/ts.class
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
 
-set file [cgi_get file]
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
+
+set file [dict get $_cgi file]
 set ts [ts fetch $file]
 if {[set ts [ts fetch $file]] != 0} {
 	set action new
@@ -14,7 +19,6 @@ if {[set ts [ts fetch $file]] != 0} {
 
 	if {[$ts set_$action]} {
 		puts "Successfully marked $file as $action."
-		ts resetnew [file dirname $file]
 	} else {
 		puts "Problem marking $file as $action,
 		    [$ts get error]"

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

@@ -2,11 +2,16 @@
 
 package require cgi
 package require pack
-source /mod/webif/lib/setup
 
-httpheader "application/json"
+puts "Content-Type: application/json"
+puts ""
 
-set root [cgi_get dir]
+cgi_input
+#cgi_dump
+
+#set _cgi(dir) "/media/My Video"
+
+set root [dict get $_cgi dir]
 # Strip double slashes
 regsub -all -- {\/+} "$root/*" "/" root
 
@@ -15,11 +20,10 @@ foreach dir [glob -nocomplain "$root"] {
 	if {[file exists "$dir/.series"]} {
 		set fd [open "$dir/.series"]
 		set bytes [read $fd 8]
-		$fd close
 		set recs [unpack $bytes -uintle 0 32]
 		set plays [unpack $bytes -uintle 32 32]
 		set diff $($recs - $plays)
-		if {$diff > 0} {
+		if {$diff != 0} {
 			set node [lindex [split $dir /] end]
 			puts "\"$node\": $diff,"
 		}

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

@@ -0,0 +1,53 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#renameorig
+#titleorig
+#rename
+#renametitle
+
+#set _cgi(renameorig) "/media/My Video/The Walking Dead/The Walking Dead_20110521_2201.ts"
+#set _cgi(rename) "Last Episode"
+
+if {![dict exists $_cgi renameorig]} { exit }
+
+set file [dict get $_cgi renameorig]
+set newfile [dict get $_cgi rename]
+
+if {[string length [string trim $newfile]] == 0 || $file eq $newfile} {
+	set newfile ""
+}
+
+if {[file isdirectory $file]} {
+	#puts "Directory."
+	if {$newfile ne ""} {
+		set dir [file dirname $file]
+		set newfile "${dir}/${newfile}"
+		file rename $file $newfile
+	}
+} elseif {[set ts [ts fetch $file]] != 0} {
+	#puts "TS file."
+
+	catch {
+		set title [dict get $_cgi renametitle]
+		set titleorig [dict get $_cgi titleorig]
+
+		if {[string length [string trim $title]] > 0 &&
+		    $title ne $titleorig} {
+			$ts settitle $title
+		}
+	}
+	if {$newfile ne ""} { ts renamegroup $file $newfile }
+} else {
+	#puts "Normal file."
+	if {$newfile ne ""} { ts renamegroup $file $newfile }
+}
+

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

@@ -1,10 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require ts.class
+source /mod/var/mongoose/lib/ts.class
 
-httpheader
+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]]

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

@@ -1,25 +1,31 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
 
-httpheader "application/json"
+#puts "Content-Type: text/plain"
+puts "Content-Type: application/json"
+puts ""
 
-set dir [cgi_get dir]
-set dlen [string length "$dir/"]
+cgi_input
+#cgi_dump
+
+#set _cgi(dir) "/media/My Video"
+
+set dir [dict get $_cgi 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/cat.jim

@@ -0,0 +1,25 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/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

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo "Content-Type: text/plain"
+echo
+
+/bin/rm -rf /mod/*
+

var/mongoose/cgi-bin/channel.jim

@@ -2,11 +2,16 @@
 
 package require cgi
 package require sqlite3
-source /mod/webif/lib/setup
-require altrow progressbar epg.class system.class
+source /mod/var/mongoose/lib/setup
+require altrow progressbar epg.class
+
+puts "Content-Type: text/html"
+puts ""
 
 header
 
+cgi_input
+
 proc f2c {frequency} {
 	set ch int($((($frequency / 1000) - 303.25) / 8))
 	return [expr int($ch)]
@@ -27,31 +32,25 @@ puts "
 		<th>Frequency</th>
 		<th>Signal Strength</th>
 		<th>Signal Quality</th>
-		<th>Network</th>
 		<th>Mux</th>
-		<th>Type</th>
 		<th>Channels</th>
 		<th>&gt;799</th>
 	</tr>
 "
 foreach tw [$db query {
-		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel,
-		ucQuality, eTransMode, eConstellation
-		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 \
-	    x eTransMode x eConstellation
+	lassign $tw x tsIdx x usTsID x ulFrequency x ucLevel x ucQuality
 
+	altrow
 	puts "
-		<tr class=odd>
 		<td>[f2c $ulFrequency]</td>
 		<td>[expr $ulFrequency / 1000.0] MHz</td>
 	"
 	puts "<td>[progressbar $ucLevel]</td>"
 	puts "<td>[progressbar $ucQuality]</td>"
-	puts "<td>[system strip $netName]</td>"
 
 	set channels [$db query {
 		select usLcn, szSvcName, szPrvName, aucDefaultAuthority
@@ -60,34 +59,22 @@ foreach tw [$db query {
 		order by usLcn
 		} $tsIdx]
 
-	if {$eConstellation == 1} {
-		set mux "Local"
-	} else {
-		set mux "Unknown"
-	}
+	set mux "???"
 	set ehs 0
 	foreach chan $channels {
 		lassign $chan x lcn x name
-		set name [system strip $name]
+		set name [string range $name 1 end]
 		if {$lcn >= 800} { incr ehs }
 		switch $name {
-			"BBC THREE" { set mux "PSB1/BBC A" }
+			"BBC ONE" { set mux "PSB1/BBC A" }
 			"ITV1" { set mux "PSB2/D3&amp;4" }
-			"ITV" { set mux "PSB2/D3&amp;4" }
-			"BBC ONE HD" { set mux "PSB3/BBC B" }
+			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }
-			"ITV4" { set mux "COM6/ARQ B" }
-			"BBC NEWS HD" { set mux "COM7/ARQ C" }
-			"Movies4Men" { set mux "Local" }
+			"Film4" { set mux "COM6/ARQ B" }
 		}
 	}
 	puts "<td>$mux</td>"
-	if {$eTransMode == 2} {
-		puts "<td>DVB-T (SD)</td>"
-	} else {
-		puts "<td class=blood>DVB-T2 (HD)</td>"
-	}
 
 	puts "<td>[llength $channels]
 		<a class=mchan ts=$tsIdx href=#>
@@ -95,29 +82,30 @@ foreach tw [$db query {
 			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
 			    view
 		</a></td>"
-	puts "<td>$ehs</td>"
+	puts "<td>$ehs</th>"
 	puts "</tr>"
 	puts "<tr id=mchan_$tsIdx class=mchan style=\"display: none\">
-		<td colspan=9>"
+		<td colspan=5>"
 	puts "<table style=\"margin-left: 5em\">"
 	puts "<tr>
 		<th colspan=3>Channel</th>
 		<th>Provider</th>
 		<th>Authority</th>
 	      </tr>"
-	altrow reset
 	foreach chan $channels {
 		lassign $chan x lcn x name x prv x auth
-		set name [system strip $name]
-		set prv [system strip $prv]
+		set name [string range $name 1 end]
+		set prv [string range $prv 3 end]
 		altrow
-		puts "
-			<td class=va>[epg channelicon $name 50]</td>
-				<td>$lcn</td><td>$name</td>
-				<td>$prv</td>
-				<td>$auth</td>
-			</tr>
-		"
+		puts "<td class=va>"
+		puts "[epg channelicon $name 50]</td>
+		    <td>$lcn</td><td>$name</td>"
+		puts "</td><td>"
+		puts $prv
+		puts "</td><td>"
+		puts $auth
+		puts "</td>"
+		puts "</tr>"
 	}
 	puts "</table>"
 	puts "</td></tr>"
@@ -144,5 +132,3 @@ $(document).ready(function() {
 </script>
 }
 
-footer
-

var/mongoose/cgi-bin/db.jim

@@ -2,15 +2,25 @@
 
 package require cgi
 package require sqlite3
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require altrow
 
-set databases [glob /var/lib/humaxtv/*.db]
-lappend databases {*}[glob /mod/etc/*.db]
-lappend databases "/mnt/hd2/dms_cds.db"
+puts "Content-Type: text/html"
+puts ""
+
+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
 
+cgi_input
+#cgi_dump
+
 set ftab [cgi_get tab]
 set fdb [cgi_get db]
 
@@ -19,7 +29,7 @@ if {$fdb != 0} {
 }
 
 proc db_info {db_file} {
-	global fdb ftab
+	global _cgi fdb ftab
 
 	if {$fdb != 0 && [file tail $db_file] ne $fdb} { return }
 	if {![file exists $db_file]} { return }
@@ -62,8 +72,8 @@ proc db_info {db_file} {
 
 if {$fdb == 0} {
 	puts "Please choose database to view:<ul>"
-	foreach db [lsort $databases] {
-		puts "<li><a href=$::env(SCRIPT_NAME)?db=[file tail $db]>
+	foreach db $databases {
+		puts "<li><a href=$::env(REQUEST_URI)?db=[file tail $db]>
 		    $db</a></li>"
 	}
 	puts "</ul>"

var/mongoose/cgi-bin/dedup.jim

@@ -0,0 +1,125 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size altrow
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set dir [cgi_get dir "/media/My Video"]
+set doit [cgi_get doit 0]
+
+# Strip double slashes
+
+header
+
+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>
+"
+
+regsub -all -- {\/+} "$dir/*" "/" sdir
+
+set seen {}
+
+foreach file [lsort [glob -nocomplain "$sdir"]] {
+	if {[file extension $file] ne ".hmt"} { continue }
+	altrow
+	set ts [ts fetch $file 1]
+	set base [file tail [file rootname $file]]
+	puts "<td nowrap>$base</td>"
+	set syn [$ts get synopsis]
+	regsub -nocase -all -- {^new series\.* *} $syn "" syn
+	regsub -nocase -all -- {^cbeebies\. *} $syn "" syn
+	regsub -all -- { *[:].*$} $syn "" syn
+	if {[string length $syn] > 40} {
+		lassign [split $syn "."] v w
+		set syn $v
+		if {[string length $syn] < 6 && [string length $w] < 6} {
+			append syn "_$w"
+		}
+	}
+	if {[string length $syn] < 10} {
+		if {[string match "${syn}*" [$ts get title]]} {
+			set syn [$ts get title]
+		} else {
+			append syn " [$ts get title]"
+		}
+	}
+	regsub -all -- {[\/ &]} $syn "_" fn
+	puts "<td>$fn</td>"
+	puts "<td>$syn</td>"
+	puts "<td>"
+	if {$fn in $seen} {
+		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"
+		}
+	} elseif {[string length $syn] > 40} {
+		puts -nonewline "Cannot process"
+	} elseif {$base eq $fn} {
+		puts -nonewline "Nothing to do"
+	} elseif {[file exists "$dir/$fn.ts"]} {
+		puts -nonewline "Preserving"
+	} elseif {$doit} {
+		# Dooooo, it.
+		$ts settitle $syn
+		ts renamegroup $file $fn
+		puts -nonewline "Done"
+	}
+	lappend seen $fn
+	
+	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>
+
+<script type=text/javascript>
+$('#browse').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' +
+	    encodeURIComponent($('#dir').text());
+});
+}
+
+if {!$doit} {
+	puts {
+	$('#dedup').button().click(function() {
+		window.location = window.location + '&doit=1';
+	});
+	}
+}
+
+puts "</script>"
+
+footer
+

var/mongoose/cgi-bin/diag.jim

@@ -0,0 +1,33 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require system.class chunked
+
+cgi_input
+#cgi_dump
+
+set diag [cgi_get diag general]
+
+start_chunked
+
+if {[system modversion 1] < 113} {
+	chunk ">>> Diagnostics only available with customised firmware 1.13 or above."
+	end_chunked
+	exit
+}
+
+chunk ">>> Beginning diagnostic $diag\r\n"
+
+set bcmd "|/bin/diag $diag"
+set fd [open $bcmd r]
+while {[gets $fd line] >= 0} {
+	chunk "$line\r\n"
+	#chunk_pad
+}
+close $fd
+chunk "\r\n"
+chunk ">>> Ending diagnostic $diag\r\n"
+
+end_chunked
+

var/mongoose/cgi-bin/epg_dump.jim

@@ -0,0 +1,37 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require epg.class
+
+puts "Content-Type: text/html"
+puts ""
+
+header
+
+cgi_input
+#cgi_dump
+
+set service 0
+set service 4351
+catch { set service [dict get $_cgi service] }
+set event 0
+catch { set event [dict get $_cgi event] }
+set raw 0
+catch { set raw [dict get $_cgi raw] }
+
+puts "<pre>"
+if { $raw == 0 } {
+	puts [epg exec dump -raw 1 -service $service -event $event]
+	puts "<a href=$env(REQUEST_URI)?$env(QUERY_STRING)&raw=1>
+		Click here for extended dump</a>"
+} else {
+	puts [epg exec dumpraw -raw 1 -service $service -event $event]
+}
+
+puts "</pre>"
+
+epg cleanup
+
+footer
+

var/mongoose/cgi-bin/epg_info.jim

@@ -1,26 +1,33 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require epg.class system.class settings.class
+source /mod/var/mongoose/lib/setup
+require epg.class
 
-set irinst [system pkginst ir]
+puts "Content-Type: text/html"
+puts ""
 
-httpheader
+cgi_input
+#cgi_dump
 
 set service [cgi_get service 0]
 set event [cgi_get event 0]
-if {![cgi_exists bare]} header else noheader
+if {! [dict exists $_cgi bare]} { header }
 
 set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
 set others [$record othertimes]
 
-if {[[settings] chanchangenc]} {
-	puts { <script type=text/javascript src=/js/chanchangenc.js></script> }
-} else {
-	jqplugin confirmAction
-	puts { <script type=text/javascript src=/js/chanchange.js></script> }
+puts {
+	<style type=text/css>
+	font.also
+	{
+		font-size: 0.9em;
+		font-style: italic;
+		color: #333;
+		background: transparent;
+	}
+	</style>
 }
 
 puts "
@@ -72,16 +79,10 @@ puts "
 "
 
 if {[$record get warning] != ""} {
-	if {[$record get warning_mode]} {
-		set gcol red
-	} else {
-		set gcol blue
-	}
 	puts "
 	<tr>
 		<th>Warning</th>
-		<td><img class=va src=/img/Guidance_$gcol.png height=21>
-		    [$record get warning]</td>
+		<td>[$record get warning]</td>
 	</tr>
 	"
 }
@@ -90,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]
@@ -104,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]
@@ -118,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]
@@ -131,20 +132,13 @@ if {[$record get rec_crid] != ""} {
 puts "
 	<tr>
 		<td colspan=2 valign=top>
-"
-if {$irinst} {
-	puts "<a class=chanchange chan=[$record get channel_num] href=#>"
-}
-puts [$record channel_icon 70]
-if {$irinst} { puts "</a>" }
-
-puts "
+			[$record channel_icon 70]
 			[join [$record icon_set] "&nbsp;"]
 		</td>
 	</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>
@@ -153,5 +147,5 @@ puts "
 puts "<div id=epginfo_extra class=footnote></div>"
 
 epg cleanup
-if {![cgi_exists bare]} footer
+if {! [dict exists $_cgi bare]} { footer }
 

var/mongoose/cgi-bin/epg_schedule.jim

@@ -1,20 +1,25 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require epg.class system.class
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
 
-set service [cgi_get service -]
-set event [cgi_get event -]
-set type [cgi_get type 1]
+cgi_input
+#cgi_dump
 
-if {$service eq "-" || $event eq "-"} {
+if {![dict exists $_cgi service] || ![dict exists $_cgi event]} {
 	puts "Error, insufficient parameters passed."
 	exit
 }
 
+set service $_cgi(service)
+set event $_cgi(event)
+set type 1
+if {[dict exists $_cgi type]} { set type $_cgi(type) }
+
 set event [lindex [epg fetch dump -service $service -event $event] 0]
 if {$event eq ""} {
 	puts "Error, cannot find event to schedule."

var/mongoose/cgi-bin/epg_search.jim

@@ -1,20 +1,30 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require epg.class spinner.class altrow settings.class
+source /mod/var/mongoose/lib/setup
+require epg.class spinner.class altrow
+
+puts "Content-Type: text/html"
+puts ""
 
-jqplugin highlight
 header
 
 require totop
 
-set ct [cgi_get ct 0]
-set crid [cgi_get crid ""]
-set scrid [cgi_get scrid ""]
+puts "<script type=text/javascript src=/js/jquery.highlight.js></script>"
 
-if {[cgi_exists term]} {
-	set lterm [cgi_get term]
+cgi_input
+#cgi_dump
+
+set ct 0
+catch { set ct [dict get $_cgi ct] }
+set crid ""
+catch { set crid [dict get $_cgi crid] }
+set scrid ""
+catch { set scrid [dict get $_cgi scrid] }
+
+if {[dict exists $_cgi term]} {
+	set lterm [dict get $_cgi term]
 
 	if {[string match {CRID:*} $lterm]} {
 		set crid [string range $lterm 5 end]
@@ -37,30 +47,25 @@ require epg_search
 
 require epg_popup
 
+#set _cgi [dict create term "doctor who"]
+#set env(REQUEST_URI) "test"
+
 set cmd "search"
 if {$searchfull} { set cmd "searchall" }
 
-set dedup 0
 if {$ct > 0 } {
 	set records [epg fetch dump -type $ct]
-	if {[[settings] genrededup]} { set dedup 1 }
 } elseif {$crid ne ""} {
 	set records [epg fetch dump -crid $crid]
 } 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 {}
 }
 
 set favlist [epg favlist]
-set s [settings]
-if {[$s service_style] eq "standard"} {
-	set surl xservice
-} else {
-	set surl service
-}
 
 if {[llength $records] > 0} {
 	puts {
@@ -70,7 +75,6 @@ if {[llength $records] > 0} {
 		<th colspan=3>Channel</th>
 		<th>Programme</th>
 		<th>Synopsis</th>
-		<th></th>
 	</tr>
 	}
 } else {
@@ -86,17 +90,8 @@ proc rsort {v1 v2} {
 	return -1
 }
 
-set seen {}
 set i 0
 foreach record [lsort -command rsort $records] {
-	set ename [$record get name]
-	if {$ename eq ""} continue
-
-	if {$dedup} {
-		if {$ename in $seen} continue
-		lappend seen $ename
-	}
-
 	if {$favlist != "" && [$record get service_id] ni $favlist} {
 		continue
 	}
@@ -105,11 +100,7 @@ foreach record [lsort -command rsort $records] {
 
 	set ended [$record ended]
 
-	if {$ended} {
-		puts "<td nowrap class=blood>"
-	} else {
-		puts "<td nowrap>"
-	}
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>"}
 	puts "
 	    [clock format [$record get start] -format "%a %d %b %Y"]<br>
 		[clock format [$record get start] -format "%H:%M %Z"]"
@@ -117,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=/epg/$surl.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,9 +1,12 @@
 #!/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"
+puts ""
+
 header
 
 require totop
@@ -14,10 +17,13 @@ require totop
 	style "margin: 1em;"
 	}] start
 
+cgi_input
+#cgi_dump
+
 require epg_popup
 
 set service [cgi_get service 4351]
-set records [epg dbfetch dump -service $service]
+set records [epg fetch dump -service $service]
 
 set tr [lindex $records 0]
 $tr get_channel_info
@@ -26,28 +32,14 @@ set channel_name [$tr get channel_name]
 
 puts "
 	<div style=\"margin: 0 1em 1em 1em\">
-	<table class=va><tr><td class=va>
-	[$tr channel_icon 40 {vertical-align:middle}]
-	</td><td>
+	[$tr channel_icon 80 {vertical-align:middle}]
+	<span style=\"vertical-align: middle\">
 		$channel_num - $channel_name
-	</td><td style=\"width: 50px\">&nbsp;</td><td>
-	<button id=gridview>
-		Grid View
-	</button>
-	</td></tr></table>
+	</span>
 	</div>
 "
-puts "
-<script type=text/javascript>
-\$('button').button();
-\$('#gridview').button().bind('click', function() {
-	document.location.href = '/epg/service.jim?service=$service';
-});
-</script>
-"
 
 puts {
-	<div id=list>
 	<table class=borders>
 	<tr>
 		<th></th>
@@ -55,10 +47,10 @@ puts {
 		<th>Time</th>
 		<th>Programme</th>
 		<th>Synopsis</th>
-		<th></th>
 	</tr>
 }
 
+set i 0
 foreach record $records {
 	altrow
 	$record get_channel_info
@@ -66,24 +58,16 @@ foreach record $records {
 	if {[$record showing]} {
 	    puts "<td><img src=/images/111_1_00_Cursor_2R_Arrow.png></td>"
 	} else { puts "<td></td>" }
-	if {$ended} {
-		puts "<td nowrap class=blood>"
-	} else {
-		puts "<td nowrap>"
-	}
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>" }
 	puts "[clock format [$record get start] -format "%a %d %b %Y"]</td>"
-	if {$ended} {
-		puts "<td nowrap class=blood>"
-	} else {
-		puts "<td nowrap>"
-	}
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>" }
 	puts "[clock format [$record get start] -format "%H:%M"]</td>"
 	puts [$record cell]
 	puts "<td>[$record get text]</td>"
 	puts "<td>[$record get warning]</td>"
 	puts "</tr>"
 }
-puts "</table></div>"
+puts "</table>"
 
 epg cleanup
 footer

var/mongoose/cgi-bin/opkg.jim

@@ -0,0 +1,36 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require pkg.class chunked
+
+cgi_input
+#cgi_dump
+
+set cmd [cgi_get cmd update]
+
+proc opkg {cmd} {
+	chunk ">>> opkg $cmd\r\n"
+	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
+	chunk "\r\n"
+}
+
+start_chunked
+
+if {$cmd eq "upgrade"} { opkg update }
+opkg $cmd
+
+if {$cmd eq "update" || $cmd eq "upgrade"} {
+	chunk "Updating package meta information\r\n"
+	pkg fetchmeta
+	chunk "Done.\r\n"
+}
+
+end_chunked
+

var/mongoose/cgi-bin/pkg.jim

@@ -1,24 +1,26 @@
 #!/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 }
 
-httpheader
+puts "Content-Type: text/html"
+puts "Pragma: no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts ""
+
+cgi_input
+#cgi_dump
+if {![dict exists $_cgi type]} { set _cgi(type) avail }
 
 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>"
@@ -30,28 +32,11 @@ proc pkgrow {pkg} {
 		puts "<td nowrap>[$pkg get latest]</td>"
 	}
 
-	puts "<td>"
 	if {[dict exists $::pkgmeta $name]} {
-		puts "$::pkgmeta($name)"
+		puts "<td>$::pkgmeta($name)</td>"
 	} else {
-		puts "[$pkg get descr]"
+		puts "<td>[$pkg get descr]</td>"
 	}
-	if {$::type eq "upgr"} {
-		$pkg loadraw
-		set url [$pkg get url]
-		set changes [$pkg get changes]
-		if {$changes ne ""} {
-			puts "<br>&nbsp;&nbsp;-&nbsp;<i>$changes</i>"
-		}
-		if {$url ne ""} {
-			puts "
-	<br>
-	<a class=va href=\"$url\" target=_blank style=\"color: darkblue\">
-		<img class=va height=18 width=18 src=/img/info.png> $url
-	</a>"
-		}
-	}
-	puts "</td>"
 
 	if {![$pkg is installed]} {
 		set type Install
@@ -61,7 +46,7 @@ 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>"
 
@@ -70,7 +55,7 @@ proc pkgrow {pkg} {
 
 pkg loadmeta
 
-set type [cgi_get type "avail"]
+set type $_cgi(type)
 
 set pkgs [pkg $type]
 
@@ -94,19 +79,18 @@ 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>"
-	if {$type ne "upgr" && $filter} {
+	if {$filter} {
 		puts "<font class=footnote>This is a filtered package list. To show all packages, enable the <i>Show development and advanced packages</i> in the settings screen.</font>"
 	}
 } else {
 	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,16 +1,13 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require rsv.class system.class
 
-httpheader
-
-if {[cgi_get act] eq "cancel"} {
-	system restartpending 0
-	exit
-}
+puts "Content-Type: text/html"
+puts ""
 
+cgi_input
 if {[cgi_get now] eq "yes"} {
 	# - Busybox reboot does sync the disk but may still not be clean enough.
 	puts "Restarting."
@@ -18,8 +15,7 @@ if {[cgi_get now] eq "yes"} {
 	exit
 }
 
-system restartpending 0
-jqplugin progressbar
+file delete /tmp/.restartpending
 header
 
 # Commit pending reservations on older mod versions.
@@ -28,6 +24,8 @@ if {![file exists /sbin/rsvsync] && ![file exists /mod/boot/rsvsync]} {
 }
 
 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>
 	var handle = 0;
@@ -45,7 +43,7 @@ puts {
 
 	$(document).ready(function() {
 		$('#progressbar').reportprogress(0);
-		handle = setInterval("update()" , 400);
+		handle = setInterval("update()", 300);
 		$.get('/cgi-bin/restart.jim?now=yes');
 	});
 </script>

var/mongoose/cgi-bin/restartblock.jim

@@ -0,0 +1,7 @@
+#!/mod/bin/jimsh
+
+puts "Content-Type: text/html"
+puts ""
+
+source /mod/var/mongoose/include/restart.jim
+

var/mongoose/cgi-bin/sched_cancel.jim

@@ -1,10 +1,14 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
+source /mod/var/mongoose/lib/setup
 require rsv.class system.class
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
 
 set slot [cgi_get slot 0]
 set table [cgi_get table TBL_RESERVATION] 

var/mongoose/cgi-bin/sched_info.jim

@@ -1,27 +1,60 @@
 #!/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
 
-httpheader
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
 
 set table [cgi_get table TBL_RESERVATION]
 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>"
+	if {[$event get ersvtype] == 3} {
+		if {[$event padded]} {
+			set padding "<- [expr [$event get ulPreOffset] / 60], [expr [$event get ulPostOffset] / 60] ->"
+			append rsvicon \
+			    "<img src=/img/pad.png height=20
+			     title=\"$padding\" alt=\"$padding\">"
+		} else {
+			append rsvicon \
+			    "<img src=/img/ar.png 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]
 	"
 }
@@ -30,12 +63,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>
 "
@@ -71,10 +99,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>
@@ -89,7 +117,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> 

var/mongoose/cgi-bin/service.jim

@@ -0,0 +1,15 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+catch { set service [dict get $_cgi service] }
+catch { set action [dict get $_cgi action] }
+
+catch { puts [exec /mod/bin/service $action $service] }
+

var/mongoose/cgi-bin/settings.jim

@@ -0,0 +1,371 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require settings.class
+require plugin
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+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]
+
+# Handle updates
+
+if {![dict exists $env REQUEST_URI]} { set env(REQUEST_URI) "" }
+
+proc _handle_update {class var old text} {
+	global _cgi
+	global settings
+
+	if {[dict exists $_cgi $var]} {
+		set new [string trim [dict get $_cgi $var]]
+		if {$new == $old} {
+			puts "$text unchanged."
+		} elseif [string is $class -strict $new] {
+			$settings $var $new
+			puts "$text updated."
+		} else {
+			puts "Invalid value for $var."
+		}
+		exit
+	}
+}
+
+proc handle_int_update {var old {text "Value"}} {
+	_handle_update digit $var $old $text
+}
+
+proc handle_str_update {var old {text "Value"}} {
+	_handle_update alnum $var $old $text
+}
+
+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"
+
+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>
+<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 />
+}
+
+puts {
+	<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 "
+	<fieldset style=\"display: inline\">
+		<legend>
+			General Settings
+		</legend>
+	<table>
+"
+
+puts "
+	<tr>
+	<form class=auto id=hostname method=get action=$env(REQUEST_URI)>
+		<th class=key>Hostname</th>
+		<td><input name=hostname value=\"$hostname\"
+		    class=\"text ui-widget-content ui-corner-all\"
+		    length=20 maxlength=50>
+		    <small>
+		    <input id=hostname_submit value=\"change\" type=submit>
+		    </small>
+		    <div id=hostname_output></div>
+		</td>
+	</form>
+	</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\">
+"
+
+set i 0
+puts "<option value=0>-- None --"
+foreach grp [$settings channel_groups] {
+	incr i
+	puts -nonewline "<option value=$i"
+	if {$channel_group == $i} {
+		puts -nonewline " selected"
+	}
+	puts ">$grp"
+}
+
+puts "
+		</select>
+		<small>
+		<input name=channel_group value=\"set\" type=submit>
+		</small>
+		<div id=channel_group_output></div>
+		</td>
+	</form>
+	</tr>
+"
+
+puts "
+	</table>
+	</fieldset>
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Email Settings </legend>
+	<table>
+"
+
+puts "
+	<tr>
+	<form class=auto id=smtp_server method=get action=$env(REQUEST_URI)>
+		<th class=key>SMTP Server for outbound email</th>
+		<td><input name=smtp_server value=\"$smtp_server\"
+		    class=\"text ui-widget-content ui-corner-all\"
+		    length=20 maxlength=50>
+		    <small>
+		    <input id=smtp_server_submit value=\"change\" type=submit>
+		    </small>
+		    <div id=smtp_server_output></div>
+		</td>
+	</form>
+	</tr>
+"
+
+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 "
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Advanced Settings </legend>
+	<table>
+"
+
+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>
+	</fieldset>
+"
+
+eval_plugins settings
+
+puts {
+<br><br>
+<fieldset style="display: inline">
+<legend> Reset Custom Firmware </legend>
+<button id=cfwreset>
+Click to remove all packages and settings installed by the custom firmware.
+</button>
+</fieldset>
+<script type=text/javascript>
+$('#cfwreset').jConfirmAction({
+	yesAnswer: "Delete"
+}, function(el) {
+	$('html').html('Restart the Humax using the remote control.');
+	$.get('/cgi-bin/cfwreset');
+});
+</script>
+
+}
+
+footer
+

var/mongoose/cgi-bin/status.jim

@@ -0,0 +1,49 @@
+#!/mod/bin/jimsh
+
+puts "Content-Type: text/html"
+puts ""
+
+if {[catch {set pid [exec pgrep humaxtv]}]} { exit }
+
+if {[catch {set data [exec lsof -p $pid | grep Video | fgrep .ts]} ]} {
+        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
+}
+
+sleep 2
+
+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 {
+		set mode "Watching"
+		set icon "745_1_10_Video_2Live.png"
+	}
+
+	incr seen($name)
+
+	lappend output "<img class=va src=/images/$icon><span class=va>
+	    $mode&nbsp;$name</span><br>"
+}
+
+if {[llength $output]} {
+	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,53 +1,37 @@
 #!/mod/bin/jimsh
 
 package require cgi
-source /mod/webif/lib/setup
-require settings.class
+source /mod/var/mongoose/lib/setup
 
-jqplugin enadis
-jscss xepg.js /css/xepg.css
+puts "Content-Type: text/html"
+puts ""
 header
 
-require epg.class spinner.class altrow epg_search totop system.class
+require epg.class spinner.class altrow epg_search totop
 
-set irinst [system pkginst ir]
+cgi_input
 
-set s [settings]
-
-if {[$s chanchangenc]} {
-	puts { <script type=text/javascript src=/js/chanchangenc.js></script> }
-} else {
-	jqplugin confirmAction
-	puts { <script type=text/javascript src=/js/chanchange.js></script> }
-}
-
-if {[$s service_style] eq "standard"} {
-	set surl xservice
-} else {
-	set surl service
-}
+puts {<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />}
 
 [spinner new {
-	text "Loading EPG Information..."
+	text "Loading Now/Next Information..."
 	size "1.2em"
 	style "margin: 1em;"
 	}] start
 
 require epg_popup
 
-set now [clock seconds]
-set stt [cgi_get stt $now]
-if {$stt <= $now} {
-	set stt $now
+set stt [cgi_get stt [clock seconds]]
+if {$stt <= [clock seconds]} {
+	set stt [clock seconds]
 	set current 1
 } else {
 	set current 0
 }
 
-set favgroup [$s channel_group]
+set favlist [epg favlist]
 
-set hours [expr 1.0 * [[settings] xepghours]]
-if {$hours == 0} { set hours 4.0 }
+set hours 4.0
 set seconds $($hours * 3600)
 
 set ostt $stt
@@ -56,7 +40,7 @@ set stt [expr int($stt / 1800.0) * 1800]
 set ett $(int($stt + $seconds))
 set offset $(($ostt - $stt) / 1800.0)
 
-set chanpx 160
+set chanpx 120
 set eventpx 1000
 set totalpx $($chanpx + $eventpx)
 set contwidth $($totalpx + 50)
@@ -67,56 +51,28 @@ 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"]
-	}
-
+	set records [epg dbfetch dump -trange "$stt:$ett"]
 } else {
 	require channelsort
 	set records [channelsort [epg fetch dump -trange "$stt:$ett"]]
 }
 set got [clock milliseconds]
 
-proc but {label time {active 1}} {
-	puts -nonewline "<button style=\"margin-right: 2em\" tt=$time"
-	if {$active} {
-		puts -nonewline " class=nav"
-	} else {
-		puts -nonewline " disabled class=\"nav ui-state-disabled\""
-	}
-	puts " active=$active>$label</button>"
-}
-
-puts "<!-- Hours $hours ($seconds) -->"
 puts "<div id=buttons style=\"width: $eventpx; margin-left: ${chanpx}px;\">"
-
-but "&lt&lt; -1 Week" $($stt - 3600 * 24 * 7) \
-    $($stt - $now + 3600 >= 3600 * 24 * 7)
-but "&lt&lt; -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23)
-but "&lt;&lt; Earlier" $($stt - 3600 * 4) $($stt > $now)
-#but "&lt; Now &gt;" $now $($current == 0)
-but "&lt; Now &gt;" $now
-but "&gt;&gt; Later" $ett;
-but "&gt;&gt; +1 Day" $($stt + 3600 * 24) $($stt < $now + 8 * 3600 * 24)
-but "&gt;&gt; +1 Week" $($stt + 3600 * 24 * 7) $($stt < $now + 8 * 3600 * 24)
-
+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 "
-<script type=text/javascript>
-\$('button.nav').button();
-</script>
 <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/%m/%Y}]
-puts "<input type=hidden id=xepg_dp stt=$stt>"
+puts [clock format $stt -format {%a %D}]
 puts "</div>"
 
 puts "<div class=xechan style=\"width: ${chanpx}px;\">&nbsp;</div>"
@@ -131,19 +87,18 @@ set lcn 0
 set bg "odd"
 
 foreach e $records {
+	if {$favlist != "" && [$e get service_id] ni $favlist} {
+		continue
+	}
 	set chnum [$e get channel_num]
 	if {$chnum == 0} { continue }
 
 	if {$chnum != $lcn} {
 		puts "<div class=xechan style=\"width: ${chanpx}px;\">"
 
-		if {$irinst} {
-			puts "<a class=chanchange chan=$chnum href=#>"
-		}
 		puts "[$e channel_icon 30]&nbsp;"
-		if {$irinst} { puts "</a>" }
 		puts "$chnum
-	    <a href=\"/epg/$surl.jim?service=[$e get service_id]\"
+	    <a href=/cgi-bin/epg_service.jim?service=[$e get service_id]
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"
@@ -193,10 +148,7 @@ foreach e $records {
 	    clock format $ee -format "%H:%M"])"
 	if {$showing} { append hxt " ($perc%)" }
 
-	set lbg $bg
-	if {[$e scheduled]} { set lbg "blueshade" }
-
-	puts "<div class=\"xeprog $lbg\"
+	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]
@@ -218,13 +170,22 @@ puts "
 	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 "
-		<script type=text/javascript>
-		\$(function() {
-	"
 	puts {
 
 var kt = $('#xe0');
@@ -235,32 +196,34 @@ 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=/settings/settings.jim>
+});
+</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>"
 
+epg cleanup
+
 footer
 

var/mongoose/html/backup.shtml

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

var/mongoose/html/css/iphone-style-checkboxes.css

@@ -0,0 +1,75 @@
+.iPhoneCheckContainer {
+  position: relative;
+  height: 27px;
+  cursor: pointer;
+  overflow: hidden; }
+  .iPhoneCheckContainer input {
+    position: absolute;
+    top: 5px;
+    left: 30px;
+    opacity: 0;
+    -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); }
+  .iPhoneCheckContainer label {
+    white-space: nowrap;
+    font-size: 17px;
+    line-height: 17px;
+    font-weight: bold;
+    font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+    text-transform: uppercase;
+    cursor: pointer;
+    display: block;
+    height: 27px;
+    position: absolute;
+    width: auto;
+    top: 0;
+    padding-top: 5px;
+    overflow: hidden; }
+  .iPhoneCheckContainer, .iPhoneCheckContainer label {
+    user-select: none;
+    -moz-user-select: none;
+    -khtml-user-select: none; }
+
+.iPhoneCheckDisabled {
+  opacity: 0.5;
+  -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); }
+
+label.iPhoneCheckLabelOn {
+  color: white;
+  background: url('/img/iphone-style-checkboxes/on.png?1282083753') no-repeat;
+  text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
+  left: 0;
+  padding-top: 5px; }
+  label.iPhoneCheckLabelOn span {
+    padding-left: 8px; }
+label.iPhoneCheckLabelOff {
+  color: #8b8b8b;
+  background: url('/img/iphone-style-checkboxes/off.png?1282083753') no-repeat right 0;
+  text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.6);
+  text-align: right;
+  right: 0; }
+  label.iPhoneCheckLabelOff span {
+    padding-right: 8px; }
+
+.iPhoneCheckHandle {
+  display: block;
+  height: 27px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  background: url('/img/iphone-style-checkboxes/slider_left.png?1282083753') no-repeat;
+  padding-left: 3px; }
+
+.iPhoneCheckHandleRight {
+  height: 100%;
+  width: 100%;
+  padding-right: 3px;
+  background: url('/img/iphone-style-checkboxes/slider_right.png?1282083753') no-repeat right 0; }
+
+.iPhoneCheckHandleCenter {
+  height: 100%;
+  width: 100%;
+  background: url('/img/iphone-style-checkboxes/slider_center.png?1282083753'); }

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

@@ -7,12 +7,11 @@
 	height: 78px;
 	font-size: 13px;
 	line-height: 1.5em;
-	background: url(/img/bubble.png) left top no-repeat;
+	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;
-	z-index: 1000;
 	opacity: 0;
 }
 
@@ -25,7 +24,7 @@
 	height: 21px;
 	color: #fff;
 	text-shadow: 0px 1px 0px #000;
-	background: url(/img/button.png) left top no-repeat;
+	background: url('/img/button.png') left top no-repeat;
 }
 
 .jcatitle {

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

@@ -0,0 +1,578 @@
+/*
+ * jQuery UI CSS Framework 1.8.13
+ *
+ * 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
+ */
+
+/* Layout helpers
+----------------------------------*/
+.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: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); }
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled { cursor: default !important; }
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+
+
+/*
+ * jQuery UI CSS Framework 1.8.13
+ *
+ * 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/?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
+ */
+
+
+/* Component containers
+----------------------------------*/
+.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(/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(/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(/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(/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(/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(/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; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.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; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-off { background-position: -96px -144px; }
+.ui-icon-radio-on { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.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(/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 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;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; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.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.13
+ *
+ * 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.13
+ *
+ * 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/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
+.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
+.ui-accordion .ui-accordion-li-fix { display: inline; }
+.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
+.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
+.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.13
+ *
+ * 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/Autocomplete#theming
+ */
+.ui-autocomplete { position: absolute; cursor: default; }	
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+
+/*
+ * jQuery UI Menu 1.8.13
+ *
+ * Copyright 2010, 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/Menu#theming
+ */
+.ui-menu {
+	list-style:none;
+	padding: 2px;
+	margin: 0;
+	display:block;
+	float: left;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+	margin:0;
+	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration:none;
+	display:block;
+	padding:.2em .4em;
+	line-height:1.5;
+	zoom:1;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+/*
+ * jQuery UI Button 1.8.13
+ *
+ * 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/Button#theming
+ */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+/*
+ * jQuery UI Dialog 1.8.13
+ *
+ * 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/Dialog#theming
+ */
+.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.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.13
+ *
+ * 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/Slider#theming
+ */
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.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.13
+ *
+ * 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/Tabs#theming
+ */
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
+.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.13
+ *
+ * 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/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
+.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
+.ui-datepicker .ui-datepicker-prev { left:2px; }
+.ui-datepicker .ui-datepicker-next { right:2px; }
+.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
+.ui-datepicker .ui-datepicker-next-hover { right:1px; }
+.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
+.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
+.ui-datepicker td { border: 0; padding: 1px; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
+.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
+.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi { width:auto; }
+.ui-datepicker-multi .ui-datepicker-group { float:left; }
+.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
+.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
+.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
+.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
+.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%; }
+
+/* RTL support */
+.ui-datepicker-rtl { direction: rtl; }
+.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
+.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group { float:right; }
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
+
+/* 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*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
+}/*
+ * jQuery UI Progressbar 1.8.13
+ *
+ * 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; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }

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

@@ -64,19 +64,5 @@
 .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.compressr A { background-image: url(/img/context/compressr.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.decryptr A { background-image: url(/img/context/decryptr.png); }
-.contextMenu LI.mpg A { background-image: url(/img/context/mpg.png); }
-.contextMenu LI.mp3 A { background-image: url(/img/context/mp3.png); }
-.contextMenu LI.clock A { background-image: url(/img/context/clock.png); }
-.contextMenu LI.thm A { background-image: url(/img/context/thumb.png); }
-.contextMenu LI.bookmark A { background-image: url(/img/context/bookmark.png); }
-.contextMenu LI.lock A { background-image: url(/img/context/lock.png); }
-.contextMenu LI.rename A { background-image: url(/img/context/rename.png); }
-.contextMenu LI.download A { background-image: url(/img/context/download.png); }
-.contextMenu LI.new A { background-image: url(/img/context/new.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/style.css

@@ -13,28 +13,6 @@ html>body
 	font-size: small;
 }
 
-.left, .cleft
-{
-	float: left;
-}
-.cleft
-{
-	clear: left;
-}
-.right, .cright
-{
-	float: right;
-}
-.cright
-{
-	clear: right;
-}
-
-fieldset.left, fieldset.cleft
-{
-	display: inline;
-}
-
 div.container
 {
 	position: relative;
@@ -68,46 +46,19 @@ div.container .middle
 	height: 116px;
 }
 
-div.container .usb
-{
-	position: absolute;
-	left: -5px;
-	top: 8px;
-}
-
 div.footer
 {
 	clear: both;
 	padding-top: 2em;
 }
 
-div.owarningbox
+div.warningbox
 {
 	background: url('/img/redshade.png') repeat-x;
 	padding: 0.5em;
 	margin: 1em;
 }
 
-div.warningbox
-{
-	width: 60%;
-	background: url('/img/redshade.png') repeat-x;
-	background-size: 100%;
-	#color: #005000;
-	border: 1px solid #7a4707;
-	padding: 10px;
-	position: relative;
-	top: -2px;
-	left: -2px;
-	font-weight: bold;
-	z-index: 30;
-	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;
-}
-
 table
 {
 	empty-cells: show;
@@ -131,12 +82,6 @@ table.borders, table.borders td, table.borders th
 	color: black;
 }
 
-.hover
-{
-	background: #f6ff5b;
-	color: black;
-}
-
 table td,table th
 {
 	font-size: small;
@@ -163,7 +108,7 @@ table.keyval td
 	color: black;
 }
 
-pre, .pre, .prelike
+pre, .pre
 {
         font-family: Consolas, 'Courier New', Courier, monospace;
         color: black;
@@ -181,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;
@@ -235,7 +177,7 @@ pre, .pre
 
 .blood
 {
-	color: #ff4000 !important;
+	color: #ff4000;
 	background: transparent;
 }
 
@@ -245,18 +187,14 @@ pre, .pre
 	background: transparent;
 }
 
-.footnote, .bfootnote
+.footnote
 {
+	color: #ff4000;
 	background: transparent;
 	font-size: 70%;
 	font-weight: bold;
 }
 
-.footnote
-{
-	color: #ff4000 !important;
-}
-
 .blueshade
 {
 	background: #b9daff;
@@ -275,11 +213,6 @@ pre, .pre
 	color: black;
 }
 
-.strike
-{
-	text-decoration: line-through;
-}
-
 .greenshade
 {
 	background: #e4faa8;
@@ -292,12 +225,6 @@ pre, .pre
 	color: black;
 }
 
-.redshade
-{
-	background: #ff4000;
-	color: white;
-}
-
 img.progress
 {
 	background: transparent url(/img/percentback.png) top left no-repeat;
@@ -369,178 +296,3 @@ div.cut
 	font-size: 12px;
 }
 
-.also
-{
-	font-size: 0.9em;
-	font-style: italic;
-	color: #333;
-	background: transparent;
-}
-
-div.toolbarouter
-{
-	position: relative;
-	z-index: 29;
-}
-
-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;
-}
-
-#status
-{
-	width: 60%;
-}
-
-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;
-}
-
-div#restart_block
-{
-	text-align: center;
-	z-index: 31;
-	float: right;
-	width: 60%;
-	position: absolute;
-	top: 10px;
-	left: 100px;
-	background-color: #f8f8f8;
-	opacity: 0.9;
-	filter:alpha(opacity=90);
-}
-
-img.bmp, img.doublebmp
-{
-	transform: scaleY(-1);
-	-webkit-transform: scaleY(-1);
-	-o-transform: scaleY(-1);
-	height: 78px;
-	width: 140px;
-}
-
-img.doublebmp
-{
-	height: 156px;
-	width: 280px;
-}
-
-.relative
-{
-	position: relative;
-}
-
-span.foldernum
-{
-	display: none;
-	position: absolute;
-	left: 14px;
-	top: 9px;
-	color: white;
-	height: 15px;
-	line-height: 16px;
-	background-color: #CC0000;
-	background: linear-gradient(#FF0000, #CC0000) repeat scroll 0 0 #EEEEEE;
-	font-size: 10px;
-	border: 1px solid #660000;
-	padding: 0 2px 0 2px;
-	border-radius: 1em 1em 1em 1em;
-	-moz-border-radius: 1em;  
-	-webkit-border-radius: 1em;
-	border-top-right-radius: 1em;
-	border-top-left-radius: 1em;
-	border-bottom-right-radius: 1em;
-	border-bottom-left-radius: 1em;
-}
-
-#tbdiskspace
-{
-	float: right;
-	padding-top: 1.2em;
-	position: relative;
-	right: -10px;
-}
-
-#tbdiskpie
-{
-	float: right;
-	width: 150px;
-	height: 150px;
-	position: relative;
-	right: -10px;
-}
-
-.tbdiskpie
-{
-	top: -10px !important;
-}
-
-#usbejectinfo
-{
-	position: relative;
-	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;
-	background: #d2e0ea;
-	padding: 6px;
-	z-index: 40;
-}
-

var/mongoose/html/css/xepg.css

@@ -111,8 +111,3 @@ button#later
 	margin-left: 2em;
 }
 
-.jcaquestion
-{
-	margin-left: 0px !important;
-}
-

var/mongoose/html/diag.shtml

@@ -0,0 +1,38 @@
+<!--#include virtual="/lib/header.shtml" -->
+
+<fieldset style="display: inline; float: left; clear: left">
+<legend>Diagnostics</legend>
+Diagnostic:
+<input name=seq id=seq autocorrect=off autocapitalize=off
+    value=general size=30 maxlength=50
+    class="text ui-widget-content ui-corner-all">
+<button id=rundiag>Run Diagnostic</button>
+</fieldset>
+
+<fieldset style="display: inline; float: left; clear: left">
+<legend>Log Files</legend>
+<!--#exec cmd="/mod/var/mongoose/include/logfiles.jim" -->
+</fieldset>
+
+<div style="margin-top: 2em; display: none; float: left; clear: left"
+class=pre id=results></div>
+
+<script type=text/javascript>
+$('#rundiag').button().click(function() {
+	$('#results')
+	    .slideDown()
+	    .text('\n\nRunning diagnostic, please wait...\n\n')
+	    .load('/cgi-bin/diag.jim?diag=' +
+	    encodeURIComponent($('#seq').val()));
+});
+$('a.log').click(function() {
+	$('#results')
+	    .slideDown()
+	    .text('\n\nLoading log, please wait...\n\n')
+	    .load('/cgi-bin/cat.jim?file=' +
+	    encodeURIComponent($(this).attr('file')));
+});
+</script>
+
+<!--#include virtual="/lib/footer.shtml" -->
+

var/mongoose/html/epg.shtml

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

var/mongoose/html/img/channels/1-2-1 Dating.png

@@ -0,0 +1 @@
+blank.png

var/mongoose/html/img/channels/302.png

@@ -0,0 +1 @@
+302.png -

var/mongoose/html/img/channels/303.png

@@ -0,0 +1 @@
+303.png -

var/mongoose/html/img/channels/305.png

@@ -0,0 +1 @@
+305.png -

var/mongoose/html/img/channels/4music.png

@@ -0,0 +1 @@
+4Music.png

var/mongoose/html/img/channels/9X.png

@@ -0,0 +1 @@
+9X.png -

var/mongoose/html/img/channels/AAG.png

@@ -0,0 +1 @@
+AAG.png -