From 78730bfa7a238b80c83615d23eb025b7089daa3e Mon Sep 17 00:00:00 2001 From: Jean-Christian Denis Date: Fri, 24 Mar 2023 23:43:29 +0100 Subject: [PATCH] use namespace --- src/Backend.php | 32 ++++- src/Frontend.php | 150 +++------------------ src/Widgets.php | 341 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 289 insertions(+), 234 deletions(-) diff --git a/src/Backend.php b/src/Backend.php index 0d10e3e..5c25be3 100644 --- a/src/Backend.php +++ b/src/Backend.php @@ -10,8 +10,32 @@ * @copyright Jean-Christian Denis * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html */ -if (!defined('DC_CONTEXT_ADMIN')) { - return null; -} +declare(strict_types=1); -require __DIR__ . '/_widgets.php'; +namespace Dotclear\Plugin\myBlogNumbers; + +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; + } +} diff --git a/src/Frontend.php b/src/Frontend.php index 467a154..66a3511 100644 --- a/src/Frontend.php +++ b/src/Frontend.php @@ -10,140 +10,32 @@ * @copyright Jean-Christian Denis * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html */ -if (!defined('DC_RC_PATH')) { - return null; -} +declare(strict_types=1); -require __DIR__ . '/_widgets.php'; +namespace Dotclear\Plugin\myBlogNumbers; -function myBlogNumbersWidgetPublic($w) +use dcCore; +use dcNsProcess; + +class Frontend extends dcNsProcess { - $content = $addons = ''; - $s_line = '
  • %s%s
    • '; - $s_title = '%s '; + public static function init(): bool + { + static::$init = true; - if ($w->offline) { - return; + return static::$init; } - if (!$w->checkHomeOnly(dcCore::app()->url->type)) { - return null; + public static function process(): bool + { + if (!static::$init) { + return false; + } + + dcCore::app()->addBehaviors([ + 'initWidgets' => [Widgets::class, 'initWidgets'], + ]); + + return true; } - - # Entry - if ($w->entry_show) { - $title = $w->entry_title ? - sprintf($s_title, html::escapeHTML($w->entry_title)) : ''; - - $count = dcCore::app()->blog->getPosts([], true)->f(0); - - $text = $count == 0 ? - sprintf(__('no entries'), $count) : - sprintf(__('one entry', '%s entries', $count), $count); - - $content .= sprintf($s_line, $title, $text); - } - - # Cat - if ($w->cat_show) { - $title = $w->cat_title ? - sprintf($s_title, html::escapeHTML($w->cat_title)) : ''; - - $count = dcCore::app()->blog->getCategories([])->count(); - - $text = $count == 0 ? - sprintf(__('no categories'), $count) : - sprintf(__('one category', '%s categories', $count), $count); - - $content .= sprintf($s_line, $title, $text); - } - - # Comment - if ($w->comment_show) { - $title = $w->comment_title ? - sprintf($s_title, html::escapeHTML($w->comment_title)) : ''; - - $params = [ - 'post_type' => 'post', - 'comment_status' => 1, - 'comment_trackback' => 0, - ]; - $count = dcCore::app()->blog->getComments($params, true)->f(0); - - $text = $count == 0 ? - sprintf(__('no comments'), $count) : - sprintf(__('one comment', '%s comments', $count), $count); - - $content .= sprintf($s_line, $title, $text); - } - - # Trackback - if ($w->trackback_show) { - $title = $w->trackback_title ? - sprintf($s_title, html::escapeHTML($w->trackback_title)) : ''; - - $params = [ - 'post_type' => 'post', - 'comment_status' => 1, - 'comment_trackback' => 1, - ]; - $count = dcCore::app()->blog->getComments($params, true)->f(0); - - $text = $count == 0 ? - sprintf(__('no trackbacks'), $count) : - sprintf(__('one trackback', '%s trackbacks', $count), $count); - - $content .= sprintf($s_line, $title, $text); - } - - # Tag - if (dcCore::app()->plugins->moduleExists('tags') && $w->tag_show) { - $title = $w->tag_title ? - sprintf($s_title, html::escapeHTML($w->tag_title)) : ''; - - $count = dcCore::app()->con->select( - 'SELECT count(M.meta_id) AS count ' . - 'FROM ' . dcCore::app()->prefix . 'meta M ' . - 'LEFT JOIN ' . dcCore::app()->prefix . 'post P ON P.post_id=M.post_id ' . - "WHERE M.meta_type='tag' " . - "AND P.blog_id='" . dcCore::app()->blog->id . "' " - )->f(0); - - $text = $count == 0 ? - sprintf(__('no tags'), $count) : - sprintf(__('one tag', '%s tags', $count), $count); - - $content .= sprintf($s_line, $title, $text); - } - - # User (that post) - if ($w->user_show) { - $title = $w->user_title ? - sprintf($s_title, html::escapeHTML($w->user_title)) : ''; - - $count = dcCore::app()->blog->getPostsUsers('post')->count(); - - $text = $count == 0 ? - sprintf(__('no author'), $count) : - sprintf(__('one author', '%s authors', $count), $count); - - $content .= sprintf($s_line, $title, $text); - } - - # --BEHAVIOR-- myBlogNumbersWidgetParse - $addons = dcCore::app()->callBehavior('myBlogNumbersWidgetParse', $w); - - # Nothing to display - if (!$content && !$addons) { - return null; - } - - # Display - return $w->renderDiv( - $w->content_only, - 'myblognumbers ' . $w->class, - '', - ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') . - sprintf('', $content . $addons) - ); } diff --git a/src/Widgets.php b/src/Widgets.php index 6794e48..c14a65b 100644 --- a/src/Widgets.php +++ b/src/Widgets.php @@ -10,119 +10,258 @@ * @copyright Jean-Christian Denis * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html */ -if (!defined('DC_RC_PATH')) { - return null; -} +declare(strict_types=1); -dcCore::app()->addBehavior('initWidgets', 'myBlogNumbersWidgetAdmin'); +namespace Dotclear\Plugin\myBlogNumbers; -function myBlogNumbersWidgetAdmin($w) +use dcCore; +use dcMeta; +use Dotclear\Plugin\widgets\WidgetsStack; +use Dotclear\Plugin\widgets\WidgetsElement; +use html; + +class Widgets { - $w - ->create( - 'myblognumbers', - __('My blog numbers'), - 'myBlogNumbersWidgetPublic', - null, - __('Show some figures of your blog') - ) - ->addTitle(__('My blog numbers')) + public static function initWidgets(WidgetsStack $w): void + { + $w + ->create( + 'myblognumbers', + __('My blog numbers'), + [self::class, 'frontendWidget'], + null, + __('Show some figures of your blog') + ) + ->addTitle(__('My blog numbers')) - # Entry - ->setting( - 'entry_show', - __('Show entries count'), - 1, - 'check' - ) - ->setting( - 'entry_title', - __('Title for entries count:'), - __('Entries:'), - 'text' - ) - - # Cat - ->setting( - 'cat_show', - __('Show categories count'), - 1, - 'check' - ) - ->setting( - 'cat_title', - __('Title for categories count:'), - __('Categories:'), - 'text' - ) - - # Comment - ->setting( - 'comment_show', - __('Show comments count'), - 1, - 'check' - ) - ->setting( - 'comment_title', - __('Title for comments count:'), - __('Comments:'), - 'text' - ) - - # Trackback - ->setting( - 'trackback_show', - __('Show trackbacks count'), - 1, - 'check' - ) - ->setting( - 'trackback_title', - __('Title for trackbacks count:'), - __('Trackbacks:'), - 'text' - ); - - if (dcCore::app()->plugins->moduleExists('tags')) { - # Tag - $w->myblognumbers + # Entry ->setting( - 'tag_show', - __('Show tags count'), + 'entry_show', + __('Show entries count'), 1, 'check' ) ->setting( - 'tag_title', - __('Title for tags count:'), - __('Tags:'), + 'entry_title', + __('Title for entries count:'), + __('Entries:'), + 'text' + ) + + # Cat + ->setting( + 'cat_show', + __('Show categories count'), + 1, + 'check' + ) + ->setting( + 'cat_title', + __('Title for categories count:'), + __('Categories:'), + 'text' + ) + + # Comment + ->setting( + 'comment_show', + __('Show comments count'), + 1, + 'check' + ) + ->setting( + 'comment_title', + __('Title for comments count:'), + __('Comments:'), + 'text' + ) + + # Trackback + ->setting( + 'trackback_show', + __('Show trackbacks count'), + 1, + 'check' + ) + ->setting( + 'trackback_title', + __('Title for trackbacks count:'), + __('Trackbacks:'), 'text' ); + + if (dcCore::app()->plugins->moduleExists('tags')) { + # Tag + $w->myblognumbers + ->setting( + 'tag_show', + __('Show tags count'), + 1, + 'check' + ) + ->setting( + 'tag_title', + __('Title for tags count:'), + __('Tags:'), + 'text' + ); + } + + # Users (that post) + $w->myblognumbers + ->setting( + 'user_show', + __('Show users count'), + 1, + 'check' + ) + ->setting( + 'user_title', + __('Title for users count:'), + __('Authors:'), + 'text' + ); + + # --BEHAVIOR-- myBlogNumbersWidgetInit + dcCore::app()->callBehavior('myBlogNumbersWidgetInit', $w); + + # widget option - page to show on + $w->myblognumbers + ->addHomeOnly() + ->addContentOnly() + ->addClass() + ->addOffline(); } - # Users (that post) - $w->myblognumbers - ->setting( - 'user_show', - __('Show users count'), - 1, - 'check' - ) - ->setting( - 'user_title', - __('Title for users count:'), - __('Authors:'), - 'text' + public static function frontendWidget(WidgetsElement $w): string + { + $content = $addons = ''; + $s_line = '
  • %s%s
    • '; + $s_title = '%s '; + + if ($w->offline) { + return ''; + } + + if (!$w->checkHomeOnly(dcCore::app()->url->type)) { + return ''; + } + + # Entry + if ($w->entry_show) { + $title = $w->entry_title ? + sprintf($s_title, html::escapeHTML($w->entry_title)) : ''; + + $count = (int) dcCore::app()->blog->getPosts([], true)->f(0); + + $text = $count == 0 ? + sprintf(__('no entries'), $count) : + sprintf(__('one entry', '%s entries', $count), $count); + + $content .= sprintf($s_line, $title, $text); + } + + # Cat + if ($w->cat_show) { + $title = $w->cat_title ? + sprintf($s_title, html::escapeHTML($w->cat_title)) : ''; + + $count = dcCore::app()->blog->getCategories([])->count(); + + $text = $count == 0 ? + sprintf(__('no categories'), $count) : + sprintf(__('one category', '%s categories', $count), $count); + + $content .= sprintf($s_line, $title, $text); + } + + # Comment + if ($w->comment_show) { + $title = $w->comment_title ? + sprintf($s_title, html::escapeHTML($w->comment_title)) : ''; + + $params = [ + 'post_type' => 'post', + 'comment_status' => 1, + 'comment_trackback' => 0, + ]; + $count = (int) dcCore::app()->blog->getComments($params, true)->f(0); + + $text = $count == 0 ? + sprintf(__('no comments'), $count) : + sprintf(__('one comment', '%s comments', $count), $count); + + $content .= sprintf($s_line, $title, $text); + } + + # Trackback + if ($w->trackback_show) { + $title = $w->trackback_title ? + sprintf($s_title, html::escapeHTML($w->trackback_title)) : ''; + + $params = [ + 'post_type' => 'post', + 'comment_status' => 1, + 'comment_trackback' => 1, + ]; + $count = (int) dcCore::app()->blog->getComments($params, true)->f(0); + + $text = $count == 0 ? + sprintf(__('no trackbacks'), $count) : + sprintf(__('one trackback', '%s trackbacks', $count), $count); + + $content .= sprintf($s_line, $title, $text); + } + + # Tag + if (dcCore::app()->plugins->moduleExists('tags') && $w->tag_show) { + $title = $w->tag_title ? + sprintf($s_title, html::escapeHTML($w->tag_title)) : ''; + + $count = (int) dcCore::app()->con->select( + 'SELECT count(M.meta_id) AS count ' . + 'FROM ' . dcCore::app()->prefix . dcMeta::META_TABLE_NAME . ' M ' . + 'LEFT JOIN ' . dcCore::app()->prefix . 'post P ON P.post_id=M.post_id ' . + "WHERE M.meta_type='tag' " . + "AND P.blog_id='" . dcCore::app()->blog->id . "' " + )->f(0); + + $text = $count == 0 ? + sprintf(__('no tags'), $count) : + sprintf(__('one tag', '%s tags', $count), $count); + + $content .= sprintf($s_line, $title, $text); + } + + # User (that post) + if ($w->user_show) { + $title = $w->user_title ? + sprintf($s_title, html::escapeHTML($w->user_title)) : ''; + + $count = dcCore::app()->blog->getPostsUsers('post')->count(); + + $text = $count == 0 ? + sprintf(__('no author'), $count) : + sprintf(__('one author', '%s authors', $count), $count); + + $content .= sprintf($s_line, $title, $text); + } + + # --BEHAVIOR-- myBlogNumbersWidgetParse + $addons = dcCore::app()->callBehavior('myBlogNumbersWidgetParse', $w); + + # Nothing to display + if (!$content && !$addons) { + return ''; + } + + # Display + return $w->renderDiv( + (bool) $w->content_only, + 'myblognumbers ' . $w->class, + '', + ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') . + sprintf('', $content . $addons) ); - - # --BEHAVIOR-- myBlogNumbersWidgetInit - dcCore::app()->callBehavior('myBlogNumbersWidgetInit', $w); - - # widget option - page to show on - $w->myblognumbers - ->addHomeOnly() - ->addContentOnly() - ->addClass() - ->addOffline(); + } }