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 6092af20582b1b1d463e0b0c166644d04e6f7d8a..4feb1d31661777c879820b92cd76644d586aeb76 100755 (executable)
--- 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 0d19c66519b63f05f8afd49decaef7200f11daab..26716e26a1897a7d851b66ea1bdf32dea2cd26fe 100644 (file)
--- 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 0f00cca7cbb9aa79bf49aa60d4364f112a80679e..f4feac6e5383a66e436c0720cea1ee8443120bde 100644 (file)
--- 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