webif updates

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

CONTROL/control

@@ -1,9 +1,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.2
+Version: 1.0.3
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.0.5),mongoose(>=3.0-8),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,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),stripts(>=1.2.1),smartmontools,tmenu(>=1.05),ffmpeg,id3v2
+Depends: webif-channelicons(>=1.0.6),mongoose(>=3.0-9),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,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),stripts(>=1.2.1),smartmontools,tmenu(>=1.05),ffmpeg,id3v2
 Suggests:
 Description: An evolving web interface for the Humax.

CONTROL/postinst

@@ -6,25 +6,22 @@ export tmpf=/tmp/cronf.$$
 
 # Add cron jobs
 
-crond=$PKG_ROOT/var/spool/cron/crontabs
-[ -d $crond ] || exit 1
-
-cronf=$crond/root
-grep -v webif/lib/bin/auto $cronf > $tmpf
-(
-	cat $tmpf
-	echo '*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1'
-) > $cronf
+crontab=$PKG_ROOT/bin/crontab
+if [ -x $crontab ]; then
+	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
+	cat $tmpf - << EOM | $crontab -
+*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1
+EOM
+fi
 
 # Add anacron jobs
 
 ana=$PKG_ROOT/etc/anacrontab
-egrep -v 'backup/backup.jim|diskattrs' $ana > $tmpf
-(
-	cat $tmpf
-	echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim"
-	echo "1 5 diskattrs /mod/webif/lib/bin/diskattrs"
-) > $ana
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
+cat $tmpf - << EOM > $ana
+1 8 sched_backup /mod/webife/cgi-bin/backup/backup.jim
+1 5 diskattrs /mod/webif/lib/bin/diskattrs
+EOM
 
 $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
 
@@ -41,5 +38,7 @@ fi
 
 /mod/webif/lib/bin/diskattrs
 
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

CONTROL/prerm

@@ -2,16 +2,17 @@
 
 export tmpf=/tmp/cronf.$$
 
-cronf=$PKG_ROOT/var/spool/cron/crontabs/root
-if [ -f $cronf ]; then
-	grep -v webif/lib/bin/auto $cronf > $tmpf
-	cp $tmpf $cronf
-	[ -s $cronf ] || rm -f $cronf
+crontab=$PKG_ROOT/bin/crontab
+if [ -x $crontab ]; then
+	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
+	[ -s $tmpf ] && $crontab $tmpf || $crontab -r
 fi
 
 ana=/mod/etc/anacrontab
-egrep -v 'backup/backup.jim|diskattrs' $ana > $tmpf
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
 cp $tmpf $ana
 
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

var/mongoose/cgi-bin/xepg.jim

@@ -123,7 +123,7 @@ foreach e $records {
 
 		puts "[$e channel_icon 30] "
 		puts "$chnum
-	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
+	    <a href=\"/cgi-bin/epg/service.jim?service=[$e get service_id]\"
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"

var/mongoose/html/browse/assets.jim

@@ -268,7 +268,7 @@ puts {
 		</label>
 	</th>
 	<td>
-		<input type=text name="aexpiry_days" id="aexpiry_days"
+		<input name="aexpiry_days" id="aexpiry_days"
 		    type=number value=0 size=5 maxlength=3
 		    class="text ui-widget-content ui-corner-all">
 	</td>

var/mongoose/html/browse/index.jim

@@ -268,7 +268,7 @@ set stub ""
 foreach part [split $dir /] {
 	if {$stub eq "/"} { set name $part } else { set name "/$part" }
 	append stub $name
-	puts "<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $stub]>$name</a>
+	puts "<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $stub]\">$name</a>
 }
 puts "<span class=filesize id=dirsize></span>"
 puts "</legend>"
@@ -278,7 +278,7 @@ set parent [join [lrange [split $dir /] 0 end-1] /]
 if {$parent ne ""} {
 	puts "
 	    <div class=va>
-		<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $parent]>
+		<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $parent]\">
 		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
 			\[parent directory\]</a>
 	    </div>
@@ -337,7 +337,7 @@ foreach sl $sortlist {
 	set tag "Currently sorting"
 	if {$order != $index} {
 		puts "
-		    <a href=$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index>"
+	    <a href=\"$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index\">"
 		set tag "Sort"
 	}
 	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"

var/mongoose/html/favicon.ico

@@ -0,0 +1 @@
+img/fav/favicon.ico

var/mongoose/html/img/fav/notes.txt

@@ -0,0 +1,6 @@
+<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 64x64" type=image/vnd.microsoft.icon />
+<link rel="apple-touch-icon" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="57x57" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="72x72" href="/img/fav/72.png" />
+<link rel="apple-touch-icon" sizes="114x114" href="/img/fav/114.png" />
+<link rel="apple-touch-icon" sizes="144x144" href="/img/fav/144.png" />

var/mongoose/html/lib/header.jim

@@ -11,7 +11,13 @@ source /mod/webif/include/model.jim
 puts {
 </title>
 <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
-<link rel="shortcut icon" href=/img/favicon.ico />
+<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 64x64"
+    type="image/vnd.microsoft.icon" />
+<link rel="apple-touch-icon" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="57x57" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="72x72" href="/img/fav/72.png" />
+<link rel="apple-touch-icon" sizes="114x114" href="/img/fav/114.png" />
+<link rel="apple-touch-icon" sizes="144x144" href="/img/fav/144.png" />
 <link type="text/css" href="/lib/jquery.ui/css/custom-theme/jquery-ui.css"
     rel="Stylesheet" />     
 <link href="/css/style.css" rel="Stylesheet" type="text/css" />

var/mongoose/html/pkg/index.shtml

@@ -42,15 +42,15 @@
 <div id=pkgtabs>
 <ul>
 	<li>
-		<a class=tablink href=pkg.jim?type=inst>
+		<a class=tablink href="pkg.jim?type=inst">
 		<span>Installed</span>
 		</a>
 	</li><li>
-		<a class=tablink href=pkg.jim?type=avail>
+		<a class=tablink href="pkg.jim?type=avail">
 		<span>Available</span>
 		</a>
 	</li><li>
-		<a class=tablink href=pkg.jim?type=upgr>
+		<a class=tablink href="pkg.jim?type=upgr">
 		<span>Upgrades</span>
 		</a>
 	</li>

var/mongoose/html/sched/script.js

@@ -147,8 +147,7 @@ function preparemenu(el, menu)
 	else
 		$('#optmenu').disableContextMenuItems('#ar');
 
-	if ($(el).attr('table') != 'pending' && (
-	    $(el).attr('reckind') == 4 || $(el).attr('reckind') == 1))
+	if ($(el).attr('table') != 'pending' && $(el).attr('reckind') == 4)
 		$('#optmenu').enableContextMenuItems('#folder');
 	else
 		$('#optmenu').disableContextMenuItems('#folder');

var/mongoose/include/epg.jim

@@ -57,7 +57,8 @@ foreach record $records {
 		puts "<td>$chnum</td>"
 		puts "<td>[$record channel_icon 50]</td>
 		    <td>
-	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
+	    <a href=\"/cgi-bin/epg/service.jim?service=[\
+		$record get service_id]\">
 		    [$record get channel_name]
 		    </a></td>"
 		set lcn $chnum

var/mongoose/lib/bin/auto

@@ -41,10 +41,13 @@ proc endclock {size} {
 	return "[pretty_size $size] in $el seconds - [pretty_size $rate]/s"
 }
 
-set modules {dedup decrypt shrink mpg mp3 expire}
+set modules {decrypt dedup shrink mpg mp3 expire}
+
 foreach mod $modules {
+	set "hook_pre${mod}scan" {}
 	set "hook_pre$mod" {}
 	set "hook_post$mod" {}
+	set "hook_post${mod}scan" {}
 }
 
 proc register {type fn} {
@@ -542,7 +545,9 @@ if {[llength $argv] > 0} {
 } else {
 	foreach arg $modules {
 		set st [clock milliseconds]
+		runplugin "pre${arg}scan" 0
 		scan $root $arg
+		runplugin "post${arg}scan" 0
 		log "$arg scan completed in [elapsed $st] seconds."
 	}
 }

var/mongoose/lib/epg_search

@@ -31,7 +31,7 @@ puts ">
 "
 
 proc cts {type img text} {
-	puts "<a href=/cgi-bin/epg/search.jim?ct=$type>
+	puts "<a href=\"/cgi-bin/epg/search.jim?ct=$type\">
 		<img height=18 border=0 src=/images/173_3_00_G3_$img.png>
 		&nbsp;$text</a>";
 }
@@ -96,7 +96,8 @@ if {[llength $res] > 0} {
 		set kw [string range [lindex $keyword 1] 1 end]
 		# Clean the keyword string.
 		regexp -nocase {^(\w+)} $kw kw
-		puts "<td><a href=/cgi-bin/epg/search.jim?term=[cgi_quote_url $kw]>$kw
+		puts "<td><a href=\"/cgi-bin/epg/search.jim?term=[\
+		    cgi_quote_url $kw]\">$kw
 		    </a></td>"
 	}
 	puts "