diff --git a/_admin.php b/_admin.php
index a52bb8f..0d10e3e 100644
--- a/_admin.php
+++ b/_admin.php
@@ -1,18 +1,17 @@
registerModule(
'My blog numbers',
'Show some figures of your blog',
'Jean-Christian Denis, Pierre Van Glabeke',
- '2021.09.017',
+ '2022.11.12',
[
- 'requires' => [['core', '2.19']],
- 'permissions' => 'usage,contentadmin',
- 'type' => 'plugin',
- 'support' => 'http://forum.dotclear.org/viewtopic.php?id=40934',
- 'details' => 'http://plugins.dotaddict.org/dc2/details/myBlogNumbers',
- 'repository' => 'https://raw.githubusercontent.com/JcDenis/myBlogNumbers/master/dcstore.xml'
+ 'requires' => [['core', '2.24']],
+ 'permissions' => dcCore::app()->auth->makePermissions([
+ dcAuth::PERMISSION_USAGE,
+ dcAuth::PERMISSION_CONTENT_ADMIN,
+ ]),
+ 'type' => 'plugin',
+ 'support' => 'http://forum.dotclear.org/viewtopic.php?id=40934',
+ 'details' => 'http://plugins.dotaddict.org/dc2/details/myBlogNumbers',
+ 'repository' => 'https://raw.githubusercontent.com/JcDenis/myBlogNumbers/master/dcstore.xml',
]
-);
\ No newline at end of file
+);
diff --git a/_public.php b/_public.php
index 5688505..4614b0e 100644
--- a/_public.php
+++ b/_public.php
@@ -1,45 +1,42 @@
%s%s';
+ $s_line = '
%s%s';
$s_title = '%s ';
if ($w->offline) {
return;
}
- if (($w->homeonly == 1 && !$core->url->isHome($core->url->type))
- || ($w->homeonly == 2 && $core->url->isHome($core->url->type))) {
+ if (($w->homeonly == 1 && !dcCore::app()->url->isHome(dcCore::app()->url->type))
+ || ($w->homeonly == 2 && dcCore::app()->url->isHome(dcCore::app()->url->type))) {
return null;
}
# Entry
if ($w->entry_show) {
- $title = $w->entry_title ?
+ $title = $w->entry_title ?
sprintf($s_title, html::escapeHTML($w->entry_title)) : '';
- $count = $core->blog->getPosts([], true)->f(0);
+ $count = dcCore::app()->blog->getPosts([], true)->f(0);
$text = $count == 0 ?
sprintf(__('no entries'), $count) :
@@ -50,10 +47,10 @@ function myBlogNumbersWidgetPublic($w)
# Cat
if ($w->cat_show) {
- $title = $w->cat_title ?
+ $title = $w->cat_title ?
sprintf($s_title, html::escapeHTML($w->cat_title)) : '';
- $count = $core->blog->getCategories([])->count();
+ $count = dcCore::app()->blog->getCategories([])->count();
$text = $count == 0 ?
sprintf(__('no categories'), $count) :
@@ -64,53 +61,53 @@ function myBlogNumbersWidgetPublic($w)
# Comment
if ($w->comment_show) {
- $title = $w->comment_title ?
+ $title = $w->comment_title ?
sprintf($s_title, html::escapeHTML($w->comment_title)) : '';
$params = [
- 'post_type' => 'post',
- 'comment_status' => 1,
- 'comment_trackback' => 0
+ 'post_type' => 'post',
+ 'comment_status' => 1,
+ 'comment_trackback' => 0,
];
- $count = $core->blog->getComments($params, true)->f(0);
+ $count = dcCore::app()->blog->getComments($params, true)->f(0);
$text = $count == 0 ?
- sprintf(__('no comments'),$count) :
+ sprintf(__('no comments'), $count) :
sprintf(__('one comment', '%s comments', $count), $count);
- $content .= sprintf($s_line,$title,$text);
+ $content .= sprintf($s_line, $title, $text);
}
# Trackback
if ($w->trackback_show) {
- $title = $w->trackback_title ?
+ $title = $w->trackback_title ?
sprintf($s_title, html::escapeHTML($w->trackback_title)) : '';
$params = [
- 'post_type' => 'post',
- 'comment_status' => 1,
- 'comment_trackback' => 1
+ 'post_type' => 'post',
+ 'comment_status' => 1,
+ 'comment_trackback' => 1,
];
- $count = $core->blog->getComments($params, true)->f(0);
+ $count = dcCore::app()->blog->getComments($params, true)->f(0);
$text = $count == 0 ?
- sprintf(__('no trackbacks'),$count) :
+ sprintf(__('no trackbacks'), $count) :
sprintf(__('one trackback', '%s trackbacks', $count), $count);
- $content .= sprintf($s_line,$title,$text);
+ $content .= sprintf($s_line, $title, $text);
}
# Tag
- if ($core->plugins->moduleExists('tags') && $w->tag_show) {
- $title = $w->tag_title ?
- sprintf($s_title,html::escapeHTML($w->tag_title)) : '';
+ if (dcCore::app()->plugins->moduleExists('tags') && $w->tag_show) {
+ $title = $w->tag_title ?
+ sprintf($s_title, html::escapeHTML($w->tag_title)) : '';
- $count = $core->con->select(
+ $count = dcCore::app()->con->select(
'SELECT count(M.meta_id) AS count ' .
- 'FROM ' . $core->prefix . 'meta M ' .
- 'LEFT JOIN ' . $core->prefix . 'post P ON P.post_id=M.post_id ' .
- "WHERE M.meta_type='tag' " .
- "AND P.blog_id='" . $core->blog->id . "' "
+ '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 ?
@@ -122,20 +119,20 @@ function myBlogNumbersWidgetPublic($w)
# User (that post)
if ($w->user_show) {
- $title = $w->user_title ?
+ $title = $w->user_title ?
sprintf($s_title, html::escapeHTML($w->user_title)) : '';
- $count = $core->blog->getPostsUsers(array(),true)->count();
+ $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);
+ $content .= sprintf($s_line, $title, $text);
}
# --BEHAVIOR-- myBlogNumbersWidgetParse
- $addons = $core->callBehavior('myBlogNumbersWidgetParse', $core, $w);
+ $addons = dcCore::app()->callBehavior('myBlogNumbersWidgetParse', $w);
# Nothing to display
if (!$content && !$addons) {
@@ -147,7 +144,7 @@ function myBlogNumbersWidgetPublic($w)
$w->content_only,
'myblognumbers ' . $w->class,
'',
- ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') .
+ ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') .
sprintf('', $content . $addons)
);
-}
\ No newline at end of file
+}
diff --git a/_widgets.php b/_widgets.php
index 1884699..6794e48 100644
--- a/_widgets.php
+++ b/_widgets.php
@@ -1,26 +1,23 @@
addBehavior('initWidgets', 'myBlogNumbersWidgetAdmin');
+dcCore::app()->addBehavior('initWidgets', 'myBlogNumbersWidgetAdmin');
function myBlogNumbersWidgetAdmin($w)
{
- global $core;
-
$w
->create(
'myblognumbers',
@@ -87,7 +84,7 @@ function myBlogNumbersWidgetAdmin($w)
'text'
);
- if ($core->plugins->moduleExists('tags')) {
+ if (dcCore::app()->plugins->moduleExists('tags')) {
# Tag
$w->myblognumbers
->setting(
@@ -120,7 +117,7 @@ function myBlogNumbersWidgetAdmin($w)
);
# --BEHAVIOR-- myBlogNumbersWidgetInit
- $core->callBehavior('myBlogNumbersWidgetInit',$w);
+ dcCore::app()->callBehavior('myBlogNumbersWidgetInit', $w);
# widget option - page to show on
$w->myblognumbers
@@ -128,4 +125,4 @@ function myBlogNumbersWidgetAdmin($w)
->addContentOnly()
->addClass()
->addOffline();
-}
\ No newline at end of file
+}