From f9a6275528fafaa9baf5dd52bc14640514d500b6 Mon Sep 17 00:00:00 2001
From: Lukas Staab <l.staab@posteo.de>
Date: Sun, 2 Feb 2025 19:10:01 +0100
Subject: [PATCH] open-projects: removed revoked projects as well

---
 legacy/lib/forms/chat/ChatHandler.php        | 2 +-
 legacy/lib/framework/render/MenuRenderer.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/legacy/lib/forms/chat/ChatHandler.php b/legacy/lib/forms/chat/ChatHandler.php
index abc67959..293ad4e8 100644
--- a/legacy/lib/forms/chat/ChatHandler.php
+++ b/legacy/lib/forms/chat/ChatHandler.php
@@ -397,7 +397,7 @@ public function _createComment(string $group, int $group_id, string $timestamp,
                 'timestamp' => mb_substr($timestamp, 0, 20),
                 'creator' => mb_substr($creator, 0, 127),
                 'creator_alias' => mb_substr($creator_alias, 0, 255),
-                'text' => '$lara$'.Crypt::encryptString(mb_substr($text, 0, 45000)),
+                'text' => Crypt::encryptString(mb_substr($text, 0, 45000)),
                 'type' => $type,
             ]);
         } catch (Exception $e) {
diff --git a/legacy/lib/framework/render/MenuRenderer.php b/legacy/lib/framework/render/MenuRenderer.php
index 125a6ca4..bcf9347d 100644
--- a/legacy/lib/framework/render/MenuRenderer.php
+++ b/legacy/lib/framework/render/MenuRenderer.php
@@ -112,11 +112,11 @@ public function renderProjekte($active): void
             case 'open-projects':
                 if (is_null($hhp_bis)) {
                     $where = [
-                        ['state' => ['!=', 'terminated'], 'createdat' => ['>=', $hhp_von]],
+                        ['state' => ['not regexp', '(terminated|revoked)'], 'createdat' => ['>=', $hhp_von]],
                     ];
                 } else {
                     $where = [
-                        ['state' => ['!=', 'terminated'], 'createdat' => ['BETWEEN', [$hhp_von, $hhp_bis]]],
+                        ['state' => ['not regexp', '(terminated|revoked)'], 'createdat' => ['BETWEEN', [$hhp_von, $hhp_bis]]],
                     ];
                 }
                 break;