JcDenis
/
activityReport
1
0
Fork 0
Code Issues Pull Requests Releases 3 Activity

upgrade to Dotclear 2.28

master
Jean-Christian Paul Denis 2023-10-17 22:47:35 +02:00
parent d8d0597526
commit 78c34f1b76
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
23 changed files with 328 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
_init.php
View File

@ -1,20 +0,0 @@
<?php
/**
* @brief activityReport, 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;
}
class initActivityReport
{
public const ACTIVITY_TABLE_NAME = 'activity';
}

22
src/Action.php
View File

@ -1,23 +1,17 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use dcCore;
use Dotclear\App;
/**
* Action descriptor.
* @brief activityReport action descriptor class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Action
{
@ -39,7 +33,7 @@ class Action
) {
// fake action has no behavior
if (!is_null($function)) {
dcCore::app()->addBehavior($behavior, $function);
App::behavior()->addBehavior($behavior, $function);
}
}
}

127
src/ActivityBehaviors.php
View File

@ -1,23 +1,12 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use ArrayObject;
use dcBlog;
use dcCore;
use dcUtils;
use Dotclear\App;
use Dotclear\Interface\Core\BlogInterace;
use Dotclear\Database\{
Cursor,
MetaRecord
@ -25,7 +14,15 @@ use Dotclear\Database\{
use Dotclear\Helper\Network\Http;
/**
*/
/**
* @brief activityReport register class.
* @ingroup activityReport
*
* Register default activities and export mail formats.
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class ActivityBehaviors
{
@ -45,7 +42,7 @@ class ActivityBehaviors
__('Special messages'),
__('%s'),
'messageActivityReport',
[self::class, 'messageActivityReport']
self::messageActivityReport(...)
));
// Not use as it is global : BEHAVIOR adminAfterBlogCreate in admin/blog.php
@ -56,7 +53,7 @@ class ActivityBehaviors
__('updating blog'),
__('Blog was updated by "%s"'),
'adminAfterBlogUpdate',
[self::class, 'blogUpdate']
self::blogUpdate(...)
));
// from BEHAVIOR publicHeadContent in template
@ -65,7 +62,7 @@ class ActivityBehaviors
__('404 error'),
__('New 404 error page at "%s"'),
'publicHeadContent',
[self::class, 'blogP404']
self::blogP404(...)
));
// from BEHAVIOR coreAfterPostCreate in inc/core/class.dc.blog.php (DC 2.2)
@ -76,7 +73,7 @@ class ActivityBehaviors
__('post creation'),
__('A new post called "%s" was created by "%s" at %s'),
'adminAfterPostCreate',
[self::class, 'postCreate']
self::postCreate(...)
));
// Plugin contribute
@ -86,7 +83,7 @@ class ActivityBehaviors
__('post creation'),
__('A new post called "%s" was created by "%s" at %s'),
'publicAfterPostCreate',
[self::class, 'postCreate']
self::postCreate(...)
));
// from BEHAVIOR coreAfterPostUpdate in inc/core/class.dc.blog.php (DC2.2)
@ -96,7 +93,7 @@ class ActivityBehaviors
__('updating post'),
__('Post called "%s" has been updated by "%s" at %s'),
'adminAfterPostUpdate',
[self::class, 'postUpdate']
self::postUpdate(...)
));
// from BEHAVIOR adminBeforePostDelete in admin/post.php
@ -105,7 +102,7 @@ class ActivityBehaviors
__('post deletion'),
__('Post called "%s" has been deleted by "%s"'),
'adminBeforePostDelete',
[self::class, 'postDelete']
self::postDelete(...)
));
// Wrong attempt on passworded enrty
@ -115,7 +112,7 @@ class ActivityBehaviors
__('Post protection'),
__('An attempt failed on a passworded post with password "%s" at "%s"'),
'urlHandlerServeDocument',
[self::class, 'postPasswordAttempt']
self::postPasswordAttempt(...)
));
// from BEHAVIOR coreAfterCommentCreate in inc/core/class.dc.blog.php
@ -126,7 +123,7 @@ class ActivityBehaviors
__('comment creation'),
__('A new comment was created by "%s" on post "%s" at %s'),
'coreAfterCommentCreate',
[self::class, 'commentCreate']
self::commentCreate(...)
));
// from BEHAVIOR coreAfterCommentUpdate in inc/core/class.dc.blog.php
@ -136,7 +133,7 @@ class ActivityBehaviors
__('updating comment'),
__('Comment has been updated by "%s" at %s'),
'coreAfterCommentUpdate',
[self::class, 'commentUpdate']
self::commentUpdate(...)
));
// Missing coreBeforeCommentDelete in inc/core/class.dc.blog.php
@ -149,7 +146,7 @@ class ActivityBehaviors
__('trackback creation'),
__('A new trackback to "%" at "%s" was created on post "%s" at %s'),
'coreAfterCommentCreate',
[self::class, 'trackbackCreate']
self::trackbackCreate(...)
));
// from BEHAVIOR adminAfterCategoryCreate in admin/category.php
@ -158,7 +155,7 @@ class ActivityBehaviors
__('category creation'),
__('A new category called "%s" was created by "%s" at %s'),
'adminAfterCategoryCreate',
[self::class, 'categoryCreate']
self::categoryCreate(...)
));
// from BEHAVIOR adminAfterCategoryUpdate in admin/category.php
@ -167,7 +164,7 @@ class ActivityBehaviors
__('updating category'),
__('Category called "%s" has been updated by "%s" at %s'),
'adminAfterCategoryUpdate',
[self::class, 'categoryUpdate']
self::categoryUpdate(...)
));
// Missing adminBeforeCategoryDelete in admin/category.php
@ -178,7 +175,7 @@ class ActivityBehaviors
__('user creation'),
__('A new user named "%s" was created by "%s"'),
'adminAfterUserCreate',
[self::class, 'userCreate']
self::userCreate(...)
));
// from BEHAVIOR adminAfterUserUpdated in admin/user.php
@ -187,7 +184,7 @@ class ActivityBehaviors
__('updating user'),
__('User named "%s" has been updated by "%s"'),
'adminAfterUserUpdate',
[self::class, 'userUpdate']
self::userUpdate(...)
));
// from BEHAVIOR adminAfterUserProfileUpdate in admin/preferences.php
@ -196,21 +193,21 @@ class ActivityBehaviors
__('updating user preference'),
__('"%s" user preference has been updated'),
'adminAfterUserProfileUpdate',
[self::class, 'userPreference']
self::userPreference(...)
));
$user->add(new Action(
'preference',
__('updating user preference'),
__('"%s" user preference has been updated'),
'adminAfterUserOptionsUpdate',
[self::class, 'userPreference']
self::userPreference(...)
));
$user->add(new Action(
'preference',
__('updating user preference'),
__('"%s" user preference has been updated'),
'adminAfterDashboardOptionsUpdate',
[self::class, 'userOption']
self::userOption(...)
));
// from BEHAVIOR adminBeforeUserDelete in admin/users.php
@ -219,7 +216,7 @@ class ActivityBehaviors
__('user deletion'),
__('User named "%s" has been deleted by "%"'),
'adminBeforeUserDelete',
[self::class, 'userDelete']
self::userDelete(...)
));
ActivityReport::instance()->groups
@ -274,26 +271,26 @@ class ActivityBehaviors
public static function blogUpdate(Cursor $cur, string $blog_id): void
{
$logs = [self::str(dcCore::app()->auth->getInfo('user_cn'))];
$logs = [self::str(App::auth()->getInfo('user_cn'))];
ActivityReport::instance()->addLog('blog', 'update', $logs);
}
public static function blogP404(): void
{
if (dcCore::app()->url->type != '404') {
if (App::url()->type != '404') {
return;
}
$logs = [self::str(dcCore::app()->blog?->url) . $_SERVER['QUERY_STRING']];
$logs = [self::str(App::blog()->url()) . $_SERVER['QUERY_STRING']];
ActivityReport::instance()->addLog('blog', 'p404', $logs);
}
public static function postCreate(Cursor $cur, int $post_id): void
{
$post_url = dcCore::app()->blog?->getPostURL('', self::str($cur->getField('post_dt')), self::str($cur->getField('post_title')), $post_id);
$post_url = App::blog()->getPostURL('', self::str($cur->getField('post_dt')), self::str($cur->getField('post_title')), $post_id);
$logs = [
self::str($cur->getField('post_title')),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(dcCore::app()->blog?->url) . dcCore::app()->url->getBase(self::str($cur->getField('post_type'))) . '/' . $post_url,
self::str(App::auth()->getInfo('user_cn')),
self::str(App::blog()->url()) . App::url()->getBase(self::str($cur->getField('post_type'))) . '/' . $post_url,
];
ActivityReport::instance()->addLog('post', 'create', $logs);
}
@ -301,24 +298,24 @@ class ActivityBehaviors
public static function postUpdate(Cursor $cur, int|string $post_id): void
{
$post_id = is_numeric($post_id) ? (int) $post_id : 0;
$post_url = dcCore::app()->blog?->getPostURL('', self::str($cur->getField('post_dt')), self::str($cur->getField('post_title')), $post_id);
$post_url = App::blog()->getPostURL('', self::str($cur->getField('post_dt')), self::str($cur->getField('post_title')), $post_id);
$logs = [
self::str($cur->getField('post_title')),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(dcCore::app()->blog?->url) . dcCore::app()->url->getBase(self::str($cur->getField('post_type'))) . '/' . $post_url,
self::str(App::auth()->getInfo('user_cn')),
self::str(App::blog()->url()) . App::url()->getBase(self::str($cur->getField('post_type'))) . '/' . $post_url,
];
ActivityReport::instance()->addLog('post', 'update', $logs);
}
public static function postDelete(int $post_id): void
{
$posts = dcCore::app()->blog?->getPosts(['post_id' => $post_id, 'limit' => 1]);
$posts = App::blog()->getPosts(['post_id' => $post_id, 'limit' => 1]);
if (!$posts || $posts->isEmpty()) {
return;
}
$logs = [
self::str($posts->f('post_title')),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(App::auth()->getInfo('user_cn')),
];
ActivityReport::instance()->addLog('post', 'delete', $logs);
}
@ -335,12 +332,12 @@ class ActivityBehaviors
ActivityReport::instance()->addLog('post', 'protection', $logs);
}
public static function commentCreate(dcBlog $blog, Cursor $cur): void
public static function commentCreate(BlogInterace $blog, Cursor $cur): void
{
if ($cur->getField('comment_trackback')) {
return;
}
$posts = dcCore::app()->blog?->getPosts(
$posts = App::blog()->getPosts(
['post_id' => $cur->getField('post_id'), 'limit' => 1, 'post_type' => '']
);
if (!$posts || $posts->isEmpty()) {
@ -350,15 +347,15 @@ class ActivityBehaviors
$logs = [
self::str($cur->getField('comment_author')),
self::str($posts->f('post_title')),
self::str(dcCore::app()->blog?->url) . dcCore::app()->url->getBase(self::str($posts->f('post_type'))) .
self::str(App::blog()->url()) . App::url()->getBase(self::str($posts->f('post_type'))) .
'/' . self::str($posts->f('post_url')) . '#c' . self::str($cur->getField('comment_id')),
];
ActivityReport::instance()->addLog('comment', 'create', $logs);
}
public static function commentUpdate(dcBlog $blog, Cursor $cur, MetaRecord $old): void
public static function commentUpdate(BlogInterace $blog, Cursor $cur, MetaRecord $old): void
{
$posts = dcCore::app()->blog?->getPosts(
$posts = App::blog()->getPosts(
['post_id' => $old->f('post_id'), 'limit' => 1]
);
if (!$posts || $posts->isEmpty()) {
@ -366,21 +363,21 @@ class ActivityBehaviors
}
$logs = [
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(App::auth()->getInfo('user_cn')),
self::str($posts->f('post_title')),
self::str(dcCore::app()->blog?->url) . dcCore::app()->url->getBase(self::str($posts->f('post_type'))) .
self::str(App::blog()->url()) . App::url()->getBase(self::str($posts->f('post_type'))) .
'/' . self::str($posts->f('post_url')) . '#c' . self::str($old->f('comment_id')),
];
ActivityReport::instance()->addLog('comment', 'update', $logs);
}
public static function trackbackCreate(dcBlog $blog, Cursor $cur): void
public static function trackbackCreate(BlogInterace $blog, Cursor $cur): void
{
if (!$cur->getField('comment_trackback')) {
return;
}
$posts = dcCore::app()->blog?->getPosts(
$posts = App::blog()->getPosts(
['post_id' => $cur->getField('post_id'), 'no_content' => true, 'limit' => 1]
);
if (!$posts || $posts->isEmpty()) {
@ -391,7 +388,7 @@ class ActivityBehaviors
self::str($cur->getField('comment_author')),
self::str($cur->getField('comment_site')),
self::str($posts->f('post_title')),
self::str(dcCore::app()->blog?->url) . dcCore::app()->url->getBase(self::str($posts->f('post_type'))) .
self::str(App::blog()->url()) . App::url()->getBase(self::str($posts->f('post_type'))) .
'/' . self::str($posts->f('post_url')),
];
ActivityReport::instance()->addLog('comment', 'trackback', $logs);
@ -401,8 +398,8 @@ class ActivityBehaviors
{
$logs = [
self::str($cur->getField('cat_title')),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(dcCore::app()->blog?->url) . dcCore::app()->url->getBase('category') . '/' . self::str($cur->getField('cat_url')),
self::str(App::auth()->getInfo('user_cn')),
self::str(App::blog()->url()) . App::url()->getBase('category') . '/' . self::str($cur->getField('cat_url')),
];
ActivityReport::instance()->addLog('category', 'create', $logs);
}
@ -411,8 +408,8 @@ class ActivityBehaviors
{
$logs = [
self::str($cur->getField('cat_title')),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(dcCore::app()->blog?->url) . dcCore::app()->url->getBase('category') . '/' . self::str($cur->getField('cat_url')),
self::str(App::auth()->getInfo('user_cn')),
self::str(App::blog()->url()) . App::url()->getBase('category') . '/' . self::str($cur->getField('cat_url')),
];
ActivityReport::instance()->addLog('category', 'update', $logs);
}
@ -427,7 +424,7 @@ class ActivityBehaviors
);
$logs = [
self::str($user_cn),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(App::auth()->getInfo('user_cn')),
];
ActivityReport::instance()->addLog('user', 'create', $logs);
}
@ -442,7 +439,7 @@ class ActivityBehaviors
);
$logs = [
self::str($user_cn),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(App::auth()->getInfo('user_cn')),
];
ActivityReport::instance()->addLog('user', 'update', $logs);
}
@ -454,11 +451,11 @@ class ActivityBehaviors
public static function userOption(string $user_id): void
{
$user = dcCore::app()->getUser($user_id);
$user = App::users()->getUser($user_id);
if ($user->isEmpty()) {
return;
}
$user_cn = dcUtils::getUserCN(
$user_cn = App::users()->getUserCN(
self::str($user->f('user_id')),
self::str($user->f('user_name')),
self::str($user->f('user_firstname')),
@ -472,8 +469,8 @@ class ActivityBehaviors
public static function userDelete(string $user_id): void
{
$users = dcCore::app()->getUser($user_id);
$user_cn = dcUtils::getUserCN(
$users = App::users()->getUser($user_id);
$user_cn = App::users()->getUserCN(
self::str($users->f('user_id')),
self::str($users->f('user_name')),
self::str($users->f('user_firstname')),
@ -481,7 +478,7 @@ class ActivityBehaviors
);
$logs = [
self::str($user_cn),
self::str(dcCore::app()->auth->getInfo('user_cn')),
self::str(App::auth()->getInfo('user_cn')),
];
ActivityReport::instance()->addLog('user', 'delete', $logs);
}

98
src/ActivityReport.php
View File

@ -1,23 +1,11 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use ArrayObject;
use dcAuth;
use dcBlog;
use dcCore;
use Dotclear\App;
use Dotclear\Database\MetaRecord;
use Dotclear\Database\Statement\{
DeleteStatement,
@ -36,7 +24,11 @@ use Dotclear\Helper\Text;
use Exception;
/**
* Activity report main class.
* @brief activityReport main class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class ActivityReport
{
@ -134,11 +126,11 @@ class ActivityReport
]);
}
$sql
->from($sql->as(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME, 'E'), false, true)
->from($sql->as(App::con()->prefix() . My::ACTIVITY_TABLE_NAME, 'E'), false, true)
->join(
(new JoinStatement())
->left()
->from($sql->as(dcCore::app()->prefix . dcBlog::BLOG_TABLE_NAME, 'B'))
->from($sql->as(App::con()->prefix() . App::blog()::BLOG_TABLE_NAME, 'B'))
->on('E.blog_id = B.blog_id')
->statement()
);
@ -169,7 +161,7 @@ class ActivityReport
}
$sql->and('E.blog_id' . $sql->in($params['blog_id']));
} else {
$sql->and('E.blog_id = ' . $sql->quote((string) dcCore::app()->blog?->id));
$sql->and('E.blog_id = ' . $sql->quote(App::blog()->id()));
}
if (isset($params['activity_status']) && is_numeric($params['activity_status'])) {
@ -240,12 +232,12 @@ class ActivityReport
public function addLog(string $group, string $action, array $logs): void
{
try {
$cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME);
dcCore::app()->con->writeLock(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME);
$cur = App::con()->openCursor(App::con()->prefix() . My::ACTIVITY_TABLE_NAME);
App::con()->writeLock(App::con()->prefix() . My::ACTIVITY_TABLE_NAME);
$cur->setField('activity_id', $this->getNextId());
$cur->setField('activity_type', $this->type);
$cur->setField('blog_id', (string) dcCore::app()->blog?->id);
$cur->setField('blog_id', App::blog()->id());
$cur->setField('activity_group', $group);
$cur->setField('activity_action', $action);
$cur->setField('activity_logs', json_encode($logs));
@ -253,13 +245,13 @@ class ActivityReport
$cur->setField('activity_status', self::STATUS_PENDING);
$cur->insert();
dcCore::app()->con->unlock();
App::con()->unlock();
# --BEHAVIOR-- coreAfterCategoryCreate -- ActivityReport, cursor
dcCore::app()->callBehavior('activityReportAfteAddLog', $this, $cur);
App::behavior()->callBehavior('activityReportAfteAddLog', $this, $cur);
} catch (Exception $e) {
dcCore::app()->con->unlock();
dcCore::app()->error->add($e->getMessage());
App::con()->unlock();
App::error()->add($e->getMessage());
}
// Test if email report is needed
@ -301,7 +293,7 @@ class ActivityReport
$from = time();
$to = 0;
$res = $blog_name = $blog_url = $group = '';
$tz = dcCore::app()->blog?->settings->get('system')->get('blog_timezone');
$tz = App::blog()->settings()->get('system')->get('blog_timezone');
$tz = is_string($tz) ? $tz : 'UTC';
$dt = empty($this->settings->dateformat) ? '%Y-%m-%d %H:%M:%S' : $this->settings->dateformat;
$format = $this->formats->get($this->formats->has($this->settings->mailformat) ? $this->settings->mailformat : 'plain');
@ -394,7 +386,7 @@ class ActivityReport
{
// Get blogs and logs count
$sql = new SelectStatement();
$sql->from(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME)
$sql->from(App::con()->prefix() . My::ACTIVITY_TABLE_NAME)
->column('blog_id')
->where('activity_type =' . $sql->quote($this->type))
->group('blog_id');
@ -410,16 +402,16 @@ class ActivityReport
$obs = Date::str('%Y-%m-%d %H:%M:%S', $ts - (int) $this->settings->obsolete);
if (is_string($rs->f('blog_id'))) {
$sql = new DeleteStatement();
$sql->from(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME)
$sql->from(App::con()->prefix() . My::ACTIVITY_TABLE_NAME)
->where('activity_type =' . $sql->quote($this->type))
->and('activity_dt < TIMESTAMP ' . $sql->quote($obs))
->and('blog_id = ' . $sql->quote($rs->f('blog_id')))
->delete();
if (dcCore::app()->con->changes()) {
if (App::con()->changes()) {
try {
$cur = dcCore::app()->con->openCursor(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME);
dcCore::app()->con->writeLock(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME);
$cur = App::con()->openCursor(App::con()->prefix() . My::ACTIVITY_TABLE_NAME);
App::con()->writeLock(App::con()->prefix() . My::ACTIVITY_TABLE_NAME);
$cur->setField('activity_id', $this->getNextId());
$cur->setField('activity_type', $this->type);
@ -431,10 +423,10 @@ class ActivityReport
$cur->setField('activity_status', self::STATUS_PENDING);
$cur->insert();
dcCore::app()->con->unlock();
App::con()->unlock();
} catch (Exception $e) {
dcCore::app()->con->unlock();
dcCore::app()->error->add($e->getMessage());
App::con()->unlock();
App::error()->add($e->getMessage());
}
}
}
@ -456,7 +448,7 @@ class ActivityReport
$sql->and('activity_status = ' . self::STATUS_REPORTED);
}
return $sql->from(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME)
return $sql->from(App::con()->prefix() . My::ACTIVITY_TABLE_NAME)
->where('activity_type = ' . $sql->quote($this->type))
->delete();
}
@ -470,10 +462,10 @@ class ActivityReport
private function updateStatus(int $from_date_ts, int $to_date_ts): void
{
$sql = new UpdateStatement();
$sql->from(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME)
$sql->from(App::con()->prefix() . My::ACTIVITY_TABLE_NAME)
->column('activity_status')
->set((string) self::STATUS_REPORTED)
->where('blog_id = ' . $sql->quote((string) dcCore::app()->blog?->id))
->where('blog_id = ' . $sql->quote(App::blog()->id()))
->and('activity_type =' . $sql->quote($this->type))
->and('activity_dt >= TIMESTAMP ' . $sql->quote(date('Y-m-d H:i:s', $from_date_ts)))
->and('activity_dt < TIMESTAMP ' . $sql->quote(date('Y-m-d H:i:s', $to_date_ts)))
@ -488,7 +480,7 @@ class ActivityReport
public function getNextId(): int
{
$sql = new SelectStatement();
$sql->from(dcCore::app()->prefix . My::ACTIVITY_TABLE_NAME)
$sql->from(App::con()->prefix() . My::ACTIVITY_TABLE_NAME)
->column($sql->max('activity_id'));
return (int) $sql->select()?->f(0) + 1;
@ -503,14 +495,14 @@ class ActivityReport
{
try {
# Cache writable ?
if (!is_writable(DC_TPL_CACHE)) {
if (!is_writable(App::config()->cacheRoot())) {
throw new Exception("Can't write in cache fodler");
}
# Set file path
$f_md5 = md5((string) dcCore::app()->blog?->id);
$f_md5 = md5(App::blog()->id());
$file = sprintf(
'%s/%s/%s/%s/%s.txt',
DC_TPL_CACHE,
App::config()->cacheRoot(),
My::id(),
substr($f_md5, 0, 2),
substr($f_md5, 2, 2),
@ -591,7 +583,7 @@ class ActivityReport
$params = new ArrayObject([
'from_date_ts' => $lastreport,
'to_date_ts' => $now,
'blog_id' => dcCore::app()->blog?->id,
'blog_id' => App::blog()->id(),
'activity_status' => self::STATUS_PENDING,
'requests' => true,
'order' => 'activity_group ASC, activity_action ASC, activity_dt ASC ',
@ -612,7 +604,7 @@ class ActivityReport
$this->updateStatus($lastreport, $now);
$this->settings->set('lastreport', $now);
dcCore::app()->callBehavior('messageActivityReport', 'Activity report has been successfully send by mail.');
App::behavior()->callBehavior('messageActivityReport', 'Activity report has been successfully send by mail.');
}
}
@ -658,20 +650,20 @@ class ActivityReport
# Sending mails
try {
$subject = mb_encode_mimeheader(
sprintf(__('Blog "%s" activity report'), dcCore::app()->blog?->name),
sprintf(__('Blog "%s" activity report'), App::blog()->name()),
'UTF-8',
'B'
);
$headers = [];
$headers[] = 'From: ' . (defined('DC_ADMIN_MAILFROM') && str_contains(DC_ADMIN_MAILFROM, '@') ? DC_ADMIN_MAILFROM : 'dotclear@local');
$headers[] = 'From: ' . (defined('DC_ADMIN_MAILFROM') && str_contains(App::config()->adminMailFrom(), '@') ? App::config()->adminMailFrom() : 'dotclear@local');
$headers[] = 'Content-Type: text/' . $mailformat . '; charset=UTF-8;';
//$headers[] = 'MIME-Version: 1.0';
//$headers[] = 'X-Originating-IP: ' . mb_encode_mimeheader(Http::realIP(), 'UTF-8', 'B');
//$headers[] = 'X-Mailer: Dotclear';
//$headers[] = 'X-Blog-Id: ' . mb_encode_mimeheader(dcCore::app()->blog->id), 'UTF-8', 'B');
//$headers[] = 'X-Blog-Name: ' . mb_encode_mimeheader(dcCore::app()->blog->name), 'UTF-8', 'B');
//$headers[] = 'X-Blog-Url: ' . mb_encode_mimeheader(dcCore::app()->blog->url), 'UTF-8', 'B');
//$headers[] = 'X-Blog-Id: ' . mb_encode_mimeheader(App::blog()->id()), 'UTF-8', 'B');
//$headers[] = 'X-Blog-Name: ' . mb_encode_mimeheader(App::blog()->name()), 'UTF-8', 'B');
//$headers[] = 'X-Blog-Url: ' . mb_encode_mimeheader(App::>blog()->url()), 'UTF-8', 'B');
$done = true;
foreach ($recipients as $email) {
@ -693,9 +685,9 @@ class ActivityReport
*/
public function getUserCode(): string
{
$id = is_string(dcCore::app()->auth->userID()) ? dcCore::app()->auth->userID() : '';
$pw = is_string(dcCore::app()->auth->getInfo('user_pwd')) ? dcCore::app()->auth->getInfo('user_pwd') : '';
$code = pack('a32', $id) . pack('H*', Crypt::hmac(DC_MASTER_KEY, $pw));
$id = is_string(App::auth()->userID()) ? App::auth()->userID() : '';
$pw = is_string(App::auth()->getInfo('user_pwd')) ? App::auth()->getInfo('user_pwd') : '';
$code = pack('a32', $id) . pack('H*', Crypt::hmac(App::config()->masterKey(), $pw));
return bin2hex($code);
}
@ -721,7 +713,7 @@ class ActivityReport
$pwd = $pwd['hex'];
$sql = new SelectStatement();
$sql->from(dcCore::app()->prefix . dcAuth::USER_TABLE_NAME)
$sql->from(App::con()->prefix() . App::auth()::USER_TABLE_NAME)
->columns(['user_id', 'user_pwd'])
->where('user_id =' . $sql->quote($user_id));
@ -731,7 +723,7 @@ class ActivityReport
return false;
}
if (Crypt::hmac(DC_MASTER_KEY, $rs->f('user_pwd')) != $pwd) {
if (Crypt::hmac(App::config()->masterKey(), $rs->f('user_pwd')) != $pwd) {
return false;
}

18
src/ActivityRow.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief activityReport, 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\activityReport;
@ -17,7 +7,11 @@ namespace Dotclear\Plugin\activityReport;
use Dotclear\Database\MetaRecord;
/**
* Activity record row type hinting.
* @brief activityReport activity record row descriptor class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class ActivityRow
{

41
src/Backend.php
View File

@ -1,22 +1,11 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use ArrayObject;
use dcAuth;
use dcCore;
use Dotclear\App;
use Dotclear\Core\Backend\Favorites;
use Dotclear\Core\Process;
use Dotclear\Helper\Date;
@ -29,7 +18,11 @@ use Dotclear\Helper\Html\Form\{
};
/**
* Backend process
* @brief activityReport backend class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Backend extends Process
{
@ -46,7 +39,7 @@ class Backend extends Process
My::addBackendMenuItem();
dcCore::app()->addBehaviors([
App::behavior()->addBehaviors([
// dashboard favorites icon
'adminDashboardFavoritesV2' => function (Favorites $favs): void {
$favs->register(My::id(), [
@ -54,14 +47,14 @@ class Backend extends Process
'url' => My::manageUrl(),
'small-icon' => My::icons(),
'large-icon' => My::icons(),
'permissions' => dcCore::app()->auth->makePermissions([
dcAuth::PERMISSION_ADMIN,
'permissions' => App::auth()->makePermissions([
App::auth()::PERMISSION_ADMIN,
]),
]);
},
// dashboard content display
'adminDashboardContentsV2' => function (ArrayObject $items): void {
$db = dcCore::app()->auth->user_prefs?->get(My::id())->get('dashboard_item');
$db = App::auth()->prefs()->get(My::id())->get('dashboard_item');
$limit = abs(is_numeric($db) ? (int) $db : 0);
if (!$limit) {
return ;
@ -87,9 +80,9 @@ class Backend extends Process
$lines[] = '<dt title="' . __($group->title) . '">' .
'<strong>' . __($group->get($row->action)->title) . '</strong>' .
'<br />' . Date::str(
dcCore::app()->blog?->settings->get('system')->get('date_format') . ', ' . dcCore::app()->blog?->settings->get('system')->get('time_format'),
App::blog()->settings()->get('system')->get('date_format') . ', ' . App::blog()->settings()->get('system')->get('time_format'),
(int) strtotime($row->dt),
is_string(dcCore::app()->auth->getInfo('user_tz')) ? dcCore::app()->auth->getInfo('user_tz') : 'UTC'
is_string(App::auth()->getInfo('user_tz')) ? App::auth()->getInfo('user_tz') : 'UTC'
) . '<dt>' .
'<dd><p>' .
'<em>' . ActivityReport::parseMessage(__($group->get($row->action)->message), $row->logs) . '</em></p></dd>';
@ -105,10 +98,10 @@ class Backend extends Process
'<p class="modules"><a class="module-details" href="' .
My::manageUrl() . '">' .
__('View all logs') . '</a> - <a class="module-config" href="' .
dcCore::app()->admin->url->get('admin.plugins', [
App::backend()->url()->get('admin.plugins', [
'module' => My::id(),
'conf' => 1,
'redir' => dcCore::app()->admin->url->get('admin.home'),
'redir' => App::backend()->url()->get('admin.home'),
]) . '">' .
__('Configure plugin') . '</a></p>' .
'</div>',
@ -116,7 +109,7 @@ class Backend extends Process
},
// dashboard content user preference form
'adminDashboardOptionsFormV2' => function (): void {
$db = dcCore::app()->auth->user_prefs?->get(My::id())->get('dashboard_item');
$db = App::auth()->prefs()->get(My::id())->get('dashboard_item');
echo
(new Div())->class('fieldset')->items([
(new Text('h4', My::name())),
@ -137,7 +130,7 @@ class Backend extends Process
// save dashboard content user preference
'adminAfterDashboardOptionsUpdate' => function (?string $user_id = null): void {
if (!is_null($user_id)) {
dcCore::app()->auth->user_prefs?->get(My::id())->put(
App::auth()->prefs()->get(My::id())->put(
'dashboard_item',
(int) $_POST[My::id() . '_dashboard_item'],
'integer'

18
src/Combo.php
View File

@ -1,21 +1,15 @@
<?php
/**
* @brief activityReport, 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\activityReport;
/**
* Combo helper.
* @brief activityReport combo class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Combo
{

34
src/Config.php
View File

@ -1,20 +1,10 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use dcCore;
use Dotclear\App;
use Dotclear\Core\Backend\Notices;
use Dotclear\Core\Process;
use Dotclear\Helper\Date;
@ -32,7 +22,11 @@ use Dotclear\Helper\Html\Form\{
use Exception;
/**
* Config process.
* @brief activityReport config class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Config extends Process
{
@ -85,12 +79,12 @@ class Config extends Process
);
}
dcCore::app()->admin->url->redirect('admin.plugins', [
App::bakend()->url()->redirect('admin.plugins', [
'module' => My::id(),
'conf' => 1,
]);
} catch (Exception $e) {
dcCore::app()->error->add($e->getMessage());
App::error()->add($e->getMessage());
}
return true;
@ -103,19 +97,19 @@ class Config extends Process
}
$s = ActivityReport::instance()->settings;
$tz = is_string(dcCore::app()->auth->getInfo('user_tz')) ? dcCore::app()->auth->getInfo('user_tz') : 'UTC';
$tz = is_string(App::auth()->getInfo('user_tz')) ? App::auth()->getInfo('user_tz') : 'UTC';
if (!$s->lastreport) {
$last_report = __('never');
$next_report = __('on new activity');
} else {
$last_report = Date::str(
dcCore::app()->blog?->settings->get('system')->get('date_format') . ', ' . dcCore::app()->blog?->settings->get('system')->get('time_format'),
App::blog()->settings()->get('system')->get('date_format') . ', ' . App::blog()->settings()->get('system')->get('time_format'),
$s->lastreport,
$tz
);
$next_report = Date::str(
dcCore::app()->blog?->settings->get('system')->get('date_format') . ', ' . dcCore::app()->blog?->settings->get('system')->get('time_format'),
App::blog()->settings()->get('system')->get('date_format') . ', ' . App::blog()->settings()->get('system')->get('time_format'),
$s->interval + $s->lastreport,
$tz
);
@ -166,11 +160,11 @@ class Config extends Process
'ul',
'<li><img alt="' . __('RSS feed') . '" src="' . My::fileURL('img/feed.png') . '" /> ' .
'<a title="' . __('RSS feed') . '" href="' .
dcCore::app()->blog?->url . dcCore::app()->url->getBase(My::id()) . '/rss2/' . ActivityReport::instance()->getUserCode() . '">' .
App::blog()->url() . App::url()->getBase(My::id()) . '/rss2/' . ActivityReport::instance()->getUserCode() . '">' .
__('Rss2 activities feed') . '</a></li>' .
'<li><img alt="' . __('Atom feed') . '" src="' . My::fileURL('img/feed.png') . '" /> ' .
'<a title="' . __('Atom feed') . '" href="' .
dcCore::app()->blog?->url . dcCore::app()->url->getBase(My::id()) . '/atom/' . ActivityReport::instance()->getUserCode() . '">' .
App::blog()->url() . App::url()->getBase(My::id()) . '/atom/' . ActivityReport::instance()->getUserCode() . '">' .
__('Atom activities feed') . '</a></li>'
)),
]),

18
src/Context.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief activityReport, 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\activityReport;
@ -18,7 +8,11 @@ use dcCore;
use Dotclear\Database\MetaRecord;
/**
* Template helper.
* @brief activityReport frontend context class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Context
{

18
src/Format.php
View File

@ -1,21 +1,15 @@
<?php
/**
* @brief activityReport, 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\activityReport;
/**
* Report format descriptor.
* @brief activityReport format decriptor.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Format
{

18
src/Formats.php
View File

@ -1,21 +1,15 @@
<?php
/**
* @brief activityReport, 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\activityReport;
/**
* Email report formats stack.
* @brief activityReport formats stack.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Formats
{

32
src/Frontend.php
View File

@ -1,24 +1,18 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use dcCore;
use Dotclear\App;
use Dotclear\Core\Process;
/**
* Front end process.
* @brief activityReport frontend class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Frontend extends Process
{
@ -33,13 +27,13 @@ class Frontend extends Process
return false;
}
dcCore::app()->tpl->setPath(dcCore::app()->tpl->getPath(), implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', 'tpl']));
App::frontend()->template()->setPath(App::frontend()->template()->getPath(), implode(DIRECTORY_SEPARATOR, [My::path(), 'default-templates', 'tpl']));
dcCore::app()->tpl->addBlock('activityReports', [Template::class, 'activityReports']);
dcCore::app()->tpl->addValue('activityReportFeedID', [Template::class, 'activityReportFeedID']);
dcCore::app()->tpl->addValue('activityReportTitle', [Template::class, 'activityReportTitle']);
dcCore::app()->tpl->addValue('activityReportDate', [Template::class, 'activityReportDate']);
dcCore::app()->tpl->addValue('activityReportContent', [Template::class, 'activityReportContent']);
App::frontend()->template()->addBlock('activityReports', Template::activityReports(...));
App::frontend()->template()->addValue('activityReportFeedID', Template::activityReportFeedID(...));
App::frontend()->template()->addValue('activityReportTitle', Template::activityReportTitle(...));
App::frontend()->template()->addValue('activityReportDate', Template::activityReportDate(...));
App::frontend()->template()l->addValue('activityReportContent', Template::activityReportContent(...));
return true;
}

18
src/Group.php
View File

@ -1,21 +1,15 @@
<?php
/**
* @brief activityReport, 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\activityReport;
/**
* Actions stack.
* @brief activityReport actions stack class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Group
{

18
src/Groups.php
View File

@ -1,21 +1,15 @@
<?php
/**
* @brief activityReport, 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\activityReport;
/**
* Actions groups stack.
* @brief activityReport actions groups stack class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Groups
{

38
src/Install.php
View File

@ -1,20 +1,10 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use dcCore;
use Dotclear\App;
use Dotclear\Core\Process;
use Dotclear\Database\Structure;
use Dotclear\Database\Statement\{
@ -24,7 +14,11 @@ use Dotclear\Database\Statement\{
use Exception;
/**
* Install process.
* @brief activityReport install class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Install extends Process
{
@ -42,7 +36,7 @@ class Install extends Process
try {
self::beforeGrowUp();
$s = new Structure(dcCore::app()->con, dcCore::app()->prefix);
$s = new Structure(App::con(), App::con()->prefix());
$s->__get(My::ACTIVITY_TABLE_NAME)
->field('activity_id', 'bigint', 0, false)
->field('activity_type', 'varchar', 32, false, "'" . My::id() . "'")
@ -59,11 +53,11 @@ class Install extends Process
->index('idx_activity_action', 'btree', 'activity_group', 'activity_action')
->index('idx_activity_status', 'btree', 'activity_status');
(new Structure(dcCore::app()->con, dcCore::app()->prefix))->synchronize($s);
(new Structure(App::con(), App::con()->prefix()))->synchronize($s);
return true;
} catch (Exception $e) {
dcCore::app()->error->add($e->getMessage());
App::error()->add($e->getMessage());
return false;
}
@ -75,17 +69,17 @@ class Install extends Process
private static function beforeGrowUp(): void
{
// sorry not sorry we restart from scratch
if (is_string(dcCore::app()->getVersion('activityReport'))
&& version_compare(dcCore::app()->getVersion('activityReport'), '3.0', '<')
if (is_string(App::version()->getVersion('activityReport'))
&& version_compare(App::version()->getVersion('activityReport'), '3.0', '<')
) {
$struct = new Structure(dcCore::app()->con, dcCore::app()->prefix);
$struct = new Structure(App::con(), App::con()->prefix());
if ($struct->tableExists('activity')) {
(new TruncateStatement())->from(dcCore::app()->prefix . 'activity')->truncate();
(new TruncateStatement())->from(App::con()->prefix() . 'activity')->truncate();
}
if ($struct->tableExists('activity_settings')) {
(new TruncateStatement())->from(dcCore::app()->prefix . 'activity_settings')->truncate();
(new DropStatement())->from(dcCore::app()->prefix . 'activity_settings')->drop();
(new TruncateStatement())->from(App::con()->prefix() . 'activity_settings')->truncate();
(new DropStatement())->from(App::con()->prefix() . 'activity_settings')->drop();
}
}
}

28
src/Manage.php
View File

@ -1,21 +1,11 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use ArrayObject;
use dcCore;
use Dotclear\App;
use Dotclear\Core\Backend\Filter\Filters;
use Dotclear\Core\Backend\{
Notices,
@ -32,7 +22,11 @@ use Dotclear\Helper\Html\Form\{
use Exception;
/**
* Manage process (admin logs list).
* @brief activityReport manage class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Manage extends Process
{
@ -53,7 +47,7 @@ class Manage extends Process
Notices::addSuccessNotice(__('Logs successfully deleted'));
My::redirect();
} catch (Exception $e) {
dcCore::app()->error->add($e->getMessage());
App::error()->add($e->getMessage());
}
}
@ -77,7 +71,7 @@ class Manage extends Process
$list = new ManageList($logs, $counter->f(0));
}
} catch (Exception $e) {
dcCore::app()->error->add($e->getMessage());
App::error()->add($e->getMessage());
}
Page::openModule(
@ -87,7 +81,7 @@ class Manage extends Process
My::jsLoad('backend') .
# --BEHAVIOR-- activityReportListHeader --
dcCore::app()->callBehavior('activityReportListHeader')
App::behavior()->callBehavior('activityReportListHeader')
);
echo
@ -104,7 +98,7 @@ class Manage extends Process
if (!is_null($logs) && !$logs->isEmpty()) {
echo
(new Form('form-logs'))->method('post')->action(dcCore::app()->admin->getPageURL())->fields([
(new Form('form-logs'))->method('post')->action(App::backend()->getPageURL())->fields([
(new Para())->class('right')->separator(' ')->items([
(new Submit('delete_all_logs'))->class('delete')->value(__('Delete all aticivity logs')),
(new Submit('delete_reported_logs'))->class('delete')->value(__('Delete all allready reported logs')),

24
src/ManageList.php
View File

@ -1,21 +1,11 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use ArrayObject;
use dcCore;
use Dotclear\App;
use Dotclear\Core\Backend\Filter\Filters;
use Dotclear\Core\Backend\Listing\{
Listing,
@ -24,7 +14,11 @@ use Dotclear\Core\Backend\Listing\{
use Dotclear\Helper\Date;
/**
* Logs admin list helper.
* @brief activityReport manage logs list class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class ManageList extends Listing
{
@ -83,9 +77,9 @@ class ManageList extends Listing
$action = $group->get($row->action);
$message = ActivityReport::parseMessage(__($action->message), $row->logs);
$date = Date::str(
dcCore::app()->blog?->settings->get('system')->get('date_format') . ', ' . dcCore::app()->blog?->settings->get('system')->get('time_format'),
App::blog()->settings()->get('system')->get('date_format') . ', ' . App::blog()->settings()->get('system')->get('time_format'),
(int) strtotime($row->dt),
is_string(dcCore::app()->auth->getInfo('user_tz')) ? dcCore::app()->auth->getInfo('user_tz') : 'UTC'
is_string(App::auth()->getInfo('user_tz')) ? App::auth()->getInfo('user_tz') : 'UTC'
);
$status = $row->status == ActivityReport::STATUS_PENDING ? __('pending') : __('reported');

62
src/My.php
View File

@ -1,50 +1,52 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use dcCore;
use Dotclear\App;
use Dotclear\Module\MyPlugin;
/**
* This module definitions.
* @brief activityReport My helper.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class My extends MyPlugin
{
/** @var string Activity database table name */
/**
* Activity database table name.
*
* @var string ACTIVITY_TABLE_NAME
*/
public const ACTIVITY_TABLE_NAME = 'activity';
/** @var int Incremental version by breaking changes */
/**
* Incremental version by breaking changes.
*
* @var int COMPATIBILITY_VERSION
*/
public const COMPATIBILITY_VERSION = 3;
public static function checkCustomContext(int $context): ?bool
{
switch($context) {
case My::FRONTEND:
return defined('ACTIVITY_REPORT') && My::isInstalled();
case My::BACKEND:
return defined('DC_CONTEXT_ADMIN') && defined('ACTIVITY_REPORT') && My::isInstalled();
case My::CONFIG:
case My::MANAGE:
return defined('DC_CONTEXT_ADMIN')
return match ($context) {
My::FRONTEND =>
defined('ACTIVITY_REPORT') && My::isInstalled(),
My::BACKEND =>
App::task()->checkContext('BACKEND') && defined('ACTIVITY_REPORT') && My::isInstalled(),
My::CONFIG, My::MANAGE =>
App::task()->checkContext('BACKEND')
&& defined('ACTIVITY_REPORT')
&& dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([
dcCore::app()->auth::PERMISSION_ADMIN,
]), dcCore::app()->blog?->id);
default:
return null;
}
&& App::auth()->check(App::auth()->makePermissions([
App::auth()::PERMISSION_ADMIN,
]), App::blog()->id()),
default =>
null,
};
}
/**
@ -54,6 +56,6 @@ class My extends MyPlugin
*/
public static function isInstalled(): bool
{
return dcCore::app()->getVersion(self::id()) == (string) dcCore::app()->plugins->getDefine(self::id())->get('version');
return App::version()->getVersion(self::id()) == (string) App::plugins()->getDefine(self::id())->get('version');
}
}

24
src/Prepend.php
View File

@ -1,25 +1,19 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use dcCore;
use Dotclear\App;
use Dotclear\Core\Process;
use Exception;
/**
* Prepend process.
* @brief activityReport prepend class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Prepend extends Process
{
@ -43,11 +37,11 @@ class Prepend extends Process
ActivityReport::instance();
// regirster activity feed URL
dcCore::app()->url->register(
App::url()->register(
My::id(),
'reports',
'^reports/((atom|rss2)/(.+))$',
[UrlHandler::class, 'feed']
UrlHandler::feed(...)
);
// declare report open

18
src/Settings.php
View File

@ -1,21 +1,15 @@
<?php
/**
* @brief activityReport, 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\activityReport;
/**
* Module settings helper.
* @brief activityReport settings helper class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Settings
{

50
src/Template.php
View File

@ -1,25 +1,19 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use ArrayObject;
use dcCore;
use Dotclear\App;
use Dotclear\Helper\Date;
/**
* Template blocs and values.
* @brief activityReport frontend template class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Template
{
@ -43,12 +37,12 @@ class Template
$lastn = abs((int) $attr['lastn']) + 0;
}
$p = '$_page_number = dcCore::app()->public->getPageNumber(); if ($_page_number < 1) { $_page_number = 1; }' . "\n\$params = new ArrayObject();\n";
$p = '$_page_number = App::frontend()->getPageNumber(); if ($_page_number < 1) { $_page_number = 1; }' . "\n\$params = new ArrayObject();\n";
if ($lastn > 0) {
$p .= "\$params['limit'] = " . $lastn . ";\n";
} else {
$p .= "\$params['limit'] = dcCore::app()->ctx->nb_entry_per_page;\n";
$p .= "\$params['limit'] = App::frontend()->context()->nb_entry_per_page;\n";
}
if (!isset($attr['ignore_pagination']) || $attr['ignore_pagination'] == '0') {
@ -60,10 +54,10 @@ class Template
return
"<?php \n" .
$p .
'dcCore::app()->ctx->activityreport_params = $params; ' . "\n" .
'dcCore::app()->ctx->activityreports = ' . ActivityReport::class . '::instance()->getLogs($params); unset($params); ' . "\n" .
'while (dcCore::app()->ctx->activityreports->fetch()) : ?>' . $content . '<?php endwhile; ' .
'dcCore::app()->ctx->pop("activityreports"); dcCore::app()->ctx->pop("activityreport_params"); ' . "\n" .
'App::frontend()->context()->activityreport_params = $params; ' . "\n" .
'App::frontend()->context()->activityreports = ' . ActivityReport::class . '::instance()->getLogs($params); unset($params); ' . "\n" .
'while (App::frontend()->context()->activityreports->fetch()) : ?>' . $content . '<?php endwhile; ' .
'App::frontend()->context()->pop("activityreports"); App::frontend()->context()x->pop("activityreport_params"); ' . "\n" .
'?>';
}
@ -81,8 +75,8 @@ class Template
public static function activityReportFeedID(ArrayObject $attr): string
{
return
'urn:md5:<?php echo md5(dcCore::app()->ctx->activityreports->blog_id.' .
'dcCore::app()->ctx->activityreports->activity_id.dcCore::app()->ctx->activityreports->activity_dt); ' .
'urn:md5:<?php echo md5(App::frontend()->context()->activityreports->blog_id.' .
'App::frontend()->context()->activityreports->activity_id.App::frontend()->context()->activityreports->activity_dt); ' .
'?>';
}
@ -99,7 +93,7 @@ class Template
*/
public static function activityReportTitle(ArrayObject $attr): string
{
$f = dcCore::app()->tpl->getFilters($attr);
$f = App::frontend()->template()->getFilters($attr);
return '<?php echo ' . sprintf($f, Context::class . '::parseTitle()') . '; ?>';
}
@ -117,7 +111,7 @@ class Template
*/
public static function activityReportContent(ArrayObject $attr): string
{
$f = dcCore::app()->tpl->getFilters($attr);
$f = App::frontend()->context()->getFilters($attr);
return '<?php echo ' . sprintf($f, Context::class . '::parseContent()') . '; ?>';
}
@ -146,16 +140,16 @@ class Template
$iso8601 = !empty($attr['iso8601']);
$rfc822 = !empty($attr['rfc822']);
$f = dcCore::app()->tpl->getFilters($attr);
$f = App::frontend()->template()->getFilters($attr);
if ($rfc822) {
return '<?php echo ' . sprintf($f, Date::class . '::rfc822(strtotime(dcCore::app()->ctx->activityreports->activity_dt),dcCore::app()->blog->settings->system->blog_timezone)') . '; ?>';
return '<?php echo ' . sprintf($f, Date::class . '::rfc822(strtotime(App::frontend()->context()->activityreports->activity_dt),App::blog()->settings()->system->blog_timezone)') . '; ?>';
} elseif ($iso8601) {
return '<?php echo ' . sprintf($f, Date::class . '::iso8601(strtotime(dcCore::app()->ctx->activityreports->activity_dt),dcCore::app()->blog->settings->system->blog_timezone)') . '; ?>';
return '<?php echo ' . sprintf($f, Date::class . '::iso8601(strtotime(App::frontend()->context()->activityreports->activity_dt),App::blog()->settings()->system->blog_timezone)') . '; ?>';
} elseif (!empty($format)) {
return '<?php echo ' . sprintf($f, Date::class . "::dt2str('" . $format . "',dcCore::app()->ctx->activityreports->activity_dt)") . '; ?>';
return '<?php echo ' . sprintf($f, Date::class . "::dt2str('" . $format . "',App::frontend()->context()->activityreports->activity_dt)") . '; ?>';
}
return '<?php echo ' . sprintf($f, Date::class . '::dt2str(dcCore::app()->blog->settings->system->date_format,dcCore::app()->ctx->activityreports->activity_dt)') . '; ?>';
return '<?php echo ' . sprintf($f, Date::class . '::dt2str(App::blog()->settings()->system->date_format,App::frontend()->context()->activityreports->activity_dt)') . '; ?>';
}
}

21
src/Uninstall.php
View File

@ -1,27 +1,18 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use dcCore;
use Dotclear\Core\Process;
use Dotclear\Plugin\Uninstaller\Uninstaller;
/**
* Uninstall process.
* @brief activityReport uninstall class.
* @ingroup activityReport
*
* Using plugin Uninstaller
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Uninstall extends Process
{
@ -32,7 +23,7 @@ class Uninstall extends Process
public static function process(): bool
{
if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
if (!self::status()) {
return false;
}

40
src/UrlHandler.php
View File

@ -1,27 +1,20 @@
<?php
/**
* @brief activityReport, 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\activityReport;
use context;
use dcCore;
use dcUrlHandlers;
use Dotclear\App;
use Dotclear\Core\Frontend\Url;
/**
* Frontend URL handler.
* @brief activityReport frontend URL handler class.
* @ingroup activityReport
*
* @author Jean-Christian Denis (author)
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class UrlHandler extends dcUrlHandlers
class UrlHandler extends Url
{
/**
* Get activity logs feed.
@ -31,8 +24,7 @@ class UrlHandler extends dcUrlHandlers
public static function feed(?string $args): void
{
// no context or wrong URL args or module no loaded or report unactive
if (!dcCore::app()->ctx
|| !preg_match('/^(atom|rss2)\/(.+)$/', (string) $args, $m)
if (!preg_match('/^(atom|rss2)\/(.+)$/', (string) $args, $m)
|| !defined('ACTIVITY_REPORT')
|| !ActivityReport::instance()->settings->feed_active
) {
@ -50,15 +42,15 @@ class UrlHandler extends dcUrlHandlers
}
// feed limits
$nb = dcCore::app()->blog?->settings->get('system')->get('nb_post_per_feed');
//$it = dcCore::app()->blog?->settings->get('system')->get('short_feed_items');
$rb = dcCore::app()->blog?->settings->get('system')->get('robots_policy');
$nb = App::blog()->settings()->get('system')->get('nb_post_per_feed');
//$it = App::blog()->settings()->get('system')->get('short_feed_items');
$rb = App::blog()->settings()->get('system')->get('robots_policy');
dcCore::app()->ctx->__set('nb_entry_per_page', is_numeric($nb) ? (int) $nb : 20);
// dcCore::app()->ctx->__set('short_feed_items', is_numerci($it) ? (int) $it : 1);
App::frontend()->context()->__set('nb_entry_per_page', is_numeric($nb) ? (int) $nb : 20);
// App::frontend->context()->__set('short_feed_items', is_numerci($it) ? (int) $it : 1);
// serve activity feed template
header('X-Robots-Tag: ' . context::robotsPolicy(is_string($rb) ? $rb : '', ''));
header('X-Robots-Tag: ' . App::frontend()->context()::robotsPolicy(is_string($rb) ? $rb : '', ''));
self::serveDocument('activityreport-' . $m[1] . '.xml', $mime);
}
}