From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 28 Oct 2020 05:56:54 +0000 (+0100)
Subject: baculum: Fix using offset in job file list query with MySQL catalog database
X-Git-Tag: Release-9.6.7~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8354e40832ebbac0de53fc9f1cd1d16423290a2e;p=thirdparty%2Fbacula.git

baculum: Fix using offset in job file list query with MySQL catalog database
---

diff --git a/gui/baculum/protected/API/Class/JobManager.php b/gui/baculum/protected/API/Class/JobManager.php
index 636ef7bc7..f0abf6eb5 100644
--- a/gui/baculum/protected/API/Class/JobManager.php
+++ b/gui/baculum/protected/API/Class/JobManager.php
@@ -329,16 +329,16 @@ WHERE Client.ClientId='$clientid' $jobs_criteria";
 			$fname_col = 'CONCAT(Path.Path, Filename.Name)';
 		}
 
-		$offset_sql = '';
-		if ($offset) {
-			$offset_sql = ' OFFSET ' . $offset;
-		}
-
 		$limit_sql = '';
 		if ($limit) {
 			$limit_sql = ' LIMIT ' . $limit;
 		}
 
+		$offset_sql = '';
+		if ($offset) {
+			$offset_sql = ' OFFSET ' . $offset;
+		}
+
 		$sql = "SELECT $fname_col  AS file, 
                                F.lstat     AS lstat, 
                                F.fileindex AS fileindex 
@@ -365,7 +365,7 @@ WHERE Client.ClientId='$clientid' $jobs_criteria";
                         WHERE Filename.FilenameId=F.FilenameId 
                         AND Path.PathId=F.PathId 
                         $search_crit 
-			$offset_sql $limit_sql";
+			$limit_sql $offset_sql";
 		$connection = JobRecord::finder()->getDbConnection();
 		$connection->setActive(true);
 		$pdo = $connection->getPdoInstance();