fix prepend: cleanup, update license, move activityReport behavior

This commit is contained in:
Jean-Christian Paul Denis 2021-09-07 15:05:53 +02:00
parent 14343aa882
commit 956d48b4f4
2 changed files with 107 additions and 113 deletions

View File

@ -1,19 +1,17 @@
<?php <?php
# -- BEGIN LICENSE BLOCK ---------------------------------- /**
# * @brief cinecturlink2, a plugin for Dotclear 2
# This file is part of cinecturlink2, a plugin for Dotclear 2. *
# * @package Dotclear
# Copyright (c) 2009-2013 Jean-Christian Denis and contributors * @subpackage Plugin
# contact@jcdenis.fr http://jcd.lv *
# * @author 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 * @copyright Jean-Christian Denis
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
# */
# -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')) { if (!defined('DC_RC_PATH')) {
return null; return null;
} }
@ -22,25 +20,24 @@ $d = dirname(__FILE__).'/inc/';
$__autoload['cinecturlink2'] = $d . 'class.cinecturlink2.php'; $__autoload['cinecturlink2'] = $d . 'class.cinecturlink2.php';
$__autoload['cinecturlink2Context'] = $d . 'lib.cinecturlink2.context.php'; $__autoload['cinecturlink2Context'] = $d . 'lib.cinecturlink2.context.php';
$__autoload['sitemapsCinecturlink2'] = $d . 'lib.sitemaps.cinecturlink2.php'; $__autoload['sitemapsCinecturlink2'] = $d . 'lib.sitemaps.cinecturlink2.php';
$__autoload['cinecturlink2ActivityReportBehaviors'] = $d . 'lib.cinecturlink2.activityreport.php';
$core->url->register( $core->url->register(
'cinecturlink2', 'cinecturlink2',
'cinecturlink', 'cinecturlink',
'^cinecturlink(?:/(.+))?$', '^cinecturlink(?:/(.+))?$',
array('urlCinecturlink2', 'c2Page') ['urlCinecturlink2', 'c2Page']
); );
# Add cinecturlink2 report on plugin activityReport
if (defined('ACTIVITY_REPORT')) {
require_once $d.'lib.cinecturlink2.activityreport.php';
}
# cinecturlink2 libraries for sitemaps
$core->addBehavior( $core->addBehavior(
'sitemapsDefineParts', 'sitemapsDefineParts',
array('sitemapsCinecturlink2', 'sitemapsDefineParts') ['sitemapsCinecturlink2', 'sitemapsDefineParts']
); );
$core->addBehavior( $core->addBehavior(
'sitemapsURLsCollect', 'sitemapsURLsCollect',
array('sitemapsCinecturlink2', 'sitemapsURLsCollect') ['sitemapsCinecturlink2', 'sitemapsURLsCollect']
); );
if (defined('ACTIVITY_REPORT')) {
cinecturlink2ActivityReportBehaviors::add($core);
}

View File

@ -1,64 +1,63 @@
<?php <?php
# -- BEGIN LICENSE BLOCK ---------------------------------- /**
# * @brief cinecturlink2, a plugin for Dotclear 2
# This file is part of cinecturlink2, a plugin for Dotclear 2. *
# * @package Dotclear
# Copyright (c) 2009-2013 Jean-Christian Denis and contributors * @subpackage Plugin
# contact@jcdenis.fr http://jcd.lv *
# * @author 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 * @copyright Jean-Christian Denis
# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
# */
# -- END LICENSE BLOCK ------------------------------------
if (!defined('DC_RC_PATH')) { if (!defined('DC_RC_PATH')) {
return null; return null;
} }
# This file is used with plugin activityReport class cinecturlink2ActivityReportBehaviors
{
public static function add($core)
{
$core->activityReport->addGroup('cinecturlink2', __('Plugin cinecturlink2')); $core->activityReport->addGroup('cinecturlink2', __('Plugin cinecturlink2'));
# from BEHAVIOR cinecturlink2AfterAddLink in cinecturlink2/inc/class.cinecturlink2.php // from BEHAVIOR cinecturlink2AfterAddLink in cinecturlink2/inc/class.cinecturlink2.php
$core->activityReport->addAction( $core->activityReport->addAction(
'cinecturlink2', 'cinecturlink2',
'create', 'create',
__('link creation'), __('link creation'),
__('A new cineturlink named "%s" was added by "%s"'), __('A new cineturlink named "%s" was added by "%s"'),
'cinecturlink2AfterAddLink', 'cinecturlink2AfterAddLink',
array('cinecturlink2ActivityReportBehaviors', 'addLink') ['cinecturlink2ActivityReportBehaviors', 'addLink']
); );
# from BEHAVIOR cinecturlink2AfterUpdLink in cinecturlink2/inc/class.cinecturlink2.php // from BEHAVIOR cinecturlink2AfterUpdLink in cinecturlink2/inc/class.cinecturlink2.php
$core->activityReport->addAction( $core->activityReport->addAction(
'cinecturlink2', 'cinecturlink2',
'update', 'update',
__('updating link'), __('updating link'),
__('Cinecturlink named "%s" has been updated by "%s"'), __('Cinecturlink named "%s" has been updated by "%s"'),
'cinecturlink2AfterUpdLink', 'cinecturlink2AfterUpdLink',
array('cinecturlink2ActivityReportBehaviors', 'updLink') ['cinecturlink2ActivityReportBehaviors', 'updLink']
); );
# from BEHAVIOR cinecturlink2BeforeDelLink in cinecturlink2/inc/class.cinecturlink2.php // from BEHAVIOR cinecturlink2BeforeDelLink in cinecturlink2/inc/class.cinecturlink2.php
$core->activityReport->addAction( $core->activityReport->addAction(
'cinecturlink2', 'cinecturlink2',
'delete', 'delete',
__('link deletion'), __('link deletion'),
__('Cinecturlink named "%s" has been deleted by "%s"'), __('Cinecturlink named "%s" has been deleted by "%s"'),
'cinecturlink2BeforeDelLink', 'cinecturlink2BeforeDelLink',
array('cinecturlink2ActivityReportBehaviors', 'delLink') ['cinecturlink2ActivityReportBehaviors', 'delLink']
); );
}
class cinecturlink2ActivityReportBehaviors
{
public static function addLink($cur) public static function addLink($cur)
{ {
global $core; global $core;
$logs = array( $logs = [
$cur->link_title, $cur->link_title,
$core->auth->getInfo('user_cn') $core->auth->getInfo('user_cn')
); ];
$core->activityReport->addLog('cinecturlink2', 'create', $logs); $core->activityReport->addLog('cinecturlink2', 'create', $logs);
} }
@ -66,13 +65,12 @@ class cinecturlink2ActivityReportBehaviors
{ {
global $core; global $core;
$C2 = new cinecturlink2($core); $C2 = new cinecturlink2($core);
$rs = $C2->getLinks(array('link_id'=>$id)); $rs = $C2->getLinks(['link_id' => $id]);
$logs = array( $logs = [
$rs->link_title, $rs->link_title,
$core->auth->getInfo('user_cn') $core->auth->getInfo('user_cn')
); ];
$core->activityReport->addLog('cinecturlink2', 'update', $logs); $core->activityReport->addLog('cinecturlink2', 'update', $logs);
} }
@ -80,13 +78,12 @@ class cinecturlink2ActivityReportBehaviors
{ {
global $core; global $core;
$C2 = new cinecturlink2($core); $C2 = new cinecturlink2($core);
$rs = $C2->getLinks(array('link_id'=>$id)); $rs = $C2->getLinks(['link_id' => $id]);
$logs = array( $logs = [
$rs->link_title, $rs->link_title,
$core->auth->getInfo('user_cn') $core->auth->getInfo('user_cn')
); ];
$core->activityReport->addLog('cinecturlink2', 'delete', $logs); $core->activityReport->addLog('cinecturlink2', 'delete', $logs);
} }
} }