X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/1e6e0732eb889ea7f8ca17ba467bf2a9a2ff5cbd..e02706eef130529aac80bb58cf9755c850e316a7:/widget/issue/activity.php

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index cd99e48..153034e 100644
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -7,28 +7,37 @@ $cols = 'm.*, i.subject, i.updated, i.closed';
 $sql = "SELECT $cols FROM messages m JOIN issues i ON i.id = issue";
 $sql .= " WHERE message IS NOT NULL";
 $sql .= " ORDER BY m.created DESC LIMIT $limit";
-$sql = "SELECT * FROM ($sql) x ORDER BY updated DESC, created, id"; # grouped issues
 $query = $Db->query($sql);
 
+$msgformat = [
+	"{(?=</p>\n).+}s" => ' <small class="footer">(Meer op de site)</small>',
+	'{(.*)(<p><img [^>]+></p>)\s*}' => "$2\n$1",
+	'{(?<=<img src=")(?=/)}' => '/thumb/300x',
+];
+
 print '<dl class="replies">';
 
 $group = NULL;
 while ($row = $query->fetch()) {
-	$rowuser = new User("profile/{$row->author}");
+	print '<dt>';
 	if ($group !== $row->issue) {
 		$group = $row->issue;
-		print '<dt>';
 		printf('<a href="/%s">%s</a>', $row->page, $row->subject);
 		if ($row->closed) {
 			print ' <em>(opgelost)</em>';
 		}
-		print '</dt>';
 	}
-	print '<dd>';
-	printf('<strong>%s</strong> <small class="date">%s</small>',
-		$rowuser->html, showdate(preg_split('/\D/', $row->created))
+	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))
 	);
-	printf("\n\t<blockquote>%s</blockquote>", $row->message);
+	print "</span>";
+	print '</dt>';
+	print '<dd>';
+	print preg_replace(array_keys($msgformat), array_values($msgformat), $row->message);
 	print "</dd>\n";
 }