From: Kern Sibbald Date: Sun, 19 Jun 2005 10:25:00 +0000 (+0000) Subject: Tweaks X-Git-Tag: Release-1.38.0~357 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aa33b80149b0179f40ecaea51f52a88726550808;p=bacula%2Fbacula Tweaks git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2147 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php index a9bcb72adf..e6bce4b619 100644 --- a/gui/bacula-web/index.php +++ b/gui/bacula-web/index.php @@ -19,40 +19,40 @@ require ("paths.php"); require($smarty_path."Smarty.class.php"); include "classes.inc"; -$smarty = new Smarty; // Template engine +$smarty = new Smarty; // Template engine $dbSql = new Bweb(); //$smarty->compile_check = true; //$smarty->debugging = true; $smarty->template_dir = "./templates"; $smarty->compile_dir = "./templates_c"; -$smarty->config_dir = "./configs"; -$smarty->config_load("bacula.conf"); // Load config file -$mode = $smarty->get_config_vars("mode"); // Lite o Extend? +$smarty->config_dir = "./configs"; +$smarty->config_load("bacula.conf"); // Load config file +$mode = $smarty->get_config_vars("mode"); // Lite o Extend? require("lang.php"); // generaldata.tpl & last_run_report.tpl (last24bytes) $client = $dbSql->link->query("select count(*) from Client") - or die ("Error query: 1"); + or die ("Error query: 1"); $totalfiles = $dbSql->link->query("select count(FilenameId) from Filename") - or die ("Error query: 2"); + 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") - or die ("Error query: 3"); + or die ("Error query: 3"); $bytes_stored =& $dbSql->link->getOne("select SUM(VolBytes) from Media") - or die ("Error query: 4"); + or die ("Error query: 4"); -$smarty->assign('database_size', $dbSql->GetDbSize()); +$smarty->assign('database_size', $dbSql->GetDbSize()*1000000); $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" ); - $smarty->assign('when',"yesterday"); +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" ); + $smarty->assign('when',"yesterday"); } $smarty->assign('bytes_totales',$tmp[0]); $smarty->assign('total_jobs', $tmp[1]); @@ -69,68 +69,68 @@ $last24bytes->free(); $res = $dbSql->link->query("select Name from Job group by Name"); $a_jobs = array(); while ( $tmp = $res->fetchRow() ) - array_push($a_jobs, $tmp[0]); + array_push($a_jobs, $tmp[0]); $smarty->assign('total_name_jobs',$a_jobs); -$smarty->assign('time2',( (time())-2678400) ); // Current time - 1 month. date $res->free(); // volumes.tpl -$volumes = $dbSql->GetDataVolumes(); // Obtain array with info -$pools = array_keys($volumes); // Extract Pools -$smarty->assign('pools',$pools); +$volumes = $dbSql->GetDataVolumes(); // Obtain array with info +$pools = array_keys($volumes); // Extract Pools +$smarty->assign('pools',$pools); $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"); - $smarty->assign('status', $status->numRows()); - if ( $status->numRows() ) { - while ( $res = $status->fetchRow() ) - array_push($tmp, $res); - $smarty->assign('errors_array',$tmp); - } - $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"); - while ( $res = $ret->fetchRow() ) { - if ( $TotalElapsed < 1000000000 ) // Temporal "workaround" ;) Fix later - $TotalElapsed += $res[0]; - } - if ($TotalElapsed > 86400) // More than 1 day! - $TotalElapsed = gmstrftime("%d days %H:%M:%S", $TotalElapsed); - else - $TotalElapsed = gmstrftime("%H:%M:%S", $TotalElapsed); - $smarty->assign('TotalElapsed',$TotalElapsed); - $ret->free(); + $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"); + $smarty->assign('status', $status->numRows()); + if ( $status->numRows() ) { + while ( $res = $status->fetchRow() ) + array_push($tmp, $res); + $smarty->assign('errors_array',$tmp); + } + $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"); + while ( $res = $ret->fetchRow() ) { + if ( $TotalElapsed < 1000000000 ) // Temporal "workaround" ;) Fix later + $TotalElapsed += $res[0]; + } + if ($TotalElapsed > 86400) // More than 1 day! + $TotalElapsed = gmstrftime("%d days %H:%M:%S", $TotalElapsed); + else + $TotalElapsed = gmstrftime("%H:%M:%S", $TotalElapsed); + $smarty->assign('TotalElapsed',$TotalElapsed); + $ret->free(); } else if ($mode == "Full" || $_GET['Full_popup'] == "yes" ){ - $tmp1 = array(); - if ( $dbSql->driver == "mysql") - $query = "select SEC_TO_TIME( UNIX_TIMESTAMP(Job.EndTime)-UNIX_TIMESTAMP(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 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 "; - $status = $dbSql->link->query($query) - or die ("Error: query at row 118"); - while ( $tmp = $status->fetchRow() ) { - $tdate = explode (":",$tmp[0]); - if ( $tdate[0] > 300000 ) // Temporal "workaround" ;) Fix later - $tmp[0] = "00:00:00"; - array_push($tmp1,$tmp); - } - - $smarty->assign('clients',$tmp1); + $tmp1 = array(); + if ( $dbSql->driver == "mysql") + $query = "select SEC_TO_TIME( UNIX_TIMESTAMP(Job.EndTime)-UNIX_TIMESTAMP(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 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 "; + $status = $dbSql->link->query($query) + or die ("Error: query at row 118"); + while ( $tmp = $status->fetchRow() ) { + $tdate = explode (":",$tmp[0]); + if ( $tdate[0] > 300000 ) // Temporal "workaround" ;) Fix later + $tmp[0] = "00:00:00"; + array_push($tmp1,$tmp); + } + + $smarty->assign('clients',$tmp1); } if ($_GET['Full_popup'] == "yes" || $_GET['pop_graph1'] == "yes" || $_GET['pop_graph2'] == "yes") - $smarty->display('full_popup.tpl'); + $smarty->display('full_popup.tpl'); else - $smarty->display('index.tpl'); -?> \ No newline at end of file + $smarty->display('index.tpl'); +?>