JcDenis/postExpired
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

release 2022.11.20

Browse source
This commit is contained in:
Jean-Christian Denis 2022-11-20 21:43:32 +01:00
parent 947b0cf339
commit beb6a186d1
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
9 changed files with 195 additions and 266 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,5 +1,6 @@
2022.04.27.1 - dev
- [ ] fix wrong timezone on admin vs public expired date
2022.11.20
- fix compatibility with Dotclear 2.24 (required)
- fix wrong timezone on admin vs public expired date
2022.04.27
- require Dotclear 2.21.3

9
README.md
View file

@ -3,11 +3,10 @@
[![Release](https://img.shields.io/github/v/release/JcDenis/postExpired)](https://github.com/JcDenis/postExpired/releases)
[![Date](https://img.shields.io/github/release-date/JcDenis/postExpired)](https://github.com/JcDenis/postExpired/releases)
[![Issues](https://img.shields.io/github/issues/JcDenis/postExpired)](https://github.com/JcDenis/postExpired/issues)
[![Dotclear](https://img.shields.io/badge/dotclear-v2.20-blue.svg)](https://fr.dotclear.org/download)
[![Dotclear](https://img.shields.io/badge/dotclear-v2.24-blue.svg)](https://fr.dotclear.org/download)
[![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/postExpired)
[![License](https://img.shields.io/github/license/JcDenis/postExpired)](https://github.com/JcDenis/postExpired/blob/master/LICENSE)
## WHAT IS POSTEXPIRED ?
Post expired is a plugin for the open-source
@ -21,7 +20,7 @@ to change some options of a post at a given time.
postExpired requires:
* contentadmin permissions
* Dotclear 2.21.3
* Dotclear 2.24
## USAGE
@ -43,8 +42,8 @@ Notes:
* License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
* Source & contribution : [GitHub Page](https://github.com/JcDenis/postExpired)
* Packages & details: [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/postExpired)
* Discuss & help: [Dotclear Forum](https://forum.dotclear.org/viewtopic.php?id=42305)
* Packages & details : [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/postExpired)
* Discuss & help : [Dotclear Forum](https://forum.dotclear.org/viewtopic.php?id=42305)
## CONTRIBUTORS

161
_admin.php
View file

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_CONTEXT_ADMIN')) {
return null;
}
@ -22,8 +21,8 @@ if (dcCore::app()->getVersion('postExpired') != dcCore::app()->plugins->moduleIn
# Check user right
if (!dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([
dcAuth::PERMISSION_CONTENT_ADMIN,
]), dcCore::app()->blog->id)
dcAuth::PERMISSION_CONTENT_ADMIN,
]), dcCore::app()->blog->id)
) {
return null;
}
@ -93,21 +92,21 @@ class adminBehaviorPostExpired
public static function adminPostsActions(dcPostsActions $pa)
{
$pa->addAction(
array(
__('Expired entries') => array(
__('Add expired date') => 'post_expired_add'
)
),
array('adminBehaviorPostExpired', 'callbackAdd')
[
__('Expired entries') => [
__('Add expired date') => 'post_expired_add',
],
],
['adminBehaviorPostExpired', 'callbackAdd']
);
$pa->addAction(
array(
__('Expired entries') => array(
__('Remove expired date') => 'post_expired_remove'
)
),
array('adminBehaviorPostExpired', 'callbackRemove')
[
__('Expired entries') => [
__('Remove expired date') => 'post_expired_remove',
],
],
['adminBehaviorPostExpired', 'callbackRemove']
);
}
@ -134,13 +133,13 @@ class adminBehaviorPostExpired
return null;
}
$sidebar_items['post_expired'] = array(
$sidebar_items['post_expired'] = [
'title' => __('Expired date'),
'items' => self::fieldsPostExpired(
$post->post_type,
$post->post_id
)
);
),
];
}
/**
@ -194,7 +193,7 @@ class adminBehaviorPostExpired
|| !empty($post['post_expired_selected'])
|| !empty($post['post_expired_comment'])
|| !empty($post['post_expired_trackback']))) {
foreach($posts_ids as $post_id) {
foreach ($posts_ids as $post_id) {
self::delPostExpired($post_id);
self::setPostExpired($post_id, $post);
}
@ -208,11 +207,11 @@ class adminBehaviorPostExpired
$posts = $pa->getRS();
$pa->beginPage(
dcPage::breadcrumb(array(
dcPage::breadcrumb([
html::escapeHTML(dcCore::app()->blog->name) => '',
$pa->getCallerTitle() => $pa->getRedirection(true),
__('Add expired date to this selection') => ''
)),
$pa->getCallerTitle() => $pa->getRedirection(true),
__('Add expired date to this selection') => '',
]),
//dcPage::jsDatePicker() .
self::adminPostHeaders()
);
@ -225,7 +224,7 @@ class adminBehaviorPostExpired
dcCore::app()->formNonce() .
$pa->getHiddenFields() .
form::hidden(array('action'), 'post_expired_add') .
form::hidden(['action'], 'post_expired_add') .
'<input type="submit" value="' . __('Save') . '" /></p>' .
'</form>';
@ -248,7 +247,7 @@ class adminBehaviorPostExpired
}
# Delete expired date
foreach($posts_ids as $post_id) {
foreach ($posts_ids as $post_id) {
self::delPostExpired($post_id);
}
@ -274,37 +273,32 @@ class adminBehaviorPostExpired
*/
protected static function setPostExpired($post_id, $post)
{
$post_expired = array(
'status'=> '',
'category'=> '',
'selected'=> '',
'comment'=> '',
$post_expired = [
'status' => '',
'category' => '',
'selected' => '',
'comment' => '',
'trackback' => '',
'date'=> date(
'date' => date(
'Y-m-d H:i:00',
strtotime($post['post_expired_date'])
)
);
),
];
if (!empty($post['post_expired_status'])) {
$post_expired['status'] =
(string) $post['post_expired_status'];
$post_expired['status'] = (string) $post['post_expired_status'];
}
if (!empty($post['post_expired_category'])) {
$post_expired['category'] =
(string) $post['post_expired_category'];
$post_expired['category'] = (string) $post['post_expired_category'];
}
if (!empty($post['post_expired_selected'])) {
$post_expired['selected'] =
(string) $post['post_expired_selected'];
$post_expired['selected'] = (string) $post['post_expired_selected'];
}
if (!empty($post['post_expired_comment'])) {
$post_expired['comment'] =
(string) $post['post_expired_comment'];
$post_expired['comment'] = (string) $post['post_expired_comment'];
}
if (!empty($post['post_expired_trackback'])) {
$post_expired['trackback'] =
(string) $post['post_expired_trackback'];
$post_expired['trackback'] = (string) $post['post_expired_trackback'];
}
dcCore::app()->meta->setPostMeta(
@ -322,14 +316,13 @@ class adminBehaviorPostExpired
*/
protected static function fieldsPostExpired($post_type, $post_id = null)
{
$fields = $post_expired = array();
$fields = $post_expired = [];
if ($post_id) {
$rs = dcCore::app()->meta->getMetadata([
'meta_type' => 'post_expired',
'post_id' => $post_id,
'limit' => 1
'post_id' => $post_id,
'limit' => 1,
]);
if (!$rs->isEmpty()) {
@ -337,8 +330,7 @@ class adminBehaviorPostExpired
}
}
$fields['post_expired_date'] =
'<p><label for="post_expired_date">' .
$fields['post_expired_date'] = '<p><label for="post_expired_date">' .
__('Date:') . '</label>' .
form::datetime('post_expired_date', [
'default' => html::escapeHTML(dt::str('%Y-%m-%dT%H:%M', strtotime($post_expired['date'] ?? 0))),
@ -346,8 +338,7 @@ class adminBehaviorPostExpired
])
. '</p>';
$fields['post_expired_status'] =
'<h5>' . __('On this date, change:') . '</h5>' .
$fields['post_expired_status'] = '<h5>' . __('On this date, change:') . '</h5>' .
'<p><label for="post_expired_status">' .
__('Status:') . '</label>' .
form::combo(
@ -358,23 +349,20 @@ class adminBehaviorPostExpired
) . '</p>';
if ($post_type == 'post') {
$fields['post_expired_category'] =
'<p><label for="post_expired_category">' .
$fields['post_expired_category'] = '<p><label for="post_expired_category">' .
__('Category:') . '</label>' .
form::combo(
'post_expired_category',
self::categoriesCombo(
dcCore::app()->blog->getCategories(
array('post_type' => 'post')
['post_type' => 'post']
)
),
empty($post_expired['category']) ?
'' : $post_expired['category']
) . '</p>';
$fields['post_expired_selected'] =
'<p><label for="post_expired_selected">' .
$fields['post_expired_selected'] = '<p><label for="post_expired_selected">' .
__('Selection:') . '</label>' .
form::combo(
'post_expired_selected',
@ -384,8 +372,7 @@ class adminBehaviorPostExpired
) . '</p>';
}
$fields['post_expired_comment'] =
'<p><label for="post_expired_comment">' .
$fields['post_expired_comment'] = '<p><label for="post_expired_comment">' .
__('Comments status:') . '</label>' .
form::combo(
'post_expired_comment',
@ -394,8 +381,7 @@ class adminBehaviorPostExpired
'' : $post_expired['comment']
) . '</p>';
$fields['post_expired_trackback'] =
'<p><label for="post_expired_trackback">' .
$fields['post_expired_trackback'] = '<p><label for="post_expired_trackback">' .
__('Trackbacks status:') . '</label>' .
form::combo(
'post_expired_trackback',
@ -416,22 +402,23 @@ class adminBehaviorPostExpired
protected static function categoriesCombo(dcRecord $categories)
{
# Getting categories
$categories_combo = array(
__('Not changed') => '',
__('Uncategorized') => '!'
);
$categories_combo = [
__('Not changed') => '',
__('Uncategorized') => '!',
];
try {
$categories = dcCore::app()->blog->getCategories(
array('post_type' => 'post')
['post_type' => 'post']
);
while ($categories->fetch()) {
$categories_combo[] = new formSelectOption(
str_repeat('&nbsp;&nbsp;', $categories->level - 1) . '&bull; '. html::escapeHTML($categories->cat_title),
'!'.$categories->cat_id
str_repeat('&nbsp;&nbsp;', $categories->level - 1) . '&bull; ' . html::escapeHTML($categories->cat_title),
'!' . $categories->cat_id
);
}
} catch (Exception $e) {
return array();
return [];
}
return $categories_combo;
@ -444,12 +431,12 @@ class adminBehaviorPostExpired
*/
protected static function statusCombo()
{
return array(
return [
__('Not changed') => '',
__('Published') => '!1',
__('Pending') => '!-2',
__('Unpublished') => '!0'
);
__('Published') => '!1',
__('Pending') => '!-2',
__('Unpublished') => '!0',
];
}
/**
@ -459,11 +446,11 @@ class adminBehaviorPostExpired
*/
protected static function selectedCombo()
{
return array(
__('Not changed') => '',
__('Selected') => '!1',
__('Not selected') => '!0'
);
return [
__('Not changed') => '',
__('Selected') => '!1',
__('Not selected') => '!0',
];
}
/**
@ -473,11 +460,11 @@ class adminBehaviorPostExpired
*/
protected static function commentCombo()
{
return array(
return [
__('Not changed') => '',
__('Opened') => '!1',
__('Closed') => '!0'
);
__('Opened') => '!1',
__('Closed') => '!0',
];
}
/**
@ -487,10 +474,10 @@ class adminBehaviorPostExpired
*/
protected static function trackbackCombo()
{
return array(
return [
__('Not changed') => '',
__('Opened') => '!1',
__('Closed') => '!0'
);
__('Opened') => '!1',
__('Closed') => '!0',
];
}
}

13
_define.php
View file

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return null;
}
@ -21,14 +20,14 @@ $this->registerModule(
'Jean-Christian Denis and Contributors',
'2022.11.12',
[
'requires' => [['core', '2.24']],
'permissions' => dcCore::app()->auth->makePermissions([
'requires' => [['core', '2.24']],
'permissions' => dcCore::app()->auth->makePermissions([
dcAuth::PERMISSION_USAGE,
dcAuth::PERMISSION_CONTENT_ADMIN,
]),
'type' => 'plugin',
'support' => 'https://github.com/JcDenis/postExpired',
'details' => 'https://plugins.dotaddict.org/dc2/details/postExpired',
'repository' => 'https://raw.githubusercontent.com/JcDenis/postExpired/master/dcstore.xml'
'type' => 'plugin',
'support' => 'https://github.com/JcDenis/postExpired',
'details' => 'https://plugins.dotaddict.org/dc2/details/postExpired',
'repository' => 'https://raw.githubusercontent.com/JcDenis/postExpired/master/dcstore.xml',
]
);

5
_install.php
View file

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_CONTEXT_ADMIN')) {
return null;
}
@ -34,7 +33,9 @@ try {
if (!method_exists('dcUtils', 'versionsCompare')
|| dcUtils::versionsCompare(DC_VERSION, $dc_min, '<', false)) {
throw new Exception(sprintf(
'%s requires Dotclear %s', $mod_id, $dc_min
'%s requires Dotclear %s',
$mod_id,
$dc_min
));
}

11
_prepend.php
View file

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return null;
}
@ -26,8 +25,8 @@ if (!defined('DC_RC_PATH')) {
*/
function encodePostExpired($in)
{
$out = array();
foreach($in as $k => $v) {
$out = [];
foreach ($in as $k => $v) {
$out[] = $k . '|' . $v;
}
@ -42,9 +41,9 @@ function encodePostExpired($in)
*/
function decodePostExpired($in)
{
$out = array();
foreach(explode(';', $in) as $v) {
$v = explode('|', $v);
$out = [];
foreach (explode(';', $in) as $v) {
$v = explode('|', $v);
$out[$v[0]] = $v[1];
}

64
_public.php
View file

@ -10,7 +10,6 @@
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
if (!defined('DC_RC_PATH')) {
return null;
}
@ -23,7 +22,7 @@ __('Expired on');
__('This entry has no expiration date');
# launch update only on public home page and feed
if (in_array(dcCore::app()->url->type, array('default', 'feed'))) {
if (in_array(dcCore::app()->url->type, ['default', 'feed'])) {
dcCore::app()->addBehavior(
'publicBeforeDocumentV2',
['publicBehaviorPostExpired', 'publicBeforeDocument']
@ -55,7 +54,6 @@ class publicBehaviorPostExpired
{
/**
* Check if there are expired dates
*
*/
public static function publicBeforeDocument()
{
@ -84,18 +82,17 @@ class publicBehaviorPostExpired
# Loop through marked posts
$updated = false;
while($posts->fetch()) {
while ($posts->fetch()) {
# Decode meta record
$post_expired = decodePostExpired($posts->meta_id);
# Check if post is outdated
$now_tz = $now + dt::getTimeOffset($posts->post_tz, $now);
$now_tz = $now + dt::getTimeOffset($posts->post_tz, $now);
$meta_tz = strtotime($post_expired['date']);
if ($now_tz > $meta_tz) {
# Delete meta for expired date
dcCore::app()->auth->sudo(
array(dcCore::app()->meta, 'delPostMeta'),
[dcCore::app()->meta, 'delPostMeta'],
$posts->post_id,
'post_expired'
);
@ -105,36 +102,40 @@ class publicBehaviorPostExpired
$post_cur->post_upddt = date('Y-m-d H:i:s', $now_tz);
# Loop through actions
foreach($post_expired as $k => $v) {
foreach ($post_expired as $k => $v) {
if (empty($v)) {
continue;
}
# values are prefixed by "!"
$v = (integer) substr($v, 1);
$v = (int) substr($v, 1);
# Put value in post cursor
switch($k)
{
switch($k) {
case 'status':
$post_cur->post_status = $v;
break;
break;
case 'category':
$post_cur->cat_id = $v ? $v : null;
break;
break;
case 'selected':
$post_cur->post_selected = $v;
break;
break;
case 'comment':
$post_cur->post_open_comment = $v;
break;
break;
case 'trackback':
$post_cur->post_open_tb = $v;
break;
break;
}
}
@ -183,15 +184,15 @@ class rsExtPostExpiredPublic extends rsExtPost
if (!$rs->postexpired[$rs->post_id]) { //memory
$rs_date = $rs->core->meta->getMetadata([
'meta_type' => 'post_expired',
'post_id'=> $rs->post_id,
'limit'=> 1
'post_id' => $rs->post_id,
'limit' => 1,
]);
if ($rs_date->isEmpty()) {
return null;
}
$v = decodePostExpired($rs_date->meta_id);
$v = decodePostExpired($rs_date->meta_id);
$rs->postexpired[$rs->post_id] = $v['date'];
}
@ -214,19 +215,19 @@ class tplPostExpired
*/
public static function EntryExpiredIf($attr, $content)
{
$if = array();
$if = [];
$operator = isset($attr['operator']) ?
self::getOperator($attr['operator']) : '&&';
if (isset($attr['has_date'])) {
$sign = (boolean) $attr['has_date'] ? '!' : '=';
$sign = (bool) $attr['has_date'] ? '!' : '=';
$if[] = '(null ' . $sign . '== dcCore::app()->ctx->posts->postExpiredDate())';
} else {
$if[] = '(null !== dcCore::app()->ctx->posts->postExpiredDate())';
}
return
"<?php if(" . implode(' ' . $operator . ' ', $if) . ") : ?>\n" .
'<?php if(' . implode(' ' . $operator . ' ', $if) . ") : ?>\n" .
$content .
"<?php endif; ?>\n";
}
@ -243,13 +244,13 @@ class tplPostExpired
$f = dcCore::app()->tpl->getFilters($attr);
if (!empty($attr['rfc822'])) {
$res = sprintf($f, "dt::rfc822(strtotime(dcCore::app()->ctx->posts->postExpiredDate()),dcCore::app()->ctx->posts->post_tz)");
$res = sprintf($f, 'dt::rfc822(strtotime(dcCore::app()->ctx->posts->postExpiredDate()),dcCore::app()->ctx->posts->post_tz)');
} elseif (!empty($attr['iso8601'])) {
$res = sprintf($f, "dt::iso8601(strtotime(dcCore::app()->ctx->posts->postExpiredDate(),dcCore::app()->ctx->posts->post_tz)");
$res = sprintf($f, 'dt::iso8601(strtotime(dcCore::app()->ctx->posts->postExpiredDate(),dcCore::app()->ctx->posts->post_tz)');
} elseif ($format) {
$res = sprintf($f, "dt::dt2str('" . $format . "',dcCore::app()->ctx->posts->postExpiredDate())");
} else {
$res = sprintf($f, "dt::dt2str(dcCore::app()->blog->settings->system->date_format,dcCore::app()->ctx->posts->postExpiredDate())");
$res = sprintf($f, 'dt::dt2str(dcCore::app()->blog->settings->system->date_format,dcCore::app()->ctx->posts->postExpiredDate())');
}
return '<?php if (null !== dcCore::app()->ctx->posts->postExpiredDate()) { echo ' . $res . '; } ?>';
@ -264,10 +265,12 @@ class tplPostExpired
{
return
'<?php if (null !== dcCore::app()->ctx->posts->postExpiredDate()) { echo ' . sprintf(
dcCore::app()->tpl->getFilters($attr), "dt::dt2str(" .
(!empty($attr['format']) ?
"'" . addslashes($attr['format']) . "'" : "dcCore::app()->blog->settings->system->time_format"
) . ",dcCore::app()->ctx->posts->postExpiredDate())"
dcCore::app()->tpl->getFilters($attr),
'dt::dt2str(' .
(
!empty($attr['format']) ?
"'" . addslashes($attr['format']) . "'" : 'dcCore::app()->blog->settings->system->time_format'
) . ',dcCore::app()->ctx->posts->postExpiredDate())'
) . '; } ?>';
}
@ -278,8 +281,7 @@ class tplPostExpired
*/
protected static function getOperator($op)
{
switch (strtolower($op))
{
switch (strtolower($op)) {
case 'or':
case '||':
return '||';

21
dcstore.xml
View file

@ -1,12 +1,13 @@
<?xml version="1.0"?>
<modules xmlns:da="http://dotaddict.org/da/">
<module id="postExpired">
<name>Billets périmés</name>
<version>2022.04.27</version>
<author>Jean-Christian Denis and Contributors</author>
<desc>Change entries options at a given date</desc>
<file>https://github.com/JcDenis/postExpired/releases/download/v2022.04.27/plugin-postExpired.zip</file>
<da:dcmin>2.121</da:dcmin>
<da:details>https://plugins.dotaddict.org/dc2/details/postExpired</da:details>
<da:support>https://github.com/JcDenis/postExpired</da:support>
</module>
<module id="postExpired">
<name>Expired entries</name>
<version>2022.11.12</version>
<author>Jean-Christian Denis and Contributors</author>
<desc>Change entries options at a given date</desc>
<file>https://github.com/JcDenis/postExpired/releases/download/v2022.11.12/plugin-postExpired.zip</file>
<da:dcmin>2.24</da:dcmin>
<da:details>https://plugins.dotaddict.org/dc2/details/postExpired</da:details>
<da:support>https://github.com/JcDenis/postExpired</da:support>
</module>
</modules>

60
locales/fr/main.lang.php
View file

@ -1,60 +0,0 @@
<?php
// Language: Français
// Module: postExpired - 2013.11.03
// Date: 2013-11-03 22:12:31
// Translated with dcTranslater - 2013.05.11
#_admin.php:100
#_admin.php:110
$GLOBALS['__l10n']['Expired entries'] = 'Billets périmés';
#_admin.php:101
$GLOBALS['__l10n']['Add expired date'] = 'Ajouter une date de péremption';
#_admin.php:111
$GLOBALS['__l10n']['Remove expired date'] = 'Retirer une date de péremption';
#_admin.php:139
$GLOBALS['__l10n']['Expired date'] = 'Date de péremption';
#_admin.php:209
$GLOBALS['__l10n']['Expired date added.'] = 'Date de péremption ajoutée.';
#_admin.php:222
$GLOBALS['__l10n']['Add expired date to this selection'] = 'Ajouter une date de péremtion à cette sélection';
#_admin.php:269
$GLOBALS['__l10n']['Expired date deleted.'] = 'Dtae de péremtion supprimé';
#_admin.php:370
$GLOBALS['__l10n']['On this date, change:'] = 'Á cette date, changer :';
#_admin.php:398
$GLOBALS['__l10n']['Selection:'] = 'Séléction :';
#_admin.php:409
$GLOBALS['__l10n']['Comments status:'] = 'Status des commentaires :';
#_admin.php:419
$GLOBALS['__l10n']['Trackbacks status:'] = 'Status des rétroliens :';
#_admin.php:440
#_admin.php:470
#_admin.php:485
#_admin.php:499
#_admin.php:513
$GLOBALS['__l10n']['Not changed'] = 'Inchangé';
#_admin.php:500
#_admin.php:514
$GLOBALS['__l10n']['Opened'] = 'Ouvert';
#_admin.php:501
#_admin.php:515
$GLOBALS['__l10n']['Closed'] = 'Fermé';
#_public.php:25
$GLOBALS['__l10n']['Expired on'] = 'Expire le';
#_public.php:26
$GLOBALS['__l10n']['This entry has no expiration date'] = 'Ce billet n\'a pas de date de péremption';