From 2424a6157860df9beeabc3eae9030460632ebffa Mon Sep 17 00:00:00 2001 From: Davide Franco Date: Thu, 16 Dec 2010 12:11:36 +0100 Subject: [PATCH 1/1] bacula-web: Fixed typo for date function in bweb.inc.php and jobs.php - Fixed wrong argument in date function for minute (H:m:s instead of H:i:s) --- gui/bacula-web/bweb.inc.php | 20 ++++++++++---------- gui/bacula-web/jobs.php | 5 +++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/gui/bacula-web/bweb.inc.php b/gui/bacula-web/bweb.inc.php index 7aef804d30..d0211024b2 100644 --- a/gui/bacula-web/bweb.inc.php +++ b/gui/bacula-web/bweb.inc.php @@ -359,8 +359,8 @@ class Bweb extends DB { $end_date = mktime(); $start_date = $end_date - $delay; - $start_date = date( "Y-m-d H:m:s", $start_date ); - $end_date = date( "Y-m-d H:m:s", $end_date ); + $start_date = date( "Y-m-d H:i:s", $start_date ); + $end_date = date( "Y-m-d H:i:s", $end_date ); switch( $this->driver ) { @@ -389,8 +389,8 @@ class Bweb extends DB { $end_date = mktime(); $start_date = $end_date - $delay; - $start_date = date( "Y-m-d H:m:s", $start_date ); - $end_date = date( "Y-m-d H:m:s", $end_date ); + $start_date = date( "Y-m-d H:i:s", $start_date ); + $end_date = date( "Y-m-d H:i:s", $end_date ); //echo "start date: $start_date
"; //echo "end date: $end_date
"; @@ -459,8 +459,8 @@ class Bweb extends DB { $end_date = mktime(); $start_date = $end_date - $delay; - $start_date = date( "Y-m-d H:m:s", $start_date ); - $end_date = date( "Y-m-d H:m:s", $end_date ); + $start_date = date( "Y-m-d H:i:s", $start_date ); + $end_date = date( "Y-m-d H:i:s", $end_date ); switch( $this->driver ) { @@ -504,8 +504,8 @@ class Bweb extends DB { $end_date = mktime(); $start_date = $end_date - $delay; - $start_date = date( "Y-m-d H:m:s", $start_date ); - $end_date = date( "Y-m-d H:m:s", $end_date ); + $start_date = date( "Y-m-d H:i:s", $start_date ); + $end_date = date( "Y-m-d H:i:s", $end_date ); // Job status switch( $type ) @@ -596,8 +596,8 @@ class Bweb extends DB { $end_date = mktime(); $start_date = $end_date - $delay; - $start_date = date( "Y-m-d H:m:s", $start_date ); - $end_date = date( "Y-m-d H:m:s", $end_date ); + $start_date = date( "Y-m-d H:i:s", $start_date ); + $end_date = date( "Y-m-d H:i:s", $end_date ); if( $delay != ALL ) { $query .= "WHERE EndTime BETWEEN '$start_date' AND '$end_date'"; diff --git a/gui/bacula-web/jobs.php b/gui/bacula-web/jobs.php index 2f28c20f20..1149c9e9f2 100644 --- a/gui/bacula-web/jobs.php +++ b/gui/bacula-web/jobs.php @@ -66,8 +66,8 @@ $end_date = mktime(); $start_date = $end_date - LAST_DAY; - $start_date = date( "Y-m-d H:m:s", $start_date ); - $end_date = date( "Y-m-d H:m:s", $end_date ); + $start_date = date( "Y-m-d H:i:s", $start_date ); + $end_date = date( "Y-m-d H:i:s", $end_date ); switch( $dbSql->driver ) { @@ -89,6 +89,7 @@ $query .= "ORDER BY Job.EndTime DESC"; break; } + $jobsresult = $dbSql->db_link->query( $query ); if( PEAR::isError( $jobsresult ) ) { -- 2.39.2