update webif

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

CONTROL/control

@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.18-8
+Version: 1.2.0
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.1.14),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(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.15),hmt(>=1.1.21),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),tcpping(>=1.1),e2fsprogs,mongoose
+Depends: webif-channelicons(>=1.1.14),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(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=1.2.0),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),tcpping(>=1.1),e2fsprogs,mongoose
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/5866/

webif/cgi-bin/channel.jim

@@ -73,7 +73,7 @@ foreach tw [$db query {
 			"BBC ONE HD" { set mux "PSB3/BBC B" }
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }
-			"Film4+1" { set mux "COM6/ARQ B" }
+			"ITV4" { set mux "COM6/ARQ B" }
 			"BBC NEWS HD" { set mux "COM7/ARQ C" }
 			"Movies4Men" { set mux "Local" }
 		}

webif/cgi-bin/epg/info.jim

@@ -72,10 +72,16 @@ puts "
 "
 
 if {[$record get warning] != ""} {
+	if {[$record get warning_mode]} {
+		set gcol red
+	} else {
+		set gcol blue
+	}
 	puts "
 	<tr>
 		<th>Warning</th>
-		<td>[$record get warning]</td>
+		<td><img class=va src=/img/Guidance_$gcol.png height=21>
+		    [$record get warning]</td>
 	</tr>
 	"
 }

webif/html/browse/file.jim

@@ -38,7 +38,17 @@ if {$type eq "ts"} {
 		puts "
 			<th>Guidance</th>
 			<td><img class=va
-			    src=/images/174_1_26_GuidancePolicy.png height=21>
+			    src=/img/Guidance_red.png height=21>
+			    [$ts get guidance]
+			</td>
+			</tr><tr>
+		"
+	}
+	if {[$ts flag "GGuidance"] > 0} {
+		puts "
+			<th>General Guidance</th>
+			<td><img class=va
+			    src=/img/Guidance_blue.png height=21>
 			    [$ts get guidance]
 			</td>
 			</tr><tr>

webif/html/browse/index.jim

@@ -221,7 +221,10 @@ proc entry {file} {{i 0}} {
 
 		# Guidance
 		if {[$ts flag "Guidance"] > 0} {
-			icon "/images/174_1_26_GuidancePolicy.png"
+			icon "/img/Guidance_red.png"
+		}
+		if {[$ts flag "GGuidance"] > 0} {
+			icon "/img/Guidance_blue.png"
 		}
 
 		# Indexed

webif/html/m/browse.jim

@@ -140,7 +140,10 @@ proc entry {file {i 0}} {
 
 		# Guidance
 		if {[$ts flag "Guidance"] > 0} {
-			icon "/images/174_1_26_GuidancePolicy.png"
+			icon "/img/Guidance_red.png"
+		}
+		if {[$ts flag "GGuidance"] > 0} {
+			icon "/img/Guidance_blue.png"
 		}
 
 		# Indexed

webif/lib/epg.class

@@ -23,7 +23,7 @@ if {[file exists $::epgdbpath]} {
 
 #  * service_id, event_id, start, duration, encrypted, name, text
 #  * warning, content code, content type,
-#  * event CRID, series CRID, rec CRID
+#  * event CRID, series CRID, rec CRID, warning mode
 
 class epg {
 	service_id 	0
@@ -34,6 +34,7 @@ class epg {
 	name		""
 	text		""
 	warning		""
+	warning_mode	0
 	content_code	0
 	content_type	""
 	event_crid	""
@@ -47,12 +48,14 @@ class epg {
 
 	sched_type	-1
 	rsv		0
+
 }
 
 epg method _parse {line} {
 	lassign [split $line "\t"] \
 	    service_id event_id start duration encrypted name text warning \
-	    content_code content_type event_crid series_crid rec_crid
+	    content_code content_type event_crid series_crid rec_crid \
+	    warning_mode
 }
 
 epg method percent {} {
@@ -218,6 +221,16 @@ epg method icon_set {{height 0}} {
 		    alt=\"$content_type\" title=\"$content_type\">"
 	}
 
+	if {$warning ne ""} {
+		if {$warning_mode} {
+			set icon "Guidance_red"
+		} else {
+			set icon "Guidance_blue"
+		}
+		lappend set "<img class=guidance src=/img/$icon.png $height
+		    alt=Guidance title=Guidance>"
+	}
+
 	$self process_sched
 	if {$sched_type == 1} {
 		lappend set \