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

Compare commits

base: JcDenis:v2023.10.08
Branches Tags
JcDenis:master
JcDenis:v2023.10.24
JcDenis:v2023.10.16
JcDenis:v2023.10.13
JcDenis:v2023.10.11
JcDenis:v2023.10.08
JcDenis:v2023.08.14
..
compare: JcDenis:master
Branches Tags
JcDenis:master
JcDenis:v2023.10.24
JcDenis:v2023.10.16
JcDenis:v2023.10.13
JcDenis:v2023.10.11
JcDenis:v2023.10.08
JcDenis:v2023.08.14

6 Commits
v2023.10.0 ... master

Author SHA1 Message Date
Jean-Christian Denis
02dc3bd51e
fix widgets 2023-10-24 20:30:17 +02:00
Jean-Christian Denis
eb3ad16f88
fix maxlength typo 2023-10-24 20:20:36 +02:00
Jean-Christian Denis
ff2e09e743
code review 2023-10-16 22:36:53 +02:00
Jean-Christian Denis
b1f644a8f3
release 2023.10.13 2023-10-13 20:43:55 +02:00
Jean-Christian Denis
4ec3ac9610
cosmetic 2023-10-11 21:06:12 +02:00
Jean-Christian Denis
208963952c
release 2023.10.11 2023-10-11 21:02:43 +02:00
30 changed files with 346 additions and 417 deletions
Show Stats Expand all files Collapse all files

24
CHANGELOG.md
View File

@ -1,3 +1,27 @@
enhancePostContent 2023.10.24
===========================================================
* Require Dotclear 2.28
* Require PHP 8.1
* Fix widgets
enhancePostContent 2023.10.16
===========================================================
* Require Dotclear 2.28
* Require PHP 8.1
* Code review
enhancePostContent 2023.10.13
===========================================================
* Require Dotclear 2.28
* Require PHP 8.1
* Upgrade to last minute change to Dotclear 2.28
enhancePostContent 2023.10.11
===========================================================
* Require Dotclear 2.28
* Require PHP 8.1
* Code review
enhancePostContent 2023.10.08
===========================================================
* Require Dotclear 2.28

14
README.md
View File

@ -1,7 +1,7 @@
# README
[![Release](https://img.shields.io/badge/release-2023.10.08-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/enhancePostContent/releases)
![Date](https://img.shields.io/badge/date-2023.10.08-c44d58.svg)
[![Release](https://img.shields.io/badge/release-2023.10.24-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/enhancePostContent/releases)
![Date](https://img.shields.io/badge/date-2023.10.24-c44d58.svg)
[![Dotclear](https://img.shields.io/badge/dotclear-v2.28-137bbb.svg)](https://fr.dotclear.org/download)
[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/enhancePostContent)
[![License](https://img.shields.io/badge/license-GPL--2.0-ececec.svg)](https://git.dotclear.watch/JcDenis/enhancePostContent/src/branch/master/LICENSE)
@ -14,10 +14,10 @@ _enhancePostContent_ is a plugin for the open-source web publishing software cal
## REQUIREMENTS
* admin permissions to set up plugin
* content admin permissions to manage fitlers
* Dotclear 2.28
* PHP 8.1+
* Dotclear admin permissions to set up plugin
* Dotclear content admin permissions to manage fitlers
## USAGE
@ -32,10 +32,6 @@ you should also add widgets.
## LINKS
* License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
* Source & contribution : [Gitea Page](https://git.dotclear.watch/JcDenis/enhancePostContent) or [GitHub Page](https://github.com/JcDenis/enhancePostContent)
* Packages & details: [Gitea Page](https://git.dotclear.watch/JcDenis/enhancePostContent/releases) or [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/enhancePostContent)
* [License](https://git.dotclear.watch/JcDenis/enhancePostContent/src/branch/master/LICENSE)
* [Packages & details](https://git.dotclear.watch/JcDenis/enhancePostContent/releases) (or on [Dotaddict](https://plugins.dotaddict.org/dc2/details/enhancePostContent))
* [Sources & contributions](https://git.dotclear.watch/JcDenis/enhancePostContent) (or on [GitHub](https://github.com/JcDenis/enhancePostContent))
@ -44,6 +40,6 @@ you should also add widgets.
## CONTRIBUTORS
* Jean-Christian Denis
* Jean-Christian Denis (author)
You are welcome to contribute to this code.

28
_define.php
View File

@ -1,35 +1,29 @@
<?php
/**
* @brief enhancePostContent, a plugin for Dotclear 2
* @file
* @brief The plugin enhancePostContent definition
* @ingroup enhancePostContent
*
* @package Dotclear
* @subpackage Plugin
* @defgroup enhancePostContent Plugin enhancePostContent.
*
* @author Jean-Christian Denis and Contributors
* Add features to words in post content.
*
* @copyright Jean-Christian Denis
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
use Dotclear\App;
$this->registerModule(
'Enhance post content',
'Add features to words in post content',
'Jean-Christian Denis and Contributors',
'2023.08.14',
'2023.10.24',
[
'requires' => [
['php', '8.1'],
['core', '2.28'],
],
'permissions' => App::auth()->makePermissions([
App::auth()::PERMISSION_CONTENT_ADMIN,
]),
'type' => 'plugin',
'requires' => [['core', '2.28']],
'permissions' => 'My',
'settings' => [
'self' => '',
'blog' => '#params.epc_params',
],
'type' => 'plugin',
'support' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues',
'details' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md',
'repository' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml',

20
_init.php
View File

@ -1,20 +0,0 @@
<?php
/**
* @brief enhancePostContent, 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 initEnhancePostContent
{
public const TABLE_NAME = 'epc';
}

4
dcstore.xml
View File

@ -2,10 +2,10 @@
<modules xmlns:da="http://dotaddict.org/da/">
<module id="enhancePostContent">
<name>Enhance post content</name>
<version>2023.10.08</version>
<version>2023.10.24</version>
<author>Jean-Christian Denis and Contributors</author>
<desc>Add features to words in post content</desc>
<file>https://git.dotclear.watch/JcDenis/enhancePostContent/releases/download/v2023.10.08/plugin-enhancePostContent.zip</file>
<file>https://git.dotclear.watch/JcDenis/enhancePostContent/releases/download/v2023.10.24/plugin-enhancePostContent.zip</file>
<da:dcmin>2.28</da:dcmin>
<da:details>https://git.dotclear.watch/JcDenis/enhancePostContent/src/branch/master/README.md</da:details>
<da:support>https://git.dotclear.watch/JcDenis/enhancePostContent/issues</da:support>

17
locales/en/resources.php
View File

@ -1,17 +1,10 @@
<?php
/**
* @brief enhancePostContent, a plugin for Dotclear 2
* @file
* @brief The plugin enhancePostContent resources
* @ingroup enhancePostContent
*
* @package Dotclear
* @subpackage Plugin
*
* @author Jean-Christian Denis and Contributors
*
* @copyright Jean-Christian Denis
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return;
}
dcCore::app()->resources['help']['enhancePostContent'] = __DIR__ . '/help/help.html';
\Dotclear\App::backend()->resources()->set('help', 'enhancePostContent', __DIR__ . '/help/help.html');

17
locales/fr/resources.php
View File

@ -1,17 +1,10 @@
<?php
/**
* @brief enhancePostContent, a plugin for Dotclear 2
* @file
* @brief The plugin enhancePostContent resources
* @ingroup enhancePostContent
*
* @package Dotclear
* @subpackage Plugin
*
* @author Jean-Christian Denis and Contributors
*
* @copyright Jean-Christian Denis
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return;
}
dcCore::app()->resources['help']['enhancePostContent'] = __DIR__ . '/help/help.html';
\Dotclear\App::backend()->resources()->set('help', 'enhancePostContent', __DIR__ . '/help/help.html');

31
src/Backend.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -17,7 +7,6 @@ namespace Dotclear\Plugin\enhancePostContent;
use ArrayObject;
use Dotclear\App;
use Dotclear\Core\Backend\Favorites;
use Dotclear\Core\BlogSettings;
use Dotclear\Core\Process;
use Dotclear\Helper\Html\Form\{
Checkbox,
@ -29,7 +18,15 @@ use Dotclear\Helper\Html\Form\{
Para,
Text
};
use Dotclear\Interface\Core\BlogSettingsInterface;
/**
* @brief enhancePostContent backend class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Backend extends Process
{
public static function init(): bool
@ -57,7 +54,7 @@ class Backend extends Process
]);
},
// backend user preference form
'adminBlogPreferencesFormV2' => function (BlogSettings $blog_settings): void {
'adminBlogPreferencesFormV2' => function (BlogSettingsInterface $blog_settings): void {
$active = (bool) $blog_settings->get(My::id())->get('active');
$allowedtplvalues = Epc::blogAllowedTemplateValue();
$allowedpubpages = Epc::blogAllowedTemplatePage();
@ -102,7 +99,7 @@ class Backend extends Process
// allowedtplvalues
(new Para())->items([
(new Label(__('Allowed DC template values:'), Label::OUTSIDE_LABEL_BEFORE))->for('epc_allowedtplvalues'),
(new Input('epc_allowedtplvalues'))->size(100)->maxlenght(0)->value(Epc::encodeMulti($allowedtplvalues)),
(new Input('epc_allowedtplvalues'))->size(100)->maxlength(0)->value(Epc::encodeMulti($allowedtplvalues)),
]),
(new Note())
->class('form-note')
@ -110,7 +107,7 @@ class Backend extends Process
// allowedpubpages
(new Para())->items([
(new Label(__('Allowed public pages:'), Label::OUTSIDE_LABEL_BEFORE))->for('epc_allowedpubpages'),
(new Input('epc_allowedpubpages'))->size(100)->maxlenght(0)->value(Epc::encodeMulti($allowedpubpages)),
(new Input('epc_allowedpubpages'))->size(100)->maxlength(0)->value(Epc::encodeMulti($allowedpubpages)),
]),
(new Note())
->class('form-note')
@ -123,7 +120,7 @@ class Backend extends Process
->render();
},
// backend user preference save
'adminBeforeBlogSettingsUpdate' => function (BlogSettings $blog_settings): void {
'adminBeforeBlogSettingsUpdate' => function (BlogSettingsInterface $blog_settings): void {
$active = !empty($_POST['epc_active']);
$allowedtplvalues = Epc::decodeMulti($_POST['epc_allowedtplvalues']);
$allowedpubpages = Epc::decodeMulti($_POST['epc_allowedpubpages']);
@ -148,7 +145,7 @@ class Backend extends Process
];
},
// widgets registration
'initWidgets' => [Widgets::class, 'initWidgets'],
'initWidgets' => Widgets::initWidgets(...),
]);
return true;

32
src/BackendList.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -24,7 +14,11 @@ use Dotclear\Helper\Html\Form\Checkbox;
use Dotclear\Helper\Html\Html;
/**
* Backend filters values list.
* @brief enhancePostContent filters list class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class BackendList extends Listing
{
@ -43,7 +37,7 @@ class BackendList extends Listing
return;
}
$pager = new Pager($filter->value('page'), $this->rs_count, $filter->value('nb'), 10);
$pager = new Pager($filter->value('page'), (int) $this->rs_count, $filter->value('nb'), 10);
$pager->base_url = $url;
$epc_id = [];
@ -71,7 +65,7 @@ class BackendList extends Listing
echo $pager->getLinks() . $blocks[0];
while ($this->rs->fetch()) {
$this->line(isset($epc_id[$this->rs->epc_id]));
$this->line(isset($epc_id[$this->rs->f('epc_id')]));
}
echo $blocks[1] . $blocks[2] . $pager->getLinks();
@ -85,14 +79,14 @@ class BackendList extends Listing
private function line(bool $checked): void
{
$cols = [
'check' => '<td class="nowrap">' . (new Checkbox(['epc_id[]'], $checked))->value($this->rs->epc_id)->render() . '</td>',
'key' => '<td class="nowrap">' . Html::escapeHTML($this->rs->epc_key) . '</td>',
'value' => '<td class="maximal">' . Html::escapeHTML($this->rs->epc_value) . '</td>',
'date' => '<td class="nowrap count">' . Date::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->epc_upddt) . '</td>',
'check' => '<td class="nowrap">' . (new Checkbox(['epc_id[]'], $checked))->value($this->rs->f('epc_id'))->render() . '</td>',
'key' => '<td class="nowrap">' . Html::escapeHTML($this->rs->f('epc_key')) . '</td>',
'value' => '<td class="maximal">' . Html::escapeHTML($this->rs->f('epc_value')) . '</td>',
'date' => '<td class="nowrap count">' . Date::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->f('epc_upddt')) . '</td>',
];
echo
'<tr class="line" id="p' . $this->rs->epc_id . '">' .
'<tr class="line" id="p' . $this->rs->f('epc_id') . '">' .
implode($cols) .
'</tr>';
}

90
src/Epc.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -31,15 +21,59 @@ __('search results page');
__('atom feeds');
__('RSS feeds');
/**
* @brief enhancePostContent main class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Epc
{
/** @var string The temporary pattern to tag words to replace */
/**
* Plugin table name.
*
* @var string TABLE_NAME
*/
public const TABLE_NAME = 'epc';
/**
* Distributed filters.
*
* @var array<int,string> DEFAULT_FILTERS
*/
public const DEFAULT_FILTERS = [
Filter\EpcFilterTag::class,
Filter\EpcFilterSearch::class,
Filter\EpcFilterAcronym::class,
Filter\EpcFilterAbbreviation::class,
Filter\EpcFilterDefinition::class,
Filter\EpcFilterCitation::class,
Filter\EpcFilterLink::class,
Filter\EpcFilterReplace::class,
Filter\EpcFilterUpdate::class,
Filter\EpcFilterTwitter::class,
];
/**
* The temporary pattern to tag words to replace.
*
* @var string FLAGGER
*/
public const FLAGGER = 'ççççç%sççççç';
/** @var EpcFilters $filters THe filters stack */
/**
* The filters stack.
*
* @var EpcFilters $filters
*/
private static EpcFilters $filters;
/** @var array<string,int> $limits The replacment limit per filtre */
/**
* The replacment limit per filtre.
*
* @var array<string,int> $limits
*/
private static array $limits = [];
/**
@ -76,22 +110,22 @@ class Epc
/**
* Get list of allowed templates name->[tag,callback] to list on epc widgets.
*
* @return array The templates name->[id,cb] values
* @return array<string, array<string, mixed>> The templates name->[id,cb] values
*/
public static function widgetAllowedTemplateValue(): array
{
$list = new ArrayObject([
'entry excerpt' => [
'id' => 'entryexcerpt',
'cb' => [self::class, 'widgetContentEntryExcerpt'],
'cb' => self::widgetContentEntryExcerpt(...),
],
'entry content' => [
'id' => 'entrycontent',
'cb' => [self::class, 'widgetContentEntryContent'],
'cb' => self::widgetContentEntryContent(...),
],
'comment content' => [
'id' => 'commentcontent',
'cb' => [self::class, 'widgetContentCommentContent'],
'cb' => self::widgetContentCommentContent(...),
],
]);
@ -375,13 +409,13 @@ class Epc
*/
public static function widgetContentEntryExcerpt(?WidgetsElement $widget = null): string
{
if (!App::frontend()->ctx->exists('posts')) {
if (!App::frontend()->context()->exists('posts')) {
return '';
}
$content = '';
while (App::frontend()->ctx->__get('posts')?->fetch()) {
$content .= App::frontend()->__get('posts')->f('post_excerpt');
while (App::frontend()->context()->__get('posts')?->fetch()) {
$content .= App::frontend()->context()->__get('posts')->f('post_excerpt');
}
return $content;
@ -396,13 +430,13 @@ class Epc
*/
public static function widgetContentEntryContent(?WidgetsElement $widget = null): string
{
if (!App::frontend()->ctx->exists('posts')) {
if (!App::frontend()->context()->exists('posts')) {
return '';
}
$content = '';
while (App::frontend()->ctx->__get('posts')?->fetch()) {
$content .= dApp::frontend()->ctx->__get('posts')->f('post_content');
while (App::frontend()->context()->__get('posts')?->fetch()) {
$content .= App::frontend()->context()->__get('posts')->f('post_content');
}
return $content;
@ -417,14 +451,14 @@ class Epc
*/
public static function widgetContentCommentContent(?WidgetsElement $widget = null): string
{
if (!App::frontend()->ctx->exists('posts')) {
if (!App::frontend()->context()->exists('posts')) {
return '';
}
$content = '';
while (App::frontend()->ctx->__get('posts')?->fetch()) {
$comments = App::blog()->getComments(['post_id' => App::frontend()->ctx->__get('posts')->f('post_id')]);
while ($comments?->fetch()) {
while (App::frontend()->context()->__get('posts')->fetch()) {
$comments = App::blog()->getComments(['post_id' => App::frontend()->context()->__get('posts')->f('post_id')]);
while ($comments->fetch()) {
$content .= $comments->__call('getContent', []);
}
}

30
src/EpcFilter.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -20,9 +10,13 @@ use Dotclear\Plugin\widgets\WidgetsElement;
use Exception;
/**
* Filter abstract class.
* @brief enhancePostContent abstract filter class.
* @ingroup enhancePostContent
*
* All filter must extends this class.
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
abstract class EpcFilter
{
@ -44,10 +38,10 @@ abstract class EpcFilter
/** @var bool $has_list Filter has list of records (property) */
public readonly bool $has_list;
/** @var array $ignore The filter disabled html tags (property) */
/** @var array<int,string> $ignore The filter disabled html tags (property) */
public readonly array $ignore;
/** @var array $class The css class that apply to filter (property) */
/** @var array<int,string> $class The css class that apply to filter (property) */
public readonly array $class;
/** @var string $replace The filter replacement bloc in content (property) */
@ -65,16 +59,16 @@ abstract class EpcFilter
/** @var bool $plural The replacement limit per filter (settings) */
public readonly int $limit;
/** @var array $style The style applied to filter class (settings) */
/** @var array<int,string> $style The style applied to filter class (settings) */
public readonly array $style;
/** @var array $notag The filter disabled html tags (settings) */
/** @var array<int,string> $notag The filter disabled html tags (settings) */
public readonly array $notag;
/** @var array $template The extra template value to scan (settings) */
/** @var array<int,string> $template The extra template value to scan (settings) */
public readonly array $template;
/** @var array $page The extra frontend pages to scan (settings) */
/** @var array<int,string> $page The extra frontend pages to scan (settings) */
public readonly array $page;
/**

24
src/EpcFilters.php
View File

@ -1,27 +1,25 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
/**
* Filters stack.
* @brief enhancePostContent filters stack.
* @ingroup enhancePostContent
*
* Use Epc::getFilters() to get loaded stack
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilters
{
/** @var array<int,EpcFilter> $satck The filters stack */
/**
* The filters stack.
*
* @var array<int, EpcFilter> $stack
*/
private array $stack = [];
/**

28
src/EpcRecord.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -22,7 +12,11 @@ use Dotclear\Database\{
use Exception;
/**
* Filter records.
* @brief enhancePostContent filters records.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcRecord
{
@ -48,7 +42,7 @@ class EpcRecord
'E.epc_filter, E.epc_key, E.epc_value ';
}
$strReq .= 'FROM ' . App::con()->prefix() . My::TABLE_NAME . ' E ';
$strReq .= 'FROM ' . App::con()->prefix() . Epc::TABLE_NAME . ' E ';
if (!empty($params['from'])) {
$strReq .= $params['from'] . ' ';
@ -121,7 +115,7 @@ class EpcRecord
*/
public static function addRecord(Cursor $cur): int
{
App::con()->writeLock(App::con()->prefix() . My::TABLE_NAME);
App::con()->writeLock(App::con()->prefix() . Epc::TABLE_NAME);
try {
$cur->setField('epc_id', self::getNextId());
@ -199,7 +193,7 @@ class EpcRecord
App::behavior()->callBehavior('enhancePostContentbeforeDelRecord', $id);
App::con()->execute(
'DELETE FROM ' . App::con()->prefix() . My::TABLE_NAME . ' ' .
'DELETE FROM ' . App::con()->prefix() . Epc::TABLE_NAME . ' ' .
'WHERE epc_id = ' . $id . ' ' .
"AND blog_id = '" . App::con()->escapeStr(App::blog()->id()) . "' "
);
@ -215,7 +209,7 @@ class EpcRecord
private static function getNextId(): int
{
return (int) App::con()->select(
'SELECT MAX(epc_id) FROM ' . App::con()->prefix() . My::TABLE_NAME . ' '
'SELECT MAX(epc_id) FROM ' . App::con()->prefix() . Epc::TABLE_NAME . ' '
)->f(0) + 1;
}
@ -226,7 +220,7 @@ class EpcRecord
*/
public static function openCursor(): Cursor
{
return App::con()->openCursor(App::con()->prefix() . My::TABLE_NAME);
return App::con()->openCursor(App::con()->prefix() . Epc::TABLE_NAME);
}
/**

20
src/Filter/EpcFilterAbbreviation.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -19,6 +9,14 @@ use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
use Dotclear\Plugin\widgets\WidgetsElement;
/**
* @brief enhancePostContent abbreviation filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterAbbreviation extends EpcFilter
{
protected string $id = 'abbreviation';

20
src/Filter/EpcFilterAcronym.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -19,6 +9,14 @@ use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
use Dotclear\Plugin\widgets\WidgetsElement;
/**
* @brief enhancePostContent acronym filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterAcronym extends EpcFilter
{
protected string $id = 'acronym';

20
src/Filter/EpcFilterCitation.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -19,6 +9,14 @@ use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
use Dotclear\Plugin\widgets\WidgetsElement;
/**
* @brief enhancePostContent citaion filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterCitation extends EpcFilter
{
protected string $id = 'citation';

20
src/Filter/EpcFilterDefinition.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -19,6 +9,14 @@ use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
use Dotclear\Plugin\widgets\WidgetsElement;
/**
* @brief enhancePostContent definition filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterDefinition extends EpcFilter
{
protected string $id = 'definition';

20
src/Filter/EpcFilterLink.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -19,6 +9,14 @@ use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
use Dotclear\Plugin\widgets\WidgetsElement;
/**
* @brief enhancePostContent link filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterLink extends EpcFilter
{
protected string $id = 'link';

20
src/Filter/EpcFilterReplace.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -17,6 +7,14 @@ namespace Dotclear\Plugin\enhancePostContent\Filter;
use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
/**
* @brief enhancePostContent replacement filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterReplace extends EpcFilter
{
protected string $id = 'replace';

20
src/Filter/EpcFilterSearch.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -18,6 +8,14 @@ use Dotclear\App;
use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
/**
* @brief enhancePostContent search filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterSearch extends EpcFilter
{
protected string $id = 'search';

20
src/Filter/EpcFilterTag.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -20,6 +10,14 @@ use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
use Dotclear\Plugin\widgets\WidgetsElement;
/**
* @brief enhancePostContent tag filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterTag extends EpcFilter
{
protected string $id = 'tag';

20
src/Filter/EpcFilterTwitter.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -17,6 +7,14 @@ namespace Dotclear\Plugin\enhancePostContent\Filter;
use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
/**
* @brief enhancePostContent twitter filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterTwitter extends EpcFilter
{
protected string $id = 'twitter';

20
src/Filter/EpcFilterUpdate.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent\Filter;
@ -17,6 +7,14 @@ namespace Dotclear\Plugin\enhancePostContent\Filter;
use Dotclear\Plugin\enhancePostContent\Epc;
use Dotclear\Plugin\enhancePostContent\EpcFilter;
/**
* @brief enhancePostContent update filter.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class EpcFilterUpdate extends EpcFilter
{
protected string $id = 'update';

23
src/Frontend.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -17,6 +7,13 @@ namespace Dotclear\Plugin\enhancePostContent;
use Dotclear\App;
use Dotclear\Core\Process;
/**
* @brief enhancePostContent frontend class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Frontend extends Process
{
public static function init(): bool
@ -39,7 +36,7 @@ class Frontend extends Process
'publicBeforeContentFilterV2' => function (string $tag, array $args): void {
foreach (Epc::getFilters()->dump() as $filter) {
// test context
if (in_array((string) App::frontend()->ctx->__get('current_tpl'), $filter->page)
if (in_array((string) App::frontend()->context()->__get('current_tpl'), $filter->page)
&& in_array($tag, $filter->template)
&& $args[0] != '' //content
&& empty($args['encode_xml'])
@ -52,7 +49,7 @@ class Frontend extends Process
}
},
// Widgets
'initWidgets' => [Widgets::class, 'initWidgets'],
'initWidgets' => Widgets::initWidgets(...),
]);
return true;

31
src/Install.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -19,6 +9,13 @@ use Dotclear\Core\Process;
use Dotclear\Database\Structure;
use Exception;
/**
* @brief enhancePostContent installation class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Install extends Process
{
public static function init(): bool
@ -35,7 +32,7 @@ class Install extends Process
try {
// Database
$s = new Structure(App::con(), App::con()->prefix());
$s->__get(My::TABLE_NAME)
$s->__get(Epc::TABLE_NAME)
->field('epc_id', 'bigint', 0, false)
->field('blog_id', 'varchar', 32, false)
->field('epc_type', 'varchar', 32, false, "'epc'")
@ -124,10 +121,10 @@ class Install extends Process
$curlist = @unserialize($record->f('setting_value'));
if (is_array($curlist)) {
foreach ($curlist as $k => $v) {
$cur = App::con()->openCursor(App::con()->prefix() . My::TABLE_NAME);
App::con()->writeLock(App::con()->prefix() . My::TABLE_NAME);
$cur = App::con()->openCursor(App::con()->prefix() . Epc::TABLE_NAME);
App::con()->writeLock(App::con()->prefix() . Epc::TABLE_NAME);
$cur->setField('epc_id', (int) App::con()->select('SELECT MAX(epc_id) FROM ' . App::con()->prefix() . My::TABLE_NAME . ' ')->f(0) + 1);
$cur->setField('epc_id', (int) App::con()->select('SELECT MAX(epc_id) FROM ' . App::con()->prefix() . Epc::TABLE_NAME . ' ')->f(0) + 1);
$cur->setField('blog_id', $record->f('blog_id'));
$cur->setField('epc_filter', strtolower($m[1]));
$cur->setField('epc_key', $k);
@ -150,9 +147,9 @@ class Install extends Process
private static function upTo20211006(): void
{
# Move old filter name to filter id
$record = App::con()->select('SELECT epc_id, epc_filter FROM ' . App::con()->prefix() . My::TABLE_NAME);
$record = App::con()->select('SELECT epc_id, epc_filter FROM ' . App::con()->prefix() . Epc::TABLE_NAME);
while ($record->fetch()) {
$cur = App::con()->openCursor(App::con()->prefix() . My::TABLE_NAME);
$cur = App::con()->openCursor(App::con()->prefix() . Epc::TABLE_NAME);
$cur->setField('epc_filter', strtolower($record->f('epc_filter')));

27
src/Manage.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -42,6 +32,13 @@ use Dotclear\Helper\Html\Html;
use Dotclear\Helper\Network\Http;
use Exception;
/**
* @brief enhancePostContent manage class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Manage extends Process
{
public static function init(): bool
@ -268,7 +265,7 @@ class Manage extends Process
->for('filter_style' . $k),
(new Input(['filter_style[]', 'filter_style' . $k]))
->size(60)
->maxlenght(255)
->maxlength(255)
->value(Html::escapeHTML($filter->style[$k])),
]);
}
@ -340,7 +337,7 @@ class Manage extends Process
->for('filter_notag'),
(new Input('filter_notag'))
->size(60)
->maxlenght(255)
->maxlength(255)
->value(Epc::encodeSingle($filter->notag)),
]),
(new Note())
@ -409,7 +406,7 @@ class Manage extends Process
->for('new_key'),
(new Input('new_key'))
->size(60)
->maxlenght(255)
->maxlength(255)
->required(true),
]),
(new Para())
@ -418,7 +415,7 @@ class Manage extends Process
->for('new_value'),
(new Input('new_value'))
->size(60)
->maxlenght(255)
->maxlength(255)
->required(true),
]),
(new Para())

45
src/My.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -18,32 +8,23 @@ use Dotclear\App;
use Dotclear\Module\MyPlugin;
/**
* This module definitions.
* @brief enhancePostContent My helper.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class My extends MyPlugin
{
/** @var string Plugin table name */
public const TABLE_NAME = 'epc';
/** @var array Distributed filters */
public const DEFAULT_FILTERS = [
Filter\EpcFilterTag::class,
Filter\EpcFilterSearch::class,
Filter\EpcFilterAcronym::class,
Filter\EpcFilterAbbreviation::class,
Filter\EpcFilterDefinition::class,
Filter\EpcFilterCitation::class,
Filter\EpcFilterLink::class,
Filter\EpcFilterReplace::class,
Filter\EpcFilterUpdate::class,
Filter\EpcFilterTwitter::class,
];
public static function checkCustomContext(int $context): ?bool
{
return !in_array($context, [My::BACKEND, My::MANAGE, My::MENU]) ? null :
App::auth()->check(App::auth()->makePermissions([
return match ($context) {
// Limit main backend featrues to content admin
self::BACKEND, self::MANAGE, self::MENU => App::auth()->check(App::auth()->makePermissions([
App::auth()::PERMISSION_CONTENT_ADMIN,
]), App::blog()->id());
]), App::blog()->id()),
default => null,
};
}
}

23
src/Prepend.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -18,6 +8,13 @@ use Dotclear\App;
use Dotclear\Core\Process;
use Dotclear\Helper\Html\Html;
/**
* @brief enhancePostContent prepend class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Prepend extends Process
{
public static function init(): bool
@ -32,8 +29,8 @@ class Prepend extends Process
}
// register epc filters
app::behavior()->addBehavior('enhancePostContentFilters', function (EpcFilters $stack): void {
foreach (My::DEFAULT_FILTERS as $class) {
App::behavior()->addBehavior('enhancePostContentFilters', function (EpcFilters $stack): void {
foreach (Epc::DEFAULT_FILTERS as $class) {
$stack->add(new $class());
}
});

23
src/Uninstall.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -17,6 +7,13 @@ namespace Dotclear\Plugin\enhancePostContent;
use Dotclear\Core\Process;
use Dotclear\Plugin\Uninstaller\Uninstaller;
/**
* @brief enhancePostContent uninstall class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Uninstall extends Process
{
public static function init(): bool
@ -39,7 +36,7 @@ class Uninstall extends Process
->addUserAction(
'tables',
'delete',
My::TABLE_NAME
Epc::TABLE_NAME
)
->addUserAction(
'plugins',
@ -59,7 +56,7 @@ class Uninstall extends Process
->addDirectAction(
'tables',
'delete',
My::TABLE_NAME
Epc::TABLE_NAME
)
->addDirectAction(
'plugins',

24
src/Widgets.php
View File

@ -1,15 +1,5 @@
<?php
/**
* @brief enhancePostContent, 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\enhancePostContent;
@ -21,9 +11,11 @@ use Dotclear\Plugin\widgets\WidgetsStack;
use Dotclear\Plugin\widgets\WidgetsElement;
/**
* @ingroup DC_PLUGIN_ENHANCEPOSTCONTENT
* @brief Filter posts content - widgets methods.
* @since 2.6
* @brief enhancePostContent widgets class.
* @ingroup enhancePostContent
*
* @author Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
class Widgets
{
@ -37,7 +29,7 @@ class Widgets
$w->create(
'epclist',
My::name(),
[self::class, 'parseWidget'],
self::parseWidget(...),
null,
__('List filtered contents.')
);
@ -94,7 +86,7 @@ class Widgets
# Page
if (!My::settings()->get('active')
|| !in_array(App::frontend()->ctx->__get('current_tpl'), ['post.html', 'page.html'])
|| !in_array(App::frontend()->context()->__get('current_tpl'), ['post.html', 'page.html'])
) {
return '';
}