Fix and update widgets

This commit is contained in:
Jean-Christian Paul Denis 2021-09-07 16:00:49 +02:00
parent b21e286961
commit 02d56c5c96

View File

@ -12,17 +12,16 @@
*/
if (!defined('DC_RC_PATH')) {
return null;
}
$core->addBehavior(
'initWidgets',
array('cinecturlink2Widget', 'adminLinks')
['cinecturlink2Widget', 'adminLinks']
);
$core->addBehavior(
'initWidgets',
array('cinecturlink2Widget', 'adminCats')
['cinecturlink2Widget', 'adminCats']
);
class cinecturlink2Widget
@ -33,140 +32,128 @@ class cinecturlink2Widget
$C2 = new cinecturlink2($core);
$categories_combo = array('' => '', __('Uncategorized') => 'null');
$categories_combo = ['' => '', __('Uncategorized') => 'null'];
$categories = $C2->getCategories();
while($categories->fetch()) {
$cat_title = html::escapeHTML($categories->cat_title);
$categories_combo[$cat_title] = $categories->cat_id;
}
$sortby_combo = array(
$sortby_combo = [
__('Update date') => 'link_upddt',
__('My rating') => 'link_note',
__('Title') => 'link_title',
__('Random') => 'RANDOM',
__('Number of views') => 'COUNTER'
);
$order_combo = array(
];
$order_combo = [
__('Ascending') => 'asc',
__('Descending') => 'desc'
);
];
$w->create(
$w
->create(
'cinecturlink2links',
__('My cinecturlink'),
array('cinecturlink2Widget', 'publicLinks'),
'null',
['cinecturlink2Widget', 'publicLinks'],
null,
__('Show selection of cinecturlinks')
);
$w->cinecturlink2links->setting(
'title',
__('Title:'),
)
->addTitle(
__('My cinecturlink'),
'text'
);
$w->cinecturlink2links->setting(
)
->setting(
'category',
__('Category:'),
'',
'combo',
$categories_combo
);
$w->cinecturlink2links->setting(
)
->setting(
'sortby',
__('Order by:'),
'link_upddt',
'combo',
$sortby_combo
);
$w->cinecturlink2links->setting(
)
->setting(
'sort',
__('Sort: (only for date, note and title)'),
'desc',
'combo',
$order_combo
);
$w->cinecturlink2links->setting(
)
->setting(
'limit',
__('Limit:'),
10,
'text'
);
$w->cinecturlink2links->setting(
)
->setting(
'withlink',
__('Enable link'),
1,
'check'
);
$w->cinecturlink2links->setting(
)
->setting(
'showauthor',
__('Show author'),
1,
'check'
);
$w->cinecturlink2links->setting(
)
->setting(
'shownote',
__('Show my rating'),
0,
'check'
);
$w->cinecturlink2links->setting(
)
->setting(
'showdesc',
__('Show description'),
0,
'check'
);
$w->cinecturlink2links->setting(
)
->setting(
'showpagelink',
__('Show a link to cinecturlink page'),
0,
'check'
);
$w->cinecturlink2links->setting(
'homeonly',
__('Display on:'),
1,
'combo',
array(
__('All pages') => 0,
__('Home page only') => 1,
__('Except on home page') => 2
)
);
->addHomeOnly()
->addContentOnly()
->addClass()
->addOffline();
}
public static function adminCats($w)
{
$w->create(
$w
->create(
'cinecturlink2cats',
__('List of categories of cinecturlink'),
array('cinecturlink2Widget', 'publicCats'),
['cinecturlink2Widget', 'publicCats'],
null,
__('List of categories of cinecturlink')
);
$w->cinecturlink2cats->setting(
)
->addTitle(
__('My cinecturlink by categories')
)
->setting(
'title',
__('Title:'),
__('My cinecturlink by categories'),
'text'
);
$w->cinecturlink2cats->setting(
)
->setting(
'shownumlink',
__('Show number of links'),
0,
'check'
);
$w->cinecturlink2cats->setting(
'homeonly',
__('Display on:'),
1,
'combo',
array(
__('All pages') => 0,
__('Home page only') => 1,
__('Except on home page') => 2
)
);
->addHomeOnly()
->addContentOnly()
->addClass()
->addOffline();
}
public static function publicLinks($w)
@ -176,8 +163,8 @@ class cinecturlink2Widget
$core->blog->settings->addNamespace('cinecturlink2');
if (!$core->blog->settings->cinecturlink2->cinecturlink2_active
|| $w->homeonly == 1 && $core->url->type != 'default'
|| $w->homeonly == 2 && $core->url->type == 'default'
|| $w->homeonly == 1 && !$core->url->isHome($core->url->type)
|| $w->homeonly == 2 && $core->url->isHome($core->url->type)
) {
return null;
}
@ -195,33 +182,29 @@ class cinecturlink2Widget
$limit = abs((integer) $w->limit);
# Tirage aléatoire
# Consomme beaucoup de ressources!
// Tirage aléatoire: Consomme beaucoup de ressources!
if ($w->sortby == 'RANDOM') {
$big_rs = $C2->getLinks($params);
if ($big_rs->isEmpty()) {
return null;
}
$ids= array();
$ids= [];
while($big_rs->fetch()) {
$ids[] = $big_rs->link_id;
}
shuffle($ids);
$ids = array_slice($ids, 0, $limit);
$params['link_id'] = array();
$params['link_id'] = [];
foreach($ids as $id) {
$params['link_id'][] = $id;
}
}
elseif ($w->sortby == 'COUNTER') {
} elseif ($w->sortby == 'COUNTER') {
$params['order'] = 'link_count asc';
$params['limit'] = $limit;
}
else {
} else {
$params['order'] = $w->sortby;
$params['order'] .= $w->sort == 'asc' ? ' asc' : ' desc';
$params['limit'] = $limit;
@ -230,14 +213,13 @@ class cinecturlink2Widget
$rs = $C2->getLinks($params);
if ($rs->isEmpty()) {
return null;
}
$widthmax = (integer) $core->blog->settings->cinecturlink2->cinecturlink2_widthmax;
$style = $widthmax ? ' style="width:' . $widthmax . 'px;"' : '';
$entries = array();
$entries = [];
while($rs->fetch()) {
$url = $rs->link_url;
$img = $rs->link_img;
@ -266,8 +248,7 @@ class cinecturlink2Widget
$cur = $core->con->openCursor($C2->table);
$cur->link_count = ($count + 1);
$C2->updLink($rs->link_id, $cur, false);
}
catch (Exception $e) {
} catch (Exception $e) {
}
}
@ -281,14 +262,15 @@ class cinecturlink2Widget
}
}
return
'<div class="cinecturlink2list">'.
($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
implode(' ',$entries).
return $w->renderDiv(
$w->content_only,
'cinecturlink2list '. $w->class,
'',
($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') . implode(' ',$entries) .
($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>' : ''
).
'</div>';
)
);
}
public static function publicCats($w)
@ -299,48 +281,45 @@ class cinecturlink2Widget
if (!$core->blog->settings->cinecturlink2->cinecturlink2_active
|| !$core->blog->settings->cinecturlink2->cinecturlink2_public_active
|| $w->homeonly == 1 && $core->url->type != 'default'
|| $w->homeonly == 2 && $core->url->type == 'default'
|| $w->homeonly == 1 && !$core->url->isHome($core->url->type)
|| $w->homeonly == 2 && $core->url->isHome($core->url->type)
) {
return null;
}
$C2 = new cinecturlink2($core);
$rs = $C2->getCategories(array());
$rs = $C2->getCategories([]);
if ($rs->isEmpty()) {
return null;
}
$res =
$res = [];
$res[] =
'<li><a href="' .
$core->blog->url . $core->url->getBase('cinecturlink2') .
'" title="' . __('view all links') . '">' . __('all links') .
'</a>';
if ($w->shownumlink) {
$res .= ' ('.($C2->getLinks(array(), true)->f(0)).')';
}
$res .= '</li>';
'</a>'. ($w->shownumlink ? ' ('. ($C2->getLinks([], true)->f(0)) . ')' : '') .
'</li>';
while($rs->fetch()) {
$res .=
$res[] =
'<li><a href="' .
$core->blog->url.$core->url->getBase('cinecturlink2').'/'.$core->blog->settings->cinecturlink2->cinecturlink2_public_caturl.'/'.urlencode($rs->cat_title).
$core->blog->url . $core->url->getBase('cinecturlink2') . '/' .
$core->blog->settings->cinecturlink2->cinecturlink2_public_caturl . '/' .
urlencode($rs->cat_title) .
'" title="'.__('view links of this category') . '">' .
html::escapeHTML($rs->cat_title) .
'</a>';
if ($w->shownumlink) {
$res .= ' ('.($C2->getLinks(array('cat_id'=>$rs->cat_id), true)->f(0)).')';
}
$res .= '</li>';
'</a>'. ($w->shownumlink ? ' (' .
($C2->getLinks(['cat_id' => $rs->cat_id], true)->f(0)) . ')' : '') .
'</li>';
}
return
'<div class="cinecturlink2cat">'.
($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
'<ul>'.$res.'</ul>'.
'</div>';
return $w->renderDiv(
$w->content_only,
'cinecturlink2cat '. $w->class,
'',
($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '') .
'<ul>' . implode(' ',$res) . '</ul>'
);
}
}