Rebuild configure

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

diff --git a/gui/bweb/cgi/bweb.pl b/gui/bweb/cgi/bweb.pl
index a6a14f6c624b408e173f2148a206748fadd490f8..8634bfa0183eb3c56d19a848e0001718a6e49c63 100755 (executable)
--- a/gui/bweb/cgi/bweb.pl
+++ b/gui/bweb/cgi/bweb.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 John Walker.
+   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
@@ -373,7 +372,7 @@ if ($action eq 'begin') {           # main display
 } elsif ($action eq 'client_stats') {
 
     foreach my $client (CGI::param('client')) {
-       if ($client =~ m/$client_re/) {
+       if ($client =~ $client_re) {
            $bweb->display_client_stats(clientname => $1,
                                        age => $arg->{age});
        }
@@ -382,7 +381,7 @@ if ($action eq 'begin') {           # main display
     $bweb->can_do('r_view_stat');
     print "<div><table border='0'><tr><td valign='top'>\n";
     my $fields = $bweb->get_form(qw/since age 
-                                    db_client_groups qclient_groups/); # drop this to hide 
+                                    db_client_groups qclient_groups/); 
     $fields->{action}='group_stats';
     $fields->{hide_level}=1;
     $fields->{hide_type}=1;
@@ -422,7 +421,7 @@ if ($action eq 'begin') {           # main display
     $bweb->can_do('r_client_status');
     my $b;
     foreach my $client (CGI::param('client')) {
-       if ($client =~ m/$client_re/) {
+       if ($client =~ $client_re) {
            $client = $1;
            $b = new Bconsole(pref => $conf) 
                unless ($b) ;
@@ -441,6 +440,9 @@ if ($action eq 'begin') {           # main display
 } elsif ($action eq 'cancel_job') {
     $bweb->cancel_job();
 
+} elsif ($action eq 'cancel_future_job') {
+    $bweb->cancel_future_job();
+
 } elsif  ($action eq 'media_zoom') {
     $bweb->display_media_zoom();