clean up again
This commit is contained in:
parent
ef17eb4a52
commit
fb42b5b6ae
7 changed files with 118 additions and 120 deletions
|
|
@ -30,4 +30,4 @@ Add and configure "Last blog update" from widgets manager.
|
|||
## CONTRIBUTORS
|
||||
|
||||
* Jean-Chirstian Denis
|
||||
* Pierre Van Glabeke
|
||||
* Pierre Van Glabeke
|
||||
22
_admin.php
22
_admin.php
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
# -- BEGIN LICENSE BLOCK ----------------------------------
|
||||
#
|
||||
# This file is part of lastBlogUpdate, a plugin for Dotclear 2.
|
||||
#
|
||||
# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
|
||||
#
|
||||
# Licensed under the GPL version 2.0 license.
|
||||
# A copy of this license is available in LICENSE file or at
|
||||
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
#
|
||||
# -- END LICENSE BLOCK ------------------------------------
|
||||
/**
|
||||
* @brief lastBlogUpdate, a plugin for Dotclear 2
|
||||
*
|
||||
* @package Dotclear
|
||||
* @subpackage Plugin
|
||||
*
|
||||
* @author Jean-Christian Denis, Pierre Van Glabeke
|
||||
*
|
||||
* @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
_define.php
22
_define.php
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
# -- BEGIN LICENSE BLOCK ----------------------------------
|
||||
#
|
||||
# This file is part of lastBlogUpdate, a plugin for Dotclear 2.
|
||||
#
|
||||
# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
|
||||
#
|
||||
# Licensed under the GPL version 2.0 license.
|
||||
# A copy of this license is available in LICENSE file or at
|
||||
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
#
|
||||
# -- END LICENSE BLOCK ------------------------------------
|
||||
/**
|
||||
* @brief lastBlogUpdate, a plugin for Dotclear 2
|
||||
*
|
||||
* @package Dotclear
|
||||
* @subpackage Plugin
|
||||
*
|
||||
* @author Jean-Christian Denis, Pierre Van Glabeke
|
||||
*
|
||||
* @copyright Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
|
||||
if (!defined('DC_RC_PATH')) {
|
||||
return null;
|
||||
|
|
|
|||
160
_public.php
160
_public.php
|
|
@ -1,104 +1,104 @@
|
|||
<?php
|
||||
# -- BEGIN LICENSE BLOCK ----------------------------------
|
||||
#
|
||||
# This file is part of lastBlogUpdate, a plugin for Dotclear 2.
|
||||
#
|
||||
# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
|
||||
#
|
||||
# Licensed under the GPL version 2.0 license.
|
||||
# A copy of this license is available in LICENSE file or at
|
||||
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
#
|
||||
# -- END LICENSE BLOCK ------------------------------------
|
||||
/**
|
||||
* @brief lastBlogUpdate, a plugin for Dotclear 2
|
||||
*
|
||||
* @package Dotclear
|
||||
* @subpackage Plugin
|
||||
*
|
||||
* @author Jean-Christian Denis, Pierre Van Glabeke
|
||||
*
|
||||
* @copyright Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
|
||||
if (!defined('DC_RC_PATH')) {
|
||||
|
||||
return null;
|
||||
return null;
|
||||
}
|
||||
|
||||
require dirname(__FILE__).'/_widgets.php';
|
||||
|
||||
function lastBlogUpdateWidgetPublic($w)
|
||||
{
|
||||
global $core;
|
||||
global $core;
|
||||
|
||||
if ($w->offline) {
|
||||
return null;
|
||||
}
|
||||
if ($w->offline) {
|
||||
return null;
|
||||
}
|
||||
|
||||
# Nothing to display
|
||||
if ($w->homeonly == 1 && $core->url->type != 'default'
|
||||
|| $w->homeonly == 2 && $core->url->type == 'default'
|
||||
|| !$w->blog_show && !$w->post_show && !$w->comment_show && !$w->media_show
|
||||
|| !$w->blog_text && !$w->post_text && !$w->comment_text && !$w->media_text) {
|
||||
return null;
|
||||
}
|
||||
# Nothing to display
|
||||
if ($w->homeonly == 1 && $core->url->type != 'default'
|
||||
|| $w->homeonly == 2 && $core->url->type == 'default'
|
||||
|| !$w->blog_show && !$w->post_show && !$w->comment_show && !$w->media_show
|
||||
|| !$w->blog_text && !$w->post_text && !$w->comment_text && !$w->media_text) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$blog = $post = $comment = $media = $addons = '';
|
||||
$blog = $post = $comment = $media = $addons = '';
|
||||
|
||||
# Blog
|
||||
if ($w->blog_show && $w->blog_text) {
|
||||
$title = $w->blog_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->blog_title)) : '';
|
||||
$text = dt::str($w->blog_text, $core->blog->upddt, $core->blog->settings->system->blog_timezone);
|
||||
$blog = sprintf('<li>%s%s</li>', $title, $text);
|
||||
}
|
||||
# Blog
|
||||
if ($w->blog_show && $w->blog_text) {
|
||||
$title = $w->blog_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->blog_title)) : '';
|
||||
$text = dt::str($w->blog_text, $core->blog->upddt, $core->blog->settings->system->blog_timezone);
|
||||
$blog = sprintf('<li>%s%s</li>', $title, $text);
|
||||
}
|
||||
|
||||
# Post
|
||||
if ($w->post_show && $w->post_text) {
|
||||
$rs = $core->blog->getPosts(['limit' => 1, 'no_content' => true]);
|
||||
if (!$rs->isEmpty()) {
|
||||
$title = $w->post_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->post_title)) : '';
|
||||
$text = dt::str($w->post_text, strtotime($rs->post_upddt), $core->blog->settings->system->blog_timezone);
|
||||
$link = $rs->getURL();
|
||||
$over = $rs->post_title;
|
||||
# Post
|
||||
if ($w->post_show && $w->post_text) {
|
||||
$rs = $core->blog->getPosts(['limit' => 1, 'no_content' => true]);
|
||||
if (!$rs->isEmpty()) {
|
||||
$title = $w->post_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->post_title)) : '';
|
||||
$text = dt::str($w->post_text, strtotime($rs->post_upddt), $core->blog->settings->system->blog_timezone);
|
||||
$link = $rs->getURL();
|
||||
$over = $rs->post_title;
|
||||
|
||||
$post = sprintf('<li>%s<a href="%s" title="%s">%s</a></li>', $title, $link, $over, $text);
|
||||
}
|
||||
}
|
||||
$post = sprintf('<li>%s<a href="%s" title="%s">%s</a></li>', $title, $link, $over, $text);
|
||||
}
|
||||
}
|
||||
|
||||
# Comment
|
||||
if ($w->comment_show && $w->comment_text) {
|
||||
$rs = $core->blog->getComments(['limit' => 1, 'no_content' => true]);
|
||||
if (!$rs->isEmpty()) {
|
||||
$title = $w->comment_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->comment_title)) : '';
|
||||
$text = dt::str($w->comment_text, strtotime($rs->comment_upddt), $core->blog->settings->system->blog_timezone);
|
||||
$link = $core->blog->url . $core->getPostPublicURL($rs->post_type, html::sanitizeURL($rs->post_url)) . '#c' . $rs->comment_id;
|
||||
$over = $rs->post_title;
|
||||
# Comment
|
||||
if ($w->comment_show && $w->comment_text) {
|
||||
$rs = $core->blog->getComments(['limit' => 1, 'no_content' => true]);
|
||||
if (!$rs->isEmpty()) {
|
||||
$title = $w->comment_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->comment_title)) : '';
|
||||
$text = dt::str($w->comment_text, strtotime($rs->comment_upddt), $core->blog->settings->system->blog_timezone);
|
||||
$link = $core->blog->url . $core->getPostPublicURL($rs->post_type, html::sanitizeURL($rs->post_url)) . '#c' . $rs->comment_id;
|
||||
$over = $rs->post_title;
|
||||
|
||||
$comment = sprintf('<li>%s<a href="%s" title="%s">%s</a></li>', $title, $link, $over, $text);
|
||||
}
|
||||
}
|
||||
$comment = sprintf('<li>%s<a href="%s" title="%s">%s</a></li>', $title, $link, $over, $text);
|
||||
}
|
||||
}
|
||||
|
||||
# Media
|
||||
if ($w->media_show && $w->media_text) {
|
||||
$rs = $core->con->select(
|
||||
'SELECT media_upddt FROM ' . $core->prefix . 'media ' .
|
||||
"WHERE media_path='" . $core->con->escape($core->blog->settings->system->public_path) . "' " .
|
||||
'ORDER BY media_upddt DESC ' . $core->con->limit(1)
|
||||
);
|
||||
|
||||
if (!$rs->isEmpty()) {
|
||||
$title = $w->media_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->media_title)) : '';
|
||||
$text = dt::str($w->media_text, strtotime($rs->f('media_upddt')), $core->blog->settings->system->blog_timezone);
|
||||
# Media
|
||||
if ($w->media_show && $w->media_text) {
|
||||
$rs = $core->con->select(
|
||||
'SELECT media_upddt FROM ' . $core->prefix . 'media ' .
|
||||
"WHERE media_path='" . $core->con->escape($core->blog->settings->system->public_path) . "' " .
|
||||
'ORDER BY media_upddt DESC ' . $core->con->limit(1)
|
||||
);
|
||||
|
||||
$media = sprintf('<li>%s%s</li>', $title, $text);
|
||||
}
|
||||
}
|
||||
if (!$rs->isEmpty()) {
|
||||
$title = $w->media_title ? sprintf('<strong>%s</strong>', html::escapeHTML($w->media_title)) : '';
|
||||
$text = dt::str($w->media_text, strtotime($rs->f('media_upddt')), $core->blog->settings->system->blog_timezone);
|
||||
|
||||
# --BEHAVIOR-- lastBlogUpdateWidgetParse
|
||||
$addons = $core->callBehavior('lastBlogUpdateWidgetParse', $core, $w);
|
||||
$media = sprintf('<li>%s%s</li>', $title, $text);
|
||||
}
|
||||
}
|
||||
|
||||
# Nothing to display
|
||||
if (!$blog && !$post && !$comment && !$media && !$addons) {
|
||||
return null;
|
||||
}
|
||||
# --BEHAVIOR-- lastBlogUpdateWidgetParse
|
||||
$addons = $core->callBehavior('lastBlogUpdateWidgetParse', $core, $w);
|
||||
|
||||
# Display
|
||||
return $w->renderDiv(
|
||||
$w->content_only,
|
||||
'lastblogupdate ' . $w->class,
|
||||
'',
|
||||
($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') .
|
||||
sprintf('<ul>%s</ul>', $blog . $post . $comment . $media . $addons)
|
||||
);
|
||||
# Nothing to display
|
||||
if (!$blog && !$post && !$comment && !$media && !$addons) {
|
||||
return null;
|
||||
}
|
||||
|
||||
# Display
|
||||
return $w->renderDiv(
|
||||
$w->content_only,
|
||||
'lastblogupdate ' . $w->class,
|
||||
'',
|
||||
($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') .
|
||||
sprintf('<ul>%s</ul>', $blog . $post . $comment . $media . $addons)
|
||||
);
|
||||
}
|
||||
24
_widgets.php
24
_widgets.php
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
# -- BEGIN LICENSE BLOCK ----------------------------------
|
||||
#
|
||||
# This file is part of lastBlogUpdate, a plugin for Dotclear 2.
|
||||
#
|
||||
# Copyright (c) 2009-2021 Jean-Christian Denis and contributors
|
||||
#
|
||||
# Licensed under the GPL version 2.0 license.
|
||||
# A copy of this license is available in LICENSE file or at
|
||||
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
#
|
||||
# -- END LICENSE BLOCK ------------------------------------
|
||||
/**
|
||||
* @brief lastBlogUpdate, a plugin for Dotclear 2
|
||||
*
|
||||
* @package Dotclear
|
||||
* @subpackage Plugin
|
||||
*
|
||||
* @author Jean-Christian Denis, Pierre Van Glabeke
|
||||
*
|
||||
* @copyright Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
|
||||
if (!defined('DC_RC_PATH')) {
|
||||
return null;
|
||||
|
|
@ -20,7 +20,7 @@ $core->addBehavior('initWidgets', 'lastBlogUpdateWidgetAdmin');
|
|||
function lastBlogUpdateWidgetAdmin($w)
|
||||
{
|
||||
global $core;
|
||||
|
||||
|
||||
$w
|
||||
->create(
|
||||
'lastblogupdate',
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
<modules xmlns:da="http://dotaddict.org/da/">
|
||||
<module id="lastBlogUpdate">
|
||||
<name>lastBlogUpdate</name>
|
||||
<version>2021.08.27</version>
|
||||
<version>2021.08.27.1</version>
|
||||
<author>Jean-Christian Denis, Pierre Van Glabeke</author>
|
||||
<desc>Show the dates of last updates of your blog in a widget</desc>
|
||||
<file>https://github.com/JcDenis/lastBlogUpdate/releases/download/v2021.08.27/plugin-lastBlogUpdate.zip</file>
|
||||
<file>https://github.com/JcDenis/lastBlogUpdate/releases/download/v2021.08.27.1/plugin-lastBlogUpdate.zip</file>
|
||||
<da:dcmin>2.19</da:dcmin>
|
||||
<da:details>http://plugins.dotaddict.org/dc2/details/lastBlogUpdate</da:details>
|
||||
<da:section></da:section>
|
||||
<da:support>http://forum.dotclear.org/viewtopic.php?pid=332950#p332950</da:support>
|
||||
</module>
|
||||
</modules>
|
||||
|
|
@ -57,5 +57,4 @@ $GLOBALS['__l10n']['Text for media update:'] = 'Texte pour la date de mise à jo
|
|||
|
||||
$GLOBALS['__l10n']['Show the dates of last updates of your blog in a widget'] = 'Afficher les dates des dernières mises à jour de votre blog';
|
||||
|
||||
$GLOBALS['__l10n']['Last blog update'] = 'Dernières mises à jour du blog';
|
||||
|
||||
$GLOBALS['__l10n']['Last blog update'] = 'Dernières mises à jour du blog';
|
||||
Loading…
Reference in a new issue