10 changed files with 176 additions and 261 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,16 +1,3 @@
-2023.06.17
- require dotclear 2.26
- fix php7.4 compatibility
-
-2023.04.22
- require dotclear 2.26
- use latest helper namespace
- fix nullsafe warnings
-
-2023.03.25
- require dotclear 2.26
- use namespace
-
 2022.11.20
 - fix compatibility with Dotclear 2.24 (required)

--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/JcDenis/lastpostsExtend)](https://github.com/JcDenis/lastpostsExtend/releases)
 [![Date](https://img.shields.io/github/release-date/JcDenis/lastpostsExtend)](https://github.com/JcDenis/lastpostsExtend/releases)
 [![Issues](https://img.shields.io/github/issues/JcDenis/lastpostsExtend)](https://github.com/JcDenis/lastpostsExtend/issues)
-[![Dotclear](https://img.shields.io/badge/dotclear-v2.26-blue.svg)](https://fr.dotclear.org/download)
+[![Dotclear](https://img.shields.io/badge/dotclear-v2.24-blue.svg)](https://fr.dotclear.org/download)
 [![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/lastpostsExtend)
 [![License](https://img.shields.io/github/license/JcDenis/lastpostsExtend)](https://github.com/JcDenis/lastpostsExtend/blob/master/LICENSE)

@ -19,7 +19,7 @@ Like widget lastposts but with more options.
 lastpostsExtend requires: 

  * permissions to manage widgets
-  * Dotclear 2.26
+  * Dotclear 2.24

 ## USAGE

--- a/_admin.php
+++ b/_admin.php
@ -0,0 +1,17 @@
+<?php
+/**
+ * @brief lastpostsExtend, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
+if (!defined('DC_CONTEXT_ADMIN')) {
+    return null;
+}
+
+require __DIR__ . '/_widgets.php';
--- a/_define.php
+++ b/_define.php
@ -18,15 +18,13 @@ $this->registerModule(
    'Last entries (Extended)',
    'Extended list of entries',
    'Jean-Christian Denis and contributors',
-    '2023.06.17',
+    '2022.11.20',
    [
-        'requires'    => [['core', '2.26']],
-        'permissions' => dcCore::app()->auth->makePermissions([
-            dcAuth::PERMISSION_ADMIN,
-        ]),
+        'requires'    => [['core', '2.24']],
+        'permissions' => dcAuth::PERMISSION_ADMIN,
        'type'        => 'plugin',
-        'support'    => 'https://github.com/JcDenis/' . basename(__DIR__),
-        'details'    => 'http://plugins.dotaddict.org/dc2/details/' . basename(__DIR__),
-        'repository' => 'https://raw.githubusercontent.com/JcDenis/' . basename(__DIR__) . '/master/repository.xml',
+        'support'     => 'https://github.com/JcDenis/lastpostsExtend',
+        'details'     => 'http://plugins.dotaddict.org/dc2/details/lastpostsExtend',
+        'repository'  => 'https://raw.githubusercontent.com/JcDenis/lastpostsExtend/master/repository.xml',
    ]
 );
--- a/_public.php
+++ b/_public.php
@ -0,0 +1,17 @@
+<?php
+/**
+ * @brief lastpostsExtend, a plugin for Dotclear 2
+ *
+ * @package Dotclear
+ * @subpackage Plugin
+ *
+ * @author Jean-Christian Denis and contributors
+ *
+ * @copyright Jean-Christian Denis
+ * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
+ */
+if (!defined('DC_RC_PATH')) {
+    return null;
+}
+
+require __DIR__ . '/_widgets.php';
--- a/src/Widgets.php
+++ b/src/Widgets.php
@ -10,49 +10,43 @@
 * @copyright Jean-Christian Denis
 * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
 */
-declare(strict_types=1);
+if (!defined('DC_RC_PATH')) {
+    return null;
+}

-namespace Dotclear\Plugin\lastpostsExtend;
+dcCore::app()->addBehavior(
+    'initWidgets',
+    ['lastpostsextendWidget', 'initWidget']
+);

-use dcBlog;
-use dcCore;
-use dcMeta;
-use Dotclear\Helper\Date;
-use Dotclear\Helper\Text;
-use Dotclear\Helper\File\Path;
-use Dotclear\Helper\Html\Html;
-use Dotclear\Plugin\widgets\WidgetsStack;
-use Dotclear\Plugin\widgets\WidgetsElement;
-
-class Widgets
+class lastpostsextendWidget
 {
-    public static function initWidgets(WidgetsStack $w): void
+    public static function initWidget($w)
    {
-        // nullsafe
-        if (is_null(dcCore::app()->blog)) {
-            return;
-        }
-
-        // Create widget
+        # Create widget
        $w->create(
            'lastpostsextend',
            __('Last entries (Extended)'),
-            [self::class, 'parseWidget'],
+            ['lastpostsextendWidget', 'parseWidget'],
            null,
            __('Extended list of entries')
        );
-        // Title
-        $w->lastpostsextend->addTitle(__('Last entries'));
-
-        // post type
+        # Title
+        $w->lastpostsextend->setting(
+            'title',
+            __('Title:'),
+            __('Last entries'),
+            'text'
+        );
+        # type
        $posttypes = [
            __('Post')    => 'post',
            __('Page')    => 'page',
            __('Gallery') => 'galitem',
        ];
-        // plugin muppet types
-        if (dcCore::app()->plugins->moduleExists('muppet') && class_exists('\muppet')) {
-            $muppet_types = \muppet::getPostTypes();
+        # plugin muppet types
+        if (dcCore::app()->plugins->moduleExists('muppet')) {
+            $muppet_types = muppet::getPostTypes();
            if (is_array($muppet_types) && !empty($muppet_types)) {
                foreach ($muppet_types as $k => $v) {
                    $posttypes[$v['name']] = $k;
@ -66,8 +60,7 @@ class Widgets
            'combo',
            $posttypes
        );
-
-        // Category (post and page have same category)
+        # Category (post and page have same category)
        $rs = dcCore::app()->blog->getCategories([
            'post_type' => 'post',
        ]);
@ -78,8 +71,8 @@ class Widgets
        while ($rs->fetch()) {
            $categories[str_repeat(
                '&nbsp;&nbsp;',
-                (int) $rs->f('level') - 1
-            ) . '&bull; ' . Html::escapeHTML($rs->f('cat_title'))] = $rs->f('cat_id');
+                $rs->level - 1
+            ) . '&bull; ' . html::escapeHTML($rs->cat_title)] = $rs->cat_id;
        }
        $w->lastpostsextend->setting(
            'category',
@ -89,8 +82,7 @@ class Widgets
            $categories
        );
        unset($rs, $categories);
-
-        // Passworded
+        # Pasworded
        $w->lastpostsextend->setting(
            'passworded',
            __('Protection:'),
@ -102,8 +94,7 @@ class Widgets
                __('only with password')    => 'yes',
            ]
        );
-
-        // Status
+        # Status
        $w->lastpostsextend->setting(
            'status',
            __('Status:'),
@ -117,24 +108,21 @@ class Widgets
                __('published')   => '1',
            ]
        );
-
-        // Selected entries only
+        # Selected entries only
        $w->lastpostsextend->setting(
            'selectedonly',
            __('Selected entries only'),
            0,
            'check'
        );
-
-        // Updated entries only
+        # Updated entries only
        $w->lastpostsextend->setting(
            'updatedonly',
            __('Updated entries only'),
            0,
            'check'
        );
-
-        // Tag
+        # Tag
        if (dcCore::app()->plugins->moduleExists('tags')) {
            $w->lastpostsextend->setting(
                'tag',
@ -143,24 +131,21 @@ class Widgets
                'text'
            );
        }
-
-        // Search
+        # Search
        $w->lastpostsextend->setting(
            'search',
            __('Limit to words:'),
            '',
            'text'
        );
-
-        // Entries limit
+        # Entries limit
        $w->lastpostsextend->setting(
            'limit',
            __('Entries limit:'),
            10,
            'text'
        );
-
-        // Sort
+        # Sort type
        $w->lastpostsextend->setting(
            'sortby',
            __('Order by:'),
@ -172,6 +157,7 @@ class Widgets
                __('Comments') => 'nb_comment',
            ]
        );
+        # Sort order
        $w->lastpostsextend->setting(
            'sort',
            __('Sort:'),
@ -182,8 +168,7 @@ class Widgets
                __('Descending') => 'desc',
            ]
        );
-
-        // First image
+        # First image
        $w->lastpostsextend->setting(
            'firstimage',
            __('Show entries first image:'),
@ -198,76 +183,103 @@ class Widgets
                __('original')  => 'o',
            ]
        );
-
-        // With excerpt
+        # With excerpt
        $w->lastpostsextend->setting(
            'excerpt',
            __('Show entries excerpt'),
            0,
            'check'
        );
-
-        // Excerpt cut length
+        # Excerpt length
        $w->lastpostsextend->setting(
            'excerptlen',
            __('Excerpt length:'),
            100,
            'text'
        );
-
-        // Comment count
+        # Comment count
        $w->lastpostsextend->setting(
            'commentscount',
            __('Show comments count'),
            0,
            'check'
        );
-
-        // commons
-        $w->lastpostsextend
-            ->addHomeOnly()
-            ->addContentOnly()
-            ->addClass()
-            ->addOffline();
+        # Home only
+        $w->lastpostsextend->setting(
+            'homeonly',
+            __('Display on:'),
+            0,
+            'combo',
+            [
+                __('All pages')           => 0,
+                __('Home page only')      => 1,
+                __('Except on home page') => 2,
+            ]
+        );
+        # widget option - content only
+        $w->lastpostsextend->setting(
+            'content_only',
+            __('Content only'),
+            0,
+            'check'
+        );
+        # widget option - additionnal CSS
+        $w->lastpostsextend->setting(
+            'class',
+            __('CSS class:'),
+            ''
+        );
+        # widget option - put offline
+        $w->lastpostsextend->setting(
+            'offline',
+            __('Offline'),
+            0,
+            'check'
+        );
    }

-    public static function parseWidget(WidgetsElement $w): string
+    public static function parseWidget($w)
    {
-        // Widget is offline & Home page only
-        if (is_null(dcCore::app()->auth) || is_null(dcCore::app()->blog) || $w->offline || !$w->checkHomeOnly(dcCore::app()->url->type)) {
-            return '';
-        }
-
-        // Need posts excerpt
-        if ($w->excerpt) {
-            $params['columns'][] = 'post_excerpt';
-        }
-
-        // prepare request params
        $params = [
            'sql'     => '',
            'columns' => [],
            'from'    => '',
        ];

-        // Passworded
+        # Widget is offline
+        if ($w->offline) {
+            return;
+        }
+
+        # Home page only
+        if ($w->homeonly == 1 && dcCore::app()->url->type != 'default'
+        || $w->homeonly  == 2 && dcCore::app()->url->type == 'default') {
+            return null;
+        }
+
+        # Need posts excerpt
+        if ($w->excerpt) {
+            $params['columns'][] = 'post_excerpt';
+        }
+
+        # Passworded
        if ($w->passworded == 'yes') {
            $params['sql'] .= 'AND post_password IS NOT NULL ';
        } elseif ($w->passworded == 'no') {
            $params['sql'] .= 'AND post_password IS NULL ';
        }

-        // Status
+        # Status
        if ($w->status != 'all') {
            $params['post_status'] = $w->status;
        }

-        // Search words
+        # Search words
        if ('' != $w->search) {
            $params['search'] = $w->search;
        }

-        // Updated posts only
+        # Updated posts only
        if ($w->updatedonly) {
            $params['sql'] .= 'AND post_creadt < post_upddt ' .
                'AND post_dt < post_upddt ';
@ -286,15 +298,15 @@ class Widgets
        $params['limit']      = abs((int) $w->limit);
        $params['no_content'] = true;

-        // Selected posts only
+        # Selected posts only
        if ($w->selectedonly) {
            $params['post_selected'] = 1;
        }

-        // Post type
+        # Type
        $params['post_type'] = $w->posttype;

-        // Category
+        # Category
        if ($w->category) {
            if ($w->category == 'null') {
                $params['sql'] .= ' AND P.cat_id IS NULL ';
@ -305,13 +317,13 @@ class Widgets
            }
        }

-        // Tags
+        # Tags
        if (dcCore::app()->plugins->moduleExists('tags') && $w->tag) {
            $tags = explode(',', $w->tag);
            foreach ($tags as $i => $tag) {
                $tags[$i] = trim($tag);
            }
-            $params['from'] .= ', ' . dcCore::app()->prefix . dcMeta::META_TABLE_NAME . ' META ';
+            $params['from'] .= ', ' . dcCore::app()->prefix . 'meta META ';
            $params['sql']  .= 'AND META.post_id = P.post_id ';
            $params['sql']  .= 'AND META.meta_id ' . dcCore::app()->con->in($tags) . ' ';
            $params['sql']  .= "AND META.meta_type = 'tag' ";
@ -323,58 +335,53 @@ class Widgets
            false
        );

-        // No result
+        # No result
        if ($rs->isEmpty()) {
-            return '';
+            return null;
        }

-        // Parse result
-        $res = $w->title ? $w->renderTitle(Html::escapeHTML($w->title)) : '';
+        # Return
+        $res = $w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '';

        while ($rs->fetch()) {
-            if (is_null(dcCore::app()->blog)) { // phpstan ignores previous check !?
-                break;
-            }
-            $published = ((int) $rs->f('post_status')) == dcBlog::POST_PUBLISHED;
-
            $res .= '<li>' .
-            '<' . ($published ? 'a href="' . $rs->getURL() . '"' : 'span') .
+            '<' . ($rs->post_status == 1 ? 'a href="' . $rs->getURL() . '"' : 'span') .
            ' title="' .
-            Date::dt2str(
-                dcCore::app()->blog->settings->get('system')->get('date_format'),
-                $rs->f('post_upddt')
+            dt::dt2str(
+                dcCore::app()->blog->settings->system->date_format,
+                $rs->post_upddt
            ) . ', ' .
-            Date::dt2str(
-                dcCore::app()->blog->settings->get('system')->get('time_format'),
-                $rs->f('post_upddt')
+            dt::dt2str(
+                dcCore::app()->blog->settings->system->time_format,
+                $rs->post_upddt
            ) . '">' .
-            Html::escapeHTML($rs->f('post_title')) .
-            '</' . ($published ? 'a' : 'span') . '>';
+            html::escapeHTML($rs->post_title) .
+            '</' . ($rs->post_status == 1 ? 'a' : 'span') . '>';

-            // Nb comments
-            if ($w->commentscount && $published) {
+            # Nb comments
+            if ($w->commentscount && $rs->post_status == 1) {
                $res .= ' (' . $rs->nb_comment . ')';
            }

-            // First image
+            # First image
            if ($w->firstimage != '') {
                $res .= self::entryFirstImage(
-                    $rs->f('post_type'),
-                    $rs->f('post_id'),
+                    $rs->post_type,
+                    $rs->post_id,
                    $w->firstimage
                );
            }

-            // Excerpt
+            # Excerpt
            if ($w->excerpt) {
-                $excerpt = $rs->f('post_excerpt');
-                if ($rs->f('post_format') == 'wiki') {
+                $excerpt = $rs->post_excerpt;
+                if ($rs->post_format == 'wiki') {
                    dcCore::app()->initWikiComment();
                    $excerpt = dcCore::app()->wikiTransform($excerpt);
                    $excerpt = dcCore::app()->HTMLfilter($excerpt);
                }
                if (strlen($excerpt) > 0) {
-                    $cut = Text::cutString(
+                    $cut = text::cutString(
                        $excerpt,
                        abs((int) $w->excerptlen)
                    );
@ -387,16 +394,16 @@ class Widgets
        }

        return $w->renderDiv(
-            (bool) $w->content_only,
+            $w->content_only,
            'lastpostsextend ' . $w->class,
            '',
            '<ul>' . $res . '</ul>'
        );
    }

-    private static function entryFirstImage(string $type, $id, string $size = 's'): string
+    private static function entryFirstImage($type, $id, $size = 's')
    {
-        if (is_null(dcCore::app()->auth) || is_null(dcCore::app()->blog) || !in_array($type, ['post', 'page', 'galitem'])) {
+        if (!in_array($type, ['post', 'page', 'galitem'])) {
            return '';
        }

@ -414,8 +421,8 @@ class Widgets
            $size = 's';
        }

-        $p_url  = (string) dcCore::app()->blog->settings->get('system')->get('public_url');
-        $p_site = (string) preg_replace(
+        $p_url  = dcCore::app()->blog->settings->system->public_url;
+        $p_site = preg_replace(
            '#^(.+?//.+?)/(.*)$#',
            '$1',
            dcCore::app()->blog->url
@ -428,10 +435,10 @@ class Widgets
        $src = '';
        $alt = '';

-        $subject = $rs->f('post_excerpt_xhtml') . $rs->f('post_content_xhtml') . $rs->f('cat_desc');
+        $subject = $rs->post_excerpt_xhtml . $rs->post_content_xhtml . $rs->cat_desc;
        if (preg_match_all($pattern, $subject, $m) > 0) {
            foreach ($m[1] as $i => $img) {
-                if (($src = self::ContentFirstImageLookup($p_root, $img, $size)) != '') {
+                if (($src = self::ContentFirstImageLookup($p_root, $img, $size)) !== false) {
                    $src = $p_url . (dirname($img) != '/' ? dirname($img) : '') . '/' . $src;
                    if (preg_match('/alt="([^"]+)"/', $m[0][$i], $malt)) {
                        $alt = $malt[1];
@ -449,24 +456,23 @@ class Widgets
        return
        '<div class="img-box">' .
        '<div class="img-thumbnail">' .
-        '<a title="' . Html::escapeHTML($rs->f('post_title')) . '" href="' . $rs->getURL() . '">' .
+        '<a title="' . html::escapeHTML($rs->post_title) . '" href="' . $rs->getURL() . '">' .
        '<img alt="' . $alt . '" src="' . stripslashes($src) . '" />' .
        '</a></div>' .
        "</div>\n";
    }

-    private static function ContentFirstImageLookup(string $root, string $img, string $size): string
+    private static function ContentFirstImageLookup($root, $img, $size)
    {
-        $res = '';
-
        # Get base name and extension
-        $info = Path::info($img);
+        $info = path::info($img);
        $base = $info['base'];

        if (preg_match('/^\.(.+)_(sq|t|s|m)$/', $base, $m)) {
            $base = $m[1];
        }

+        $res = false;
        if ($size != 'o' && file_exists($root . '/' . $info['dirname'] . '/.' . $base . '_' . $size . '.jpg')) {
            $res = '.' . $base . '_' . $size . '.jpg';
        } else {
@ -482,6 +488,6 @@ class Widgets
            }
        }

-        return $res;
+        return $res ? $res : false;
    }
 }
--- a/dcstore.xml
+++ b/dcstore.xml
@ -2,11 +2,11 @@
 <modules xmlns:da="http://dotaddict.org/da/">
  <module id="lastpostsExtend">
    <name>Last entries (Extended)</name>
-    <version>2023.06.17</version>
+    <version>2022.11.20</version>
    <author>Jean-Christian Denis and contributors</author>
    <desc>Extended list of entries</desc>
-    <file>https://github.com/JcDenis/lastpostsExtend/releases/download/v2023.06.17/plugin-lastpostsExtend.zip</file>
-    <da:dcmin>2.26</da:dcmin>
+    <file>https://github.com/JcDenis/lastpostsExtend/releases/download/v2022.11.20/plugin-lastpostsExtend.zip</file>
+    <da:dcmin>2.24</da:dcmin>
    <da:details>http://plugins.dotaddict.org/dc2/details/lastpostsExtend</da:details>
    <da:support>https://github.com/JcDenis/lastpostsExtend</da:support>
  </module>
--- a/locales/fr/main.lang.php
+++ b/locales/fr/main.lang.php
@ -1,28 +0,0 @@
-<?php
-/**
- * @package Dotclear
- *
- * @copyright Olivier Meunier & Association Dotclear
- * @copyright GPL-2.0-only
- */
-#
-# DOT NOT MODIFY THIS FILE !
-#
-
-use Dotclear\Helper\L10n;
-
-L10n::$locales['Last entries (Extended)']   = 'Derniers billets (étendu)';
-L10n::$locales['Extended list of entries']  = 'Liste étendue de billets';
-L10n::$locales['Post']                      = 'Billet';
-L10n::$locales['Gallery']                   = 'Galerie';
-L10n::$locales['Protection:']               = 'Protection :';
-L10n::$locales['only without password']     = 'seulement sans mot de passe';
-L10n::$locales['only with password']        = 'seulement avec mot de passe';
-L10n::$locales['Selected entries only']     = 'Billets sélectionnés seulement';
-L10n::$locales['Updated entries only']      = 'Billets mis à jour seulement';
-L10n::$locales['Limit to tags:']            = 'Limiter aux mots-clés :';
-L10n::$locales['Limit to words:']           = 'Limiter aux mots :';
-L10n::$locales['Show entries first image:'] = 'Afficher la première image du billet :';
-L10n::$locales['Show entries excerpt']      = 'Afficher l\'extrait';
-L10n::$locales['Excerpt length:']           = 'Taille de l\'extrait :';
-L10n::$locales['Show comments count']       = 'Afficher le nombre de commentaires';
--- a/src/Backend.php
+++ b/src/Backend.php
@ -1,41 +0,0 @@
-<?php
-/**
- * @brief lastpostsExtend, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis and contributors
- *
- * @copyright Jean-Christian Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
-declare(strict_types=1);
-
-namespace Dotclear\Plugin\lastpostsExtend;
-
-use dcCore;
-use dcNsProcess;
-
-class Backend extends dcNsProcess
-{
-    public static function init(): bool
-    {
-        static::$init = defined('DC_CONTEXT_ADMIN');
-
-        return static::$init;
-    }
-
-    public static function process(): bool
-    {
-        if (!static::$init) {
-            return false;
-        }
-
-        dcCore::app()->addBehaviors([
-            'initWidgets' => [Widgets::class, 'initWidgets'],
-        ]);
-
-        return true;
-    }
-}
--- a/src/Frontend.php
+++ b/src/Frontend.php
@ -1,41 +0,0 @@
-<?php
-/**
- * @brief lastpostsExtend, a plugin for Dotclear 2
- *
- * @package Dotclear
- * @subpackage Plugin
- *
- * @author Jean-Christian Denis and contributors
- *
- * @copyright Jean-Christian Denis
- * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
- */
-declare(strict_types=1);
-
-namespace Dotclear\Plugin\lastpostsExtend;
-
-use dcCore;
-use dcNsProcess;
-
-class Frontend extends dcNsProcess
-{
-    public static function init(): bool
-    {
-        static::$init = true;
-
-        return static::$init;
-    }
-
-    public static function process(): bool
-    {
-        if (!static::$init) {
-            return false;
-        }
-
-        dcCore::app()->addBehaviors([
-            'initWidgets' => [Widgets::class, 'initWidgets'],
-        ]);
-
-        return true;
-    }
-}