update tablesorter, improve queue.js, fix safe_delete

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

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.0-6
+Version: 1.4.0-7
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.25),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.5),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.10),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.21-2),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95),sqlite3(>=3.15.1)

webif/html/diag/queue/script.js

@@ -16,6 +16,8 @@ function dirname(path)
 function load()
 {
 	$('span.isloading').show();
+	// Grey out the rows
+	$('#queuetab > tbody tr').disable();
 	$.getJSON('fetch.jim', function(data) {
 		$('#queuetab > tbody').empty();
 
@@ -26,27 +28,47 @@ function load()
 
 		$.each(data, function(k, v) {
 
-	s = '<tr>' +
-	'<td><input type=checkbox class=qid status=' + v.status +
-	    ' value=' + v.qid + '>' +
-	    v.qid + '</td>' +
-	'<td>' + v.submitted + '</td>' +
-	'<td><a href=# class=file>' + v.file + '</a></td>' +
-	'<td>' + v.action + ' ' + v.args + '</td>' +
-	'<td class="status ' + v.status + '">' + v.status;
-	if (v.status == 'RUNNING')
-		s += ' &nbsp;<img class=va src=/img/spin.gif>';
-	if ((v.status == 'DEFER' || v.status == 'PENDING') && v.start != '0')
-		s += ' &nbsp;(' + v.start + 's)';
-	s += '</td><td>';
-	if (v.runtime != '0')
-		s += v.runtime;
-	s += '</td>' +
-	'<td class=queuelog>' + v.log + '</td>' +
-	'<td>' + v.last + '</td>' +
-	'</tr>';
+			var $row = $('<tr>');
 
-			$('#queuetab > tbody').append(s);
+			$('<td>').append($('<input>', {
+				'type': 'checkbox',
+				'class': 'qid',
+				status: v.status,
+				value: v.qid
+			})).append(v.qid).appendTo($row);
+			$('<td>', { html: v.submitted }).appendTo($row);
+			$('<td>').append($('<a>', {
+				'class': 'file',
+				href: '#',
+				html: v.file
+			})).appendTo($row);
+			$('<td>', { html: v.action + ' ' + v.args })
+			    .appendTo($row);
+
+			var s = v.status;
+			if (v.status == 'RUNNING')
+				s += ' &nbsp;<img class=va src=/img/spin.gif>';
+			if ((v.status == 'DEFER' || v.status == 'PENDING')
+			    && v.start != '0')
+				s += ' &nbsp;(' + v.start + 's)';
+
+			$('<td>', {
+				'class': 'status ' + v.status,
+				html: s
+			}).appendTo($row);
+
+			$('<td>', {
+				html: v.runtime != 0 ? v.runtime : ""
+			}).appendTo($row);
+
+			$('<td>', {
+				'class': 'queuelog',
+				html: v.log
+			}).appendTo($row);
+
+			$('<td>', { html: v.last }).appendTo($row);
+
+			$('#queuetab > tbody').append($row);
 		});
 
 		if (data.length > 0)
@@ -85,6 +107,7 @@ $('table')
 	sortList: [[0,1]],
 	theme: 'webif',
 	widthFixed: false,
+	dateFormat: "ddmmyyyy",
 	widgets: ['zebra', 'stickyHeaders']
     });
 

webif/html/lib/jquery.plugin/tablesorter2/theme.green.css

@@ -19,7 +19,8 @@
 /* header */
 .tablesorter-green thead tr .tablesorter-header,
 .tablesorter-green tfoot tr {
-	background: center center repeat-x;
+	background-position: center center;
+	background-repeat: repeat-x;
 	background-image: url(data:image/gif;base64,R0lGODlhAQBkAOYAAN/e39XU1fX19tTU1eXm5uTl5ePk5OLj4+Hi4vX29fT19PP08/Lz8vHy8fDx8O/w7+7v7uzt7Orr6ufo5/T08/Pz8ufn5uLi4eDg39/f3t3d3Nzc29HR0NDQz8/Pzuvq6urp6eno6Ojn5+fm5tfW1tbV1dTT09PS0tLR0dHQ0NDPz/f39/b29vX19fT09PPz8/Ly8vHx8e/v7+7u7u3t7ezs7Ovr6+rq6unp6ejo6Ofn5+bm5uXl5eTk5OPj4+Li4uHh4eDg4N/f397e3t3d3dzc3Nvb29ra2tnZ2djY2NfX19XV1dPT09LS0tHR0dDQ0M/Pz8rKysXFxf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAFMALAAAAAABAGQAAAdegCsrLC0tLi+ILi6FCSwsCS0KkhQVDA0OMjM0NTYfICEiIzw9P0AYGUQaG0ZHSEoDTU9Qs08pTk1MSyRJR0VDQT8+PTw7Ojg3NTMyMTAvi4WOhC0vMTI1OT9GTlFSgQA7);
 	/* background-image: url(images/green-header.gif); */
 }
@@ -32,7 +33,8 @@
 }
 .tablesorter-green .header,
 .tablesorter-green .tablesorter-header-inner {
-	background: no-repeat 5px center;
+	background-position: 5px center;
+	background-repeat: no-repeat;
 	background-image: url(data:image/gif;base64,R0lGODlhEAAQAOYAAA5NDBBYDlWWUzRUM5DVjp7inJ/fnQ1ECiCsGhyYFxqKFRFdDhBXDQxCCiO8HSK2HCCqGh2aGByUFxuPFhqNFhmHFRZ2EhVvERRpEBBVDSS8HiGyHB+mGh6fGRuTFxiAFBd5Eww/Cgs5CRp7Fiu+JRx8GCy/JjHAKyynKCuhJzXCMDbCMDnDMyNuHz3EODy9N0LFPSl7JkvIRjycOFDKS1LKTVPLT1XLUFTCT17OWTBkLmbQYnDTbHXVcXnWdoXago/djGmUZ112XCJEIEdjRf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAEUALAAAAAAQABAAAAdlgEWCg4SFhoIvh4cVLECKhCMeJjwFj0UlEwgaMD4Gii0WFAkRHQ47BIY6IQAZDAwBCyAPOJa1toRBGBAwNTY3OT0/AoZCDQoOKi4yNDOKRCIfGycrKZYDBxIkKLZDFxy3RTHgloEAOw==);
 	/* background-image: url(images/green-unsorted.gif); */
 	border-collapse: collapse;
@@ -78,25 +80,28 @@
  you'll need to add additional lines for
  rows with more than 2 child rows
  */
+.tablesorter-green tbody > tr.hover > td,
 .tablesorter-green tbody > tr:hover > td,
 .tablesorter-green tbody > tr:hover + tr.tablesorter-childRow > td,
 .tablesorter-green tbody > tr:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td,
+.tablesorter-green tbody > tr.even.hover > td,
 .tablesorter-green tbody > tr.even:hover > td,
 .tablesorter-green tbody > tr.even:hover + tr.tablesorter-childRow > td,
 .tablesorter-green tbody > tr.even:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
-	background: #d9d9d9;
+	background-color: #d9d9d9;
 }
+.tablesorter-green tbody > tr.odd.hover > td,
 .tablesorter-green tbody > tr.odd:hover > td,
 .tablesorter-green tbody > tr.odd:hover + tr.tablesorter-childRow > td,
 .tablesorter-green tbody > tr.odd:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
-	background: #bfbfbf;
+	background-color: #bfbfbf;
 }
 
 /* table processing indicator */
 .tablesorter-green .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
@@ -133,12 +138,15 @@
 
 /* caption */
 caption {
-	background: #fff;
+	background-color: #fff;
 }
 
 /* filter widget */
+.tablesorter-green .tablesorter-filter-row {
+	background-color: #eee;
+}
 .tablesorter-green .tablesorter-filter-row td {
-	background: #eee;
+	background-color: #eee;
 	line-height: normal;
 	text-align: center; /* center the input */
 	-webkit-transition: line-height 0.1s ease;
@@ -174,10 +182,11 @@ caption {
 	filter: alpha(opacity=0);
 }
 /* filters */
-.tablesorter-green .tablesorter-filter {
+.tablesorter-green input.tablesorter-filter,
+.tablesorter-green select.tablesorter-filter {
 	width: 98%;
 	height: auto;
-	margin: 4px;
+	margin: 0;
 	padding: 4px;
 	background-color: #fff;
 	border: 1px solid #bbb;

webif/html/lib/jquery.plugin/tablesorter2/theme.webif.css

@@ -1,5 +1,5 @@
 /*************
-  Green Theme
+  Webif Theme
  *************/
 /* overall */
 .tablesorter-webif {
@@ -19,9 +19,10 @@
 /* header */
 .tablesorter-webif thead tr .tablesorter-header,
 .tablesorter-webif tfoot tr {
-	background: center center repeat-x;
+	background-position: center center;
+	background-repeat: repeat-x;
 	background-image: url(data:image/gif;base64,R0lGODlhAQBkAOYAAN/e39XU1fX19tTU1eXm5uTl5ePk5OLj4+Hi4vX29fT19PP08/Lz8vHy8fDx8O/w7+7v7uzt7Orr6ufo5/T08/Pz8ufn5uLi4eDg39/f3t3d3Nzc29HR0NDQz8/Pzuvq6urp6eno6Ojn5+fm5tfW1tbV1dTT09PS0tLR0dHQ0NDPz/f39/b29vX19fT09PPz8/Ly8vHx8e/v7+7u7u3t7ezs7Ovr6+rq6unp6ejo6Ofn5+bm5uXl5eTk5OPj4+Li4uHh4eDg4N/f397e3t3d3dzc3Nvb29ra2tnZ2djY2NfX19XV1dPT09LS0tHR0dDQ0M/Pz8rKysXFxf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAFMALAAAAAABAGQAAAdegCsrLC0tLi+ILi6FCSwsCS0KkhQVDA0OMjM0NTYfICEiIzw9P0AYGUQaG0ZHSEoDTU9Qs08pTk1MSyRJR0VDQT8+PTw7Ojg3NTMyMTAvi4WOhC0vMTI1OT9GTlFSgQA7);
-	/* background-image: url(images/webif-header.gif); */
+	/* background-image: url(images/green-header.gif); */
 }
 .tablesorter-webif th,
 .tablesorter-webif thead td {
@@ -32,9 +33,10 @@
 }
 .tablesorter-webif .header,
 .tablesorter-webif .tablesorter-header-inner {
-	background: no-repeat 5px center;
+	background-position: 5px center;
+	background-repeat: no-repeat;
 	background-image: url(data:image/gif;base64,R0lGODlhEAAQAOYAAA5NDBBYDlWWUzRUM5DVjp7inJ/fnQ1ECiCsGhyYFxqKFRFdDhBXDQxCCiO8HSK2HCCqGh2aGByUFxuPFhqNFhmHFRZ2EhVvERRpEBBVDSS8HiGyHB+mGh6fGRuTFxiAFBd5Eww/Cgs5CRp7Fiu+JRx8GCy/JjHAKyynKCuhJzXCMDbCMDnDMyNuHz3EODy9N0LFPSl7JkvIRjycOFDKS1LKTVPLT1XLUFTCT17OWTBkLmbQYnDTbHXVcXnWdoXago/djGmUZ112XCJEIEdjRf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAEUALAAAAAAQABAAAAdlgEWCg4SFhoIvh4cVLECKhCMeJjwFj0UlEwgaMD4Gii0WFAkRHQ47BIY6IQAZDAwBCyAPOJa1toRBGBAwNTY3OT0/AoZCDQoOKi4yNDOKRCIfGycrKZYDBxIkKLZDFxy3RTHgloEAOw==);
-	/* background-image: url(images/webif-unsorted.gif); */
+	/* background-image: url(images/green-unsorted.gif); */
 	border-collapse: collapse;
 	white-space: normal;
 	cursor: pointer;
@@ -43,13 +45,13 @@
 .tablesorter-webif thead .tablesorter-headerSortUp .tablesorter-header-inner,
 .tablesorter-webif thead .tablesorter-headerAsc .tablesorter-header-inner {
 	background-image: url(data:image/gif;base64,R0lGODlhEAAQANUAAA5NDBBYDpDVjp7inJ/fnSCsGhyYFxFdDhBXDSO8HSK2HB2aGBuPFhqNFhmHFRZ2EhBVDSS8Hh6fGRuTFxd5Eww/Chp7Fhx8GCy/JjnDMyNuHzy9N0LFPVTCTzBkLmbQYnDTbHnWdo/djP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACMALAAAAAAQABAAAAY4wJFwSCwaj8ikcslMbpojR0bEtEwwoIHywihEOCECUvNoGBaSxEdg9FQAEAQicKAoOtC8fs8fBgEAOw==)
-	/* background-image: url(images/webif-asc.gif); */
+	/* background-image: url(images/green-asc.gif); */
 }
 .tablesorter-webif thead .headerSortDown .tablesorter-header-inner,
 .tablesorter-webif thead .tablesorter-headerSortDown .tablesorter-header-inner,
 .tablesorter-webif thead .tablesorter-headerDesc .tablesorter-header-inner {
 	background-image: url(data:image/gif;base64,R0lGODlhEAAQANUAAFWWUzRUMw1EChqKFQxCCiO8HSCqGhyUFxVvERRpECGyHB+mGhiAFAs5CSu+JTHAKyynKCuhJzXCMDbCMD3EOELFPSl7JkvIRjycOFDKS1LKTVPLT1XLUF7OWXXVcYXagmmUZ112XCJEIEdjRf///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACQALAAAAAAQABAAAAY4QJJwSCwaj8ikcskkghKGimbD6Xg+AGOIMChIKJcMBjlqMBSPSUQZEBwcEKYIsWiSLPa8fs9HBgEAOw==)
-	/* background-image: url(images/webif-desc.gif); */
+	/* background-image: url(images/green-desc.gif); */
 }
 .tablesorter-webif th.tablesorter-header .tablesorter-header-inner,
 .tablesorter-webif td.tablesorter-header .tablesorter-header-inner {
@@ -78,25 +80,28 @@
  you'll need to add additional lines for
  rows with more than 2 child rows
  */
+.tablesorter-webif tbody > tr.hover > td,
 .tablesorter-webif tbody > tr:hover > td,
 .tablesorter-webif tbody > tr:hover + tr.tablesorter-childRow > td,
 .tablesorter-webif tbody > tr:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td,
+.tablesorter-webif tbody > tr.even.hover > td,
 .tablesorter-webif tbody > tr.even:hover > td,
 .tablesorter-webif tbody > tr.even:hover + tr.tablesorter-childRow > td,
 .tablesorter-webif tbody > tr.even:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
-	background: #f6ff5b;
+	background-color: #f6ff5b;
 }
+.tablesorter-webif tbody > tr.odd.hover > td,
 .tablesorter-webif tbody > tr.odd:hover > td,
 .tablesorter-webif tbody > tr.odd:hover + tr.tablesorter-childRow > td,
 .tablesorter-webif tbody > tr.odd:hover + tr.tablesorter-childRow + tr.tablesorter-childRow > td {
-	background: #f6ff5b;
+	background-color: #f6ff5b;
 }
 
 /* table processing indicator */
 .tablesorter-webif .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
@@ -133,12 +138,15 @@
 
 /* caption */
 caption {
-	background: #fff;
+	background-color: #fff;
 }
 
 /* filter widget */
+.tablesorter-webif .tablesorter-filter-row {
+	background-color: #eee;
+}
 .tablesorter-webif .tablesorter-filter-row td {
-	background: #eee;
+	background-color: #eee;
 	line-height: normal;
 	text-align: center; /* center the input */
 	-webkit-transition: line-height 0.1s ease;
@@ -174,10 +182,11 @@ caption {
 	filter: alpha(opacity=0);
 }
 /* filters */
-.tablesorter-webif .tablesorter-filter {
+.tablesorter-webif input.tablesorter-filter,
+.tablesorter-webif select.tablesorter-filter {
 	width: 98%;
 	height: auto;
-	margin: 4px;
+	margin: 0;
 	padding: 4px;
 	background-color: #fff;
 	border: 1px solid #bbb;

webif/html/lib/jquery.plugin/tablesorter2/webif-theme.diff

@@ -0,0 +1,16 @@
+--- theme.green.css
++++ theme.webif.css
+-  Green Theme
++  Webif Theme
+-	width: 100%;
++	/*width: 100%;*/
+-	font: 12px/18px Arial, Sans-serif;
++	/*font: 12px/18px Arial, Sans-serif;*/
+-	background-color: #d9d9d9;
++	background-color: #f6ff5b;
+-	background-color: #bfbfbf;
++	background-color: #f6ff5b;
+-	background-color: #ebfaeb;
++	background-color: #ccff99;
+-	background-color: #fff;
++	background-color: #ffffcc;

webif/lib/auto/plugin/decrypt/queue.hook

@@ -140,7 +140,9 @@ proc ::decrypt::dequeue {q ts} {
 	log "  Removing/binning old copy." 0
 	# Move the old recording to the bin if undelete is installed.
 	if {$::auto::dustbin ne ""} {
+		log "  finding bin for $file" 0
 		set bin [_del_bindir $file "webif_autodecrypt"]
+		log "  bin = ($bin)" 0
 		set tail [file tail $rfile]
 		file rename "$rfile.encrypted" "$bin/$tail.ts"
 		foreach ext {nts hmt thm} {

webif/lib/safe_delete

@@ -16,6 +16,7 @@ if {![exists -proc _del_bindir]} {
 		if {$prefix ne ""} { append lbin "/$prefix" }
 		set dir [file dirname $file]
 		regsub "^[system mediaroot]" $dir $lbin ndir
+		regsub "^[file normalize [system mediaroot]]" $dir $lbin ndir
 		if {$dir eq $ndir} { set ndir $lbin }
 		system mkdir_p $ndir
 		return $ndir

webif/lib/system.class

@@ -94,9 +94,13 @@ proc {system fhtcpversion} {} {{ver ""}} {
 	return $ver
 }
 
-# c0400           System ID
-# c8c00           MAC address
-# cb800           Serial Number
+#  :c0400	System ID
+# 4:c8400	read 1128 bytes
+# 3:c8c00	MAC address
+# 2:c9000
+# 1:cb400	DTCP key material
+# 0:cb800	Serial Number
+# 5:cbc00
 
 proc {system systemid} {} {{id ""}} {
 	if {$id ne ""} { return $id }