ebl Fix a bug in user edition

[bacula/bacula] / gui / bacula-web / index.php

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index e6bce4b619d642cae486b49dec04db881636d8ac..1e7486358132bc98c83b123f6c5cce356dc45ce8 100644 (file)
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -15,6 +15,7 @@
 +-------------------------------------------------------------------------+ 
 */
 // Last Err: 
+session_start();
 require ("paths.php");
 require($smarty_path."Smarty.class.php");
 include "classes.inc";
@@ -32,28 +33,43 @@ $mode = $smarty->get_config_vars("mode");
 
 require("lang.php");
 
+//Assign dbs
+if ( count($dbSql->dbs) >1 ) {
+  $smarty->assign("dbs", $dbSql->dbs);
+  $smarty->assign("dbs_now", $_SESSION['DATABASE']);
+}
 
 // generaldata.tpl & last_run_report.tpl (last24bytes)
 $client = $dbSql->link->query("select count(*) from Client")
         or die ("Error query: 1");
 $totalfiles = $dbSql->link->query("select count(FilenameId) from Filename")
         or die ("Error query: 2");
-$last24bytes = $dbSql->link->query("select sum(JobBytes),count(*) from Job where Endtime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-86400")
+if ( $dbSql->driver == "mysql")
+  $last24bytes = $dbSql->link->query("select sum(JobBytes),count(*) from Job where Endtime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-86400")
+        or die ("Error query: 3");
+if ( $dbSql->driver == "pgsql")
+  $last24bytes = $dbSql->link->query("select sum(JobBytes),count(*) from Job where Endtime <= NOW() and EndTime > NOW() - 86400 * interval '1 second'")
         or die ("Error query: 3");
 $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();
 $smarty->assign('clientes_totales',$tmp[0]);
 
 $tmp = $last24bytes->fetchRow();
-if ( empty($tmp[0]) ) {                                                                                                                 // No data for last 24, search last 48
-        $last24bytes = $dbSql->link->query("select sum(JobBytes) from Job where Endtime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-172800" );
+/*if ( empty($tmp[0]) ) {                                                                                                                 // No data for last 24, search last 48
+        if ( $dbSql->driver == "mysql" )
+          $last24bytes = $dbSql->link->query("select sum(JobBytes) from Job where Endtime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-172800" );
+        if ( $dbSql->driver == "pgsql")
+          $last24bytes = $dbSql->link->query("select sum(JobBytes) from Job where Endtime <= NOW() and EndTime > NOW()-172800 * interval '1 second'" )
+            or die ("Error query: 4.1");
         $smarty->assign('when',"yesterday");
-}
+        $tmp = $last24bytes->fetchRow();        
+}*/
+
 $smarty->assign('bytes_totales',$tmp[0]);
 $smarty->assign('total_jobs', $tmp[1]);
 
@@ -65,6 +81,7 @@ $totalfiles->free();
 $last24bytes->free();
 
 
+
 // report_select.tpl & last_run_report.tpl
 $res = $dbSql->link->query("select Name from Job group by Name");
 $a_jobs = array();
@@ -83,8 +100,12 @@ $smarty->assign('volumes',$volumes);
 // last_run_report.tpl
 if ($mode == "Lite" && $_GET['Full_popup'] != "yes") {
         $tmp = array();
-        $status = $dbSql->link->query("select JobId,Name,EndTime,JobStatus from Job where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) >UNIX_TIMESTAMP(NOW())-86400 and JobStatus!='T'" )               
-                or die ("Error: query at row 85");
+        if ( $dbSql->driver == "mysql" )
+          $status = $dbSql->link->query("select JobId,Name,EndTime,JobStatus from Job where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) >UNIX_TIMESTAMP(NOW())-86400 and JobStatus!='T'" )               
+                or die ("Error: query at row 95");
+        if ( $dbSql->driver == "pgsql" )
+          $status = $dbSql->link->query("select JobId,Name,EndTime,JobStatus from Job where EndTime <= NOW() and EndTime >NOW() - 86400 * interval '1 second' and JobStatus!= 'T'")
+                or die ( "Error: query at row 98" );
         $smarty->assign('status', $status->numRows());
         if ( $status->numRows() ) {
                 while ( $res = $status->fetchRow() )
@@ -94,8 +115,12 @@ if ($mode == "Lite" && $_GET['Full_popup'] != "yes") {
         $status->free();
         
         // Total Elapsed Time. Only for single Job.
-        $ret = $dbSql->link->query("select UNIX_TIMESTAMP(EndTime)-UNIX_TIMESTAMP(StartTime) as elapsed from Job where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-84600")
-                or die ("Error at row 96");
+        if ( $dbSql->driver == "mysql" )
+          $ret = $dbSql->link->query("select UNIX_TIMESTAMP(EndTime)-UNIX_TIMESTAMP(StartTime) as elapsed from Job where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-84600")
+                or die ("Error at row 110");
+        if ( $dbSql->driver == "pgsql" )
+          $ret = $dbSql->link->query("select EndTime - StartTime as elapsed from Job where EndTime <= NOW() and EndTime > NOW() - 84600 * interval '1 second'")
+                or die ("Error at row 113");
         while ( $res = $ret->fetchRow() ) {
                 if ( $TotalElapsed < 1000000000 )                                                                               // Temporal "workaround" ;) Fix later
                         $TotalElapsed += $res[0];
@@ -115,9 +140,12 @@ else if ($mode == "Full" || $_GET['Full_popup'] == "yes" ){
                                 LEFT JOIN Pool ON Job.PoolId=Pool.PoolId where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) >UNIX_TIMESTAMP(NOW())-86400 
                                 order by elapsed ";                                                                                                     // Full report array
         if ( $dbSql->driver == "pgsql")
-                $query = "select Job.EndTime::timestamp-Job.StartTime::timestamp as elapsed,Job.Name,Job.StartTime,Job.EndTime,Job.Level,Pool.Name,Job.JobStatus from Job LEFT JOIN Pool ON Job.PoolId=Pool.PoolId where EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) >UNIX_TIMESTAMP(NOW())-86400 order by elapsed ";
+                $query = "select (Job.EndTime - Job.StartTime )
+                                as elapsed,Job.Name,Job.StartTime,Job.EndTime,Job.Level,Pool.Name,Job.JobStatus from Job
+                                LEFT JOIN Pool ON Job.PoolId=Pool.PoolId where EndTime <= NOW() and EndTime > NOW() - 86400 * interval '1 second'
+                                order by elapsed ";
         $status = $dbSql->link->query($query)
-                or die ("Error: query at row 118");
+                or die ("Error: query at row 138");
         while ( $tmp = $status->fetchRow() ) {
                 $tdate = explode (":",$tmp[0]);
                 if ( $tdate[0] > 300000 )                                                                                               // Temporal "workaround" ;) Fix later