]> git.sur5r.net Git - bacula/bacula/commitdiff
ebl Fix modification of new default_age option
authorEric Bollengier <eric@eb.homelinux.org>
Tue, 21 Oct 2008 12:03:02 +0000 (12:03 +0000)
committerEric Bollengier <eric@eb.homelinux.org>
Tue, 21 Oct 2008 12:03:02 +0000 (12:03 +0000)
git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7862 91ce42f0-d328-0410-95d8-f526ca767f89

gui/bweb/lib/Bweb.pm

index 6da1b61378c5b6414a6337d951eba338bbb0232c..76dd86408fc3479ea1cf3f48bd2303f0a1498e37 100644 (file)
@@ -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");
     }
 }