From 602f96e1accb782b40a19e267c01a2b5eb77255d Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Sat, 14 Jan 2012 00:12:07 +0000
Subject: [PATCH] support variable dustbin name

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@663 2a923420-c742-0410-a762-8d5b09965624
---
 var/mongoose/cgi-bin/browse.jim | 4 +++-
 var/mongoose/lib/system.class   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim
index 5ee16542..57d56f20 100755
--- a/var/mongoose/cgi-bin/browse.jim
+++ b/var/mongoose/cgi-bin/browse.jim
@@ -30,13 +30,15 @@ if {$order eq "-"} {
 	[settings new] sortorder $order
 }
 
+set dustbin [system dustbin 1]
+
 proc directory {file bfile} {
 	global flatten
 
 	regsub -all " +" $bfile "" tbfile
 	puts "<div class=va>"
 	set img "/images/711_1_09_Media_Folder.png"
-	if {$bfile eq "_dustbin"} { set img "/img/Dustbin_Folder.png" }
+	if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" }
 	puts "<img border=0 class=va id=\"img$tbfile\" src=$img>"
 	puts "<input class=\"fs fsdir\" type=checkbox>"
 	puts "<a class=dbf
diff --git a/var/mongoose/lib/system.class b/var/mongoose/lib/system.class
index 9cbe0e44..5b01dfac 100644
--- a/var/mongoose/lib/system.class
+++ b/var/mongoose/lib/system.class
@@ -50,12 +50,13 @@ proc {system mediaroot} {} {
 	return ""
 }
 
-proc {system dustbin} {} {
+proc {system dustbin} {{short 0}} {
 	set dustbin "_dustbin"
 	if {![catch {set fd [open "/mod/boot/dustbin.name" r]}]} {
 		set dustbin [lindex [split [read $fd] "\n"] 0]
 		$fd close
 	}
+	if {$short} { return $dustbin }
 	return "[system mediaroot]/$dustbin"
 }