bacula-web: Added last 24 hours stored files to main dashboard

 - added last 24 hours stored files
 - changed some variable name (more lisible now)
 - some php code improvments

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index 67b7af81fb897c386d465bc4aa7944e8b4aeff38..e9a0e4cc555e862d718bf4d46b9ded912d4eeddd 100644 (file)
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -71,7 +71,7 @@ $last24bytes = "";
 $query = "";
 
 // Stored files number 
-$totalfiles = $dbSql->GetStoredFiles();
+$totalfiles = $dbSql->GetStoredFiles( ALL );
 $smarty->assign('stored_files',$totalfiles);
   
 // Database size
@@ -83,7 +83,12 @@ $smarty->assign('stored_bytes', $dbSql->human_file_size($result['stored_bytes'])
 
 // Total stored bytes since last 24 hours
 $result = $dbSql->GetStoredBytes( LAST_DAY );
-$smarty->assign('bytes_totales', $dbSql->human_file_size($result['stored_bytes']) );
+$smarty->assign('bytes_last', $dbSql->human_file_size($result['stored_bytes']) );
+
+// Total stored files since last 24 hours
+$files_last = $dbSql->GetStoredFiles( LAST_DAY );
+$smarty->assign('files_last', $files_last );
+
 
 // Number of clients
 $nb_clients = $dbSql->Get_Nb_Clients();

diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index cc1567bf53b3ac7e367c25d0302bab233ffe3930..b31f1d3a43d968f215d94192fc38780bc202b1d4 100644 (file)
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -109,7 +109,11 @@
                        </tr>
                        <tr>
                                <td class="label">Transferred Bytes</td> 
-                               <td class="info">{$bytes_totales}</td>
+                               <td class="info">{$bytes_last}</td>
+                       </tr>
+                       <tr>
+                               <td class="label">Transferred Files</td> 
+                               <td class="info">{$files_last}</td>
                        </tr>
                </table>
   </div> <!-- end div box -->