From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 20 Jan 2007 13:40:59 +0000 (+0000)
Subject: ebl  fv_write_path is optionnal now
X-Git-Tag: Release-2.0.2~55
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ede5a553adbe49048cdf964200145ebd8b665755;p=bacula%2Fbacula

ebl  fv_write_path is optionnal now


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

diff --git a/gui/bweb/cgi/bfileview.pl b/gui/bweb/cgi/bfileview.pl
index 6092af2058..4feb1d3166 100755
--- a/gui/bweb/cgi/bfileview.pl
+++ b/gui/bweb/cgi/bfileview.pl
@@ -79,8 +79,9 @@ unless ($where and $jobid) {
     exit 0;
 }
 
-unless (-w $base_fich) {
-    $bweb->error("$base_fich is not writable");
+unless ($base_fich and -w $base_fich) {
+    $bweb->error("fv_write_path ($base_fich) is not writable." . 
+		 " See Bweb configuration.");
     exit 0;
 }
 
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 0d19c66519..26716e26a1 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -207,7 +207,7 @@ use CGI;
 our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
 	      user     => qr/^([\w\d\.-]+)$/i,
 	      password => qr/^(.*)$/i,
-	      fv_write_path => qr!^([/\w\d\.-]+)$!,
+	      fv_write_path => qr!^([/\w\d\.-]*)$!,
 	      template_dir => qr!^([/\w\d\.-]+)$!,
 	      debug    => qr/^(on)?$/,
 	      email_media => qr/^([\w\d\.-]+@[\d\w\.-]+)$/,
diff --git a/gui/debian/changelog b/gui/debian/changelog
index 0f00cca7cb..f4feac6e53 100644
--- a/gui/debian/changelog
+++ b/gui/debian/changelog
@@ -1,5 +1,6 @@
 bweb (2.0.1-2) stable; urgency=low
 
+  * fv_write_path is optionnal now
   * fix /etc/bacula permissions
   * fix label_barcodes drive bug