1.4.0 beta 2

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

CONTROL/control

@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.4.0
+Version: 1.4.0-1
 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)
+Depends: tcpfix,webif-channelicons(>=1.1.25),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)
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/7619/

webif/html/diag/queue/fetch.jim

@@ -8,6 +8,7 @@ httpheader "application/json"
 set s [settings]
 set autolast [$s autolast]
 set autofreq [$s autofreq]
+if {$autofreq == 0} { set autofreq 10 }
 puts "{"
 puts "  \"autofreq\": \"$autofreq\","
 puts "  \"autolast\": \"[clock format $autolast] ([clock format [expr \

webif/html/settings/modules/advanced/settings.hook

@@ -40,22 +40,8 @@ puts "
 	</tr>
 "
 
-puts -nonewline "
-	<tr>
-	<form class=auto id=logkeep method=get action=$env(SCRIPT_NAME)>
-		<th class=key>How many rotated logs to keep</th>
-		<td>
-			<input name=logkeep size=5 type=number
-			    class=\"text ui-widget-content ui-corner-all\"
-			    maxlength=10 value=\"$logkeep\">
-			<small>
-			<input value=\"set\" type=submit>
-			</small>
-			<div id=logkeep_output></div>
-		</td>
-	</form>
-	</tr>
-"
+setting_number logkeep "How many rotated logs to keep" $logkeep \
+    1 100
 
 if {[system modversion 1] >= 214} {
 	setting_toggle "Disable telnet menu?" "xtelnet" \

webif/html/settings/modules/auto/settings.hook

@@ -81,7 +81,7 @@ setting_number autokeep \
     "How many days should completed entries stay in the queue?" $autokeep \
     1 365
 
-setting_toggle "Show queue icon in toolbar?" "toolbarqueue" $toolbarqueue
+setting_toggle "Show queue icon in menu/toolbar?" "toolbarqueue" $toolbarqueue
 
 puts {
 </table></fieldset></div>

webif/include/menuicons.jim

@@ -3,23 +3,28 @@
 source /mod/webif/lib/setup
 require system.class settings.class plugin
 
+set settings [settings]
+
+set menuwrap 4
+
 proc menuitem {title icon link {width 217} {height 0} {extra ""}} {{num 0}} {
+	global menuwrap
 	if {$title eq "-reset"} {
 		set num 0
 		return
 	}
-	incr num
 	if {$title eq ""} return
-	if {$num > 4} {
-		puts {</div><div style="clear: both; padding-top: 1em">}
-		set num 1
-	}
+#	incr num
+#	if {$num > $menuwrap} {
+#		puts {</div><div style="clear: both; padding-top: 1em">}
+#		set num 1
+#	}
 	if {$extra ne ""} { append extra " " }
 	puts -nonewline "
 <div class=left num=$num>
 	<center>
 	<a href=$link>
-		<img src=$icon ${extra}border=0 "
+		<img class=mmenu src=$icon ${extra}border=0 "
 	if {$width} { puts -nonewline " width=$width" }
 	if {$height} { puts -nonewline " height=$height" }
 	puts -nonewline ">
@@ -34,8 +39,6 @@ proc menuitem {title icon link {width 217} {height 0} {extra ""}} {{num 0}} {
 "
 }
 
-set settings [settings]
-
 puts {<div style="clear: both">}
 
 menuitem "Browse Media Files" "/images/323_1_10_Menu_Video.png" \
@@ -63,6 +66,11 @@ menuitem "Settings" "/images/326_1_00_Menu_Settings.png" \
 menuitem "Diagnostics" "/img/diagnostics.png" \
 	/go/mm_diag 217 228
 
+if {[[settings] toolbarqueue]} {
+	menuitem "Queue" "/img/queuep.png" \
+	    "/go/mm_queue" 217 228
+}
+
 eval_plugins menu
 
 puts {</div>}

webif/include/toolbar.jim

@@ -40,7 +40,7 @@ tb "/img/packages.png" "Packages" "/go/mm_pkg"
 tb "/images/326_1_00_Menu_Settings.png" "Settings" "/go/mm_settings"
 tb "/img/diagnostics.png" "Diag" "/go/mm_diag"
 if {[[settings] toolbarqueue]} {
-	tb "/img/queuep.png" "Queue" "/go/mm_queue"
+	tb "/img/queuep128.png" "Queue" "/go/mm_queue"
 }
 eval_plugins toolbar
 

webif/lib/auto/plugin/decrypt/queue.hook

@@ -53,11 +53,17 @@ proc ::decrypt::dequeue {q ts} {
 		    "Already decrypted but the HMT flag was wrong (fixed)"}
 	}
 
+	lassign [$ts dlnaloc "127.0.0.1"] url
+
 	if {[$ts flag "Encrypted"]} {
-		return {"DEFER" "Protected (Enc flag)"}
+		#return {"DEFER" "Protected (Enc flag)"}
+		# Unset the flag but use the DLNA helper to decrypt
+		# this file since the DLNA database will be wrong.
+		log "  $file - ENC flag set, using helper."
+		$ts unenc
+		set url ""
 	}
 
-	lassign [$ts dlnaloc "127.0.0.1"] url
 	if {$url ne ""} {
 		log "  $file - has been indexed."
 		set helper 0

webif/lib/rsv.class

@@ -1017,9 +1017,8 @@ proc {rsv restore} {file} {
 
 		puts "    $chan"
 
-		if {[dict exists $chanmap $chan]} {
-			set hsvc $chanmap($chan)
-		} else {
+		set hsvc [get_channel_attr $szSvcName]
+		if {$hsvc eq ""} {
 			puts "        Cannot map channel name to service."
 			continue
 		}