(admin) do not set null for broadcast message receiver, use fixed "Ru…

…ndmail"
bratkartoffel · Jan 30, 2023 · e280799 · e280799
1 parent 918dd59
commit e280799
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `install/update.php` can now be invoked by cli (without secret)
 - don't just invalidate, delete old http-session on login
 - (mobile) scroll to content when navigating to the pages
+- (admin) do not set null for broadcast message receiver, use fixed "Rundmail"
 
 ### Fixed
 

diff --git a/actions/nachrichten.php b/actions/nachrichten.php
@@ -59,7 +59,8 @@
                     'senderId' => $_SESSION['blm_user'],
                     'senderName' => Database::getInstance()->getPlayerNameById($_SESSION['blm_user']),
                     'subject' => $subject,
-                    'message' => $message
+                    'message' => $message,
+                    'receiverName' => 'Rundmail'
                 )) !== 1) {
                 Database::getInstance()->rollBack();
                 redirectTo($base_link, 141, __LINE__);

diff --git a/include/functions.inc.php b/include/functions.inc.php
@@ -841,7 +841,7 @@ function verifyOffset(int $offset, int $entriesCount, int $entriesPerPage): int
 
 function createProfileLink(?int $blm_user, string $name): string
 {
-    if ($blm_user == 0) return $name;
+    if ($blm_user === null || $blm_user === 0) return $name;
     return sprintf('<a href="/?p=profil&amp;id=%d">%s</a>', $blm_user, escapeForOutput($name));
 }
 

diff --git a/install/sql/21-1.11.1-log_nachrichten-rundmail.sql b/install/sql/21-1.11.1-log_nachrichten-rundmail.sql
@@ -0,0 +1,10 @@
+-- MIT Licence
+-- Copyright (c) 2023 Simon Frankenberger
+-- Please see LICENCE.md for complete licence text.
+
+update log_nachrichten
+set receiverName = 'Rundmail'
+where receiverId is null;
+
+alter table log_nachrichten
+    change receiverName receiverName varchar(20) not null;
diff --git a/pages/admin_log_nachrichten.inc.php b/pages/admin_log_nachrichten.inc.php
@@ -48,13 +48,7 @@
         ?>
         <tr>
             <td><?= createProfileLink($row['senderId'], $row['senderName']); ?></td>
-            <td><?php
-                if ($row['receiverId'] === null) {
-                    echo '<i>Rundmail</i>';
-                } else {
-                    echo createProfileLink($row['receiverId'], $row['receiverName']);
-                }
-                ?></td>
+            <td><?= createProfileLink($row['receiverId'], $row['receiverName']); ?></td>
             <td><?= formatDateTime(strtotime($row['created'])); ?></td>
             <td><?= escapeForOutput($row['subject']); ?></td>
             <td><?= escapeForOutput($row['message']); ?></td>