From 82385710648dc74e13d92327bbfe9f75ff49315b Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Wed, 4 May 2016 21:14:29 +0000
Subject: [PATCH] swap MP3 icon hover over, remove epg -nosort

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2904 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                   | 2 +-
 webif/cgi-bin/epg/info.jim        | 2 +-
 webif/cgi-bin/epg/schedule.jim    | 2 +-
 webif/html/browse/script.js       | 4 ++--
 webif/html/sched/visual/index.jim | 2 +-
 webif/lib/epg.class               | 9 +++++++--
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index b008bb4..76bf369 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.3.0-2
+Version: 1.3.0-3
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.22-2),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.7),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)
diff --git a/webif/cgi-bin/epg/info.jim b/webif/cgi-bin/epg/info.jim
index 84c5465..af79ca9 100755
--- a/webif/cgi-bin/epg/info.jim
+++ b/webif/cgi-bin/epg/info.jim
@@ -13,7 +13,7 @@ set event [cgi_get event 0]
 if {![cgi_exists bare]} header else noheader
 
 set record [lindex [\
-    epg dbfetch dump -nosort 1 -service $service -event $event] 0]
+    epg dbfetch dump -service $service -event $event -sort ""] 0]
 $record get_channel_info
 set others [$record othertimes]
 
diff --git a/webif/cgi-bin/epg/schedule.jim b/webif/cgi-bin/epg/schedule.jim
index 1552245..5bd19b7 100755
--- a/webif/cgi-bin/epg/schedule.jim
+++ b/webif/cgi-bin/epg/schedule.jim
@@ -16,7 +16,7 @@ if {$service eq "-" || $event eq "-"} {
 }
 
 set event [lindex [\
-    epg dbfetch dump -nosort 1 -service $service -event $event] 0]
+    epg dbfetch dump -service $service -event $event -sort ""] 0]
 if {$event eq ""} {
 	puts "Error, cannot find event to schedule."
 	exit
diff --git a/webif/html/browse/script.js b/webif/html/browse/script.js
index 6326c3a..613a73c 100755
--- a/webif/html/browse/script.js
+++ b/webif/html/browse/script.js
@@ -900,9 +900,9 @@ if ($('img.mp3icon'))
 	$.getJSON('/browse/mp3.jim', {dir: dir}, function(data, status, xhr) {
 	    $.each(data, function(file, type) {
 		if (type == 'mp2')
-			alt = 'MPEG-1 Audio Layer III (MP3)';
-		else if (type == 'mp3')
 			alt = 'MPEG-1 Audio Layer II (MP2)';
+		else if (type == 'mp3')
+			alt = 'MPEG-1 Audio Layer III (MP3)';
 		else
 			alt = type;
 		$('a.bf[file$="/' + encodeURIComponent(file) + '"]')
diff --git a/webif/html/sched/visual/index.jim b/webif/html/sched/visual/index.jim
index 044292c..3a1407f 100755
--- a/webif/html/sched/visual/index.jim
+++ b/webif/html/sched/visual/index.jim
@@ -184,7 +184,7 @@ proc showevent {s class &overflow &tomorrow &pxpos start end usedhours daystart
 	}
 	if {$service > 0} {
 		set epgs [epg dbfetch dump \
-		    -nosort 1 -service $service -event $event]
+		    -service $service -event $event -sort ""]
 		if {[llength $epgs] == 1} {
 			lassign $epgs epg
 			set name [$epg get name]
diff --git a/webif/lib/epg.class b/webif/lib/epg.class
index 4c66a6d..d182e21 100644
--- a/webif/lib/epg.class
+++ b/webif/lib/epg.class
@@ -433,8 +433,13 @@ proc {epg dbfetch} {mode args} {
 				    "and e.end >= $v " }
 				-before { append q \
 				    "and e.start < $v " }
-				-sort { set sort "order by $v" }
-				-nosort { set sort "" }
+				-sort {
+					if {$v eq ""} {
+						set sort ""
+					} else {
+						set sort "order by $v"
+					}
+				}
 				-trange {
 					lassign [split $v :] stt ett
 					append q "and (e.start is null or