';
}
$this->renderListItems($this->files, $params);
@@ -46,7 +46,7 @@ class Output
public function renderAsTable($params)
{
if ($this->renderer instanceof \Doku_Renderer_xhtml) {
- $this->renderer->doc .= '
';
+ $this->renderer->doc .= '
';
}
$items = $this->flattenResultTree($this->files);
@@ -277,7 +277,7 @@ class Output
protected function getLang($key)
{
- $syntax = plugin_load('syntax', 'filelist');
+ $syntax = plugin_load('syntax', 'filelistplus');
return $syntax->getLang($key);
}
}
diff --git a/Path.php b/Path.php
index 0fbb066..9ac5b88 100644
--- a/Path.php
+++ b/Path.php
@@ -1,6 +1,6 @@
$line,
- 'web' => DOKU_BASE . 'lib/plugins/filelist/file.php?root=' . rawurlencode($line) . '&file=',
+ 'web' => DOKU_BASE . 'lib/plugins/filelistplus/file.php?root=' . rawurlencode($line) . '&file=',
];
}
}
diff --git a/README b/README
index c2327f4..dd5ad88 100644
--- a/README
+++ b/README
@@ -1,12 +1,12 @@
-filelist plugin for DokuWiki
+filelistplus plugin for DokuWiki
Lists files matching a given glob pattern.
All documentation for this plugin can be found at
-https://www.dokuwiki.org/plugin:filelist
+https://www.dokuwiki.org/plugin:filelistplus
If you install this plugin manually, make sure it is installed in
-lib/plugins/filelist/ - if the folder is called different it
+lib/plugins/filelistplus/ - if the folder is called different it
will not work!
Please refer to http://www.dokuwiki.org/extensions for additional info
diff --git a/_test/GeneralTest.php b/_test/GeneralTest.php
index e22e2dc..c2dd6af 100644
--- a/_test/GeneralTest.php
+++ b/_test/GeneralTest.php
@@ -1,13 +1,13 @@
assertArrayHasKey('desc', $info);
$this->assertArrayHasKey('url', $info);
- $this->assertEquals('filelist', $info['base']);
+ $this->assertEquals('filelistplus', $info['base']);
$this->assertRegExp('/^https?:\/\//', $info['url']);
$this->assertTrue(mail_isvalid($info['email']));
$this->assertRegExp('/^\d\d\d\d-\d\d-\d\d$/', $info['date']);
@@ -61,7 +61,7 @@ class GeneralTest extends DokuWikiTest
$this->assertEquals(
gettype($conf),
gettype($meta),
- 'Both ' . DOKU_PLUGIN . 'filelist/conf/default.php and ' . DOKU_PLUGIN . 'filelist/conf/metadata.php have to exist and contain the same keys.'
+ 'Both ' . DOKU_PLUGIN . 'filelistplus/conf/default.php and ' . DOKU_PLUGIN . 'filelistplus/conf/metadata.php have to exist and contain the same keys.'
);
if ($conf !== null && $meta !== null) {
@@ -69,7 +69,7 @@ class GeneralTest extends DokuWikiTest
$this->assertArrayHasKey(
$key,
$meta,
- 'Key $meta[\'' . $key . '\'] missing in ' . DOKU_PLUGIN . 'filelist/conf/metadata.php'
+ 'Key $meta[\'' . $key . '\'] missing in ' . DOKU_PLUGIN . 'filelistplus/conf/metadata.php'
);
}
@@ -77,7 +77,7 @@ class GeneralTest extends DokuWikiTest
$this->assertArrayHasKey(
$key,
$conf,
- 'Key $conf[\'' . $key . '\'] missing in ' . DOKU_PLUGIN . 'filelist/conf/default.php'
+ 'Key $conf[\'' . $key . '\'] missing in ' . DOKU_PLUGIN . 'filelistplus/conf/default.php'
);
}
}
diff --git a/_test/PathTest.php b/_test/PathTest.php
index c020094..52cac5f 100644
--- a/_test/PathTest.php
+++ b/_test/PathTest.php
@@ -1,14 +1,14 @@
[
'root' => 'C:/xampp/htdocs/wiki/',
- 'web' => '/lib/plugins/filelist/file.php?root=C%3A%2Fxampp%2Fhtdocs%2Fwiki%2F&file=',
+ 'web' => '/lib/plugins/filelistplus/file.php?root=C%3A%2Fxampp%2Fhtdocs%2Fwiki%2F&file=',
],
'\\\\server/share/path/' => [
'root' => '\\\\server/share/path/',
- 'web' => '/lib/plugins/filelist/file.php?root=%5C%5Cserver%2Fshare%2Fpath%2F&file=',
+ 'web' => '/lib/plugins/filelistplus/file.php?root=%5C%5Cserver%2Fshare%2Fpath%2F&file=',
],
'/linux/file/path/' => [
'root' => '/linux/file/path/',
- 'web' => '/lib/plugins/filelist/file.php?root=%2Flinux%2Ffile%2Fpath%2F&file=',
+ 'web' => '/lib/plugins/filelistplus/file.php?root=%2Flinux%2Ffile%2Fpath%2F&file=',
],
'/linux/another/path/' => [
'root' => '/linux/another/path/',
diff --git a/_test/SyntaxTest.php b/_test/SyntaxTest.php
index b19e23a..47e7e9a 100644
--- a/_test/SyntaxTest.php
+++ b/_test/SyntaxTest.php
@@ -1,35 +1,35 @@
pluginsEnabled[] = 'filelist';
+ $this->pluginsEnabled[] = 'filelistplus';
parent::setUp();
// Setup config so that access to the TMP directory will be allowed
- $conf ['plugin']['filelist']['paths'] = TMP_DIR . '/filelistdata/' . "\n" . 'W> http://localhost/';
+ $conf ['plugin']['filelistplus']['paths'] = TMP_DIR . '/filelistdata/' . "\n" . 'W> http://localhost/';
}
@@ -76,7 +76,7 @@ class plugin_filelist_test extends DokuWikiTest
global $conf;
// Render filelist
- $instructions = p_get_instructions('{{filelist>' . TMP_DIR . '/filelistdata/*&style=list&direct=1}}');
+ $instructions = p_get_instructions('{{filelistplus>' . TMP_DIR . '/filelistdata/*&style=list&direct=1}}');
$xhtml = p_render('xhtml', $instructions, $info);
// We should find:
@@ -94,7 +94,7 @@ class plugin_filelist_test extends DokuWikiTest
public function test_recursive()
{
// Render filelist
- $instructions = p_get_instructions('{{filelist>' . TMP_DIR . '/filelistdata/*&style=list&direct=1&recursive=1}}');
+ $instructions = p_get_instructions('{{filelistplus>' . TMP_DIR . '/filelistdata/*&style=list&direct=1&recursive=1}}');
$xhtml = p_render('xhtml', $instructions, $info);
// We should find:
@@ -119,21 +119,21 @@ class plugin_filelist_test extends DokuWikiTest
public function testUnorderedList()
{
// Render filelist
- $instructions = p_get_instructions('{{filelist>' . TMP_DIR . '/filelistdata/*&style=list&direct=1&recursive=1}}');
+ $instructions = p_get_instructions('{{filelistplus>' . TMP_DIR . '/filelistdata/*&style=list&direct=1&recursive=1}}');
$xhtml = p_render('xhtml', $instructions, $info);
$doc = new Document();
$doc->html($xhtml);
$structure = [
- 'div.filelist-plugin' => 1,
- 'div.filelist-plugin > ul' => 1,
- 'div.filelist-plugin > ul > li' => 3,
- 'div.filelist-plugin > ul > li:nth-child(1)' => 1,
- 'div.filelist-plugin > ul > li:nth-child(1) a' => 'example.txt',
- 'div.filelist-plugin > ul > li:nth-child(2) ul' => 1,
- 'div.filelist-plugin > ul > li:nth-child(2) ul > li' => 1,
- 'div.filelist-plugin > ul > li:nth-child(2) ul > li a' => 'example2.txt',
+ 'div.filelistplus-plugin' => 1,
+ 'div.filelistplus-plugin > ul' => 1,
+ 'div.filelistplus-plugin > ul > li' => 3,
+ 'div.filelistplus-plugin > ul > li:nth-child(1)' => 1,
+ 'div.filelistplus-plugin > ul > li:nth-child(1) a' => 'example.txt',
+ 'div.filelistplus-plugin > ul > li:nth-child(2) ul' => 1,
+ 'div.filelistplus-plugin > ul > li:nth-child(2) ul > li' => 1,
+ 'div.filelistplus-plugin > ul > li:nth-child(2) ul > li a' => 'example2.txt',
];
$this->structureCheck($doc, $structure);
@@ -146,21 +146,21 @@ class plugin_filelist_test extends DokuWikiTest
public function testOrderedList()
{
// Render filelist
- $instructions = p_get_instructions('{{filelist>' . TMP_DIR . '/filelistdata/*&style=olist&direct=1&recursive=1}}');
+ $instructions = p_get_instructions('{{filelistplus>' . TMP_DIR . '/filelistdata/*&style=olist&direct=1&recursive=1}}');
$xhtml = p_render('xhtml', $instructions, $info);
$doc = new Document();
$doc->html($xhtml);
$structure = [
- 'div.filelist-plugin' => 1,
- 'div.filelist-plugin > ol' => 1,
- 'div.filelist-plugin > ol > li' => 3,
- 'div.filelist-plugin > ol > li:nth-child(1)' => 1,
- 'div.filelist-plugin > ol > li:nth-child(1) a' => 'example.txt',
- 'div.filelist-plugin > ol > li:nth-child(2) ol' => 1,
- 'div.filelist-plugin > ol > li:nth-child(2) ol > li' => 1,
- 'div.filelist-plugin > ol > li:nth-child(2) ol > li a' => 'example2.txt',
+ 'div.filelistplus-plugin' => 1,
+ 'div.filelistplus-plugin > ol' => 1,
+ 'div.filelistplus-plugin > ol > li' => 3,
+ 'div.filelistplus-plugin > ol > li:nth-child(1)' => 1,
+ 'div.filelistplus-plugin > ol > li:nth-child(1) a' => 'example.txt',
+ 'div.filelistplus-plugin > ol > li:nth-child(2) ol' => 1,
+ 'div.filelistplus-plugin > ol > li:nth-child(2) ol > li' => 1,
+ 'div.filelistplus-plugin > ol > li:nth-child(2) ol > li a' => 'example2.txt',
];
$this->structureCheck($doc, $structure);
@@ -175,19 +175,19 @@ class plugin_filelist_test extends DokuWikiTest
global $conf;
// Render filelist
- $instructions = p_get_instructions('{{filelist>' . TMP_DIR . '/filelistdata/*&style=table&direct=1&recursive=1}}');
+ $instructions = p_get_instructions('{{filelistplus>' . TMP_DIR . '/filelistdata/*&style=table&direct=1&recursive=1}}');
$xhtml = p_render('xhtml', $instructions, $info);
$doc = new Document();
$doc->html($xhtml);
$structure = [
- 'div.filelist-plugin' => 1,
- 'div.filelist-plugin table' => 1,
- 'div.filelist-plugin table > tbody > tr' => 3,
- 'div.filelist-plugin table > tbody > tr:nth-child(1) a' => 'example.txt',
- 'div.filelist-plugin table > tbody > tr:nth-child(2) a' => 'exampledir/example2.txt',
- 'div.filelist-plugin table > tbody > tr:nth-child(3) a' => 'exampleimage.png',
+ 'div.filelistplus-plugin' => 1,
+ 'div.filelistplus-plugin table' => 1,
+ 'div.filelistplus-plugin table > tbody > tr' => 3,
+ 'div.filelistplus-plugin table > tbody > tr:nth-child(1) a' => 'example.txt',
+ 'div.filelistplus-plugin table > tbody > tr:nth-child(2) a' => 'exampledir/example2.txt',
+ 'div.filelistplus-plugin table > tbody > tr:nth-child(3) a' => 'exampleimage.png',
];
$this->structureCheck($doc, $structure);
diff --git a/conf/default.php b/conf/default.php
index fc3e2af..c5db900 100644
--- a/conf/default.php
+++ b/conf/default.php
@@ -1,7 +1,7 @@
*/
diff --git a/file.php b/file.php
index ecd7740..9f4bbbe 100644
--- a/file.php
+++ b/file.php
@@ -2,7 +2,7 @@
// phpcs:disable PSR1.Files.SideEffects.FoundWithSymbols
-use dokuwiki\plugin\filelist\Path;
+use dokuwiki\plugin\filelistplus\Path;
if (!defined('DOKU_INC')) define('DOKU_INC', __DIR__ . '/../../../');
if (!defined('NOSESSION')) define('NOSESSION', true); // we do not use a session or authentication here (better caching)
@@ -11,7 +11,7 @@ require_once(DOKU_INC . 'inc/init.php');
global $INPUT;
-$syntax = plugin_load('syntax', 'filelist');
+$syntax = plugin_load('syntax', 'filelistplus');
if (!$syntax) die('plugin disabled?');
$pathUtil = new Path($syntax->getConf('paths'));
diff --git a/lang/de/settings.php b/lang/de/settings.php
index 5fa1887..f8c3751 100644
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -1,3 +1,3 @@
*/
-$lang['allow_in_comments'] = 'Of de filelist syntax toegestaan is voor gebruik in commentaar.';
+$lang['allow_in_comments'] = 'Of de filelistplus syntax toegestaan is voor gebruik in commentaar.';
$lang['defaults'] = 'Default options. Gebruik dezelfde syntax als de inline configuratie.';
$lang['extensions'] = 'Komma-gescheiden lijst van toegestane bestandsextensies voor de lijst.';
diff --git a/plugin.info.txt b/plugin.info.txt
index 5b071cc..a5f891d 100644
--- a/plugin.info.txt
+++ b/plugin.info.txt
@@ -1,7 +1,7 @@
-base filelist
-author Gina Häußge, Dokufreaks
-email freaks@dokuwiki.org
-date 2024-07-03
-name Filelist Plugin
+base filelistplus
+author Gina Häußge, Dokufreaks, luxick
+email dokuwiki@luxick.de
+date 2026-01-05
+name Filelist Plus Plugin
desc Lists files matching a given glob pattern.
-url https://www.dokuwiki.org/plugin:filelist
+url https://www.dokuwiki.org/plugin:filelistplus
diff --git a/syntax.php b/syntax.php
index fd73471..5184e05 100644
--- a/syntax.php
+++ b/syntax.php
@@ -1,17 +1,17 @@
*/
-class syntax_plugin_filelist extends SyntaxPlugin
+class syntax_plugin_filelistplus extends SyntaxPlugin
{
/** @inheritdoc */
public function getType()
@@ -34,7 +34,7 @@ class syntax_plugin_filelist extends SyntaxPlugin
/** @inheritdoc */
public function connectTo($mode)
{
- $this->Lexer->addSpecialPattern('\{\{filelist>.+?\}\}', $mode, 'plugin_filelist');
+ $this->Lexer->addSpecialPattern('\{\{filelistplus>.+?\}\}', $mode, 'plugin_filelistplus');
}
/** @inheritdoc */
@@ -47,7 +47,7 @@ class syntax_plugin_filelist extends SyntaxPlugin
return false;
}
- $match = substr($match, strlen('{{filelist>'), -2);
+ $match = substr($match, strlen('{{filelistplus>'), -2);
[$path, $flags] = explode('&', $match, 2);
// load default config options