systemausfall.org/moin2doku
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

put media files to output dir instead of directly overwriting dokuwiki target dir

Browse source
This commit is contained in:
Elan Ruusamäe 2012-09-17 23:56:40 +02:00
parent 800196e92d
commit 65786931b9
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doku.php
View file

@ -17,20 +17,22 @@ require_once DOKU_INC.'inc/init.php';
require_once DOKU_INC.'inc/common.php';
require_once DOKU_INC.'inc/cliopts.php';
function strip_datadir($fn) {
function strip_dir($dir, $fn) {
global $conf;
return end(explode($conf['datadir'].'/', $fn, 2));
return end(explode($dir.'/', $fn, 2));
}
$fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
switch ($argv[1]) {
case 'cleanID':
echo cleanID($argv[2]);
break;
case 'wikiFN':
echo strip_datadir(wikiFN($argv[2]));
echo strip_dir($conf['datadir'], wikiFN($argv[2]));
break;
case 'mediaFn':
echo mediaFn($argv[2]);
case 'mediaFN':
echo strip_dir($conf['mediadir'], mediaFN($argv[2]));
break;
case 'getNS':
echo getNS($argv[2]);