From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 21 Oct 2008 12:43:00 +0000 (+0000)
Subject: ebl  Search also tpl on lang/<lang>/tpl/*.tpl
X-Git-Tag: Release-3.0.0~736
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a1e755539ad621f959fe9317c8597cfeffc6bf39;p=bacula%2Fbacula

ebl  Search also tpl on lang/<lang>/tpl/*.tpl


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7865 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 76dd86408f..a50453b93f 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -157,6 +157,7 @@ sub display
     my $lang = $self->{lang} || 'en';
     my $template = HTML::Template->new(filename => $tpl,
 				       path =>["$dir/$lang",
+                                               "$dir/$lang/tpl",
 					       $dir],
 				       die_on_bad_params => 0,
 				       case_sensitive => 0);
@@ -1820,10 +1821,10 @@ sub get_form
 	    my $value = CGI::param($i) || $opt_i{$i} ;
 	    if ($value =~ /^(\d+)$/) {
 		$ret{$i} = $1;
-	    } elsif ($value eq 'age' &&  # can have unit
-		     $i =~ /^(?:\d+(?:[ywdhms]\s*)?)+\s*$/) # 2y1h2m34s
+	    } elsif ($i eq 'age' &&  # can have unit
+		     $value =~ /^(?:\d+(?:[ywdhms]\s*)?)+\s*$/) # 2y1h2m34s
 	    {
-		$ret{$i} = human_sec_unit($i);
+		$ret{$i} = human_sec_unit($value);
 	    }
 	} elsif ($opt_s{$i}) {	# simple string param
 	    my $value = CGI::param($i) || '';