luxick/luxtools-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow direct=2 to treat pattern as relative to 1st path

Browse Source
This commit is contained in:
Andreas Gohr
2009-12-03 12:56:03 +01:00
committed by Adrian Lang
parent 0809416694
commit 30f6a886d8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
syntax.php
View File

@@ -394,6 +394,8 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
global $conf; global $conf;
global $ID; global $ID;
$allowed_absolute_paths = split(',', $this->getConf('allowed_absolute_paths'));
$result = array( $result = array(
'files' => array(), 'files' => array(),
'basedir' => false, 'basedir' => false,
@@ -408,6 +410,9 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
} }
// replace : with / and prepend mediadir // replace : with / and prepend mediadir
$pattern = $this->mediadir . str_replace(':', '/', $pattern); $pattern = $this->mediadir . str_replace(':', '/', $pattern);
} elseif($params['direct'] == 2){
// treat path as relative to first configured path
$pattern = $allowed_absolute_paths[0].'/'.$pattern;
} else { } else {
// if path is not absolute, precede it with DOKU_INC // if path is not absolute, precede it with DOKU_INC
if (!$this->_path_is_absolute($pattern)) { if (!$this->_path_is_absolute($pattern)) {
@@ -423,7 +428,6 @@ class syntax_plugin_filelist extends DokuWiki_Syntax_Plugin {
} }
// match pattern aginst allowed paths // match pattern aginst allowed paths
$allowed_absolute_paths = split(',', $this->getConf('allowed_absolute_paths'));
$web_paths = split(',', $this->getConf('web_paths')); $web_paths = split(',', $this->getConf('web_paths'));
$basedir = false; $basedir = false;
$webdir = false; $webdir = false;