bweb: Update some GPL2 notice to AGPL

[bacula/bacula] / gui / bweb / cgi / bgraph.pl

diff --git a/gui/bweb/cgi/bgraph.pl b/gui/bweb/cgi/bgraph.pl
index 760e670a04d77fef6029871caec46b5f66d1b2b1..7407322dba4a5c3925973299c55d9a6b020ac373 100755 (executable)
--- a/gui/bweb/cgi/bgraph.pl
+++ b/gui/bweb/cgi/bgraph.pl
@@ -11,25 +11,24 @@ use strict;
    The main author of Bweb is Eric Bollengier.
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
-
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   Affero General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zurich,
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 
 =head1 VERSION
@@ -218,16 +217,20 @@ sub get_graph
                'x_number_format' => sub { strftime('%D', localtime($_[0])) },
                'x_tick_number' => 5*$arg->{width}/800,
                 'overwrite' => 1,
-                dclrs => [ add_colour("#afd8f8"), add_colour("#f6bd0f"),
+                dclrs => [ "lred", add_colour("#008e8e"), 
+                           add_colour("#afd8f8"), add_colour("#f6bd0f"),
                            add_colour("#8bba00"), add_colour("#ff8e46"),
-                           add_colour("#008e8e"), add_colour("#d64646"),
+                           add_colour("#d64646"),
                            add_colour("#8e468e"), add_colour("#588526"),
                            add_colour("#b3aa00"), add_colour("#008ed6"),
                            add_colour("#9d080d"), add_colour("#a186be"),
                 ],
                @options,
                );
-
+    if ($conf->{graph_font} && -f $conf->{graph_font}) {
+        $graph->set_title_font([$conf->{graph_font}], 12);
+        $graph->set_legend_font([$conf->{graph_font}], 11);
+    }
     return $graph;
 }
 
@@ -243,7 +246,7 @@ sub make_tab
     foreach my $row (@$all_row) {
        my $label = $row->[1] . "/" . $row->[2] ; # client/backup name
 
-       if ($arg->{level} eq 'All') {             # can separate level
+       if ($arg->{level} && $arg->{level} eq 'All') {  # can separate level
            $label = $row->[4] . ': ' . $label;   # if users ask for
        }
 
@@ -362,7 +365,7 @@ $limitq
 }
 
 # it works only with postgresql at this time
-# we dont use $jobt because we use File, so job is in Job table
+# we don't use $jobt because we use File, so job is in Job table
 elsif ($graph eq 'file_histo' and $arg->{where}) {
     
     my $dir  = $dbh->quote(dirname($arg->{where}) . '/');