From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 21 Oct 2008 12:03:02 +0000 (+0000)
Subject: ebl  Fix modification of new default_age option
X-Git-Tag: Release-3.0.0~739
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68e336bfbe202215e1a2f20606cad826633d5336;p=bacula%2Fbacula

ebl  Fix modification of new default_age option


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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 6da1b61378..76dd86408f 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -234,7 +234,7 @@ our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
 	      display_log_time => qr!^(on)?$!,
 	      enable_security => qr/^(on)?$/,
 	      enable_security_acl => qr/^(on)?$/,
-	      default_age => qr/^(?:\d+(?:[ywdhms]\s*)?)+\s*$/,
+	      default_age => qr/^((?:\d+(?:[ywdhms]\s*?)?)+)\s*$/,
 	      );
 
 =head1 FUNCTION
@@ -2048,7 +2048,7 @@ sub display_graph
 	%$fields,
     }, "graph.tpl");
 
-    if ($fields->{gtype} eq 'balloon') {
+    if ($fields->{gtype} and $fields->{gtype} eq 'balloon') {
 	system("./bgraph.pl");
     }
 }