ebl first cup of user managment

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

diff --git a/gui/bweb/lang/es/tpl/config_edit.tpl b/gui/bweb/lang/es/tpl/config_edit.tpl
index 3c9b6900be99f072cf458419783a0183d150481e..de9dbb42ae5e5dc45a3bc19f0b21628fa4e30ebb 100644 (file)
--- a/gui/bweb/lang/es/tpl/config_edit.tpl
+++ b/gui/bweb/lang/es/tpl/config_edit.tpl
@@ -46,6 +46,8 @@
      <tr><td>display_log_time :</td>
          <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
          </td></tr>
+     <tr><td>security :</td> 
+         <td> <input class="formulaire" type='checkbox' name='enable_security' title='Use user managment in bweb. Read INSTALL first' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/lang/es/tpl/config_view.tpl b/gui/bweb/lang/es/tpl/config_view.tpl
index 7380b743d857aa316516fba8eb9ca6d9394941f9..31e39e7402ec09e4248829ed08091d583f020ecc 100644 (file)
--- a/gui/bweb/lang/es/tpl/config_view.tpl
+++ b/gui/bweb/lang/es/tpl/config_view.tpl
@@ -18,6 +18,7 @@
     <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/path/a/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
     <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
+    <tr><td>security :</td> <td> <TMPL_VAR enable_security> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Libreria</b></td>  <td/></tr>

diff --git a/gui/bweb/lang/fr/tpl/config_edit.tpl b/gui/bweb/lang/fr/tpl/config_edit.tpl
index 847c404059ad66ea4868737a867d066642c5b77a..123d499298ce6d0e79e3aaf773395c837ec2b259 100644 (file)
--- a/gui/bweb/lang/fr/tpl/config_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/config_edit.tpl
@@ -47,6 +47,8 @@
      <tr><td>display_log_time :</td>
          <td> <input class="formulaire" title="affiche les heures dans les logs" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> >
          </td></tr>
+     <tr><td>security :</td> 
+         <td> <input class="formulaire" type='checkbox' name='enable_security' title='Active la gestion des utilisateurs dans bweb. Lire le manuel avant.' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/lang/fr/tpl/config_view.tpl b/gui/bweb/lang/fr/tpl/config_view.tpl
index c179d74b810a2a3abd09450987e46d21743b96aa..0ad1d0e5fe3d74b1111142344cb32a071f22fbac 100644 (file)
--- a/gui/bweb/lang/fr/tpl/config_view.tpl
+++ b/gui/bweb/lang/fr/tpl/config_view.tpl
@@ -18,6 +18,7 @@
     <tr><td title="Vous pouvez utiliser une autre table que Job pour vos statistiques">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/chemin/vers/bconsole -n -c /chemin/vers/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
     <tr><td title="affiche les heures dans le log des jobs">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
+    <tr><td>security :</td> <td> <TMPL_VAR enable_security> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Robotique (Autochanger)</b></td>  <td/></tr>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 65da7f806135e565d34fe28fbd2a1f3dd639f216..59d1084b8f8dd898223b50dd0b033112b62c06cd 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -217,6 +217,7 @@ our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
              log_dir     => qr!^(.+)?$!,
              stat_job_table => qr!^(\w*)$!,
              display_log_time => qr!^(on)?$!,
+             enable_security => qr/^(on)?$/,
              );
 
 =head1 FUNCTION
@@ -345,7 +346,10 @@ sub modify
     my ($self) = @_;
     
     $self->{error} = '';
+    # we need to reset checkbox first
     $self->{debug} = 0;
+    $self->{enable_security} = 0;
+    $self->{display_log_time} = 0;
 
     foreach my $k (CGI::param())
     {
@@ -1444,7 +1448,9 @@ sub get_form
                 replace => 1,
                 expired => 1,
                 enabled => 1,
-                );
+                 username => 1,
+                 rolename => 1,
+                 );
     my %opt_p = (              # option with path
                 fileset=> 1,
                 mtxcmd => 1,
@@ -2764,7 +2770,7 @@ INSERT LocationLog (Date, Comment, MediaId, LocationId, NewVolStatus)
     $self->display({ email  => $self->{info}->{email_media},
                     url => $url,
                     newlocation => $newloc,
-                    # [ { volumename => 'vol1' }, { volumename => 'vol2' },..]
+                    # [ { volumename => 'vol1' }, { volumename => 'vol2'},..]
                     media => [ values %$media ],
                   },
                   "change_location.tpl");

diff --git a/gui/bweb/tpl/begin.tpl b/gui/bweb/tpl/begin.tpl
index e876123d8f8193bf562920a72cbfc076c231808a..a535a6b54050869f0eef31536c08305df79be1f6 100644 (file)
--- a/gui/bweb/tpl/begin.tpl
+++ b/gui/bweb/tpl/begin.tpl
@@ -59,7 +59,7 @@ if (navigator.appName == 'Konqueror') {
  <li> <a href="bweb.pl?action=about"> About </a> </li>
  <li style="padding: 0.25em 2em;float: right;">&nbsp;Logged as <TMPL_VAR NAME=loginname> </li>
  <li style="float: right;white-space: nowrap;">
-<input type="image" class="button" title="search media" onclick="search_media();" src="/bweb/tape.png"><input type="image" title="search client" onclick="search_client();" src="/bweb/client.png">&nbsp;<input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="search..." onclick="this.value='';" title="search media or client"></li>
+<input type="image" class="button" title="Search media" onclick="search_media();" src="/bweb/tape.png"><input type="image" title="Search client" onclick="search_client();" src="/bweb/client.png">&nbsp;<input class='formulaire' style="margin: 0 2px 0 2px; padding: 0 0 0 0;" id='searchbox' type='text' size='8' value="search..." onclick="this.value='';" title="Search media or client"></li>
 </ul>
 
 <form name="search" action="bweb.pl?" method='GET'>

diff --git a/gui/bweb/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index c918cf29885afad17cc10ab0b76d6598c24ae707..65b66dc499a085cac7c6378297319711a84d88f6 100644 (file)
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -46,6 +46,8 @@
      <tr><td>display_log_time :</td> 
          <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
+     <tr><td>security :</td> 
+         <td> <input class="formulaire" type='checkbox' name='enable_security' title='Use user managment in bweb. Read INSTALL first' <TMPL_IF enable_security> checked='checked' value='on' </TMPL_IF> > 
      <tr><td>debug :</td> 
          <td> <input class="formulaire" type='checkbox' name='debug' <TMPL_IF debug> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>

diff --git a/gui/bweb/tpl/config_view.tpl b/gui/bweb/tpl/config_view.tpl
index 5056458da267066bd9b71c9ad0b1ffc10ed21e56..0dd5cf8cdfabb050d1700ea115323a99cb6fd54f 100644 (file)
--- a/gui/bweb/tpl/config_view.tpl
+++ b/gui/bweb/tpl/config_view.tpl
@@ -18,6 +18,7 @@
     <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/path/to/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
     <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
+    <tr><td title="user managment">security :</td> <td> <TMPL_VAR enable_security> </td></tr>
     <tr><td>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Autochanger</b></td>  <td/></tr>