Compare commits

..

7 Commits

  1. 9
      README.md
  2. 1
      conf/default.php
  3. 2
      conf/metadata.php
  4. 16
      lang/de/lang.php
  5. 17
      lang/de/settings.php
  6. 7
      lang/en/settings.php
  7. 2
      lang/ru/lang.php
  8. 7
      lang/ru/settings.php
  9. 4
      plugin.info.txt
  10. 165
      syntax.php

@ -1,4 +1,13 @@
# sqlquery
A dokuwiki plugin for processing query to MySQL databases and display results as a table.
This is a improved version which cann connect to different hosts
and databases. The defaults are set in the plugin configuration.
Different types, hosts and databases can be set inside the tag:
```
<sql type=mysql host=myhost db=mydb>
SELECT foo FROM bar ORDER BY baz
<sql>
```
More information at https://www.dokuwiki.org/plugin:sqlquery

@ -7,6 +7,7 @@
//$conf['fixme'] = 'FIXME';
$conf['type'] = 'mysql';
$conf['Host'] = 'localhost';
$conf['DB'] = '';
$conf['user'] = '';

@ -5,7 +5,7 @@
* @author George Pirogov <i1557@yandex.ru>
*/
$meta['type'] = array('multichoice', '_choices' => array('mysql', 'dblib'));
$meta['Host'] = array('string');
$meta['DB'] = array('string');
$meta['user'] = array('string');

@ -0,0 +1,16 @@
<?php
/**
* German language file for sqlquery plugin
*
* @author Thomas Hooge <thomas@hoogi.de>
*/
// menu entry for admin plugins
// $lang['menu'] = 'Your menu entry';
// custom language strings for the plugin
// $lang['fixme'] = 'FIXME';
//Setup VIM: ex: et ts=4 :

@ -0,0 +1,17 @@
<?php
/**
* German language file for sqlquery plugin
*
* @author Thomas Hooge <thomas@hoogi.de>
*/
// keys need to match the config setting name
$lang['type'] = 'DSN-Prefix (Datenbanktyp)';
$lang['Host'] = 'Standard MySQL-Serveradresse (DNS or IP)';
$lang['DB'] = 'Standard MySQL-Datenbankname';
$lang['user'] = 'Datenbankbenutzername';
$lang['password'] = 'Datenbankkennwort';
//Setup VIM: ex: et ts=4 :

@ -1,6 +1,6 @@
<?php
/**
* english language file for sqlquery plugin
* English language file for sqlquery plugin
*
* @author George Pirogov <i1557@yandex.ru>
*/
@ -8,6 +8,11 @@
// keys need to match the config setting name
// $lang['fixme'] = 'FIXME';
$lang['type'] = 'DSN prefix (database type)';
$lang['Host'] = 'Default MySQL server address (DNS or IP)';
$lang['DB'] = 'MySQL database name';
$lang['user'] = 'Database username';
$lang['password'] = 'Database password';
//Setup VIM: ex: et ts=4 :

@ -1,6 +1,6 @@
<?php
/**
* English language file for sqlquery plugin
* Russian language file for sqlquery plugin
*
* @author George Pirogov <i1557@yandex.ru>
*/

@ -1,6 +1,6 @@
<?php
/**
* english language file for sqlquery plugin
* Russian language file for sqlquery plugin
*
* @author George Pirogov <i1557@yandex.ru>
*/
@ -8,8 +8,9 @@
// keys need to match the config setting name
// $lang['fixme'] = 'FIXME';
$lang['Host'] = 'Адрес MySQL сервера (dns или ip)';
$lang['DB'] = 'Имя базы данных MySQL';
$lang['type'] = 'Префикс DSN (тип базы данных)';
$lang['Host'] = 'Адрес MySQL сервера по умолчанию (DNS или IP)';
$lang['DB'] = 'Имя базы данных MySQL по умолчанию';
$lang['user'] = 'Логин';
$lang['password'] = 'Пароль';

@ -1,7 +1,7 @@
base sqlquery
author George Pirogov
email i1557@yandex.ru
date 2016-11-25
name SQL query plugin
date 2018-12-12
name SQL query plugin (multidb)
desc Processing query to mysql database and display results as a table.
url https://www.dokuwiki.org/plugin:sqlquery

@ -4,29 +4,26 @@
*
* @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
* @author George Pirogov <i1557@yandex.ru>
* @author Thomas Hooge <hooge@rowa-group.com>
*
*/
// must be run within Dokuwiki
if (!defined('DOKU_INC')) die();
/**
* All DokuWiki plugins to extend the parser/rendering mechanism
* need to inherit from this class
*/
class syntax_plugin_sqlquery extends DokuWiki_Syntax_Plugin {
public function getType() {
return 'substition';
}
public function getSort() {
return 666;
}
public function getType() { return 'substition'; }
public function getSort() { return 666; }
public function getPType() { return 'block'; }
public function connectTo($mode)
{
$this->Lexer->addEntryPattern('<sql>', $mode, 'plugin_sqlquery');
}
public function postConnect()
{
$this->Lexer->addExitPattern('</sql>','plugin_sqlquery');
$this->Lexer->addSpecialPattern('<sql\b(?:\s+(?:host|db|type)=[\w\-\.$]+?)*\s*>(?:.*?</sql>)', $mode, 'plugin_sqlquery');
}
/**
@ -36,29 +33,36 @@ class syntax_plugin_sqlquery extends DokuWiki_Syntax_Plugin {
* @param int $state The state of the handler
* @param int $pos The position in the document
* @param Doku_Handler $handler The handler
*
* @return array Data for the renderer
*/
public function handle($match, $state, $pos, Doku_Handler $handler)
{
switch ( $state )
{
case DOKU_LEXER_ENTER:
$data = array();
return $data;
break;
case DOKU_LEXER_UNMATCHED:
return array('sqlquery' => $match);
break;
case DOKU_LEXER_EXIT:
$data = array();
return $data;
break;
public function handle($match, $state, $pos, Doku_Handler $handler) {
$data = array('state' => $state);
if ($state == DOKU_LEXER_SPECIAL) {
# get type (DSN prefix)
if (preg_match('/<sql\b.*type=(mysql|dblib)/', $match, $result)) {
$data['type'] = $result[1];
} else {
$data['type'] = $this->getConf('type');
}
# get host
if (preg_match('/<sql\b.*host=([\w\-\.$]+)/', $match, $result)) {
$data['host'] = $result[1];
} else {
$data['host'] = $this->getConf('Host');
}
# get database
if (preg_match('/<sql\b.*db=([\w\-\.$]+)/', $match, $result)) {
$data['db'] = $result[1];
} else {
$data['db'] = $this->getConf('DB');
}
# get query
$data['match'] = $match;
if (preg_match('%<sql.*?>(.*)</sql>%s', $match, $result)) {
$data['query'] = trim($result[1]);
}
}
$data = array();
return $data;
}
@ -68,72 +72,73 @@ class syntax_plugin_sqlquery extends DokuWiki_Syntax_Plugin {
* @param string $mode Renderer mode (supported modes: xhtml)
* @param Doku_Renderer $renderer The renderer
* @param array $data The data from the handler() function
*
* @return bool If rendering was successful.
*/
public function render($mode, Doku_Renderer $renderer, $data)
{
if ( $mode != 'xhtml' ) return false;
if ($mode != 'xhtml') return false;
if (empty($data['query'])) return true;
if ( !empty( $data['sqlquery'] ) )
{
// получаем параметры конфигурации
$host = $this->getConf('Host');
$DB = $this->getConf('DB');
// get configuration
$user = $this->getConf('user');
$password = $this->getConf('password');
// получаем запрос
$querystring = $data['sqlquery'];
// подключаемся к базе
$link = mysqli_connect($host, $user, $password, $DB);
mysqli_set_charset($link, "utf8");
// connect to database
$dsn = "{$data['type']}:host={$data['host']};dbname={$data[db]};charset=UTF-8;";
try {
$dbh = new PDO($dsn, $user, $password);
} catch (PDOException $e) {
$renderer->doc .= "<pre>Unable to connect ro database:" . $e->getMessage() . "</pre>\n";
return true;
}
$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$dbh->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_NUM);
// run query
try {
$result = $dbh->query($data['query']);
} catch (PDOException $e) {
$renderer->doc .= "<pre>Error in query:" . $e->getMessage() . "</pre>\n";
return true;
}
// подключились
if ( $link )
{
$result = mysqli_query($link, $querystring);
if ( $result )
{
// получаем кол-во полей в таблице
$fieldcount = mysqli_num_fields($result);
// get the number of fields in the table
$fieldcount = $result->columnCount();
// строим таблицу
$renderer->doc .= "<table id=\"sqlquerytable\" class=\"inline\">";
// build a table
$renderer->doc .= '<table id="sqlquerytable" class="inline">' . "\n";
// строим заголовок
// build the header section of the table
$renderer->doc .= "<thead><tr>";
while ($fieldinfo = mysqli_fetch_field($result))
{
for ($i = 0; $i < $fieldcount; $i++) {
$meta = $result->getColumnMeta($i);
$renderer->doc .= "<th>";
$renderer->doc .= $fieldinfo->name;
$renderer->doc .= $meta['name'];
$renderer->doc .= "</th>";
}
$renderer->doc .= "</tr></thead>";
$renderer->doc .= "</tr></thead>\n";
// строим содержимое таблицы
$renderer->doc .= "<tbody>";
while ($row = mysqli_fetch_row($result))
{
// build the contents of the table
$renderer->doc .= "<tbody>\n";
foreach ($result as $row) {
$renderer->doc .= "<tr>";
// строим строку
for ( $i = 0; $i < $fieldcount; $i++ )
{
for ( $i = 0; $i < $fieldcount; $i++ ) {
$renderer->doc .= "<td>";
$renderer->doc .= $row[$i];
$renderer->doc .= htmlentities($row[$i]);
$renderer->doc .= "</td>";
}
$renderer->doc .= "</tr>";
} // of while fetch_row
// закрываем таблицу
$renderer->doc .= "</tbody></table>";
} // of mysqli_query
mysqli_close($link);
} // of mysqli link
} // of sqlquery not empty
$renderer->doc .= "</tr>\n";
}
// finish the table
$renderer->doc .= "</tbody>\n</table>\n";
// Close connection, there is no close() method with PDO :-(
$result = null;
$dbh = null;
return true;
} // of render function
}
}
// vim:ts=4:sw=4:et: