Compare commits

..

No commits in common. "cde1aa319a344e91f959a9950c25b7ebe7897c3d" and "76b78278e0f033e59c88273bde7331423baeccee" have entirely different histories.

12 changed files with 163 additions and 260 deletions

View File

@ -1,21 +1,3 @@
1.3.1 - 2023.06.17
- require dotclear 2.26
- fix php7.4 compatibility
1.3 - 2023.05.13
- require dotclear 2.26
- some fixes for dotclear 2.26 stable
1.2.1 - 2023.04.23
- require dotclear 2.26
- use lastest dotclear namespace (database)
1.2 - 2023.04.22
- require dotclear 2.26
- use lastest dotclear namespace
- fix cosmetic nullsafe warnings
- add plugin Uninstaller features
1.1 - 2023.03.26
- require dotclear 2.26
- use namespace

View File

@ -18,7 +18,7 @@ $this->registerModule(
'Feed after content',
'Add RSS/Atom feeds after entries content',
'Jean-Christian Denis and Contributors',
'1.3.1',
'1.1',
[
'requires' => [['core', '2.26']],
'permissions' => dcCore::app()->auth->makePermissions([

View File

@ -2,10 +2,10 @@
<modules xmlns:da="http://dotaddict.org/da/">
<module id="fac">
<name>Feed after content</name>
<version>1.3.1</version>
<version>1.1</version>
<author>Jean-Christian Denis and Contributors</author>
<desc>Add RSS/Atom feeds after entries content</desc>
<file>https://github.com/JcDenis/fac/releases/download/v1.3.1/plugin-fac.zip</file>
<file>https://github.com/JcDenis/fac/releases/download/v1.1/plugin-fac.zip</file>
<da:dcmin>2.26</da:dcmin>
<da:details>https://plugins.dotaddict.org/dc2/details/fac</da:details>
<da:support>https://github.com/JcDenis/fac</da:support>

View File

@ -1,9 +1,7 @@
/*global $, dotclear, datePicker */
'use strict';
$(() => {
$(function(){
/* toogle admin form sidebar */
$('#fac h5').toggleWithLegend(
$('#fac').children().not('h5'),
{user_pref:'dcx_fac_admin_form_sidebar',legend_click:true}
{cookie:'dcx_fac_admin_form_sidebar',legend_click:true}
);
});

View File

@ -9,53 +9,51 @@
# DOT NOT MODIFY THIS FILE !
#
use Dotclear\Helper\L10n;
L10n::$locales['home page'] = 'la page d\'accueil';
L10n::$locales['post pages'] = 'la page d\'un billet';
L10n::$locales['tags pages'] = 'les pages d\'un tag';
L10n::$locales['archives pages'] = 'les pages des archives';
L10n::$locales['category pages'] = 'les pages de catégorie';
L10n::$locales['entries feed'] = 'le flux des billets';
L10n::$locales['"%s" pages from extension muppet'] = 'la page de type "%s" de l\'extension muppet';
L10n::$locales['To add feed to an entry edit this entry and put in sidebar the url of the feed and select a format.'] = 'Pour ajouter un flux à un billet, modifier ce billet et dans son menu latéral ajouter l\'URL du flux et le format.';
L10n::$locales['Configure formats'] = 'Configurer les formats';
L10n::$locales['Enable "fac" extension'] = 'Activer l\'extension "fac"';
L10n::$locales['You can manage related feed to display for each post with a predefined format.'] = 'Vous pouvez gérer les flux a afficher pour chaque billet avec un format prédéfini.';
L10n::$locales['Feed'] = 'Flux';
L10n::$locales['Default title'] = 'Titre par défaut';
L10n::$locales['Use %T to insert title of feed.'] = 'Utiliser %T pour insérer le titre du flux.';
L10n::$locales['Show description of feed'] = 'Afficher la description';
L10n::$locales['Show feed after content on:'] = 'Afficher le flux après le contenu sur :';
L10n::$locales['Linked feed'] = 'Flux lié';
L10n::$locales['Add feed'] = 'Ajouter un flux';
L10n::$locales['Remove feed'] = 'Retirer un flux';
L10n::$locales['Linked feed deleted.'] = 'Flux lié effacé.';
L10n::$locales['Linked feed added.'] = 'Flux lié ajouté.';
L10n::$locales['Linked feed to this selection'] = 'Lié un flux a cette selection';
L10n::$locales['view feed'] = 'Voir le flux';
L10n::$locales['Format %s'] = 'Format %s';
L10n::$locales['In order to remove a format, leave its name empty.'] = 'Pour retirer un format, laisser son nom vide.';
L10n::$locales['Use date format of Dotclear or leave empty to use default date format of blog.'] = 'Utiliser le formatage des dates de Dotclear ou laisser vide pour utiliser le format par défaut du blog.';
L10n::$locales['Leave lengh empty for no limit.'] = 'Laisser vide pour ne pas mettre de limite.';
L10n::$locales['Title format:'] = 'Format du titre :';
L10n::$locales['Format can be:'] = 'Le format peut-être :';
L10n::$locales['Over title format:'] = 'Format au survole du titre :';
L10n::$locales['Maximum length of title:'] = 'Longueur maximum du titre :';
L10n::$locales['Show description of entries'] = 'Afficher la description des billets';
L10n::$locales['Remove html of description'] = 'Retirer le code HTML de la description';
L10n::$locales['Maximum length of description:'] = 'Longueur maximum de la description :';
L10n::$locales['Show content of entries'] = 'Afficher le contenu du flux';
L10n::$locales['Remove html of content'] = 'Retirer le code HTML du contenu';
L10n::$locales['Maximum length of content:'] = 'Longueur maximum du contenu :';
L10n::$locales['New format'] = 'Nouveau format';
L10n::$locales['Informations'] = 'Informations';
L10n::$locales['Theme'] = 'Thème';
L10n::$locales['Theme must have behavoir publicEntryAfterContent.'] = 'Le thème doit avoir le behavior pulicEnryAfterContent.';
L10n::$locales['Structure'] = 'Structure';
L10n::$locales['Title of feed'] = 'Titre du flux';
L10n::$locales['Description of feed'] = 'Descritpion du flux';
L10n::$locales['Title of entry'] = 'Titre du billet';
L10n::$locales['Description of entry'] = 'Description du billet';
L10n::$locales['a related feed'] = 'un flux lié';
L10n::$locales['Add RSS/Atom feeds after entries content'] = 'Ajouter des flux RSS/Atom après le contenu des billets';
l10n::$locales['home page'] = 'la page d\'accueil';
l10n::$locales['post pages'] = 'la page d\'un billet';
l10n::$locales['tags pages'] = 'les pages d\'un tag';
l10n::$locales['archives pages'] = 'les pages des archives';
l10n::$locales['category pages'] = 'les pages de catégorie';
l10n::$locales['entries feed'] = 'le flux des billets';
l10n::$locales['"%s" pages from extension muppet'] = 'la page de type "%s" de l\'extension muppet';
l10n::$locales['To add feed to an entry edit this entry and put in sidebar the url of the feed and select a format.'] = 'Pour ajouter un flux à un billet, modifier ce billet et dans son menu latéral ajouter l\'URL du flux et le format.';
l10n::$locales['Configure formats'] = 'Configurer les formats';
l10n::$locales['Enable "fac" extension'] = 'Activer l\'extension "fac"';
l10n::$locales['You can manage related feed to display for each post with a predefined format.'] = 'Vous pouvez gérer les flux a afficher pour chaque billet avec un format prédéfini.';
l10n::$locales['Feed'] = 'Flux';
l10n::$locales['Default title'] = 'Titre par défaut';
l10n::$locales['Use %T to insert title of feed.'] = 'Utiliser %T pour insérer le titre du flux.';
l10n::$locales['Show description of feed'] = 'Afficher la description';
l10n::$locales['Show feed after content on:'] = 'Afficher le flux après le contenu sur :';
l10n::$locales['Linked feed'] = 'Flux lié';
l10n::$locales['Add feed'] = 'Ajouter un flux';
l10n::$locales['Remove feed'] = 'Retirer un flux';
l10n::$locales['Linked feed deleted.'] = 'Flux lié effacé.';
l10n::$locales['Linked feed added.'] = 'Flux lié ajouté.';
l10n::$locales['Linked feed to this selection'] = 'Lié un flux a cette selection';
l10n::$locales['view feed'] = 'Voir le flux';
l10n::$locales['Format %s'] = 'Format %s';
l10n::$locales['In order to remove a format, leave its name empty.'] = 'Pour retirer un format, laisser son nom vide.';
l10n::$locales['Use date format of Dotclear or leave empty to use default date format of blog.'] = 'Utiliser le formatage des dates de Dotclear ou laisser vide pour utiliser le format par défaut du blog.';
l10n::$locales['Leave lengh empty for no limit.'] = 'Laisser vide pour ne pas mettre de limite.';
l10n::$locales['Title format:'] = 'Format du titre :';
l10n::$locales['Format can be:'] = 'Le format peut-être :';
l10n::$locales['Over title format:'] = 'Format au survole du titre :';
l10n::$locales['Maximum length of title:'] = 'Longueur maximum du titre :';
l10n::$locales['Show description of entries'] = 'Afficher la description des billets';
l10n::$locales['Remove html of description'] = 'Retirer le code HTML de la description';
l10n::$locales['Maximum length of description:'] = 'Longueur maximum de la description :';
l10n::$locales['Show content of entries'] = 'Afficher le contenu du flux';
l10n::$locales['Remove html of content'] = 'Retirer le code HTML du contenu';
l10n::$locales['Maximum length of content:'] = 'Longueur maximum du contenu :';
l10n::$locales['New format'] = 'Nouveau format';
l10n::$locales['Informations'] = 'Informations';
l10n::$locales['Theme'] = 'Thème';
l10n::$locales['Theme must have behavoir publicEntryAfterContent.'] = 'Le thème doit avoir le behavior pulicEnryAfterContent.';
l10n::$locales['Structure'] = 'Structure';
l10n::$locales['Title of feed'] = 'Titre du flux';
l10n::$locales['Description of feed'] = 'Descritpion du flux';
l10n::$locales['Title of entry'] = 'Titre du billet';
l10n::$locales['Description of entry'] = 'Description du billet';
l10n::$locales['a related feed'] = 'un flux lié';
l10n::$locales['Add RSS/Atom feeds after entries content'] = 'Ajouter des flux RSS/Atom après le contenu des billets';

View File

@ -15,18 +15,20 @@ declare(strict_types=1);
namespace Dotclear\Plugin\fac;
use dcCore;
use Dotclear\Core\Process;
use dcNsProcess;
class Backend extends Process
class Backend extends dcNsProcess
{
public static function init(): bool
{
return self::status(My::checkContext(My::BACKEND));
static::$init = defined('DC_CONTEXT_ADMIN');
return static::$init;
}
public static function process(): bool
{
if (!self::status()) {
if (!static::$init) {
return false;
}

View File

@ -14,18 +14,14 @@ declare(strict_types=1);
namespace Dotclear\Plugin\fac;
use cursor;
use ArrayObject;
use dcAuth;
use dcCore;
use dcPage;
use dcPostsActions;
use dcRecord;
use dcSettings;
use Dotclear\Core\Backend\{
Notices,
Page
};
use Dotclear\Core\Backend\Action\ActionsPosts;
use Dotclear\Database\{
Cursor,
MetaRecord
};
use Dotclear\Helper\Html\Html;
use Dotclear\Helper\Html\Form\{
Checkbox,
@ -64,7 +60,7 @@ class BackendBehaviors
__('category pages') => 'category',
__('entries feed') => 'feed',
];
if (dcCore::app()->plugins->getDefine('muppet')->isDefined() && class_exists('\muppet')) {
if (dcCore::app()->plugins->moduleExists('muppet') && class_exists('\muppet')) {
foreach (\muppet::getPostTypes() as $k => $v) {
$types[sprintf(
__('"%s" pages from extension muppet'),
@ -96,15 +92,15 @@ class BackendBehaviors
}
echo
'<div class="fieldset"><h4 id="' . My::id() . '_params">Feed after content</h4>' .
'<div class="fieldset"><h4 id="fac_params">Feed after content</h4>' .
'<p class="form-note">' .
__('To add feed to an entry edit this entry and put in sidebar the url of the feed and select a format.') .
'</p>';
if (dcCore::app()->auth->isSuperAdmin()) {
echo '<p><a href="' . dcCore::app()->admin->url->get('admin.plugins', [
echo '<p><a href="' . dcCore::app()->adminurl->get('admin.plugins', [
'module' => My::id(),
'conf' => 1,
'redir' => dcCore::app()->admin->url->get('admin.blog.pref') . '#params.' . My::id() . '_params',
'redir' => dcCore::app()->adminurl->get('admin.blog.pref') . '#fac_params',
]) . '">' . __('Configure formats') . '</a></p>';
}
@ -160,7 +156,7 @@ class BackendBehaviors
*/
public static function adminPostHeaders(): string
{
return My::jsLoad('backend');
return dcPage::jsModuleLoad(My::id() . '/js/backend.js');
}
/**
@ -168,11 +164,11 @@ class BackendBehaviors
*
* @param ArrayObject $main_items Main items
* @param ArrayObject $sidebar_items Sidebar items
* @param null|MetaRecord $post Post record or null
* @param null|dcRecord $post Post record or null
*/
public static function adminPostFormItems(ArrayObject $main_items, ArrayObject $sidebar_items, ?MetaRecord $post): void
public static function adminPostFormItems(ArrayObject $main_items, ArrayObject $sidebar_items, ?dcRecord $post): void
{
if (is_null(dcCore::app()->blog) || !My::settings()->get('active')) {
if (!dcCore::app()->blog->settings->get(My::id())->get('active')) {
return;
}
@ -201,10 +197,10 @@ class BackendBehaviors
/**
* Save linked feed
*
* @param Cursor $cur Current post Cursor
* @param cursor $cur Current post cursor
* @param integer $post_id Post id
*/
public static function adminAfterPostSave(Cursor $cur, int $post_id): void
public static function adminAfterPostSave(cursor $cur, int $post_id): void
{
if (!isset($_POST['fac_url'])
|| !isset($_POST['fac_format'])) {
@ -231,11 +227,11 @@ class BackendBehaviors
/**
* Add actions to posts page combo
*
* @param ActionsPosts $pa ActionsPostsPage instance
* @param dcPostsActions $pa dcPostsActionsPage instance
*/
public static function adminPostsActions(ActionsPosts $pa): void
public static function adminPostsActions(dcPostsActions $pa): void
{
if (is_null(dcCore::app()->blog) || !My::settings()->get('active')) {
if (!dcCore::app()->blog->settings->get(My::id())->get('active')) {
return;
}
@ -245,8 +241,8 @@ class BackendBehaviors
);
if (!dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([
dcCore::app()->auth::PERMISSION_DELETE,
dcCore::app()->auth::PERMISSION_CONTENT_ADMIN,
dcAuth::PERMISSION_DELETE,
dcAuth::PERMISSION_CONTENT_ADMIN,
]), dcCore::app()->blog->id)) {
return;
}
@ -259,14 +255,11 @@ class BackendBehaviors
/**
* Posts actions callback to remove linked feed
*
* @param ActionsPosts $pa ActionsPosts instance
* @param dcPostsActions $pa dcPostsActions instance
* @param ArrayObject $post _POST actions
*/
public static function callbackRemove(ActionsPosts $pa, ArrayObject $post): void
public static function callbackRemove(dcPostsActions $pa, ArrayObject $post): void
{
if (is_null(dcCore::app()->blog)) {
return;
}
# No entry
$posts_ids = $pa->getIDs();
if (empty($posts_ids)) {
@ -275,8 +268,8 @@ class BackendBehaviors
# No right
if (!dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([
dcCore::app()->auth::PERMISSION_DELETE,
dcCore::app()->auth::PERMISSION_CONTENT_ADMIN,
dcAuth::PERMISSION_DELETE,
dcAuth::PERMISSION_CONTENT_ADMIN,
]), dcCore::app()->blog->id)) {
throw new Exception(__('No enough right'));
}
@ -286,21 +279,18 @@ class BackendBehaviors
self::delFeed($post_id);
}
Notices::addSuccessNotice(__('Linked feed deleted.'));
dcPage::addSuccessNotice(__('Linked feed deleted.'));
$pa->redirect(true);
}
/**
* Posts actions callback to add linked feed
*
* @param ActionsPosts $pa ActionsPosts instance
* @param dcPostsActions $pa dcPostsActions instance
* @param ArrayObject $post _POST actions
*/
public static function callbackAdd(ActionsPosts $pa, ArrayObject $post): void
public static function callbackAdd(dcPostsActions $pa, ArrayObject $post): void
{
if (is_null(dcCore::app()->blog)) {
return;
}
# No entry
$posts_ids = $pa->getIDs();
if (empty($posts_ids)) {
@ -315,13 +305,13 @@ class BackendBehaviors
self::addFeed($post_id, $post);
}
Notices::addSuccessNotice(__('Linked feed added.'));
dcPage::addSuccessNotice(__('Linked feed added.'));
$pa->redirect(true);
# Display form
} else {
$pa->beginPage(
Page::breadcrumb([
dcPage::breadcrumb([
Html::escapeHTML(dcCore::app()->blog->name) => '',
$pa->getCallerTitle() => $pa->getRedirection(true),
__('Linked feed to this selection') => '',
@ -351,7 +341,7 @@ class BackendBehaviors
*/
protected static function formFeed(string $url = '', string $format = ''): string
{
if (is_null(dcCore::app()->blog) || !My::settings()->get('active')) {
if (!dcCore::app()->blog->settings->get(My::id())->get('active')) {
return '';
}
@ -379,10 +369,7 @@ class BackendBehaviors
*/
protected static function comboFac(): array
{
if (is_null(dcCore::app()->blog)) {
return [];
}
$formats = json_decode((string) My::settings()->get('formats'), true);
$formats = json_decode(dcCore::app()->blog->settings->get(My::id())->get('formats'), true);
if (!is_array($formats) || empty($formats)) {
return [];
}
@ -413,7 +400,7 @@ class BackendBehaviors
* @param integer $post_id Post id
* @param array|ArrayObject $options Feed options
*/
protected static function addFeed(int $post_id, $options): void
protected static function addFeed(int $post_id, array|ArrayObject $options): void
{
if (empty($options['fac_url'])
|| empty($options['fac_format'])) {

View File

@ -15,11 +15,8 @@ declare(strict_types=1);
namespace Dotclear\Plugin\fac;
use dcCore;
use Dotclear\Core\Process;
use Dotclear\Core\Backend\{
Notices,
Page
};
use dcPage;
use dcNsProcess;
use Dotclear\Helper\Html\Html;
use Dotclear\Helper\Html\Form\{
Checkbox,
@ -33,21 +30,19 @@ use Dotclear\Helper\Html\Form\{
};
use Exception;
class Config extends Process
class Config extends dcNsProcess
{
public static function init(): bool
{
return self::status(My::checkContext(My::CONFIG));
static::$init == defined('DC_CONTEXT_ADMIN')
&& dcCore::app()->auth?->isSuperAdmin();
return static::$init;
}
public static function process(): bool
{
if (!self::status()) {
return false;
}
//nullsafe
if (is_null(dcCore::app()->blog)) {
if (!static::$init) {
return false;
}
@ -55,7 +50,7 @@ class Config extends Process
dcCore::app()->admin->__get('list')->getURL() . '#plugins' : $_REQUEST['redir'];
# -- Get settings --
$s = My::settings();
$s = dcCore::app()->blog->settings->get(My::id());
$fac_formats = json_decode($s->get('formats'), true);
@ -87,10 +82,10 @@ class Config extends Process
dcCore::app()->blog->triggerBlog();
Notices::addSuccessNotice(
dcPage::addSuccessNotice(
__('Configuration successfully updated.')
);
dcCore::app()->admin->url->redirect(
dcCore::app()->adminurl?->redirect(
'admin.plugins',
['module' => My::id(), 'conf' => 1, 'redir' => dcCore::app()->admin->__get('list')->getRedir()]
);
@ -104,11 +99,10 @@ class Config extends Process
public static function render(): void
{
if (!self::status()) {
if (!static::$init) {
return;
}
$s = My::settings();
$s = dcCore::app()->blog->settings->get(My::id());
$fac_formats = json_decode($s->get('formats'), true);
@ -142,7 +136,7 @@ class Config extends Process
echo '
<div class="fieldset">
<h4 id="' . My::id() . 'Params">' . __('Informations') . '</h4>
<h4>' . __('Informations') . '</h4>
<div class="two-boxes">
@ -170,7 +164,7 @@ class Config extends Process
</div>';
Page::helpBlock('fac');
dcPage::helpBlock('fac');
}
private static function displayFacFormat(string $title, string $uid, array $format): void

View File

@ -16,44 +16,41 @@ namespace Dotclear\Plugin\fac;
use context;
use dcCore;
use Dotclear\Core\Process;
use dcNsProcess;
use Dotclear\Helper\Date;
use Dotclear\Helper\Html\Html;
use Dotclear\Helper\Network\Feed\Reader;
use Exception;
class Frontend extends Process
class Frontend extends dcNsProcess
{
public static function init(): bool
{
return self::status(My::checkContext(My::FRONTEND));
static::$init = defined('DC_RC_PATH');
return static::$init;
}
public static function process(): bool
{
if (!self::status() || is_null(dcCore::app()->blog) || !My::settings()->get('active')) {
if (!static::$init || !dcCore::app()->blog->settings->get(My::id())->get('active')) {
return false;
}
dcCore::app()->addBehavior('publicEntryAfterContent', function (dcCore $core, context $_ctx): void {
//nullsafe
if (is_null(dcCore::app()->blog) || is_null(dcCore::app()->ctx)) {
return;
}
// Not a post
# Not a post
if (!dcCore::app()->ctx->exists('posts')) {
return;
}
// Not in page to show
$types = json_decode((string) My::settings()->get('public_tpltypes'), true);
# Not in page to show
$types = json_decode((string) dcCore::app()->blog->settings->get(My::id())->get('public_tpltypes'), true);
if (!is_array($types)
|| !in_array(dcCore::app()->url->type, $types)) {
return;
}
// Get related feed
# Get related feed
$fac_url = dcCore::app()->meta->getMetadata([
'meta_type' => 'fac',
'post_id' => dcCore::app()->ctx->__get('posts')->f('post_id'),
@ -63,7 +60,7 @@ class Frontend extends Process
return;
}
// Get related format
# Get related format
$fac_format = dcCore::app()->meta->getMetadata([
'meta_type' => 'facformat',
'post_id' => dcCore::app()->ctx->__get('posts')->f('post_id'),
@ -73,7 +70,7 @@ class Frontend extends Process
return;
}
// Get format info
# Get format info
$default_format = [
'name' => 'default',
'dateformat' => '',
@ -89,7 +86,7 @@ class Frontend extends Process
'linescontentnohtml' => '1',
];
$formats = json_decode((string) My::settings()->get('formats'), true);
$formats = json_decode((string) dcCore::app()->blog->settings->get(My::id())->get('formats'), true);
if (empty($formats)
|| !is_array($formats)
|| !isset($formats[$fac_format->f('meta_id')])) {
@ -101,7 +98,7 @@ class Frontend extends Process
);
}
// Read feed url
# Read feed url
$cache = is_dir(DC_TPL_CACHE . '/fac') ? DC_TPL_CACHE . '/fac' : null;
try {
@ -110,32 +107,32 @@ class Frontend extends Process
$feed = null;
}
// No entries
# No entries
if (!$feed) {
return;
}
// Feed title
# Feed title
$feedtitle = '';
if ('' != My::settings()->get('defaultfeedtitle')) {
if ('' != dcCore::app()->blog->settings->get(My::id())->get('defaultfeedtitle')) {
$feedtitle = '<h3>' . Html::escapeHTML(
empty($feed->title) ?
str_replace(
'%T',
__('a related feed'),
(string) My::settings()->get('defaultfeedtitle')
dcCore::app()->blog->settings->get(My::id())->get('defaultfeedtitle')
) :
str_replace(
'%T',
$feed->title,
(string) My::settings()->get('defaultfeedtitle')
dcCore::app()->blog->settings->get(My::id())->get('defaultfeedtitle')
)
) . '</h3>';
}
// Feed desc
# Feed desc
$feeddesc = '';
if (My::settings()->get('showfeeddesc')
if (dcCore::app()->blog->settings->get(My::id())->get('showfeeddesc')
&& '' != $feed->description) {
$feeddesc = '<p>' . context::global_filters(
$feed->description,
@ -143,12 +140,12 @@ class Frontend extends Process
) . '</p>';
}
// Date format
# Date format
$dateformat = '' != $format['dateformat'] ?
$format['dateformat'] :
dcCore::app()->blog->settings->get('system')->get('date_format') . ',' . dcCore::app()->blog->settings->get('system')->get('time_format');
// Enrties limit
# Enrties limit
$entrieslimit = abs((int) $format['lineslimit']);
$uselimit = $entrieslimit > 0 ? true : false;
@ -162,7 +159,7 @@ class Frontend extends Process
# Format date
$date = Date::dt2str($dateformat, $item->pubdate);
// Entries title
# Entries title
$title = context::global_filters(
str_replace(
[
@ -184,7 +181,7 @@ class Frontend extends Process
['remove_html', 'cut_string' => abs((int) $format['linestitlelength'])],
);
// Entries over title
# Entries over title
$overtitle = context::global_filters(
str_replace(
[
@ -206,7 +203,7 @@ class Frontend extends Process
['remove_html', 'cut_string' => 350],
);
// Entries description
# Entries description
$description = '';
if ($format['showlinesdescription']
&& '' != $item->description) {
@ -217,7 +214,7 @@ class Frontend extends Process
) . '</dd>';
}
// Entries content
# Entries content
$content = '';
if ($format['showlinescontent']
&& '' != $item->content) {

View File

@ -16,19 +16,22 @@ namespace Dotclear\Plugin\fac;
use dcCore;
use dcNamespace;
use Dotclear\Core\Process;
use dcNsProcess;
use Exception;
class Install extends Process
class Install extends dcNsProcess
{
public static function init(): bool
{
return self::status(My::checkContext(My::INSTALL));
static::$init = defined('DC_CONTEXT_ADMIN')
&& dcCore::app()->newVersion(My::id(), dcCore::app()->plugins->moduleInfo(My::id(), 'version'));
return static::$init;
}
public static function process(): bool
{
if (!self::status()) {
if (!static::$init) {
return false;
}
@ -103,7 +106,7 @@ class Install extends Process
// Set module settings
foreach ($mod_conf as $v) {
My::settings()->put(
dcCore::app()->blog->settings->get(My::id())->put(
$v[0],
$v[2],
$v[3],

View File

@ -14,11 +14,23 @@ declare(strict_types=1);
namespace Dotclear\Plugin\fac;
use Dotclear\Module\MyPlugin;
use dcCore;
class My
{
/**
* This module id
*/
public static function id(): string
{
return basename(dirname(__DIR__));
}
/**
* This module definitions.
* This module name
*/
class My extends MyPlugin
public static function name(): string
{
return __((string) dcCore::app()->plugins->moduleInfo(self::id(), 'name'));
}
}

View File

@ -1,70 +0,0 @@
<?php
/**
* @brief fac, 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\fac;
use dcCore;
use Dotclear\Core\Process;
use Dotclear\Plugin\Uninstaller\Uninstaller;
class Uninstall extends Process
{
public static function init(): bool
{
return self::status(My::checkContext(My::UNINSTALL));
}
public static function process(): bool
{
if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
return false;
}
Uninstaller::instance()
->addUserAction(
'settings',
'delete_all',
My::id()
)
->addUserAction(
'plugins',
'delete',
My::id()
)
->addUserAction(
'versions',
'delete',
My::id()
)
->addDirectAction(
'settings',
'delete_all',
My::id()
)
->addDirectAction(
'plugins',
'delete',
My::id()
)
->addDirectAction(
'versions',
'delete',
My::id()
)
;
// no custom action
return false;
}
}