' .
@@ -124,7 +125,7 @@ public function html()
);
// add empty row for adding a new entry
- $rows[] = array('name' => '', 'type' => '', 'prefix' => '', 'postfix' => '', 'enum' => '');
+ $rows[] = ['name' => '', 'type' => '', 'prefix' => '', 'postfix' => '', 'enum' => ''];
$cur = 0;
foreach ($rows as $row) {
@@ -137,8 +138,10 @@ public function html()
$form->addElement('| ');
$form->addElement(form_makeMenuField(
'd[' . $cur . '][type]',
- array('', 'page', 'title', 'mail', 'url', 'dt', 'wiki', 'tag', 'hidden', 'img'),//'nspage' don't support post/prefixes
- $row['type'], ''
+ //'nspage' don't support post/prefixes
+ ['', 'page', 'title', 'mail', 'url', 'dt', 'wiki', 'tag', 'hidden', 'img'],
+ $row['type'],
+ ''
));
$form->addElement(' | ');
@@ -163,5 +166,4 @@ public function html()
$form->addElement(form_makeButton('submit', 'admin', $this->getLang('submit')));
$form->printForm();
}
-
}
diff --git a/admin/clean.php b/admin/clean.php
index 4506ca6..1cb9d24 100644
--- a/admin/clean.php
+++ b/admin/clean.php
@@ -1,22 +1,23 @@
*/
-
/**
* Let admin remove non-existing pages from sqlite db
*/
-class admin_plugin_data_clean extends DokuWiki_Admin_Plugin
+class admin_plugin_data_clean extends AdminPlugin
{
-
/**
* will hold the data helper plugin
* @var helper_plugin_data
*/
- protected $dthlp = null;
+ protected $dthlp;
/**
* Constructor. Load helper plugin
@@ -65,7 +66,7 @@ public function handle()
{
if (!isset($_REQUEST['data_go']) || !checkSecurityToken()) return;
- $sqlite = $this->dthlp->_getDB();
+ $sqlite = $this->dthlp->getDB();
if (!$sqlite) return;
$rows = $sqlite->queryAll('SELECT pid, page FROM pages');
@@ -90,12 +91,11 @@ public function html()
echo $this->locale_xhtml('intro_clean');
- $form = new Doku_Form(array('method' => 'post'));
+ $form = new Doku_Form(['method' => 'post']);
$form->addHidden('page', 'data_clean');
$form->addHidden('data_go', 'go');
$form->addElement(form_makeButton('submit', 'admin', $this->getLang('submit_clean')));
$form->printForm();
}
-
}
diff --git a/bureaucracy_field.php b/bureaucracy_field.php
index 46eb546..b4fc71d 100644
--- a/bureaucracy_field.php
+++ b/bureaucracy_field.php
@@ -1,178 +1,178 @@
init($args);
- $n_args = array();
- $this->args = array();
- foreach ($args as $arg) {
- if ($arg[0] !== '_') {
- $n_args[] = $arg;
- continue;
- }
- $this->args[] = $arg;
+ $this->init($args);
+ $n_args = [];
+ foreach ($args as $arg) {
+ if ($arg[0] !== '_') {
+ $n_args[] = $arg;
+ continue;
}
- $this->standardArgs($n_args);
-
+ $this->args[] = $arg;
}
+ $this->standardArgs($n_args);
+ }
- /**
- * Prepare
- *
- * @param array $args data plugin related field arguments
- */
- private function prepareColumns($args)
- {
- /** @var helper_plugin_data $dthlp */
- $dthlp = plugin_load('helper', 'data');
- if (!$dthlp) msg('Loading the data helper failed. Make sure the data plugin is installed.', -1);
-
- foreach ($args as $arg) {
- $arg = $this->replaceTranslation($arg);
- $datatype = $dthlp->_column($arg);
- if (is_array($datatype['type'])) {
- $datatype['basetype'] = $datatype['type']['type'];
- $datatype['enum'] = $datatype['type']['enum'];
- $datatype['type'] = $datatype['origtype'];
- } else {
- $datatype['basetype'] = $datatype['type'];
- }
- }
- $datatype['title'] = '@@DISPLAY@@';
- if (isset($datatype['enum'])) {
- $values = preg_split('/\s*,\s*/', $datatype['enum']);
- if (!$datatype['multi'] && $this->opt['optional']) array_unshift($values, '');
- $this->opt['args'] = $values;
- $this->additional = ($datatype['multi'] ? array('multiple' => 'multiple') : array());
+ /**
+ * Prepare
+ *
+ * @param array $args data plugin related field arguments
+ */
+ private function prepareColumns($args)
+ {
+ /** @var helper_plugin_data $dthlp */
+ $dthlp = plugin_load('helper', 'data');
+ if (!$dthlp) msg('Loading the data helper failed. Make sure the data plugin is installed.', -1);
+
+ foreach ($args as $arg) {
+ $arg = $this->replaceTranslation($arg);
+ $datatype = $dthlp->column($arg);
+ if (is_array($datatype['type'])) {
+ $datatype['basetype'] = $datatype['type']['type'];
+ $datatype['enum'] = $datatype['type']['enum'];
+ $datatype['type'] = $datatype['origtype'];
} else {
- $classes = 'data_type_' . $datatype['type'] . ($datatype['multi'] ? 's' : '') . ' ' .
- 'data_type_' . $datatype['basetype'] . ($datatype['multi'] ? 's' : '');
- $content = form_makeTextField('@@NAME@@', '@@VALUE@@', '@@DISPLAY@@', '@@ID@@', '@@CLASS@@ ' . $classes);
-
- $this->tpl = $content;
+ $datatype['basetype'] = $datatype['type'];
}
- if (!isset($this->opt['display'])) {
- $this->opt['display'] = $this->opt['label'];
- }
-
}
-
- /**
- * Render the field as XHTML
- *
- * Creates a single line input field or select field
- *
- * @params array $params Additional HTML specific parameters
- * @params Doku_Form $form The target Doku_Form object
- * @params int $formid unique identifier of the form which contains this field
- */
- public function renderfield($params, Doku_Form $form, $formid)
- {
- $this->prepareColumns($this->args);
-
- if (isset($this->tpl)) {
- parent::renderfield($params, $form, $formid);
- } else {
- // Is an enum type, otherwise $this->tpl would be set in __construct
- $this->_handlePreload();
- if (!$form->_infieldset) {
- $form->startFieldset('');
- }
- if ($this->error) {
- $params['class'] = 'bureaucracy_error';
- }
- $params = array_merge($this->opt, $params);
- $params['value'] = preg_split('/\s*,\s*/', $params['value'], -1, PREG_SPLIT_NO_EMPTY);
- if (count($params['value']) === 0) {
- $params['value'] = $params['args'][0];
- }
- if (!isset($this->opt['optional'])) {
- $this->additional['required'] = 'required';
- }
-
- $form->addElement(call_user_func_array('form_makeListboxField',
- $this->_parse_tpl(
- array(
- '@@NAME@@[]',
- $params['args'],
- $params['value'],
- '@@DISPLAY@@',
- '',
- '@@CLASS@@',
- $this->additional
- ),
- $params
- )));
- }
+ $datatype['title'] = '@@DISPLAY@@';
+ if (isset($datatype['enum'])) {
+ $values = preg_split('/\s*,\s*/', $datatype['enum']);
+ if (!$datatype['multi'] && $this->opt['optional']) array_unshift($values, '');
+ $this->opt['args'] = $values;
+ $this->additional = ($datatype['multi'] ? ['multiple' => 'multiple'] : []);
+ } else {
+ $classes = 'data_type_' . $datatype['type'] . ($datatype['multi'] ? 's' : '') . ' ' .
+ 'data_type_' . $datatype['basetype'] . ($datatype['multi'] ? 's' : '');
+ $content = form_makeTextField(
+ '@@NAME@@',
+ '@@VALUE@@',
+ '@@DISPLAY@@',
+ '@@ID@@',
+ '@@CLASS@@ ' . $classes
+ );
+
+ $this->tpl = $content;
+ }
+ if (!isset($this->opt['display'])) {
+ $this->opt['display'] = $this->opt['label'];
}
+ }
- /**
- * Handle a post to the field
- *
- * Accepts and validates a posted value.
- *
- * @param string $value The passed value or array or null if none given
- * @param syntax_plugin_bureaucracy_field[] $fields (reference) form fields (POST handled upto $this field)
- * @param int $index index number of field in form
- * @param int $formid unique identifier of the form which contains this field
- * @return bool Whether the passed value is valid
- */
- public function handle_post($value, &$fields, $index, $formid)
- {
- if (is_array($value)) {
- $value = join(', ', $value);
+ /**
+ * Render the field as XHTML
+ *
+ * Creates a single line input field or select field
+ *
+ * @params array $params Additional HTML specific parameters
+ * @params Doku_Form $form The target Doku_Form object
+ * @params int $formid unique identifier of the form which contains this field
+ */
+ public function renderfield($params, Doku_Form $form, $formid)
+ {
+ $this->prepareColumns($this->args);
+
+ if (isset($this->tpl)) {
+ parent::renderfield($params, $form, $formid);
+ } else {
+ // Is an enum type, otherwise $this->tpl would be set in __construct
+ $this->_handlePreload();
+ if (!$form->_infieldset) {
+ $form->startFieldset('');
+ }
+ if ($this->error) {
+ $params['class'] = 'bureaucracy_error';
+ }
+ $params = array_merge($this->opt, $params);
+ $params['value'] = preg_split('/\s*,\s*/', $params['value'], -1, PREG_SPLIT_NO_EMPTY);
+ if (count($params['value']) === 0) {
+ $params['value'] = $params['args'][0];
+ }
+ if (!isset($this->opt['optional'])) {
+ $this->additional['required'] = 'required';
}
- return parent::handle_post($value, $fields, $index, $formid);
+ $form->addElement(call_user_func_array(
+ 'form_makeListboxField',
+ $this->_parse_tpl(
+ [
+ '@@NAME@@[]',
+ $params['args'],
+ $params['value'],
+ '@@DISPLAY@@',
+ '',
+ '@@CLASS@@',
+ $this->additional
+ ],
+ $params
+ )
+ ));
}
+ }
- /**
- * Replace the translation placeholders
- *
- * @param string $string
- * @return string parsed string
- */
- private function replaceTranslation($string)
- {
- global $ID;
- global $conf;
+ /**
+ * Handle a post to the field
+ *
+ * Accepts and validates a posted value.
+ *
+ * @param string $value The passed value or array or null if none given
+ * @param helper_plugin_bureaucracy_field[] $fields (reference) form fields (POST handled upto $this field)
+ * @param int $index index number of field in form
+ * @param int $formid unique identifier of the form which contains this field
+ * @return bool Whether the passed value is valid
+ */
+ public function handlePost($value, &$fields, $index, $formid)
+ {
+ if (is_array($value)) {
+ $value = implode(', ', $value);
+ }
- $lang = $conf['lang'];
- $trans = '';
+ return parent::handlePost($value, $fields, $index, $formid);
+ }
- /** @var helper_plugin_translation $translationPlugin */
- $translationPlugin = plugin_load('helper', 'translation');
- if ($translationPlugin) {
- $trans = $translationPlugin->getLangPart($ID);
- $lang = $translationPlugin->realLC('');
- }
+ /**
+ * Replace the translation placeholders
+ *
+ * @param string $string
+ * @return string parsed string
+ */
+ private function replaceTranslation($string)
+ {
+ global $ID;
+ global $conf;
- $string = str_replace('@LANG@', $lang, $string);
- return str_replace('@TRANS@', $trans, $string);
+ $lang = $conf['lang'];
+ $trans = '';
+
+ /** @var helper_plugin_translation $translationPlugin */
+ $translationPlugin = plugin_load('helper', 'translation');
+ if ($translationPlugin) {
+ $trans = $translationPlugin->getLangPart($ID);
+ $lang = $translationPlugin->realLC('');
}
+
+ $string = str_replace('@LANG@', $lang, $string);
+ return str_replace('@TRANS@', $trans, $string);
}
}
diff --git a/conf/metadata.php b/conf/metadata.php
index 1e32b78..7aaee1c 100644
--- a/conf/metadata.php
+++ b/conf/metadata.php
@@ -1,6 +1,6 @@
*/
+use dokuwiki\Extension\Plugin;
use dokuwiki\ErrorHandler;
use dokuwiki\plugin\sqlite\SQLiteDB;
use dokuwiki\Utf8\PhpString;
@@ -11,23 +13,22 @@
/**
* This is the base class for all syntax classes, providing some general stuff
*/
-class helper_plugin_data extends DokuWiki_Plugin
+class helper_plugin_data extends Plugin
{
-
/**
* @var SQLiteDB initialized via _getDb()
*/
- protected $db = null;
+ protected $db;
/**
* @var array stores the alias definitions
*/
- protected $aliases = null;
+ protected $aliases;
/**
* @var array stores custom key localizations
*/
- protected $locs = array();
+ protected $locs = [];
/**
* Constructor
@@ -41,13 +42,13 @@ public function __construct()
private function loadLocalizedLabels()
{
- $lang = array();
+ $lang = [];
$path = DOKU_CONF . '/lang/en/data-plugin.php';
if (file_exists($path)) include($path);
$path = DOKU_CONF . '/lang/' . $this->determineLang() . '/data-plugin.php';
if (file_exists($path)) include($path);
foreach ($lang as $key => $val) {
- $lang[PHPString::strtolower($key)] = $val;
+ $lang[PhpString::strtolower($key)] = $val;
}
$this->locs = $lang;
}
@@ -76,7 +77,7 @@ protected function determineLang()
*/
public function ready()
{
- return (bool)$this->_getDB();
+ return (bool)$this->getDB();
}
/**
@@ -84,12 +85,12 @@ public function ready()
*
* @return SQLiteDB|null SQLite class plugin or null if failed
*/
- function _getDB()
+ public function getDB()
{
if ($this->db === null) {
try {
$this->db = new SQLiteDB('data', __DIR__ . '/db/');
- $this->db->getPdo()->sqliteCreateFunction('DATARESOLVE', [$this, '_resolveData'], 2);
+ $this->db->getPdo()->sqliteCreateFunction('DATARESOLVE', [$this, 'resolveData'], 2);
} catch (\Exception $exception) {
if (defined('DOKU_UNITTEST')) throw new \RuntimeException('Could not load SQLite', 0, $exception);
ErrorHandler::logException($exception);
@@ -107,10 +108,10 @@ function _getDB()
* @param string|array $type
* @return string
*/
- function _cleanData($value, $type)
+ public function cleanData($value, $type)
{
$value = trim((string) $value);
- if (!$value and $value !== '0') {
+ if (!$value && $value !== '0') {
return '';
}
if (is_array($type)) {
@@ -166,7 +167,7 @@ function _cleanData($value, $type)
* @param string $post
* @return string
*/
- function _addPrePostFixes($type, $val, $pre = '', $post = '')
+ public function addPrePostFixes($type, $val, $pre = '', $post = '')
{
if (is_array($type)) {
if (isset($type['prefix'])) {
@@ -190,11 +191,11 @@ function _addPrePostFixes($type, $val, $pre = '', $post = '')
* @param string $colname
* @return string
*/
- function _resolveData($value, $colname)
+ public function resolveData($value, $colname)
{
// resolve pre and postfixes
- $column = $this->_column($colname);
- $value = $this->_addPrePostFixes($column['type'], $value);
+ $column = $this->column($colname);
+ $value = $this->addPrePostFixes($column['type'], $value);
// for pages, resolve title
$type = $column['type'];
@@ -204,7 +205,7 @@ function _resolveData($value, $colname)
if ($type == 'title' || ($type == 'page' && useHeading('content'))) {
$id = $value;
if ($type == 'title') {
- list($id,) = explode('|', $value, 2);
+ [$id, ] = explode('|', $value, 2);
}
//DATARESOLVE is only used with the 'LIKE' comparator, so concatenate the different strings is fine.
$value .= ' ' . p_get_first_heading($id);
@@ -228,11 +229,11 @@ public function ensureAbsoluteId($id)
* @param Doku_Renderer_xhtml $R
* @return string
*/
- function _formatData($column, $value, Doku_Renderer_xhtml $R)
+ public function formatData($column, $value, Doku_Renderer_xhtml $R)
{
global $conf;
$vals = explode("\n", $value);
- $outs = array();
+ $outs = [];
//multivalued line from db result for pageid and wiki has only in first value the ID
$storedID = '';
@@ -247,18 +248,18 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
}
switch ($type) {
case 'page':
- $val = $this->_addPrePostFixes($column['type'], $val);
+ $val = $this->addPrePostFixes($column['type'], $val);
$val = $this->ensureAbsoluteId($val);
$outs[] = $R->internallink($val, null, null, true);
break;
case 'title':
- list($id, $title) = array_pad(explode('|', $val, 2), 2, null);
- $id = $this->_addPrePostFixes($column['type'], $id);
+ [$id, $title] = array_pad(explode('|', $val, 2), 2, null);
+ $id = $this->addPrePostFixes($column['type'], $id);
$id = $this->ensureAbsoluteId($id);
$outs[] = $R->internallink($id, $title, null, true);
break;
case 'pageid':
- list($id, $title) = array_pad(explode('|', $val, 2), 2, null);
+ [$id, $title] = array_pad(explode('|', $val, 2), 2, null);
//use ID from first value of the multivalued line
if ($title == null) {
@@ -270,7 +271,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
$storedID = $id;
}
- $id = $this->_addPrePostFixes($column['type'], $id);
+ $id = $this->addPrePostFixes($column['type'], $id);
$outs[] = $R->internallink($id, $title, null, true);
break;
@@ -281,8 +282,8 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
$outs[] = $R->internallink($val, null, null, true);
break;
case 'mail':
- list($id, $title) = array_pad(explode(' ', $val, 2), 2, null);
- $id = $this->_addPrePostFixes($column['type'], $id);
+ [$id, $title] = array_pad(explode(' ', $val, 2), 2, null);
+ $id = $this->addPrePostFixes($column['type'], $id);
$id = obfuscate(hsc($id));
if (!$title) {
$title = $id;
@@ -295,7 +296,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
$outs[] = '' . $title . '';
break;
case 'url':
- $val = $this->_addPrePostFixes($column['type'], $val);
+ $val = $this->addPrePostFixes($column['type'], $val);
$outs[] = $this->external_link($val, false, 'urlextern');
break;
case 'tag':
@@ -303,10 +304,11 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
if (!is_array($column['type'])) {
$target = $column['key'] . ':';
} else {
- $target = $this->_addPrePostFixes($column['type'], '');
+ $target = $this->addPrePostFixes($column['type'], '');
}
- $outs[] = 'getTagUrlparam($column, $val))
. '" title="' . sprintf($this->getLang('tagfilter'), hsc($val))
. '" class="wikilink1">' . hsc($val) . '';
break;
@@ -316,7 +318,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
case 'wiki':
global $ID;
$oldid = $ID;
- list($ID, $data) = explode('|', $val, 2);
+ [$ID, $data] = explode('|', $val, 2);
//use ID from first value of the multivalued line
if ($data == null) {
@@ -325,7 +327,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
} else {
$storedID = $ID;
}
- $data = $this->_addPrePostFixes($column['type'], $data);
+ $data = $this->addPrePostFixes($column['type'], $data);
// Trim document_{start,end}, p_{open,close} from instructions
$allinstructions = p_get_instructions($data);
@@ -339,7 +341,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
$ID = $oldid;
break;
default:
- $val = $this->_addPrePostFixes($column['type'], $val);
+ $val = $this->addPrePostFixes($column['type'], $val);
//type '_img' or '_img'
if (substr($type, 0, 3) == 'img') {
$width = (int)substr($type, 3);
@@ -347,7 +349,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
$width = $this->getConf('image_width');
}
- list($mediaid, $title) = array_pad(explode('|', $val, 2), 2, null);
+ [$mediaid, $title] = array_pad(explode('|', $val, 2), 2, null);
if ($title === null) {
$title = $column['key'] . ': ' . basename(str_replace(':', '/', $mediaid));
} else {
@@ -355,9 +357,27 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
}
if (media_isexternal($val)) {
- $html = $R->externalmedia($mediaid, $title, $align = null, $width, $height = null, $cache = null, $linking = 'direct', true);
+ $html = $R->externalmedia(
+ $mediaid,
+ $title,
+ $align = null,
+ $width,
+ $height = null,
+ $cache = null,
+ $linking = 'direct',
+ true
+ );
} else {
- $html = $R->internalmedia($mediaid, $title, $align = null, $width, $height = null, $cache = null, $linking = 'direct', true);
+ $html = $R->internalmedia(
+ $mediaid,
+ $title,
+ $align = null,
+ $width,
+ $height = null,
+ $cache = null,
+ $linking = 'direct',
+ true
+ );
}
if (strpos($html, 'mediafile') === false) {
$html = str_replace('href', 'rel="lightbox" href', $html);
@@ -369,7 +389,7 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
}
}
}
- return join(', ', $outs);
+ return implode(', ', $outs);
}
/**
@@ -378,25 +398,25 @@ function _formatData($column, $value, Doku_Renderer_xhtml $R)
* @param string $col column name
* @return array with key, type, ismulti, title, opt
*/
- function _column($col)
+ public function column($col)
{
preg_match('/^([^_]*)(?:_(.*))?((? $col,
'multi' => ($matches[3] === 's'),
- 'key' => PHPString::strtolower($matches[1]),
+ 'key' => PhpString::strtolower($matches[1]),
'origkey' => $matches[1], //similar to key, but stores upper case
'title' => $matches[1],
- 'type' => PHPString::strtolower($matches[2])
- );
+ 'type' => PhpString::strtolower($matches[2]),
+ ];
// fix title for special columns
- static $specials = array(
- '%title%' => array('page', 'title'),
- '%pageid%' => array('title', 'page'),
- '%class%' => array('class'),
- '%lastmod%' => array('lastmod', 'timestamp')
- );
+ static $specials = [
+ '%title%' => ['page', 'title'],
+ '%pageid%' => ['title', 'page'],
+ '%class%' => ['class'],
+ '%lastmod%' => ['lastmod', 'timestamp']
+ ];
if (isset($specials[$column['title']])) {
$s = $specials[$column['title']];
$column['title'] = $this->getLang($s[0]);
@@ -406,7 +426,7 @@ function _column($col)
}
// check if the type is some alias
- $aliases = $this->_aliases();
+ $aliases = $this->aliases();
if (isset($aliases[$column['type']])) {
$column['origtype'] = $column['type'];
$column['type'] = $aliases[$column['type']];
@@ -425,14 +445,14 @@ function _column($col)
*
* @return array
*/
- function _aliases()
+ public function aliases()
{
if (!is_null($this->aliases)) return $this->aliases;
- $sqlite = $this->_getDB();
- if (!$sqlite) return array();
+ $sqlite = $this->getDB();
+ if (!$sqlite) return [];
- $this->aliases = array();
+ $this->aliases = [];
$rows = $sqlite->queryAll("SELECT * FROM aliases");
foreach ($rows as $row) {
$name = $row['name'];
@@ -451,17 +471,14 @@ function _aliases()
* @param $filterline
* @return array|bool - array on success, false on error
*/
- function _parse_filter($filterline)
+ public function parseFilter($filterline)
{
//split filterline on comparator
if (preg_match('/^(.*?)([\*=<>!~]{1,2})(.*)$/', $filterline, $matches)) {
- $column = $this->_column(trim($matches[1]));
+ $column = $this->column(trim($matches[1]));
$com = $matches[2];
- $aliasses = array(
- '<>' => '!=', '=!' => '!=', '~!' => '!~',
- '==' => '=', '~=' => '~', '=~' => '~'
- );
+ $aliasses = ['<>' => '!=', '=!' => '!=', '~!' => '!~', '==' => '=', '~=' => '~', '=~' => '~'];
if (isset($aliasses[$com])) {
$com = $aliasses[$com];
@@ -488,9 +505,9 @@ function _parse_filter($filterline)
}
} else {
// Clean if there are no asterisks I could kill
- $val = $this->_cleanData($val, $column['type']);
+ $val = $this->cleanData($val, $column['type']);
}
- $sqlite = $this->_getDB();
+ $sqlite = $this->getDB();
if (!$sqlite) return false;
if ($com == 'IN(') {
@@ -502,13 +519,13 @@ function _parse_filter($filterline)
$val = $sqlite->getPdo()->quote($val);
}
- return array(
+ return [
'key' => $column['key'],
'value' => $val,
'compare' => $com,
'colname' => $column['colname'],
'type' => $column['type']
- );
+ ];
}
msg('Failed to parse filter "' . hsc($filterline) . '"', -1);
return false;
@@ -519,7 +536,7 @@ function _parse_filter($filterline)
*
* @param $data
*/
- function _replacePlaceholdersInSQL(&$data)
+ public function replacePlaceholdersInSQL(&$data)
{
global $USERINFO;
global $INPUT;
@@ -572,12 +589,12 @@ public function makeTranslationReplacement($data)
*
* @return array
*/
- function _get_filters()
+ public function getFilters()
{
- $filters = array();
+ $filters = [];
if (!isset($_REQUEST['dataflt'])) {
- $flt = array();
+ $flt = [];
} elseif (!is_array($_REQUEST['dataflt'])) {
$flt = (array)$_REQUEST['dataflt'];
} else {
@@ -588,7 +605,7 @@ function _get_filters()
if (!is_numeric($key)) {
$line = $key . $line;
}
- $f = $this->_parse_filter($line);
+ $f = $this->parseFilter($line);
if (is_array($f)) {
$f['logic'] = 'AND';
$filters[] = $f;
@@ -604,9 +621,9 @@ function _get_filters()
* @param string|array $array value or key-value pairs
* @return array
*/
- function _a2ua($name, $array)
+ public function a2ua($name, $array)
{
- $urlarray = array();
+ $urlarray = [];
foreach ((array)$array as $key => $val) {
$urlarray[$name . '[' . $key . ']'] = $val;
}
@@ -619,11 +636,11 @@ function _a2ua($name, $array)
* @param bool $returnURLparams
* @return array with dataflt, datasrt and dataofs parameters
*/
- function _get_current_param($returnURLparams = true)
+ public function getPurrentParam($returnURLparams = true)
{
- $cur_params = array();
+ $cur_params = [];
if (isset($_REQUEST['dataflt'])) {
- $cur_params = $this->_a2ua('dataflt', $_REQUEST['dataflt']);
+ $cur_params = $this->a2ua('dataflt', $_REQUEST['dataflt']);
}
if (isset($_REQUEST['datasrt'])) {
$cur_params['datasrt'] = $_REQUEST['datasrt'];
@@ -634,7 +651,7 @@ function _get_current_param($returnURLparams = true)
//combine key and value
if (!$returnURLparams) {
- $flat_param = array();
+ $flat_param = [];
foreach ($cur_params as $key => $val) {
$flat_param[] = $key . $val;
}
@@ -650,9 +667,9 @@ function _get_current_param($returnURLparams = true)
* @param string $tag
* @return array of url parameters
*/
- function _getTagUrlparam($column, $tag)
+ public function getTagUrlparam($column, $tag)
{
- $param = array();
+ $param = [];
if (isset($_REQUEST['dataflt'])) {
$param = (array)$_REQUEST['dataflt'];
@@ -662,14 +679,14 @@ function _getTagUrlparam($column, $tag)
if (!is_numeric($key)) {
$flt = $key . $flt;
}
- $filter = $this->_parse_filter($flt);
+ $filter = $this->parseFilter($flt);
if ($filter['key'] == $column['key']) {
unset($param[$key]);
}
}
}
$param[] = $column['key'] . "_=$tag";
- $param = $this->_a2ua('dataflt', $param);
+ $param = $this->a2ua('dataflt', $param);
if (isset($_REQUEST['datasrt'])) {
$param['datasrt'] = $_REQUEST['datasrt'];
diff --git a/helper/aliastextbox.php b/helper/aliastextbox.php
index a4a2d33..010e791 100644
--- a/helper/aliastextbox.php
+++ b/helper/aliastextbox.php
@@ -8,7 +8,6 @@
*/
class helper_plugin_data_aliastextbox extends helper_plugin_bureaucracy_field
{
-
private $args;
private $additional;
@@ -24,8 +23,8 @@ class helper_plugin_data_aliastextbox extends helper_plugin_bureaucracy_field
public function initialize($args)
{
$this->init($args);
- $n_args = array();
- $this->args = array();
+ $n_args = [];
+ $this->args = [];
foreach ($args as $arg) {
if ($arg[0] !== '_') {
$n_args[] = $arg;
@@ -34,7 +33,6 @@ public function initialize($args)
$this->args[] = $arg;
}
$this->standardArgs($n_args);
-
}
/**
@@ -50,7 +48,7 @@ private function prepareColumns($args)
foreach ($args as $arg) {
$arg = $this->replaceTranslation($arg);
- $datatype = $dthlp->_column($arg);
+ $datatype = $dthlp->column($arg);
if (is_array($datatype['type'])) {
$datatype['basetype'] = $datatype['type']['type'];
$datatype['enum'] = $datatype['type']['enum'];
@@ -64,7 +62,7 @@ private function prepareColumns($args)
$values = preg_split('/\s*,\s*/', $datatype['enum']);
if (!$datatype['multi'] && $this->opt['optional']) array_unshift($values, '');
$this->opt['args'] = $values;
- $this->additional = ($datatype['multi'] ? array('multiple' => 'multiple') : array());
+ $this->additional = ($datatype['multi'] ? ['multiple' => 'multiple'] : []);
} else {
$classes = 'data_type_' . $datatype['type'] . ($datatype['multi'] ? 's' : '') . ' ' .
'data_type_' . $datatype['basetype'] . ($datatype['multi'] ? 's' : '');
@@ -75,7 +73,6 @@ private function prepareColumns($args)
if (!isset($this->opt['display'])) {
$this->opt['display'] = $this->opt['label'];
}
-
}
/**
@@ -111,9 +108,10 @@ public function renderfield($params, Doku_Form $form, $formid)
$this->additional['required'] = 'required';
}
- $form->addElement(call_user_func_array('form_makeListboxField',
+ $form->addElement(call_user_func_array(
+ 'form_makeListboxField',
$this->_parse_tpl(
- array(
+ [
'@@NAME@@[]',
$params['args'],
$params['value'],
@@ -121,9 +119,10 @@ public function renderfield($params, Doku_Form $form, $formid)
'',
'@@CLASS@@',
$this->additional
- ),
+ ],
$params
- )));
+ )
+ ));
}
}
@@ -138,13 +137,13 @@ public function renderfield($params, Doku_Form $form, $formid)
* @param int $formid unique identifier of the form which contains this field
* @return bool Whether the passed value is valid
*/
- public function handle_post($value, &$fields, $index, $formid)
+ public function handlePost($value, &$fields, $index, $formid)
{
if (is_array($value)) {
- $value = join(', ', $value);
+ $value = implode(', ', $value);
}
- return parent::handle_post($value, $fields, $index, $formid);
+ return parent::handlePost($value, $fields, $index, $formid);
}
/**
@@ -172,4 +171,3 @@ private function replaceTranslation($string)
return str_replace('@TRANS@', $trans, $string);
}
}
-
diff --git a/plugin.info.txt b/plugin.info.txt
index aea4288..761a17c 100644
--- a/plugin.info.txt
+++ b/plugin.info.txt
@@ -5,4 +5,4 @@ date 2023-07-18
name Structured Data Plugin
desc Add and query structured data in your wiki
url https://www.dokuwiki.org/plugin:data
-
+minphp 7.3
diff --git a/renderer_data_edit.php b/renderer_data_edit.php
index b508f12..d77d653 100644
--- a/renderer_data_edit.php
+++ b/renderer_data_edit.php
@@ -1,4 +1,7 @@
Lexer->addSpecialPattern('----+ *datacloud(?: [ a-zA-Z0-9_]*)?-+\n.*?\n----+', $mode, 'plugin_data_cloud');
+ $this->Lexer->addSpecialPattern(
+ '----+ *datacloud(?: [ a-zA-Z0-9_]*)?-+\n.*?\n----+',
+ $mode,
+ 'plugin_data_cloud'
+ );
}
/**
@@ -68,7 +72,7 @@ public function connectTo($mode)
* @param array &$data instruction by handler
* @return bool|string SQL query or false
*/
- public function _buildSQL(&$data)
+ public function buildSQL(&$data)
{
$ckey = array_keys($data['cols']);
$ckey = $ckey[0];
@@ -76,16 +80,12 @@ public function _buildSQL(&$data)
$from = ' ';
$where = ' ';
$pagesjoin = '';
- $tables = array();
+ $tables = [];
- $sqlite = $this->dthlp->_getDB();
+ $sqlite = $this->dthlp->getDB();
if (!$sqlite) return false;
- $fields = array(
- 'pageid' => 'page',
- 'class' => 'class',
- 'title' => 'title'
- );
+ $fields = ['pageid' => 'page', 'class' => 'class', 'title' => 'title'];
// prepare filters (no request filters - we set them ourselves)
if (is_array($data['filter']) && count($data['filter'])) {
$cnt = 0;
@@ -152,7 +152,7 @@ public function render($format, Doku_Renderer $renderer, $data)
if (!$this->dthlp->ready()) return false;
$renderer->info['cache'] = false;
- $sqlite = $this->dthlp->_getDB();
+ $sqlite = $this->dthlp->getDB();
if (!$sqlite) return false;
$ckey = array_keys($data['cols']);
@@ -162,13 +162,13 @@ public function render($format, Doku_Renderer $renderer, $data)
$data['page'] = $ID;
}
- $this->dthlp->_replacePlaceholdersInSQL($data);
+ $this->dthlp->replacePlaceholdersInSQL($data);
// build cloud data
$rows = $sqlite->queryAll($data['sql']);
$min = 0;
$max = 0;
- $tags = array();
+ $tags = [];
foreach ($rows as $row) {
if (!$max) {
$max = $row['cnt'];
@@ -177,7 +177,7 @@ public function render($format, Doku_Renderer $renderer, $data)
$tags[$row['value']]['cnt'] = $row['cnt'];
$tags[$row['value']]['value'] = $row['value'];
}
- $this->_cloud_weight($tags, $min, $max, 5);
+ $this->cloudWeight($tags, $min, $max, 5);
// output cloud
$renderer->doc .= sprintf($this->before_item, hsc($data['classes']));
@@ -188,7 +188,8 @@ public function render($format, Doku_Renderer $renderer, $data)
}
$renderer->doc .= sprintf($this->before_val, $tag['lvl']);
- $renderer->doc .= 'dthlp->getTagUrlparam($data['cols'][$ckey], $tag['value'])) .
'" title="' . sprintf($this->getLang('tagfilter'), hsc($tag['value'])) .
'" class="wikilink1">' . $tagLabelText . '';
$renderer->doc .= $this->after_val;
@@ -205,14 +206,14 @@ public function render($format, Doku_Renderer $renderer, $data)
* @param $max int The highest count of a single tag
* @param $levels int The number of levels you want. A 5 gives levels 0 to 4.
*/
- protected function _cloud_weight(&$tags, $min, $max, $levels)
+ protected function cloudWeight(&$tags, $min, $max, $levels)
{
$levels--;
// calculate tresholds
- $tresholds = array();
+ $tresholds = [];
for ($i = 0; $i <= $levels; $i++) {
- $tresholds[$i] = pow($max - $min + 1, $i / $levels) + $min - 1;
+ $tresholds[$i] = ($max - $min + 1) ** ($i / $levels) + $min - 1;
}
// assign weights
@@ -229,6 +230,4 @@ protected function _cloud_weight(&$tags, $min, $max, $levels)
// sort
ksort($tags);
}
-
}
-
diff --git a/syntax/entry.php b/syntax/entry.php
index 9d77a7f..d5ea71d 100644
--- a/syntax/entry.php
+++ b/syntax/entry.php
@@ -1,28 +1,32 @@
*/
+use dokuwiki\Extension\SyntaxPlugin;
+use dokuwiki\plugin\data\Form\DropdownElement;
+use dokuwiki\Form\InputElement;
+use dokuwiki\Form\CheckableElement;
use dokuwiki\Form\Element;
use dokuwiki\Utf8\PhpString;
/**
* Class syntax_plugin_data_entry
*/
-class syntax_plugin_data_entry extends DokuWiki_Syntax_Plugin
+class syntax_plugin_data_entry extends SyntaxPlugin
{
-
/**
* @var helper_plugin_data will hold the data helper plugin
*/
- var $dthlp = null;
+ public $dthlp;
/**
* Constructor. Load helper plugin
*/
- function __construct()
+ public function __construct()
{
$this->dthlp = plugin_load('helper', 'data');
if (!$this->dthlp) msg('Loading the data helper failed. Make sure the data plugin is installed.', -1);
@@ -31,7 +35,7 @@ function __construct()
/**
* What kind of syntax are we?
*/
- function getType()
+ public function getType()
{
return 'substition';
}
@@ -39,7 +43,7 @@ function getType()
/**
* What about paragraphs?
*/
- function getPType()
+ public function getPType()
{
return 'block';
}
@@ -47,7 +51,7 @@ function getPType()
/**
* Where to sort in?
*/
- function getSort()
+ public function getSort()
{
return 155;
}
@@ -55,9 +59,13 @@ function getSort()
/**
* Connect pattern to lexer
*/
- function connectTo($mode)
+ public function connectTo($mode)
{
- $this->Lexer->addSpecialPattern('----+ *dataentry(?: [ a-zA-Z0-9_]*)?-+\n.*?\n----+', $mode, 'plugin_data_entry');
+ $this->Lexer->addSpecialPattern(
+ '----+ *dataentry(?: [ a-zA-Z0-9_]*)?-+\n.*?\n----+',
+ $mode,
+ 'plugin_data_entry'
+ );
}
/**
@@ -69,7 +77,7 @@ function connectTo($mode)
* @param Doku_Handler $handler The Doku_Handler object
* @return bool|array Return an array with all data you want to use in render, false don't add an instruction
*/
- function handle($match, $state, $pos, Doku_Handler $handler)
+ public function handle($match, $state, $pos, Doku_Handler $handler)
{
if (!$this->dthlp->ready()) return null;
@@ -81,8 +89,8 @@ function handle($match, $state, $pos, Doku_Handler $handler)
$class = trim($class, '- ');
// parse info
- $data = array();
- $columns = array();
+ $data = [];
+ $columns = [];
foreach ($lines as $line) {
// ignore comments
preg_match('/^(.*?(?dthlp->_column($line[0]);
+ $column = $this->dthlp->column($line[0]);
if (isset($matches[2])) {
$column['comment'] = $matches[2];
}
@@ -101,25 +109,28 @@ function handle($match, $state, $pos, Doku_Handler $handler)
// init with empty array
// Note that multiple occurrences of the field are
// practically merged
- $data[$column['key']] = array();
+ $data[$column['key']] = [];
}
$vals = explode(',', $line[1]);
foreach ($vals as $val) {
- $val = trim($this->dthlp->_cleanData($val, $column['type']));
+ $val = trim($this->dthlp->cleanData($val, $column['type']));
if ($val == '') continue;
if (!in_array($val, $data[$column['key']])) {
$data[$column['key']][] = $val;
}
}
} else {
- $data[$column['key']] = $this->dthlp->_cleanData($line[1] ?? '', $column['type']);
+ $data[$column['key']] = $this->dthlp->cleanData($line[1] ?? '', $column['type']);
}
$columns[$column['key']] = $column;
}
- return array(
- 'data' => $data, 'cols' => $columns, 'classes' => $class,
- 'pos' => $pos, 'len' => strlen($match)
- ); // not utf8_strlen
+ return [
+ 'data' => $data,
+ 'cols' => $columns,
+ 'classes' => $class,
+ 'pos' => $pos,
+ 'len' => strlen($match) // not utf8_strlen
+ ];
}
/**
@@ -130,7 +141,7 @@ function handle($match, $state, $pos, Doku_Handler $handler)
* @param $data array data created by handler()
* @return boolean rendered correctly?
*/
- function render($format, Doku_Renderer $renderer, $data)
+ public function render($format, Doku_Renderer $renderer, $data)
{
if (is_null($data)) return false;
if (!$this->dthlp->ready()) return false;
@@ -139,18 +150,18 @@ function render($format, Doku_Renderer $renderer, $data)
switch ($format) {
case 'xhtml':
/** @var $renderer Doku_Renderer_xhtml */
- $this->_showData($data, $renderer);
+ $this->showData($data, $renderer);
return true;
case 'metadata':
/** @var $renderer Doku_Renderer_metadata */
- $this->_saveData($data, $ID, $renderer->meta['title'] ?? '');
+ $this->saveData($data, $ID, $renderer->meta['title'] ?? '');
return true;
case 'plugin_data_edit':
/** @var $renderer Doku_Renderer_plugin_data_edit */
if (is_a($renderer->form, 'Doku_Form')) {
- $this->_editDataLegacy($data, $renderer);
+ $this->editDataLegacy($data, $renderer);
} else {
- $this->_editData($data, $renderer);
+ $this->editData($data, $renderer);
}
return true;
default:
@@ -164,7 +175,7 @@ function render($format, Doku_Renderer $renderer, $data)
* @param array $data
* @param Doku_Renderer_xhtml $R
*/
- function _showData($data, $R)
+ public function showData($data, $R)
{
global $ID;
$ret = '';
@@ -173,7 +184,7 @@ function _showData($data, $R)
$data['classes'] .= ' ' . $R->startSectionEdit($data['pos'], $sectionEditData);
$ret .= '';
- $class_names = array();
+ $class_names = [];
foreach ($data['data'] as $key => $val) {
if ($val == '' || is_null($val) || (is_array($val) && count($val) == 0)) continue;
$type = $data['cols'][$key]['type'];
@@ -183,28 +194,26 @@ function _showData($data, $R)
if ($type === 'hidden') continue;
$class_name = hsc(sectionID($key, $class_names));
- $ret .= '- ' . hsc($data['cols'][$key]['title']) . ':
';
+ $ret .= '- ' .
+ hsc($data['cols'][$key]['title']) .
+ ':
';
$ret .= '- ';
if (is_array($val)) {
$cnt = count($val);
for ($i = 0; $i < $cnt; $i++) {
- switch ($type) {
- case 'wiki':
- $val[$i] = $ID . '|' . $val[$i];
- break;
+ if ($type === 'wiki') {
+ $val[$i] = $ID . '|' . $val[$i];
}
- $ret .= $this->dthlp->_formatData($data['cols'][$key], $val[$i], $R);
+ $ret .= $this->dthlp->formatData($data['cols'][$key], $val[$i], $R);
if ($i < $cnt - 1) {
$ret .= ', ';
}
}
} else {
- switch ($type) {
- case 'wiki':
- $val = $ID . '|' . $val;
- break;
+ if ($type === 'wiki') {
+ $val = $ID . '|' . $val;
}
- $ret .= $this->dthlp->_formatData($data['cols'][$key], $val, $R);
+ $ret .= $this->dthlp->formatData($data['cols'][$key], $val, $R);
}
$ret .= '
';
}
@@ -216,9 +225,9 @@ function _showData($data, $R)
/**
* Save date to the database
*/
- function _saveData($data, $id, $title)
+ public function saveData($data, $id, $title)
{
- $sqlite = $this->dthlp->_getDB();
+ $sqlite = $this->dthlp->getDB();
if (!$sqlite) return false;
if (!$title) {
@@ -232,14 +241,19 @@ function _saveData($data, $id, $title)
// store page info
$this->replaceQuery(
"INSERT OR IGNORE INTO pages (page,title,class) VALUES (?,?,?)",
- $id, $title, $class
+ $id,
+ $title,
+ $class
);
// Update title if insert failed (record already saved before)
$revision = filemtime(wikiFN($id));
$this->replaceQuery(
"UPDATE pages SET title = ?, class = ?, lastmod = ? WHERE page = ?",
- $title, $class, $revision, $id
+ $title,
+ $class,
+ $revision,
+ $id
);
// fetch page id
@@ -260,12 +274,16 @@ function _saveData($data, $id, $title)
if (is_array($val)) foreach ($val as $v) {
$this->replaceQuery(
"INSERT INTO DATA (pid, KEY, VALUE) VALUES (?, ?, ?)",
- $pid, $key, $v
+ $pid,
+ $key,
+ $v
);
} else {
$this->replaceQuery(
"INSERT INTO DATA (pid, KEY, VALUE) VALUES (?, ?, ?)",
- $pid, $key, $val
+ $pid,
+ $key,
+ $val
);
}
}
@@ -285,21 +303,21 @@ function _saveData($data, $id, $title)
* @fixme replace this madness
* @return bool|mixed
*/
- function replaceQuery()
+ public function replaceQuery()
{
$args = func_get_args();
$argc = func_num_args();
if ($argc > 1) {
for ($i = 1; $i < $argc; $i++) {
- $data = array();
+ $data = [];
$data['sql'] = $args[$i];
- $this->dthlp->_replacePlaceholdersInSQL($data);
+ $this->dthlp->replacePlaceholdersInSQL($data);
$args[$i] = $data['sql'];
}
}
- $sqlite = $this->dthlp->_getDB();
+ $sqlite = $this->dthlp->getDB();
if (!$sqlite) return false;
return call_user_func_array(array(&$sqlite, 'query'), $args);
@@ -315,7 +333,7 @@ function replaceQuery()
* @param Doku_Renderer_plugin_data_edit $renderer
* @deprecated _editData() is used since Igor
*/
- protected function _editDataLegacy($data, &$renderer)
+ protected function editDataLegacy($data, &$renderer)
{
$renderer->form->startFieldset($this->getLang('dataentry'));
$renderer->form->_content[count($renderer->form->_content) - 1]['class'] = 'plugin__data';
@@ -324,18 +342,25 @@ protected function _editDataLegacy($data, &$renderer)
if ($this->getConf('edit_content_only')) {
$renderer->form->addHidden('data_edit[classes]', $data['classes']);
- $columns = array('title', 'value', 'comment');
+ $columns = ['title', 'value', 'comment'];
$class = 'edit_content_only';
-
} else {
- $renderer->form->addElement(form_makeField('text', 'data_edit[classes]', $data['classes'], $this->getLang('class'), 'data__classes'));
+ $renderer->form->addElement(
+ form_makeField(
+ 'text',
+ 'data_edit[classes]',
+ $data['classes'],
+ $this->getLang('class'),
+ 'data__classes'
+ )
+ );
- $columns = array('title', 'type', 'multi', 'value', 'comment');
+ $columns = ['title', 'type', 'multi', 'value', 'comment'];
$class = 'edit_all_content';
// New line
$data['data'][''] = '';
- $data['cols'][''] = array('type' => '', 'multi' => false);
+ $data['cols'][''] = ['type' => '', 'multi' => false];
}
$renderer->form->addElement("");
@@ -379,50 +404,77 @@ protected function _editDataLegacy($data, &$renderer)
$values,
$data['data'][$key],
$vals['title'],
- '', '',
- ($vals['multi'] ? array('multiple' => 'multiple') : array())
+ '',
+ '',
+ ($vals['multi'] ? ['multiple' => 'multiple'] : [])
);
} else {
$classes = 'data_type_' . $vals['type'] . ($vals['multi'] ? 's' : '') . ' '
. 'data_type_' . $vals['basetype'] . ($vals['multi'] ? 's' : '');
- $attr = array();
+ $attr = [];
if ($vals['basetype'] == 'date' && !$vals['multi']) {
$attr['class'] = 'datepicker';
}
- $content = form_makeField('text', $fieldid . '[value]', $content, $vals['title'], '', $classes, $attr);
-
+ $content = form_makeField(
+ 'text',
+ $fieldid . '[value]',
+ $content,
+ $vals['title'],
+ '',
+ $classes,
+ $attr
+ );
}
- $cells = array(
+ $cells = [
hsc($vals['title']) . ':',
$content,
'' . hsc($vals['comment']) . ''
- );
- foreach (array('multi', 'comment', 'type') as $field) {
+ ];
+ foreach (['multi', 'comment', 'type'] as $field) {
$renderer->form->addHidden($fieldid . "[$field]", $vals[$field]);
}
- $renderer->form->addHidden($fieldid . "[title]", $vals['origkey']); //keep key as key, even if title is translated
+ //keep key as key, even if title is translated
+ $renderer->form->addHidden($fieldid . "[title]", $vals['origkey']);
} else {
- $check_data = $vals['multi'] ? array('checked' => 'checked') : array();
- $cells = array(
- form_makeField('text', $fieldid . '[title]', $vals['origkey'], $this->getLang('title')), // when editable, always use the pure key, not a title
+ $check_data = $vals['multi'] ? ['checked' => 'checked'] : [];
+ $cells = [
+ form_makeField('text', $fieldid . '[title]', $vals['origkey'], $this->getLang('title')),
+ // when editable, always use the pure key, not a title
form_makeMenuField(
$fieldid . '[type]',
array_merge(
- array(
- '', 'page', 'nspage', 'title',
- 'img', 'mail', 'url', 'tag', 'wiki', 'dt', 'hidden'
- ),
- array_keys($this->dthlp->_aliases())
+ ['', 'page', 'nspage', 'title', 'img', 'mail', 'url', 'tag', 'wiki', 'dt', 'hidden'],
+ array_keys($this->dthlp->aliases())
),
$vals['type'],
$this->getLang('type')
),
- form_makeCheckboxField($fieldid . '[multi]', array('1', ''), $this->getLang('multi'), '', '', $check_data),
- form_makeField('text', $fieldid . '[value]', $content, $this->getLang('value')),
- form_makeField('text', $fieldid . '[comment]', $vals['comment'], $this->getLang('comment'), '', 'data_comment', array('readonly' => 1, 'title' => $vals['comment']))
- );
+ form_makeCheckboxField(
+ $fieldid . '[multi]',
+ ['1', ''],
+ $this->getLang('multi'),
+ '',
+ '',
+ $check_data
+ ),
+ form_makeField(
+ 'text',
+ $fieldid . '[value]',
+ $content,
+ $this->getLang('value')
+ ),
+ form_makeField(
+ 'text',
+ $fieldid . '[comment]',
+ $vals['comment'],
+ $this->getLang('comment'),
+ '',
+ 'data_comment',
+ ['readonly' => 1, 'title' => $vals['comment']]
+ ),
+ ];
}
foreach ($cells as $index => $cell) {
@@ -435,7 +487,6 @@ protected function _editDataLegacy($data, &$renderer)
$renderer->form->addElement('
');
$renderer->form->endFieldset();
-
}
/**
@@ -446,27 +497,26 @@ protected function _editDataLegacy($data, &$renderer)
* @param array $data
* @param Doku_Renderer_plugin_data_edit $renderer
*/
- protected function _editData($data, &$renderer)
+ protected function editData($data, &$renderer)
{
$renderer->form->addFieldsetOpen($this->getLang('dataentry'))->attr('class', 'plugin__data');
if ($this->getConf('edit_content_only')) {
$renderer->form->setHiddenField('data_edit[classes]', $data['classes']);
- $columns = array('title', 'value', 'comment');
+ $columns = ['title', 'value', 'comment'];
$class = 'edit_content_only';
-
} else {
$renderer->form->addTextInput('data_edit[classes]', $this->getLang('class'))
->id('data__classes')
->val($data['classes']);
- $columns = array('title', 'type', 'multi', 'value', 'comment');
+ $columns = ['title', 'type', 'multi', 'value', 'comment'];
$class = 'edit_all_content';
// New line
$data['data'][''] = '';
- $data['cols'][''] = array('type' => '', 'multi' => false);
+ $data['cols'][''] = ['type' => '', 'multi' => false];
}
$renderer->form->addHTML("");
@@ -506,71 +556,67 @@ protected function _editData($data, &$renderer)
array_unshift($values, '');
}
- $el = new \dokuwiki\plugin\data\Form\DropdownElement(
+ $el = new DropdownElement(
$fieldid . '[value]',
$values,
$vals['title']
);
$el->useInput(false);
- $el->attrs(($vals['multi'] ? array('multiple' => 'multiple') : array()));
+ $el->attrs(($vals['multi'] ? ['multiple' => 'multiple'] : []));
$el->attr('selected', $data['data'][$key]);
$el->val($data['data'][$key]);
} else {
$classes = 'data_type_' . $vals['type'] . ($vals['multi'] ? 's' : '') . ' '
. 'data_type_' . $vals['basetype'] . ($vals['multi'] ? 's' : '');
- $attr = array();
+ $attr = [];
if ($vals['basetype'] == 'date' && !$vals['multi']) {
$attr['class'] = 'datepicker';
}
- $el = new \dokuwiki\Form\InputElement('text', $fieldid . '[value]', $vals['title']);
+ $el = new InputElement('text', $fieldid . '[value]', $vals['title']);
$el->useInput(false);
$el->val($content);
$el->addClass($classes);
$el->attrs($attr);
-
}
- $cells = array(
- hsc($vals['title']) . ':',
- $el,
+ $cells = [
+ hsc($vals['title']) . ':', $el,
'' . hsc($vals['comment'] ?? '') . ''
- );
- foreach (array('multi', 'comment', 'type') as $field) {
+ ];
+ foreach (['multi', 'comment', 'type'] as $field) {
$renderer->form->setHiddenField($fieldid . "[$field]", $vals[$field] ?? '');
}
- $renderer->form->setHiddenField($fieldid . "[title]", $vals['origkey'] ?? ''); //keep key as key, even if title is translated
+ //keep key as key, even if title is translated
+ $renderer->form->setHiddenField($fieldid . "[title]", $vals['origkey'] ?? '');
} else {
- $check_data = $vals['multi'] ? array('checked' => 'checked') : array();
- $cells = array();
+ $check_data = $vals['multi'] ? ['checked' => 'checked'] : [];
+ $cells = [];
- $el = new \dokuwiki\Form\InputElement('text', $fieldid . '[title]', $this->getLang('title'));
+ $el = new InputElement('text', $fieldid . '[title]', $this->getLang('title'));
$el->val($vals['origkey'] ?? '');
$cells[] = $el;
$el = new \dokuwiki\Form\DropdownElement(
$fieldid . '[type]',
array_merge(
- array(
- '', 'page', 'nspage', 'title',
- 'img', 'mail', 'url', 'tag', 'wiki', 'dt', 'hidden'
- ),
- array_keys($this->dthlp->_aliases())
+ ['', 'page', 'nspage', 'title', 'img', 'mail', 'url', 'tag', 'wiki', 'dt', 'hidden'],
+ array_keys($this->dthlp->aliases())
),
$this->getLang('type')
);
$el->val($vals['type']);
$cells[] = $el;
- $el = new \dokuwiki\Form\CheckableElement('checkbox', $fieldid . '[multi]', $this->getLang('multi'));
+ $el = new CheckableElement('checkbox', $fieldid . '[multi]', $this->getLang('multi'));
$el->attrs($check_data);
$cells[] = $el;
- $el = new \dokuwiki\Form\InputElement('text', $fieldid . '[value]', $this->getLang('value'));
+ $el = new InputElement('text', $fieldid . '[value]', $this->getLang('value'));
$el->val($content);
$cells[] = $el;
- $el = new \dokuwiki\Form\InputElement('text', $fieldid . '[comment]', $this->getLang('comment'));
+ $el = new InputElement('text', $fieldid . '[comment]', $this->getLang('comment'));
$el->addClass('data_comment');
$el->attrs(['readonly' => '1', 'title' => $vals['comment'] ?? '']);
$el->val($vals['comment'] ?? '');
@@ -600,7 +646,7 @@ protected function _editData($data, &$renderer)
* @return mixed
* @todo bad naming
*/
- public static function _normalize($txt)
+ public static function normalize($txt)
{
return str_replace('#', '\#', trim($txt));
}
@@ -613,20 +659,20 @@ public static function _normalize($txt)
*/
public static function editToWiki($data)
{
- $nudata = array();
+ $nudata = [];
$len = 0; // we check the maximum lenght for nice alignment later
foreach ($data['data'] as $field) {
if (is_array($field['value'])) {
- $field['value'] = join(', ', $field['value']);
+ $field['value'] = implode(', ', $field['value']);
}
$field = array_map('trim', $field);
if ($field['title'] === '') continue;
- $name = syntax_plugin_data_entry::_normalize($field['title']);
+ $name = syntax_plugin_data_entry::normalize($field['title']);
if ($field['type'] !== '') {
- $name .= '_' . syntax_plugin_data_entry::_normalize($field['type']);
+ $name .= '_' . syntax_plugin_data_entry::normalize($field['type']);
} elseif (substr($name, -1, 1) === 's') {
$name .= '_'; // when the field name ends in 's' we need to secure it against being assumed as multi
}
@@ -635,13 +681,13 @@ public static function editToWiki($data)
$name .= 's';
}
- $nudata[] = array($name, syntax_plugin_data_entry::_normalize($field['value']), $field['comment']);
- $len = max($len, PHPString::strlen($nudata[count($nudata) - 1][0]));
+ $nudata[] = [$name, syntax_plugin_data_entry::normalize($field['value']), $field['comment']];
+ $len = max($len, PhpString::strlen($nudata[count($nudata) - 1][0]));
}
$ret = '---- dataentry ' . trim($data['classes']) . ' ----' . DOKU_LF;
foreach ($nudata as $field) {
- $ret .= $field[0] . str_repeat(' ', $len + 1 - PHPString::strlen($field[0])) . ': ';
+ $ret .= $field[0] . str_repeat(' ', $len + 1 - PhpString::strlen($field[0])) . ': ';
$ret .= $field[1];
if ($field[2] !== '') {
$ret .= ' # ' . $field[2];
diff --git a/syntax/list.php b/syntax/list.php
index cc472d2..c325931 100644
--- a/syntax/list.php
+++ b/syntax/list.php
@@ -1,4 +1,5 @@
Lexer->addSpecialPattern('----+ *datalist(?: [ a-zA-Z0-9_]*)?-+\n.*?\n----+', $mode, 'plugin_data_list');
}
@@ -34,7 +34,7 @@ function connectTo($mode)
*/
protected function beforeVal(&$data, $colno)
{
- if ($data['sepbyheaders'] and $colno === 0) {
+ if ($data['sepbyheaders'] && $colno === 0) {
return $data['headers'][$colno];
} else {
return $this->before_val;
@@ -64,7 +64,7 @@ protected function afterVal(&$data, $colno)
* @param array $data instruction by handler
* @return string html of table header
*/
- function preList($clist, $data)
+ public function preList($clist, $data)
{
return '';
}
@@ -76,7 +76,7 @@ function preList($clist, $data)
* @param array $clist keys of the columns
* @param Doku_Renderer $R
*/
- function nullList($data, $clist, $R)
+ public function nullList($data, $clist, $R)
{
$R->doc .= '';
$R->cdata($this->getLang('none'));
@@ -90,9 +90,8 @@ function nullList($data, $clist, $R)
* @param int $rowcnt number of rows
* @return string html of table footer
*/
- function postList($data, $rowcnt)
+ public function postList($data, $rowcnt)
{
return '
';
if (isset($_REQUEST['dataflt'])) {
- $filters = $this->dthlp->_get_filters();
- $fltrs = array();
+ $filters = $this->dthlp->getFilters();
+ $fltrs = [];
foreach ($filters as $filter) {
if (strpos($filter['compare'], 'LIKE') !== false) {
if (strpos($filter['compare'], 'NOT') !== false) {
@@ -414,7 +416,7 @@ function preList($clist, $data)
$ckey = $clist[$num];
$width = '';
- if (isset($data['widths'][$num]) and $data['widths'][$num] != '-') {
+ if (isset($data['widths'][$num]) && $data['widths'][$num] != '-') {
$width = ' style="width: ' . $data['widths'][$num] . ';"';
}
$text .= '
';
@@ -430,7 +432,7 @@ function preList($clist, $data)
}
// Clickable header for dynamic sorting
- $text .= ' $ckey] + $cur_params) .
'" title="' . $this->getLang('sort') . '">' . hsc($head) . '';
$text .= '';
}
@@ -446,14 +448,14 @@ function preList($clist, $data)
foreach ($data['headers'] as $num => $head) {
$text .= '';
- $form = new Doku_Form(array('method' => 'GET'));
- $form->_hidden = array();
+ $form = new Doku_Form(['method' => 'GET']);
+ $form->_hidden = [];
if (!$conf['userewrite']) {
$form->addHidden('id', $ID);
}
$key = 'dataflt[' . $data['cols'][$clist[$num]]['colname'] . '*~' . ']';
- $val = isset($cur_params[$key]) ? $cur_params[$key] : '';
+ $val = $cur_params[$key] ?? '';
// Add current request params
foreach ($cur_params as $c_key => $c_val) {
@@ -479,7 +481,7 @@ function preList($clist, $data)
* @param array $clist keys of the columns
* @param Doku_Renderer $R
*/
- function nullList($data, $clist, $R)
+ public function nullList($data, $clist, $R)
{
$R->doc .= $this->preList($clist, $data);
$R->tablerow_open();
@@ -497,7 +499,7 @@ function nullList($data, $clist, $R)
* @param int $rowcnt number of rows
* @return string html of table footer
*/
- function postList($data, $rowcnt)
+ public function postList($data, $rowcnt)
{
global $ID;
$text = '';
@@ -531,7 +533,7 @@ function postList($data, $rowcnt)
}
// keep url params
- $params = $this->dthlp->_a2ua('dataflt', $_REQUEST['dataflt']);
+ $params = $this->dthlp->a2ua('dataflt', $_REQUEST['dataflt']);
if (isset($_REQUEST['datasrt'])) {
$params['datasrt'] = $_REQUEST['datasrt'];
}
@@ -548,7 +550,7 @@ function postList($data, $rowcnt)
$next = $offset + $data['limit'];
// keep url params
- $params = $this->dthlp->_a2ua('dataflt', $_REQUEST['dataflt']);
+ $params = $this->dthlp->a2ua('dataflt', $_REQUEST['dataflt']);
if (isset($_REQUEST['datasrt'])) {
$params['datasrt'] = $_REQUEST['datasrt'];
}
@@ -571,17 +573,17 @@ function postList($data, $rowcnt)
* @param array &$data instruction by handler
* @return bool|string SQL query or false
*/
- function _buildSQL(&$data)
+ public function buildSQL(&$data)
{
$cnt = 0;
- $tables = array();
- $select = array();
+ $tables = [];
+ $select = [];
$from = '';
$from2 = '';
$where2 = '1 = 1';
- $sqlite = $this->dthlp->_getDB();
+ $sqlite = $this->dthlp->getDB();
if (!$sqlite) return false;
// prepare the columns to show
@@ -653,21 +655,24 @@ function _buildSQL(&$data)
// prepare filters
$cnt = 0;
if (is_array($data['filter']) && count($data['filter'])) {
-
foreach ($data['filter'] as $filter) {
$col = $filter['key'];
$closecompare = ($filter['compare'] == 'IN(' ? ')' : '');
if ($col == '%pageid%') {
- $where2 .= " " . $filter['logic'] . " pages.page " . $filter['compare'] . " " . $filter['value'] . $closecompare;
+ $where2 .= " " . $filter['logic'] . " pages.page " .
+ $filter['compare'] . " " . $filter['value'] . $closecompare;
} elseif ($col == '%class%') {
- $where2 .= " " . $filter['logic'] . " pages.class " . $filter['compare'] . " " . $filter['value'] . $closecompare;
+ $where2 .= " " . $filter['logic'] . " pages.class " .
+ $filter['compare'] . " " . $filter['value'] . $closecompare;
} elseif ($col == '%title%') {
- $where2 .= " " . $filter['logic'] . " pages.title " . $filter['compare'] . " " . $filter['value'] . $closecompare;
+ $where2 .= " " . $filter['logic'] . " pages.title " .
+ $filter['compare'] . " " . $filter['value'] . $closecompare;
} elseif ($col == '%lastmod%') {
# parse value to int?
$filter['value'] = (int)strtotime($filter['value']);
- $where2 .= " " . $filter['logic'] . " pages.lastmod " . $filter['compare'] . " " . $filter['value'] . $closecompare;
+ $where2 .= " " . $filter['logic'] . " pages.lastmod " .
+ $filter['compare'] . " " . $filter['value'] . $closecompare;
} else {
// filter by hidden column?
$table = 'T' . (++$cnt);
@@ -676,7 +681,9 @@ function _buildSQL(&$data)
// apply data resolving?
if ($use_dataresolve && $filter['colname'] && (substr($filter['compare'], -4) == 'LIKE')) {
- $where2 .= ' ' . $filter['logic'] . ' DATARESOLVE(' . $table . '.value,' . $sqlite->getPdo()->quote($filter['colname']) . ') ' . $filter['compare'] .
+ $where2 .= ' ' . $filter['logic'] .
+ ' DATARESOLVE(' . $table . '.value,' . $sqlite->getPdo()->quote($filter['colname']) . ') ' .
+ $filter['compare'] .
" " . $filter['value']; //value is already escaped
} else {
$where2 .= ' ' . $filter['logic'] . ' ' . $table . '.value ' . $filter['compare'] .
@@ -687,7 +694,7 @@ function _buildSQL(&$data)
}
// build the query
- $sql = "SELECT " . join(', ', $select) . "
+ $sql = "SELECT " . implode(', ', $select) . "
FROM (
SELECT DISTINCT pages.pid AS pid
FROM pages $from2
@@ -712,22 +719,22 @@ function _buildSQL(&$data)
*
* @param array $data instruction by handler()
*/
- function updateSQLwithQuery(&$data)
+ public function updateSQLwithQuery(&$data)
{
if ($this->hasRequestFilter()) {
if (isset($_REQUEST['datasrt'])) {
if ($_REQUEST['datasrt'][0] == '^') {
- $data['sort'] = array(substr($_REQUEST['datasrt'], 1), 'DESC');
+ $data['sort'] = [substr($_REQUEST['datasrt'], 1), 'DESC'];
} else {
- $data['sort'] = array($_REQUEST['datasrt'], 'ASC');
+ $data['sort'] = [$_REQUEST['datasrt'], 'ASC'];
}
}
// add request filters
- $data['filter'] = array_merge($data['filter'], $this->dthlp->_get_filters());
+ $data['filter'] = array_merge($data['filter'], $this->dthlp->getFilters());
// Rebuild SQL FIXME do this smarter & faster
- $data['sql'] = $this->_buildSQL($data);
+ $data['sql'] = $this->buildSQL($data);
}
if ($data['limit'] && (int)$_REQUEST['dataofs']) {
@@ -740,7 +747,7 @@ function updateSQLwithQuery(&$data)
*
* @return bool
*/
- function hasRequestFilter()
+ public function hasRequestFilter()
{
return isset($_REQUEST['datasrt']) || isset($_REQUEST['dataflt']);
}
@@ -755,7 +762,7 @@ function hasRequestFilter()
*/
protected function parseValues($line)
{
- $values = array();
+ $values = [];
$inQuote = false;
$escapedQuote = false;
$value = '';
@@ -773,17 +780,16 @@ protected function parseValues($line)
$escapedQuote = true;
continue;
}
- array_push($values, $value);
+ $values[] = $value;
$inQuote = false;
$value = '';
continue;
-
} else {
$inQuote = true;
$value = ''; //don't store stuff before the opening quote
continue;
}
- } else if ($line[$i] == ',') {
+ } elseif ($line[$i] == ',') {
if ($inQuote) {
$value .= ',';
continue;
@@ -791,7 +797,7 @@ protected function parseValues($line)
if (strlen($value) < 1) {
continue;
}
- array_push($values, trim($value));
+ $values[] = trim($value);
$value = '';
continue;
}
@@ -800,9 +806,8 @@ protected function parseValues($line)
$value .= $line[$i];
}
if (strlen($value) > 0) {
- array_push($values, trim($value));
+ $values[] = trim($value);
}
return $values;
}
}
-
diff --git a/syntax/taglist.php b/syntax/taglist.php
index abf5238..e3fa379 100644
--- a/syntax/taglist.php
+++ b/syntax/taglist.php
@@ -1,4 +1,5 @@
Lexer->addSpecialPattern('----+ *datataglist(?: [ a-zA-Z0-9_]*)?-+\n.*?\n----+', $mode, 'plugin_data_taglist');
+ $this->Lexer->addSpecialPattern(
+ '----+ *datataglist(?: [ a-zA-Z0-9_]*)?-+\n.*?\n----+',
+ $mode,
+ 'plugin_data_taglist'
+ );
}
protected $before_item = '';
@@ -34,13 +38,11 @@ function connectTo($mode)
* @param $max int The highest count of a single tag
* @param $levels int The number of levels you want. A 5 gives levels 0 to 4.
*/
- protected function _cloud_weight(&$tags, $min, $max, $levels)
+ protected function cloudWeight(&$tags, $min, $max, $levels)
{
- parent::_cloud_weight($tags, $min, $max, $levels);
+ parent::cloudWeight($tags, $min, $max, $levels);
// sort by values. Key is name of the single tag, value the count
arsort($tags);
}
-
}
-
|
) . ' ": dokuwiki-128.png")