- Fixed mysql database size result. Reported by Roland Arendes

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

diff --git a/gui/bacula-web/ChangeLog b/gui/bacula-web/ChangeLog
index c9ed5a23a7e86cbcee68957c8b7cc2fd953ef116..19f847298e3e32e076a3d9dba703d114148994de 100644 (file)
--- a/gui/bacula-web/ChangeLog
+++ b/gui/bacula-web/ChangeLog
@@ -3,10 +3,12 @@
        - Updated French translation
        - Initial support for PostgreSQL (thanks to Dan Langille)
        - Upgrade Phplot to 5.0rc2 version.
-       - Add templates_c to cvs repository.
+       - Added templates_c to cvs repository.
+       - Added German translation
+       - Fix mysql database size (reported by Roland Arendes)
        
 25-10-2004 Bacula web 1.1
-    - Add array_fill function (as Mikael suggested)
+       - Add array_fill function (as Mikael suggested)
        - Fix url encode of links. (reported by Phil Stracchino) 
        - Upgrade Smarty to 2.6.6 version.
        - Add French translation        

diff --git a/gui/bacula-web/TODO b/gui/bacula-web/TODO
index c01d138d3900a60b6695596e9121dd32146b8b1e..a6ef5aa3cce9b36b554ec95d34b9b72a788498e3 100644 (file)
--- a/gui/bacula-web/TODO
+++ b/gui/bacula-web/TODO
@@ -1,3 +1,4 @@
+- Multi catalog
 - Improve check errors routines.
 - Improve security. (stats.php mainly)
 - Optimize database querys (Very poor now) (TO_DAYS,etc.).
@@ -11,7 +12,6 @@
 
 LOW PRIORITY
 ------------
-- Multi catalog
 - WebConsole!!!
 - Add support to PDF creation.
 - Build documentation of classes.

diff --git a/gui/bacula-web/classes.inc b/gui/bacula-web/classes.inc
index 9b4211b6443509a411cf0b3eab583c5d97b2304f..ad3a72a6f77250b525836cce0adb716399607ffa 100644 (file)
--- a/gui/bacula-web/classes.inc
+++ b/gui/bacula-web/classes.inc
@@ -124,8 +124,8 @@ class Bweb extends DB {
                         $dbsize = $this->link->query("show table status")
                                 or die ("classes.inc: Error query: 3");
                         if ( $dbsize->numRows() ) {
-                                while ( $res = $dbsize->fetchRow() )
-                                        $database_size += $res[5];
+                                while ( $res = $dbsize->fetchRow(DB_FETCHMODE_ASSOC) )
+                                        $database_size += $res["Data_length"];
                         }
                         else
                                 return 0;

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index 78c527309aebfacff064f0ec2c7ed063f0f9c492..cc13c78b4b9c0f31f7b788a5a86e5e23cb12fa82 100644 (file)
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -47,7 +47,7 @@ if ( $dbSql->driver == "pgsql")
 $bytes_stored =& $dbSql->link->getOne("select SUM(VolBytes) from Media")
         or die ("Error query: 4");
 
-$smarty->assign('database_size', $dbSql->GetDbSize()*1000000);
+$smarty->assign('database_size', $dbSql->GetDbSize());
 $smarty->assign('bytes_stored',$bytes_stored);
 
 $tmp = $client->fetchRow();