From 320a1ed91c3e96f881dab145b6f196cd45c61d48 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Tue, 25 Apr 2023 15:02:36 +0200
Subject: [PATCH] code review

---
 src/ManageList.php | 83 +++++++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 35 deletions(-)

diff --git a/src/ManageList.php b/src/ManageList.php
index 567ed06..05ed2df 100644
--- a/src/ManageList.php
+++ b/src/ManageList.php
@@ -31,33 +31,30 @@ use Dotclear\Helper\Html\Html;
  */
 class ManageList extends adminGenericListV2
 {
-    public function display(adminGenericFilterV2 $filter, string $enclose = ''): void
+    public function display(adminGenericFilterV2 $filter, string $enclose = '%s'): void
     {
+        // nullsafe
         if (is_null(dcCore::app()->auth) || is_null(dcCore::app()->blog)) {
             return;
         }
 
+        // prepare page
+        $blocks = explode('%s', $enclose);
+        $pager  = new dcPager((int) $filter->value('page'), (int) $this->rs_count, (int) $filter->value('nb'), 10);
+        $tz     = dcCore::app()->auth->getInfo('user_tz') ?? (dcCore::app()->blog->settings->get('system')->get('blog_timezone') ?? 'UTC');
+
+        // no record
         if ($this->rs->isEmpty()) {
-            echo '<p><strong>' . (
-                $filter->show() ?
-                __('No widgets matching the filter.') : __('No widget')
-            ) . '</strong></p>';
+            echo sprintf(
+                '<p><strong>%s</strong></p>',
+                $filter->show() ? __('No widgets matching the filter.') : __('No widget')
+            );
 
             return;
         }
 
-        $pager = new dcPager((int) $filter->value('page'), (int) $this->rs_count, (int) $filter->value('nb'), 10);
-
-        $content = '<div class="table-outer">' .
-        '<table class="clear">' .
-        '<caption>' . (
-            $filter->show() ?
-            sprintf(__('List of %s widgets matching the filter.'), $this->rs_count) :
-            sprintf(__('List of widgets (%s)'), $this->rs_count)
-        ) . '</caption>' .
-        '<thead><tr>';
-
-        $cols = new ArrayObject([
+        // table head line
+        $thead = new ArrayObject([
             'name'          => '<th colspan="2" class="first">' . __('Post title') . '</th>',
             'post_dt'       => '<th scope="col" class="nowrap">' . __('Post date') . '</th>',
             'option_title'  => '<th scope="col" class="nowrap">' . __('Widget title') . '</th>',
@@ -66,49 +63,65 @@ class ManageList extends adminGenericListV2
             'post_type'     => '<th scope="col" class="nowrap">' . __('Type') . '</th>',
         ]);
 
-        $this->userColumns(My::id(), $cols);
+        $this->userColumns(My::id(), $thead);
 
-        $content .= implode(iterator_to_array($cols)) . '</tr></thead><tbody>';
-
-        $tz = dcCore::app()->auth->getInfo('user_tz') ?? (dcCore::app()->blog->settings->get('system')->get('blog_timezone') ?? 'UTC');
+        // display list header
+        echo
+        $pager->getLinks() .
+        ($blocks[0] ?? '') .
+        sprintf(
+            '<div class="table-outer"><table class="clear"><caption>%s</caption><thead><tr>%s</tr></thead><tbody>',
+            $filter->show() ?
+                sprintf(__('List of %s widgets matching the filter.'), $this->rs_count) :
+                sprintf(__('List of widgets (%s)'), $this->rs_count),
+            implode(iterator_to_array($thead))
+        );
 
+        // parses lines
         while ($this->rs->fetch()) {
             $w_title = Html::escapeHTML($this->rs->option_title);
             if ($w_title == '') {
-                $w_title = '<em>' . context::global_filters(
+                // widget title can accept HTML, but backend table not
+                $w_title = context::global_filters(
                     $this->rs->option_content,
                     [
                         'encode_xml',
                         'remove_html',
                         'cut_string' => 80,
                     ]
-                ) . '</em>';
+                );
             }
 
-            $cols = new ArrayObject([
-                'check' => '<td class="nowrap">' . (new Checkbox(['widgets[]'], (bool) $this->rs->f('option_id')))->value($this->rs->f('option_id'))->disabled(!$this->rs->isEditable())->render() . '</td>',
-                'name'  => '<td class="maximal"><a href="' . dcCore::app()->getPostAdminURL($this->rs->f('post_type'), $this->rs->f('post_id')) . '#post-wtext-form">' .
+            // table body line
+            $tbody = new ArrayObject([
+                'check' => '<td class="nowrap">' .
+                    (new Checkbox(['widgets[]'], (bool) in_array($this->rs->f('option_id'), $_REQUEST['widgets'] ?? [])))
+                        ->__call('value', [$this->rs->f('option_id')])
+                        ->__call('disabled', [!$this->rs->isEditable()])
+                        ->render() .
+                    '</td>',
+                'name' => '<td class="maximal"><a href="' . dcCore::app()->getPostAdminURL($this->rs->f('post_type'), $this->rs->f('post_id')) . '#post-wtext-form">' .
                     Html::escapeHTML($this->rs->f('post_title')) . '</a></td>',
                 'post_dt'       => '<td class="nowrap count">' . Date::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->f('post_dt'), $tz) . '</td>',
                 'option_title'  => '<td class="nowrap">' . $w_title . '</td>',
                 'option_creadt' => '<td class="nowrap count">' . Date::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->f('option_upddt'), $tz) . '</td>',
                 'user_id'       => '<td class="nowrap">' . $this->rs->f('user_id') . '</td>',
                 'post_type'     => '<td class="nowrap">' . $this->rs->f('post_type') . '</td>',
-
             ]);
 
-            $this->userColumns(My::id(), $cols);
+            $this->userColumns(My::id(), $tbody);
 
-            $content .= '<tr class="line' . ($this->rs->f('post_status') == 1 ? '' : ' offline') . '" id="p' . $this->rs->f('post_id') . '">' .
-            implode(iterator_to_array($cols)) .
+            // display table body line
+            echo
+            '<tr class="line' . ($this->rs->f('post_status') == 1 ? '' : ' offline') . '" id="p' . $this->rs->f('post_id') . '">' .
+            implode(iterator_to_array($tbody)) .
             '</tr>';
         }
 
-        $content .= '</tbody></table></div>';
-
+        // display list footer
         echo
-            $pager->getLinks() .
-            sprintf($enclose, $content) .
-            $pager->getLinks();
+        '</tbody></table></div>' .
+        ($blocks[1] ?? '').
+        $pager->getLinks();
     }
 }