Fix DbLogController::overview() and topLogMessages() logic and provide a formatMessage() method

Something like this?

Working on it.

Updated patch. Thanks for bringing this back @areke :)

Eh, there's still that same message formatting code in dblog_top() in dblog.admin.inc. The best way forward may be to postpone on #1982954: Convert dblog_top() to a controller, I don't think we should add a procedural helper (or a static method?) for this.

Looks like it might be a good time to revisit this.

Nice, thanks @amitgoyal :)

1. +++ b/core/modules/dblog/src/Controller/DbLogController.php
   @@ -169,21 +169,11 @@ public function overview() {
   -          $log_text = Unicode::truncate(Xss::filter($message, array()), 56, TRUE, TRUE);
   ...
   +        $log_text = Unicode::truncate(filter_xss($message, array()), 56, TRUE, TRUE);
   

   filter_xss should be Xss::filter I think.

2. +++ b/core/modules/dblog/src/Controller/DbLogController.php
   @@ -331,6 +317,35 @@ protected function buildFilterQuery() {
   +        $message = t($row->message, unserialize($row->variables));
   

   Use $this->t() instead of t() here.

Great, let's see if we can refactor topLogMessages() now as well because it contains logic that can be replaced by the new formatMessage().

I think that's changing the logic, it didn't have the truncate before.

+++ b/core/modules/dblog/src/Controller/DbLogController.php
@@ -370,16 +385,10 @@ public function topLogMessages($type) {
-      // Check for required properties.
-      if (isset($dblog->message) && isset($dblog->variables)) {
-        // Messages without variables or user specified text.
-        if ($dblog->variables === 'N;') {
-          $message = $dblog->message;
-        }
-        // Message to translate with injected variables.
-        else {
-          $message = $this->t($dblog->message, unserialize($dblog->variables));
-        }
+      $message = $this->formatMessage($dblog);
+      if ($message && isset($dblog->wid)) {
+        $log_text = Xss::filter($message, array());
+        $message = $this->l($log_text, 'dblog.event',  array('event_id' => $dblog->wid), array('html' => TRUE));

I don't think we want $this->l, that wasn't called before either, same with Xss::filter().

Without seeing the whole code I think roughly what we might want here is:

$message = $this->formatMessage($dblog);
if ($message) {
  $rows[] = array($dblog->count, $message);
}

(edited to add code tags)

This is looking good to me, I only have one small suggestion for improvement:

+++ b/core/modules/dblog/src/Controller/DbLogController.php
@@ -370,18 +385,10 @@ public function topLogMessages($type) {
+      $message = $this->formatMessage($dblog);
+      if ($message) {
+        $rows[] = array($dblog->count, $message);
       }

The first two lines here could be combined into one:

if ($message = $this->formatMessage($dblog))

Been a while since I worked on this so going for RTBC and updating the issue summary. Thanks @amitgoyal!