fix lock, add guidance icons, add new icon

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

CONTROL/conffiles

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

CONTROL/control

@@ -1,10 +1,11 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.5.1
+Version: 0.5.6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=2.11-4),jim-sqlite3,jim-cgi,service-control,busybox,lsof,jim-oo,epg(>=1.0.2)
+Depends: mongoose(>=2.11-5),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.2),jim-oo,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
 Description: A web interface for the Humax. In development.

var/mongoose/cgi-bin/browse.jim

@@ -0,0 +1,248 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+source /mod/var/mongoose/lib/pretty_size
+
+puts "Content-Type: text/html"
+puts ""
+
+set ignore {.nts .thm .hmt .hmi}
+set include {.ts .avi .mpg .wmv .mkv}
+
+cgi_input
+#cgi_dump
+
+#set env(REQUEST_URI) ''
+#set _cgi(dir) "/media/My Video/Chuggington"
+
+proc directory {file bfile} {
+	puts "<div class=va>"
+	puts "<a href=$::env(REQUEST_URI)?dir=[cgi_quote_url $file]>"
+	puts "<img border=0 class=va src=/images/711_1_09_Media_Folder.png>"
+	regsub -all " +" $bfile "" tbfile
+	puts "$bfile</a><span class=filesize id=\"$tbfile\">
+		</span></div>"
+}
+
+proc entry {file} {{i 0}} {
+	set bfile [file tail $file]
+	if {[string index $bfile 0] == "\025"} {
+		set bfile [string range $bfile 1 end]
+	}
+	if [file isdirectory "$file"] {
+		directory $file $bfile
+		continue
+	}
+	set ext [file extension $file]
+	if {$ext in $::ignore || $ext ni $::include} { continue }
+
+	file stat $file st
+	set sz [pretty_size $st(size)]
+
+	set base [file rootname $file]
+
+	if {$ext eq ".ts" && [file exists "${base}.nts"]} {
+		set type ts
+		set ts [ts fetch $file 1]
+		set img 741_1_10_Video_Title.png
+		set pad 0
+		set newpad "top: -6; left: 4;"
+	} else {
+		set type gen
+		set ts 0
+		set img 743_4_10_Video_Xvid_File.png
+		set pad "2"
+		set newpad "top: -2; left: 2;"
+	}
+
+	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 }
+	} else {
+		if {![file exists "[file rootname $file].hmi"]} { set new 1 }
+	}
+
+	if {$new} {
+		# Overlay the new image over the media one.
+		puts "
+		    <span style=\"position: relative; left: 0; top 0;
+		      padding: $pad\">
+			<img class=va border=0 width=45 src=/images/$img
+			    style=\"padding: $pad;
+				position: relative; top: 0; left: 0\">
+			<img class=va border=0
+			    src=/images/743_1_10_Video_New.png
+			    style=\"position: absolute; $newpad
+			      width: 18\">
+		    </span>
+		"
+	} else {
+		puts "
+			<img class=va border=0 width=45 src=/images/$img
+			    style=\"padding:$pad\">
+		"
+	}
+
+	puts "
+		$bfile
+	      </a>
+	"
+
+	# Size
+	puts "<span class=filesize> ($sz) </span>"
+
+	# Icons
+
+	set locked 0
+	if {$type eq "ts"} {
+		# HD / SD
+		if {[$ts get definition] eq "HD"} {
+			set img "172_1_00_HD"
+		} else {
+			set img "172_1_26_SD"
+		}
+		puts "<img class=va src=/images/$img.png height=21>"
+
+		# Locked
+		if {[$ts flag "Locked"] > 0} {
+			set locked 1
+			puts "<img class=va src=/images/178_1_00_Icon_Lock.png
+			    height=21>"
+		}
+
+		# Encrypted
+		if {[$ts flag "Encrypted"] > 0} {
+			puts "<img class=va
+			    src=/images/749_1_26_Video_Encryption.png
+			    height=21>"
+		}
+
+		# Guidance
+		if {[$ts flag "Guidance"] > 0} {
+			puts "<img class=va
+			    src=/images/174_1_26_GuidancePolicy.png
+			    height=21>"
+		}
+	}
+
+	# Opt+ button
+
+	puts "
+	      <a href=#>
+		<img class=\"opt va\" border=0 width=45 type=$type did=$i
+		    locked=$locked
+		    src=/images/181_1_00_Help5_OPT_Plus.png>
+	      </a>
+	    <div class=\"results blood\" style=\"margin: 0 0 0 5em\"></div>
+	"
+	puts "</div>"
+}
+
+if {[dict exists $_cgi dir]} {
+	set dir [dict get $_cgi dir]
+} else {
+	set dir "/media/My Video"
+}
+
+######################################################################
+# Render web page
+
+source /mod/var/mongoose/html/lib/header.jim
+
+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><a href=#delete>Delete</a></li>
+		<li><a href=#lock>Toggle Lock</a></li>
+		<li><a href=#rename>Rename</a></li>
+		<li><a href=#download>Download</a></li>
+	</ul>
+
+	<div id=renameform title="Rename media file" style="display: none">
+		<form id=renameform_form>
+		<input type=hidden name="renameorig" id="renameorig" value="">
+		<input type=hidden name="titleorig" id="titleorig" value="">
+		<table border=0>
+		<tr>
+		<th>
+			<label for="rename">
+				<b>New Filename</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="rename" id="rename"
+			    value="" size=70 maxlength=255
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<th>
+			<label for="renametitle" style="padding-top: 0.5em">
+				<b>New EPG Title</b>
+			</label>
+		</th>
+		<td>
+			<input type=text name="renametitle" id="renametitle"
+			    value="" size=70 maxlength=48
+			    class="text ui-widget-content ui-corner-all">
+		</td>
+		</tr>
+		<tr style="display: none" class=tstype>
+		<td colspan=2 id=synopsis style="font-style: italic"></td>
+		</tr>
+		</table>
+		</form>
+	</div>
+
+	<div id=dialogue></div>
+	<div id=confirm title="Confirmation Required"></div>
+
+	<script type=text/javascript src=/cgi-bin/browse/browse.js></script>
+}
+
+puts "<span style=\"display:none\" id=dir>$dir</span>"
+
+# Breadcrumb path
+puts "
+      <fieldset style=\"margin: 1em\">
+      <legend style=\"font-size: 1.5em; padding: 0 0.5em 0.5em 0.5em;\">
+"
+set stub ""
+foreach part [split $dir /] {
+	if {$stub eq "/"} { set name $part } else { set name "/$part" }
+	append stub $name
+	puts "<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $stub]>$name</a>
+}
+puts "</legend>"
+
+# Parent directory
+set parent [join [lrange [split $dir /] 0 end-1] /]
+if {$parent ne ""} {
+	puts "
+	    <div class=va>
+		<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $parent]>
+		<img src=/images/711_3_09_Media_Folder_UP.png class=va>
+			\[parent directory\]</a>
+	    </div>
+	"
+}
+
+# Strip double slashes
+regsub -all -- {\/+} "$dir/*" "/" dir
+
+foreach file [lsort [glob -nocomplain "$dir"]] {
+	entry $file
+}
+
+puts "</fieldset>"
+
+source /mod/var/mongoose/html/lib/footer.jim
+

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

@@ -0,0 +1,217 @@
+
+function epginfo_callback(data, status, xhr)
+{
+	var width = 85;
+
+	if (status != 'success')
+		return;
+
+	//console.log(status);
+	//console.dir(data);
+
+	$('#titleorig').val(data.title);
+	$('#renametitle').val(data.title);
+	if (data.synopsis.length > width)
+		data.synopsis = data.synopsis.substring(0, width) + '...';
+	$('#synopsis').html(data.synopsis);
+	$('tr.tstype').show('slow');
+}
+
+function insert_folder_size(folder, size)
+{
+	folder = folder.replace(/ /g, '');
+	//console.log("Folder: (%s) = (%s)", folder, size);
+	$('#' + folder).text(' (' + size + 'iB)');
+}
+
+function folder_size_callback(data, status, xhr)
+{
+	//console.log("Status: %s", status);
+	$.each(data, insert_folder_size);
+}
+
+function delete_callback(file, type, id)
+{
+	var el = 'div.bf#' + id;
+	var results = el + ' .results';
+	var url = '/cgi-bin/browse/delete.jim?file=' +
+	    encodeURIComponent(file) + '&type=' + type;
+	$(results).load(url, function() {
+		$(el).delay(3000).slideUp(300, function() {
+			$(el).remove();
+		});
+	});
+}
+
+function lock_callback(file, type, id)
+{
+	var url = '/cgi-bin/browse/lock.jim?file=' + encodeURIComponent(file);
+	$.get(url, function() { window.location.reload(true); });
+}
+
+function rename_submit()
+{
+	var s = $('#renameform_form').serialize();
+	$.get('/cgi-bin/browse/rename.jim?' + s,
+	    function() { window.location.reload(true); });
+}
+
+var $confirm;	// Populated after DOM is loaded.
+
+function confirm_action(action, callback, file, type, id)
+{
+	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	$confirm.dialog('option', 'buttons', {
+		'Yes': function() { $(this).dialog('close');
+			callback(file, type, id); },
+		'No':  function() {$(this).dialog('close');}
+
+	});
+	$('#confirm').empty().html(
+	    'Are you sure you wish to ' + action + '<br>' +
+	    '<i>' + bfile + '</i> ?'
+	);
+	$confirm.dialog('open');
+}
+
+function preparemenu(el, menu)
+{
+	if (el.attr('type') == 'ts')
+	{
+		$('#optmenu').enableContextMenuItems('#lock');
+		if (el.attr('locked') == 1)
+		{
+			$(menu).changeContextMenuItem('#lock', 'Unlock');
+			$('#optmenu').disableContextMenuItems('#delete');
+		}
+		else
+		{
+			$(menu).changeContextMenuItem('#lock', 'Lock');
+			$('#optmenu').enableContextMenuItems('#delete');
+		}
+	}
+	else
+	{
+		$('#optmenu').enableContextMenuItems('#delete');
+		$('#optmenu').disableContextMenuItems('#lock');
+	}
+}
+
+
+$(document).ready(function() {
+
+var menuclick = function(action, el, pos)
+{
+	var file = $(el).parent().prevAll('a.bf').last().attr('file');
+	var bfile = file.replace(/.*\/|\.[^.]*$/g, '');
+	bfile = bfile.replace(/[\x00-\x1f]+/g, '');
+	var type = $(el).attr('type');
+	var id = $(el).attr('did');
+	switch (action)
+	{
+	    case 'delete':
+		confirm_action('delete', delete_callback, file,
+		    type, id);
+		break;
+
+	    case 'lock':
+		confirm_action('change the lock on', lock_callback,
+		    file, type, id);
+		break;
+
+	    case 'rename':
+		$('#rename').val(bfile);
+		$('#renameorig').val(file);
+
+		$('#titleorig').val('');
+		$('#renametitle').val('');
+		$('#synopsis').val('');
+		$('tr.tstype').css('display', 'none');
+
+		if (type == 'ts')
+		{
+			$.getJSON('/cgi-bin/browse/epgtitle.jim?file=' +
+			    encodeURIComponent(file), epginfo_callback);
+		}
+
+		$('#renameform').dialog('open');
+		break;
+
+	    case 'download':
+		window.location.href = file;
+		break;
+
+	    default:
+		alert('Unhandled action: ' + action);
+		break;
+	}
+};
+
+	// Bind context menu to opt+ image
+	$('img.opt').contextMenu(
+		{
+			menu: 'optmenu',
+			leftButton: true,
+			beforeShow: preparemenu
+		},
+		menuclick
+	);
+
+	// Disable items which are not yet implemented.
+	$('#optmenu').disableContextMenuItems('#title');
+
+	// Create reusable dialogue.
+	var $dialog = $('#dialogue').dialog({
+		title: "Media Details",
+		modal: false, autoOpen: false,
+		height: 600, width: 700,
+		show: 'scale', hide: 'fade',
+		draggable: true, resizable: true,
+		buttons: {
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function(e,u) { $('#dialogue').empty().html(
+		    '<img src="/img/loading.gif" alt="loading">'); }
+	});
+
+	// Bind dialogue open to filenames.
+	$('a.bf').click(function(e) {
+		e.preventDefault();
+		var file = $(this).attr('file');
+		var type = $(this).attr('type');
+		var url = '/cgi-bin/browse/file.jim?file=' +
+		    encodeURIComponent(file) + '&type=' + type;
+		$('#dialogue').load(url);
+		$dialog.dialog('open');
+	});
+
+	$('#renameform').dialog({
+		autoOpen: false,
+		height: 'auto', width: 'auto',
+		modal: true,
+		buttons: {
+			"Update": rename_submit,
+			"Close": function() {
+				$(this).dialog('close');
+			}
+		},
+		close: function() { $('#rename').val(''); }
+	});
+
+	// Create re-usable confirmation dialogue.
+	$confirm = $('#confirm').dialog({
+		modal: true, autoOpen: false,
+		height: 160, width: 500,
+		show: 'fade', hide: 'fade',
+		draggable: false, resizable: false
+	});
+	
+	var dir = $('#dir').text();
+
+	// Load folder sizes
+	$.getJSON('/cgi-bin/browse/sizes.jim?dir=' + encodeURIComponent(dir),
+		folder_size_callback);
+});
+

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

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

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

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

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

@@ -0,0 +1,17 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+if [file exists /mod/bin/ffmpeg] {
+	set file [dict get $_cgi file]
+	puts [exec /mod/var/mongoose/lib/ffmpeg -i $file]
+} else {
+	puts "Install ffmpeg package for more information..."
+}
+

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

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

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

@@ -0,0 +1,27 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/var/mongoose/lib/ts.class
+
+puts "Content-Type: text/html"
+puts ""
+
+cgi_input
+#cgi_dump
+
+#set _cgi(file) "/media/My Video/The Walking Dead/The Walking Dead S01E06.ts"
+
+set file [dict get $_cgi file]
+set ts [ts fetch $file]
+if {[set ts [ts fetch $file]] != 0} {
+	set action lock
+	if {[$ts flag "Locked"]} { set action unlock }
+
+	if {[$ts $action]} {
+		puts "Successfully [set action]ed $file."
+	} else {
+		puts "Problem [set action]ing $file,
+		    [$ts get error]"
+	}
+}
+

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

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

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

@@ -0,0 +1,26 @@
+#!/mod/bin/jimsh
+
+package require cgi
+
+puts "Content-Type: application/json"
+puts ""
+
+cgi_input
+#cgi_dump
+
+set _cgi(dir) "/media/My Video"
+
+set dir [dict get $_cgi dir]
+
+#9.4G	/media/My Video/Archive
+#1.4G	/media/My Video/CSI_ Crime Scene Investigation
+puts "{"
+foreach line [split [exec /mod/bin/busybox/du -h "$dir/"] "\n"] {
+	set fields [split $line "\t"]
+	set size [lindex $fields 0]
+	set node [lindex [split [lindex $fields 1] '/'] end]
+	puts "\"$node\" : \"$size\","
+}
+puts "\"dummy\" : \"\""
+puts "}"
+

var/mongoose/cgi-bin/epg_info.jim

@@ -21,6 +21,7 @@ if {! [dict exists $_cgi bare]} {
 #set event 25293
 
 set record [lindex [epg fetch dump -service $service -event $event] 0]
+$record get_channel_info
 
 puts "
 	<table class=keyval>
@@ -91,7 +92,7 @@ if {[$record get rec_crid] != ""} {
 puts "
 	<tr>
 		<td colspan=2 valign=top>
-			[$record channel_icon]
+			[$record channel_icon 70]
 			[join [$record icon_set] "&nbsp;"]
 		</td>
 	</tr>

var/mongoose/cgi-bin/epg_search.jim

@@ -2,6 +2,7 @@
 
 package require cgi
 source /mod/var/mongoose/lib/epg.class
+source /mod/var/mongoose/lib/spinner.class
 source /mod/var/mongoose/lib/altrow
 source /mod/var/mongoose/lib/cat
 
@@ -32,13 +33,27 @@ catch { set scrid [dict get $_cgi scrid] }
 
 puts "
 <form method=get action=/cgi-bin/epg_search.jim>
-Search EPG: <input name=term size=20 maxlength=255 value=\"$term\">
-<input type=checkbox name=full"
-if {[dict exists $_cgi full]} { puts " checked" }
-puts ">Search descriptions as well as titles.
+<fieldset>
+<legend>EPG Search</legend>
+<label for=term>Query</label>
+<input type=text name=term id=term size=20 maxlength=255 value=\"$term\"
+    class=\"text ui-widget-content ui-corner-all\">
 <input type=submit value=Search>
+<input type=checkbox name=full id=full"
+if {[dict exists $_cgi full]} { puts -nonewline " checked" }
+puts ">
+<label for=full>Search descriptions as well as titles.</label>
 "
 
+puts {
+	<style type=text/css>
+	.ui-button, .ui-button-text { padding: 0; font-size: 12px; }
+	</style>
+	<script type=text/javascript>
+		$('input:submit').button();
+	</script>
+}
+
 set db [sqlite3.open /var/lib/humaxtv/setup.db]
 set res [$db query {
 	select itemBlob from TBL_USERCONFIG
@@ -53,7 +68,7 @@ proc cts {type img text} {
 puts {
 	<br>
 	<table>
-	<tr><td rowspan=2>Content Type Searches</td>
+	<tr><td rowspan=2 valign=top>Content Type Searches</td>
 	<td>
 }
 
@@ -95,8 +110,15 @@ puts "</table>"
 
 $db close
 
+puts "</fieldset>"
 puts "</form>"
 
+[spinner new {
+	text "Loading EPG Data..."
+	size "1.2em"
+	style "margin: 1em;"
+	}] start
+
 if {$ct > 0 } {
 	set records [epg fetch dump -type $ct]
 } elseif {$crid ne ""} {
@@ -107,6 +129,8 @@ if {$ct > 0 } {
 	set records [epg fetch $cmd -extra $term]
 }
 
+set favlist [epg favlist]
+
 puts {
 	<table class=borders id=results style="clear: both;margin: 0.5em 0 0 0">
 	<tr>
@@ -126,10 +150,13 @@ proc rsort {v1 v2} {
 	return -1
 }
 
-
 set i 0
 foreach record [lsort -command rsort $records] {
+	if {$favlist != "" && [$record get service_id] ni $favlist} {
+		continue
+	}
 	altrow
+	$record get_channel_info
 	puts "<td nowrap>
 	    [clock format [$record get start] -format "%a %d %b %Y"]<br>
 		[clock format [$record get start] -format "%H:%M %Z"]</td>"

var/mongoose/cgi-bin/epg_service.jim

@@ -29,12 +29,13 @@ catch { set service [dict get $_cgi service] }
 set records [epg fetch dump -service $service]
 
 set tr [lindex $records 0]
+$tr get_channel_info
 set channel_num [$tr get channel_num]
 set channel_name [$tr get channel_name]
 
 puts "
 	<div style=\"margin: 0 1em 1em 1em\">
-	[$tr channel_icon 0 {vertical-align:middle}]
+	[$tr channel_icon 80 {vertical-align:middle}]
 	<span style=\"vertical-align: middle\">
 		$channel_num - $channel_name
 	</span>

var/mongoose/cgi-bin/settings.jim

@@ -1,5 +1,6 @@
 #!/mod/bin/jimsh
 
+source /mod/var/mongoose/lib/settings.class
 package require cgi
 
 puts "Content-Type: text/html"
@@ -8,37 +9,54 @@ puts ""
 cgi_input
 #cgi_dump
 
-# Set variables
+set settings [settings new]
 
-if {[catch {set fd [open "/var/lib/humaxtv/hostname" r]}]} {
-	set hostname "humax"
-} else {
-	set hostname [string trim [read $fd]]
-	close $fd
-}
+set hostname [$settings hostname]
+set smtp_server [$settings smtp_server]
+set channel_group [$settings channel_group]
 
 # Handle updates
 
-if {[dict exists $_cgi hostname]} {
-	set nhostname [string trim [dict get $_cgi hostname]]
-	if {$nhostname eq $hostname} {
-		puts "Hostname is already '$hostname'."
-	} elseif [string is alnum -strict $hostname] {
-		set fd [open "/var/lib/humaxtv/hostname" w]
-		puts $fd $nhostname
-		close $fd
-		exec hostname -F /var/lib/humaxtv/hostname
-		puts "Hostname successfully updated, reboot recommended."
-	} else {
-		puts "Invalid hostname."
+#set _cgi(smtp_server) "fred.bob"
+#set env(REQUEST_URI) ''
+
+proc _handle_update {class var old text} {
+	global _cgi
+	global settings
+
+	if {[dict exists $_cgi $var]} {
+		set new [string trim [dict get $_cgi $var]]
+		if {$new == $old} {
+			puts "$text unchanged."
+		} elseif [string is $class -strict $new] {
+			$settings $var $new
+			puts "$text updated."
+		} else {
+			puts "Invalid value for $var."
+		}
+		exit
 	}
-	exit
 }
 
+proc handle_int_update {var old {text "Value"}} {
+	_handle_update digit $var $old $text
+}
+
+proc handle_str_update {var old {text "Value"}} {
+	_handle_update alnum $var $old $text
+}
+
+handle_str_update hostname $hostname Hostname
+_handle_update ascii smtp_server $smtp_server "SMTP Server"
+handle_int_update channel_group $channel_group "Channel Group"
+
 source /mod/var/mongoose/html/lib/header.jim
 puts {<script type="text/javascript" src="/js/jquery.form.js"></script>}
 
 puts {
+	<style type=text/css>
+	.ui-button, .ui-button-text { padding: 0; font-size: 10px; }
+	</style>
 	<script type=text/javascript>
 	$(document).ready(function () {
 		$(":submit").button();
@@ -59,23 +77,83 @@ puts {
 }
 
 puts "
-	<h1>Settings</h1>
-	<form id=hostname method=get action=$env(REQUEST_URI)>
-	<table class=keyval>
+	<fieldset style=\"display: inline\">
+		<legend>
+			General Settings
+		</legend>
+	<table>
+"
+
+puts "
 	<tr>
-		<th>Hostname</th>
+	<form id=hostname method=get action=$env(REQUEST_URI)>
+		<th class=key>Hostname</th>
 		<td><input name=hostname value=\"$hostname\"
+		    class=\"text ui-widget-content ui-corner-all\"
 		    length=20 maxlength=50>
 		    <input id=hostname_submit value=\"change\" type=submit>
 		    <div id=hostname_output></div>
 		</td>
-	</tr>
-	</table>
 	</form>
-	<br>
-	More coming soon...
-	<br>
-	<br>
+	</tr>
 "
+
+puts "
+	<tr>
+	<form 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]>
+"
+
+set i 0
+puts "<option value=0>-- None --"
+foreach grp [$settings channel_groups] {
+	incr i
+	puts -nonewline "<option value=$i"
+	if {$channel_group == $i} {
+		puts -nonewline " selected"
+	}
+	puts ">$grp"
+}
+
+puts "
+		</select>
+		<input name=channel_group value=\"set\" type=submit>
+		<div id=channel_group_output></div>
+		</td>
+	</form>
+	</tr>
+"
+
+puts "
+	</table>
+	</fieldset>
+	<br><br>
+	<fieldset style=\"display: inline\">
+	<legend> Email Settings </legend>
+	<table>
+"
+
+puts "
+	<tr>
+	<form id=smtp_server method=get action=$env(REQUEST_URI)>
+		<th class=key>SMTP Server for outbound email</th>
+		<td><input name=smtp_server value=\"$smtp_server\"
+		    class=\"text ui-widget-content ui-corner-all\"
+		    length=20 maxlength=50>
+		    <input id=smtp_server_submit value=\"change\" type=submit>
+		    <div id=smtp_server_output></div>
+		</td>
+	</form>
+	</tr>
+"
+
+puts "
+	</table>
+	</fieldset>
+"
+
 source /mod/var/mongoose/html/lib/footer.jim
 

var/mongoose/cgi-bin/status.jim

@@ -43,9 +43,8 @@ foreach line $lines {
 
 	incr seen($name)
 
-	lappend output "<img style=\"vertical-align: middle\"
-	    src=/images/$icon><span
-	    style=\"vertical-align: middle\">$mode&nbsp;$name</span>"
+	lappend output "<img class=va src=/images/$icon><span class=va>
+	    $mode&nbsp;$name</span><br>"
 }
 
 if {[llength $output]} {

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

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

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

@@ -0,0 +1,62 @@
+/* Generic context menu styles */
+.contextMenu {
+	position: absolute;
+	width: 120px;
+	z-index: 99999;
+	border: solid 1px #CCC;
+	background: #EEE;
+	padding: 0px;
+	margin: 0px;
+	display: none;
+}
+
+.contextMenu LI {
+	list-style: none;
+	padding: 0px;
+	margin: 0px;
+}
+
+.contextMenu A {
+	color: #333;
+	text-decoration: none;
+	display: block;
+	line-height: 20px;
+	height: 20px;
+	background-position: 6px center;
+	background-repeat: no-repeat;
+	outline: none;
+	padding: 1px 5px;
+	padding-left: 28px;
+}
+
+.contextMenu LI.hover A {
+	color: #FFF;
+	background-color: #3399FF;
+}
+
+.contextMenu LI.disabled A {
+	color: #AAA;
+	cursor: default;
+}
+
+.contextMenu LI.hover.disabled A {
+	background-color: transparent;
+}
+
+.contextMenu LI.separator {
+	border-top: solid 1px #CCC;
+}
+
+/*
+	Adding Icons
+	
+	You can add icons to the context menu by adding
+	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); }

var/mongoose/html/css/style.css

@@ -63,13 +63,13 @@ table.borders, table.borders td, table.borders th
 	empty-cells: show;
 }
 
-table tr.odd
+table tr.odd, table td.odd, table th.odd
 {
 	background: #ccff99;
 	color: black;
 }
 
-table tr.even
+table tr.even, table td.even, table th.even
 {
 	background: #ffffcc;
 	color: black;
@@ -86,7 +86,7 @@ table th
 	text-align: left;
 }
 
-table.keyval th
+table.keyval th, th.key
 {
 	background: #ccff99;
 	font-weight: bold;
@@ -101,7 +101,7 @@ table.keyval td
 	color: black;
 }
 
-pre
+pre, .pre
 {
         font-family: Consolas, 'Courier New', Courier, monospace;
         color: black;
@@ -174,6 +174,12 @@ pre
 	background: transparent;
 }
 
+.filesize
+{
+	color: #6a6aff;
+	background: transparent;
+}
+
 .footnote
 {
 	color: #ff4000;
@@ -220,3 +226,18 @@ img.progress
 	background-position: 1px 0;
 }
 
+.va
+{
+	vertical-align: middle;
+}
+
+.block
+{
+	display: block;
+}
+
+input.text
+{
+	padding: .4em;
+}
+

var/mongoose/html/epg.shtml

@@ -1,9 +1,27 @@
 <!--#include virtual="/lib/header.shtml" -->
+
+<style type=text/css>
+.ui-button, .ui-button-text { padding: 0; font-size: 12px; }
+</style>
+
+<div style="width: 75%">
 <form method=get action=/cgi-bin/epg_search.jim>
-Search EPG: <input name=term size=20 maxlength=255>
-<input type=checkbox name=full>Search descriptions as well as titles.
+<fieldset>
+<legend>EPG Search</legend>
+<label for=term>Query</label>
+<input type=text name=term id=term size=20 maxlength=255
+    class="text ui-widget-content ui-corner-all">
 <input type=submit value=Search>
+<input type=checkbox name=full id=full>
+<label for=full>Search descriptions as well as titles.</label>
+</fieldset>
 </form>
+</div>
+
+<script type=text/javascript>
+	$('input:submit').button();
+</script>
+
 <!--#exec cmd="/mod/var/mongoose/include/epg.jim" -->
 <!--#include virtual="/lib/footer.shtml" -->
 

var/mongoose/html/img/channels/301.jpg

@@ -1 +0,0 @@
-freeview/BBC-RED-BUTTON_logo.jpg

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

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

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

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

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

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

var/mongoose/html/img/channels/4Music.jpg

@@ -1 +0,0 @@
-freeview/4-MUSIC_logo.jpg

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

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

var/mongoose/html/img/channels/5 USA.jpg

@@ -1 +0,0 @@
-freeview/5-USA_logo.jpg

var/mongoose/html/img/channels/5*.jpg

@@ -1 +0,0 @@
-freeview/Five_logo.jpg

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

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

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

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

var/mongoose/html/img/channels/Absolute Radio.jpg

@@ -1 +0,0 @@
-freeview/Absolute_logo.jpg

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

@@ -0,0 +1 @@
+Absolute Radio.png

var/mongoose/html/img/channels/Alibi+1.png

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

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

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

var/mongoose/html/img/channels/BBC 1 E Mids.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 East (E).png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 East (W).png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 London.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 N West.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 NE & C.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 Oxford.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 S East.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 S West.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 Scotland.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 South.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 W Mids.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 Wales.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 West.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 Yorks.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 1 Yrks&Lin.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC 2 Scotland.png

@@ -0,0 +1 @@
+BBC 2 England.png

var/mongoose/html/img/channels/BBC 2 Wales.png

@@ -0,0 +1 @@
+BBC 2 England.png

var/mongoose/html/img/channels/BBC 2W.png

@@ -0,0 +1 @@
+BBC 2 England.png

var/mongoose/html/img/channels/BBC 6 Music.jpg

@@ -1 +0,0 @@
-freeview/BBC-RADIO-6-music_logo.jpg

var/mongoose/html/img/channels/BBC 7.png

@@ -0,0 +1 @@
+BBC Radio 7.png -

var/mongoose/html/img/channels/BBC Asian N..png

@@ -0,0 +1 @@
+BBC Asian Net..png -

var/mongoose/html/img/channels/BBC Asian Net..jpg

@@ -1 +0,0 @@
-freeview/BBC-RADIO-A_logo.jpg

var/mongoose/html/img/channels/BBC FOUR.jpg

@@ -1 +0,0 @@
-freeview/BBC-FOUR_logo.jpg

var/mongoose/html/img/channels/BBC HD.jpg

@@ -1 +0,0 @@
-freeview/BBC-HD_logo.jpg

var/mongoose/html/img/channels/BBC London.png

@@ -0,0 +1 @@
+BBC London.png -

var/mongoose/html/img/channels/BBC NEWS.jpg

@@ -1 +0,0 @@
-freeview/BBC-NEWS_logo.jpg

var/mongoose/html/img/channels/BBC News.png

@@ -0,0 +1 @@
+BBC NEWS.png

var/mongoose/html/img/channels/BBC ONE NI.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC ONE Scot.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC ONE Wales.png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC ONE [South].png

@@ -0,0 +1 @@
+BBC 1 Cl.png

var/mongoose/html/img/channels/BBC ONE.jpg

@@ -1 +0,0 @@
-freeview/BBC-one_logo.jpg