From 59aea9b9b1d63bd24849851c6ca8d40ac5f4c021 Mon Sep 17 00:00:00 2001
From: Torben Dannhauer <torben@dannhauer.de>
Date: Mon, 25 May 2026 12:52:57 +0200
Subject: [PATCH 1/3] Check for flags before modifying results array

Add a check for flags before processing changes to avoid errors.
---
 lib/Horde/Core/ActiveSync/Driver.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/Horde/Core/ActiveSync/Driver.php b/lib/Horde/Core/ActiveSync/Driver.php
index ec477b68..86b1ccaf 100644
--- a/lib/Horde/Core/ActiveSync/Driver.php
+++ b/lib/Horde/Core/ActiveSync/Driver.php
@@ -1422,11 +1422,15 @@ public function getServerChanges(
             $flags = $folder->flags();
             $categories = $folder->categories();
             foreach ($changes['modify'] as $uid) {
+                if (!isset($flags[$uid])) {
+                    continue;
+                }
+
                 $results[] = [
                     'id' => $uid,
                     'type' => Horde_ActiveSync::CHANGE_TYPE_FLAGS,
                     'flags' => $flags[$uid],
-                    'categories' => $categories[$uid],
+                    'categories' => $categories[$uid] ?? [],
                 ];
             }
         } else {

From 2c8f90252a3ad842c8ae2ba4221356076cfb29de Mon Sep 17 00:00:00 2001
From: Torben Dannhauer <torben@dannhauer.de>
Date: Mon, 25 May 2026 12:54:15 +0200
Subject: [PATCH 2/3] Handle missing config values in prefs loading

---
 lib/Horde/Core/Prefs/Ui.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/Horde/Core/Prefs/Ui.php b/lib/Horde/Core/Prefs/Ui.php
index b851ff6c..7b5268cd 100644
--- a/lib/Horde/Core/Prefs/Ui.php
+++ b/lib/Horde/Core/Prefs/Ui.php
@@ -768,9 +768,10 @@ protected function _loadPrefs($app, $data = false)
 
         try {
             $pconf = $registry->loadConfigFile('prefs.php', ['prefGroups', '_prefs'], $app);
+            $config = $pconf->config ?? [];
             $res = [
-                'prefGroups' => $pconf->config['prefGroups'],
-                '_prefs' => $pconf->config['_prefs'],
+                'prefGroups' => $config['prefGroups'] ?? [],
+                '_prefs' => $config['_prefs'] ?? [],
             ];
         } catch (Horde_Exception $e) {
             $res = [

From a186067cdffe3342438e298e5260c2efcf11f620 Mon Sep 17 00:00:00 2001
From: Torben Dannhauer <torben@dannhauer.de>
Date: Mon, 25 May 2026 12:57:26 +0200
Subject: [PATCH 3/3] Refactor SimpleFormatter initialization in
 LogHandlerFactory

---
 src/Factory/LogHandlerFactory.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Factory/LogHandlerFactory.php b/src/Factory/LogHandlerFactory.php
index 0a142df3..55f2f983 100644
--- a/src/Factory/LogHandlerFactory.php
+++ b/src/Factory/LogHandlerFactory.php
@@ -76,9 +76,8 @@ public function create(Injector $injector): LogHandler
 
                     case 'default':
                     default:
-                        // Match legacy Horde_Log_Handler_Stream + SimpleFormatter:
-                        // append a line break after the (pre-formatted) message.
-                        $formatters[] = new SimpleFormatter('%message%' . PHP_EOL);
+                        // Match legacy Horde_Log_Handler_Stream + SimpleFormatter.
+                        $formatters[] = new SimpleFormatter();
                         break;
 
                     case 'xml':