From: Francisco Manuel Garcia Botella <francisco.garcia@baculasystems.com>
Date: Wed, 4 Sep 2024 10:27:24 +0000 (+0000)
Subject: baculum: Add new query parameters in M365EmailList endpoint
X-Git-Tag: Release-15.0.3~66^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0de28f82b1fb1862fb7da5a8a1113fb9c6af43ae;p=thirdparty%2Fbacula.git

baculum: Add new query parameters in M365EmailList endpoint
---

diff --git a/gui/baculum/protected/API/Pages/API/PluginM365EmailList.php b/gui/baculum/protected/API/Pages/API/PluginM365EmailList.php
index 201331b3a..c2c970a6b 100644
--- a/gui/baculum/protected/API/Pages/API/PluginM365EmailList.php
+++ b/gui/baculum/protected/API/Pages/API/PluginM365EmailList.php
@@ -92,7 +92,7 @@ class PluginM365EmailList extends ConsoleOutputJSONPage {
 			$params['maxtime'] = $this->Request['maxtime'];
 		}
 		if ($this->Request->contains('folder') && $misc->isValidFilename($this->Request['folder'])) {
-			$params['folder'] = $this->Request['folder'];
+			$params['foldername'] = $this->Request['folder'];
 		}
 		if ($this->Request->contains('tags') && $misc->isValidName($this->Request['tags'])) {
 			$params['tags'] = $this->Request['tags'];
@@ -113,8 +113,18 @@ class PluginM365EmailList extends ConsoleOutputJSONPage {
 			$params['maxsize'] = $this->Request['maxsize'];
 		}
 		if ($this->Request->contains('conversationid') && $misc->isValidNameExt($this->Request['conversationid'])) {
-			$params['conversationid'] =  $this->Request['conversationid'];
+			$params['conversationid'] = $this->Request['conversationid'];
 		}
+		if ($this->Request->contains('subject')) {
+			$params['subject'] = $this->Request['subject'];
+		}
+		if ($this->Request->contains('bodypreview')) {
+			$params['bodypreview'] = $this->Request['bodypreview'];
+		}
+		if ($this->Request->contains('hasattachment') && $misc->isValidBooleanTrue($this->Request['hasattachment'])) {
+			$params['hasattachment'] = $this->Request['hasattachment'];
+		}
+		
 		$out = $this->getJSONOutput($params);
 
 		$output = [];
diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index 8234d59cb..54eb8d808 100644
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -11286,6 +11286,24 @@
 							"type": "string"
 						}
 					},
+					{
+						"name": "subject",
+						"in": "query",
+						"required": false,
+						"description": "Email subject",
+						"schema": {
+							"type": "string"
+						}
+					},
+					{
+						"name": "bodypreview",
+						"in": "query",
+						"required": false,
+						"description": "Email body preview",
+						"schema": {
+							"type": "string"
+						}
+					},
 					{
 						"name": "minsize",
 						"in": "query",
@@ -11312,6 +11330,15 @@
 						"schema": {
 							"type": "string"
 						}
+					},
+					{
+						"name": "hasattachment",
+						"in": "query",
+						"required": false,
+						"description": "Email has attachments",
+						"schema": {
+							"type": "boolean"
+						}
 					}
 				]
 			}