From e3a76dd8ee57c9ebe42c9e01cc5d5a6ae3059a9f Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 1 Mar 2007 17:25:13 +0000
Subject: [PATCH] ebl  add display_log_time option

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4290 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/ReleaseNotes                | 4 ++++
 gui/bweb/lang/es/tpl/config_edit.tpl | 3 +++
 gui/bweb/lang/es/tpl/config_view.tpl | 1 +
 gui/bweb/lang/fr/tpl/config_edit.tpl | 3 +++
 gui/bweb/lib/Bweb.pm                 | 3 ++-
 gui/bweb/tpl/config_edit.tpl         | 3 +++
 gui/bweb/tpl/config_view.tpl         | 1 +
 7 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gui/bweb/ReleaseNotes b/gui/bweb/ReleaseNotes
index bd13e44736..f49bb2a0eb 100644
--- a/gui/bweb/ReleaseNotes
+++ b/gui/bweb/ReleaseNotes
@@ -1,4 +1,8 @@
           Release Notes for bweb 2.0
+
+2007/03/01
+ - Add display_time_log option to get timestamp in display_log
+
 2007/02/28
  - Add limit and offset params to display_log
 
diff --git a/gui/bweb/lang/es/tpl/config_edit.tpl b/gui/bweb/lang/es/tpl/config_edit.tpl
index 97fbc397f7..3c9b6900be 100644
--- a/gui/bweb/lang/es/tpl/config_edit.tpl
+++ b/gui/bweb/lang/es/tpl/config_edit.tpl
@@ -43,6 +43,9 @@
      <tr><td>bconsole :</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
+     <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>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 f3db685f63..7380b743d8 100644
--- a/gui/bweb/lang/es/tpl/config_view.tpl
+++ b/gui/bweb/lang/es/tpl/config_view.tpl
@@ -17,6 +17,7 @@
     <tr><td title="Este directorio debe tener permisos de escritura para el usuario apache y debe ser accesible en /bweb/fv">fv_write_path :</td> <td> <TMPL_VAR fv_write_path> </td></tr>
     <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>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 cd60610f21..847c404059 100644
--- a/gui/bweb/lang/fr/tpl/config_edit.tpl
+++ b/gui/bweb/lang/fr/tpl/config_edit.tpl
@@ -44,6 +44,9 @@
      <tr><td>bconsole :</td> 
          <td> <input class="formulaire" title="/chemin/vers/bconsole -n -c /chemin/vers/bconsole.conf" type='text' value='<TMPL_VAR NAME=bconsole>' size='64' name='bconsole'> 
          </td></tr>
+     <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>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/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d2679c825d..e0a445f7ac 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -216,6 +216,7 @@ our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
 	      syslog_file => qr!^(.+)?$!,
 	      log_dir     => qr!^(.+)?$!,
 	      stat_job_table => qr!^(\w*)$!,
+	      display_log_time => qr!^(on)?$!,
 	      );
 
 =head1 FUNCTION
@@ -2965,7 +2966,7 @@ sub get_job_log
         $arg->{limit} = 1000;
     }
 
-    my $t = CGI::param('time') || '';
+    my $t = CGI::param('time') || $self->{info}->{display_log_time} || '';
 
     my $query = "
 SELECT Job.Name as name, Client.Name as clientname
diff --git a/gui/bweb/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index b30a8bec19..c918cf2988 100644
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -43,6 +43,9 @@
      <tr><td>bconsole :</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
+     <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>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 f3c40546d6..5056458da2 100644
--- a/gui/bweb/tpl/config_view.tpl
+++ b/gui/bweb/tpl/config_view.tpl
@@ -17,6 +17,7 @@
     <tr><td title="This folder must be writable by apache user and must be accessible on /bweb/fv">fv_write_path :</td> <td> <TMPL_VAR fv_write_path> </td></tr>
     <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>debug :</td> <td> <TMPL_VAR debug> </td></tr>
     <TMPL_IF achs>
     <tr>  <td><b>Autochanger</b></td>  <td/></tr>
-- 
2.39.5