Skip to content

added optional option skipns for simplenavi call #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
solewniczak wants to merge 4 commits into
base: master
Choose a base branch
from
Open

added optional option skipns for simplenavi call #14

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9451824
added optional option skipns for simplenavi call
Jun 19, 2017
e3e81f9
fix indentation
Jun 19, 2017
021184e
Merge branch 'master' into skipns
Apr 7, 2018
26a45cf
Merge branch 'master' into skipns
Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions syntax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
* @license GPL 2 http://www.gnu.org/licenses/gpl-2.0.html
* @author Andreas Gohr <gohr@cosmocode.de>
* @author Szymon Olewniczak <solewniczak@rid.pl>
*/

// must be run within Dokuwiki
Expand Down Expand Up @@ -35,7 +36,18 @@ function connectTo($mode) {
}

function handle($match, $state, $pos, Doku_Handler $handler){
$data = array(cleanID(substr($match,13,-2)));
list($nsstr, $optsstr) = explode('|', substr($match,13,-2), 2);

//defaults
$opts = array(
'skipns' => ''
);

if(preg_match('/skipns=(\S+)/u', $optsstr, $sns) > 0) {
$opts['skipns'] = $sns[1];
}

$data = array(cleanID($nsstr), $opts);

return $data;
}
Expand All @@ -46,10 +58,13 @@ function render($mode, Doku_Renderer $R, $pass) {
global $conf;
global $INFO;
$R->info['cache'] = false;

list($nsstr, $opts) = $pass;

$ns = utf8_encodeFN(str_replace(':','/',$pass[0]));
$ns = utf8_encodeFN(str_replace(':','/',$nsstr));
$data = array();
search($data,$conf['datadir'],array($this,'_search'),array('ns' => $INFO['id']),$ns,1,'natural');
$opts['ns'] = $INFO['id'];
search($data,$conf['datadir'],array($this,'_search'),$opts,$ns,1,'natural');
if ($this->getConf('sortByTitle') == true) {
$this->_sortByTitle($data,"id");
} else {
Expand Down Expand Up @@ -133,6 +148,11 @@ function _search(&$data,$base,$file,$type,$lvl,$opts){
if($type=='f' && auth_quickaclcheck($id) < AUTH_READ){
return false;
}

//check skipns
if(!empty($opts['skipns']) && preg_match('/'.$opts['skipns'].'/ui',':'.$id)){
return false;
}

$data[$id]=array( 'id' => $id,
'type' => $type,
Expand Down