From ebf274386c0b53e46bf87f6f370ec30ca3491529 Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Tue, 22 Nov 2022 14:50:57 +0100
Subject: [PATCH] baculum: Fix time range filter for job and object endpoints

---
 gui/baculum/protected/API/Pages/API/Jobs.php    | 16 ++++++++--------
 gui/baculum/protected/API/Pages/API/Objects.php | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gui/baculum/protected/API/Pages/API/Jobs.php b/gui/baculum/protected/API/Pages/API/Jobs.php
index 454ff8000..06ec3b6e9 100644
--- a/gui/baculum/protected/API/Pages/API/Jobs.php
+++ b/gui/baculum/protected/API/Pages/API/Jobs.php
@@ -119,13 +119,13 @@ class Jobs extends BaculumAPIServer {
 			if (!empty($schedtime_from)) {
 				$params['Job.SchedTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $schedtime_from)
+					'vals' => date('Y-m-d H:i:s', $schedtime_from)
 				];
 			}
 			if (!empty($schedtime_to)) {
 				$params['Job.SchedTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $schedtime_to)
+					'vals' => date('Y-m-d H:i:s', $schedtime_to)
 				];
 			}
 		}
@@ -136,13 +136,13 @@ class Jobs extends BaculumAPIServer {
 			if (!empty($starttime_from)) {
 				$params['Job.StartTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $starttime_from)
+					'vals' => date('Y-m-d H:i:s', $starttime_from)
 				];
 			}
 			if (!empty($starttime_to)) {
 				$params['Job.StartTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $starttime_to)
+					'vals' => date('Y-m-d H:i:s', $starttime_to)
 				];
 			}
 		}
@@ -153,13 +153,13 @@ class Jobs extends BaculumAPIServer {
 			if (!empty($endtime_from)) {
 				$params['Job.EndTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $endtime_from)
+					'vals' => date('Y-m-d H:i:s', $endtime_from)
 				];
 			}
 			if (!empty($endtime_to)) {
 				$params['Job.EndTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $endtime_to)
+					'vals' => date('Y-m-d H:i:s', $endtime_to)
 				];
 			}
 		}
@@ -170,13 +170,13 @@ class Jobs extends BaculumAPIServer {
 			if (!empty($realendtime_from)) {
 				$params['Job.RealEndTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $realendtime_from)
+					'vals' => date('Y-m-d H:i:s', $realendtime_from)
 				];
 			}
 			if (!empty($realendtime_to)) {
 				$params['Job.RealEndTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $realendtime_to)
+					'vals' => date('Y-m-d H:i:s', $realendtime_to)
 				];
 			}
 		}
diff --git a/gui/baculum/protected/API/Pages/API/Objects.php b/gui/baculum/protected/API/Pages/API/Objects.php
index bf59293d3..37be7fca2 100644
--- a/gui/baculum/protected/API/Pages/API/Objects.php
+++ b/gui/baculum/protected/API/Pages/API/Objects.php
@@ -132,13 +132,13 @@ class Objects extends BaculumAPIServer {
 			if (!empty($schedtime_from)) {
 				$params['Job.SchedTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $schedtime_from)
+					'vals' => date('Y-m-d H:i:s', $schedtime_from)
 				];
 			}
 			if (!empty($schedtime_to)) {
 				$params['Job.SchedTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $schedtime_to)
+					'vals' => date('Y-m-d H:i:s', $schedtime_to)
 				];
 			}
 		}
@@ -149,13 +149,13 @@ class Objects extends BaculumAPIServer {
 			if (!empty($starttime_from)) {
 				$params['Job.StartTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $starttime_from)
+					'vals' => date('Y-m-d H:i:s', $starttime_from)
 				];
 			}
 			if (!empty($starttime_to)) {
 				$params['Job.StartTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $starttime_to)
+					'vals' => date('Y-m-d H:i:s', $starttime_to)
 				];
 			}
 		}
@@ -166,13 +166,13 @@ class Objects extends BaculumAPIServer {
 			if (!empty($endtime_from)) {
 				$params['Job.EndTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $endtime_from)
+					'vals' => date('Y-m-d H:i:s', $endtime_from)
 				];
 			}
 			if (!empty($endtime_to)) {
 				$params['Job.EndTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $endtime_to)
+					'vals' => date('Y-m-d H:i:s', $endtime_to)
 				];
 			}
 		}
@@ -183,13 +183,13 @@ class Objects extends BaculumAPIServer {
 			if (!empty($realendtime_from)) {
 				$params['Job.RealEndTime'][] = [
 					'operator' => '>=',
-					'vals' => date('Y-m-d H:m:s', $realendtime_from)
+					'vals' => date('Y-m-d H:i:s', $realendtime_from)
 				];
 			}
 			if (!empty($realendtime_to)) {
 				$params['Job.RealEndTime'][] = [
 					'operator' => '<=',
-					'vals' => date('Y-m-d H:m:s', $realendtime_to)
+					'vals' => date('Y-m-d H:i:s', $realendtime_to)
 				];
 			}
 		}
-- 
2.47.3