issue/activity: only concatenate messages after images

[minimedit.git] / widget / issue / activity.php

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index bb694c7506c0d49fd36f3c1f7ab8cf89b0392101..371f11a665216d744b6526918b1363fadd2d05a1 100644 (file)
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -9,30 +9,38 @@ $sql .= " WHERE message IS NOT NULL";
 $sql .= " ORDER BY m.created DESC LIMIT $limit";
 $query = $Db->query($sql);
 
+$msgformat = [
+       "{(?=</p>\n).+}s" => ' <small class="footer">(Meer op de site)</small>',
+       '{(.*)(<p><img [^>]+></p>)\s*}s' => "$2\n$1",
+       '{(?<=<img src=")(?=/)}' => '/thumb/300x',
+];
+
 print '<dl class="replies">';
 
-$group = NULL;
+$prev = NULL;
 while ($row = $query->fetch()) {
-       print '<dt>';
-       if ($group !== $row->issue) {
-               $group = $row->issue;
-               printf('<a href="/%s">%s</a>', $row->page, $row->subject);
-               if ($row->closed) {
-                       print ' <em>(opgelost)</em>';
+       if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author
+       or !preg_match('/\A<p><img/', $prev->message)) {
+               print '<dt>';
+               if (!$prev or $prev->issue !== $row->issue) {
+                       printf('<a href="/%s">%s</a>', $row->page, $row->subject);
+                       if ($row->closed) {
+                               print ' <em>(opgelost)</em>';
+                       }
                }
+               print '<span class="right">';
+               if ($row->author and $rowuser = new User("profile/{$row->author}")) {
+                       printf('<strong>%s</strong> ', $rowuser->html);
+               }
+               printf('<small class="date">%s</small>',
+                       showdate(preg_split('/\D/', $row->created))
+               );
+               print "</span>";
+               print '</dt>';
+               print '<dd>';
        }
-       print '<span class="right">';
-       if ($row->author and $rowuser = new User("profile/{$row->author}")) {
-               printf('<strong>%s</strong> ', $rowuser->html);
-       }
-       printf('<small class="date">%s</small>',
-               showdate(preg_split('/\D/', $row->created))
-       );
-       print "</span>";
-       print '</dt>';
-       print '<dd>';
-       print $row->message;
-       print "</dd>\n";
+       print preg_replace(array_keys($msgformat), array_values($msgformat), $row->message);
+       $prev = $row;
 }
 
 print "</dl>\n";