diff --git a/CONTROL/control b/CONTROL/control index a41b1e7..f4ad67b 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.2.1-2 +Version: 1.2.1-4 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.14),lighttpd(>=1.4.35-2),jim(>=0.76),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.0),hmt(>=2.0.3),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,wireless-tools(>=29-1),dbupdate,mongoose,recmon(>=2.0.2) diff --git a/webif/html/dedup/dedup b/webif/html/dedup/dedup index 1f665de..12e42b0 100755 --- a/webif/html/dedup/dedup +++ b/webif/html/dedup/dedup @@ -31,7 +31,7 @@ foreach dir $dirs { foreach file [lsort -command dedupsort [readdir $dir]] { if {[file extension $file] ne ".nts"} { continue } - set file "$dir/[file rootname $file].hmt" + set file "[file rootname $file].hmt" set base [file tail [file rootname $file]] lassign [dedupprocess $file] stat ts syn fn diff --git a/webif/html/dedup/dedup.jim b/webif/html/dedup/dedup.jim index 5c7a37f..55347f7 100755 --- a/webif/html/dedup/dedup.jim +++ b/webif/html/dedup/dedup.jim @@ -32,7 +32,7 @@ foreach file [lsort -command dedupsort [readdir $dir]] { set file "$dir/$file" if {[file extension $file] ne ".nts"} { continue } - set file "$dir/[file rootname $file].hmt" + set file "[file rootname $file].hmt" if {$reset} { set ts [ts fetch $file 1] diff --git a/webif/html/dedup/process.jim b/webif/html/dedup/process.jim index 3c548e6..eb11ba1 100755 --- a/webif/html/dedup/process.jim +++ b/webif/html/dedup/process.jim @@ -3,7 +3,8 @@ require system.class proc dedupsort {a b} { - return [expr [file mtime $a] > [file mtime $b]] + global dir + return [expr [file mtime "$dir/$a"] > [file mtime "$dir/$b"]] } proc dedupprocess {file} {{seen {}}} { diff --git a/webif/html/lib/jquery.plugin/tablesorter2/theme.webif.css b/webif/html/lib/jquery.plugin/tablesorter2/theme.webif.css index be84902..7d088e2 100644 --- a/webif/html/lib/jquery.plugin/tablesorter2/theme.webif.css +++ b/webif/html/lib/jquery.plugin/tablesorter2/theme.webif.css @@ -11,7 +11,7 @@ } .tablesorter-webif th, .tablesorter-webif td { - font: 12px/18px Arial, Sans-serif; + /*font: 12px/18px Arial, Sans-serif;*/ border: #cdcdcd 1px solid; border-width: 0 1px 1px 0; }