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

fix list and pager, remove record edition

Browse source
This commit is contained in:
Jean-Christian Denis 2021-10-24 23:38:49 +02:00
parent d4eded0c29
commit 2ec18b5b49
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
5 changed files with 274 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
_prepend.php
View file

@ -19,3 +19,4 @@ $d = dirname(__FILE__) . '/inc/';
$__autoload['libEPC'] = $d . 'lib.epc.php';
$__autoload['epcRecords'] = $d . 'lib.epc.records.php';
$__autoload['adminEpcList'] = $d . 'lib.epc.pager.php';

76
inc/lib.epc.pager.php Normal file
View file

@ -0,0 +1,76 @@
<?php
if (!defined('DC_CONTEXT_ADMIN')) {
return null;
}
/**
* @ingroup DC_PLUGIN_PERIODICAL
* @brief Periodical - admin pager methods.
* @since 2.6
*/
class adminEpcList extends adminGenericList
{
public function display($filter, $pager_url, $enclose_block='')
{
if ($this->rs->isEmpty()) {
if ($filter->show()) {
echo '<p><strong>' . __('No record matches the filter') . '</strong></p>';
} else {
echo '<p><strong>' . __('No record') . '</strong></p>';
}
} else {
$pager = new dcPager($filter->page, $this->rs_count, $filter->nb, 10);
$pager->base_url = $pager_url;
$epc_id = [];
if (isset($_REQUEST['epc_id'])) {
foreach ($_REQUEST['epc_id'] as $v) {
$epc_id[(integer) $v] = true;
}
}
$cols = [
'key' => '<th colspan="2" class="first">' . __('Key') . '</th>',
'value' => '<th scope="col">' . __('Value') . '</th>',
'date' => '<th scope="col">' . __('Date') . '</th>'
];
$html_block =
'<div class="table-outer"><table><caption>' .
($filter->show() ?
sprintf(__('List of %s records matching the filter.'), $this->rs_count) :
sprintf(__('List of %s records.'), $this->rs_count)
). '</caption>' .
'<tr>' . implode($cols) . '</tr>%s</table>%s</div>';
if ($enclose_block) {
$html_block = sprintf($enclose_block, $html_block);
}
$blocks = explode('%s', $html_block);
echo $pager->getLinks() . $blocks[0];
while ($this->rs->fetch()) {
echo $this->line(isset($epc_id[$this->rs->epc_id]));
}
echo $blocks[1] . $blocks[2] . $pager->getLinks();
}
}
private function line($checked)
{
$cols = [
'check' => '<td class="nowrap">' . form::checkbox(['epc_id[]'], $this->rs->epc_id, ['checked' => $checked]) . '</td>',
'key' => '<td class="nowrap">' . html::escapeHTML($this->rs->epc_key) . '</td>',
'value' => '<td class="maximal">' . html::escapeHTML($this->rs->epc_value) . '</td>',
'date' => '<td class="nowrap count">' . dt::dt2str(__('%Y-%m-%d %H:%M'), $this->rs->epc_upddt) . '</td>'
];
return
'<tr class="line" id="p' . $this->rs->epc_id . '">' .
implode($cols) .
'</tr>';
}
}

1
inc/lib.epc.php
View file

@ -328,6 +328,7 @@ class libEPC
if (isset($opt[$name]['pubPages'])) {
$filters[$name]['pubPages'] = (array) $opt[$name]['pubPages'];
}
$filters[$name]['name'] = $name;
}
$core->callBehavior('enhancePostContentBlogFilters', $filters);

347
index.php
View file

@ -21,14 +21,22 @@ dcPage::check('contentadmin');
# -- Prepare queries and object --
$_filters = libEPC::blogFilters();
$filters_id = array();
$filters_id = $filters_combo = [];
foreach($_filters as $name => $filter) {
$filters_id[$filter['id']] = $name;
$filters_combo[__($name)] = $filter['id'];
}
$action = isset($_POST['action']) ? $_POST['action'] : '';
$default_part = isset($_REQUEST['part']) ? $_REQUEST['part'] : key($filters_id);
$action = $_POST['action'] ?? '';
$part = $_REQUEST['part'] ?? key($filters_id);
if (!isset($filters_id[$part])) {
return null;
}
$header = '';
$filter = $_filters[$filters_id[$part]];
$records = new epcRecords($core);
# -- Action --
@ -40,11 +48,8 @@ if (!empty($action)) {
try {
# Update filter settings
if ($action == 'savefiltersetting'
&& isset($filters_id[$default_part])
) {
if ($action == 'savefiltersetting') {
# Parse filters options
$name = $filters_id[$default_part];
$f = [
'nocase' => !empty($_POST['filter_nocase']),
'plural' => !empty($_POST['filter_plural']),
@ -56,7 +61,7 @@ try {
];
$core->blog->settings->addNamespace('enhancePostContent');
$core->blog->settings->enhancePostContent->put('enhancePostContent_' . $name, serialize($f));
$core->blog->settings->enhancePostContent->put('enhancePostContent_' . $filter['name'], serialize($f));
$core->blog->triggerBlog();
@ -66,19 +71,18 @@ try {
$core->adminurl->redirect(
'admin.plugin.enhancePostContent',
['part' => $default_part],
['part' => $part],
'#settings'
);
}
# Add new filter record
if ($action == 'savenewrecord'
&& isset($filters_id[$default_part])
&& !empty($_POST['new_key'])
&& !empty($_POST['new_value'])
) {
$cur = $records->openCursor();
$cur->epc_filter = $filters_id[$default_part];
$cur->epc_filter = $filter['name'];
$cur->epc_key = html::escapeHTML($_POST['new_key']);
$cur->epc_value = html::escapeHTML($_POST['new_value']);
@ -95,119 +99,107 @@ try {
}
$core->adminurl->redirect(
'admin.plugin.enhancePostContent',
['part' => $default_part],
['part' => $part],
'#record'
);
}
# Update filter records
$error = false;
if ($action == 'saveupdaterecords'
&& isset($filters_id[$default_part])
&& $_filters[$filters_id[$default_part]]['has_list']
) {
foreach($_POST['epc_id'] as $k => $id) {
$k = abs((integer) $k);
$id = abs((integer) $id);
if (empty($_POST['epc_key'][$k])
|| empty($_POST['epc_value'][$k])
if ($action == 'deleterecords' && $filter['has_list']
&& !empty($_POST['epc_id']) && is_array($_POST['epc_id'])
) {
foreach($_POST['epc_id'] as $id) {
$records->delRecord($id);
} elseif ($_POST['epc_key'][$k] != $_POST['epc_old_key'][$k]
|| $_POST['epc_value'][$k] != $_POST['epc_old_value'][$k]
) {
$cur = $records->openCursor();
$cur->epc_filter = $filters_id[$default_part];
$cur->epc_key = html::escapeHTML($_POST['epc_key'][$k]);
$cur->epc_value = html::escapeHTML($_POST['epc_value'][$k]);
if ($records->isRecord($cur->epc_filter, $cur->epc_key, $id)) {
dcPage::addErrorNotice(__('Key already exists for this filter'));
$error = true;
} else {
$records->updRecord($id, $cur);
}
}
}
$core->blog->triggerBlog();
$redir = !empty($_REQUEST['redir']) ?
$_REQUEST['redir'] :
$core->adminurl->get('admin.plugin.enhancePostContent', ['part' => $default_part]) . '#record';
if (!$error) {
dcPage::addSuccessNotice(
__('Filter successfully updated.')
);
}
http::redirect(
$redir
if (!empty($_REQUEST['redir'])) {
http::redirect($_REQUEST['redir']);
} else {
$core->adminurl->redirect(
'admin.plugin.enhancePostContent',
['part' => $part],
'#record'
);
}
}
} catch(Exception $e) {
$core->error->add($e->getMessage());
}
# -- Prepare page --
$breadcrumb = [html::escapeHTML($core->blog->name) => '', __('Enhance post content') => '', __('Filters') => ''];
if ($filter['has_list']) {
$sorts = new adminGenericFilter($core, 'epc');
$sorts->add(dcAdminFilters::getPageFilter());
$sorts->add('part', $part);
$filters_combo = [];
foreach($filters_id as $id => $name) {
if ($default_part == $id) {
$breadcrumb[__($filters_id[$default_part])] = '';
$params = $sorts->params();
$params['epc_filter'] = $filter['name'];
try {
$list = $records->getRecords($params);
$counter = $records->getRecords($params, true);
$pager = new adminEpcList($core, $list, $counter->f(0));
} catch (Exception $e) {
$core->error->add($e->getMessage());
}
$filters_combo[__($name)] = $id;
$header = $sorts->js($core->adminurl->get('admin.plugin.enhancePostContent', ['part' => $part], '&').'#record');
}
# -- Display page --
# Headers
# Page headers
echo '
<html><head><title>' . __('Enhance post content') . '</title>' .
//dcPage::jsLoad('js/_posts_list.js') .
dcPage::jsToolbar() .
dcPage::jsPageTabs() .
dcPage::jsLoad(dcPage::getPF('enhancePostContent/js/index.js')) .
$header .
# --BEHAVIOR-- enhancePostContentAdminHeader
$core->callBehavior('enhancePostContentAdminHeader', $core) . '
</head><body>' .
# Title
dcPage::breadcrumb($breadcrumb) .
# Page title
dcPage::breadcrumb([
__('Plugins') => '',
__('Enhance post content') => '',
__($filter['name']) => ''
]) .
dcPage::notices() .
# Filters list
'<form method="post" action="' . $p_url . '&tab=settings">' .
# Filters select menu list
'<form method="get" action="' . $core->adminurl->get('admin.plugin.enhancePostContent') . '" id="filters_menu">' .
'<p class="anchor-nav"><label for="epc_tab" class="classic">' . __('Select filter:') . ' </label>' .
form::combo('part', $filters_combo, $default_part) . ' ' .
$core->formNonce() .
'<input type="submit" value="' . __('Ok') . '" /></p>' .
form::combo('part', $filters_combo, $part) . ' ' .
'<input type="submit" value="' . __('Ok') . '" />' .
form::hidden('p', 'enhancePostContent') . '</p>' .
'</form>';
# Filter content
if (isset($filters_id[$default_part])) {
$name = $filters_id[$default_part];
$filter = $_filters[$name];
# Filter title and description
echo '
<h3>' . __($filter['name']) . '</h3>
<p>' . $filter['help'] . '</p>';
# Filter title and description
echo '
<h3>' . __($filters_id[$default_part]) . '</h3>
<p>' . $filter['help'] . '</p>';
# Filter settings
echo '
<div class="multi-part" id="setting" title="' . __('Settings') . '">
<form method="post" action="' . $core->adminurl->get('admin.plugin.enhancePostContent') . '#setting">
# Filter settings
echo '
<div class="multi-part" id="setting" title="' . __('Settings') . '">
<form method="post" action="' . $p_url . '&amp;part=' . $default_part . '&amp;tab=setting"><div>';
<div class="two-boxes odd">
<h4>' . __('Pages to be filtered') . '</h4>';
echo
'<div class="two-boxes odd">
<h4>' . __('Pages to be filtered') . '</h4>';
foreach(libEPC::blogAllowedPubPages() as $k => $v) {
foreach(libEPC::blogAllowedPubPages() as $k => $v) {
echo '
<p><label for="filter_pubPages' . $v . '">' .
form::checkbox(
@ -216,36 +208,30 @@ if (isset($filters_id[$default_part])) {
in_array($v, $filter['pubPages'])
) .
__($k) . '</label></p>';
}
}
echo
'</div>';
echo '
</div><div class="two-boxes even">
<h4>' . __('Filtering') . '</h4>
echo
'<div class="two-boxes even">
<h4>' . __('Filtering') . '</h4>
<p><label for="filter_nocase">' .
form::checkbox('filter_nocase', '1', $filter['nocase']) .
__('Case insensitive') . '</label></p>
<p><label for="filter_nocase">' .
form::checkbox('filter_nocase', '1', $filter['nocase']) .
__('Case insensitive') . '</label></p>
<p><label for="filter_plural">' .
form::checkbox('filter_plural', '1', $filter['plural']) .
__('Also use the plural') . '</label></p>
<p><label for="filter_plural">' .
form::checkbox('filter_plural', '1', $filter['plural']) .
__('Also use the plural') . '</label></p>
<p><label for="filter_limit">' .
__('Limit the number of replacement to:') . '</label>' .
form::number('filter_limit', ['min' => 0, 'max' => 99, 'default' => (integer) $filter['limit']]) . '
</p>
<p class="form-note">' . __('Leave it blank or set it to 0 for no limit') . '</p>
<p><label for="filter_limit">' .
__('Limit the number of replacement to:') . '</label>' .
form::field('filter_limit', 4, 10, html::escapeHTML($filter['limit'])) . '
</p>
<p class="form-note">' . __('Leave it blank or set it to 0 for no limit') . '</p>
</div><div class="two-boxes odd">
<h4>' . __('Contents to be filtered') . '</h4>';
</div>';
echo
'<div class="two-boxes odd">
<h4>' . __('Contents to be filtered') . '</h4>';
foreach(libEPC::blogAllowedTplValues() as $k => $v) {
foreach(libEPC::blogAllowedTplValues() as $k => $v) {
echo '
<p><label for="filter_tplValues' . $v . '">' .
form::checkbox(
@ -254,16 +240,13 @@ if (isset($filters_id[$default_part])) {
in_array($v, $filter['tplValues'])
) .
__($k) . '</label></p>';
}
}
echo
'</div>';
echo '
</div><div class="two-boxes even">
<h4>' . __('Style') . '</h4>';
echo
'<div class="two-boxes even">
<h4>' . __('Style') . '</h4>';
foreach($filter['class'] as $k => $v) {
foreach($filter['class'] as $k => $v) {
echo '
<p><label for="filter_style' . $k . '">' .
sprintf(__('Class "%s":'), $v) . '</label>' .
@ -274,144 +257,78 @@ if (isset($filters_id[$default_part])) {
html::escapeHTML($filter['style'][$k])
) .
'</p>';
}
}
echo '
<p class="form-note">' . sprintf(__('The inserted HTML tag looks like: %s'), html::escapeHTML(str_replace('%s', '...', $filter['replace']))) . '</p>
echo '
<p class="form-note">' . sprintf(__('The inserted HTML tag looks like: %s'), html::escapeHTML(str_replace('%s', '...', $filter['replace']))) . '</p>
<p><label for="filter_notag">' . __('Ignore HTML tags:') . '</label>' .
form::field('filter_notag', 60, 255, html::escapeHTML($filter['notag'])) . '
</p>
<p class="form-note">' . __('This is the list of HTML tags where content will be ignored.') . ' ' .
(empty($filter['htmltag']) ? '' : sprintf(__('Tag "%s" always be ignored.'), $filter['htmltag'])) . '</p>
<p><label for="filter_notag">' . __('Ignore HTML tags:') . '</label>' .
form::field('filter_notag', 60, 255, html::escapeHTML($filter['notag'])) . '
</p>
<p class="form-note">' . __('This is the list of HTML tags where content will be ignored.') . ' ' .
(empty($filter['htmltag']) ? '' : sprintf(__('Tag "%s" always be ignored.'), $filter['htmltag'])) . '</p>
</div>
<div class="clear">
<p>' .
$core->formNonce() .
form::hidden(['action'], 'savefiltersetting') .
form::hidden(['part'], $part) . '
<input type="submit" name="save" value="' . __('Save') . '" />
</p>
</div>
</div>';
</form>
</div>';
echo '</div>
<div class="clear">
<p>' .
$core->formNonce() .
form::hidden(['action'], 'savefiltersetting') . '
<input type="submit" name="save" value="' . __('Save') . '" />
</p>
</div>
</form>
</div>';
# Filter records list
if ($filter['has_list']) {
$sorts = new adminGenericFilter($core, 'epc');
$sorts->add(dcAdminFilters::getPageFilter());
$params = $sorts->params();
$params['epc_filter'] = $name;
try {
$list = $records->getRecords($params);
$counter = $records->getRecords($params, true);
$pager_url = $p_url .
'&amp;nb=' . $sorts->nb .
'&amp;sortby=%s' .
'&amp;order=%s' .
'&amp;page=%s' .
'&amp;part=' . $default_part .
'#record';
$pager = new dcPager($sorts->page, $counter->f(0), $sorts->nb, 10);
$pager->base_url = sprintf($pager_url, $sorts->sortby, $sorts->order, '%s');
} catch (Exception $e) {
$core->error->add($e->getMessage());
}
# Filter records list
if ($filter['has_list']) {
$pager_url = $core->adminurl->get('admin.plugin.enhancePostContent', array_diff_key($sorts->values(true), ['page' => ''])).'&page=%s#record';
echo '
<div class="multi-part" id="record" title="' . __('Records') . '">';
if ($core->error->flag() || $list->isEmpty()) {
echo '<p>' . __('No record') . '</p>';
} else {
echo '
<form action="' . sprintf($pager_url, $sorts->sortby, $sorts->order, $sorts->page) . '" method="post">' .
$sorts->display(['admin.plugin.enhancePostContent', '#record'], form::hidden('p', 'enhancePostContent') . form::hidden('part', $part));
$pager->getLinks() . '
$pager->display($sorts, $pager_url,
'<form action="' . $core->adminurl->get('admin.plugin.enhancePostContent') . '#record" method="post" id="form-records">' .
'%s' .
<div class="table-outer">
<table><caption class="hidden">' . __('Records') . '</caption>
<thead><tr>';
'<div class="two-cols">' .
'<p class="col checkboxes-helpers"></p>' .
$lines = [
__('Key') => 'epc_key',
__('Value') => 'epc_value',
__('Date') => 'epc_date'
];
foreach($lines as $k => $v) {
echo '<th><a href="' . sprintf($pager_url, $v, $sorts->sortby == $v ? $sorts->order == 'asc' ? 'desc' : 'asc' : $sorts->order, $sorts->page) . '">' .$k . '</a></th>';
}
echo '
</tr></thead>
<tbody>';
while($list->fetch()) {
echo '
<tr class="line">
<td class="nowrap">' .
form::hidden(['epc_id[]'], $list->epc_id) .
form::hidden(['epc_old_key[]'], html::escapeHTML($list->epc_key)) .
form::hidden(['epc_old_value[]'], html::escapeHTML($list->epc_value)) .
form::field(['epc_key[]'], 30, 225, html::escapeHTML($list->epc_key), '') . '</td>
<td class="maximal">' .
form::field(['epc_value[]'], 90, 225, html::escapeHTML($list->epc_value), '') . '</td>
<td class="nowrap count">' .
dt::dt2str(__('%Y-%m-%d %H:%M'), $list->epc_upddt,$core->auth->getInfo('user_tz')) . '</td>
</tr>';
}
echo '
</tbody>
</table></div>
<p class="form-note">' . __('In order to remove a record, leave empty its key or value.') . '</p>' .
$pager->getLinks() . '
<div class="clear">
<p>' .
'<p class="col right">' .
form::hidden('action', 'deleterecords') .
'<input id="del-action" type="submit" name="save" value="' . __('Delete selected records') . '" /></p>' .
$core->adminurl->getHiddenFormFields('admin.plugin.enhancePostContent', array_merge(['p' => 'enhancePostContent'], $sorts->values(true))) .
form::hidden('redir', $core->adminurl->get('admin.plugin.enhancePostContent', $sorts->values(true))) .
$core->formNonce() .
form::hidden(['redir'], sprintf($pager_url, $sorts->sortby, $sorts->order, $sorts->page)) .
form::hidden(['action'], 'saveupdaterecords') . '
<input type="submit" name="save" value="' . __('Save') . '" />
</p>
</div>
</form>';
}
'</div>' .
'</form>'
);
echo '</div>';
# New record
echo '
<div class="multi-part" id="newrecord" title="' . __('New record') . '">
<form action="' .
$core->adminurl->get('admin.plugin.enhancePostContent', ['part' => $default_part]) .
'#record" method="post">' .
<form action="' . $core->adminurl->get('admin.plugin.enhancePostContent') . '#record" method="post" id="form-create">' .
'<p><label for="new_key">' . __('Key:') . '</label>' .
form::field('new_key', 60, 255) .
form::field('new_key', 60, 255, ['extra_html' => 'required']) .
'</p>' .
'<p><label for="new_value">' . __('Value:') . '</label>' .
form::field('new_value', 60, 255) .
form::field('new_value', 60, 255, ['extra_html' => 'required']) .
'</p>
<p class="clear">' .
form::hidden(['action'], 'savenewrecord') .
form::hidden(['part'], $part) .
$core->formNonce() . '
<input type="submit" name="save" value="' . __('Save') . '" />
<input id="new-action" type="submit" name="save" value="' . __('Save') . '" />
</p>
</form>
</div>';
}
}
# --BEHAVIOR-- enhancePostContentAdminPage

9
js/index.js
View file

@ -2,7 +2,12 @@
'use strict';
$(function () {
$('#part').on('change', function () {
this.form.submit();
$('#filters_menu input[type=submit]').hide();
$('#filters_menu #part').on('change', function () {this.form.submit();});
$('.checkboxes-helpers').each(function () {
dotclear.checkboxesHelpers(this, undefined, '#form-records td input[type=checkbox]', '#form-records #del-action');
});
$('#form-records td input[type=checkbox]').enableShiftClick();
dotclear.condSubmit('#form-records td input[type=checkbox]', '#form-records #del-action');
});