fix sorting of backups

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

CONTROL/control

@@ -1,11 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.6.2
+Version: 0.8.4-1
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.2),hmt(>=1.0.6),ssmtp
-Replaces: af123-webif
-Conflicts: af123-webif
-Suggests: ffmpeg
+Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.1),ssmtp,anacron
+Suggests: ffmpeg,webif-iphone,nicesplice
 Description: An evolving web interface for the Humax.

CONTROL/postinst

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+export tmpf=/tmp/cronf.$$
+
+# Add anacron jobs
+
+ana=$PKG_ROOT/etc/anacrontab
+grep -v 'backup/backup.jim' $ana > $tmpf
+(
+	cat $tmpf
+	echo "1 30 /mod/var/mongoose/cgi-bin/backup/backup.jim"
+) > $ana
+
+$PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
+
+exit 0
+

CONTROL/prerm

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+export tmpf=/tmp/cronf.$$
+
+ana=/mod/etc/anacrontab
+grep -v 'backup/backup.jim' $ana > $tmpf
+cp $tmpf $ana
+
+exit 0
+

etc/init.d/S60parseepg

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

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

@@ -13,12 +13,23 @@ puts ""
 cgi_input
 #cgi_dump
 
-if {![dict exists $_cgi file]} {
-	puts "No filename supplied."
-	exit
+set now [clock seconds]
+set file [file tail [cgi_get file \
+    [clock format $now -format "auto-%Y-%b-%d-%H:%M"]]]
+
+if {[string match {auto-*} $file]} {
+	# Delete any automatic backups over 7 days old.
+	set mt $(7 * 3600)
+	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 file [file tail [dict get $_cgi file]]
 set ffile "/$dir/$file.rbk"
 
 if {[file exists $ffile]} {

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

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

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

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

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

@@ -3,7 +3,7 @@
 package require cgi
 source /mod/var/mongoose/lib/setup
 
-require rsv.class
+require rsv.class findhsvc system.class
 
 set dir /mod/var/backup
 
@@ -29,29 +29,11 @@ if {![file exists $ffile]} {
 }
 
 if {[catch { set fd [open $ffile r] } msg]} {
-	puts "Error opening backup file. - $msg"
+	puts "Error opening <i>$file</i> - $msg"
 	exit
 }
 
-proc findhsvc {channel} {
-	global rsvdb
-
-	set hsvc [$rsvdb query "
-		select hSvc
-		from channel.TBL_SVC
-		where szSvcName = '$channel'
-		or szSvcname = '\025$channel'
-		limit 1
-	"]
-
-	if {[llength $hsvc] == 1} {
-		return [lindex [lindex $hsvc 0] 1]
-	} else {
-		return 0
-	}
-}
-
-puts "Restoring scheduled events..."
+puts "Restoring scheduled events from <i>$file</i>..."
 
 $rsvdb query {begin transaction;}
 $rsvdb query {delete from TBL_RESERVATION;}
@@ -94,7 +76,11 @@ foreach line $data {
 		}
 	}
 
-	if {!$bad} { $rsv insert }
+	if {!$bad} {
+		if {[catch {$rsv insert pending 1} msg]} {
+			puts "    Error inserting event, $msg"
+		}
+	}
 }
 
 $rsvdb query {commit transaction;}
@@ -111,7 +97,7 @@ foreach line $data {
 	set group [lindex $vals 1]
 	set type [lindex $vals 2]
 	set chan [lindex $vals 3]
-	set hsvc [findhsvc $chan]
+	set hsvc [get_channel_attr $chan]
 
 	if {$grp != $group} {
 		set grp $group
@@ -135,7 +121,7 @@ foreach line $data {
 
 $rsvdb query {commit transaction;}
 
-close [open /tmp/.restartpending w]
+system restartpending
 
 close $fd
 rsv cleanup

var/mongoose/cgi-bin/browse.jim

@@ -2,11 +2,13 @@
 
 package require cgi
 source /mod/var/mongoose/lib/setup
-require ts.class pretty_size
+require ts.class pretty_size system.class settings.class
 
 puts "Content-Type: text/html"
 puts ""
 
+set nicesplice [system pkginst nicesplice]
+
 set ignore {.nts .thm .hmt .hmi}
 set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
 
@@ -14,16 +16,36 @@ cgi_input
 #cgi_dump
 
 #set env(REQUEST_URI) ''
-#set _cgi(dir) "/media/My Video/Chuggington"
+#set _cgi(dir) "/media/My Video/\[Don't Die Young\]"
+
+if {![dict exists $env QUERY_STRING]} { set env(QUERY_STRING) "root" }
+
+set order [cgi_get order -]
+if {$order eq "-"} {
+	set order [[settings new] sortorder]
+} else {
+	[settings new] sortorder $order
+}
 
 proc directory {file bfile} {
 	regsub -all " +" $bfile "" tbfile
 	puts "<div class=va>"
-	puts "<a href=$::env(REQUEST_URI)?dir=[cgi_quote_url $file]>"
 	puts "<img border=0 class=va id=\"img$tbfile\"
 	    src=/images/711_1_09_Media_Folder.png>"
+	puts "<input class=\"fs fsdir\" type=checkbox>"
+	puts "<a class=dbf
+	    href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
+	    file=\"$file\">"
 	puts "$bfile</a><span class=filesize id=\"$tbfile\">
-		</span></div>"
+		</span>"
+	puts "
+	      <a href=#>
+		<img class=\"dopt va\" border=0 width=45 
+		    src=/images/181_1_00_Help5_OPT_Plus.png>
+	      </a>
+	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
+	"
+	puts "</div>"
 }
 
 proc entry {file} {{i 0}} {
@@ -53,11 +75,6 @@ proc entry {file} {{i 0}} {
 		set img Video_Other
 	}
 
-	puts "
-	    <div class=\"va bf\" id=[incr i]>
-	      <a class=bf file=\"$file\" type=$type href=#>
-	"
-
 	set new 0
 	if {$type eq "ts"} {
 		if {[$ts flag "New"] > 0} { set new 1 }
@@ -67,11 +84,18 @@ proc entry {file} {{i 0}} {
 
 	if {$new} { append img _New }
 
-	puts "<img class=va border=0 src=/img/$img.png>"
+	set fscl "fs"
+	if {$type eq "ts"} {
+		set fscl "fs fsts"
+	}
 
 	puts "
-		$bfile
-	      </a>
+	    <div class=\"va bf\" id=[incr i]>
+		<img class=va border=0 src=/img/$img.png>
+		<input class=\"$fscl\" type=checkbox>
+		<a class=bf file=\"$file\" type=$type href=#>
+		    $bfile
+	        </a>
 	"
 
 	# Size
@@ -81,7 +105,9 @@ proc entry {file} {{i 0}} {
 
 	set locked 0
 	set encd 0
+	set odencd 1
 	set def unknown
+	set bx 0
 	if {$type eq "ts"} {
 		# HD / SD
 		if {[$ts get definition] eq "HD"} {
@@ -107,6 +133,10 @@ proc entry {file} {{i 0}} {
 			    src=/images/749_1_26_Video_Encryption.png
 			    height=21>"
 		}
+		if {![$ts flag "ODEncrypted"]} {
+			puts "<img class=va src=/img/Decrypted.png height=21>"
+			set odencd 0
+		}
 
 		# Guidance
 		if {[$ts flag "Guidance"] > 0} {
@@ -114,6 +144,8 @@ proc entry {file} {{i 0}} {
 			    src=/images/174_1_26_GuidancePolicy.png
 			    height=21>"
 		}
+
+		set bx [$ts get bookmarks]
 	}
 
 	# Opt+ button
@@ -121,7 +153,8 @@ proc entry {file} {{i 0}} {
 	puts "
 	      <a href=#>
 		<img class=\"opt va\" border=0 width=45 type=$type did=$i
-		    locked=$locked encd=$encd def=$def new=$new
+		    locked=$locked encd=$encd def=$def new=$new bx=$bx
+		    odencd=$odencd
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
 	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
@@ -129,11 +162,7 @@ proc entry {file} {{i 0}} {
 	puts "</div>"
 }
 
-if {[dict exists $_cgi dir]} {
-	set dir [dict get $_cgi dir]
-} else {
-	set dir "/media/My Video"
-}
+set dir [cgi_get dir [system mediaroot]]
 
 ######################################################################
 # Render web page
@@ -145,12 +174,25 @@ puts {
 	<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
 
 	<ul id=optmenu class=contextMenu>
-		<li><a href=#delete>Delete</a></li>
+		<li class=delete><a href=#delete>Delete</a></li>
 		<li><a href=#lock>Toggle Lock</a></li>
 		<li><a href=#enc>Toggle Enc</a></li>
 		<li><a href=#new>Toggle New</a></li>
 		<li><a href=#rename>Rename</a></li>
 		<li><a href=#download>Download</a></li>
+}
+if {[system model] eq "HDR"} {
+	puts { <li class="separator"><a href=#decrypt>Decrypt</a></li> }
+}
+if $nicesplice {
+	puts { <li class="cut separator"><a href=#crop>Crop</a></li> }
+}
+puts {
+	</ul>
+
+	<ul id=doptmenu class=contextMenu>
+		<li class=delete><a href=#delete>Delete</a></li>
+		<li><a href=#rename>Rename</a></li>
 	</ul>
 
 	<div id=renameform title="Rename media file" style="display: none">
@@ -173,7 +215,7 @@ puts {
 		<tr style="display: none" class=tstype>
 		<th>
 			<label for="renametitle" style="padding-top: 0.5em">
-				<b>New EPG Title</b>
+				<b>New Medialist Title</b>
 			</label>
 		</th>
 		<td>
@@ -189,6 +231,52 @@ puts {
 		</form>
 	</div>
 
+	<div id=drenameform title="Rename directory" style="display: none">
+		<form id=drenameform_form>
+		<input type=hidden name="renameorig" id="drenameorig" value="">
+		<table border=0>
+		<tr>
+		<th>
+			<label for="drename">
+				<b>New Directory Name</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="rename" id="drename"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		</table>
+		</form>
+	</div>
+
+	<div id=savestreamform title="Save streamed content"
+	    style="display: none">
+		<div class=pre id=savestream_detail></div>
+		<form id=savestream_form>
+}
+puts "<input type=hidden name=dir value=\"$dir\">"
+puts {
+		<table border=0>
+		<tr>
+		<th>
+			<label for="savestream_name">
+				<b>Filename</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="savestream_name"
+			    id="savestream_name"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+			<img id=savestream_spin src=/img/loading.gif>
+		</td>
+		</tr>
+		</table>
+		</form>
+	</div>
+
 	<div id=dialogue></div>
 	<div id=confirm title="Confirmation Required"></div>
 
@@ -226,11 +314,97 @@ if {$parent ne ""} {
 # Strip double slashes
 regsub -all -- {\/+} "$dir/*" "/" dir
 
-foreach file [lsort [glob -nocomplain "$dir"]] {
-	entry $file
+# Escape square brackets (for glob)
+regsub -all {([\\[])} $dir {\\\1} dir
+
+proc s_time {a b} {
+	set ad [file isdirectory $a]
+	set bd [file isdirectory $b]
+
+	if {$ad && !$bd} { return -1 }
+	if {$bd && !$ad} { return 1 }
+	if {$ad && $bd} {
+		if {$a < $b} { return -1 }
+		if {$a > $b} { return 1 }
+		return 0
+	}
+
+	file stat $a l
+	set at $l(ctime)
+	file stat $b l
+	set bt $l(ctime)
+
+	if {$at < $bt} { return -1 }
+	if {$at > $bt} { return 1 }
+	return 0
 }
 
+set files [glob -nocomplain $dir]
+switch $order {
+	1 {		set files [lsort -command s_time $files] }
+	default {	set files [lsort $files] }
+}
+
+foreach file $files { entry $file }
+
+puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
+
+# Sort icons
+puts "<div id=sortdiv>"
+set sortlist {{0 sort_name name} {1 sort_date date}}
+foreach sl $sortlist {
+	lassign $sl index img descr
+
+	if {$index} { puts "  |  " }
+
+	set tag "Currently sorting"
+	if {$order != $index} {
+		puts "
+		    <a href=$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index>"
+		set tag "Sort"
+	}
+	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"
+	if {$order != $index} {
+		puts "</a>"
+	}
+}
+puts "</div>"
+
 puts "</fieldset>"
 
+puts "<div class=brow>"
+
+puts {
+<button id=delete>Delete</button>
+<div id=deletewait class=blood style="display: none">
+<img src=/img/loading.gif>Deleting may take some time, please be patient...
+</div>
+}
+
+# Join
+if $nicesplice {
+	puts { <button id=join>Join</button> }
+}
+
+puts "</div><div class=brow style=\"margin-top: 3px\">"
+
+# De-duplicate
+
+puts {
+	<button id=dedup>De-duplicate/tidy this folder</button>
+}
+
+# Streamer file
+
+if {[file exists /mnt/hd3/Streamer_down_file]} {
+		puts {
+	<button id=save_stream file=/mnt/hd3/Streamer_down_file>
+		Save last streamed content (e.g. iPlayer/YouTube)
+	</button>
+	}
+}
+
+puts "</div>"
+
 footer
 

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

@@ -1,3 +1,28 @@
+(function($)
+{
+	$.fn.enable = function()
+	{
+		return this.each(function() {
+			$(this)
+			    .removeClass('ui-state-disabled')
+			    .removeProp('disabled');
+		});
+	};
+
+	$.fn.disable = function()
+	{
+		return this.each(function() {
+			$(this)
+			    .addClass('ui-state-disabled')
+			    .prop('disabled', true);
+		});
+	};
+})(jQuery);
+
+function disableall()
+{
+	$('button,a,input').disable();
+}
 
 function epginfo_callback(data, status, xhr)
 {
@@ -56,7 +81,10 @@ function delete_callback(file, type, id)
 	var results = el + ' .results';
 	var url = '/cgi-bin/browse/delete.jim?file=' +
 	    encodeURIComponent(file) + '&type=' + type;
-	$(results).load(url, function() {
+	$(results)
+	    .html('<img src=/img/loading.gif>Deleting, please wait...')
+	    .slideDown('slow')
+	    .load(url, function() {
 		$(el).delay(3000).slideUp(300, function() {
 			$(el).remove();
 		});
@@ -88,6 +116,25 @@ function rename_submit()
 	    function() { window.location.reload(true); });
 }
 
+function drename_submit()
+{
+	var s = $('#drenameform_form').serialize();
+	$.get('/cgi-bin/browse/rename.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
+function savestream_submit()
+{
+	var s = $('#savestream_form').serialize();
+	var sf = $('#save_stream').attr('file');
+	$('#savestream_spin').show();
+	$.get('/cgi-bin/browse/savestream.jim?sfile=' +
+	    encodeURIComponent(sf) + '&' + s,
+	    function() {
+		window.location.reload(true);
+	    });
+}
+
 var $confirm;	// Populated after DOM is loaded.
 
 function confirm_action(action, callback, file, type, id)
@@ -115,13 +162,16 @@ function preparemenu(el, menu)
 			$('#optmenu').enableContextMenuItems('#enc');
 			if (el.attr('encd') == 1)
 				$(menu).changeContextMenuItem('#enc',
-				    'Remove ENC');
+				    'Remove Enc');
 			else
 				$(menu).changeContextMenuItem('#enc',
-				    'Set ENC');
+				    'Set Enc');
 		}
+
+		if (el.attr('bx') > 0)
+			$('#optmenu').enableContextMenuItems('#crop');
 		else
-			$('#optmenu').disableContextMenuItems('#enc');
+			$('#optmenu').disableContextMenuItems('#crop');
 
 		$('#optmenu').enableContextMenuItems('#new');
 		if (el.attr('new') == 1)
@@ -141,6 +191,12 @@ function preparemenu(el, menu)
 			$(menu).changeContextMenuItem('#lock', 'Lock');
 			$('#optmenu').enableContextMenuItems('#delete');
 		}
+
+		if (el.attr('odencd') == 1)
+			$('#optmenu').enableContextMenuItems('#decrypt');
+		else
+			$('#optmenu').disableContextMenuItems('#decrypt');
+	
 	}
 	else
 	{
@@ -148,6 +204,8 @@ function preparemenu(el, menu)
 		$('#optmenu').disableContextMenuItems('#lock');
 		$('#optmenu').disableContextMenuItems('#enc');
 		$('#optmenu').disableContextMenuItems('#new');
+		$('#optmenu').disableContextMenuItems('#decrypt');
+		$('#optmenu').disableContextMenuItems('#crop');
 	}
 
 }
@@ -203,7 +261,59 @@ var menuclick = function(action, el, pos)
 		break;
 
 	    case 'download':
-		window.location.href = file;
+		window.location.href = '/cgi-bin/browse/download.jim?file=' +
+		    encodeURIComponent(file);
+		break;
+
+	    case 'crop':
+		window.location.href = '/cgi-bin/browse/crop.jim?file=' +
+		    encodeURIComponent(file);
+		break;
+
+	    case 'decrypt':
+		window.location.href = '/cgi-bin/browse/decrypt.jim?file=' +
+		    encodeURIComponent(file);
+		break;
+
+	    default:
+		alert('Unhandled action: ' + action);
+		break;
+	}
+};
+
+var dmenuclick = function(action, el, pos)
+{
+	var direl = $(el).parent().parent();
+	var file = $(el).parent().prevAll('a.dbf').last().attr('file');
+	var bfile = file.replace(/.*\//g, '');
+	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
+	var results = $(el).parent().next('div.results');
+
+	switch (action)
+	{
+	    case 'delete':
+		var url = '/cgi-bin/browse/delete.jim?file=' +
+		    encodeURIComponent(file) + '&type=dir';
+
+		if (confirm('Are you sure you wish to delete "' + file +
+		    '" and all files within it?'))
+		{
+			$(results)
+			    .html('<img src=/img/loading.gif>' +
+			    'Deleting, please wait...')
+			    .slideDown('slow')
+			    .load(url, function() {
+				$(direl).delay(3000).slideUp(300, function() {
+					$(direl).remove();
+				});
+			});
+		}
+		break;
+
+	    case 'rename':
+		$('#drename').val(bfile);
+		$('#drenameorig').val(file);
+		$('#drenameform').dialog('open');
 		break;
 
 	    default:
@@ -222,6 +332,14 @@ var menuclick = function(action, el, pos)
 		menuclick
 	);
 
+	$('img.dopt').contextMenu(
+		{
+			menu: 'doptmenu',
+			leftButton: true,
+		},
+		dmenuclick
+	);
+
 	// Disable items which are not yet implemented.
 	$('#optmenu').disableContextMenuItems('#title');
 
@@ -265,6 +383,32 @@ var menuclick = function(action, el, pos)
 		close: function() { $('#rename').val(''); }
 	});
 
+	$('#drenameform').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Update": drename_submit,
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#drename').val(''); }
+	});
+
+	$('#savestreamform').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Save": savestream_submit,
+			"Cancel": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#savestream_name').val(''); }
+	});
+
 	// Create re-usable confirmation dialogue.
 	$confirm = $('#confirm').dialog({
 		modal: true, autoOpen: false,
@@ -282,5 +426,81 @@ var menuclick = function(action, el, pos)
 	// Flag folders with unwatched items
 	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
 		new_folder_callback);
+
+	// Uncheck everything
+	$('input.fs:checked').attr('checked', false);
+
+	// Buttons
+
+	$('#dedup').button().click(function() {
+		window.location = '/cgi-bin/dedup.jim?dir='
+		    + encodeURIComponent(dir);
+	});
+
+	$('#save_stream').button().click(function() {
+		$('#savestream_spin').hide();
+		$('#savestreamform').dialog('open');
+		$('#savestream_detail').load(
+		    '/cgi-bin/browse/ffmpeg.jim?file=' +
+		    encodeURIComponent($('#save_stream').attr('file')));
+	});
+
+	$('#selectall').click(function(e) {
+		e.preventDefault();
+		$('input.fs').attr('checked', true).trigger('change');
+	});
+	$('#deselectall').click(function(e) {
+		e.preventDefault();
+		$('input.fs:checked').attr('checked', false).trigger('change');
+	});
+
+	$('#join').button().disable()
+	    .click(function() {
+		var files = new Array();
+		var els = $('input.fsts:checked + a').each(function() {
+			files.push(encodeURIComponent($(this).attr('file')));
+		});
+		//console.log("%o", files);
+		window.location.href = '/cgi-bin/browse/join.jim?files=' +
+		    files.join();
+	    });
+
+	$('#delete').button().disable()
+	    .click(function() {
+		var files = new Array();
+		var els = $('input.fs:checked + a').each(function() {
+			files.push(encodeURIComponent($(this).attr('file')));
+		});
+		//console.log("%o", files);
+		var str = 'Are you sure you want to delete ' + files.length +
+		    ' file';
+		if (files.length != 1) str += 's';
+		str += '?';
+		if (confirm(str))
+		{
+			disableall();
+			$('#deletewait').slideDown('slow');
+			window.location.href =
+			    '/cgi-bin/browse/mdelete.jim?dir=' +
+			    encodeURIComponent(dir) + '&files=' +
+		    	    files.join();
+		}
+	    });
+
+	$('input.fs').change(function() {
+		var num = $('input.fs:checked').size();
+		if (num > 0)
+			$('#delete').enable();
+		else
+			$('#delete').disable();
+	
+		var num = $('input.fsts:checked').size();
+		if (num > 1)
+			$('#join').enable();
+		else
+			$('#join').disable();
+
+	});
+
 });
 

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

@@ -0,0 +1,192 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set tsfile [cgi_get file]
+set rfile [file normalize $tsfile]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+
+set len [$ts duration 1]
+
+if {[cgi_get do] eq "it"} {
+
+	set cropstart [clock milliseconds]
+
+	set base [file rootname $rfile]
+	set origdir "$dir/_original"
+	if {![file exists $origdir]} { file mkdir $origdir }
+
+	set shname [file tail $base]
+	puts "Processing $shname"
+
+	if {[file exists "$origdir/$shname.ts"]} {
+		puts "This recording already exists within _original"
+		puts "Cannot continue."
+		exit
+	}
+
+	puts "Moving recording to $origdir"
+	foreach f [glob -nocomplain "${base}.*"] {
+		set tail [file tail $f]
+		puts "  $tail"
+		file rename $f "$origdir/$tail"
+	}
+
+	puts [exec /mod/bin/nicesplice \
+	    -in "$origdir/$shname" \
+	    -out "$dir/$shname" \
+	    -cutBookMarks]
+
+	set newname "$shname-[clock seconds]"
+	puts "Renaming file group to $newname"
+	ts renamegroup "$dir/$shname.ts" $newname
+	exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
+
+	set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
+	puts "Time taken: $croptime"
+
+	exit
+}
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
+
+<table class=keyval cellpadding=5>
+<tr><th>File:</th><td>$rfile</td></tr>
+<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
+<tr><th>Size:</th><td>[pretty_size [$ts size]] ([$ts get definition])</td></tr>
+<tr><th>Bookmarks:</th><td>[$ts get bookmarks] @ "
+
+set flag 0
+foreach b [$ts bookmarks] {
+	if $flag { puts -nonewline ", " }
+	incr flag
+	puts -nonewline [clock format $b -format "%T"]
+}
+
+puts "</td></tr><tr><th>File</th><td>"
+
+puts "<div style=\"position: relative; top: -10px\">"
+
+proc div {type left right} {
+	set width $($right - $left)
+	puts "<div class=$type style=\"left: ${left}px; width: ${width}px\">
+	    $type</div>"
+}
+
+set keeping 0
+set last 0
+set start -1
+foreach b [$ts bookmarks] {
+	if {$start < 0} {
+		set start $b
+		continue
+	}
+	set end $b
+
+	incr keeping $($end - $start)
+
+	set left $($start * 500 / $len)
+	set right $($end * 500 / $len)
+
+	div cut $last $($left - 1)
+	div keep $left $($right - 1)
+
+	set last $right
+
+	set start -1
+}
+
+if {$start > 0} {
+	incr keeping $($len - $start)
+	set left $($start * 500 / $len)
+	div cut $last $($left - 1)
+	div keep $left 500
+} else {
+	div cut $last 500
+}
+
+set keepperc $($keeping * 100.0 / $len)
+set esttime $(int($keeping * 0.025))
+if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
+
+puts "
+</div>
+</td></tr>
+<tr><th>Keeping:</th><td>
+[clock format $keeping -format "%T"] ([format "%.2f" $keepperc]%)
+</td></tr>
+<tr><th>Time:</th>
+<td>Cropping will take around [clock format $esttime -format "%T"]</td></tr>
+</table>
+"
+
+puts "
+<div id=cropdiv>
+<button id=cropit>Perform crop operation</button>
+</div>
+<div id=progressdiv style=\"display: none\">
+Cropping: <div id=progressbar></div>
+<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+    perc=\"$keepperc\"
+    style=\"display: none\">Back to media list</button>"
+puts {
+<div id=output class=pre style="margin-top: 10px"></div>
+</div>
+
+<script type=text/javascript>
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/crop_progress.jim'
+	    + '?perc=' + $('#back').attr('perc')
+	    + '&file=' + $('#back').attr('rfile'),
+	    function(data) {
+		if (handle)
+			$('#progressbar').reportprogress(data);
+	});
+}
+
+$(document).ready(function() {
+
+$('#progressbar').reportprogress(0);
+
+$('#back').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
+});
+
+$('#cropit').button().click(function() {
+	$('#cropdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').text('Please do not interrupt...')
+	    .load(document.URL + '&do=it',
+	    function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+</script>
+</div>
+
+}
+

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

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

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

@@ -0,0 +1,129 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set tsfile [cgi_get file]
+set rfile [file normalize $tsfile]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+lassign [$ts dlnaloc] url
+
+if {[cgi_get do] eq "it"} {
+
+	set base [file rootname $rfile]
+	set origdir "$dir/_original"
+	if {![file exists $origdir]} { file mkdir $origdir }
+
+	set shname [file tail $base]
+	puts "Processing $shname"
+
+	exec wget -O "$rfile.decrypting" $url
+
+	puts "Moving recording to $origdir"
+
+	foreach f [glob -nocomplain "${base}.*"] {
+		if {[file extension $f] eq ".decrypting"} { continue }
+		set tail [file tail $f]
+		puts "  $tail"
+		file rename $f "${origdir}/$tail"
+	}
+
+	file rename "$rfile.decrypting" $rfile
+
+	foreach ext {nts hmt thm} {
+		set sidecar "$shname.$ext"
+		if {[file exists "$origdir/$sidecar"]} {
+			puts "Copying back sidecar $ext"
+			file copy "$origdir/$sidecar" "$dir/$sidecar"
+		}
+	}
+
+	if {[file exists "$dir/$shname.hmt"]} {
+		exec /mod/bin/hmt -encrypted "$dir/$shname.hmt"
+	}
+
+	exit
+}
+
+header
+
+puts "
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
+
+<table class=keyval cellpadding=5>
+<tr><th>File:</th><td>$rfile</td></tr>
+<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
+<tr><th>DLNA URL</th><td>$url</td></tr>
+</table>
+"
+
+if {$url eq ""} {
+	puts "This file has not been indexed by the media server.
+	    Cannot decrypt."
+	exit
+}
+
+puts {
+
+<div style="margin-top: 10px"></div>
+<div id=decryptdiv><button id=decryptit>Perform decryption</button></div>
+<div id=progressdiv style="display: none">
+Decrypting: <div id=progressbar></div>
+}
+puts "<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    rfile=\"[cgi_quote_url $rfile]\"
+    style=\"display: none\">Back to media list</button>"
+puts {
+<div id=output class=pre style="margin-top: 10px"></div>
+</div>
+
+<script type=text/javascript>
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/decrypt_progress.jim?file='
+	    + $('#back').attr('rfile'), function(data) {
+		if (handle)
+			$('#progressbar').reportprogress(data);
+	});
+}
+
+$(document).ready(function() {
+
+$('#progressbar').reportprogress(0);
+
+$('#back').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
+});
+
+$('#decryptit').button().click(function() {
+	$('#decryptdiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+	$('#output').load(document.URL + '&do=it', function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+});
+</script>
+</div>
+
+}
+

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

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

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

@@ -20,8 +20,13 @@ if {$type eq "ts"} {
 		puts "Problem deleting $file, [$ts get error]"
 	}
 	exit
+} elseif {$type eq "dir"} {
+	puts -nonewline "Directory..."
+	puts [exec /mod/bin/busybox/rm -rf $file]
+	puts -nonewline "Done..."
+} else {
+	file delete $file
+	file delete "[file rootname $file].hmi"
+	puts "Successfully deleted $file."
 }
 
-file delete $file
-puts "Successfully deleted $file."
-

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

@@ -0,0 +1,44 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require sqlite3
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+#puts "Content-Type: text/plain\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set file [cgi_get file]
+set rfile [file normalize $file]
+set ts [ts fetch $file]
+
+# Default to just downloading the raw file.
+set url $file
+set mime "video/ts"
+
+# If it's encrypted on disk and the DLNA option is available, then use
+# the server to perform decryption on the fly.
+if {[$ts flag "ODEncrypted"] > 0} {
+	set dlna [$ts dlnaloc]
+	if {[llength $dlna]} { lassign $dlna url mime }
+
+	#puts "DLNA: $dlna"
+}
+
+puts "Content-Type: text/plain"
+puts "Refresh: 0; url=$url"
+puts "Content-length: 0"
+puts ""
+
+#puts "Pragma: public"
+#puts "Expires: 0"
+#puts "Cache-Control: must-revalidate, post-check=0, pre-check=0"
+#puts "Content-Type: application/force-download"
+#puts "Content-Type: application/download"
+#puts "Content-Type: $mime"
+#puts "Content-Disposition: attachment; filename=\"[file tail $file]\""
+#puts "Content-Transfer-Encoding: binary"
+#puts "Content-Length: [file size $rfile]"
+

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

@@ -77,12 +77,24 @@ if {$type eq "ts"} {
 </tr><tr>
 	<th>Size</th>
 	<td>$sz</td>
+"
+set dlna [$ts dlnaloc]
+lassign $dlna url
+if {[llength $dlna]} {
+	puts "</tr><tr><th>DLNA&nbsp;URL</th>
+	   <td><a href=\"$url\">$url</a></td>"
+}
+puts "
 </tr><tr>
 	<th>Flags</th>
-	<td>[$ts get flags]</td>
-</tr>
-</table>
-	"
+	<td>[$ts get flags]
+"
+if {[$ts get bookmarks]} {
+		puts " \[Bookmarks: [$ts get bookmarks]\]"
+}
+
+	puts "</tr>"
+	puts "</table>"
 	exit
 }
 

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

@@ -0,0 +1,137 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+header
+
+cgi_input 1
+#cgi_dump
+
+puts {
+<style>
+#filelist { list-style-type: none; margin: 0; padding: 0; }
+#filelist li { margin: 0 3px 3px 3px; padding: 0.4em; padding-left: 1.5em;
+	height: 35px; }
+#filelist li span { position: absolute; margin-left: -1.3em; }
+span.pl { padding-left: 2em; }
+</style>
+
+<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
+<script type="text/javascript" src="/js/jquery.progressbar.js"></script>
+<script type="text/javascript" src="/js/touchbridge.js"></script>
+
+<p><b>
+Drag the files below into order, enter a name for the resulting file and then
+click the <i>Join</i> button.</b>
+}
+
+puts "<ul id=filelist>"
+set esize 0
+foreach file [split [cgi_get files] ","] {
+	set file [cgi_unquote_input $file]
+	set dir [file dirname $file]
+	set ts [ts fetch $file]
+	puts "<li class=\"va ui-state-default\" id=\"$file\"><span
+	    class=\"va ui-icon ui-icon-arrowthick-2-n-s\"></span>
+	    <img class=va src=/img/Video_TS.png>
+	    <span class=pl>
+	    $file ([clock format [$ts duration 1] -format "%T"])
+	    \[[pretty_size [$ts size]]\]
+	    <br><i style=\"font-size: 0.8em\">[$ts get title]</i>
+	    </span>
+	</li>"
+	incr esize [$ts size]
+}
+puts "</ul>"
+
+puts "
+<br><br>
+
+<div id=joindiv>
+Name for joined file:
+    <input id=dest name=dfile class=\"text ui-widget-content ui-corner-all\"
+    length=20 maxlength=50>
+<button id=dojoin>Join</button>
+</div>
+
+<div id=progressdiv style=\"display: none\">
+Joining: <div id=progressbar></div>
+<button id=back
+    dir=\"[cgi_quote_url $dir]\"
+    esize=\"$esize\"
+    style=\"display: none\">Back to media list</button>
+<div id=output class=pre style=\"margin-top: 10px\"></div>
+</div>
+"
+
+puts {
+<script type=text/javascript>
+
+$('#filelist li').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+);
+
+var handle = 0;
+
+function update()
+{
+	$.get('/cgi-bin/browse/join_progress.jim'
+	    + '?esize=' + $('#back').attr('esize')
+	    + '&file=' + $('#back').attr('dir') + '/' + $('#dest').val(),
+	    function(data) {
+		if (handle)
+			$('#progressbar').reportprogress(data);
+	});
+}
+
+$(document).ready(function() {
+
+$('#progressbar').reportprogress(0);
+
+$('#back').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
+});
+
+$('#filelist').sortable().disableSelection();
+
+$('#dojoin').button().attr('disabled', true).addClass('ui-state-disabled')
+    .click(function() {
+	var files = $('#filelist').sortable('toArray');
+	var sfiles = new Array();
+	for (x in files)
+		sfiles.push(encodeURIComponent(files[x]));
+
+	$('#joindiv').hide('slow');
+	$('#progressdiv').show('slow');
+	handle = setInterval("update()", 1000);
+
+	$('#output').text('Please do not interrupt...')
+	    .load('/cgi-bin/browse/join_backend.jim?files=' +
+	    sfiles.join() + '&dest=' + $('#dest').val(),
+	    function() {
+		clearInterval(handle);
+		handle = 0;
+		$('#back').show();
+		$('#progressbar').reportprogress(100);
+	});
+});
+
+$('#dest').val('').keyup(function() {
+	if ($(this).val().length > 0)
+		$('#dojoin')
+		    .removeProp('disabled').removeClass('ui-state-disabled');
+	else
+		$('#dojoin')
+		    .prop('disabled', true).addClass('ui-state-disabled');
+});
+
+});
+</script>
+}
+
+footer
+

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@
 
 package require cgi
 
+#puts "Content-Type: text/plain"
 puts "Content-Type: application/json"
 puts ""
 
@@ -18,9 +19,28 @@ puts "{"
 foreach line [split [exec /mod/bin/busybox/du -h "$dir/"] "\n"] {
 	set fields [split $line "\t"]
 	set size [lindex $fields 0]
-	set node [lindex [split [lindex $fields 1] /] end]
+	set node [file tail [lindex $fields 1]]
+#	set node [lindex [split [lindex $fields 1] /] end]
 	puts "\"$node\" : \"$size\","
 }
+
+# Handle symbolic links.
+foreach file [glob -nocomplain "$dir/*"] {
+	if {[catch {set lk [file readlink $file]}]} continue
+
+	if {![string match "/*" $lk]} { set lk "$dir/$lk" }
+
+	if {![file isdirectory $lk]} continue
+	foreach line [split [exec /mod/bin/busybox/du -h "$lk"] "\n"] {
+		set fields [split $line "\t"]
+		if {[lindex $fields 1] eq $lk} {
+			set node [file tail $file]
+			set size [lindex $fields 0]
+			puts "\"$node\" : \"@$size\","
+		}
+	}
+}
+
 puts "\"dummy\" : \"\""
 puts "}"
 

var/mongoose/cgi-bin/cat.jim

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

var/mongoose/cgi-bin/cfwreset

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

var/mongoose/cgi-bin/channel.jim

@@ -0,0 +1,134 @@
+#!/mod/bin/jimsh
+
+package require cgi
+package require sqlite3
+source /mod/var/mongoose/lib/setup
+require altrow progressbar epg.class
+
+puts "Content-Type: text/html"
+puts ""
+
+header
+
+cgi_input
+
+proc f2c {frequency} {
+	set ch int($((($frequency / 1000) - 303.25) / 8))
+	return [expr int($ch)]
+}
+
+if {[catch {set db [sqlite3.open /var/lib/humaxtv/channel.db]} msg]} {
+	puts "Error opening channel database: $msg"
+	exit
+}
+
+puts "
+	<button id=expandall>Expand All</button>
+	<button id=collapseall>Collapse All</button>
+	<br><br>
+	<table class=borders>
+	<tr>
+		<th>Channel</th>
+		<th>Frequency</th>
+		<th>Signal Strength</th>
+		<th>Signal Quality</th>
+		<th>Mux</th>
+		<th>Channels</th>
+		<th>&gt;799</th>
+	</tr>
+"
+foreach tw [$db query {
+		select tsIdx, usTsID, ulFrequency, ucLevel, ucQuality
+		from TBL_TS
+		order by ulFrequency
+	}] {
+	lassign $tw x tsIdx x usTsID x ulFrequency x ucLevel x ucQuality
+
+	altrow
+	puts "
+		<td>[f2c $ulFrequency]</td>
+		<td>[expr $ulFrequency / 1000.0] MHz</td>
+	"
+	puts "<td>[progressbar $ucLevel]</td>"
+	puts "<td>[progressbar $ucQuality]</td>"
+
+	set channels [$db query {
+		select usLcn, szSvcName, szPrvName, aucDefaultAuthority
+		from TBL_SVC left join TBL_PRV using (prvIdx)
+		where tsIdx = %s
+		order by usLcn
+		} $tsIdx]
+
+	set mux "???"
+	set ehs 0
+	foreach chan $channels {
+		lassign $chan x lcn x name
+		set name [string range $name 1 end]
+		if {$lcn >= 800} { incr ehs }
+		switch $name {
+			"BBC ONE" { set mux "PSB1/BBC A" }
+			"ITV1" { set mux "PSB2/D3&amp;4" }
+			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
+			"ITV3" { set mux "COM4/SDN" }
+			"Dave" { set mux "COM5/ARQ A" }
+			"Film4" { set mux "COM6/ARQ B" }
+		}
+	}
+	puts "<td>$mux</td>"
+
+	puts "<td>[llength $channels]
+		<a class=mchan ts=$tsIdx href=#>
+			<img border=0 height=14
+			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
+			    view
+		</a></td>"
+	puts "<td>$ehs</th>"
+	puts "</tr>"
+	puts "<tr id=mchan_$tsIdx class=mchan style=\"display: none\">
+		<td colspan=5>"
+	puts "<table style=\"margin-left: 5em\">"
+	puts "<tr>
+		<th colspan=3>Channel</th>
+		<th>Provider</th>
+		<th>Authority</th>
+	      </tr>"
+	foreach chan $channels {
+		lassign $chan x lcn x name x prv x auth
+		set name [string range $name 1 end]
+		set prv [string range $prv 3 end]
+		altrow
+		puts "<td class=va>"
+		puts "[epg channelicon $name 50]</td>
+		    <td>$lcn</td><td>$name</td>"
+		puts "</td><td>"
+		puts $prv
+		puts "</td><td>"
+		puts $auth
+		puts "</td>"
+		puts "</tr>"
+	}
+	puts "</table>"
+	puts "</td></tr>"
+}
+
+puts "</table>"
+
+puts {
+<script type=text/javascript>
+
+$(document).ready(function() {
+	$('a.mchan').click(function(e) {
+		e.preventDefault();
+		$('#mchan_' + $(this).attr('ts')).slideToggle('slow');
+	});
+	$('#expandall').button().click(function() {
+		$('tr.mchan').slideDown('slow');
+	});
+	$('#collapseall').button().click(function() {
+		$('tr.mchan').slideUp('slow');
+	});
+});
+
+</script>
+}
+

var/mongoose/cgi-bin/db.jim

@@ -8,6 +8,14 @@ require altrow
 puts "Content-Type: text/html"
 puts ""
 
+set databases {
+	/var/lib/humaxtv/rsvp.db
+	/var/lib/humaxtv/rsv.db
+	/var/lib/humaxtv/setup.db
+	/var/lib/humaxtv/channel.db
+	/mnt/hd2/dms_cds.db
+}
+
 header
 
 cgi_input
@@ -62,10 +70,16 @@ proc db_info {db_file} {
 	$db close
 }
 
-db_info /var/lib/humaxtv/rsv.db
-db_info /var/lib/humaxtv/setup.db
-db_info /var/lib/humaxtv/channel.db
-db_info /mnt/hd2/dms_cds.db
+if {$fdb == 0} {
+	puts "Please choose database to view:<ul>"
+	foreach db $databases {
+		puts "<li><a href=$::env(REQUEST_URI)?db=[file tail $db]>
+		    $db</a></li>"
+	}
+	puts "</ul>"
+} else {
+	foreach db $databases { db_info $db }
+}
 
 footer
 

var/mongoose/cgi-bin/dedup.jim

@@ -0,0 +1,124 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size altrow
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set dir [cgi_get dir "/media/My Video"]
+set doit [cgi_get doit 0]
+
+# Strip double slashes
+
+header
+
+puts "<fieldset style=\"display: inline\">
+<legend>De-duplicate <span id=dir>$dir</span></legend>
+<table class=borders>
+<tr>
+	<th>File</th>
+	<th>Proposed Filename</th>
+	<th>Proposed Title</th>
+	<th>Status</th>
+</tr>
+"
+
+regsub -all -- {\/+} "$dir/*" "/" sdir
+
+set seen {}
+
+foreach file [lsort [glob -nocomplain "$sdir"]] {
+	if {[file extension $file] ne ".hmt"} { continue }
+	altrow
+	set ts [ts fetch $file 1]
+	set base [file tail [file rootname $file]]
+	puts "<td nowrap>$base</td>"
+	set syn [$ts get synopsis]
+	regsub -nocase -all -- {^new series\.* *} $syn "" syn
+	regsub -all -- { *[:].*$} $syn "" syn
+	if {[string length $syn] > 40} {
+		lassign [split $syn "."] v w
+		set syn $v
+		if {[string length $syn] < 6 && [string length $w] < 6} {
+			append syn "_$w"
+		}
+	}
+	if {[string length $syn] < 10} {
+		if {[string match "${syn}*" [$ts get title]]} {
+			set syn [$ts get title]
+		} else {
+			append syn " [$ts get title]"
+		}
+	}
+	regsub -all -- {[\/ &]} $syn "_" fn
+	puts "<td>$fn</td>"
+	puts "<td>$syn</td>"
+	puts "<td>"
+	if {$fn in $seen} {
+		puts -nonewline "Duplicate"
+		if {$doit} {
+			set dupdir "$dir/_duplicates"
+			if {![file exists $dupdir]} { file mkdir $dupdir }
+			while {[file exists $dupdir/$fn.hmt]} {
+				append fn "~"
+			}
+			ts renamegroup $file "_duplicates/$fn"
+			puts -nonewline " - Renamed to _duplicates/$fn"
+		}
+	} elseif {[string length $syn] > 40} {
+		puts -nonewline "Cannot process"
+	} elseif {$base eq $fn} {
+		puts -nonewline "Nothing to do"
+	} elseif {[file exists "$dir/$fn.ts"]} {
+		puts -nonewline "Preserving"
+	} elseif {$doit} {
+		# Dooooo, it.
+		$ts settitle $syn
+		ts renamegroup $file $fn
+		puts -nonewline "Done"
+	}
+	lappend seen $fn
+	
+	puts "</td>"
+	puts "</tr>"
+}
+
+puts {
+</table>
+</fieldset>
+<div style="padding-top: 2em">
+<small>
+<button id=browse>Back to media browser</button>
+}
+
+if {!$doit} { puts "<button id=dedup>Process folder</button>" }
+
+puts {
+</small>
+
+</div>
+
+<script type=text/javascript>
+$('#browse').button().click(function() {
+	window.location = '/cgi-bin/browse.jim?dir=' +
+	    encodeURIComponent($('#dir').text());
+});
+}
+
+if {!$doit} {
+	puts {
+	$('#dedup').button().click(function() {
+		window.location = window.location + '&doit=1';
+	});
+	}
+}
+
+puts "</script>"
+
+footer
+

var/mongoose/cgi-bin/diag.jim

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

var/mongoose/cgi-bin/epg_info.jim

@@ -10,17 +10,25 @@ puts ""
 cgi_input
 #cgi_dump
 
-set service 0
-catch { set service [dict get $_cgi service] }
-set event 0
-catch { set event [dict get $_cgi event] }
+set service [cgi_get service 0]
+set event [cgi_get event 0]
 if {! [dict exists $_cgi bare]} { header }
 
-#set service 8384
-#set event 25293
-
 set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
+set others [$record othertimes]
+
+puts {
+	<style type=text/css>
+	font.also
+	{
+		font-size: 0.9em;
+		font-style: italic;
+		color: #333;
+		background: transparent;
+	}
+	</style>
+}
 
 puts "
 	<table class=keyval>
@@ -32,7 +40,29 @@ puts "
 		<td>[$record get text]</td>
 	</tr><tr>
 		<th>Start</th>
-		<td>[clock format [$record get start] -format {%c %Z}]</td>
+		<td>[clock format [$record get start] -format {%c %Z}]
+"
+
+foreach o $others {
+	if {[$o ended]} { continue }
+	$o get_channel_info
+	$o process_sched
+	if {[$o get series_crid] eq ""} { set ro 1 } else { set ro 2 }
+	puts -nonewline "<br><font class=also>&nbsp;&nbsp;&nbsp;&nbsp;"
+	puts -nonewline "Also: "
+	puts -nonewline "<a class=event href=# xs=[$o get service_id] "
+	puts -nonewline "xe=[$o get event_id] "
+	puts -nonewline "sch=[$o get sched_type] rec=$ro>"
+	puts -nonewline "[clock format [$o get start] -format {%c %Z}]"
+	puts -nonewline " on "
+	puts -nonewline [$o channel_icon 16]
+	puts -nonewline "[$o get channel_name] "
+	puts "</a>"
+	puts "</font>"
+}
+
+puts "
+		</td>
 	</tr><tr>
 		<th>Duration</th>
 		<td>[clock format [$record get duration] -format %T]
@@ -60,8 +90,13 @@ if {[$record get warning] != ""} {
 if {[$record get event_crid] != ""} {
 	puts "
 	<tr>
-		<th>CRID</th>
-		<td>[$record get channel_crid][$record get event_crid]</td>
+		<th>CRID</th><td>
+		<a href=/cgi-bin/epg_search.jim?crid=[$record get event_crid]>
+			<img border=0 height=14
+			    src=/images/421_1_00_CH_Title_2R_Arrow.png>
+			[$record get channel_crid][$record get event_crid]
+			</a>
+		</td>
 	</tr>
 	"
 }

var/mongoose/cgi-bin/epg_schedule.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/var/mongoose/lib/setup
-require epg.class
+require epg.class system.class
 
 puts "Content-Type: text/html"
 puts ""
@@ -10,10 +10,6 @@ puts ""
 cgi_input
 #cgi_dump
 
-#set _cgi(service) 4170
-#set _cgi(event) 38584
-#set _cgi(type) 2
-
 if {![dict exists $_cgi service] || ![dict exists $_cgi event]} {
 	puts "Error, insufficient parameters passed."
 	exit
@@ -35,48 +31,12 @@ if {[$event percent] > 0} {
 	exit
 }
 
-$event get_channel_info
-
-set args {}
-
-set args(ersvtype)		3
-set args(hsvc)			[$event get channel_hsvc]
-set args(nsttime)		[$event get start]
-set args(nduration)		[$event get duration]
-set args(usevtid)		[$event get event_id]
-set args(szevtname)		"\025[$event get name]"
-set args(eReady)		30
-
-set ccrid [$event get channel_crid]
-
-if {$type == 1} {
-	# Event
-	set args(ucCRIDType)		49
-	set args(ucRecKind)		1
-	set args(szCRID) 		"$ccrid[$event get event_crid]"
-	set args(szEventToRecord)	"1$args(szCRID)|"
+set r [rsv construct $event $type]
+if {[catch {$r insert} msg]} {
+	puts "Error encountered while scheduling: <i>$msg</i>"
 } else {
-	# Series
-	set args(ucCRIDType)		50
-	set args(ucRecKind)		4
-	set args(szCRID)		"$ccrid[$event get series_crid]"
-	set args(szFPBRecPath)		"$args(szevtname)"
-	set progs [lmap i [epg fetch dump -scrid [$event get series_crid]] {
-		if {[set ecrid [$i get event_crid]] eq ""} { continue }
-		list "1$::ccrid$ecrid"
-	}]
-	set args(szEventToRecord)	 "[join $progs "|"]|"
-}
-
-#puts $args
-
-set msg ""
-if {![file exists /mod/.schedule.testing]} { set msg "Disabled during testing" }
-if {$msg ne "" || [catch {[rsv new $args] insert} msg]} {
-	puts "Error encountered while scheduling the recording: <i>$msg</i>"
-} else {
-	puts "Successfully scheduled recording of <i>[$event get name]</i>"
-	close [open /tmp/.restartpending w]
+	puts "Successfully scheduled <i>[$event get name]</i>"
+	system restartpending
 }
 
 epg cleanup

var/mongoose/cgi-bin/epg_search.jim

@@ -9,6 +9,8 @@ puts ""
 
 header
 
+require totop
+
 puts "<script type=text/javascript src=/js/jquery.highlight.js></script>"
 
 cgi_input
@@ -95,9 +97,14 @@ foreach record [lsort -command rsort $records] {
 	}
 	altrow
 	$record get_channel_info
-	puts "<td nowrap>
+
+	set ended [$record ended]
+
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>"}
+	puts "
 	    [clock format [$record get start] -format "%a %d %b %Y"]<br>
-		[clock format [$record get start] -format "%H:%M %Z"]</td>"
+		[clock format [$record get start] -format "%H:%M %Z"]"
+	puts "</td>"
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>

var/mongoose/cgi-bin/epg_service.jim

@@ -9,6 +9,8 @@ puts ""
 
 header
 
+require totop
+
 [spinner new {
 	text "Loading EPG Data..."
 	size "1.2em"
@@ -20,10 +22,7 @@ cgi_input
 
 require epg_popup
 
-set service 0
-set service 4351
-catch { set service [dict get $_cgi service] }
-
+set service [cgi_get service 4351]
 set records [epg fetch dump -service $service]
 
 set tr [lindex $records 0]
@@ -55,13 +54,14 @@ set i 0
 foreach record $records {
 	altrow
 	$record get_channel_info
+	set ended [$record ended]
 	if {[$record showing]} {
 	    puts "<td><img src=/images/111_1_00_Cursor_2R_Arrow.png></td>"
 	} else { puts "<td></td>" }
-	puts "<td nowrap>
-		[clock format [$record get start] -format "%a %d %b %Y"]</td>"
-	puts "<td nowrap>
-		[clock format [$record get start] -format "%H:%M"]</td>"
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>" }
+	puts "[clock format [$record get start] -format "%a %d %b %Y"]</td>"
+	if $ended { puts "<td nowrap class=blood>" } else { puts "<td nowrap>" }
+	puts "[clock format [$record get start] -format "%H:%M"]</td>"
 	puts [$record cell]
 	puts "<td>[$record get text]</td>"
 	puts "<td>[$record get warning]</td>"

var/mongoose/cgi-bin/opkg.jim

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

var/mongoose/cgi-bin/pkg.jim

@@ -48,7 +48,7 @@ proc pkgrow {pkg} {
 
 	puts "<td align=center><small><button id=\"[$pkg get name]\"
 	    action=[string tolower $type]
-	    class=[string tolower $type]>$type</button></small></td>"
+	    class=\"va [string tolower $type]\">$type</button></small></td>"
 
 	puts "</tr>"
 }

var/mongoose/cgi-bin/restart.jim

@@ -1,9 +1,56 @@
 #!/mod/bin/jimsh
 
+package require cgi
+source /mod/var/mongoose/lib/setup
+require rsv.class system.class
+
 puts "Content-Type: text/html"
 puts ""
 
-#puts [exec /etc/init.d/S90settop restart]
-#file delete /tmp/.restartpending
-puts [exec killall humaxtv]
+cgi_input
+if {[cgi_get now] eq "yes"} {
+	# - Busybox reboot does sync the disk but may still not be clean enough.
+	puts "Restarting."
+	system reboot
+	exit
+}
+
+file delete /tmp/.restartpending
+header
+
+# Commit pending reservations on older mod versions.
+if {![file exists /sbin/rsvsync] && ![file exists /mod/boot/rsvsync]} {
+	rsv commit
+}
+
+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;
+	var pct = 0;
+	function update()
+	{
+		$('#progressbar').reportprogress(++pct);
+		if (pct == 100)
+		{
+			clearInterval(handle);
+			pct = 0;
+			window.location = '/';
+		}
+	}
+
+	$(document).ready(function() {
+		$('#progressbar').reportprogress(0);
+		handle = setInterval("update()", 300);
+		$.get('/cgi-bin/restart.jim?now=yes');
+	});
+</script>
+
+Please wait while the Humax restarts...<br>
+<div id=progressbar></div>
+}
+
+footer
 

var/mongoose/cgi-bin/sched_cancel.jim

@@ -0,0 +1,28 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require rsv.class system.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set slot [cgi_get slot 0]
+set table [cgi_get table TBL_RESERVATION] 
+
+set event [rsv slot $table $slot]
+
+if {$table eq "pending"} {
+	$event remove_pending
+	exit
+}
+
+$event clear_ulslot
+$event set_delete
+$event insert
+
+system restartpending
+

var/mongoose/cgi-bin/sched_info.jim

@@ -0,0 +1,123 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require rsv.class progressbar
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set table [cgi_get table TBL_RESERVATION]
+set slot [cgi_get slot 0]
+
+set event [rsv slot $table $slot]
+
+set rsvicon [$event icon]
+if {$rsvicon ne ""} {
+	set rsvicon "<img src='images/$rsvicon' height=20>
+}
+
+set RKIcon [$event RKIcon]
+if {$RKIcon ne ""} {
+	set RKIcon "<img src='images/$RKIcon' height=20>
+}
+
+if {[$event get ucRecKind] == 4} {
+	set series 1
+} else {
+	set series 0
+}
+
+puts "
+	<table class=keyval>
+	<tr>
+		<th>Event [$event get ulslot]</th>
+		<td class=va>$rsvicon $RKIcon</td>
+	</tr><tr>
+		<th>Channel</th>
+		<td class=va>
+"
+if {[$event get usLcn] ne ""} {
+	puts "
+		<img class=va width=50
+		    src=\"/img/channels/[$event channel_name].png\">
+		- [$event get usLcn] - [$event channel_name]
+	"
+}
+
+puts "
+		</td>
+	</tr><tr>
+		<th>Event Name</th>
+		<td>[$event name]</td>
+	</tr><tr>
+		<th>Start</th>
+"
+
+set s [$event get nsttime]
+set d [$event get nduration]
+set e $($s + $d)
+set n [clock seconds]
+
+if { $n > $e } {
+	puts "<td class=blood nowrap class=va>"
+} else {
+	puts "<td nowrap class=va>"
+}
+puts "[clock format $s -format "%a %d %b %Y"]
+    [clock format $s -format "%H:%M %Z"]"
+
+if {$d > 0 && $n > $s && $n < $e} {
+	puts "<br>"
+	set perc [expr [expr $n - $s] * 100 / $d]
+	puts "<img class=va src=/images/745_1_11_Video_1REC.png>"
+	puts [progressbar $perc]
+}
+
+puts "
+		</td>
+	</tr><tr>
+		<th>Duration</th>
+		<td>[clock format [$event get nduration] -format %T]</td>
+	</tr>
+"
+
+set crid [join [lrange [split [$event get szCRID] /] 1 end]]
+if {$crid != ""} {
+	puts "<tr><th>"
+	if $series { puts "Series" } else { puts "Event" }
+	puts " CRID</th><td>"
+	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	if $series { puts -nonewline "s" }
+	puts "crid=/$crid>
+	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
+	    height=14>
+	[$event get szCRID]"
+	puts "</a></td></tr>"
+}
+puts "<tr><th>Events</th><td>"
+set flag 0
+foreach ev [split [$event get szEventToRecord] "|"] {
+	if {$ev eq ""} { continue }
+	set ev [string range $ev 1 end]
+	if {$flag} { puts "<br>" }
+	incr flag
+	set crid [join [lrange [split $ev /] 1 end]]
+	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	puts "crid=/$crid>
+	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
+	    height=14> 
+	$ev"
+	puts "</a>"
+}
+puts "</td></tr>"
+puts "<tr><th>Accepted</th><td>"
+if {[$event get aulEventToRecordInfo] != ""} {
+	puts "Yes"
+}
+puts "</td></tr>"
+puts "</table>"
+

var/mongoose/cgi-bin/settings.jim

@@ -16,6 +16,7 @@ set settings [settings new]
 set hostname [$settings hostname]
 set smtp_server [$settings smtp_server]
 set channel_group [$settings channel_group]
+set epg_style [$settings epg_style]
 set pkgdev [$settings pkgdev]
 
 # Handle updates
@@ -51,14 +52,49 @@ proc handle_str_update {var old {text "Value"}} {
 handle_str_update hostname $hostname Hostname
 _handle_update ascii smtp_server $smtp_server "SMTP Server"
 handle_int_update channel_group $channel_group "Channel Group"
+handle_str_update epg_style $epg_style "EPG Type"
 if {[dict exists $_cgi pkgdevoff] && ![dict exists $_cgi pkgdev]} {
 	set _cgi(pkgdev) 0
 }
 handle_int_update pkgdev $pkgdev "Development Package Display"
 
+set acluser [cgi_get acluser "-"]
+set aclpass [cgi_get aclpass "-"]
+set aclpassc [cgi_get aclpassc "-"]
+if {$acluser ne "-" && $aclpass ne "-"} {
+	if {![string length $acluser]} {
+		puts "No username provided."
+		exit
+	}
+	if {$aclpass ne $aclpassc} {
+		puts "Passwords do not match."
+		exit
+	}
+	if {[string length $aclpass] < 4} {
+		puts "Password is too short (< 4 characters)"
+		exit
+	}
+	puts [$settings addacluser $acluser $aclpass]
+	exit
+}
+
+set aclact [cgi_get aclact "-"]
+if {$aclact ne "-" && $acluser ne "-"} {
+	switch $aclact {
+		"del" { puts [$settings delacluser $acluser] }
+	}
+	exit
+}
+
 header
 
-puts {<script type="text/javascript" src="/js/jquery.form.js"></script>}
+puts {
+<script type="text/javascript" src="/js/jquery.form.js"></script>
+<script type="text/javascript" src="/js/jconfirmaction.jquery.js"></script>
+<link href=/css/jconfirmaction.jquery.css rel=stylesheet type=text/css />
+<script type="text/javascript" src="/js/iphone-style-checkboxes.js"></script>
+<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+}
 
 puts {
 	<script type=text/javascript>
@@ -81,9 +117,6 @@ puts {
 }
 
 puts "
-<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
-<script type=\"text/javascript\" src=\"/js/iphone-style-checkboxes.js\">
-</script>
 	<fieldset style=\"display: inline\">
 		<legend>
 			General Settings
@@ -107,13 +140,36 @@ puts "
 	</tr>
 "
 
+puts "
+	<tr>
+	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
+		<th class=key>Default Now/Next style</th>
+		<td><select id=epg_style name=epg_style
+		    class=\"text ui-widget-content ui-corner-all\">
+"
+puts "<option value=standard"
+if {$epg_style ne "grid"} { puts " selected" }
+puts ">Standard\n"
+puts "<option value=grid"
+if {$epg_style eq "grid"} { puts " selected" }
+puts ">Grid\n"
+puts "
+		</select>
+		<small>
+		<input name=epg_style value=\"set\" type=submit>
+		</small>
+		<div id=epg_style_output></div>
+		</td>
+	</form>
+	</tr>
+"
+
 puts "
 	<tr>
 	<form class=auto id=channel_group method=get action=$env(REQUEST_URI)>
 		<th class=key>Channel Group for EPG</th>
 		<td><select id=channel_group name=channel_group
-		    class=\"text ui-widget-content ui-corner-all\"
-		    value=[$settings channel_group]>
+		    class=\"text ui-widget-content ui-corner-all\">
 "
 
 set i 0
@@ -166,6 +222,100 @@ puts "
 puts "
 	</table>
 	</fieldset>
+"
+
+puts "
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Web Interface User Access Control </legend>
+	<table>
+"
+
+set aclusers [$settings aclusers]
+if {[llength $aclusers]} {
+	puts "<tr><th colspan=5 class=odd>Existing Users</th></tr>"
+	foreach user [$settings aclusers] {
+		lassign $user user
+		puts "<tr><td align=center style=\"font-weight: bold\">
+		    $user</td>"
+		puts "<th class=key>New password:
+	        <input
+		  class=\"aclpass text ui-widget-content ui-corner-all\"
+		  type=password size=20 maxlength=50><br>"
+		puts "Again:
+	        <input
+		  class=\"aclpassc text ui-widget-content ui-corner-all\"
+		  type=password size=20 maxlength=50></td>"
+		puts "<th class=key><button class=pwchange>
+		    Change</button></td>"
+		puts "<th class=key><button class=userdel>
+		    Delete User</button></td>"
+		puts "</tr>"
+	}
+	puts "<tr><td colspan=5 id=aclusermod_output>&nbsp;</td></tr>"
+	puts "<tr><td colspan=5>&nbsp;</td></tr>"
+} else {
+	puts "<tr><td colspan=5 class=blood><b>
+	    Add a user to enable authentication.</b></td></tr>"
+}
+
+puts "<tr><th colspan=5 class=odd>Add New User</th></tr>"
+puts "
+	<form id=aclnewuser method=get action=$env(REQUEST_URI)>
+	<tr><th class=key>New User:</th><td>
+	    <input
+		class=\"text ui-widget-content ui-corner-all\"
+		id=acluser name=acluser size=20 maxlength=50></td></tr>
+	<tr><th class=key>Password:</th><td>
+	    <input type=password
+		class=\"text ui-widget-content ui-corner-all\"
+		id=aclpass name=aclpass size=20 maxlength=50></td></tr>
+	<tr><th class=key>Password (confirm):</th><td>
+	    <input type=password
+		class=\"text ui-widget-content ui-corner-all\"
+		id=aclpassc name=aclpassc size=20 maxlength=50></td></tr>
+	<tr><td><input id=aclnewuser_submit value=\"Add User\" type=submit>
+	    </td></tr>
+	</form>
+	</table>
+	<div id=aclnewuser_output></div>
+	</fieldset>
+"
+
+puts {
+<script type=text/javascript>
+$('#aclnewuser').ajaxForm({
+	target: '#aclnewuser_output',
+	success: function(txt) {
+		if (txt.indexOf('Success') >= 0)
+			window.location.reload(true);
+	}
+});
+
+$('button.userdel').click(function(el) {
+	var user = $('td:first', $(this).parents('tr')).text().trim();
+	$('#aclusermod_output').load(
+	    '/cgi-bin/settings.jim?aclact=del&acluser=' +
+	    encodeURIComponent(user), function(txt) {
+		if (txt.indexOf('Success') >= 0)
+			window.location.reload(true);
+	});
+});
+
+$('button.pwchange').click(function(el) {
+	var tr = $(this).parents('tr');
+	var user = $('td:first', $(tr)).text().trim();
+	var pass = $(tr).find('input.aclpass').val();
+	var passc = $(tr).find('input.aclpassc').val();
+	$('#aclusermod_output').load('/cgi-bin/settings.jim?' +
+	    'acluser=' + encodeURIComponent(user) + '&' +
+	    'aclpass=' + encodeURIComponent(pass) + '&' +
+	    'aclpassc=' + encodeURIComponent(passc));
+});
+</script>
+}
+
+puts "
 	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
@@ -198,5 +348,24 @@ puts "
 
 eval_plugins settings
 
+puts {
+<br><br>
+<fieldset style="display: inline">
+<legend> Reset Custom Firmware </legend>
+<button id=cfwreset>
+Click to remove all packages and settings installed by the custom firmware.
+</button>
+</fieldset>
+<script type=text/javascript>
+$('#cfwreset').jConfirmAction({
+	yesAnswer: "Delete"
+}, function(el) {
+	$('html').html('Restart the Humax using the remote control.');
+	$.get('/cgi-bin/cfwreset');
+});
+</script>
+
+}
+
 footer
 

var/mongoose/cgi-bin/xepg.jim

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

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

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

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

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

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

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

var/mongoose/html/css/style.css

@@ -70,13 +70,13 @@ table.borders, table.borders td, table.borders th
 	empty-cells: show;
 }
 
-table tr.odd, table td.odd, table th.odd
+.odd
 {
 	background: #ccff99;
 	color: black;
 }
 
-table tr.even, table td.even, table th.even
+.even
 {
 	background: #ffffcc;
 	color: black;
@@ -258,3 +258,41 @@ input.text
 	background-color: yellow;
 }
 
+.focused
+{
+	border: 2px solid red;
+}
+
+div.cut, div.keep
+{
+	position: absolute;
+	top: 0px;
+	text-align: center;
+	overflow: hidden;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+
+div.keep
+{
+	background: green;
+	color: white;
+}
+
+div.cut
+{
+	background: #ff4000;
+	color: black;
+}
+
+.ui-button-text
+{
+	font-size: inherit !important;
+}
+
+.ui-button, .ui-button-text
+{
+	padding: 0;
+	font-size: 12px;
+}
+

var/mongoose/html/css/ui.totop.css

@@ -0,0 +1,30 @@
+
+#toTop {
+    background: url("/img//ui.totop.png") no-repeat scroll left top transparent;
+    border: medium none;
+    bottom: 110px;
+    display: none;
+    height: 51px;
+    margin-left: 50px;
+    overflow: hidden;
+    position: fixed;
+    text-decoration: none;
+    text-indent: -999px;
+    width: 77px;
+    z-index: 2000;
+}
+
+#toTopHover {
+    background: url("/img/ui.totop.png") no-repeat scroll left -51px transparent;
+    display: block;
+    float: left;
+    height: 51px;
+    opacity: 0;
+    overflow: hidden;
+    width: 77px;
+}
+
+#toTop:active, #toTop:focus {
+    outline: medium none;
+}
+

var/mongoose/html/css/xepg.css

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

var/mongoose/html/diag.shtml

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

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

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

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

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

var/mongoose/html/img/channels/Channel 5 + 1.png

@@ -0,0 +1 @@
+Channel 5 +1.png

var/mongoose/html/img/channels/Channel 5+1.png

@@ -0,0 +1 @@
+Channel 5 +1.png

var/mongoose/html/img/channels/S4/C.png

@@ -0,0 +1 @@
+../S4C.png

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

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

var/mongoose/html/img/channels/Sky Text.png

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

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

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

var/mongoose/html/img/channels/TOPUP Anytime5.png

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

var/mongoose/html/img/channels/TOPUP Anytime6.png

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

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

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