Blockparser plugin: Replaced deprecated create_function() call with anonymous function;

FootNotes plugin: Renamed class-named constructor to "__construct"
This commit is contained in:
azett 2019-02-09 12:35:32 +01:00
parent 6bae0cde9d
commit a6188978d8
2 changed files with 123 additions and 147 deletions

View File

@ -1,13 +1,13 @@
<?php <?php
/* /*
Plugin Name: BlockParser * Plugin Name: BlockParser
Plugin URI: http://www.nowhereland.it/ * Plugin URI: http://www.nowhereland.it/
Type: Block * Type: Block
Description: BlockParser plugin. Part of the standard distribution ;) This allow you to use simple non-plugin custom blocks :) * Description: BlockParser plugin. Part of the standard distribution ;) This allow you to use simple non-plugin custom blocks :)
Author: NoWhereMan real_nowhereman at user dot sf dot net * Author: NoWhereMan real_nowhereman at user dot sf dot net
Version: 1.0 * Version: 1.0
Author URI: http://www.nowhereland.it/ * Author URI: http://www.nowhereland.it/
*/ */
// define('BLOCKS_DIR', CONTENT_DIR . 'blocks/'); // define('BLOCKS_DIR', CONTENT_DIR . 'blocks/');
@ -16,9 +16,7 @@ Author URI: http://www.nowhereland.it/
// so you can edit blocks using the static editor!! // so you can edit blocks using the static editor!!
define('BLOCKS_DIR', STATIC_DIR); define('BLOCKS_DIR', STATIC_DIR);
function plugin_blockparser_parse($blockid) { function plugin_blockparser_parse($blockid) {
if ($f_contents = io_load_file(BLOCKS_DIR . $blockid . EXT)) { if ($f_contents = io_load_file(BLOCKS_DIR . $blockid . EXT)) {
$contents = utils_kexplode($f_contents); $contents = utils_kexplode($f_contents);
return array_change_key_case($contents, CASE_LOWER); return array_change_key_case($contents, CASE_LOWER);
@ -27,10 +25,8 @@ function plugin_blockparser_parse($blockid) {
return false; return false;
} }
# register_widget('blockparser', 'BlockParser', 'plugin_blockparser_widget', 1); // register_widget('blockparser', 'BlockParser', 'plugin_blockparser_widget', 1);
function plugin_blockparser_widget($blockid) { function plugin_blockparser_widget($blockid) {
if ($contents = plugin_blockparser_parse($blockid)) { if ($contents = plugin_blockparser_parse($blockid)) {
$contents ['subject'] = apply_filters('the_title', $contents ['subject']); $contents ['subject'] = apply_filters('the_title', $contents ['subject']);
$contents ['content'] = apply_filters('the_content', $contents ['content']); $contents ['content'] = apply_filters('the_content', $contents ['content']);
@ -38,11 +34,12 @@ function plugin_blockparser_widget($blockid) {
return $contents; return $contents;
} }
return array( 'subject' => 'BlockParser::Error', return array(
'content' => "<ul><li>Error parsing block $blockid; file may not exist</li></ul>" ); 'subject' => 'BlockParser::Error',
'content' => "<ul><li>Error parsing block $blockid; file may not exist</li></ul>"
);
} }
function plugin_blockparser_init() { function plugin_blockparser_init() {
// for instance: // for instance:
@ -54,19 +51,17 @@ function plugin_blockparser_init() {
// this would suggest to use an object, though :B // this would suggest to use an object, though :B
// anyway the result is the same... // anyway the result is the same...
$pgs = plugin_getoptions('blockparser', 'pages'); $pgs = plugin_getoptions('blockparser', 'pages');
if (is_array($pgs)) { if (is_array($pgs)) {
foreach ($pgs as $page) { foreach ($pgs as $page) {
register_widget( register_widget('blockparser:' . $page, // widget id
'blockparser:'.$page, // widget id
'BlockParser: ' . $page, // widget name 'BlockParser: ' . $page, // widget name
create_function('', "return plugin_blockparser_widget('$page');") // lambda func function () use ($page) {
return plugin_blockparser_widget($page);
} // lambda func
); );
} }
} }
} }
add_action('init', 'plugin_blockparser_init'); add_action('init', 'plugin_blockparser_init');
@ -76,7 +71,11 @@ if (class_exists('AdminPanelAction')){
class admin_widgets_blockparser extends AdminPanelAction { class admin_widgets_blockparser extends AdminPanelAction {
var $langres = 'plugin:blockparser'; var $langres = 'plugin:blockparser';
var $commands = array('enable', 'disable');
var $commands = array(
'enable',
'disable'
);
function doenable($id) { function doenable($id) {
$success = -1; $success = -1;
@ -116,19 +115,15 @@ if (class_exists('AdminPanelAction')){
$this->smarty->assign('enabledlist', $this->bp_enabled = plugin_getoptions('blockparser', 'pages')); $this->smarty->assign('enabledlist', $this->bp_enabled = plugin_getoptions('blockparser', 'pages'));
} }
function main() { function main() {
global $fp_config; global $fp_config;
// $this->smarty->assign_by_ref('enabledpages', plugin_getoptions('blockparser')); // $this->smarty->assign_by_ref('enabledpages', plugin_getoptions('blockparser'));
$this->smarty->assign('statics', $assign = static_getlist()); $this->smarty->assign('statics', $assign = static_getlist());
} }
} }
admin_addpanelaction('widgets', 'blockparser', true); admin_addpanelaction('widgets', 'blockparser', true);
} }
?> ?>

View File

@ -1,21 +1,21 @@
<?php <?php
/* /*
Plugin Name: FootNotes * Plugin Name: FootNotes
Version: 0.1 * Version: 0.1
Plugin URI: http://flatpress.nowhereland.it * Plugin URI: http://flatpress.nowhereland.it
Description: footnotes in your entry * Description: footnotes in your entry
Author: NoWhereMan * Author: NoWhereMan
Author URI: http://flatpress.nowhereland.it * Author URI: http://flatpress.nowhereland.it
*/ */
define('FOOTNOTES_START', '[footnotes]'); define('FOOTNOTES_START', '[footnotes]');
class footnotes_class { class footnotes_class {
var $refs = false; var $refs = false;
var $id = 'noid'; var $id = 'noid';
function footnotes_class($id) { function __construct($id) {
if ($id) if ($id)
$this->id = $id; $this->id = $id;
} }
@ -24,18 +24,12 @@ class footnotes_class {
$id = $this->id; $id = $this->id;
$this->refs = true; $this->refs = true;
return return '<li>' . trim($s) . " <a id=\"$id-fn-{$n}\" href=\"#$id-rel-{$n}\" " . "title=\"Back {$n}\">^top</a>" . '</li>';
'<li>'.trim($s).
" <a id=\"$id-fn-{$n}\" href=\"#$id-rel-{$n}\" ".
"title=\"Back {$n}\">^top</a>".
'</li>';
} }
function footnotes($matches) { function footnotes($matches) {
$str = '<div class="footnotes"><h4>Footnotes</h4><ol>'; $str = '<div class="footnotes"><h4>Footnotes</h4><ol>';
$lines = preg_split('|\[([0-9]+)\]|', $matches [1], -1, PREG_SPLIT_DELIM_CAPTURE); $lines = preg_split('|\[([0-9]+)\]|', $matches [1], -1, PREG_SPLIT_DELIM_CAPTURE);
// first array element is always empty - remove // first array element is always empty - remove
@ -49,11 +43,9 @@ class footnotes_class {
$str .= '</ol></div>'; $str .= '</ol></div>';
return $str; return $str;
} }
function references($matches) { function references($matches) {
$n = $matches [1]; $n = $matches [1];
$id = $this->id; $id = $this->id;
@ -67,16 +59,11 @@ class footnotes_class {
function headings($matches) { function headings($matches) {
$i = 7 - strlen($matches [1]); $i = 7 - strlen($matches [1]);
return "<h$i>{$matches[2]}</h$i>"; return "<h$i>{$matches[2]}</h$i>";
} }
} }
function plugin_footnotes_filter($text) { function plugin_footnotes_filter($text) {
global $smarty; global $smarty;
$footnotes_obj = new footnotes_class($id = $smarty->get_template_vars('id')); $footnotes_obj = new footnotes_class($id = $smarty->get_template_vars('id'));
@ -88,36 +75,30 @@ function plugin_footnotes_filter($text) {
// heading // heading
/* /*
$text = preg_replace_callback( * $text = preg_replace_callback(
'(?<!\w)=(?=\S) (?! =) (.+?) (?<=\S) =(?!>\w)|xs' * '(?<!\w)=(?=\S) (?! =) (.+?) (?<=\S) =(?!>\w)|xs'
//'/\n(#{1,6})([^#]+)# * /', * //'/\n(#{1,6})([^#]+)# * /',
array(&$footnotes_obj, 'headings'), * array(&$footnotes_obj, 'headings'),
$text); * $text);
*
*/ */
$text = preg_replace_callback('|\n' . preg_quote(FOOTNOTES_START) . '\s*(.*)|sm', array(
&$footnotes_obj,
$text = preg_replace_callback('|\n'. preg_quote(FOOTNOTES_START) .'\s*(.*)|sm', 'footnotes'
array(&$footnotes_obj, 'footnotes'), ), $text);
$text);
// no [footnotes] references at the bottom of the page: stops // no [footnotes] references at the bottom of the page: stops
if (!$footnotes_obj->refs) if (!$footnotes_obj->refs)
return $text; return $text;
$text = preg_replace_callback('|\[([0-9]+)\]|', $text = preg_replace_callback('|\[([0-9]+)\]|', array(
array(&$footnotes_obj, 'references'), &$footnotes_obj,
$text); 'references'
), $text);
return $text; return $text;
} }
add_filter('the_content', 'plugin_footnotes_filter', 0); add_filter('the_content', 'plugin_footnotes_filter', 0);
?> ?>