webif 1.0.14

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

CONTROL/conffiles

@@ -0,0 +1,6 @@
+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,9 +1,11 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.13.2
+Version: 1.0.14
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.0.4-1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.10),hmt(>=1.1.13),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.05)
-Suggests: ffmpeg
-Description: An evolving web interface for the Humax.
+Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),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),mongoose
+Conflicts: tvdiary(<0.0.2-6)
+Suggests:
+Description: An evolving web interface for the Humax. [Enhance auto-expiry options]
+Tags: http://hummy.tv/forum/threads/5031/

CONTROL/postinst

@@ -1,29 +1,37 @@
 #!/bin/sh
 
-echo "Postinstall $*"
+# 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
 
-crond=$PKG_ROOT/var/spool/cron/crontabs
-[ -d $crond ] || exit 1
-
-cronf=$crond/root
-grep -v webif/lib/bin/auto $cronf > $tmpf
-(
-	cat $tmpf
-	echo '*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1'
-) > $cronf
+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
-grep -v 'backup/backup.jim' $ana > $tmpf
-(
-	cat $tmpf
-	echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim"
-) > $ana
+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
 
 $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
 
@@ -38,5 +46,10 @@ if [ ! -f /mod/webif/.strip-updated ]; then
 	touch /mod/webif/.strip-updated
 fi
 
+/mod/webif/lib/bin/diskattrs
+#/mod/webif/lib/bin/resetnew
+
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

CONTROL/preinst

@@ -0,0 +1,16 @@
+#!/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,16 +2,17 @@
 
 export tmpf=/tmp/cronf.$$
 
-cronf=$PKG_ROOT/var/spool/cron/crontabs/root
-if [ -f $cronf ]; then
-	grep -v webif/lib/bin/auto $cronf > $tmpf
-	cp $tmpf $cronf
-	[ -s $cronf ] || rm -f $cronf
+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
-grep -v 'backup/backup.jim' $ana > $tmpf
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
 cp $tmpf $ana
 
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

var/mongoose

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

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

@@ -1,83 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-require rsv.class
-
-set dir /mod/var/backup
-
-httpheader
-
-set now [clock seconds]
-set file [file tail [cgi_get file \
-    [clock format $now -format "auto-%Y-%b-%d-%H:%M"]]]
-
-if {[string match {auto-*} $file]} {
-	# Delete any automatic backups over 7 days old.
-	set mt $(15 * 86400)
-	foreach af [glob -nocomplain "$dir/auto-*"] {
-		set aft [file mtime $af]
-		set diff $($now - $aft)
-		if {$diff > $mt} {
-			puts "Removing $af"
-			file delete $af 
-		}
-	}
-}
-
-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,
-		favIdx
-	from TBL_FAV join TBL_SVC using (hSvc)
-	order by eFavGroup, favIdx
-    }] {
-	if {$res(eFavGroup) != $grp} {
-		set grp $res(eFavGroup)
-		puts "  Group $grp"
-	}
-	puts "    $res(szSvcName)"
-	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)\t$res(favIdx)"
-}
-puts "Done."
-
-close $fd
-rsv cleanup
-

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

@@ -1,135 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-require rsv.class findhsvc system.class
-
-set dir /mod/var/backup
-
-httpheader
-
-set file [file tail [cgi_get restore_file]]
-if {$file == 0} {
-	puts "No filename supplied."
-	exit
-}
-
-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]
-	}
-
-	# Don't restore DSO events.
-	if {$vars(ersvtype) == 11} { continue }
-
-	set rsv [rsv new $vars]
-
-	# Need to fix up channel and CRID mappings in case something has
-	# 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}
-
-$rsvdb query {drop table if exists pending.fav}
-$rsvdb query {create table pending.fav (
-		favIdx integer primary key autoincrement unique,
-		hSvc integer(4),
-		eFavGroup integer(4),
-		[eSvcType] integer(4)
-	)}
-
-set grp 0
-foreach line $data {
-	set vals [split $line "\t"]
-	if {[lindex $vals 0] ne "fav"} { continue }
-
-	set group [lindex $vals 1]
-	set type [lindex $vals 2]
-	set chan [lindex $vals 3]
-	set idx [lindex $vals 4]
-	if {$idx eq ""} { set idx 0 }
-	set hsvc [get_channel_attr $chan]
-
-	if {$grp != $group} {
-		set grp $group
-		puts "  Group $grp"
-	}
-
-	puts "    $chan"
-
-	if {$hsvc eq ""} {
-		puts "        Cannot map channel name to service."
-		continue
-	}
-
-	set query "
-		insert into pending.fav(favIdx, hSvc, eFavGroup, eSvcType)
-		values($idx, $hsvc, $group, $type);
-	"
-
-	$rsvdb query $query
-}
-
-$rsvdb query {commit transaction;}
-
-system restartpending
-
-close $fd
-rsv cleanup
-

var/mongoose/cgi-bin/env.jim

@@ -1,9 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-httpheader "text/plain"
-
-foreach f [dict keys $env] {
-	puts "$f = $env($f)"
-}
-

var/mongoose/cgi-bin/settings.js

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

var/mongoose/html/backup.shtml

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

var/mongoose/html/browse/aexpiry.jim

@@ -1,24 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/lib/setup
-
-httpheader
-
-# dir=%2Fmedia%2FMy+Video%2FWeatherview
-# aexpiry_days=13
-
-set dir [cgi_get dir "-"]
-set days [cgi_get aexpiry_days 7]
-if {$dir eq "-"} exit
-
-if {![file isdirectory $dir]} {
-	puts "Not a directory."
-	exit
-}
-
-set fd [open "$dir/.autoexpire" w]
-puts $fd $days
-$fd close
-puts "Ok."
-

var/mongoose/html/browse/resetnew.jim

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

var/mongoose/html/diag/rundiag.jim

@@ -1,33 +0,0 @@
-#!/mod/bin/jimsh
-
-package require cgi
-source /mod/webif/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/html/epg.shtml

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

var/mongoose/html/lib/footer.shtml

@@ -1 +0,0 @@
-<!--#exec cmd="/mod/webif/html/lib/footer.jim" -->

var/mongoose/html/lib/header.jim

@@ -1,36 +0,0 @@
-#!/mod/bin/jimsh
-
-puts {
-<!doctype html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>
-}
-source /mod/webif/include/model.jim
-puts {
-</title>
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
-<link rel="shortcut icon" href=/img/favicon.ico />
-<link type="text/css" href="/lib/jquery.ui/css/custom-theme/jquery-ui.css"
-    rel="Stylesheet" />     
-<link href="/css/style.css" rel="Stylesheet" type="text/css" />
-<script type="text/javascript" src="/js/jquery.js"></script>
-<script type="text/javascript" src="/lib/jquery.ui/js/jquery-ui.js"></script>
-</head>
-<body>
-}
-
-source /mod/webif/html/lib/topbar.jim
-puts "<div id=restart_block>"
-source /mod/webif/include/restart.jim
-puts "</div>"
-
-puts {
-<div style="clear: both">
-
-<!-- end of header -->
-}
-
-set renderstart [clock milliseconds]
-

var/mongoose/html/lib/header.shtml

@@ -1 +0,0 @@
-<!--#exec cmd="/mod/webif/html/lib/header.jim" -->

var/mongoose/html/lib/jquery.mobile/jquery.mobile.css

@@ -1 +0,0 @@
-jquery.mobile-1.2.0.min.css

var/mongoose/html/lib/jquery.mobile/jquery.mobile.js

@@ -1 +0,0 @@
-jquery.mobile-1.2.0.min.js

var/mongoose/html/lib/jquery.ui/css/custom-theme/jquery-ui-1.8.24.custom.css

@@ -1,563 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.8.24
- *
- * Copyright 2012, 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:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.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.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=ccff99&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=000000&iconColorHeader=554e34&bgColorContent=ffffcc&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
- */
-
-
-/* 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(images/ui-bg_highlight-soft_100_ffffcc_1x100.png) 50% top repeat-x; color: #383838; }
-.ui-widget-content a { color: #383838; }
-.ui-widget-header { border: 1px solid #494437; background: #ccff99 url(images/ui-bg_gloss-wave_45_ccff99_500x100.png) 50% 50% repeat-x; color: #000000; font-weight: bold; }
-.ui-widget-header a { color: #000000; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d19405; background: #fece2f url(images/ui-bg_gloss-wave_60_fece2f_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #4c3000; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #4c3000; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #a45b13; background: #ffdd57 url(images/ui-bg_gloss-wave_70_ffdd57_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #381f00; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #381f00; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #655e4e; background: #ffffff url(images/ui-bg_inset-soft_30_ffffff_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #0074c7; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #0074c7; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #eeb420; background: #fff9e5 url(images/ui-bg_gloss-wave_90_fff9e5_500x100.png) 50% top repeat-x; color: #1f1f1f; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #1f1f1f; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #ffb73d; background: #d34d17 url(images/ui-bg_diagonals-medium_20_d34d17_40x40.png) 50% 50% repeat; color: #ffffff; }
-.ui-state-error 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(images/ui-icons_d19405_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_d19405_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_554e34_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_3d3d3d_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_bd7b00_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_eb990f_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_ed9f26_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffe180_256x240.png); }
-
-/* 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-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; -khtml-border-top-left-radius: 8px; border-top-left-radius: 8px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; -khtml-border-top-right-radius: 8px; border-top-right-radius: 8px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; -khtml-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; -khtml-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #5c5c5c url(images/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
-.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(images/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
- * jQuery UI Resizable 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-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.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*!
- * jQuery UI Accordion 1.8.24
- *
- * Copyright 2012, 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.24
- *
- * Copyright 2012, 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.24
- *
- * 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.24
- *
- * Copyright 2012, 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.24
- *
- * Copyright 2012, 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.24
- *
- * Copyright 2012, 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.24
- *
- * Copyright 2012, 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.24
- *
- * Copyright 2012, 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%; font-size:0em; }
-
-/* 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 {
-    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.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }

var/mongoose/html/lib/jquery.ui/css/custom-theme/jquery-ui.css

@@ -1 +0,0 @@
-jquery-ui-1.8.24.custom.css

var/mongoose/html/lib/jquery.ui/js/jquery-ui.js

@@ -1 +0,0 @@
-jquery-ui-1.8.24.custom.min.js

var/mongoose/include/menuicons.jim

@@ -1,64 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require settings.class
-
-proc menuitem {title icon link {width 217} {height 0} {extra ""}} {{num 0}} {
-	incr num
-	if {$title eq ""} return
-	if {$num > 4} {
-		puts {</div><div style="clear: both; padding-top: 1em">}
-		set num 1
-	}
-	if {$extra ne ""} { append extra " " }
-	puts -nonewline "
-<div class=left num=$num>
-	<center>
-	<a href=$link>
-		<img src=$icon ${extra}border=0 width=$width"
-	if {$height} { puts -nonewline " height=$height" }
-	puts -nonewline ">
-	</a>
-	<br>
-	<a href=$link>
-	<b>$title</b>
-	</a>
-	<br>
-	</center>
-</div>
-"
-}
-
-if {[[settings] epg_style] eq "grid"} {
-	set epglink "/cgi-bin/xepg.jim"
-} else {
-	set epglink "/epg.shtml"
-}
-
-puts {<div style="clear: both">}
-
-menuitem "Browse Media Files" "/images/323_1_10_Menu_Video.png" \
-	/browse/index.jim 217 228
-menuitem "Scheduled Events" "/images/321_1_00_Menu_CHList.png" \
-	/sched/sched.jim 217 228
-menuitem "EPG" "/images/328_1_26_Menu_TV_Guide.png" \
-	$epglink 217 228
-
-if {[file exists "/mod/bin/ir"]} {
-	menuitem "Remote" "/img/remote.png" /plugin/ir/remote.jim 217 228
-}
-
-if {[[settings] nomobile] eq "0"} {
-	menuitem "Mobile Version" "/img/mobile.png" /m/ 217 228
-}
-
-menuitem "Service Management" "/img/spanner.png" \
-	/services.shtml 217 228
-menuitem "Package Management" "/img/packages.png" \
-	/pkg/index.shtml 217 228
-menuitem "Settings" "/images/326_1_00_Menu_Settings.png" \
-	/cgi-bin/settings.jim 217 228
-
-menuitem "Diagnostics" "/img/diagnostics.png" \
-	/diag/diag.jim 217 228
-

var/mongoose/include/modversion.jim

@@ -1,20 +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)"
-}
-
-puts "<font class=blood style=\"font-size: 0.9em; float: right; clear: right\">
-	Web interface version: [system pkgver webif]<br>
-	Custom firmware version: $modver
-"
-if {![catch {set fhtcpversion [system fhtcpversion]}]} {
-	puts "<br>Humax Version: $fhtcpversion"
-}
-puts "</font>"
-

var/mongoose/include/pkg.jim

@@ -1,46 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-
-puts {
-<script type=text/javascript src=/js/packages.js></script>
-
-<style type=text/css>
-button.install
-{
-	display: none;
-	background-image: none;
-	background: #ccff99;
-}
-button.remove
-{
-	display: none;
-	background-image: none;
-	background: #ff6666;
-}
-button.upgrade
-{
-	display: none;
-}
-</style>
-
-<div id=pkgtabs>
-<ul>
-	<li>
-		<a href=/cgi-bin/pkg.jim?type=inst>
-		<span>Installed</span>
-		</a>
-	</li><li>
-		<a href=/cgi-bin/pkg.jim?type=upgr>
-		<span>Upgrades</span>
-		</a>
-	</li><li>
-		<a href=/cgi-bin/pkg.jim?type=avail>
-		<span>Available</span>
-		</a>
-	</li>
-</ul>
-</div>
-}
-
-

var/mongoose/include/services.jim

@@ -1,24 +0,0 @@
-#!/mod/bin/jimsh
-
-set services [split [exec /mod/bin/service mlist]]
-
-foreach service $services {
-	lassign [split $service ":"] name installed auto running
-
-	puts "<tr><td class=even>$name</td>"
-	if (!$installed) {
-		puts "<td colspan=3><i>Not installed</i></td></tr>"
-		continue
-	}
-
-	puts -nonewline "<td><input type=checkbox class=auto name=\"$name\""
-	if ($auto) { puts -nonewline " checked" }
-	puts "></td>"
-
-	puts -nonewline "<td><input type=checkbox class=toggle name=\"$name\""
-	if ($running) { puts -nonewline " checked" }
-	puts "></td>"
-
-	puts "</tr>"
-}
-

var/mongoose/lib/bin/auto

@@ -1,415 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require lock system.class ts.class tdelete pretty_size browse.class safe_delete
-
-set debug 0
-
-if {![acquire_lock webif_auto]} {
-	puts "Cannot acquire exclusive lock, terminating."
-	exit
-}
-
-set logfile "/mod/tmp/auto.log"
-# Rotate log file if large enough.
-if {[file exists $logfile] && [file size $logfile] > 2097152} {
-	file copy -force $logfile "/mod/tmp/auto_old.log"
-	file delete $logfile
-}
-
-set logfd [open "/mod/tmp/auto.log" "a+"]
-proc log {msg {always 0}} {
-	if {!$::debug && !$always} return
-	puts $::logfd "[\
-	    clock format [clock seconds] -format "%d/%m/%Y %H:%M"\
-	    ] - $msg"
-	flush $::logfd
-}
-
-proc elapsed {start} {
-	return $(([clock milliseconds] - $start) / 1000.0)
-}
-
-proc startclock {} {
-	set ::startclock_s [clock milliseconds]
-}
-
-proc endclock {size} {
-	set el [elapsed $::startclock_s]
-	set rate $($size / $el)
-	return "[pretty_size $size] in $el seconds - [pretty_size $rate]/s"
-}
-
-set scanstart [clock milliseconds]
-log "-------------------------------------------------------" 1
-
-# is_listening is relatively expensive so it is checked once globally at
-# the start and then if the server is not listening then no decrypt
-# operations will be attempted for this run, even if the server starts
-# up halfway through. Otherwise the server is checked for every decryption
-# and if it goes away then decryption will not be attempted for the rest
-# of the run.
-if {[system is_listening 9000]} {
-	set dlnaok 1
-	if {$::debug} { log "DLNA Server is running." }
-} else {
-	set dlnaok 0
-	if {$::debug} { log "DLNA Server is NOT running." }
-}
-
-log "Media scan starting, DLNA server status: $dlnaok" 1
-
-proc dsc {{size 0}} {
-	set free [system diskfree]
-
-	# Required disk space is 1GiB + 3 times the file size.
-	set req $($size * 3 + 1073741824)
-
-	if {$free < $req} {
-		log "Insufficient disk space. Require=$req, Free=$free" 1
-		exit
-	}
-}
-
-dsc
-
-set tmp "/mod/tmp/webif_auto"
-if {![file exists $tmp]} {
-	if {[catch {file mkdir $tmp} msg]} {
-		log "Cannot create temporary directory - $tmp ($msg)" 1
-		exit
-	}
-} elseif {![file isdirectory $tmp]} {
-	log "Cannot create temporary directory - $tmp (file exists)" 1
-	exit
-}
-
-# Clean-up the temporary directory
-foreach file [readdir -nocomplain $tmp] { tdelete "$tmp/$file" }
-
-if {[system pkginst undelete]} {
-	set dustbin "[system dustbin]"
-} else {
-	set dustbin ""
-}
-
-log "Dustbin: $dustbin"
-
-proc dedup {dir} {
-	log "DEDUP: \[$dir]"
-	loop i 0 1 {
-		foreach line [split \
-		    [exec /mod/webif/html/dedup/dedup -yes -auto $dir] "\n"] {
-			log $line 1
-		}
-	}
-}
-
-proc do_expire {ts} {
-	global ax_days
-	set file [$ts get file]
-
-	# Calculate the age of the file in days.
-	set age $(([clock seconds] - [$ts get start]) / 86400.0)
-	log "  EXPIRE: $file (age = $age)"
-
-	if {$age > $ax_days} {
-		log "     EXPIRE: $file ($age > $ax_days)" 1
-		if {[$ts inuse]} {
-			log "          In use." 1
-			return
-		}
-		if {[safe_delete $file]} {
-			log "          Deleted." 1
-		}
-	}
-}
-
-proc do_shrink {ts} {
-	global tmp dustbin tsgroup
-
-	if {[$ts flag "Shrunk"]} {
-		log "          Already shrunk."
-		return
-	}
-
-	set file [file rootname [$ts get file]]
-
-	if {[$ts inuse]} {
-		log "  $file - in use." 1
-		return
-	}
-
-	if {[catch {
-		set perc [exec /mod/bin/stripts -aq $file]
-	    } msg]} {
-		log "          Error: $msg" 1
-		return
-	}
-	if {[string match {*%} $perc]} {
-		set perc [string range $perc 0 end-1]
-	} else {
-		set perc 0
-	}
-
-	if {$perc == 0} {
-		log "          Already shrunk."
-		$ts set_shrunk
-		return
-	}
-	set size [$ts size]
-	dsc $size
-	startclock
-	log "  SHRINK: $file" 1
-	log "          Estimate $perc% saving." 1
-	log "          Shrinking..." 1
-	if {[catch {
-		foreach line [split \
-		    [exec nice -n 19 /mod/bin/stripts -q $file $tmp/shrunk] \
-		    "\n"] {
-			log $line 1
-		}
-	    } msg]} {
-		log "Error during shrink: $msg" 1
-		return
-	}
-
-	# The following steps are structured to minimise the risk of
-	# things being left in an inconsistent state if the system goes
-	# into standby. Renames within the same filesystem are very
-	# quick so the risk is small, but even so...
-
-	# Move the shrunken version back to the local directory.
-	foreach f [glob "$tmp/shrunk.*"] {
-		set ext [file extension $f]
-		file rename $f "${file}_shrunk${ext}"
-	}
-
-	# Remove the old recording (-> bin if undelete is installed)
-	safe_delete [$ts get file] "webif_autoshrink"
-
-	# Finally, rename the shrunken recording again.
-	foreach ext $tsgroup {
-		set f "${file}_shrunk.$ext"
-		if {[file exists $f]} {
-			file rename $f "${file}.$ext"
-		}
-	}
-	$ts set_shrunk
-	log "Done... [endclock $size]" 1
-}
-
-proc do_decrypt {ts} {
-	global tmp dustbin
-
-	set file [$ts get file]
-	set rfile [file rootname $file]
-	set bfile [file tail $file]
-
-	if {![$ts flag "ODEncrypted"]} {
-		log "          Already decrypted."
-		return
-	}
-
-	lassign [$ts dlnaloc] url
-	if {$url eq ""} {
-		log "          Not yet indexed."
-		return
-	}
-
-	if {![system is_listening 9000]} {
-		log "          DLNA Server not running."
-		set ::dlnaok 0
-		return
-	}
-
-	if {[$ts inuse]} {
-		log "          In use." 1
-		return
-	}
-	set size [$ts size]
-	dsc $size
-	set flagfile "$tmp/decrypting.$bfile"
-	exec /mod/bin/busybox/touch $flagfile
-	startclock
-	log "  DECRYPT: $rfile" 1
-	log "  DLNA: $url" 1
-	exec wget -O "$tmp/$bfile" $url
-
-	if {[file size $file] != [file size "$tmp/$bfile"]} {
-		log "        File size mismatch." 1
-		file delete $flagfile
-		return
-	}
-
-	# Move the encrypted file out of the way.
-	file rename $file "$rfile.encrypted"
-	# Move the decrypted copy into place.
-	file rename "$tmp/$bfile" $file
-	# Patch the HMT - quickest way to get back to a playable file.
-	exec /mod/bin/hmt -encrypted "$rfile.hmt"
-
-	log "  Removing/binning old copy."
-	# Move the old recording to the bin if undelete is installed.
-	if {$dustbin ne ""} {
-		set bin [_del_bindir $file "webif_autodecrypt"]
-		set tail [file tail $rfile]
-		file rename "$rfile.encrypted" "$bin/$tail.ts"
-		foreach ext {nts hmt thm} {
-			if {[file exists "$rfile.$ext"]} {
-				file copy $rfile.$ext "$bin/$tail.$ext"
-				if {$ext eq "hmt"} {
-					# Patch the binned HMT back
-					exec /mod/bin/hmt +encrypted \
-					    "$bin/$tail.hmt"
-				}
-			}
-		}
-	} else {
-		tdelete "$rfile.encrypted"
-	}
-	log "Done... [endclock $size]" 1
-	file delete $flagfile
-}
-
-proc do_mpg {ts} {
-	global tmp tsgroup
-
-	set file [file rootname [$ts get file]]
-
-	if {[file exists $file.mpg]} {
-		# Already done.
-		return
-	}
-
-	if {[$ts flag "ODEncrypted"]} {
-		log "          Not decrypted."
-		return
-	}
-
-	if {[$ts get definition] eq "HD"} {
-		# Cannot extract a useful MP3 from a HD recording.
-		return
-	}
-
-	if {[$ts inuse]} {
-		log "          In use." 1
-		return
-	}
-	dsc [$ts size]
-
-	log "     MPG: $file" 1
-	log "          Converting..." 1
-	if {[catch {
-		foreach line [split \
-		    [exec nice -n 19 /mod/bin/ffmpeg -y -benchmark -v 0 \
-		    -i $file.ts \
-		    -map 0:0 -map 0:1 \
-		    -vcodec copy -acodec copy $tmp/mpg.mpg] "\n"] {
-			log $line 1
-		}
-	    } msg]} {
-		log "Error during mpg extract: $msg" 1
-		return
-	}
-
-	# Move the MPG into the local directory
-	file rename $tmp/mpg.mpg $file.mpg
-}
-
-proc entries {dir callback} {
-	foreach entry [readdir -nocomplain $dir] {
-		if {![string match {*.ts} $entry} continue
-		if {[catch {set ts [ts fetch "$dir/$entry"]}]} continue
-		if {$ts == 0} continue
-		$callback $ts
-	}
-}
-
-proc shrink {dir} {
-	log "SHRINK: \[$dir]"
-	entries $dir do_shrink
-}
-
-proc decrypt {dir} {
-	log "DECRYPT: \[$dir]"
-	if {$::dlnaok} { entries $dir do_decrypt }
-}
-
-proc mpg {dir} {
-	log "MPG: \[$dir]"
-	entries $dir do_mpg
-}
-
-proc expire {dir} {
-	global ax_days
-	log "EXPIRE: \[$dir]"
-	
-	set ax_days [{dir expiry} $dir]
-	entries $dir do_expire
-}
-
-proc scan {dir attr {force 0}} {{indent 0}} {
-	global dustbin
-
-	incr indent 2
-
-	log "[string repeat " " $indent]\[$dir]"
-
-	if {$dir eq $dustbin} {
-		log "Dustbin, skipping."
-		return
-	}
-
-	if {[string match {\[*} [file tail $dir]]} {
-		# Special folder
-		file stat "$dir/" st
-		if {$st(dev) != $::rootdev} {
-			log "Special folder on different device, skipping."
-			return
-		}
-		if {$force} {
-			set force 0
-			log "Special folder, overriding recursion."
-		}
-	}
-
-	# Recursion
-	if {!$force && [file exists "$dir/.auto${attr}r"]} {
-		log "[string repeat " " $indent]  (R)"
-		set force 1
-	}
-
-	dsc
-
-	if {$force || [file exists "$dir/.auto$attr"]} { $attr $dir }
-
-	foreach entry [readdir -nocomplain $dir] {
-		if {[file isdirectory "$dir/$entry"]} {
-			scan "$dir/$entry" $attr $force
-		}
-	}
-
-	incr indent -2
-}
-
-set root [system mediaroot]
-file stat "$root/" rootstat
-set rootdev $rootstat(dev)
-#log "Root device: $rootdev" 1
-
-if {[llength $argv] > 0} {
-	set debug 1
-	foreach arg $argv { scan $root $arg }
-} else {
-	foreach arg {dedup decrypt shrink mpg expire} {
-		set st [clock milliseconds]
-		scan $root $arg
-		log "$arg scan completed in [elapsed $st] seconds." 1
-	}
-}
-
-release_lock webif_auto
-
-log "Media scan completed in [elapsed $scanstart] seconds." 1
-

var/mongoose/lib/bin/strip-update

@@ -1,59 +0,0 @@
-#!/mod/bin/jimsh
-
-source /mod/webif/lib/setup
-require system.class ts.class
-
-proc do_shrink {ts} {
-	if {[$ts flag "Shrunk"]} { return }
-
-	set file [file rootname [$ts get file]]
-
-	if {[$ts inuse]} { return }
-
-	if {[catch {
-		set perc [exec /mod/bin/stripts -aq $file]
-	    } msg]} {
-		return
-	}
-
-	if {[string match {*%} $perc]} {
-		set perc [string range $perc 0 end-1]
-	} else {
-		set perc 0
-	}
-
-	if {$perc == 0} {
-		puts "  Flagging $file as shrunk..."
-		$ts set_shrunk
-	}
-}
-
-proc entries {dir callback} {
-	foreach entry [readdir -nocomplain $dir] {
-		if {![string match {*.ts} $entry} continue
-		if {[catch {set ts [ts fetch "$dir/$entry"]}]} continue
-		if {$ts == 0} continue
-		$callback $ts
-	}
-}
-
-proc scan {dir} {
-	puts "Scanning $dir..."
-	file stat "$dir/" st
-	if {$st(dev) != $::rootdev} { return }
-
-	entries $dir do_shrink
-
-	foreach entry [readdir -nocomplain $dir] {
-		if {[file isdirectory "$dir/$entry"]} {
-			scan "$dir/$entry"
-		}
-	}
-}
-
-set root [system mediaroot]
-file stat "$root/" rootstat
-set rootdev $rootstat(dev)
-
-scan $root
-

var/mongoose/lib/hexdump

@@ -1,30 +0,0 @@
-package require binary
-
-proc hexdump {str} {
-        set s ""
-	set addr 0
-	
-	append s "[format "%07x" $addr]: "
-	set t ""
-        for {set i 0} {$i < [string length $str]} {incr i} {
-		if {$i > 0 && [expr $i % 16] == 0} {
-			append s "  $t\n"
-			append s "[format "%07x" $addr]: "
-			incr addr 16 
-			set t ""
-		} elseif {$i > 0 && [expr $i % 2] == 0} {
-			append s " "
-		}
-
-		set char [string index $str $i]
-                binary scan $char H2 cc
-                append s $cc
-		if {[string is print $char]} {
-			append t $char
-		} else {
-			append t "."
-		}
-        }
-	puts $s
-}
-

var/mongoose/lib/setup

@@ -1,46 +0,0 @@
-
-if {![exists -proc require]} {
-	proc require {args} {{done {}}} {
-		foreach file $args {
-			if {$file ni $done} {
-				uplevel source "/mod/webif/lib/$file"
-				lappend $done $file
-			}
-		}
-	}
-
-	proc httpheader {{type "text/html"} {cache 0} {extra ""}} {{done 0}} {
-		if {$done} return
-		if {!$cache} {
-			puts -nonewline "Content-Type: $type; charset=\"UTF-8\"; no-cache\r\n"
-			puts -nonewline "Expires: -1\r\n"
-			puts -nonewline "Pragma: no-cache\r\n"
-			puts -nonewline "Cache-Control: no-cache\r\n"
-		} else {
-			puts "Content-Type: $type; charset=\"UTF-8\"\r\n"
-		}
-		puts -nonewline $extra
-		puts -nonewline "\r\n"
-		set done 1
-	}
-
-	proc header {{type "text/html"} {cache 0}} {
-		httpheader $type $cache
-		uplevel source /mod/webif/html/lib/header.jim
-	}
-
-	proc footer {} {
-		uplevel source /mod/webif/html/lib/footer.jim
-	}
-
-	proc mheader {} {
-		uplevel source /mod/webif/html/m/lib/header.jim
-	}
-
-	proc mfooter {} {
-		uplevel source /mod/webif/html/m/lib/footer.jim
-	}
-
-	require fileops
-}
-

webif

@@ -1 +0,0 @@
-var/mongoose

webif/cgi-bin/cat.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require system.class chunked pretty_size
+require system.class pretty_size
 
 cgi_input
 #cgi_dump
@@ -10,16 +10,14 @@ cgi_input
 set file [cgi_get file "-"]
 if {$file eq "-"} { exit }
 
-start_chunked
+httpheader "text/plain"
 
 if {![file exists $file]} {
-	chunk ">>> File $file does not exist.\r\n"
+	puts ">>> File $file does not exist.\r\n"
 } else {
-	chunk ">>> Contents of $file [pretty_size [file size $file]]\r\n"
+	puts ">>> Contents of $file [pretty_size [file size $file]]\r\n"
 	set fp [open $file r]
-	chunk [read $fp]
+	puts [read $fp]
 	close $fp
 }
 
-end_chunked
-

webif/cgi-bin/channel.jim

@@ -29,20 +29,23 @@ puts "
 		<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
+		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel,
+		ucQuality, eTransMode
 		from TBL_TS join TBL_NET using (netIdx)
 		order by ulFrequency
 	}] {
 	lassign $tw \
-	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality
+	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality \
+	    x eTransMode
 
-	altrow
 	puts "
+		<tr class=odd>
 		<td>[f2c $ulFrequency]</td>
 		<td>[expr $ulFrequency / 1000.0] MHz</td>
 	"
@@ -64,17 +67,23 @@ foreach tw [$db query {
 		set name [string range $name 1 end]
 		if {$lcn >= 800} { incr ehs }
 		switch $name {
-			"BBC ONE" { set mux "PSB1/BBC A" }
+			"BBC THREE" { 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 (HD)" }
+			"BBC ONE HD" { set mux "PSB3/BBC B" }
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }
-			"Film4" { set mux "COM6/ARQ B" }
+			"Film4+1" { set mux "COM6/ARQ B" }
+			"BBC NEWS HD" { set mux "COM7/ARQ C" }
 			"Movies4Men" { set mux "Local" }
 		}
 	}
 	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=#>
@@ -92,6 +101,7 @@ foreach tw [$db query {
 		<th>Provider</th>
 		<th>Authority</th>
 	      </tr>"
+	altrow reset
 	foreach chan $channels {
 		lassign $chan x lcn x name x prv x auth
 		set name [string range $name 1 end]

webif/cgi-bin/db.jim

@@ -6,6 +6,7 @@ source /mod/webif/lib/setup
 require altrow
 
 set databases [glob /var/lib/humaxtv/*.db]
+lappend databases {*}[glob /mod/etc/*.db]
 lappend databases "/mnt/hd2/dms_cds.db"
 
 header
@@ -62,7 +63,7 @@ proc db_info {db_file} {
 if {$fdb == 0} {
 	puts "Please choose database to view:<ul>"
 	foreach db $databases {
-		puts "<li><a href=$::env(REQUEST_URI)?db=[file tail $db]>
+		puts "<li><a href=$::env(SCRIPT_NAME)?db=[file tail $db]>
 		    $db</a></li>"
 	}
 	puts "</ul>"

webif/cgi-bin/env.jim

@@ -0,0 +1,9 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+httpheader
+
+puts "<pre>"
+parray env
+puts "</pre>"
+

webif/cgi-bin/epg/dump.jim

@@ -13,7 +13,7 @@ set raw [cgi_get 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>
+	puts "<a href=$env(SCRIPT_NAME)?$env(QUERY_STRING)&raw=1>
 		Click here for extended dump</a>"
 } else {
 	puts [epg exec dumpraw -raw 1 -service $service -event $event]

webif/cgi-bin/epg/info.jim

@@ -2,18 +2,27 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require epg.class
+require epg.class system.class settings.class
+
+set irinst [system pkginst ir]
 
 httpheader
 
 set service [cgi_get service 0]
 set event [cgi_get event 0]
-if {![cgi_exists bare]} header
+if {![cgi_exists bare]} header else noheader
 
 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 "
 	<table class=keyval>
 	<tr>
@@ -116,7 +125,14 @@ if {[$record get rec_crid] != ""} {
 puts "
 	<tr>
 		<td colspan=2 valign=top>
-			[$record channel_icon 70]
+"
+if {$irinst} {
+	puts "<a class=chanchange chan=[$record get channel_num] href=#>"
+}
+puts [$record channel_icon 70]
+if {$irinst} { puts "</a>" }
+
+puts "
 			[join [$record icon_set] "&nbsp;"]
 		</td>
 	</tr>

webif/cgi-bin/epg/search.jim

@@ -4,12 +4,11 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class spinner.class altrow settings.class
 
+jqplugin highlight
 header
 
 require totop
 
-puts "<script type=text/javascript src=/js/jquery.highlight.js></script>"
-
 set ct [cgi_get ct 0]
 set crid [cgi_get crid ""]
 set scrid [cgi_get scrid ""]
@@ -56,6 +55,12 @@ if {$ct > 0 } {
 }
 
 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 {
@@ -83,8 +88,10 @@ proc rsort {v1 v2} {
 set seen {}
 set i 0
 foreach record [lsort -command rsort $records] {
+	set ename [$record get name]
+	if {$ename eq ""} continue
+
 	if {$dedup} {
-		set ename [$record get name]
 		if {$ename in $seen} continue
 		lappend seen $ename
 	}
@@ -105,7 +112,7 @@ foreach record [lsort -command rsort $records] {
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>
-	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
+	    <a href=/epg/$surl.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]

webif/cgi-bin/opkg.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require pkg.class chunked
+require pkg.class
 
 cgi_input
 #cgi_dump
@@ -10,30 +10,27 @@ cgi_input
 set cmd [cgi_get cmd update]
 
 proc opkg {cmd} {
-	chunk ">>> opkg $cmd\r\n"
+	puts ">>> opkg $cmd\r\n"
 	set bcmd "|/mod/webif/lib/bin/opkg $cmd"
 	set fd [open $bcmd r]
 	while {[gets $fd line] >= 0} {
-		chunk "$line\r\n"
-		#chunk_pad
+		puts "$line\r\n"
 	}
 	close $fd
-	chunk "\r\n"
+	puts "\r\n"
 }
 
-start_chunked
+httpheader "text/plain"
 
 if {$cmd eq "upgrade"} { opkg update }
 opkg $cmd
 
 if {$cmd eq "update" || $cmd eq "upgrade"} {
-	chunk "Updating package meta information\r\n"
+	puts "Updating package meta information\r\n"
 	pkg fetchmeta
-	chunk "Done.\r\n"
-	chunk "Updating diagnostic meta information\r\n"
+	puts "Done.\r\n"
+	puts "Updating diagnostic meta information\r\n"
 	pkg fetchdiagmeta
-	chunk "Done.\r\n"
+	puts "Done.\r\n"
 }
 
-end_chunked
-

webif/cgi-bin/restart.jim

@@ -7,7 +7,7 @@ require rsv.class system.class
 httpheader
 
 if {[cgi_get act] eq "cancel"} {
-	file delete /tmp/.restartpending
+	system restartpending 0
 	exit
 }
 
@@ -18,7 +18,8 @@ if {[cgi_get now] eq "yes"} {
 	exit
 }
 
-file delete /tmp/.restartpending
+system restartpending 0
+jqplugin progressbar
 header
 
 # Commit pending reservations on older mod versions.
@@ -27,8 +28,6 @@ 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;
@@ -46,7 +45,7 @@ puts {
 
 	$(document).ready(function() {
 		$('#progressbar').reportprogress(0);
-		handle = setInterval("update()", 350);
+		handle = setInterval("update()", 400);
 		$.get('/cgi-bin/restart.jim?now=yes');
 	});
 </script>

webif/cgi-bin/status.jim

@@ -8,7 +8,7 @@ set runmode cli
 if {[string match {*jim} $argv0]} { set runmode cgi }
 
 set schedtime 1200 
-case $runmode {
+switch $runmode {
     cgi {
 	set type [cgi_get type "full"]
 	httpheader
@@ -19,7 +19,7 @@ case $runmode {
     }
 }
 
-if {[catch {set pid [exec pgrep humaxtv]}]} {
+if {[catch {set pid [exec pgrep -n humaxtv]}]} {
 	puts "Cannot find humaxtv process."
 	exit
 }

webif/cgi-bin/xepg.jim

@@ -2,14 +2,29 @@
 
 package require cgi
 source /mod/webif/lib/setup
+require settings.class
 
+jqplugin enadis
+jscss xepg.js /css/xepg.css
 header
 
-require epg.class spinner.class altrow epg_search totop
+require epg.class spinner.class altrow epg_search totop system.class
 
-puts {
-<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />
-<script type=text/javascript src=/js/enadis.js></script>
+set irinst [system pkginst ir]
+
+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
 }
 
 [spinner new {
@@ -29,7 +44,7 @@ if {$stt <= $now} {
 	set current 0
 }
 
-set favgroup [[settings] channel_group]
+set favgroup [$s channel_group]
 
 set hours [expr 1.0 * [[settings] xepghours]]
 if {$hours == 0} { set hours 4.0 }
@@ -82,7 +97,8 @@ 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 $($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)
@@ -121,9 +137,13 @@ foreach e $records {
 	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=/cgi-bin/epg/service.jim?service=[$e get service_id]
+	    <a href=\"/epg/$surl.jim?service=[$e get service_id]\"
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"
@@ -173,7 +193,10 @@ foreach e $records {
 	    clock format $ee -format "%H:%M"])"
 	if {$showing} { append hxt " ($perc%)" }
 
-	puts "<div class=\"xeprog $bg\"
+	set lbg $bg
+	if {[$e scheduled]} { set lbg "blueshade" }
+
+	puts "<div class=\"xeprog $lbg\"
 	    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]
@@ -197,48 +220,11 @@ puts "
 </div>
 "
 
-puts "
-
-<script type=text/javascript>
-\$(document).ready(function() {
-
-\$('#epgswitch').button().click(function() {
-	window.location = '/epg.shtml';
-});
-
-\$('button.nav').click(function() {
-        window.location = '/cgi-bin/xepg.jim?stt=' + \$(this).attr('tt') +
-            '&pos=' + \$('#xegrid').scrollTop();
-});
-
-\$('#xepg_dp').datepicker({
-        buttonImage: '/img/cal.gif',
-        buttonImageOnly: true,
-        showOn: 'button',
-        dateFormat: '@',
-        minDate: '[expr $now * 1000]',
-        maxDate: '[expr ($now + 7 * 86400) * 1000]',
-        onSelect: function(val, sel) {
-                var stt = \$(this).attr('stt');
-                // Extract date part
-                dval  = ~~(val / 86400000);
-                // Extract current time part
-                var tm = ~~(stt % 86400);
-
-                var ret = dval * 86400 + tm;
-
-                window.location = '/cgi-bin/xepg.jim?stt=' + ret;
-        }
-});
-
-\$('img.ui-datepicker-trigger').hover(
-    function() { \$(this).css('cursor', 'pointer'); },
-    function() { \$(this).css('cursor', 'auto'); }
-);
-
-"
-
 if {$current} {
+	puts "
+		<script type=text/javascript>
+		\$(function() {
+	"
 	puts {
 
 var kt = $('#xe0');
@@ -249,23 +235,21 @@ 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 "
-});
-</script>
-"
-
-puts "
-	<a href=/cgi-bin/settings.jim>
+	<a href=/settings/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>

webif/cgi-bin/xepg.js

@@ -0,0 +1,38 @@
+$(function() {
+
+$('#epgswitch').button().click(function() {
+	window.location = '/epg/list.jim';
+});
+
+$('button.nav').click(function() {
+        window.location = '/cgi-bin/xepg.jim?stt=' + $(this).attr('tt') +
+            '&pos=' + $('#xegrid').scrollTop();
+});
+
+$('#xepg_dp').datepicker({
+        buttonImage: '/img/cal.gif',
+        buttonImageOnly: true,
+        showOn: 'button',
+        dateFormat: '@',
+        minDate: 0,
+        maxDate: 8,
+        onSelect: function(val, sel) {
+                var stt = $(this).attr('stt');
+                // Extract date part
+                dval  = Math.round(val / 86400000.0);
+                // Extract current time part
+                var tm = ~~(stt % 86400);
+
+                var ret = dval * 86400 + tm;
+
+                window.location = '/cgi-bin/xepg.jim?stt=' + ret;
+        }
+});
+
+$('img.ui-datepicker-trigger').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+);
+
+});
+

webif/html/backup/backup.jim

@@ -0,0 +1,37 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+
+require rsv.class
+
+set dir "/mod/var/backup"
+
+httpheader
+
+set now [clock seconds]
+set file [file tail [cgi_get file \
+    [clock format $now -format "auto-%Y-%b-%d-%H:%M"]]]
+
+if {[string match {auto-*} $file]} {
+	# Delete any automatic backups over 7 days old.
+	set mt $(15 * 86400)
+	foreach af [glob -nocomplain "$dir/auto-*"] {
+		set aft [file mtime $af]
+		set diff $($now - $aft)
+		if {$diff > $mt} {
+			puts "Removing $af"
+			file delete $af 
+		}
+	}
+}
+
+set ffile "$dir/$file.rbk"
+
+if {[file exists $ffile]} {
+	puts "Backup file <i>$file</i> already exists."
+	exit
+}
+
+rsv backup $ffile
+

webif/html/backup/backup.js

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

webif/html/backup/index.jim

@@ -3,17 +3,20 @@
 source /mod/webif/lib/setup
 require altrow rsv.class
 
+jscss backup.js
+header
+
 puts {
-<script type=text/javascript src=/cgi-bin/backup/backup.js></script>
 <h2>Backup/Restore</h2>
 
 <div id=restore_warning class="hidden warningbox">
+<div>
 <center>
 <b>!!!!!!!!!!!!!! PLEASE NOTE !!!!!!!!!!!!!!
 <br><br>
 After restoring the scheduled recordings you <b>MUST</b> restart the box using
 the link at the top of the screen or via the remote control.
-</div>
+</div></div>
 
 <div style="clear: both; float: left; width: 40%; border: 1px solid grey;
     padding: 1em">
@@ -63,3 +66,5 @@ puts {
 </div>
 }
 
+footer
+

webif/html/backup/restore.jim

@@ -0,0 +1,21 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+
+require rsv.class
+
+set dir "/mod/var/backup"
+
+httpheader
+
+set file [file tail [cgi_get restore_file]]
+if {$file == 0} {
+	puts "No filename supplied."
+	exit
+}
+
+set ffile "$dir/$file.rbk"
+
+rsv restore $ffile
+

webif/html/browse/aexpiry.jim

@@ -0,0 +1,49 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require browse.class
+
+# dir=%2Fmedia%2FMy+Video%2FWeatherview
+# aexpiry_days=13
+
+set dir [cgi_get dir "-"]
+if {$dir eq "-"} exit
+
+set act [cgi_get act "update"]
+
+if {$act eq "fetch"} {
+	httpheader "application/json"
+	set data [{dir expiry} $dir]
+	puts "{"
+	puts " \"days\": \"$data(days)\","
+	puts " \"keep\": \"$data(keep)\","
+	puts " \"type\": \"$data(type)\","
+	puts " \"keepnew\": \"$data(keepnew)\""
+	puts "}"
+	exit
+}
+
+if {$act eq "remove"} {
+	httpheader
+	if {[file exists "$dir/.autoexpire"]} {
+		file delete "$dir/.autoexpire"
+	}
+	exit
+}
+
+httpheader
+
+set data(days) [cgi_get aexpiry_days 0]
+set data(keep) [cgi_get aexpiry_min 0]
+set data(type) [cgi_get aexpiry_timetype recorded]
+set data(keepnew) [cgi_get aexpiry_unwatched 0]
+
+if {![file isdirectory $dir]} {
+	puts "Not a directory."
+	exit
+}
+
+{dir expiry} $dir $data
+puts "Ok."
+

webif/html/browse/assets.jim

@@ -21,10 +21,14 @@ if {$model eq "HDR"} {
 }
 if {[system pkginst ffmpeg]} {
 	puts {
-		<li><a href=#audio>Extract Audio</a></li>
-		<li><a href=#mpg>Extract to MPG</a></li>
+		<li class=mp3><a href=#audio>Extract Audio</a></li>
+		<li class=mpg><a href=#mpg>Extract to MPG</a></li>
+		<li class=thm><a href=#thm>Set Thumbnail</a></li>
 	}
 }
+
+puts { <li><a href=#vthm>View Thumbnail</a></li> }
+
 if $nicesplice {
 	puts {
 		<li class="cut"><a href=#crop>Crop</a></li>
@@ -34,6 +38,16 @@ if $nicesplice {
 puts {
 	<li class=separator><a href=#lock>Toggle Lock</a></li>
 	<li><a href=#new>Toggle New</a></li>
+}
+
+if {[llength $plugins(menu)]} {
+	foreach plugin $plugins(menu) {
+		lassign $plugin tag options
+		puts "<li class=$tag><a href=#$tag>$options(desc)</a></li>"
+	}
+}
+
+puts {
 </ul>
 
 <ul id=ooptmenu class=contextMenu style="width: 160px">
@@ -76,8 +90,24 @@ if $flatten {
 }
 
 puts {
-	<li class=clock><a href=#expire>Auto-Expire</a></li>
-	<li class=mpg><a href=#mpg>Auto-MPG Extract</a></li>
+	<li class=clock><a href=#expire>Auto-Expire Options</a></li>
+}
+
+if {[system pkginst ffmpeg]} {
+	puts {
+		<li class=mp3><a href=#mp3>Auto-Audio Extract</a></li>
+		<li class=mpg><a href=#mpg>Auto-MPG Extract</a></li>
+	}
+}
+
+if {[llength $plugins(dmenu)]} {
+	foreach plugin $plugins(dmenu) {
+		lassign $plugin tag options
+		puts "<li class=$tag><a href=#$tag>$options(desc)</a></li>"
+	}
+}
+
+puts {
 </ul>
 
 <div id=renameform title="Rename media file" style="display: none">
@@ -196,7 +226,10 @@ puts {
 <div id=savestreamform title="Save streamed content"
     style="display: none">
 	<div class=pre id=savestream_detail></div>
-	<form id=savestream_form>
+	<div id=savestream_retrieving>
+		<img src=/img/loading.gif> Retrieving details...
+	</div>
+	<form id=savestream_form class=hidden>
 }
 puts "<input type=hidden name=dir value=\"$dir\">"
 puts {
@@ -204,7 +237,7 @@ puts {
 	<tr>
 	<th>
 		<label for="savestream_name">
-			<b>Filename</b>
+			<b>Enter Filename</b>
 		</label>
 	</th>
 	<td>
@@ -212,7 +245,9 @@ puts {
 		    id="savestream_name"
 		    value="" size=70 maxlength=255
 		    class="text ui-widget-content ui-corner-all">
-		<img id=savestream_spin src=/img/loading.gif>
+		<span id=savestream_spin>
+			<img src=/img/loading.gif> Saving...
+		</span>
 	</td>
 	</tr>
 	</table>
@@ -241,28 +276,76 @@ puts {
 	</form>
 </div>
 
-<div id=aexpiry title="Auto-Expiry" style="display: none">
+<div id=aexpiry title="Auto-Expiry Settings"
+    style="display: none; line-height: 1em;">
 	<form id=aexpiry_form>
 	<input type=hidden name="dir" id="aexpiry_ldir" value="">
 }
 puts {
 	<table border=0>
-	<tr>
-	<th>
+
+	<tr><th align=right>
 		<label for="aexpiry_days">
-			<b>Expire after</b>
-			<span class=blood>(in days)</span>
+			<b>Remove recordings after</b> (in days)
+			<br><span class=footnote>
+			(Leave blank to skip age check)
+			</span>
 		</label>
-	</th>
-	<td>
-		<input type=text name="aexpiry_days" id="aexpiry_days"
+	</th><td>
+		<input name="aexpiry_days" id="aexpiry_days"
 		    type=number value=0 size=5 maxlength=3
 		    class="text ui-widget-content ui-corner-all">
-	</td>
-	</tr>
+	</td></tr>
+
+	<tr><th>
+		<label for="aexpiry_min">
+			<b>Keep at least</b>
+			(number of recordings)
+			<br>
+			<span class=footnote>(Oldest will be deleted first)
+			    </span>
+		</label>
+	</th><td>
+		<input name="aexpiry_min" id="aexpiry_min"
+		    type=number value=0 size=5 maxlength=3
+		    class="text ui-widget-content ui-corner-all">
+	</td></tr>
+
+	<tr><th>
+		<label for="aexpiry_timetype">
+			<b>For date of recording, use</b>
+		</label>
+	</th><td>
+		<input name="aexpiry_timetype" id="aexpiry_timetype0"
+		    type=radio value=0 checked
+		    class="text ui-widget-content ui-corner-all">
+		Recording end time
+		<br>
+		<input name="aexpiry_timetype" id="aexpiry_timetype1"
+		    type=radio value=1
+		    class="text ui-widget-content ui-corner-all">
+		<span>
+		When last watched
+		<span class=bfootnote>(or end time if unwatched)</span>
+		</span>
+	</td></tr>
+
+	<tr><th>
+		<label for="aexpiry_unwatched">
+			<b>Never delete unwatched recordings</b>
+		</label>
+	</th><td>
+		<input name="aexpiry_unwatched" id="aexpiry_unwatched"
+		    type=checkbox value=1
+		    class="ui-widget-content ui-corner-all">
+	</td></tr>
+
 	</table>
 	<div id=aexpiry_working class=hidden>
-		<img src=/img/loading.gif> Applying auto-expiry...
+		<img src=/img/loading.gif> Applying changes...
+	</div>
+	<div id=aexpiry_loading class=hidden>
+		<img src=/img/loading.gif> Retrieving data...
 	</div>
 	</form>
 </div>
@@ -278,5 +361,9 @@ Please wait...
 </center>
 </div>
 
+<div id=bmpdialogue title="Recording Thumbnail" class=hidden>
+<img id=thmbmp class=doublebmp src="about:blank">
+</div>
+
 }
 

webif/html/browse/audio/audio.jim

@@ -3,19 +3,21 @@
 package require sqlite3
 package require cgi
 source /mod/webif/lib/setup
-require ts.class system.class
+require ts.class system.class settings.class
 
+jqplugin progressbar
+jscss audio.js
 header
 
+set s [settings]
+set type [$s audiomp3descr [$s audiomp3]]
+
 set rfile [cgi_get file]
 set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
 
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=audio.js></script>
 
 <fieldset class=cleft>
 <legend>Audio Extraction</legend>
@@ -31,7 +33,7 @@ puts "
 ></span>
 
 <div id=audiodiv style=\"padding: 1em\">
-<button id=audioit>Perform audio extraction</button>
+<button id=audioit>Perform audio extraction - $type</button>
 </div>
 
 <div id=progressdiv class=hidden>

webif/html/browse/audio/execute.jim

@@ -3,7 +3,7 @@
 package require sqlite3
 package require cgi
 source /mod/webif/lib/setup
-require ts.class system.class
+require ts.class system.class settings.class
 
 httpheader
 
@@ -18,9 +18,15 @@ 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"]
+set cmd [list ffmpeg -y -benchmark -v 0 -i "$rfile" -f mp3 -vn]
+
+if {![[settings] audiomp3]} {
+	lappend cmd -acodec copy
+}
+lappend cmd "${base}.mp3"
+
+#puts "$cmd"
+puts [exec {*}$cmd]
 
 if {[system pkginst id3v2]} {
 	puts [exec /mod/bin/id3v2 \

webif/html/browse/bmp.jim

@@ -0,0 +1,19 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require cat
+
+set file [cgi_get file]
+set file "[file rootname $file].thm"
+
+if {![file exists $file]} {
+	httpheader "text/plain"
+	puts "No such file, $file"
+	exit
+}
+
+httpheader "image/bmp"
+cat "/mod/webif/lib/bmpheader"
+cat $file
+

webif/html/browse/chunk/chunk.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar
+jscss chunk.js chunk.css
 header
 
 set rfile [cgi_get file]
@@ -19,10 +21,6 @@ set esttime $(int($len * 0.025))
 if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
 
 puts "
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=chunk.js></script>
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<link href=chunk.css rel=stylesheet type=text/css />
 
 <fieldset class=cleft>
 <legend>Split recording into 45 minute segments</legend>

webif/html/browse/clipboard.jim

@@ -113,6 +113,7 @@ switch $action {
 				    "$dir/[file tail $path]"}
 			}
 		}
+		ts resetnew $dir
 	}
 	$cb clear
 	$cb save

webif/html/browse/crop/crop.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar
+jscss crop.js
 header
 
 set rfile [cgi_get file]
@@ -13,10 +15,6 @@ set dir [file dirname $rfile]
 set len [$ts duration 1]
 
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=crop.js></script>
-
 <fieldset class=cleft>
 <legend>Crop recording</legend>
 

webif/html/browse/crop/execute.jim

@@ -34,10 +34,12 @@ if {[file exists "$origdir/$shname.ts"]} {
 }
 
 puts "Moving recording to $origdir"
-foreach f [glob -nocomplain "${base}.*"] {
-	set tail [file tail $f]
-	puts "  $tail"
-	file rename $f "$origdir/$tail"
+
+set tail [file tail $base]
+foreach ext $tsgroup {
+	if {![file exists "$base.$ext"]} continue
+	puts "  $tail.$ext"
+	file rename "$base.$ext" "${origdir}/$tail.$ext"
 }
 
 puts [exec /mod/bin/nicesplice \
@@ -49,6 +51,8 @@ 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"
+# New nicesplice shrinks whilst cropping.
+exec /mod/bin/hmt "+shrunk" "$dir/$newname.hmt"
 
 set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
 puts "Time taken: $croptime"

webif/html/browse/crop/progress.jim

@@ -7,7 +7,7 @@ require ts.class
 httpheader
 
 set perc [cgi_get perc 100]
-set tsfile [file normalize [cgi_get file]]
+set tsfile [cgi_get file]
 
 set origfile "[file dirname $tsfile]/_original/[file tail $tsfile]"
 set newfile [file rootname $tsfile]