bug fixes

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

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.4-6
+Version: 1.2.4-7
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons(>=1.1.18),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.7),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,recmon(>=2.0.7)

webif/html/browse/index.jim

@@ -204,6 +204,7 @@ proc entry {file} {{i 0}} {
 	}
 
 	# Indexed
+	set dlna 0
 	if {$::dlnaok && $::model eq "HDR" && [llength [
 	    system dlnaurl [file normalize $file]]]} {
 		icon "/img/dlna.png" "Indexed by DLNA Server"

webif/lib/safe_delete

@@ -75,6 +75,9 @@ if {![exists -proc _del_bindir]} {
 
 		if {$dustbin} {
 			set nfile "[_del_bindir $file $px]/[file tail $file]"
+			while {[file exists $nfile]} {
+				append nfile "_"
+			}
 			file rename $file $nfile
 			_del_touch $nfile
 		} else {