fix PRS12 CS
This commit is contained in:
parent
aa102cb260
commit
a43e4015cd
15 changed files with 635 additions and 615 deletions
11
README.md
11
README.md
|
@ -1,10 +1,11 @@
|
|||
# README
|
||||
|
||||
[![Release version](https://img.shields.io/github/v/release/JcDenis/cinecturlink2)](https://github.com/JcDenis/cinecturlink2/releases)
|
||||
[![Release date](https://img.shields.io/github/release-date/JcDenis/cinecturlink2)](https://github.com/JcDenis/cinecturlink2/releases)
|
||||
[![Issue tracking](https://img.shields.io/github/issues/JcDenis/cinecturlink2)](https://github.com/JcDenis/cinecturlink2/issues)
|
||||
[![Dotclear version](https://img.shields.io/badge/dotclear-v2.19-blue.svg)](https://fr.dotclear.org/download)
|
||||
[![License](https://img.shields.io/badge/license-GPL%20v2-blue.svg)](https://github.com/JcDenis/cinecturlink2/blob/master/LICENSE)
|
||||
[![Release](https://img.shields.io/github/v/release/JcDenis/cinecturlink2)](https://github.com/JcDenis/cinecturlink2/releases)
|
||||
[![Date](https://img.shields.io/github/release-date/JcDenis/cinecturlink2)](https://github.com/JcDenis/cinecturlink2/releases)
|
||||
[![Issues](https://img.shields.io/github/issues/JcDenis/cinecturlink2)](https://github.com/JcDenis/cinecturlink2/issues)
|
||||
[![Dotclear](https://img.shields.io/badge/dotclear-v2.19-blue.svg)](https://fr.dotclear.org/download)
|
||||
[![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/cinecturlink2)
|
||||
[![License](https://img.shields.io/github/license/JcDenis/cinecturlink2)](https://github.com/JcDenis/cinecturlink2/blob/master/LICENSE)
|
||||
|
||||
## WHAT IS CINECTURLINK2 ?
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
16
_config.php
16
_config.php
|
@ -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_MODULE')) {
|
||||
return null;
|
||||
}
|
||||
|
@ -20,14 +19,14 @@ $redir = empty($_REQUEST['redir']) ?
|
|||
|
||||
$core->blog->settings->addNamespace('cinecturlink2');
|
||||
$s = $core->blog->settings->cinecturlink2;
|
||||
$cinecturlink2_active = (boolean) $s->cinecturlink2_active;
|
||||
$cinecturlink2_widthmax = abs((integer) $s->cinecturlink2_widthmax);
|
||||
$cinecturlink2_active = (bool) $s->cinecturlink2_active;
|
||||
$cinecturlink2_widthmax = abs((int) $s->cinecturlink2_widthmax);
|
||||
$cinecturlink2_folder = (string) $s->cinecturlink2_folder;
|
||||
$cinecturlink2_triggeronrandom = (boolean) $s->cinecturlink2_triggeronrandom;
|
||||
$cinecturlink2_public_active = (boolean) $s->cinecturlink2_public_active;
|
||||
$cinecturlink2_triggeronrandom = (bool) $s->cinecturlink2_triggeronrandom;
|
||||
$cinecturlink2_public_active = (bool) $s->cinecturlink2_public_active;
|
||||
$cinecturlink2_public_title = (string) $s->cinecturlink2_public_title;
|
||||
$cinecturlink2_public_description = (string) $s->cinecturlink2_public_description;
|
||||
$cinecturlink2_public_nbrpp = (integer) $s->cinecturlink2_public_nbrpp;
|
||||
$cinecturlink2_public_nbrpp = (int) $s->cinecturlink2_public_nbrpp;
|
||||
if ($cinecturlink2_public_nbrpp < 1) {
|
||||
$cinecturlink2_public_nbrpp = 10;
|
||||
}
|
||||
|
@ -36,9 +35,8 @@ $combo_dirs = cinecturlink2::getPublicDirs($core);
|
|||
|
||||
if (!empty($_POST['save'])) {
|
||||
try {
|
||||
|
||||
$cinecturlink2_active = !empty($_POST['cinecturlink2_active']);
|
||||
$cinecturlink2_widthmax = abs((integer) $_POST['cinecturlink2_widthmax']);
|
||||
$cinecturlink2_widthmax = abs((int) $_POST['cinecturlink2_widthmax']);
|
||||
$cinecturlink2_newdir = (string) files::tidyFileName($_POST['cinecturlink2_newdir']);
|
||||
$cinecturlink2_folder = empty($cinecturlink2_newdir) ?
|
||||
(string) files::tidyFileName($_POST['cinecturlink2_folder']) :
|
||||
|
@ -47,7 +45,7 @@ if (!empty($_POST['save'])) {
|
|||
$cinecturlink2_public_active = !empty($_POST['cinecturlink2_public_active']);
|
||||
$cinecturlink2_public_title = (string) $_POST['cinecturlink2_public_title'];
|
||||
$cinecturlink2_public_description = (string) $_POST['cinecturlink2_public_description'];
|
||||
$cinecturlink2_public_nbrpp = (integer) $_POST['cinecturlink2_public_nbrpp'];
|
||||
$cinecturlink2_public_nbrpp = (int) $_POST['cinecturlink2_public_nbrpp'];
|
||||
if ($cinecturlink2_public_nbrpp < 1) {
|
||||
$cinecturlink2_public_nbrpp = 10;
|
||||
}
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
* @copyright Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
|
||||
/*
|
||||
* Taken from cinecturlink for Dotclear 1
|
||||
* By Tigroux and Brol
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
157
_public.php
157
_public.php
|
@ -10,9 +10,7 @@
|
|||
* @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 +18,7 @@ require_once dirname(__FILE__).'/_widgets.php';
|
|||
|
||||
$core->blog->settings->addNamespace('cinecturlink2');
|
||||
|
||||
$c2_tpl_values = array(
|
||||
$c2_tpl_values = [
|
||||
'c2PageFeedID',
|
||||
'c2PageFeedURL',
|
||||
'c2PageURL',
|
||||
|
@ -59,9 +57,9 @@ $c2_tpl_values = array(
|
|||
'c2CategoryTitle',
|
||||
'c2CategoryDescription',
|
||||
'c2CategoryURL'
|
||||
);
|
||||
];
|
||||
|
||||
$c2_tpl_blocks = array(
|
||||
$c2_tpl_blocks = [
|
||||
'c2If',
|
||||
|
||||
'c2Entries',
|
||||
|
@ -76,21 +74,18 @@ $c2_tpl_blocks = array(
|
|||
'c2CategoriesHeader',
|
||||
'c2CategoriesFooter',
|
||||
'c2CategoryIf'
|
||||
);
|
||||
];
|
||||
|
||||
if ($core->blog->settings->cinecturlink2->cinecturlink2_active) {
|
||||
|
||||
foreach ($c2_tpl_blocks as $v) {
|
||||
$core->tpl->addBlock($v, array('tplCinecturlink2', $v));
|
||||
$core->tpl->addBlock($v, ['tplCinecturlink2', $v]);
|
||||
}
|
||||
foreach ($c2_tpl_values as $v) {
|
||||
$core->tpl->addValue($v, array('tplCinecturlink2', $v));
|
||||
$core->tpl->addValue($v, ['tplCinecturlink2', $v]);
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
} else {
|
||||
foreach (array_merge($c2_tpl_blocks, $c2_tpl_values) as $v) {
|
||||
$core->tpl->addBlock($v, array('tplCinecturlink2', 'disable'));
|
||||
$core->tpl->addBlock($v, ['tplCinecturlink2', 'disable']);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -102,8 +97,7 @@ class urlCinecturlink2 extends dcUrlHandlers
|
|||
$core->blog->settings->addNamespace('cinecturlink2');
|
||||
|
||||
if (!$core->blog->settings->cinecturlink2->cinecturlink2_active
|
||||
|| !$core->blog->settings->cinecturlink2->cinecturlink2_public_active)
|
||||
{
|
||||
|| !$core->blog->settings->cinecturlink2->cinecturlink2_public_active) {
|
||||
self::p404();
|
||||
|
||||
return null;
|
||||
|
@ -114,7 +108,7 @@ class urlCinecturlink2 extends dcUrlHandlers
|
|||
dirname(__FILE__) . '/default-templates/'
|
||||
);
|
||||
|
||||
$params = array();
|
||||
$params = [];
|
||||
|
||||
$n = self::getPageArgs($args, 'c2page');
|
||||
if ($n) {
|
||||
|
@ -122,20 +116,21 @@ class urlCinecturlink2 extends dcUrlHandlers
|
|||
}
|
||||
|
||||
$caturl = $core->blog->settings->cinecturlink2->cinecturlink2_public_caturl;
|
||||
if (!$caturl) $caturl = 'c2cat';
|
||||
if (!$caturl) {
|
||||
$caturl = 'c2cat';
|
||||
}
|
||||
|
||||
$c = self::getPageArgs($args, $caturl);
|
||||
if ($c) {
|
||||
if (is_numeric($c)) {
|
||||
$params['cat_id'] = (integer) $c;
|
||||
}
|
||||
else {
|
||||
$params['cat_id'] = (int) $c;
|
||||
} else {
|
||||
$params['cat_title'] = urldecode($c);
|
||||
}
|
||||
}
|
||||
|
||||
$f = self::getPageArgs($args, 'feed');
|
||||
if ($f && in_array($f, array('atom', 'rss2'))) {
|
||||
if ($f && in_array($f, ['atom', 'rss2'])) {
|
||||
$mime = $f == 'atom' ? 'application/atom+xml' : 'application/xml';
|
||||
|
||||
//$_ctx->short_feed_items = $core->blog->settings->system->short_feed_items;
|
||||
|
@ -145,14 +140,12 @@ class urlCinecturlink2 extends dcUrlHandlers
|
|||
|
||||
header('X-Robots-Tag: ' . context::robotsPolicy($core->blog->settings->system->robots_policy, ''));
|
||||
self::serveDocument('cinecturlink2-' . $f . '.xml', $mime);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$d = self::getPageArgs($args, 'c2detail');
|
||||
if ($d) {
|
||||
if (is_numeric($d)) {
|
||||
$params['link_id'] = (integer) $d;
|
||||
}
|
||||
else {
|
||||
$params['link_id'] = (int) $d;
|
||||
} else {
|
||||
$params['link_title'] = urldecode($d);
|
||||
}
|
||||
}
|
||||
|
@ -187,17 +180,17 @@ class tplCinecturlink2
|
|||
|
||||
public static function c2PageURL($a)
|
||||
{
|
||||
return "<?php echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), '$core->blog->url.$core->url->getBase(\'cinecturlink2\')')."; ?>";
|
||||
return '<?php echo ' . sprintf($GLOBALS['core']->tpl->getFilters($a), '$core->blog->url.$core->url->getBase(\'cinecturlink2\')') . '; ?>';
|
||||
}
|
||||
|
||||
public static function c2PageTitle($a)
|
||||
{
|
||||
return "<?php \$title = (string) \$core->blog->settings->cinecturlink2->cinecturlink2_public_title; if (empty(\$title)) { \$title = __('My cinecturlink'); } echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), '$title')."; ?>";
|
||||
return "<?php \$title = (string) \$core->blog->settings->cinecturlink2->cinecturlink2_public_title; if (empty(\$title)) { \$title = __('My cinecturlink'); } echo " . sprintf($GLOBALS['core']->tpl->getFilters($a), '$title') . '; ?>';
|
||||
}
|
||||
|
||||
public static function c2PageFeedURL($a)
|
||||
{
|
||||
return "<?php echo ".sprintf($GLOBALS['core']->tpl->getFilters($a),'$core->blog->url.$core->url->getBase("cinecturlink2")."/feed/'.(!empty($a['type']) && preg_match('#^(rss2|atom)$#', $a['type']) ? $a['type'] : 'atom').'"')."; ?>";
|
||||
return '<?php echo ' . sprintf($GLOBALS['core']->tpl->getFilters($a), '$core->blog->url.$core->url->getBase("cinecturlink2")."/feed/' . (!empty($a['type']) && preg_match('#^(rss2|atom)$#', $a['type']) ? $a['type'] : 'atom') . '"') . '; ?>';
|
||||
}
|
||||
|
||||
public static function c2PageFeedID($a)
|
||||
|
@ -207,45 +200,43 @@ class tplCinecturlink2
|
|||
|
||||
public static function c2PageDescription($a)
|
||||
{
|
||||
return "<?php \$description = (string) \$core->blog->settings->cinecturlink2->cinecturlink2_public_description; echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), '$description')."; ?>";
|
||||
return '<?php $description = (string) $core->blog->settings->cinecturlink2->cinecturlink2_public_description; echo ' . sprintf($GLOBALS['core']->tpl->getFilters($a), '$description') . '; ?>';
|
||||
}
|
||||
|
||||
public static function c2If($a, $c)
|
||||
{
|
||||
$if = array();
|
||||
$if = [];
|
||||
|
||||
$operator = isset($a['operator']) ? self::getOperator($a['operator']) : '&&';
|
||||
|
||||
if (isset($a['request_link'])) {
|
||||
$sign = (boolean) $a['request_link'] ? '' : '!';
|
||||
$sign = (bool) $a['request_link'] ? '' : '!';
|
||||
$if[] = $sign . '(isset($_ctx->c2_page_params["link_id"]) || isset($_ctx->c2_page_params["link_title"]))';
|
||||
}
|
||||
|
||||
if (isset($a['request_cat'])) {
|
||||
$sign = (boolean) $a['request_cat'] ? '' : '!';
|
||||
$sign = (bool) $a['request_cat'] ? '' : '!';
|
||||
$if[] = $sign . '(isset($_ctx->c2_page_params["cat_id"]) || isset($_ctx->c2_page_params["cat_title"]))';
|
||||
}
|
||||
|
||||
return empty($if) ? $c : "<?php if(".implode(' '.$operator.' ', $if).") : ?>\n".$c."<?php endif; ?>\n";
|
||||
return empty($if) ? $c : '<?php if(' . implode(' ' . $operator . ' ', $if) . ") : ?>\n" . $c . "<?php endif; ?>\n";
|
||||
}
|
||||
|
||||
public static function c2Entries($a, $c)
|
||||
{
|
||||
$lastn = isset($a['lastn']) ? abs((integer) $a['lastn'])+0 : -1;
|
||||
$lastn = isset($a['lastn']) ? abs((int) $a['lastn']) + 0 : -1;
|
||||
|
||||
$res = 'if (!isset($c2_page_number)) { $c2_page_number = 1; }' . "\n";
|
||||
|
||||
if ($lastn != 0) {
|
||||
if ($lastn > 0) {
|
||||
$res .= "\$params['limit'] = " . $lastn . ";\n";
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$res .= "if (!isset(\$params['limit']) || \$params['limit'] < 1) { \$params['limit'] = 10; }\n";
|
||||
}
|
||||
if (!isset($a['ignore_pagination']) || $a['ignore_pagination'] == "0") {
|
||||
if (!isset($a['ignore_pagination']) || $a['ignore_pagination'] == '0') {
|
||||
$res .= "\$params['limit'] = array(((\$c2_page_number-1)*\$params['limit']),\$params['limit']);\n";
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$res .= "\$params['limit'] = array(0, \$params['limit']);\n";
|
||||
}
|
||||
}
|
||||
|
@ -253,20 +244,17 @@ class tplCinecturlink2
|
|||
if (isset($a['category'])) {
|
||||
if ($a['category'] == 'null') {
|
||||
$res .= "\$params['sql'] = ' AND L.cat_id IS NULL ';\n";
|
||||
}
|
||||
elseif (is_numeric($a['category'])) {
|
||||
$res .= "\$params['cat_id'] = ".(integer) $a['category'].";\n";
|
||||
}
|
||||
else {
|
||||
} elseif (is_numeric($a['category'])) {
|
||||
$res .= "\$params['cat_id'] = " . (int) $a['category'] . ";\n";
|
||||
} else {
|
||||
$res .= "\$params['cat_title'] = '" . $a['category'] . "';\n";
|
||||
}
|
||||
}
|
||||
|
||||
$sort = isset($a['sort']) && $a['sort'] == 'asc' ? ' asc' : ' desc';
|
||||
$sortby = isset($a['order']) && in_array($a['order'],array('link_count','link_upddt','link_creadt','link_note','link_title')) ? $a['order'] : 'link_upddt';
|
||||
$sortby = isset($a['order']) && in_array($a['order'], ['link_count','link_upddt','link_creadt','link_note','link_title']) ? $a['order'] : 'link_upddt';
|
||||
|
||||
$res .=
|
||||
"\$params['order'] = '".$sortby.$sort."';\n";
|
||||
$res .= "\$params['order'] = '" . $sortby . $sort . "';\n";
|
||||
|
||||
return
|
||||
"<?php \n" .
|
||||
|
@ -282,26 +270,26 @@ class tplCinecturlink2
|
|||
|
||||
public static function c2EntriesHeader($a, $c)
|
||||
{
|
||||
return "<?php if (\$_ctx->c2_entries->isStart()) : ?>".$c."<?php endif; ?>";
|
||||
return '<?php if ($_ctx->c2_entries->isStart()) : ?>' . $c . '<?php endif; ?>';
|
||||
}
|
||||
|
||||
public static function c2EntriesFooter($a, $c)
|
||||
{
|
||||
return "<?php if (\$_ctx->c2_entries->isEnd()) : ?>".$c."<?php endif; ?>";
|
||||
return '<?php if ($_ctx->c2_entries->isEnd()) : ?>' . $c . '<?php endif; ?>';
|
||||
}
|
||||
|
||||
public static function c2EntryIf($a, $c)
|
||||
{
|
||||
$if = array();
|
||||
$if = [];
|
||||
|
||||
$operator = isset($a['operator']) ? self::getOperator($a['operator']) : '&&';
|
||||
|
||||
if (isset($a['has_category'])) {
|
||||
$sign = (boolean) $a['has_category'] ? '!' : '=';
|
||||
$sign = (bool) $a['has_category'] ? '!' : '=';
|
||||
$if[] = '($_ctx->exists("c2_entries") && "" ' . $sign . '= $_ctx->c2_entries->cat_title)';
|
||||
}
|
||||
|
||||
return empty($if) ? $c : "<?php if(".implode(' '.$operator.' ',$if).") : ?>\n".$c."<?php endif; ?>\n";
|
||||
return empty($if) ? $c : '<?php if(' . implode(' ' . $operator . ' ', $if) . ") : ?>\n" . $c . "<?php endif; ?>\n";
|
||||
}
|
||||
|
||||
public static function c2EntryIfFirst($a)
|
||||
|
@ -402,40 +390,40 @@ class tplCinecturlink2
|
|||
|
||||
return
|
||||
"<?php if (\$_ctx->exists('c2_entries')) { " .
|
||||
"\$widthmax = (integer) \$core->blog->settings->cinecturlink2->cinecturlink2_widthmax; ".
|
||||
'$widthmax = (integer) $core->blog->settings->cinecturlink2->cinecturlink2_widthmax; ' .
|
||||
"\$img = sprintf('<img src=\"%s\" alt=\"%s\" %s/>'," .
|
||||
"\$_ctx->c2_entries->link_img, ".
|
||||
'$_ctx->c2_entries->link_img, ' .
|
||||
"html::escapeHTML(\$_ctx->c2_entries->link_title.' - '.\$_ctx->c2_entries->link_author), " .
|
||||
"(\$widthmax ? ' style=\"width:'.\$widthmax.'px;$style\"' : '') " .
|
||||
"); ".
|
||||
"echo ".sprintf($f,'$img')."; unset(\$img); } ?> \n";
|
||||
'); ' .
|
||||
'echo ' . sprintf($f, '$img') . "; unset(\$img); } ?> \n";
|
||||
}
|
||||
|
||||
public static function c2EntryDate($a)
|
||||
{
|
||||
$format = !empty($a['format']) ? addslashes($a['format']) : '';
|
||||
|
||||
if (!empty($a['rfc822']))
|
||||
$p = "dt::rfc822(strtotime(\$_ctx->c2_entries->link_creadt), \$_ctx->posts->post_tz)";
|
||||
elseif (!empty($a['iso8601']))
|
||||
$p = "dt::iso8601(strtotime(\$_ctx->c2_entries->link_creadt), \$_ctx->posts->post_tz)";
|
||||
elseif ($format)
|
||||
if (!empty($a['rfc822'])) {
|
||||
$p = 'dt::rfc822(strtotime($_ctx->c2_entries->link_creadt), $_ctx->posts->post_tz)';
|
||||
} elseif (!empty($a['iso8601'])) {
|
||||
$p = 'dt::iso8601(strtotime($_ctx->c2_entries->link_creadt), $_ctx->posts->post_tz)';
|
||||
} elseif ($format) {
|
||||
$p = "dt::dt2str('" . $format . "', \$_ctx->c2_entries->link_creadt)";
|
||||
else
|
||||
$p = "dt::dt2str(\$core->blog->settings->system->date_format, \$_ctx->c2_entries->link_creadt)";
|
||||
} else {
|
||||
$p = 'dt::dt2str($core->blog->settings->system->date_format, $_ctx->c2_entries->link_creadt)';
|
||||
}
|
||||
|
||||
return self::getGenericValue($p, $a);
|
||||
}
|
||||
|
||||
public static function c2EntryTime($a)
|
||||
{
|
||||
return self::getGenericValue("dt::dt2str(".(!empty($a['format']) ? "'".addslashes($a['format'])."'" : '$core->blog->settings->system->time_format').", \$_ctx->c2_entries->link_creadt)", $a);
|
||||
return self::getGenericValue('dt::dt2str(' . (!empty($a['format']) ? "'" . addslashes($a['format']) . "'" : '$core->blog->settings->system->time_format') . ', $_ctx->c2_entries->link_creadt)', $a);
|
||||
}
|
||||
|
||||
public static function c2Pagination($a, $c)
|
||||
{
|
||||
$p =
|
||||
"<?php\n".
|
||||
$p = "<?php\n" .
|
||||
"\$params = \$_ctx->c2_params;\n" .
|
||||
"\$_ctx->c2_pagination = \$_ctx->cinecturlink->getLinks(\$params,true); unset(\$params);\n" .
|
||||
"?>\n";
|
||||
|
@ -450,19 +438,19 @@ class tplCinecturlink2
|
|||
|
||||
public static function c2PaginationCurrent($a)
|
||||
{
|
||||
return self::getGenericValue('cinecturlink2Context::PaginationPosition('.(isset($a['offset']) ? (integer) $a['offset'] : 0).')', $a);
|
||||
return self::getGenericValue('cinecturlink2Context::PaginationPosition(' . (isset($a['offset']) ? (int) $a['offset'] : 0) . ')', $a);
|
||||
}
|
||||
|
||||
public static function c2PaginationIf($a, $c)
|
||||
{
|
||||
$if = array();
|
||||
$if = [];
|
||||
|
||||
if (isset($a['start'])) {
|
||||
$sign = (boolean) $a['start'] ? '' : '!';
|
||||
$sign = (bool) $a['start'] ? '' : '!';
|
||||
$if[] = $sign . 'cinecturlink2Context::PaginationStart()';
|
||||
}
|
||||
if (isset($a['end'])) {
|
||||
$sign = (boolean) $a['end'] ? '' : '!';
|
||||
$sign = (bool) $a['end'] ? '' : '!';
|
||||
$if[] = $sign . 'cinecturlink2Context::PaginationEnd()';
|
||||
}
|
||||
|
||||
|
@ -471,7 +459,7 @@ class tplCinecturlink2
|
|||
|
||||
public static function c2PaginationURL($a)
|
||||
{
|
||||
return self::getGenericValue('cinecturlink2Context::PaginationURL('.(isset($a['offset']) ? (integer) $a['offset'] : 0).')', $a);
|
||||
return self::getGenericValue('cinecturlink2Context::PaginationURL(' . (isset($a['offset']) ? (int) $a['offset'] : 0) . ')', $a);
|
||||
}
|
||||
|
||||
public static function c2Categories($a, $c)
|
||||
|
@ -487,24 +475,24 @@ class tplCinecturlink2
|
|||
|
||||
public static function c2CategoriesHeader($a, $c)
|
||||
{
|
||||
return "<?php if (\$_ctx->c2_categories->isStart()) : ?>".$c."<?php endif; ?>";
|
||||
return '<?php if ($_ctx->c2_categories->isStart()) : ?>' . $c . '<?php endif; ?>';
|
||||
}
|
||||
|
||||
public static function c2CategoriesFooter($a, $c)
|
||||
{
|
||||
return "<?php if (\$_ctx->c2_categories->isEnd()) : ?>".$c."<?php endif; ?>";
|
||||
return '<?php if ($_ctx->c2_categories->isEnd()) : ?>' . $c . '<?php endif; ?>';
|
||||
}
|
||||
|
||||
public static function c2CategoryIf($a, $c)
|
||||
{
|
||||
$if = array();
|
||||
$if = [];
|
||||
|
||||
if (isset($a['current'])) {
|
||||
$sign = (boolean) $a['current'] ? '' : '!';
|
||||
$sign = (bool) $a['current'] ? '' : '!';
|
||||
$if[] = $sign . 'cinecturlink2Context::CategoryCurrent()';
|
||||
}
|
||||
if (isset($a['first'])) {
|
||||
$sign = (boolean) $a['first'] ? '' : '!';
|
||||
$sign = (bool) $a['first'] ? '' : '!';
|
||||
$if[] = $sign . '$_ctx->c2_categories->isStart()';
|
||||
}
|
||||
|
||||
|
@ -519,7 +507,7 @@ class tplCinecturlink2
|
|||
$p = 'atom';
|
||||
}
|
||||
|
||||
return "<?php echo ".sprintf($GLOBALS['core']->tpl->getFilters($a),'$core->blog->url.$core->url->getBase("cinecturlink2")."/".$core->blog->settings->cinecturlink2->cinecturlink2_public_caturl."/".urlencode($_ctx->c2_categories->cat_title)."/feed/'.$p.'"')."; ?>";
|
||||
return '<?php echo ' . sprintf($GLOBALS['core']->tpl->getFilters($a), '$core->blog->url.$core->url->getBase("cinecturlink2")."/".$core->blog->settings->cinecturlink2->cinecturlink2_public_caturl."/".urlencode($_ctx->c2_categories->cat_title)."/feed/' . $p . '"') . '; ?>';
|
||||
}
|
||||
|
||||
public static function c2CategoryFeedID($a)
|
||||
|
@ -529,33 +517,32 @@ class tplCinecturlink2
|
|||
|
||||
public static function c2CategoryID($a)
|
||||
{
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), '$_ctx->c2_categories->cat_id')."; } ?>";
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo " . sprintf($GLOBALS['core']->tpl->getFilters($a), '$_ctx->c2_categories->cat_id') . '; } ?>';
|
||||
}
|
||||
|
||||
public static function c2CategoryTitle($a)
|
||||
{
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), '$_ctx->c2_categories->cat_title')."; } ?>";
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo " . sprintf($GLOBALS['core']->tpl->getFilters($a), '$_ctx->c2_categories->cat_title') . '; } ?>';
|
||||
}
|
||||
|
||||
public static function c2CategoryDescription($a)
|
||||
{
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), '$_ctx->c2_categories->cat_desc')."; } ?>";
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo " . sprintf($GLOBALS['core']->tpl->getFilters($a), '$_ctx->c2_categories->cat_desc') . '; } ?>';
|
||||
}
|
||||
|
||||
public static function c2CategoryURL($a)
|
||||
{
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), '$core->blog->url.$core->url->getBase("cinecturlink2")."/".$core->blog->settings->cinecturlink2->cinecturlink2_public_caturl."/".urlencode($_ctx->c2_categories->cat_title)')."; } ?>";
|
||||
return "<?php if (\$_ctx->exists('c2_categories')) { echo " . sprintf($GLOBALS['core']->tpl->getFilters($a), '$core->blog->url.$core->url->getBase("cinecturlink2")."/".$core->blog->settings->cinecturlink2->cinecturlink2_public_caturl."/".urlencode($_ctx->c2_categories->cat_title)') . '; } ?>';
|
||||
}
|
||||
|
||||
protected static function getGenericValue($p, $a)
|
||||
{
|
||||
return "<?php if (\$_ctx->exists('c2_entries')) { echo ".sprintf($GLOBALS['core']->tpl->getFilters($a), "$p")."; } ?>";
|
||||
return "<?php if (\$_ctx->exists('c2_entries')) { echo " . sprintf($GLOBALS['core']->tpl->getFilters($a), "$p") . '; } ?>';
|
||||
}
|
||||
|
||||
protected static function getOperator($op)
|
||||
{
|
||||
switch (strtolower($op))
|
||||
{
|
||||
switch (strtolower($op)) {
|
||||
case 'or':
|
||||
case '||':
|
||||
return '||';
|
||||
|
|
121
_uninstall.php
121
_uninstall.php
|
@ -10,77 +10,116 @@
|
|||
* @copyright Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
|
||||
if (!defined('DC_CONTEXT_ADMIN')) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$this->addUserAction(
|
||||
/* type */ 'settings',
|
||||
/* action */ 'delete_all',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* desc */ __('delete all settings')
|
||||
/* type */
|
||||
'settings',
|
||||
/* action */
|
||||
'delete_all',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* desc */
|
||||
__('delete all settings')
|
||||
);
|
||||
|
||||
$this->addUserAction(
|
||||
/* type */ 'tables',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* desc */ sprintf(__('delete %s table'), 'cinecturlink2')
|
||||
/* type */
|
||||
'tables',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* desc */
|
||||
sprintf(__('delete %s table'), 'cinecturlink2')
|
||||
);
|
||||
|
||||
$this->addUserAction(
|
||||
/* type */ 'tables',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2_cat',
|
||||
/* desc */ sprintf(__('delete %s table'), 'cinecturlink2_cat')
|
||||
/* type */
|
||||
'tables',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2_cat',
|
||||
/* desc */
|
||||
sprintf(__('delete %s table'), 'cinecturlink2_cat')
|
||||
);
|
||||
|
||||
$this->addUserAction(
|
||||
/* type */ 'versions',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* desc */ __('delete the version number')
|
||||
/* type */
|
||||
'versions',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* desc */
|
||||
__('delete the version number')
|
||||
);
|
||||
|
||||
$this->addUserAction(
|
||||
/* type */ 'plugins',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* desc */ __('delete plugin files')
|
||||
/* type */
|
||||
'plugins',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* desc */
|
||||
__('delete plugin files')
|
||||
);
|
||||
|
||||
$this->addDirectAction(
|
||||
/* type */ 'settings',
|
||||
/* action */ 'delete_all',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* desc */ sprintf(__('delete all %s settings'), 'cinecturlink2')
|
||||
/* type */
|
||||
'settings',
|
||||
/* action */
|
||||
'delete_all',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* desc */
|
||||
sprintf(__('delete all %s settings'), 'cinecturlink2')
|
||||
);
|
||||
|
||||
$this->addDirectAction(
|
||||
/* type */ 'tables',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* desc */ sprintf(__('delete %s table'), 'cinecturlink2')
|
||||
/* type */
|
||||
'tables',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* desc */
|
||||
sprintf(__('delete %s table'), 'cinecturlink2')
|
||||
);
|
||||
|
||||
$this->addDirectAction(
|
||||
/* type */ 'tables',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2_cat',
|
||||
/* desc */ sprintf(__('delete %s table'), 'cinecturlink2_cat')
|
||||
/* type */
|
||||
'tables',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2_cat',
|
||||
/* desc */
|
||||
sprintf(__('delete %s table'), 'cinecturlink2_cat')
|
||||
);
|
||||
|
||||
$this->addDirectAction(
|
||||
/* type */ 'versions',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* desc */ sprintf(__('delete %s version number'), 'cinecturlink2')
|
||||
/* type */
|
||||
'versions',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* desc */
|
||||
sprintf(__('delete %s version number'), 'cinecturlink2')
|
||||
);
|
||||
|
||||
$this->addDirectAction(
|
||||
/* type */ 'plugins',
|
||||
/* action */ 'delete',
|
||||
/* ns */ 'cinecturlink2',
|
||||
/* description */ sprintf(__('delete %s plugin files'), 'cinecturlink2')
|
||||
/* type */
|
||||
'plugins',
|
||||
/* action */
|
||||
'delete',
|
||||
/* ns */
|
||||
'cinecturlink2',
|
||||
/* description */
|
||||
sprintf(__('delete %s plugin files'), 'cinecturlink2')
|
||||
);
|
25
_widgets.php
25
_widgets.php
|
@ -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;
|
||||
}
|
||||
|
@ -174,13 +173,12 @@ class cinecturlink2Widget
|
|||
if ($w->category) {
|
||||
if ($w->category == 'null') {
|
||||
$params['sql'] = ' AND L.cat_id IS NULL ';
|
||||
}
|
||||
elseif (is_numeric($w->category)) {
|
||||
$params['cat_id'] = (integer) $w->category;
|
||||
} elseif (is_numeric($w->category)) {
|
||||
$params['cat_id'] = (int) $w->category;
|
||||
}
|
||||
}
|
||||
|
||||
$limit = abs((integer) $w->limit);
|
||||
$limit = abs((int) $w->limit);
|
||||
|
||||
// Tirage aléatoire: Consomme beaucoup de ressources!
|
||||
if ($w->sortby == 'RANDOM') {
|
||||
|
@ -216,7 +214,7 @@ class cinecturlink2Widget
|
|||
return null;
|
||||
}
|
||||
|
||||
$widthmax = (integer) $core->blog->settings->cinecturlink2->cinecturlink2_widthmax;
|
||||
$widthmax = (int) $core->blog->settings->cinecturlink2->cinecturlink2_widthmax;
|
||||
$style = $widthmax ? ' style="width:' . $widthmax . 'px;"' : '';
|
||||
|
||||
$entries = [];
|
||||
|
@ -229,13 +227,12 @@ class cinecturlink2Widget
|
|||
$note = $w->shownote ? ' <em>(' . $rs->link_note . '/20)</em>' : '';
|
||||
$desc = $w->showdesc ? '<br /><em>' . html::escapeHTML($rs->link_desc) . '</em>' : '';
|
||||
$lang = $rs->link_lang ? ' hreflang="' . $rs->link_lang . '"' : '';
|
||||
$count = abs((integer) $rs->link_count);
|
||||
$count = abs((int) $rs->link_count);
|
||||
|
||||
# --BEHAVIOR-- cinecturlink2WidgetLinks
|
||||
$bhv = $core->callBehavior('cinecturlink2WidgetLinks', $rs->link_id);
|
||||
|
||||
$entries[] =
|
||||
'<p style="text-align:center;">' .
|
||||
$entries[] = '<p style="text-align:center;">' .
|
||||
($w->withlink && !empty($url) ? '<a href="' . $url . '"' . $lang . ' title="' . $cat . '">' : '') .
|
||||
'<strong>' . $title . '</strong>' . $note . '<br />' .
|
||||
($w->showauthor ? $author . '<br />' : '') . '<br />' .
|
||||
|
@ -249,7 +246,6 @@ class cinecturlink2Widget
|
|||
$cur->link_count = ($count + 1);
|
||||
$C2->updLink($rs->link_id, $cur, false);
|
||||
} catch (Exception $e) {
|
||||
|
||||
}
|
||||
}
|
||||
# Tirage aléatoire
|
||||
|
@ -267,7 +263,8 @@ class cinecturlink2Widget
|
|||
'cinecturlink2list ' . $w->class,
|
||||
'',
|
||||
($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') . implode(' ', $entries) .
|
||||
($w->showpagelink && $core->blog->settings->cinecturlink2->cinecturlink2_public_active ?
|
||||
(
|
||||
$w->showpagelink && $core->blog->settings->cinecturlink2->cinecturlink2_public_active ?
|
||||
'<p><a href="' . $core->blog->url . $core->url->getBase('cinecturlink2') . '" title="' . __('view all links') . '">' . __('More links') . '</a></p>' : ''
|
||||
)
|
||||
);
|
||||
|
@ -294,16 +291,14 @@ class cinecturlink2Widget
|
|||
}
|
||||
|
||||
$res = [];
|
||||
$res[] =
|
||||
'<li><a href="' .
|
||||
$res[] = '<li><a href="' .
|
||||
$core->blog->url . $core->url->getBase('cinecturlink2') .
|
||||
'" title="' . __('view all links') . '">' . __('all links') .
|
||||
'</a>' . ($w->shownumlink ? ' (' . ($C2->getLinks([], true)->f(0)) . ')' : '') .
|
||||
'</li>';
|
||||
|
||||
while ($rs->fetch()) {
|
||||
$res[] =
|
||||
'<li><a href="' .
|
||||
$res[] = '<li><a href="' .
|
||||
$core->blog->url . $core->url->getBase('cinecturlink2') . '/' .
|
||||
$core->blog->settings->cinecturlink2->cinecturlink2_public_caturl . '/' .
|
||||
urlencode($rs->cat_title) .
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
@ -63,8 +62,7 @@ class cinecturlink2
|
|||
$content_req .= implode(', ', $params['columns']) . ', ';
|
||||
}
|
||||
|
||||
$strReq =
|
||||
'SELECT L.link_id, L.blog_id, L.cat_id, L.user_id, L.link_type, ' .
|
||||
$strReq = 'SELECT L.link_id, L.blog_id, L.cat_id, L.user_id, L.link_type, ' .
|
||||
$content_req .
|
||||
'L.link_creadt, L.link_upddt, L.link_note, L.link_count, ' .
|
||||
'L.link_title, L.link_desc, L.link_author, ' .
|
||||
|
@ -74,8 +72,7 @@ class cinecturlink2
|
|||
'C.cat_title, C.cat_desc ';
|
||||
}
|
||||
|
||||
$strReq .=
|
||||
'FROM '. $this->table . ' L ' .
|
||||
$strReq .= 'FROM ' . $this->table . ' L ' .
|
||||
'INNER JOIN ' . $this->core->prefix . 'user U ON U.user_id = L.user_id ' .
|
||||
'LEFT OUTER JOIN ' . $this->table . '_cat C ON L.cat_id = C.cat_id ';
|
||||
|
||||
|
@ -97,18 +94,18 @@ class cinecturlink2
|
|||
|
||||
if (!empty($params['link_id'])) {
|
||||
if (is_array($params['link_id'])) {
|
||||
array_walk($params['link_id'], function(&$v, $k){ if($v !== null) { $v = (integer) $v;}});
|
||||
array_walk($params['link_id'], function (&$v, $k) { if ($v !== null) { $v = (int) $v;}});
|
||||
} else {
|
||||
$params['link_id'] = [(integer) $params['link_id']];
|
||||
$params['link_id'] = [(int) $params['link_id']];
|
||||
}
|
||||
$strReq .= 'AND L.link_id ' . $this->con->in($params['link_id']);
|
||||
}
|
||||
|
||||
if (!empty($params['cat_id'])) {
|
||||
if (is_array($params['cat_id'])) {
|
||||
array_walk($params['cat_id'], function(&$v, $k) { if($v !== null) { $v = (integer) $v;}});
|
||||
array_walk($params['cat_id'], function (&$v, $k) { if ($v !== null) { $v = (int) $v;}});
|
||||
} else {
|
||||
$params['cat_id'] = [(integer) $params['cat_id']];
|
||||
$params['cat_id'] = [(int) $params['cat_id']];
|
||||
}
|
||||
$strReq .= 'AND L.cat_id ' . $this->con->in($params['cat_id']);
|
||||
}
|
||||
|
@ -177,6 +174,7 @@ class cinecturlink2
|
|||
$this->con->unlock();
|
||||
} catch (Exception $e) {
|
||||
$this->con->unlock();
|
||||
|
||||
throw $e;
|
||||
}
|
||||
$this->trigger();
|
||||
|
@ -196,7 +194,7 @@ class cinecturlink2
|
|||
*/
|
||||
public function updLink($id, cursor $cur, $behavior = true)
|
||||
{
|
||||
$id = (integer) $id;
|
||||
$id = (int) $id;
|
||||
|
||||
if (empty($id)) {
|
||||
throw new Exception(__('No such link ID'));
|
||||
|
@ -204,7 +202,7 @@ class cinecturlink2
|
|||
|
||||
$cur->link_upddt = date('Y-m-d H:i:s');
|
||||
|
||||
$cur->update("WHERE link_id = " . $id . " AND blog_id = '" . $this->blog . "' ");
|
||||
$cur->update('WHERE link_id = ' . $id . " AND blog_id = '" . $this->blog . "' ");
|
||||
$this->trigger();
|
||||
|
||||
if ($behavior) {
|
||||
|
@ -220,7 +218,7 @@ class cinecturlink2
|
|||
*/
|
||||
public function delLink($id)
|
||||
{
|
||||
$id = (integer) $id;
|
||||
$id = (int) $id;
|
||||
|
||||
if (empty($id)) {
|
||||
throw new Exception(__('No such link ID'));
|
||||
|
@ -261,15 +259,13 @@ class cinecturlink2
|
|||
{
|
||||
if ($count_only) {
|
||||
$strReq = 'SELECT count(C.cat_id) ';
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$content_req = '';
|
||||
if (!empty($params['columns']) && is_array($params['columns'])) {
|
||||
$content_req .= implode(', ', $params['columns']) . ', ';
|
||||
}
|
||||
|
||||
$strReq =
|
||||
'SELECT C.cat_id, C.blog_id, C.cat_title, C.cat_desc, ' .
|
||||
$strReq = 'SELECT C.cat_id, C.blog_id, C.cat_title, C.cat_desc, ' .
|
||||
$content_req .
|
||||
'C.cat_pos, C.cat_creadt, C.cat_upddt ';
|
||||
}
|
||||
|
@ -284,18 +280,18 @@ class cinecturlink2
|
|||
|
||||
if (!empty($params['cat_id'])) {
|
||||
if (is_array($params['cat_id'])) {
|
||||
array_walk($params['cat_id'], function(&$v, $k) { if($v !== null) { $v = (integer) $v; }});
|
||||
array_walk($params['cat_id'], function (&$v, $k) { if ($v !== null) { $v = (int) $v; }});
|
||||
} else {
|
||||
$params['cat_id'] = [(integer) $params['cat_id']];
|
||||
$params['cat_id'] = [(int) $params['cat_id']];
|
||||
}
|
||||
$strReq .= 'AND C.cat_id ' . $this->con->in($params['cat_id']);
|
||||
}
|
||||
|
||||
if (isset($params['exclude_cat_id']) && $params['exclude_cat_id'] !== '') {
|
||||
if (is_array($params['exclude_cat_id'])) {
|
||||
array_walk($params['exclude_cat_id'], function (&$v, $k) { if ($v !== null) {$v = (integer) $v;}});
|
||||
array_walk($params['exclude_cat_id'], function (&$v, $k) { if ($v !== null) {$v = (int) $v;}});
|
||||
} else {
|
||||
$params['exclude_cat_id'] = [(integer) $params['exclude_cat_id']];
|
||||
$params['exclude_cat_id'] = [(int) $params['exclude_cat_id']];
|
||||
}
|
||||
$strReq .= 'AND C.cat_id NOT ' . $this->con->in($params['exclude_cat_id']);
|
||||
}
|
||||
|
@ -350,6 +346,7 @@ class cinecturlink2
|
|||
$this->con->unlock();
|
||||
} catch (Exception $e) {
|
||||
$this->con->unlock();
|
||||
|
||||
throw $e;
|
||||
}
|
||||
$this->trigger();
|
||||
|
@ -365,7 +362,7 @@ class cinecturlink2
|
|||
*/
|
||||
public function updCategory($id, cursor $cur)
|
||||
{
|
||||
$id = (integer) $id;
|
||||
$id = (int) $id;
|
||||
|
||||
if (empty($id)) {
|
||||
throw new Exception(__('No such category ID'));
|
||||
|
@ -373,7 +370,7 @@ class cinecturlink2
|
|||
|
||||
$cur->cat_upddt = date('Y-m-d H:i:s');
|
||||
|
||||
$cur->update("WHERE cat_id = " . $id . " AND blog_id = '" . $this->blog . "' ");
|
||||
$cur->update('WHERE cat_id = ' . $id . " AND blog_id = '" . $this->blog . "' ");
|
||||
$this->trigger();
|
||||
}
|
||||
|
||||
|
@ -384,7 +381,7 @@ class cinecturlink2
|
|||
*/
|
||||
public function delCategory($id)
|
||||
{
|
||||
$id = (integer) $id;
|
||||
$id = (int) $id;
|
||||
|
||||
if (empty($id)) {
|
||||
throw new Exception(__('No such category ID'));
|
||||
|
@ -398,9 +395,9 @@ class cinecturlink2
|
|||
|
||||
# Update link cat to NULL
|
||||
$cur = $this->con->openCursor($this->table);
|
||||
$cur->cat_id = NULL;
|
||||
$cur->cat_id = null;
|
||||
$cur->link_upddt = date('Y-m-d H:i:s');
|
||||
$cur->update("WHERE cat_id = " . $id . " AND blog_id = '" . $this->blog . "' ");
|
||||
$cur->update('WHERE cat_id = ' . $id . " AND blog_id = '" . $this->blog . "' ");
|
||||
|
||||
$this->trigger();
|
||||
}
|
||||
|
@ -453,9 +450,11 @@ class cinecturlink2
|
|||
if ($throw) {
|
||||
throw new Exception(__('Failed to create public folder for images.'));
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
* @copyright Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
|
||||
class cinecturlink2Context
|
||||
{
|
||||
public static function PaginationNbPages()
|
||||
|
@ -39,6 +38,7 @@ class cinecturlink2Context
|
|||
if (!$n) {
|
||||
return $p;
|
||||
}
|
||||
|
||||
return $p > $n || $p <= 0 ? 1 : $p;
|
||||
}
|
||||
|
||||
|
@ -47,6 +47,7 @@ class cinecturlink2Context
|
|||
if (isset($GLOBALS['c2_page_number'])) {
|
||||
return self::PaginationPosition() == 1;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -55,6 +56,7 @@ class cinecturlink2Context
|
|||
if (isset($GLOBALS['c2_page_number'])) {
|
||||
return self::PaginationPosition() == self::PaginationNbPages();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -77,6 +79,7 @@ class cinecturlink2Context
|
|||
$s = strpos($url, '?') !== false ? '&' : '?';
|
||||
$url .= $s . 'q=' . rawurlencode($_GET['q']);
|
||||
}
|
||||
|
||||
return $url;
|
||||
}
|
||||
|
||||
|
@ -99,6 +102,7 @@ class cinecturlink2Context
|
|||
) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
}
|
||||
|
@ -62,7 +61,7 @@ class adminlistCinecturlink2
|
|||
$links = [];
|
||||
if (isset($_REQUEST['links'])) {
|
||||
foreach ($_REQUEST['links'] as $v) {
|
||||
$links[(integer) $v] = true;
|
||||
$links[(int) $v] = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -78,10 +77,10 @@ class adminlistCinecturlink2
|
|||
$cols = new ArrayObject($cols);
|
||||
$this->userColumns('c2link', $cols);
|
||||
|
||||
$html_block =
|
||||
'<div class="table-outer">' .
|
||||
$html_block = '<div class="table-outer">' .
|
||||
'<table>' .
|
||||
'<caption>' . ($filter ?
|
||||
'<caption>' . (
|
||||
$filter ?
|
||||
sprintf(__('List of %s links matching the filter.'), $this->rs_count) :
|
||||
sprintf(__('List of links (%s)'), $this->rs_count)
|
||||
) . '</caption>' .
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
* @copyright Jean-Christian Denis
|
||||
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
|
||||
*/
|
||||
|
||||
class sitemapsCinecturlink2
|
||||
{
|
||||
public static function sitemapsDefineParts($map_parts)
|
||||
|
@ -36,7 +35,7 @@ class sitemapsCinecturlink2
|
|||
$C2 = new cinecturlink2($core);
|
||||
$cats = $C2->getCategories();
|
||||
while ($cats->fetch()) {
|
||||
$sitemaps->addEntry($base . "/" . $core->blog->settings->cinecturlink2->cinecturlink2_public_caturl . '/' . urlencode($cats->cat_title), $prio, $freq);
|
||||
$sitemaps->addEntry($base . '/' . $core->blog->settings->cinecturlink2->cinecturlink2_public_caturl . '/' . urlencode($cats->cat_title), $prio, $freq);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
50
index.php
50
index.php
|
@ -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;
|
||||
}
|
||||
|
@ -90,7 +89,7 @@ if ($part == 'updlinksnote') {
|
|||
while ($links->fetch()) {
|
||||
if (in_array($links->link_id, $entries)) {
|
||||
$cur = $core->con->openCursor($C2->table);
|
||||
$cur->link_note = (integer) $_POST['newlinknote'];
|
||||
$cur->link_note = (int) $_POST['newlinknote'];
|
||||
$C2->updLink($links->link_id, $cur);
|
||||
}
|
||||
}
|
||||
|
@ -116,7 +115,7 @@ if ($part == 'updlinkscat') {
|
|||
while ($links->fetch()) {
|
||||
if (in_array($links->link_id, $entries)) {
|
||||
$cur = $core->con->openCursor($C2->table);
|
||||
$cur->cat_id = (integer) $_POST['newcatid'];
|
||||
$cur->cat_id = (int) $_POST['newcatid'];
|
||||
$C2->updLink($links->link_id, $cur);
|
||||
}
|
||||
}
|
||||
|
@ -146,7 +145,10 @@ if ($part == 'links') {
|
|||
$c2link_filter->add('part', 'links');
|
||||
$c2link_filter->add(dcAdminFilters::getPageFilter());
|
||||
$c2link_filter->add(dcAdminFilters::getSelectFilter(
|
||||
'catid', __('Category:'), $categories_combo, 'cat_id'
|
||||
'catid',
|
||||
__('Category:'),
|
||||
$categories_combo,
|
||||
'cat_id'
|
||||
));
|
||||
|
||||
$params = $c2link_filter->params();
|
||||
|
@ -164,8 +166,7 @@ if ($part == 'links') {
|
|||
}
|
||||
|
||||
$breadcrumb[__('My cinecturlink')] = '';
|
||||
$headers .=
|
||||
dcPage::jsVars(['dotclear.filter_reset_url' => $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])]) .
|
||||
$headers .= dcPage::jsVars(['dotclear.filter_reset_url' => $core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])]) .
|
||||
dcPage::jsFilterControl($c2link_filter->show()) .
|
||||
dcPage::jsLoad(dcPage::getPF('cinecturlink2/js/c2links.js'));
|
||||
}
|
||||
|
@ -174,6 +175,7 @@ if ($part == 'link') {
|
|||
$langs_combo = l10n::getISOcodes(true);
|
||||
$notes_combo = range(0, 20);
|
||||
$media_combo = $tmp_media_combo = $dir = null;
|
||||
|
||||
try {
|
||||
$allowed_media = ['png', 'jpg', 'gif', 'bmp', 'jpeg'];
|
||||
$core->media = new dcMedia($core);
|
||||
|
@ -243,7 +245,8 @@ if ($part == 'link') {
|
|||
__('Link successfully updated.')
|
||||
);
|
||||
}
|
||||
$core->adminurl->redirect('admin.plugin.cinecturlink2',
|
||||
$core->adminurl->redirect(
|
||||
'admin.plugin.cinecturlink2',
|
||||
[
|
||||
'part' => 'link',
|
||||
'linkid' => $linkid,
|
||||
|
@ -286,8 +289,7 @@ if ($part == 'link') {
|
|||
}
|
||||
}
|
||||
$breadcrumb[(empty($linkid) ? __('New link') : __('Edit link'))] = '';
|
||||
$headers .=
|
||||
dcPage::jsVars(['dotclear.c2_lang' => $core->auth->getInfo('user_lang')]) .
|
||||
$headers .= dcPage::jsVars(['dotclear.c2_lang' => $core->auth->getInfo('user_lang')]) .
|
||||
dcPage::jsLoad(dcPage::getPF('cinecturlink2/js/c2link.js'));
|
||||
}
|
||||
|
||||
|
@ -329,7 +331,6 @@ if ($part == 'cats') {
|
|||
);
|
||||
$core->adminurl->redirect('admin.plugin.cinecturlink2', ['part' => 'cats']);
|
||||
}
|
||||
|
||||
} catch (Exception $e) {
|
||||
$core->error->add($e->getMessage());
|
||||
}
|
||||
|
@ -338,8 +339,7 @@ if ($part == 'cats') {
|
|||
|
||||
$core->auth->user_prefs->addWorkspace('accessibility');
|
||||
if (!$core->auth->user_prefs->accessibility->nodragdrop) {
|
||||
$headers .=
|
||||
dcPage::jsLoad('js/jquery/jquery-ui.custom.js') .
|
||||
$headers .= dcPage::jsLoad('js/jquery/jquery-ui.custom.js') .
|
||||
dcPage::jsLoad('js/jquery/jquery.ui.touch-punch.js') .
|
||||
dcPage::jsLoad(dcPage::getPF('cinecturlink2/js/c2cats.js'));
|
||||
}
|
||||
|
@ -431,7 +431,8 @@ if ($part == 'updlinksnote') {
|
|||
]) . '/20' . '</p>' .
|
||||
'<p>' .
|
||||
'<input type="submit" value="' . __('Save') . ' (s)" accesskey="s" name="save" /> ' .
|
||||
'<a id="post-cancel" href="' . ($redir ? $redir :
|
||||
'<a id="post-cancel" href="' . (
|
||||
$redir ? $redir :
|
||||
$core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])
|
||||
) . '" class="button" accesskey="c">' . __('Cancel') . ' (c)</a> ';
|
||||
foreach ($entries as $id) {
|
||||
|
@ -460,7 +461,8 @@ if ($part == 'updlinkscat') {
|
|||
'<p><label for="newcatid" class="ib">' . __('New category:') . '</label> ' .
|
||||
form::combo('newcatid', $categories_combo, $catid) . '</p>' .
|
||||
'<input type="submit" value="' . __('Save') . ' (s)" accesskey="s" name="save" /> ' .
|
||||
'<a id="post-cancel" href="' . ($redir ? $redir :
|
||||
'<a id="post-cancel" href="' . (
|
||||
$redir ? $redir :
|
||||
$core->adminurl->get('admin.plugin.cinecturlink2', ['part' => 'links'])
|
||||
) . '" class="button" accesskey="c">' . __('Cancel') . ' (c)</a> ';
|
||||
foreach ($entries as $id) {
|
||||
|
@ -474,7 +476,7 @@ if ($part == 'updlinkscat') {
|
|||
}
|
||||
}
|
||||
|
||||
if ($part == "links") {
|
||||
if ($part == 'links') {
|
||||
$links_redir = $core->adminurl->get('admin.plugin.cinecturlink2', $c2link_filter->values());
|
||||
|
||||
echo
|
||||
|
@ -492,11 +494,14 @@ if ($part == "links") {
|
|||
if ($links->isEmpty() && !$c2link_filter->show()) {
|
||||
echo '<p>' . __('There is no link') . '</p>';
|
||||
} else {
|
||||
$c2link_filter->display('admin.plugin.cinecturlink2',
|
||||
$c2link_filter->display(
|
||||
'admin.plugin.cinecturlink2',
|
||||
form::hidden('p', 'cinecturlink2') . form::hidden('part', 'links')
|
||||
);
|
||||
|
||||
$links_list->display($c2link_filter->page, $c2link_filter->nb,
|
||||
$links_list->display(
|
||||
$c2link_filter->page,
|
||||
$c2link_filter->nb,
|
||||
'<form action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '" method="post" id="form-entries">' .
|
||||
|
||||
'%s' .
|
||||
|
@ -518,8 +523,7 @@ if ($part == "links") {
|
|||
}
|
||||
}
|
||||
|
||||
if ($part == "link") {
|
||||
|
||||
if ($part == 'link') {
|
||||
echo '
|
||||
<form id="newlinkform" method="post" action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '">
|
||||
|
||||
|
@ -590,7 +594,7 @@ if ($part == "link") {
|
|||
</form>';
|
||||
}
|
||||
|
||||
if ($part == "cats") {
|
||||
if ($part == 'cats') {
|
||||
echo
|
||||
'<p class="top-add"><a class="button add" href="' .
|
||||
$core->adminurl->get(
|
||||
|
@ -610,8 +614,7 @@ if ($part == "cats") {
|
|||
|
||||
if ($categories->isEmpty()) {
|
||||
echo '<p>' . __('There is no category') . '</p>';
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
echo '
|
||||
<form id="c2items" method="post" action="' . $core->adminurl->get('admin.plugin.cinecturlink2') . '">
|
||||
<div class="table-outer">
|
||||
|
@ -689,7 +692,8 @@ if ($part == 'cat') {
|
|||
|
||||
if ($catid) {
|
||||
$links = $C2->getLinks(['cat_id' => $catid], true)->f(0);
|
||||
echo '<p class="info">' . (empty($links) ?
|
||||
echo '<p class="info">' . (
|
||||
empty($links) ?
|
||||
__('No link uses this category.') :
|
||||
sprintf(__('A link uses this category.', '%s links use this category.', $links), $links)
|
||||
) . '</p>';
|
||||
|
|
Loading…
Reference in a new issue