From 034e9c159847153d87c1962655e0b70e954a0897 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Mon, 16 Jan 2017 22:23:00 +0000
Subject: [PATCH] more tweaks

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3568 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control             |  2 +-
 webif/cgi-bin/chanlist.jim  |  4 ++--
 webif/cgi-bin/favlist.jim   | 19 +++++++++++++++++++
 webif/html/browse/script.js |  7 +++----
 webif/lib/auto/deq          |  2 +-
 webif/lib/browse.class      |  4 ++--
 webif/lib/settings.class    |  6 +-----
 7 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100755 webif/cgi-bin/favlist.jim

diff --git a/CONTROL/control b/CONTROL/control
index fc8fcaad..7acfb07f 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.3.5-8
+Version: 1.3.5-9
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.24),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)
diff --git a/webif/cgi-bin/chanlist.jim b/webif/cgi-bin/chanlist.jim
index b28d6a51..76839a24 100755
--- a/webif/cgi-bin/chanlist.jim
+++ b/webif/cgi-bin/chanlist.jim
@@ -1,7 +1,7 @@
 #!/mod/bin/jimsh
 
 source /mod/webif/lib/setup
-require epg.class
+require epg.class json
 
 httpheader "application/json"
 
@@ -15,7 +15,7 @@ lmap i [$channeldb query "
 "] {
 	if {$::flag} { puts "," } else { incr ::flag }
 	lassign $i x lcn x name
-	puts -nonewline "  \"$lcn\": \"[system strip $name]\""
+	puts -nonewline "  \"$lcn\": \"[jescape [system strip $name]]\""
 }
 
 puts "\n}"
diff --git a/webif/cgi-bin/favlist.jim b/webif/cgi-bin/favlist.jim
new file mode 100755
index 00000000..de3a660a
--- /dev/null
+++ b/webif/cgi-bin/favlist.jim
@@ -0,0 +1,19 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require epg.class json
+
+httpheader "application/json"
+
+puts "{"
+set flag 0
+
+set i 0
+foreach grp [[settings] channel_groups] {
+	incr i
+	if {$::flag} { puts "," } else { incr ::flag }
+	puts -nonewline "  \"$i\": \"[jescape $grp]\""
+}
+
+puts "\n}"
+
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index a13ff14d..c8c3b459 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -345,7 +345,7 @@ function prepareomenu(el, menu)
 function fixdmenu(el, menu, flag, tag, descr, recurse)
 {
 	var a = el.attr(flag);
-	var b = el.attr(flag + 'r');
+	var b = el.attr(flag + 'R');
 
 	if (a == undefined) a = 0;
 	if (b == undefined) b = 0;
@@ -359,13 +359,13 @@ function fixdmenu(el, menu, flag, tag, descr, recurse)
 	{
 		if (b > 0)
 		{
-			$(menu).changeContextMenuItem(tag + 'r',
+			$(menu).changeContextMenuItem(tag + 'R',
 			    'Disable Recursive ' + descr);
 			$(menu).disableContextMenuItems(tag);
 		}
 		else
 		{
-			$(menu).changeContextMenuItem(tag + 'r',
+			$(menu).changeContextMenuItem(tag + 'R',
 			    'Enable Recursive ' + descr);
 			$(menu).enableContextMenuItems(tag);
 		}
@@ -403,7 +403,6 @@ function flagdir(file, flag, iconset, output, options)
 		    .empty()
 		    .html('<img src=/img/spin.gif> Updating...')
 		    .load('/browse/iconset.jim', { file: file });
-		flag = flag.toLowerCase();
 		if ($(options).attr(flag) == '1')
 			$(options).attr(flag, 0);
 		else
diff --git a/webif/lib/auto/deq b/webif/lib/auto/deq
index e853df42..617d9dd7 100755
--- a/webif/lib/auto/deq
+++ b/webif/lib/auto/deq
@@ -176,7 +176,7 @@ for {set qq [::auto::pending]} {[llength $qq]} {set qq [::auto::pending]} {
 	::auto::dsc
 	::auto::oktorun
 
-	$q update RUNNING "Started"
+	$q update RUNNING "Started at [::auto::date]"
 
 	set ologprefix $::auto::logprefix
 	set ::auto::logprefix "$plugin:$::auto::logprefix"
diff --git a/webif/lib/browse.class b/webif/lib/browse.class
index 41a56e7f..31ae38b2 100644
--- a/webif/lib/browse.class
+++ b/webif/lib/browse.class
@@ -40,7 +40,7 @@ proc {dir iconset} {dir} {
 		set autoshrinkr 1
 		lappend icons [_addicon "/img/compressr.png" \
 		    "Recursive Auto-shrink"]
-		lappend attrs "autoshrinkr=1"
+		lappend attrs "autoshrinkR=1"
 	}
 
 	set autoshrink 0
@@ -62,7 +62,7 @@ proc {dir iconset} {dir} {
 		set autodecryptr 1
 		lappend icons [_addicon "/img/decryptr.png" \
 		    "Recursive Auto-decrypt"]
-		lappend attrs "autodecryptr=1"
+		lappend attrs "autodecryptR=1"
 	}
 
 	set autodecrypt 0
diff --git a/webif/lib/settings.class b/webif/lib/settings.class
index df260711..cc8fb071 100644
--- a/webif/lib/settings.class
+++ b/webif/lib/settings.class
@@ -288,11 +288,7 @@ settings method channel_groups {} {
 	$db close
 	foreach g $res {
 		set g $g(itemText)
-		if {[string index $g 0] == "\025"} {
-			lappend ret [string range $g 1 end]
-		} else {
-			lappend ret $g
-		}
+		lappend ret [system strip $g]
 	}
 	return $ret
 }