From bf67161898578bfb77cc150732f42b0c6e43bd96 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Wed, 28 May 2014 21:29:10 +0000
Subject: [PATCH] various

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1922 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control             | 2 +-
 webif/cgi-bin/restart.jim   | 2 +-
 webif/html/browse/script.js | 8 +++++---
 webif/lib/bin/auto          | 5 +++++
 webif/lib/system.class      | 7 +++++++
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 0a5b350..cbf1e33 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.13-3
+Version: 1.0.13-4
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),mongoose
diff --git a/webif/cgi-bin/restart.jim b/webif/cgi-bin/restart.jim
index 563fb64..0295d46 100755
--- a/webif/cgi-bin/restart.jim
+++ b/webif/cgi-bin/restart.jim
@@ -45,7 +45,7 @@ puts {
 
 	$(document).ready(function() {
 		$('#progressbar').reportprogress(0);
-		handle = setInterval("update()", 350);
+		handle = setInterval("update()", 400);
 		$.get('/cgi-bin/restart.jim?now=yes');
 	});
 </script>
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index 9ec8a15..44268c1 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -291,13 +291,16 @@ function preparemenu(el, menu)
 		else
 			$(menu).disableContextMenuItems('#thm');
 
+		if (el.attr('shrunk') == 0)
+			$(menu).enableContextMenuItems('#strip');
+		else
+			$(menu).disableContextMenuItems('#strip');
+
 		if (el.attr('thmok') == 1)
 			$(menu).enableContextMenuItems('#vthm');
 		else
 			$(menu).disableContextMenuItems('#vthm');
 
-		$(menu).enableContextMenuItems('#strip');
-
 		if (el.attr('rsize') > 4294967296)
 			$(menu).enableContextMenuItems('#chunk');
 		else
@@ -309,7 +312,6 @@ function preparemenu(el, menu)
 		else
 			$(menu).changeContextMenuItem('#new', 'Mark new');
 
-
 		$(menu).enableContextMenuItems('#lock');
 		if (el.attr('locked') == 1)
 		{
diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto
index 030fd5a..f83173f 100755
--- a/webif/lib/bin/auto
+++ b/webif/lib/bin/auto
@@ -259,6 +259,11 @@ proc do_decrypt {ts} {
 		return
 	}
 
+	if {[$ts flag "Encrypted"]} {
+		log "  $file - Protected (Enc flag)." 2
+		return
+	}
+
 	lassign [$ts dlnaloc "127.0.0.1"] url
 	if {$url eq ""} {
 		log "  $file - Not yet indexed."
diff --git a/webif/lib/system.class b/webif/lib/system.class
index d3185ba..1e2d1f7 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -380,3 +380,10 @@ proc {system display} {hdr hd} {
 	}
 }
 
+proc {system uptime} {} {
+	set fd [open /proc/uptime r]
+	set uptime [lindex [split [read $fd]] 0]
+	$fd close
+	return $uptime
+}
+