ebl fix mediatype in display_pool

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

diff --git a/gui/bweb/cgi/bconsole.pl b/gui/bweb/cgi/bconsole.pl
index 923ba014eb401894ad2400865ec4812027ec5083..a169dd730c62da2a05079a3493259fb774d229ef 100755 (executable)
--- a/gui/bweb/cgi/bconsole.pl
+++ b/gui/bweb/cgi/bconsole.pl
@@ -9,22 +9,34 @@ use strict;
 
 =head1 LICENSE
 
-    Copyright (C) 2006 Eric Bollengier
-        All rights reserved.
+   Bweb - A Bacula web interface
+   Bacula® - The Network Backup Solution
 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    any later version.
+   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
 
-    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.
+   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.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   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.
+
+   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.
+
+   You should have received a copy of the GNU 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.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zurich,
+   Switzerland, email:ftf@fsfeurope.org.
 
 =head1 VERSION
 
@@ -40,7 +52,7 @@ use File::Temp qw/tempfile/;
 use Bweb;
 use Bconsole;
 
-my $conf = new Bweb::Config(config_file => '/etc/bweb/config');
+my $conf = new Bweb::Config(config_file => $Bweb::config_file);
 $conf->load();
 
 my $bweb = new Bweb(info => $conf);
@@ -73,8 +85,8 @@ for my $a (@action)
     } elsif ($a eq 'run' and $have_run==0) {
        $have_run=1;
 
-       my $arg = $bweb->get_form(qw/job client storage fileset 
-                                    replace priority/);
+       my $arg = $bweb->get_form(qw/job client storage fileset regexwhere
+                                    where replace priority/);
 
        my $bootstrap = CGI::param('bootstrap');
        
@@ -95,6 +107,7 @@ for my $a (@action)
                                   storage   => $arg->{storage},
                                   fileset   => $arg->{fileset},
                                   where     => $arg->{where},
+                                  regexwhere => $arg->{regexwhere},
                                   replace   => $arg->{replace},
                                   priority  => $arg->{priority},
                                   bootstrap => $filename);