Merge pull request #27024 from nextcloud/enh/audit_log/expiration_date_removal

Properly log expiration date removal in audit log

1 files changed, 20 insertions, 9 deletions

diff --git a/apps/admin_audit/lib/Actions/Sharing.php b/apps/admin_audit/lib/Actions/Sharing.php
index fb070c565a7..472e4203110 100644
--- a/apps/admin_audit/lib/Actions/Sharing.php
+++ b/apps/admin_audit/lib/Actions/Sharing.php
@@ -320,15 +320,26 @@ class Sharing extends Action {
 	 * @param array $params
 	 */
 	public function updateExpirationDate(array $params): void {
-		$this->log(
-			'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
-			$params,
-			[
-				'itemType',
-				'itemSource',
-				'date',
-			]
-		);
+		if ($params['date'] === null) {
+			$this->log(
+				'The expiration date of the publicly shared %s with ID "%s" has been changed removed',
+				$params,
+				[
+					'itemType',
+					'itemSource',
+				]
+			);
+		} else {
+			$this->log(
+				'The expiration date of the publicly shared %s with ID "%s" has been changed to "%s"',
+				$params,
+				[
+					'itemType',
+					'itemSource',
+					'date',
+				]
+			);
+		}
 	}
 
 	/**