updates

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

webif/html/diag/diag.jim

@@ -101,6 +101,7 @@ util "reset" "reset" "CFW Reset" "#" "<br><span id=resetresult></span>"
 util "shredder" "rma" "RMA" "#" "<br><span id=rmaresult></span>"
 
 util "bluering" "reboot" "Reboot System" "/restart/"
+util "maint" "maint" "Maintenance Mode" "#" "<br><span id=maintresult></span>"
 
 eval_plugins diag
 
@@ -206,6 +207,24 @@ puts {
 		traces of the Custom Firmware remaining.
 	</div>
 </div>
+
+<div id=maintconfirm class=hidden xtitle="Maintenance Mode">
+	<div class=va>
+		<img class=va src=/img/maint.png height=50>
+		<span class="va blood">
+			<i>Maintenance Mode on next boot is currently
+			<b><span class=cur></span></b></i>
+		</span>
+	</div><div>
+		Maintenance Mode allows you to start up your Humax
+		into a mode where the neither the standard Humax software
+		nor the custom firmware packages are running. 
+		<br><br>
+		This mode is primarily intended to be used for checking
+		and repairing the hard disk or for modifying files which
+		are locked in normal operation.
+	</div>
+</div>
 }
 
 footer

webif/html/diag/rpc.jim

@@ -10,6 +10,7 @@ set files {
 	safe	"/var/lib/humaxtv/mod/safemode"
 	reset	"/var/lib/humaxtv/mod/_RESET_CUSTOM_FIRMWARE_ENVIRONMENT"
 	rma	"/var/lib/humaxtv_backup/.rma"
+	maint	"/var/lib/humaxtv/mod/maintenance.boot"
 }
 
 if {$act eq "getall"} {
@@ -29,7 +30,13 @@ if {$opt ni $files} {
 }
 
 switch $act {
-    set { file touch $files($opt) }
+    set {
+	if {$opt eq "maint"} {
+		file write $files($opt) "2"
+	} else {
+		file touch $files($opt)
+	}
+    }
     unset { file delete $files($opt) }
     get { puts -nonewline [file exists $files($opt)] }
 }

webif/html/diag/script.js

@@ -55,7 +55,7 @@ $.getJSON('/diag/rpc.jim?act=getall', function(data) {
 });
 
 
-$('#safe,#reset,#rma').on('click', function(e) {
+$('#safe,#reset,#rma,#maint').on('click', function(e) {
 	e.preventDefault();
 
 	opt = $(this).attr('id');

webif/html/diag/style.css

@@ -20,7 +20,7 @@ span.label
 	font-weight: bold;
 }
 
-#saferesult, #rmaresult, #resetresult
+#saferesult, #rmaresult, #resetresult, #maintresult
 {
 	font-style: italic;
 	color: #ff4000;

webif/html/restart/index.jim

@@ -50,11 +50,27 @@ intervention.
 
 }
 
-puts "
+puts {
 </div>
 
 <div class=cleft>
-"
+<div id=warn_safe class="hidden va">
+<h3><img class=xicon src=/img/safe.png>
+System will start in safe mode on next boot.</h3>
+</div>
+<div id=warn_reset class="hidden va">
+<h3><img class=xicon src=/img/reset.png>
+All custom firmware packages and settings will be removed on next boot.</h3>
+</div>
+<div id=warn_rma class="hidden va">
+<h3><img class=xicon src=/img/rma.png>
+RMA Mode will be entered on next boot.</h3>
+</div>
+<div id=warn_maint class="hidden va">
+<h3><img class=xicon src=/img/maint.png>
+Maintenance mode will be entered on next boot.</h3>
+</div>
+}
 
 if {[system busy]} {
 	puts "<div class=blood>

webif/html/restart/script.js

@@ -41,5 +41,12 @@ $('#restart_status').load('/cgi-bin/status.jim?schedtime=7200', function() {
 
 $('#restart_humaxtv').button('disable').hide();
 
+$.getJSON('/diag/rpc.jim?act=getall', function(data) {
+	$.each(data, function(k, v) {
+		if (v == '1')
+			$('#warn_' + k).show();
+	});
+});
+
 });
 

webif/html/restart/style.css

@@ -10,3 +10,10 @@ div.cleft
 	margin: 0 0 1em 0;
 }
 
+.xicon
+{
+	vertical-align: middle;
+	height: 80px;
+	border: 0;
+}
+

webif/lib/rsv.class

@@ -531,7 +531,10 @@ proc {rsv construct} {event type} {
 			if {[set ecrid [$i get event_crid]] eq ""} continue
 			if {$ecrid in $seen} continue
 			lappend seen $ecrid
-			if {[$i get start] < [$event get start]} continue
+			if {[$i get start] < [$event get start]} {
+				set args(usLastRecordedEvtId) [$i get event_id]
+				continue
+			}
 			lappend events [rsv mkaul $i]
 			list "1$::ccrid$ecrid"
 		}]