version 0.9.2

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

CONTROL/control

@@ -1,9 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.8.8-1
+Version: 0.9.2
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.2),ssmtp,anacron
-Suggests: ffmpeg,webif-iphone,nicesplice,id3v2
+Depends: mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.4),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2
+Suggests: ffmpeg,webif-iphone
 Description: An evolving web interface for the Humax.

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

@@ -106,7 +106,7 @@ foreach line $data {
 
 	puts "    $chan"
 
-	if {!$hsvc} {
+	if {$hsvc eq ""} {
 		puts "        Cannot map channel name to service."
 		continue
 	}

var/mongoose/cgi-bin/browse.jim

@@ -10,8 +10,8 @@ puts ""
 set nicesplice [system pkginst nicesplice]
 set flatten [system pkginst flatten]
 
-set ignore {.nts .thm .hmt .hmi}
-set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov}
+set ignore {.nts .thm .hmi}
+set include {.ts .avi .mpg .mpeg .wmv .mkv .mp3 .mp4 .mov .hmt}
 
 cgi_input
 #cgi_dump
@@ -30,13 +30,25 @@ if {$order eq "-"} {
 	[settings new] sortorder $order
 }
 
+set model [system model]
+set dustbin [system dustbin 1]
+
+proc icon {img {hover ""} {extra ""}} {
+	puts -nonewline "<img src=$img class=va height=21 $extra"
+	if {$hover ne ""} {
+		puts -nonewline " alt=\"$hover\" title=\"$hover\""
+	}
+	puts ">"
+}
+
 proc directory {file bfile} {
 	global flatten
 
 	regsub -all " +" $bfile "" tbfile
 	puts "<div class=va>"
-	puts "<img border=0 class=va id=\"img$tbfile\"
-	    src=/images/711_1_09_Media_Folder.png>"
+	set img "/images/711_1_09_Media_Folder.png"
+	if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" }
+	puts "<img border=0 class=va id=\"img$tbfile\" src=$img>"
 	puts "<input class=\"fs fsdir\" type=checkbox>"
 	puts "<a class=dbf
 	    href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
@@ -47,14 +59,8 @@ proc directory {file bfile} {
 	set noflat 0
 	if $flatten {
 		if {[string match {\[*\]} [file tail $file]]} { set noflat 1 }
-		if {[file exists "$file/.noflatten"]} {
-			set noflat 1
-		}
-
-		if $noflat {
-			puts "<img alt=\"No-flatten\" title=\"No-flatten\"
-			    class=va src=/img/flat-tyre.png height=21>"
-		}
+		if {[file exists "$file/.noflatten"]} { set noflat 1 }
+		if $noflat { icon "/img/flat-tyre.png" "No-flatten" }
 	}
 
 	puts -nonewline "
@@ -85,7 +91,8 @@ proc entry {file} {{i 0}} {
 	if {$ext in $::ignore || $ext ni $::include} { continue }
 
 	file stat $file st
-	set sz [pretty_size $st(size)]
+	set rsz $st(size)
+	set sz [pretty_size $rsz]
 
 	set base [file rootname $file]
 
@@ -93,6 +100,12 @@ proc entry {file} {{i 0}} {
 		set type ts
 		set ts [ts fetch $file 1]
 		set img Video_TS
+	} elseif {$ext eq ".hmt"} {
+		if {[file exists "${base}.ts"]} { continue }
+		# Sole hmt file indicates failure to track.
+		set type bad
+		set ts 0
+		set img Video_Failed
 	} else {
 		set type gen
 		set ts 0
@@ -102,22 +115,25 @@ proc entry {file} {{i 0}} {
 	set new 0
 	if {$type eq "ts"} {
 		if {[$ts flag "New"] > 0} { set new 1 }
-	} else {
-		if {![file exists "[file rootname $file].hmi"]} { set new 1 }
+	} elseif {$type eq "gen"} {
+		if {![file exists "${base}.hmi"]} { set new 1 }
 	}
 
 	if {$new} { append img _New }
 
 	set fscl "fs"
+	set synopsis ""
 	if {$type eq "ts"} {
 		set fscl "fs fsts"
+		set synopsis [cgi_quote_html [$ts get synopsis]]
 	}
 
 	puts "
 	    <div class=\"va bf\" id=[incr i]>
 		<img class=va border=0 src=/img/$img.png>
 		<input class=\"$fscl\" type=checkbox>
-		<a class=bf file=\"[cgi_quote_url $file]\" type=$type href=#>
+		<a class=bf title=\"$synopsis\"
+		    file=\"[cgi_quote_url $file]\" type=$type href=#>
 		    $bfile
 	        </a>
 	"
@@ -132,6 +148,7 @@ proc entry {file} {{i 0}} {
 	set odencd 1
 	set def unknown
 	set bx 0
+	set dlna 0
 	if {$type eq "ts"} {
 		# HD / SD
 		if {[$ts get definition] eq "HD"} {
@@ -141,32 +158,33 @@ proc entry {file} {{i 0}} {
 			set def SD
 			set img "172_1_26_SD"
 		}
-		puts "<img class=va src=/images/$img.png height=21>"
+		icon "/images/$img.png"
 
 		# Locked
 		if {[$ts flag "Locked"] > 0} {
 			set locked 1
-			puts "<img class=va src=/images/178_1_00_Icon_Lock.png
-			    height=21>"
+			icon "/images/178_1_00_Icon_Lock.png" "Locked"
 		}
 
 		# Encrypted
 		if {[$ts flag "Encrypted"] > 0} {
 			set encd 1
-			puts "<img class=va
-			    src=/images/749_1_26_Video_Encryption.png
-			    height=21>"
+			icon "/images/749_1_26_Video_Encryption.png" ""
 		}
 		if {![$ts flag "ODEncrypted"]} {
-			puts "<img class=va src=/img/Decrypted.png height=21>"
 			set odencd 0
+			icon "/img/Decrypted.png" "Decrypted"
 		}
 
 		# Guidance
 		if {[$ts flag "Guidance"] > 0} {
-			puts "<img class=va
-			    src=/images/174_1_26_GuidancePolicy.png
-			    height=21>"
+			icon "/images/174_1_26_GuidancePolicy.png"
+		}
+
+		# Indexed
+		if {$::model eq "HDR" && [llength [$ts dlnaloc]]} {
+			icon "/img/dlna.png" "Indexed by DLNA Server"
+			set dlna 1
 		}
 
 		set bx [$ts get bookmarks]
@@ -178,7 +196,8 @@ proc entry {file} {{i 0}} {
 	      <a href=#>
 		<img class=\"opt va\" border=0 width=45 type=$type did=$i
 		    locked=$locked encd=$encd def=$def new=$new bx=$bx
-		    odencd=$odencd
+		    rsize=$rsz
+		    odencd=$odencd dlna=$dlna
 		    src=/images/181_1_00_Help5_OPT_Plus.png>
 	      </a>
 	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
@@ -196,134 +215,21 @@ header
 puts { 
 	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
 	<script type="text/javascript" src="/js/jquery.contextMenu.js"></script>
-
-	<ul id=optmenu class=contextMenu>
-		<li class=delete><a href=#delete>Delete</a></li>
-		<li><a href=#lock>Toggle Lock</a></li>
-		<li><a href=#enc>Toggle Enc</a></li>
-		<li><a href=#new>Toggle New</a></li>
-		<li><a href=#rename>Rename</a></li>
-		<li><a href=#download>Download</a></li>
-}
-if {[system model] eq "HDR"} {
-	puts { <li class="separator"><a href=#decrypt>Decrypt</a></li> }
-}
-if {[system pkginst ffmpeg]} {
-	puts { <li><a href=#audio>Extract Audio</a></li> }
-}
-if $nicesplice {
-	puts { <li class="cut separator"><a href=#crop>Crop</a></li> }
-}
-puts {
-	</ul>
-
-	<ul id=doptmenu class=contextMenu>
-		<li class=delete><a href=#delete>Delete</a></li>
-		<li><a href=#rename>Rename</a></li>
-}
-
-if $flatten {
-	puts { <li class="separator"><a href=#flat>No-Flatten</a></li> }
-}
-
-puts {
-	</ul>
-
-	<div id=renameform title="Rename media file" style="display: none">
-		<form id=renameform_form>
-		<input type=hidden name="renameorig" id="renameorig" value="">
-		<input type=hidden name="titleorig" id="titleorig" value="">
-		<table border=0>
-		<tr>
-		<th>
-			<label for="rename">
-				<b>New Filename</b>
-			</label>
-		</th>
-		<td>
-			<input type=text name="rename" id="rename"
-			    value="" size=70 maxlength=255
-			    class="text ui-widget-content ui-corner-all">
-		</td>
-		</tr>
-		<tr style="display: none" class=tstype>
-		<th>
-			<label for="renametitle" style="padding-top: 0.5em">
-				<b>New Medialist Title</b>
-			</label>
-		</th>
-		<td>
-			<input type=text name="renametitle" id="renametitle"
-			    value="" size=70 maxlength=48
-			    class="text ui-widget-content ui-corner-all">
-		</td>
-		</tr>
-		<tr style="display: none" class=tstype>
-		<td colspan=2 id=synopsis style="font-style: italic"></td>
-		</tr>
-		</table>
-		</form>
-	</div>
-
-	<div id=drenameform title="Rename directory" style="display: none">
-		<form id=drenameform_form>
-		<input type=hidden name="renameorig" id="drenameorig" value="">
-		<table border=0>
-		<tr>
-		<th>
-			<label for="drename">
-				<b>New Directory Name</b>
-			</label>
-		</th>
-		<td>
-			<input type=text name="rename" id="drename"
-			    value="" size=70 maxlength=255
-			    class="text ui-widget-content ui-corner-all">
-		</td>
-		</tr>
-		</table>
-		</form>
-	</div>
-
-	<div id=savestreamform title="Save streamed content"
-	    style="display: none">
-		<div class=pre id=savestream_detail></div>
-		<form id=savestream_form>
-}
-puts "<input type=hidden name=dir value=\"$dir\">"
-puts {
-		<table border=0>
-		<tr>
-		<th>
-			<label for="savestream_name">
-				<b>Filename</b>
-			</label>
-		</th>
-		<td>
-			<input type=text name="savestream_name"
-			    id="savestream_name"
-			    value="" size=70 maxlength=255
-			    class="text ui-widget-content ui-corner-all">
-			<img id=savestream_spin src=/img/loading.gif>
-		</td>
-		</tr>
-		</table>
-		</form>
-	</div>
-
-	<div id=dialogue></div>
-	<div id=confirm title="Confirmation Required"></div>
-
+	<link href=/css/jquery.bar.css rel=stylesheet type=text/css />
+	<script type="text/javascript" src="/js/jquery.bar.js"></script>
 	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
+	<link type=text/css rel=stylesheet href=/cgi-bin/browse/style.css />
 }
 
-puts "<span style=\"display:none\" id=dir>$dir</span>"
+source /mod/var/mongoose/cgi-bin/browse/assets.jim
 
-# Breadcrumb path
 puts "
-      <fieldset style=\"margin: 1em\">
+	<span style=\"display:none\" id=dir>$dir</span>
+      <fieldset class=cleft style=\"margin: 0 1em 1em 1em\">
       <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
 "
+
+# Breadcrumb path
 set stub ""
 foreach part [split $dir /] {
 	if {$stub eq "/"} { set name $part } else { set name "/$part" }
@@ -345,13 +251,12 @@ if {$parent ne ""} {
 	"
 }
 
-# Strip double slashes
-regsub -all -- {\/+} "$dir/*" "/" dir
-
-# Escape square brackets (for glob)
-regsub -all {([\\[])} $dir {\\\1} dir
-
 proc s_time {a b} {
+	global dir
+
+	set a "$dir/$a"
+	set b "$dir/$b"
+
 	set ad [file isdirectory $a]
 	set bd [file isdirectory $b]
 
@@ -373,13 +278,13 @@ proc s_time {a b} {
 	return 0
 }
 
-set files [glob -nocomplain $dir]
+set files [readdir -nocomplain $dir]
 switch $order {
 	1 {		set files [lsort -command s_time $files] }
 	default {	set files [lsort $files] }
 }
 
-foreach file $files { entry $file }
+foreach file $files { entry "$dir/$file" }
 
 puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
 
@@ -406,10 +311,24 @@ puts "</div>"
 
 puts "</fieldset>"
 
+puts {
+<fieldset class=left style="margin: 0 1em 1em 1em">
+<legend style="font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em; color: #1e5bbd;">
+File Clipboard
+</legend>
+<div id=clipboard>
+<img src=/img/loading.gif> <i>Loading...</i>
+</div>
+</fieldset>
+}
+
 puts "<div class=brow>"
 
 puts {
+<button id=copy>Copy</button>
+<button id=cut>Cut</button>
 <button id=delete>Delete</button>
+<button id=newdir>New Folder</button>
 <div id=deletewait class=blood style="display: none">
 <img src=/img/loading.gif>Deleting may take some time, please be patient...
 </div>

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

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

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

@@ -1,109 +0,0 @@
-#!/mod/bin/jimsh
-
-package require sqlite3
-package require cgi
-source /mod/var/mongoose/lib/setup
-require ts.class system.class
-
-puts "Content-Type: text/html\r\n\r\n"
-
-cgi_input
-#cgi_dump
-
-set rfile [cgi_get file]
-set ts [ts fetch $rfile]
-set dir [file dirname $rfile]
-set len [$ts duration 1]
-
-if {[cgi_get do] eq "it"} {
-	set xstart [clock milliseconds]
-
-	set base [file rootname $rfile]
-	set shname [file tail $base]
-	puts "Processing $shname"
-
-	puts [exec /mod/bin/ffmpeg -y -benchmark -v 0 \
-	    -i $rfile -f mp3 \
-	    -vn -acodec copy "${base}.mp3"]
-
-	if {[system pkginst id3v2]} {
-		puts [exec /mod/bin/id3v2 \
-		    --song "[$ts get title]" \
-		    --comment "[$ts get synopsis]" \
-		    --album "[$ts get channel_name]" \
-		    --year "[clock format [$ts get start] -format {%Y}]" \
-		    "${base}.mp3"]
-	}
-
-	set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
-	puts "Time taken: $xtime"
-
-	exit
-}
-
-header
-
-puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=\"text/javascript\" src=\"/js/jquery.progressbar.js\"></script>
-
-<table class=keyval cellpadding=5>
-<tr><th>File:</th><td>$rfile</td></tr>
-<tr><th>Length:</th><td>[clock format $len -format "%T"]</td></tr>
-</table>
-"
-
-puts {
-
-<div style="margin-top: 10px"></div>
-<div id=audiodiv><button id=audioit>Perform audio extraction</button></div>
-<div id=progressdiv style="display: none">
-Extracting audio: <div id=progressbar></div>
-}
-puts "<button id=back
-    dir=\"[cgi_quote_url $dir]\"
-    rfile=\"[cgi_quote_url $rfile]\"
-    style=\"display: none\">Back to media list</button>"
-puts {
-<div id=output class=pre style="margin-top: 10px"></div>
-</div>
-
-<script type=text/javascript>
-
-var handle = 0;
-
-function update()
-{
-	$.get('/cgi-bin/browse/audio_progress.jim?file='
-	    + $('#back').attr('rfile'), function(data) {
-		if (handle)
-			$('#progressbar').reportprogress(data);
-	});
-}
-
-$(document).ready(function() {
-
-$('#progressbar').reportprogress(0);
-
-$('#back').button().click(function() {
-	window.location = '/cgi-bin/browse.jim?dir=' + $(this).attr('dir');
-});
-
-$('#audioit').button().click(function() {
-	$('#audiodiv').hide('slow');
-	$('#progressdiv').show('slow');
-	handle = setInterval("update()", 1000);
-	$('#output').load(document.URL + '&do=it', function() {
-		clearInterval(handle);
-		handle = 0;
-		$('#back').show();
-		$('#progressbar').reportprogress(100);
-	});
-});
-
-});
-</script>
-</div>
-
-}
-

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

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

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

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

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

@@ -0,0 +1,39 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class system.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+
+set xstart [clock milliseconds]
+
+set base [file rootname $rfile]
+set shname [file tail $base]
+puts "Processing $shname"
+
+puts [exec /mod/bin/ffmpeg -y -benchmark -v 0 \
+    -i $rfile -f mp3 \
+    -vn -acodec copy "${base}.mp3"]
+
+if {[system pkginst id3v2]} {
+	puts [exec /mod/bin/id3v2 \
+	    --song "[$ts get title]" \
+	    --comment "[$ts get synopsis]" \
+	    --album "[$ts get channel_name]" \
+	    --year "[clock format [$ts get start] -format {%Y}]" \
+	    "${base}.mp3"]
+}
+
+set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
+puts "Time taken: $xtime"
+

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

@@ -19,11 +19,68 @@
 	};
 })(jQuery);
 
+var dir;
+
 function disableall()
 {
 	$('button,a,input').disable();
 }
 
+function reloadclipboard()
+{
+	$('#clipboard')
+	    .empty()
+	    .html('<img src=/img/loading.gif> <i>Loading...</i>')
+	    .load('/cgi-bin/browse/clipboard.jim', function() {
+
+// Start Clipboard post-load actions
+
+if ($('#clipclear').length)
+	$('#paste').enable();
+else
+	$('#paste').disable();
+
+$('#clipclear').button().click(function() {
+	$.get('/cgi-bin/browse/clipboard.jim?act=clear', function() {
+		reloadclipboard();
+	});
+});
+
+$('a.clipdel').click(function() {
+	$.get('/cgi-bin/browse/clipboard.jim?act=remove&path=' +
+	    $(this).attr('path'), function() {
+		reloadclipboard();
+	});
+});
+
+$('#paste').button()
+    .click(function() {
+	disableall();
+	$('#pwdialogue').dialog({
+		title: "Pasting from clipboard",
+		modal: true, autoOpen: true,
+		height: 'auto', width: 'auto',
+		show: 'scale', hide: 'fade',
+		draggable: false, resizable: false,
+		closeOnEscape: false,
+		open: function() {
+		    $('.ui-dialog-titlebar-close').hide();
+		}
+	});
+	$('#pwfeedback').load(
+	    '/cgi-bin/browse/clipboard.jim?act=paste&dir='
+	    + encodeURIComponent(dir), function() {
+		$('#pwdialogue').dialog('close');
+		window.location.reload(true);
+	});
+});
+
+
+// End Clipboard post-load actions
+
+	});
+}
+
 function epginfo_callback(data, status, xhr)
 {
 	var width = 85;
@@ -75,16 +132,17 @@ function new_folder_callback(data, status, xhr)
 	$.each(data, set_folder_new);
 }
 
-function delete_callback(file, type, id)
+function delete_callback(file, dir, id)
 {
 	var el = 'div.bf#' + id;
 	var results = el + ' .results';
-	var url = '/cgi-bin/browse/delete.jim?file=' + file +
-	    '&type=' + type;
 	$(results)
 	    .html('<img src=/img/loading.gif>Deleting, please wait...')
 	    .slideDown('slow')
-	    .load(url, function() {
+	    .load('/cgi-bin/browse/delete.jim', {
+		'dir': dir,
+		'files': [decodeURIComponent(file)]
+		}, function() {
 		$(el).delay(3000).slideUp(300, function() {
 			$(el).remove();
 		});
@@ -123,6 +181,13 @@ function drename_submit()
 	    function() { window.location.reload(true); });
 }
 
+function newdir_submit()
+{
+	var s = $('#newdirform_form').serialize();
+	$.get('/cgi-bin/browse/mknewdir.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
 function savestream_submit()
 {
 	var s = $('#savestream_form').serialize();
@@ -159,7 +224,7 @@ function preparemenu(el, menu)
 	{
 		if (el.attr('def') == 'HD')
 		{
-			$('#optmenu').enableContextMenuItems('#enc');
+			$(menu).enableContextMenuItems('#enc');
 			if (el.attr('encd') == 1)
 				$(menu).changeContextMenuItem('#enc',
 				    'Remove Enc');
@@ -169,50 +234,54 @@ function preparemenu(el, menu)
 		}
 
 		if (el.attr('bx') > 0)
-			$('#optmenu').enableContextMenuItems('#crop');
+			$(menu).enableContextMenuItems('#crop');
 		else
-			$('#optmenu').disableContextMenuItems('#crop');
+			$(menu).disableContextMenuItems('#crop');
 
-		$('#optmenu').enableContextMenuItems('#new');
+		if (el.attr('rsize') > 4294967296)
+			$(menu).enableContextMenuItems('#chunk');
+		else
+			$(menu).disableContextMenuItems('#chunk');
+
+		$(menu).enableContextMenuItems('#new');
 		if (el.attr('new') == 1)
 			$(menu).changeContextMenuItem('#new', 'Mark watched');
 		else
 			$(menu).changeContextMenuItem('#new', 'Mark new');
 
 
-		$('#optmenu').enableContextMenuItems('#lock');
+		$(menu).enableContextMenuItems('#lock');
 		if (el.attr('locked') == 1)
 		{
 			$(menu).changeContextMenuItem('#lock', 'Unlock');
-			$('#optmenu').disableContextMenuItems('#delete');
+			$(menu).disableContextMenuItems('#delete');
 		}
 		else
 		{
 			$(menu).changeContextMenuItem('#lock', 'Lock');
-			$('#optmenu').enableContextMenuItems('#delete');
+			$(menu).enableContextMenuItems('#delete');
 		}
 
-		if (el.attr('odencd') == 1)
-		{
-			$('#optmenu').enableContextMenuItems('#decrypt');
-			$('#optmenu').disableContextMenuItems('#audio');
-		}
+		if (el.attr('odencd') == 1 && el.attr('dlna') == 1)
+			$(menu).enableContextMenuItems('#decrypt');
 		else
-		{
-			$('#optmenu').disableContextMenuItems('#decrypt');
-			$('#optmenu').enableContextMenuItems('#audio');
-		}
-	
+			$(menu).disableContextMenuItems('#decrypt');
+
+		if (el.attr('odencd') == 1)
+			$(menu).disableContextMenuItems('#audio');
+		else
+			$(menu).enableContextMenuItems('#audio');
 	}
 	else
 	{
-		$('#optmenu').enableContextMenuItems('#delete');
-		$('#optmenu').disableContextMenuItems('#lock');
-		$('#optmenu').disableContextMenuItems('#enc');
-		$('#optmenu').disableContextMenuItems('#new');
-		$('#optmenu').disableContextMenuItems('#decrypt');
-		$('#optmenu').disableContextMenuItems('#audio');
-		$('#optmenu').disableContextMenuItems('#crop');
+		$(menu).enableContextMenuItems('#delete');
+		$(menu).disableContextMenuItems('#lock');
+		$(menu).disableContextMenuItems('#enc');
+		$(menu).disableContextMenuItems('#new');
+		$(menu).disableContextMenuItems('#decrypt');
+		$(menu).disableContextMenuItems('#audio');
+		$(menu).disableContextMenuItems('#crop');
+		$(menu).disableContextMenuItems('#chunk');
 	}
 
 }
@@ -231,6 +300,8 @@ function preparedmenu(el, menu)
 
 $(document).ready(function() {
 
+dir = $('#dir').text();
+
 var menuclick = function(action, el, pos)
 {
 	var file = $(el).parent().prevAll('a.bf').last().attr('file');
@@ -242,7 +313,18 @@ var menuclick = function(action, el, pos)
 	{
 	    case 'delete':
 		confirm_action('delete', delete_callback, file,
-		    type, id);
+		    dir, id);
+		break;
+
+	    case 'copy':
+		if (!confirm('Are you sure? Copying recordings takes a long time!'))
+			break;
+		// Fallthrough
+	    case 'cut':
+		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
+		    '&path=' + file, function() {
+			reloadclipboard();
+		    });
 		break;
 
 	    case 'lock':
@@ -284,17 +366,22 @@ var menuclick = function(action, el, pos)
 		break;
 
 	    case 'crop':
-		window.location.href = '/cgi-bin/browse/crop.jim?file=' +
+		window.location.href = '/cgi-bin/browse/crop/crop.jim?file=' +
+		    file;
+		break;
+
+	    case 'chunk':
+		window.location.href = '/cgi-bin/browse/chunk/chunk.jim?file=' +
 		    file;
 		break;
 
 	    case 'decrypt':
-		window.location.href = '/cgi-bin/browse/decrypt.jim?file=' +
-		    file;
+		window.location.href =
+		    '/cgi-bin/browse/decrypt/decrypt.jim?file=' + file;
 		break;
 
 	    case 'audio':
-		window.location.href = '/cgi-bin/browse/audio.jim?file=' +
+		window.location.href = '/cgi-bin/browse/audio/audio.jim?file=' +
 		    file;
 		break;
 
@@ -315,8 +402,6 @@ var dmenuclick = function(action, el, pos)
 	switch (action)
 	{
 	    case 'delete':
-		var url = '/cgi-bin/browse/delete.jim?file=' + file +
-		    '&type=dir';
 
 		if (confirm('Are you sure you wish to delete "' +
 		    decodeURIComponent(file) +
@@ -326,7 +411,10 @@ var dmenuclick = function(action, el, pos)
 			    .html('<img src=/img/loading.gif>' +
 			    'Deleting, please wait...')
 			    .slideDown('slow')
-			    .load(url, function() {
+			    .load('/cgi-bin/browse/delete.jim', {
+				'dir': dir,
+				'files': [decodeURIComponent(file)]
+				}, function() {
 				$(direl).delay(3000).slideUp(300, function() {
 					$(direl).remove();
 				});
@@ -334,6 +422,17 @@ var dmenuclick = function(action, el, pos)
 		}
 		break;
 
+	    case 'copy':
+		if (!confirm('Are you sure? Copying directories can take a very long time!'))
+			break;
+		// Fallthrough
+	    case 'cut':
+		$.get('/cgi-bin/browse/clipboard.jim?act=add&mode=' + action +
+		    '&path=' + file, function() {
+			reloadclipboard();
+		    });
+		break;
+
 	    case 'rename':
 		$('#drename').val(decodeURIComponent(bfile));
 		$('#drenameorig').val(decodeURIComponent(file));
@@ -373,6 +472,13 @@ var dmenuclick = function(action, el, pos)
 	// Disable items which are not yet implemented.
 	$('#optmenu').disableContextMenuItems('#title');
 
+	var $buttons = {
+	    "Close" : function() {$(this).dialog('close');}
+	};
+	var $buttonsp = $.extend(
+	    {"Play" : function() { doplay(); }},
+	    $buttons);
+
 	// Create reusable dialogue.
 	var $dialog = $('#dialogue').dialog({
 		title: "Media Details",
@@ -380,23 +486,43 @@ var dmenuclick = function(action, el, pos)
 		height: 600, width: 700,
 		show: 'scale', hide: 'fade',
 		draggable: true, resizable: true,
-		buttons: {
-			"Close": function() {
-				$(this).dialog('close');
-			}
-		},
+		buttons: $buttons,
 		close: function(e,u) { $('#dialogue').empty().html(
 		    '<img src="/img/loading.gif" alt="loading">'); }
 	});
 
+	function doplay()
+	{
+		var file = $dialog.attr('file');
+		var type = $dialog.attr('type');
+
+		disableall();
+
+		window.location = '/cgi-bin/browse/play.jim?' +
+		    'dir=' + encodeURIComponent(dir) +
+		    '&file=' + file;
+	}
+
 	// Bind dialogue open to filenames.
 	$('a.bf').click(function(e) {
 		e.preventDefault();
+
 		var file = $(this).attr('file');
 		var type = $(this).attr('type');
+		var opt = $(this).nextAll('a').find('img.opt');
+
 		var url = '/cgi-bin/browse/file.jim?file=' + file
 		    + '&type=' + type;
-		$('#dialogue').load(url);
+		$dialog.load(url);
+
+		$dialog.attr('file', file);
+		$dialog.attr('type', type);
+
+		if (type == 'ts' &&
+		    (opt.attr('odencd') == 0 || opt.attr('dlna') == 1))
+			$dialog.dialog("option", "buttons", $buttonsp);
+		else
+			$dialog.dialog("option", "buttons", $buttons);
 		$dialog.dialog('open');
 	});
 
@@ -446,8 +572,6 @@ var dmenuclick = function(action, el, pos)
 		show: 'fade', hide: 'fade',
 		draggable: false, resizable: false
 	});
-	
-	var dir = $('#dir').text();
 
 	// Load folder sizes
 	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
@@ -457,6 +581,9 @@ var dmenuclick = function(action, el, pos)
 	$.getJSON('/cgi-bin/browse/newdir.jim?dir=' + encodeURIComponent(dir),
 		new_folder_callback);
 
+	// Load clipboard
+	reloadclipboard();
+
 	// Uncheck everything
 	$('input.fs:checked').attr('checked', false);
 
@@ -488,10 +615,10 @@ var dmenuclick = function(action, el, pos)
 	    .click(function() {
 		var files = new Array();
 		var els = $('input.fsts:checked + a').each(function() {
-			files.push(encodeURIComponent($(this).attr('file')));
+			files.push($(this).attr('file'));
 		});
 		//console.log("%o", files);
-		window.location.href = '/cgi-bin/browse/join.jim?files=' +
+		window.location.href = '/cgi-bin/browse/join/join.jim?files=' +
 		    files.join();
 	    });
 
@@ -499,7 +626,7 @@ var dmenuclick = function(action, el, pos)
 	    .click(function() {
 		var files = new Array();
 		var els = $('input.fs:checked + a').each(function() {
-			files.push($(this).attr('file'));
+			files.push(decodeURIComponent($(this).attr('file')));
 		});
 		//console.log("%o", files);
 		var str = 'Are you sure you want to delete ' + files.length +
@@ -510,20 +637,74 @@ var dmenuclick = function(action, el, pos)
 		{
 			disableall();
 			$('#deletewait').slideDown('slow');
-			window.location.href =
-			    '/cgi-bin/browse/mdelete.jim?dir=' +
-			    encodeURIComponent(dir) + '&files=' +
-		    	    files.join();
+
+			$('#pwdialogue').dialog({
+				title: "Deleting",
+				modal: true, autoOpen: true,
+				height: 'auto', width: 'auto',
+				show: 'scale', hide: 'fade',
+				draggable: false, resizable: false,
+				closeOnEscape: false,
+				open: function() {
+				    $('.ui-dialog-titlebar-close').hide();
+				}
+			});
+			$('#pwfeedback').load(
+			    '/cgi-bin/browse/delete.jim', {
+				'dir': dir,
+				'files': files
+				}, function() {
+				$('#pwdialogue').dialog('close');
+				window.location.reload(true);
+			});
 		}
 	    });
 
+	$('#copy,#cut').button().disable()
+	    .click(function() {
+		var files = new Array();
+		var els = $('input.fs:checked + a').each(function() {
+			files.push(decodeURIComponent($(this).attr('file')));
+		});
+		//console.log("%o", files);
+		var action = $(this).attr('id');
+		if (action == 'copy' && !confirm('Are you sure? ' +
+		    'Copying recordings can take a very long time!'))
+			return;
+
+		$.post('/cgi-bin/browse/clipboard.jim', {
+		    'act': 'add',
+		    'dir': dir,
+		    'mode': action,
+		    'path': files
+		    }, function() {
+			reloadclipboard();
+			$('input.fs:checked').attr('checked', false);
+		    });
+	    });
+
+	$('#newdir').button().click(function() {
+		$('#newdirform').dialog({
+			autoOpen: true,
+			height: 'auto', width: 'auto',
+			modal: true,
+			buttons: {
+				"Create": newdir_submit,
+				"Cancel": function() {
+					$(this).dialog('close');
+				}
+			},
+			close: function() { $('#newdirname').val(''); }
+		});
+	});
+
 	$('input.fs').change(function() {
 		var num = $('input.fs:checked').size();
 		if (num > 0)
-			$('#delete').enable();
+			$('#delete,#cut,#copy').enable();
 		else
-			$('#delete').disable();
-	
+			$('#delete,#cut,#copy').disable();
+
 		var num = $('input.fsts:checked').size();
 		if (num > 1)
 			$('#join').enable();

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

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

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

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

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

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

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

@@ -0,0 +1,38 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set part [cgi_get part -]
+set parts [cgi_get parts "?"]
+
+if {$part eq "-"} exit
+
+set start $(($part - 1) * 45 * 600 - 600)
+set end $($part * 45 * 600 + 600)
+
+puts "START: $start"
+puts "END: $end"
+
+set ts [ts fetch $rfile]
+
+set base [file rootname $rfile]
+
+set cmd [list /mod/bin/nicesplice -in $base -out "$base.part$part"]
+if {$start > 0} { lappend cmd -cut 0 $start }
+lappend cmd -cut $end 9999999
+
+puts "CMD: ($cmd)"
+
+puts [exec {*}$cmd]
+
+set ts [ts fetch "$base.part$part.ts"]
+$ts settitle "$part/$parts. [string range [ts get $title] 0 40]"
+

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

@@ -0,0 +1,17 @@
+#!/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 file [cgi_get file]
+set part [cgi_get part]
+
+set rfile "[file rootname $file].part$part"
+puts [file size $rfile]
+

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

@@ -0,0 +1,119 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require clipboard.class ts.class
+
+puts "Content-Type: text/html; no-cache"
+puts "Expires: Thu, 01 Jan 1970 00:00:00 GMT"
+puts "Pragma: nocache"
+puts ""
+
+cgi_input 1
+#cgi_dump
+
+set cb [[clipboard new {path "/tmp/webif-browse.cb"}] load]
+
+set action [cgi_get act list]
+
+switch $action {
+    list {
+	if {![$cb size]} {
+		puts "<i>Clipboard is empty</i>"
+		break
+	}
+	puts "<div class=cliplist>"
+	foreach file [$cb get items] {
+		set img "page_white_copy"
+		if {[$file get action] eq "cut"} {
+			set img "cut"
+		}
+		set path [$file get path]
+		set xpath [cgi_quote_html $path]
+		puts "<span title=\"$xpath\" alt=\"$xpath\">"
+		puts "<img src=/img/context/$img.png>"
+		set dfile [file tail $path]
+		if {[string length $dfile] > 25} {
+			set dfile "[string range $dfile 0 22]..."
+		}
+		if {[file isdirectory $path]} {
+			puts "<img height=16
+			    src=/images/711_1_09_Media_Folder.png>"
+		}
+		puts [cgi_quote_html $dfile]
+		puts "<a class=clipdel href=# alt=\"Remove\" title=\"Remove\"
+		    path=\"[cgi_quote_url $path]\">
+		    <img border=0 src=/img/close.png height=16></a>"
+		puts "</span>"
+	}
+	puts "</div>"
+	puts "<button id=paste>Paste to current folder</button>"
+	puts "<button id=clipclear>Empty clipboard</button>"
+    }
+    add {
+	if {[set path [cgi_get path]] eq "0"} {
+		puts "No path."
+		exit
+	}
+	set dir [cgi_unquote_input [cgi_get dir]]
+	set mode [cgi_get mode copy]
+	foreach p $path {
+		set p [cgi_unquote_input $p]
+		if {$dir ne "0" && ![string match "$dir/*" $p]} {
+			puts "$p not in directory<br>"
+			continue
+		}
+		if {![$cb present $p]} {
+			$cb add $mode $p
+			puts "Added $p for $mode<br>"
+		}
+	}
+	$cb save
+    }
+    remove {
+	$cb remove [cgi_unquote_input [cgi_get path]]
+	$cb save
+    }
+    clear {
+	$cb clear
+	$cb save
+    }
+    paste {
+	set dir [cgi_unquote_input [cgi_get dir]]
+	foreach item [$cb get items] {
+		set path [$item get path]
+		set file [file tail $path]
+		set mode [$item get action]
+
+		puts "Pasting $file"
+
+		if {[file isdirectory $path]} {
+			# Directory
+			if {$mode eq "cut"} {
+				catch {file rename $path "$dir/$file"}
+			} else {
+				catch {puts [exec /mod/bin/busybox/cp -r \
+				    $path $dir]}
+			}
+		} else {
+			set root [file rootname $path]
+			# Protect special characters in root.
+			# In particular [] characters which are used a lot
+			# for torrent names.
+			regsub -all {([\\["$])} $root {\\\1} root
+			foreach f [glob -nocomplain "${root}.*"] {
+				if {$mode eq "cut"} {
+					catch {file rename $f \
+					    "$dir/[file tail $f]"}
+				} else {
+					catch {file copy $f \
+					    "$dir/[file tail $f]"}
+				}
+			}
+		}
+	}
+	$cb clear
+	$cb save
+    }
+}
+

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

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

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

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

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

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

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

@@ -0,0 +1,52 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+
+set len [$ts duration 1]
+
+set cropstart [clock milliseconds]
+
+set base [file rootname $rfile]
+set origdir "$dir/_original"
+if {![file exists $origdir]} { file mkdir $origdir }
+
+set shname [file tail $base]
+puts "Processing $shname"
+
+if {[file exists "$origdir/$shname.ts"]} {
+	puts "This recording already exists within _original"
+	puts "Cannot continue."
+	exit
+}
+
+puts "Moving recording to $origdir"
+foreach f [glob -nocomplain "${base}.*"] {
+	set tail [file tail $f]
+	puts "  $tail"
+	file rename $f "$origdir/$tail"
+}
+
+puts [exec /mod/bin/nicesplice \
+    -in "$origdir/$shname" \
+    -out "$dir/$shname" \
+    -cutBookMarks]
+
+set newname "$shname-[clock seconds]"
+puts "Renaming file group to $newname"
+ts renamegroup "$dir/$shname.ts" $newname
+exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
+
+set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
+puts "Time taken: $croptime"
+

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

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

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

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

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

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

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

@@ -0,0 +1,55 @@
+#!/mod/bin/jimsh
+
+package require sqlite3
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class
+
+puts "Content-Type: text/html\r\n\r\n"
+
+cgi_input
+#cgi_dump
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+set dir [file dirname $rfile]
+set len [$ts duration 1]
+lassign [$ts dlnaloc] url
+
+set xstart [clock milliseconds]
+
+set base [file rootname $rfile]
+set origdir "$dir/_original"
+if {![file exists $origdir]} { file mkdir $origdir }
+
+set shname [file tail $base]
+puts "Processing $shname"
+
+exec wget -O "$rfile.decrypting" $url
+
+puts "Moving recording to $origdir"
+
+foreach f [glob -nocomplain "${base}.*"] {
+	if {[file extension $f] eq ".decrypting"} { continue }
+	set tail [file tail $f]
+	puts "  $tail"
+	file rename $f "${origdir}/$tail"
+}
+
+file rename "$rfile.decrypting" $rfile
+
+foreach ext {nts hmt thm} {
+	set sidecar "$shname.$ext"
+	if {[file exists "$origdir/$sidecar"]} {
+		puts "Copying back sidecar $ext"
+		file copy "$origdir/$sidecar" "$dir/$sidecar"
+	}
+}
+
+if {[file exists "$dir/$shname.hmt"]} {
+	exec /mod/bin/hmt -encrypted "$dir/$shname.hmt"
+}
+
+set xtime [expr [expr [clock milliseconds] - $xstart] / 1000.0]
+puts "Time taken: $xtime"
+

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

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

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

@@ -65,22 +65,28 @@ if {$type eq "ts"} {
 	<th>Start Time</th>
 	<td>"
 	puts [clock format [$ts get start] -format "%c %Z"]
+	puts "<font class=also>(Scheduled: [
+	    clock format [$ts get schedstart] -format "%c %Z"])</font>"
 	puts "</td>
 </tr><tr>
 	<th>End Time</th>
 	<td>"
 	puts [clock format [$ts get end] -format "%c %Z"]
+	puts "<font class=also>(Scheduled: [clock format \
+	    [expr [$ts get schedstart] + [$ts get scheddur]] \
+	    -format "%c %Z"])</font>"
 	puts "</td>
 </tr><tr>
 	<th>Duration</th>
-	<td>[$ts duration] minute(s).</td>
+	<td>[$ts duration] minute(s).
+	    <font class=also>(Scheduled: [expr [$ts get scheddur] / 60])
+	    </font></td>
 </tr><tr>
 	<th>Size</th>
 	<td>$sz</td>
 "
-set dlna [$ts dlnaloc]
-lassign $dlna url
-if {[llength $dlna]} {
+lassign [$ts dlnaloc] url
+if {$url ne ""} {
 	puts "</tr><tr><th>DLNA&nbsp;URL</th>
 	   <td><a href=\"$url\">$url</a></td>"
 }

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

@@ -1,137 +0,0 @@
-#!/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/join.css

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,51 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/setup
+require ts.class pretty_size
+
+puts "Content-Type: text/html\r\n"
+
+cgi_input
+#cgi_dump
+
+header
+
+set rfile [cgi_get file]
+set ts [ts fetch $rfile]
+if {[catch {$ts get file}]} {
+	puts "Invalid TS file, '$rfile'"
+	exit
+}
+
+if {![$ts flag "ODEncrypted"]} {
+	set url $rfile
+} else {
+	lassign [$ts dlnaloc] url
+	if {$url eq ""} {
+		alert("Media is encrypted and not indexed by the DLNA Server.");
+	}
+}
+
+puts "
+<span id=url style=\"display: none\">$url</span>
+"
+
+puts {
+<script language="javascript" src="/js/jquery-vlc.js"></script>
+<link rel="stylesheet" type="text/css" href="/css/vlc.css" />
+<script type=text/javascript src=play.js></script>
+
+<fieldset class=cleft style="margin: 0 1em 1em 1em">
+<legend>VLC Player</legend>
+}
+puts "<span class=also>Now playing: $rfile, [$ts duration] minutes.</span>"
+puts {
+<div id=vlc></div>
+
+<div class=also id=info style="float: right">
+</div>
+
+</fieldset>
+}
+

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

@@ -0,0 +1,13 @@
+
+$(document).ready(function() {
+
+var url = $('#url').text();
+
+var vlc = VLCobject.embedPlayer('vlc', 800, 450, true);
+vlc.play(encodeURI(url));
+
+if (window.console)
+	console.log("Playing: %o", url);
+
+});
+

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

@@ -16,11 +16,10 @@ set dir [dict get $_cgi dir]
 #9.4G	/media/My Video/Archive
 #1.4G	/media/My Video/CSI_ Crime Scene Investigation
 puts "{"
-foreach line [split [exec /mod/bin/busybox/du -h "$dir/"] "\n"] {
-	set fields [split $line "\t"]
-	set size [lindex $fields 0]
-	set node [file tail [lindex $fields 1]]
-#	set node [lindex [split [lindex $fields 1] /] end]
+regsub -all {([\\["$])} $dir {\\\1} xdir
+foreach line [split [exec /mod/bin/busybox/du -h -d 1 "$dir/"] "\n"] {
+	lassign [split $line "\t"] size node
+	regsub -- "^$xdir/" $node "" node
 	puts "\"$node\" : \"$size\","
 }
 

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

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

var/mongoose/cgi-bin/channel.jim

@@ -32,17 +32,19 @@ puts "
 		<th>Frequency</th>
 		<th>Signal Strength</th>
 		<th>Signal Quality</th>
+		<th>Network</th>
 		<th>Mux</th>
 		<th>Channels</th>
 		<th>&gt;799</th>
 	</tr>
 "
 foreach tw [$db query {
-		select tsIdx, usTsID, ulFrequency, ucLevel, ucQuality
-		from TBL_TS
+		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel, ucQuality
+		from TBL_TS join TBL_NET using (netIdx)
 		order by ulFrequency
 	}] {
-	lassign $tw x tsIdx x usTsID x ulFrequency x ucLevel x ucQuality
+	lassign $tw \
+	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality
 
 	altrow
 	puts "
@@ -51,6 +53,7 @@ foreach tw [$db query {
 	"
 	puts "<td>[progressbar $ucLevel]</td>"
 	puts "<td>[progressbar $ucQuality]</td>"
+	puts "<td>[string range $netName 3 end]</td>"
 
 	set channels [$db query {
 		select usLcn, szSvcName, szPrvName, aucDefaultAuthority
@@ -59,7 +62,7 @@ foreach tw [$db query {
 		order by usLcn
 		} $tsIdx]
 
-	set mux "???"
+	set mux "Local"
 	set ehs 0
 	foreach chan $channels {
 		lassign $chan x lcn x name
@@ -72,6 +75,7 @@ foreach tw [$db query {
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }
 			"Film4" { set mux "COM6/ARQ B" }
+			"Movies4Men" { set mux "Local" }
 		}
 	}
 	puts "<td>$mux</td>"

var/mongoose/cgi-bin/db.jim

@@ -8,13 +8,8 @@ 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
-}
+set databases [glob /var/lib/humaxtv/*.db]
+lappend databases "/mnt/hd2/dms_cds.db"
 
 header
 

var/mongoose/cgi-bin/dedup.jim

@@ -13,8 +13,6 @@ cgi_input
 set dir [cgi_get dir "/media/My Video"]
 set doit [cgi_get doit 0]
 
-# Strip double slashes
-
 header
 
 puts "<fieldset style=\"display: inline\">
@@ -28,11 +26,10 @@ puts "<fieldset style=\"display: inline\">
 </tr>
 "
 
-regsub -all -- {\/+} "$dir/*" "/" sdir
-
 set seen {}
 
-foreach file [lsort [glob -nocomplain "$sdir"]] {
+foreach file [readdir $dir] {
+	set file "$dir/$file"
 	if {[file extension $file] ne ".hmt"} { continue }
 	altrow
 	set ts [ts fetch $file 1]

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

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

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

@@ -108,7 +108,7 @@ foreach record [lsort -command rsort $records] {
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>
-	    <a href=/cgi-bin/epg_service.jim?service=[$record get service_id]>
+	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]

var/mongoose/cgi-bin/pkg.jim

@@ -79,7 +79,8 @@ if {[llength $pkgs] > 0} {
 	"
 
 	foreach pkg $pkgs {
-		if {$filter && ![dict exists $::pkgmeta $pkg]} { continue }
+		if {$type ne "upgr" && $filter && \
+		    ![dict exists $::pkgmeta $pkg]} { continue }
 		pkgrow [pkg load $pkg]
 	}
 	puts "</table>"
@@ -90,7 +91,7 @@ if {[llength $pkgs] > 0} {
 	puts "<i>No packages "
 	switch $type {
 		inst { puts "are installed." }
-		upgr { puts "are available for upgrade." }
+		upgr { puts "are available for upgrade; try updating the package list from the Internet using the button above." }
 		avail { puts "are available for installation." }
 	}
 	puts "</i>"

var/mongoose/cgi-bin/restart.jim

@@ -8,6 +8,12 @@ puts "Content-Type: text/html"
 puts ""
 
 cgi_input
+
+if {[cgi_get act] eq "cancel"} {
+	file delete /tmp/.restartpending
+	exit
+}
+
 if {[cgi_get now] eq "yes"} {
 	# - Busybox reboot does sync the disk but may still not be clean enough.
 	puts "Restarting."

var/mongoose/cgi-bin/sched_info.jim

@@ -101,7 +101,7 @@ 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?"
+	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
@@ -117,7 +117,7 @@ foreach ev [split [$event get szEventToRecord] "|"] {
 	if {$flag} { puts "<br>" }
 	incr flag
 	set crid [join [lrange [split $ev /] 1 end]]
-	puts -nonewline "<a href=/cgi-bin/epg_search.jim?"
+	puts -nonewline "<a href=/cgi-bin/epg/search.jim?"
 	puts "crid=/$crid>
 	<img border=0 src=/images/421_1_00_CH_Title_2R_Arrow.png
 	    height=14> 

var/mongoose/cgi-bin/settings.jim

@@ -11,6 +11,17 @@ puts ""
 cgi_input
 #cgi_dump
 
+if {[cgi_get act] eq "https"} {
+	if {[cgi_get val off] eq "off"} {
+		file delete /mod/etc/mongoose.cert
+		puts "HTTPS Server will be disabled after next reboot."
+	} else {
+		exec /mod/sbin/mongoose_mkcert
+		puts "HTTPS Server will be enabled after next reboot."
+	}
+	exit
+}
+
 set settings [settings new]
 
 set hostname [$settings hostname]
@@ -53,9 +64,6 @@ 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 "-"]
@@ -89,6 +97,7 @@ if {$aclact ne "-" && $acluser ne "-"} {
 header
 
 puts {
+<script type="text/javascript" src="/cgi-bin/settings.js"></script>
 <script type="text/javascript" src="/js/jquery.form.js"></script>
 <script type="text/javascript" src="/js/jconfirmaction.jquery.js"></script>
 <link href=/css/jconfirmaction.jquery.css rel=stylesheet type=text/css />
@@ -96,26 +105,6 @@ puts {
 <link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
 }
 
-puts {
-	<script type=text/javascript>
-	$(document).ready(function () {
-		$(":submit").button();
-		$('form.auto').each(function(i, el) {
-			var id = $(this).attr('id');
-			var output = '#' + id + '_output'
-			$(this).ajaxForm({
-				target: output,
-				success: function() {
-				    $(output).css('font-style', 'italic');
-				    $(output).show('slow');
-				    $(output).delay(2000).fadeOut('slow');
-				}
-			});
-		});
-	});
-	</script>
-}
-
 puts "
 	<fieldset style=\"display: inline\">
 		<legend>
@@ -140,6 +129,17 @@ puts "
 	</tr>
 "
 
+puts -nonewline "
+	<tr>
+		<th class=key>HTTPS web server?</th>
+		<td><input id=https_toggle name=https type=checkbox value=yes"
+if {[file exists /mod/etc/mongoose.cert]} { puts -nonewline " checked" }
+puts ">
+		    <div id=https_output></div>
+		</td>
+	</tr>
+"
+
 puts "
 	<tr>
 	<form class=auto id=epg_style method=get action=$env(REQUEST_URI)>
@@ -315,34 +315,21 @@ $('button.pwchange').click(function(el) {
 </script>
 }
 
-puts "
+puts -nonewline "
 	<br><br>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
-"
-
-puts "
 	<tr>
-	<form class=auto id=pkgdev method=get action=$env(REQUEST_URI)>
 		<th class=key>Show development and advanced packages?</th>
-		<td><input name=pkgdevoff value=0 type=hidden>
-		    <input name=pkgdev id=pkgdev value=1 type=checkbox
+		<td><input name=pkgdev id=pkgdev value=1 type=checkbox
 "
-if {$pkgdev} { puts " checked" }
-puts {
-		>
-		    <small>
-		    <input id=pkgdev_submit value="save" type=submit>
-		    </small>
-		    <div id=pkgdev_output></div>
+if {$pkgdev} { puts -nonewline " checked" }
+puts ">
 		</td>
-	</form>
 	</tr>
-}
-
-puts "
 	</table>
+	<div id=pkgdev_output></div>
 	</fieldset>
 "
 

var/mongoose/cgi-bin/settings.js

@@ -0,0 +1,77 @@
+(function($)
+{
+	$.fn.enable = function()
+	{
+		return this.each(function() {
+			$(this)
+			    .removeClass('ui-state-disabled')
+			    .removeProp('disabled');
+		});
+	};
+
+	$.fn.disable = function()
+	{
+		return this.each(function() {
+			$(this)
+			    .addClass('ui-state-disabled')
+			    .prop('disabled', true);
+		});
+	};
+})(jQuery);
+
+$(document).ready(function () {
+	$(":submit").button();
+	$(":checkbox").iphoneStyle();
+	$('form.auto').each(function(i, el) {
+		var id = $(this).attr('id');
+		var output = '#' + id + '_output'
+		$(this).ajaxForm({
+			target: output,
+			success: function() {
+			    $(output).css('font-style', 'italic');
+			    $(output).show('slow');
+			    $(output).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');
+		    });
+	});
+});
+

var/mongoose/cgi-bin/xepg.jim

@@ -98,7 +98,7 @@ foreach e $records {
 
 		puts "[$e channel_icon 30] "
 		puts "$chnum
-	    <a href=/cgi-bin/epg_service.jim?service=[$e get service_id]
+	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"

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

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

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

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

var/mongoose/html/css/style.css

@@ -13,6 +13,19 @@ html>body
 	font-size: small;
 }
 
+.left, .cleft
+{
+	float: left;
+}
+.cleft
+{
+	clear: left;
+}
+fieldset.left, fieldset.cleft
+{
+	display: inline;
+}
+
 div.container
 {
 	position: relative;
@@ -82,6 +95,12 @@ table.borders, table.borders td, table.borders th
 	color: black;
 }
 
+.hover
+{
+	background: #f6ff5b;
+	color: black;
+}
+
 table td,table th
 {
 	font-size: small;
@@ -108,7 +127,7 @@ table.keyval td
 	color: black;
 }
 
-pre, .pre
+pre, .pre, .prelike
 {
         font-family: Consolas, 'Courier New', Courier, monospace;
         color: black;
@@ -126,7 +145,10 @@ pre, .pre
         -webkit-border-top-right-radius: 4px;
         -moz-border-radius-topright: 4px;
         -khtml-border-top-right-radius: 4px;
+}
 
+pre, .pre
+{
 	white-space: pre-wrap;
 	white-space: -moz-pre-wrap !important;
 	white-space: -pre-wrap;
@@ -296,3 +318,11 @@ div.cut
 	font-size: 12px;
 }
 
+.also
+{
+	font-size: 0.9em;
+	font-style: italic;
+	color: #333;
+	background: transparent;
+}
+

var/mongoose/html/css/vlc.css

@@ -0,0 +1,60 @@
+.x-vlc-slider  {
+    background:#C7F2FF;
+    text-align:center;
+ 
+ }
+ .x-vlc-slider-thumb {
+    background:#4EAECC;
+    width:3px;
+}
+.x-vlc-main {
+ 
+}
+.x-vlc-toolbar {
+
+    color:black;
+
+}
+ .x-vlc-toolbar * {
+      vertical-align:top;
+
+      }
+.x-vlc-btn {
+   
+    padding-right:10px;
+  
+  
+}
+.x-vlc-btn-fullscreen {
+    background:url(/img/vlc/fullscreen2.gif) no-repeat;
+}
+ .x-vlc-btn-plus {
+    background:url(/img/vlc/plus2.gif) no-repeat;
+}
+.x-vlc-btn-moins {
+    background:url(/img/vlc/moins2.gif) no-repeat;
+}
+.x-vlc-btn:hover {
+    color:red;
+    
+}
+.x-vlc-btn-play {
+    background:url(/img/vlc/play2.gif) no-repeat;
+}
+.x-vlc-btn-stop {
+    background:url(/img/vlc/stop2.gif) no-repeat;
+
+}
+.x-vlc-btn-pause {
+    background:url(/img/vlc/pause2.gif) no-repeat;
+
+}
+.x-vlc-timer {
+    width:100px;
+    font-size:12px;
+    vertical-align:top;
+    text-align:center
+}
+.x-vlc-about {
+    font-size:10px;
+}

var/mongoose/html/diag.shtml

@@ -15,7 +15,7 @@ Diagnostic:
 </fieldset>
 
 <div style="margin-top: 2em; display: none; float: left; clear: left"
-class=pre id=results></div>
+    id=results></div>
 
 <script type=text/javascript>
 $('#rundiag').button().click(function() {
@@ -30,7 +30,9 @@ $('a.log').click(function() {
 	    .slideDown()
 	    .text('\n\nLoading log, please wait...\n\n')
 	    .load('/cgi-bin/cat.jim?file=' +
-	    encodeURIComponent($(this).attr('file')));
+	        encodeURIComponent($(this).attr('file')), function() {
+	    		$('#results').wrapInner('<pre>');
+		});
 });
 </script>