From be9ad95905fdc0051292f099fc03fdbea044b700 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 18 Apr 2024 12:46:11 +0200
Subject: [PATCH] chg: [syslog] output slightly changed

- always have a consistent number of fields conveyed, include delimited ( -- ) fields even if no data is passed to a field
- Avoid linebreaks in content
---
 app/Model/Log.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/Model/Log.php b/app/Model/Log.php
index 2155a2e99..6c810db1d 100644
--- a/app/Model/Log.php
+++ b/app/Model/Log.php
@@ -431,15 +431,14 @@ class Log extends AppModel
                 }
             }
 
-            $entry = $data['Log']['action'];
-            if (!empty($data['Log']['title'])) {
-                $entry .= " -- {$data['Log']['title']}";
-            }
-            if (!empty($data['Log']['description'])) {
-                $entry .= " -- {$data['Log']['description']}";
-            } else if (!empty($data['Log']['change'])) {
-                $entry .= " -- " . JsonTool::encode($data['Log']['change']);
-            }
+            $entry = sprintf(
+                '%s -- %s -- %s',
+                $data['Log']['action'],
+                empty($data['Log']['title']) ? '' : $formatted_title = preg_replace('/\s+/', " ", $data['Log']['title']),
+                empty($data['Log']['description']) ? 
+                    (empty($data['Log']['change']) ? '' : preg_replace('/\s+/', " ", $data['Log']['change'])) :
+                    preg_replace('/\s+/', " ", $data['Log']['description'])
+            );
             $this->syslog->write($action, $entry);
         }
     }