From 9c6354e5be3db406fa7f0966d65063e1d3b4d242 Mon Sep 17 00:00:00 2001
From: Tobias Sarnowski <tobias@trustedco.de>
Date: Wed, 18 Apr 2012 18:04:25 +0000
Subject: [PATCH] use original conf directory and only shadow special files

https://github.com/splitbrain/dokuwiki/pull/96#issuecomment-5195756
---
 _test/bootstrap.php                           |  11 +-
 .../conf/{acl.auth.php.dist => acl.auth.php}  |   0
 _test/conf/acronyms.conf                      | 145 ----------
 _test/conf/dokuwiki.php                       | 171 ------------
 _test/conf/entities.conf                      |  22 --
 _test/conf/interwiki.conf                     | 131 ---------
 _test/conf/license.php                        |  36 ---
 _test/conf/local.php                          |   8 +-
 _test/conf/local.php.dist                     |  16 --
 _test/conf/mediameta.php                      |  91 -------
 _test/conf/mime.conf                          |  64 -----
 _test/conf/mysql.conf.php.example             | 253 ------------------
 _test/conf/plugins.php                        |   6 -
 _test/conf/plugins.required.php               |  11 -
 _test/conf/scheme.conf                        |  11 -
 _test/conf/smileys.conf                       |  28 --
 .../{users.auth.php.dist => users.auth.php}   |   4 +-
 _test/conf/wordblock.conf                     |  32 ---
 _test/core/TestUtils.php                      |   4 +-
 19 files changed, 21 insertions(+), 1023 deletions(-)
 rename _test/conf/{acl.auth.php.dist => acl.auth.php} (100%)
 delete mode 100644 _test/conf/acronyms.conf
 delete mode 100644 _test/conf/dokuwiki.php
 delete mode 100644 _test/conf/entities.conf
 delete mode 100644 _test/conf/interwiki.conf
 delete mode 100644 _test/conf/license.php
 delete mode 100644 _test/conf/local.php.dist
 delete mode 100644 _test/conf/mediameta.php
 delete mode 100644 _test/conf/mime.conf
 delete mode 100644 _test/conf/mysql.conf.php.example
 delete mode 100644 _test/conf/plugins.php
 delete mode 100644 _test/conf/plugins.required.php
 delete mode 100644 _test/conf/scheme.conf
 delete mode 100644 _test/conf/smileys.conf
 rename _test/conf/{users.auth.php.dist => users.auth.php} (60%)
 delete mode 100644 _test/conf/wordblock.conf

diff --git a/_test/bootstrap.php b/_test/bootstrap.php
index f8ca4d483..6c3d6aaa8 100644
--- a/_test/bootstrap.php
+++ b/_test/bootstrap.php
@@ -71,11 +71,16 @@ $default_server_vars = array(
 mkdir(TMP_DIR);
 
 // cleanup dir after exit
-register_shutdown_function(function() {
-    TestUtils::rdelete(TMP_DIR);
-});
+if (getenv('PRESERVE_TMP') != 'true') {
+    register_shutdown_function(function() {
+        TestUtils::rdelete(TMP_DIR);
+    });
+} else {
+    echo ">>>> Preserving temporary directory: ".TMP_DIR."\n";
+}
 
 // populate default dirs
+TestUtils::rcopy(TMP_DIR, DOKU_INC.'/conf');
 TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/conf');
 TestUtils::rcopy(TMP_DIR, dirname(__FILE__).'/data');
 
diff --git a/_test/conf/acl.auth.php.dist b/_test/conf/acl.auth.php
similarity index 100%
rename from _test/conf/acl.auth.php.dist
rename to _test/conf/acl.auth.php
diff --git a/_test/conf/acronyms.conf b/_test/conf/acronyms.conf
deleted file mode 100644
index 058e85550..000000000
--- a/_test/conf/acronyms.conf
+++ /dev/null
@@ -1,145 +0,0 @@
-# Acronyms.
-
-ACL          Access Control List
-AFAICS       As far as I can see
-AFAIK        As far as I know
-AFAIR        As far as I remember
-AJAX         Asynchronous JavaScript and XML
-AIM          AOL (America Online) Instant Messenger
-AOL          America Online
-API          Application Programming Interface
-ASAP         As soon as possible
-ASCII        American Standard Code for Information Interchange
-ASP          Active Server Pages
-BTW          By the way
-CGI          Common Gateway Interface
-CMS          Content Management System
-CSS          Cascading Style Sheets
-CVS          Concurrent Versions System
-DBA          Database Administrator
-DHCP         Dynamic Host Configuration Protocol
-DHTML        Dynamic HyperText Markup Language
-DMCA         Digital Millenium Copyright Act
-DNS          Domain Name System
-DOM          Document Object Model
-DTD          Document Type Definition
-EOF          End of file
-EOL          End of line
-EOM          End of message
-EOT          End of text
-ESMTP        Extended Simple Mail Transfer Protocol
-FAQ          Frequently Asked Questions
-FDL          GNU Free Documentation License
-FTP          File Transfer Protocol
-FOSS         Free & Open-Source Software
-FLOSS        Free/Libre and Open Source Software
-FUD          Fear, Uncertainty, and Doubt
-GB           Gigabyte
-GHz          Gigahertz
-GIF          Graphics Interchange Format
-GPL          GNU General Public License
-GUI          Graphical User Interface
-HTML         HyperText Markup Language
-HTTP         Hyper Text Transfer Protocol
-IANAL        I am not a lawyer (but)
-ICANN        Internet Corporation for Assigned Names and Numbers
-ICQ          I seek you (Instant Messenger)
-IE5          Internet Explorer 5
-IE6          Internet Explorer 6
-IE           Internet Explorer
-IIRC         If I remember correctly
-IIS          Internet Information Services
-IMAP         Internet Message Access Protocol
-IMHO         In my humble opinion
-IMO          In my opinion
-IOW          In other words
-IRC          Internet Relay Chat
-IRL          In real life
-ISO          International Organization for Standardization
-ISP          Internet Service Provider
-JDK          Java Development Kit
-JPEG         Joint Photographics Experts Group
-JPG          Joint Photographics Experts Group
-JS           JavaScript
-KISS         Keep it simple stupid
-LAN          Local Area Network
-LDAP         Lightweight Directory Access Protocol
-LGPL         GNU Lesser General Public License
-LOL          Laughing out loud
-MathML       Mathematical Markup Language
-MB           Megabyte
-MHz          Megahertz
-MIME         Multipurpose Internet Mail Extension
-MIT          Massachusetts Institute of Technology
-MML          Mathematical Markup Language
-MP3          Moving Picture Experts Group Layer 3
-MPEG         Moving Picture Experts Group
-MSDN         Microsoft Developer Network
-MS           Microsoft
-MSIE         Microsoft Internet Explorer
-NIS          Network Information Service
-NS4.7        Netscape 4.7
-NS4          Netscape 4
-NS6          Netscape 6
-NS7          Netscape 7
-OMG          Oh my God
-OPML         Outline Processor Markup Language
-OS           Operating System
-OSS          Open Source Software
-OTOH         On the other hand
-P2P          Peer to Peer
-PDA          Personal Digital Assistant
-PDF          Portable Document Format
-Perl         Practical Extraction and Report Language
-PERL         Practical Extraction and Report Language
-PHP          Hypertext Preprocessor
-PICS         Platform for Internet Content Selection
-PIN          Personal Identification Number
-PITA         Pain in the Ass
-PNG          Portable Network Graphics
-POP3         Post Office Protocol 3
-POP          Post Office Protocol
-QoS          Quality of Service
-RAID         Redundant Array of Inexpensive Disks
-RDF          Resource Description Framework
-RFC          Request for Comments
-ROTFL        Rolling on the floor laughing
-RPC          Remote Procedure Call
-RSS          Rich Site Summary
-RTFM         Read The Fine Manual
-RTF          Rich Text File
-SCSI         Small Computer System Interface
-SDK          Software Development Kit
-SGML         Standard General Markup Language
-SMIL         Synchronized Multimedia Integration Language
-SMTP         Simple Mail Transfer Protocol
-SOAP         Simple Object Access Protocol
-spec         specification
-SQL          Structured Query Language
-SSH          Secure Shell
-SSI          Server Side Includes
-SSL          Secure Sockets Layer
-SVG          Scalable Vector Graphics
-TIA          Thanks in advance
-TIFF         Tagged Image File Format
-TLD          Top Level Domain
-TOC          Table of Contents
-URI          Uniform Resource Identifier
-URL          Uniform Resource Locator
-URN          Uniform Resource Name
-VBA          Visual Basic for Applications
-VB           Visual Basic
-W3C          World Wide Web Consortium
-WAN          Wide Area Network
-WAP          Wireless Access Protocol
-WML          Wireless Markup Language
-WTF?         What the f***
-WWW          World Wide Web
-WYSIWYG      What You See Is What You Get
-XHTML        Extensible HyperText Markup Language
-XML          Extensible Markup Language
-XSD          XML (Extensible Markup Language) Schema Definition
-XSL          Extensible Stylesheet Language
-XSLT         Extensible Stylesheet Language Transformations
-XUL          XML User Interface Language
-YMMV         Your mileage may vary
diff --git a/_test/conf/dokuwiki.php b/_test/conf/dokuwiki.php
deleted file mode 100644
index 5c0b28114..000000000
--- a/_test/conf/dokuwiki.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * This is DokuWiki's Main Configuration file
- *
- * All the default values are kept here, you should not modify it but use
- * a local.php file instead to override the settings from here.
- *
- * This is a piece of PHP code so PHP syntax applies!
- *
- * For help with the configuration see http://www.dokuwiki.org/config
- */
-
-
-/* Datastorage and Permissions */
-
-$conf['fmode']       = 0644;              //set file creation mode
-$conf['dmode']       = 0755;              //set directory creation mode
-$conf['lang']        = 'en';              //your language
-$conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
-$conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
-$conf['cookiedir']   = '';                //Cookie path. Leave blank for using baseurl.
-$conf['savedir']     = './data';          //where to store all the files
-$conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
-$conf['mediarevisions'] = 1;              //enable/disable media revisions
-
-/* Display Options */
-
-$conf['start']       = 'start';           //name of start page
-$conf['title']       = 'DokuWiki';        //what to show in the title
-$conf['template']    = 'dokuwiki';        //see lib/tpl directory
-$conf['tagline']     = '';                //tagline in header (if template supports it)
-$conf['sidebar']     = 'sidebar';         //name of sidebar in root namespace (if template supports it)
-$conf['license']     = 'cc-by-nc-sa';     //see conf/license.php
-$conf['fullpath']    = 0;                 //show full path of the document or relative to datadir only? 0|1
-$conf['recent']      = 20;                //how many entries to show in recent
-$conf['breadcrumbs'] = 10;                //how many recent visited pages to show
-$conf['youarehere']  = 0;                 //show "You are here" navigation? 0|1
-$conf['typography']  = 1;                 //smartquote conversion 0=off, 1=doublequotes, 2=all quotes
-$conf['htmlok']      = 0;                 //may raw HTML be embedded? This may break layout and XHTML validity 0|1
-$conf['phpok']       = 0;                 //may PHP code be embedded? Never do this on the internet! 0|1
-$conf['dformat']     = '%Y/%m/%d %H:%M';  //dateformat accepted by PHPs strftime() function
-$conf['signature']   = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki:config for details
-$conf['toptoclevel'] = 1;                 //Level starting with and below to include in AutoTOC (max. 5)
-$conf['tocminheads'] = 3;                 //Minimum amount of headlines that determines if a TOC is built
-$conf['maxtoclevel'] = 3;                 //Up to which level include into AutoTOC (max. 5)
-$conf['maxseclevel'] = 3;                 //Up to which level create editable sections (max. 5)
-$conf['camelcase']   = 0;                 //Use CamelCase for linking? (I don't like it) 0|1
-$conf['deaccent']    = 1;                 //deaccented chars in pagenames (1) or romanize (2) or keep (0)?
-$conf['useheading']  = 0;                 //use the first heading in a page as its name
-$conf['refcheck']    = 1;                 //check for references before deleting media files
-$conf['refshow']     = 0;                 //how many references should be shown, 5 is a good value
-$conf['showuseras']  = 'loginname';       // 'loginname' users login name
-                                          // 'username' users full name
-                                          // 'email' e-mail address (will be obfuscated as per mailguard)
-                                          // 'email_link' e-mail address as a mailto: link (obfuscated)
-
-/* Antispam Features */
-
-$conf['usewordblock']= 1;                 //block spam based on words? 0|1
-$conf['indexdelay']  = 60*60*24*5;        //allow indexing after this time (seconds) default is 5 days
-$conf['relnofollow'] = 1;                 //use rel="nofollow" for external links?
-$conf['mailguard']   = 'hex';             //obfuscate email addresses against spam harvesters?
-                                          //valid entries are:
-                                          //  'visible' - replace @ with [at], . with [dot] and - with [dash]
-                                          //  'hex'     - use hex entities to encode the mail address
-                                          //  'none'    - do not obfuscate addresses
-$conf['iexssprotect']= 1;                 // check for JavaScript and HTML in uploaded files 0|1
-
-/* Authentication Options - read http://www.splitbrain.org/dokuwiki/wiki:acl */
-
-$conf['useacl']      = 0;                //Use Access Control Lists to restrict access?
-$conf['autopasswd']  = 1;                //autogenerate passwords and email them to user
-$conf['authtype']    = 'plain';          //which authentication backend should be used
-$conf['passcrypt']   = 'smd5';           //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411)
-$conf['defaultgroup']= 'user';           //Default groups new Users are added to
-$conf['superuser']   = '!!not set!!';    //The admin can be user or @group or comma separated list user1,@group1,user2
-$conf['manager']     = '!!not set!!';    //The manager can be user or @group or comma separated list user1,@group1,user2
-$conf['profileconfirm'] = 1;             //Require current password to confirm changes to user profile
-$conf['disableactions'] = '';            //comma separated list of actions to disable
-$conf['sneaky_index']   = 0;             //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior)
-$conf['auth_security_timeout'] = 900;    //time (seconds) auth data is considered valid, set to 0 to recheck on every page view
-$conf['securecookie'] = 1;               //never send HTTPS cookies via HTTP
-
-$conf['remote']      = 0;                //Enable/disable remote interfaces
-$conf['remoteuser']  = '!!not set !!';   //user/groups that have access to remote interface (comma separated)
-
-/* Advanced Options */
-
-$conf['updatecheck'] = 1;                //automatically check for new releases?
-$conf['userewrite']  = 0;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
-$conf['useslash']    = 0;                //use slash instead of colon? only when rewrite is on
-$conf['usedraft']    = 1;                //automatically save a draft while editing (0|1)
-$conf['sepchar']     = '_';              //word separator character in page names; may be a
-                                         //  letter, a digit, '_', '-', or '.'.
-$conf['canonical']   = 0;                //Should all URLs use full canonical http://... style?
-$conf['fnencode']    = 'url';            //encode filenames (url|safe|utf-8)
-$conf['autoplural']  = 0;                //try (non)plural form of nonexisting files?
-$conf['compression'] = 'gz';             //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip)
-                                         //  bz2 generates smaller files, but needs more cpu-power
-$conf['cachetime']   = 60*60*24;         //maximum age for cachefile in seconds (defaults to a day)
-$conf['locktime']    = 15*60;            //maximum age for lockfiles (defaults to 15 minutes)
-$conf['fetchsize']   = 0;                //maximum size (bytes) fetch.php may download from extern, disabled by default
-$conf['notify']      = '';               //send change info to this email (leave blank for nobody)
-$conf['registernotify'] = '';            //send info about newly registered users to this email (leave blank for nobody)
-$conf['mailfrom']    = '';               //use this email when sending mails
-$conf['mailprefix']  = '';               //use this as prefix of outgoing mails
-$conf['gzip_output'] = 0;                //use gzip content encodeing for the output xhtml (if allowed by browser)
-$conf['gdlib']       = 2;                //the GDlib version (0, 1 or 2) 2 tries to autodetect
-$conf['im_convert']  = '';               //path to ImageMagicks convert (will be used instead of GD)
-$conf['jpg_quality'] = '70';             //quality of compression when scaling jpg images (0-100)
-$conf['subscribers'] = 0;                //enable change notice subscription support
-$conf['subscribe_time'] = 24*60*60;      //Time after which digests / lists are sent (in sec, default 1 day)
-                                         //Should be smaller than the time specified in recent_days
-$conf['compress']    = 1;                //Strip whitespaces and comments from Styles and JavaScript? 1|0
-$conf['cssdatauri']  = 0;                //Maximum byte size of small images to embed into CSS, won't work on IE<8
-$conf['hidepages']   = '';               //Regexp for pages to be skipped from RSS, Search and Recent Changes
-$conf['send404']     = 0;                //Send a HTTP 404 status for non existing pages?
-$conf['sitemap']     = 0;                //Create a google sitemap? How often? In days.
-$conf['rss_type']    = 'rss1';           //type of RSS feed to provide, by default:
-                                         //  'rss'  - RSS 0.91
-                                         //  'rss1' - RSS 1.0
-                                         //  'rss2' - RSS 2.0
-                                         //  'atom' - Atom 0.3
-                                         //  'atom1' - Atom 1.0
-$conf['rss_linkto'] = 'diff';            //what page RSS entries link to:
-                                         //  'diff'    - page showing revision differences
-                                         //  'page'    - the revised page itself
-                                         //  'rev'     - page showing all revisions
-                                         //  'current' - most recent revision of page
-$conf['rss_content'] = 'abstract';       //what to put in the items by default?
-                                         //  'abstract' - plain text, first paragraph or so
-                                         //  'diff'     - plain text unified diff wrapped in <pre> tags
-                                         //  'htmldiff' - diff as HTML table
-                                         //  'html'     - the full page rendered in XHTML
-$conf['rss_media']   = 'both';           //what should be listed?
-                                         //  'both'     - page and media changes
-                                         //  'pages'    - page changes only
-                                         //  'media'    - media changes only
-$conf['rss_update'] = 5*60;              //Update the RSS feed every n seconds (defaults to 5 minutes)
-$conf['rss_show_summary'] = 1;           //Add revision summary to title? 0|1
-$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
-$conf['broken_iua']  = 0;                //Platform with broken ignore_user_abort (IIS+CGI) 0|1
-$conf['xsendfile']   = 0;                //Use X-Sendfile (1 = lighttpd, 2 = standard)
-$conf['renderer_xhtml'] = 'xhtml';       //renderer to use for main page generation
-$conf['rememberme'] = 1;                 //Enable/disable remember me on login
-
-//Set target to use when creating links - leave empty for same window
-$conf['target']['wiki']      = '';
-$conf['target']['interwiki'] = '';
-$conf['target']['extern']    = '';
-$conf['target']['media']     = '';
-$conf['target']['windows']   = '';
-
-//Proxy setup - if your Server needs a proxy to access the web set these
-$conf['proxy']['host']    = '';
-$conf['proxy']['port']    = '';
-$conf['proxy']['user']    = '';
-$conf['proxy']['pass']    = '';
-$conf['proxy']['ssl']     = 0;
-$conf['proxy']['except']  = '';
-
-/* Safemode Hack */
-
-$conf['safemodehack'] = 0;               //read http://www.dokuwiki.org/config:safemodehack !
-$conf['ftp']['host'] = 'localhost';
-$conf['ftp']['port'] = '21';
-$conf['ftp']['user'] = 'user';
-$conf['ftp']['pass'] = 'password';
-$conf['ftp']['root'] = '/home/user/htdocs';
-
-$conf['readdircache'] = 0;               //time cache in second for the readdir opération, 0 to deactivate.
diff --git a/_test/conf/entities.conf b/_test/conf/entities.conf
deleted file mode 100644
index be9ed6d40..000000000
--- a/_test/conf/entities.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Typography replacements
-#
-# Order does matter!
-#
-# You can use HTML entities here, but it is not recomended because it may break
-# non-HTML renderers. Use UTF-8 chars directly instead.
-
-<->     ↔
-->      →
-<-      ←
-<=>     ⇔
-=>      ⇒
-<=      ⇐
->>      »
-<<      «
----     —
---      –
-(c)     ©
-(tm)    â„¢
-(r)     ®
-...     …
-
diff --git a/_test/conf/interwiki.conf b/_test/conf/interwiki.conf
deleted file mode 100644
index 28d603de2..000000000
--- a/_test/conf/interwiki.conf
+++ /dev/null
@@ -1,131 +0,0 @@
-# Each URL may contain one of the placeholders {URL} or {NAME}
-# {URL}  is replaced by the URL encoded representation of the wikiname
-#        this is the right thing to do in most cases
-# {NAME} this is replaced by the wikiname as given in the document
-#        no further encoding is done
-# If no placeholder is defined the urlencoded name is appended to the URL
-
-# To prevent losing your added InterWiki shortcuts after an upgrade, 
-# you should add new ones to interwiki.local.conf
-
-wp        http://en.wikipedia.org/wiki/{NAME}
-wpfr      http://fr.wikipedia.org/wiki/{NAME}
-wpde      http://de.wikipedia.org/wiki/{NAME}
-wpes      http://es.wikipedia.org/wiki/{NAME}
-wppl      http://pl.wikipedia.org/wiki/{NAME}
-wpjp      http://ja.wikipedia.org/wiki/{NAME}
-wpmeta    http://meta.wikipedia.org/wiki/{NAME}
-doku      http://www.dokuwiki.org/
-dokubug   http://bugs.dokuwiki.org/index.php?do=details&amp;task_id=
-rfc       http://www.cs.ccu.edu.tw/~chm91u/rfc2html.php?in=
-man       http://man.cx/
-amazon    http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/
-amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
-amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/
-paypal    https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=
-phpfn     http://www.php.net/{NAME}
-coral     http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY}
-freecache http://freecache.org/{NAME}
-sb        http://www.splitbrain.org/go/
-skype     skype:{NAME}
-google.de http://www.google.de/search?q=
-go        http://www.google.com/search?q={URL}&amp;btnI=lucky
-
-# To support VoIP/SIP links
-callto    callto://{NAME}
-
-# Standards from http://usemod.com/intermap.txt follow
-
-AbbeNormal      http://www.ourpla.net/cgi-bin/pikie.cgi?
-AcadWiki        http://xarch.tu-graz.ac.at/autocad/wiki/
-Acronym         http://www.acronymfinder.com/af-query.asp?String=exact&amp;Acronym=
-Advogato        http://www.advogato.org/
-AIWiki          http://www.ifi.unizh.ch/ailab/aiwiki/aiw.cgi?
-ALife           http://news.alife.org/wiki/index.php?
-AndStuff        http://andstuff.org/wiki.php?
-Annotation      http://bayle.stanford.edu/crit/nph-med.cgi/
-AnnotationWiki  http://www.seedwiki.com/page.cfm?wikiid=368&amp;doc=
-AwarenessWiki   http://taoriver.net/aware/
-BenefitsWiki    http://www.benefitslink.com/cgi-bin/wiki.cgi?
-BridgesWiki     http://c2.com/w2/bridges/
-C2find          http://c2.com/cgi/wiki?FindPage&amp;value=
-Cache           http://www.google.com/search?q=cache:
-CLiki           http://ww.telent.net/cliki/
-CmWiki          http://www.ourpla.net/cgi-bin/wiki.pl?
-CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
-DejaNews        http://www.deja.com/=dnc/getdoc.xp?AN=
-DeWikiPedia     http://www.wikipedia.de/wiki.cgi?
-Dictionary      http://www.dict.org/bin/Dict?Database=*&amp;Form=Dict1&amp;Strategy=*&amp;Query=
-DiveIntoOsx     http://diveintoosx.org/
-DocBook         http://docbook.org/wiki/moin.cgi/
-DolphinWiki     http://www.object-arts.com/wiki/html/Dolphin/
-EfnetCeeWiki    http://purl.net/wiki/c/
-EfnetCppWiki    http://purl.net/wiki/cpp/
-EfnetPythonWiki http://purl.net/wiki/python/
-EfnetXmlWiki    http://purl.net/wiki/xml/
-EljWiki         http://elj.sourceforge.net/phpwiki/index.php/
-EmacsWiki       http://www.emacswiki.org/cgi-bin/wiki.pl?
-FinalEmpire     http://final-empire.sourceforge.net/cgi-bin/wiki.pl?
-Foldoc          http://www.foldoc.org/foldoc/foldoc.cgi?
-FoxWiki         http://fox.wikis.com/wc.dll?Wiki~
-FreeBSDman      http://www.FreeBSD.org/cgi/man.cgi?apropos=1&amp;query=
-Google          http://www.google.com/search?q=
-GoogleGroups    http://groups.google.com/groups?q=
-GreenCheese     http://www.greencheese.org/
-HammondWiki     http://www.dairiki.org/HammondWiki/index.php3?
-Haribeau        http://wiki.haribeau.de/cgi-bin/wiki.pl?
-IAWiki          http://www.IAwiki.net/
-IMDB            http://us.imdb.com/Title?
-JargonFile      http://sunir.org/apps/meta.pl?wiki=JargonFile&amp;redirect=
-JiniWiki        http://www.cdegroot.com/cgi-bin/jini?
-JspWiki         http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=
-KmWiki          http://www.voght.com/cgi-bin/pywiki?
-KnowHow         http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi?
-LanifexWiki     http://opt.lanifex.com/cgi-bin/wiki.pl?
-LegoWiki        http://www.object-arts.com/wiki/html/Lego-Robotics/
-LinuxWiki       http://www.linuxwiki.de/
-LugKR           http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?
-MathSongsWiki   http://SeedWiki.com/page.cfm?wikiid=237&amp;doc=
-MbTest          http://www.usemod.com/cgi-bin/mbtest.pl?
-MeatBall        http://www.usemod.com/cgi-bin/mb.pl?
-MetaWiki        http://sunir.org/apps/meta.pl?
-MetaWikiPedia   http://meta.wikipedia.com/wiki/
-MoinMoin        http://purl.net/wiki/moin/
-MuWeb           http://www.dunstable.com/scripts/MuWebWeb?
-NetVillage      http://www.netbros.com/?
-OpenWiki        http://openwiki.com/?
-OrgPatterns     http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
-PangalacticOrg  http://www.pangalactic.org/Wiki/
-PersonalTelco   http://www.personaltelco.net/index.cgi/
-PhpWiki         http://phpwiki.sourceforge.net/phpwiki/index.php?
-Pikie           http://pikie.darktech.org/cgi/pikie?
-PPR             http://c2.com/cgi/wiki?
-PurlNet         http://purl.oclc.org/NET/
-PythonInfo      http://www.python.org/cgi-bin/moinmoin/
-PythonWiki      http://www.pythonwiki.de/
-PyWiki          http://www.voght.com/cgi-bin/pywiki?
-SeaPig          http://www.seapig.org/
-SeattleWireless http://seattlewireless.net/?
-SenseisLibrary  http://senseis.xmp.net/?
-Shakti          http://cgi.algonet.se/htbin/cgiwrap/pgd/ShaktiWiki/
-SourceForge     http://sourceforge.net/{NAME}
-Squeak          http://minnow.cc.gatech.edu/squeak/
-StrikiWiki      http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
-SVGWiki         http://www.protocol7.com/svg-wiki/default.asp?
-Tavi            http://tavi.sourceforge.net/index.php?
-TmNet           http://www.technomanifestos.net/?
-TMwiki          http://www.EasyTopicMaps.com/?page=
-TWiki           http://twiki.org/cgi-bin/view/{NAME}
-TwistedWiki     http://purl.net/wiki/twisted/
-Unreal          http://wiki.beyondunreal.com/wiki/
-UseMod          http://www.usemod.com/cgi-bin/wiki.pl?
-VisualWorks     http://wiki.cs.uiuc.edu/VisualWorks/
-WebDevWikiNL    http://www.promo-it.nl/WebDevWiki/index.php?page=
-WebSeitzWiki    http://webseitz.fluxent.com/wiki/
-Why             http://clublet.com/c/c/why?
-Wiki            http://c2.com/cgi/wiki?
-WikiPedia       http://www.wikipedia.com/wiki/
-WikiWorld       http://WikiWorld.com/wiki/index.php/
-YpsiEyeball     http://sknkwrks.dyndns.org:1957/writewiki/wiki.pl?
-ZWiki           http://www.zwiki.org/
-
diff --git a/_test/conf/license.php b/_test/conf/license.php
deleted file mode 100644
index 89728ab57..000000000
--- a/_test/conf/license.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * This file defines multiple available licenses you can license your
- * wiki contents under. Do not change this file, but create a
- * license.local.php instead.
- */
-
-$license['cc-zero'] = array(
-    'name' => 'CC0 1.0 Universal',
-    'url'  => 'http://creativecommons.org/publicdomain/zero/1.0/',
-);
-$license['publicdomain'] = array(
-    'name' => 'Public Domain',
-    'url'  => 'http://creativecommons.org/licenses/publicdomain/',
-);
-$license['cc-by'] = array(
-    'name' => 'CC Attribution 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by/3.0/',
-);
-$license['cc-by-sa'] = array(
-    'name' => 'CC Attribution-Share Alike 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-sa/3.0/',
-);
-$license['gnufdl'] = array(
-    'name' => 'GNU Free Documentation License 1.3',
-    'url'  => 'http://www.gnu.org/licenses/fdl-1.3.html',
-);
-$license['cc-by-nc'] = array(
-    'name' => 'CC Attribution-Noncommercial 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-nc/3.0/',
-);
-$license['cc-by-nc-sa'] = array(
-    'name' => 'CC Attribution-Noncommercial-Share Alike 3.0 Unported',
-    'url'  => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
-);
-
diff --git a/_test/conf/local.php b/_test/conf/local.php
index 3de30ee21..9a8ed9558 100644
--- a/_test/conf/local.php
+++ b/_test/conf/local.php
@@ -1,3 +1,9 @@
 <?php
 
-$conf['savedir']     = DOKU_TMP_DATA;          //where to store all the files
+$conf['savedir']     = DOKU_TMP_DATA;     //where to store all the files
+
+$conf['title']       = 'My Test Wiki';    //what to show in the title
+
+$conf['useacl']      = 1;                 //Use Access Control Lists to restrict access?
+$conf['superuser']   = 'testuser';        //password: testpass
+
diff --git a/_test/conf/local.php.dist b/_test/conf/local.php.dist
deleted file mode 100644
index 0397954f4..000000000
--- a/_test/conf/local.php.dist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * This is an example of how a local.php could look like.
- * Simply copy the options you want to change from dokuwiki.php
- * to this file and change them.
- *
- * When using the installer, a correct local.php file be generated for
- * you automatically.
- */
-
-
-//$conf['title']       = 'My Wiki';        //what to show in the title
-
-//$conf['useacl']      = 1;                //Use Access Control Lists to restrict access?
-//$conf['superuser']   = 'joe';
-
diff --git a/_test/conf/mediameta.php b/_test/conf/mediameta.php
deleted file mode 100644
index 0428a4b88..000000000
--- a/_test/conf/mediameta.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * This configures which meta data will be editable through
- * the media manager. Each field of the array is an array with the
- * following contents:
- *   fieldname - Where data will be saved (EXIF or IPTC field)
- *   label     - key to lookup in the $lang var, if not found printed as is
- *   htmltype  - 'text' or 'textarea'
- *   lookups   - array additional fields to lookup the data (EXIF or IPTC fields)
- *
- * The fields are not ordered continously to make inserting additional items
- * in between simpler.
- *
- * This is a PHP snippet, so PHP syntax applies.
- *
- * Note: $fields is not a global variable and will not be available to any
- *       other functions or templates later
- *
- * You may extend or overwrite this variable in a optional
- * conf/mediameta.local.php file
- *
- * For a list of available EXIF/IPTC fields refer to
- * http://www.dokuwiki.org/devel:templates:detail.php
- */
-
-
-$fields = array(
-    10 => array('Iptc.Headline',
-                'img_title',
-                'text'),
-
-    20 => array('',
-                'img_date',
-                'date',
-                array('Date.EarliestTime')),
-
-    30 => array('',
-                'img_fname',
-                'text',
-                array('File.Name')),
-
-    40 => array('Iptc.Caption',
-                'img_caption',
-                'textarea',
-                array('Exif.UserComment',
-                      'Exif.TIFFImageDescription',
-                      'Exif.TIFFUserComment')),
-
-    50 => array('Iptc.Byline',
-                'img_artist',
-                'text',
-                array('Exif.TIFFArtist',
-                      'Exif.Artist',
-                      'Iptc.Credit')),
-
-    60 => array('Iptc.CopyrightNotice',
-                'img_copyr',
-                'text',
-                array('Exif.TIFFCopyright',
-                      'Exif.Copyright')),
-
-    70 => array('',
-                'img_format',
-                'text',
-                array('File.Format')),
-
-    80 => array('',
-                'img_fsize',
-                'text',
-                array('File.NiceSize')),
-
-    90 => array('',
-                'img_width',
-                'text',
-                array('File.Width')),
-
-    100 => array('',
-                'img_height',
-                'text',
-                array('File.Height')),
-
-    110 => array('',
-                'img_camera',
-                'text',
-                array('Simple.Camera')),
-
-    120 => array('Iptc.Keywords',
-                'img_keywords',
-                'text',
-                array('Exif.Category')),
-);
diff --git a/_test/conf/mime.conf b/_test/conf/mime.conf
deleted file mode 100644
index 24529b06c..000000000
--- a/_test/conf/mime.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-# Allowed uploadable file extensions and mimetypes are defined here.
-# To extend this file it is recommended to create a mime.local.conf
-# file. Mimetypes that should be downloadable and not be opened in the
-# should be prefixed with a !
-
-jpg     image/jpeg
-jpeg    image/jpeg
-gif     image/gif
-png     image/png
-
-swf     application/x-shockwave-flash
-mp3     audio/mpeg
-ogg     audio/ogg
-wav     audio/wav
-
-tgz     !application/octet-stream
-tar     !application/x-gtar
-gz      !application/octet-stream
-bz2     !application/octet-stream
-zip     !application/zip
-rar     !application/rar
-7z      !application/x-7z-compressed
-
-pdf     application/pdf
-ps      !application/postscript
-
-rpm     !application/octet-stream
-deb     !application/octet-stream
-
-doc     !application/msword
-xls     !application/msexcel
-ppt     !application/mspowerpoint
-rtf     !application/msword
-
-docx    !application/vnd.openxmlformats-officedocument.wordprocessingml.document
-xlsx    !application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-pptx    !application/vnd.openxmlformats-officedocument.presentationml.presentation
-
-sxw     !application/soffice
-sxc     !application/soffice
-sxi     !application/soffice
-sxd     !application/soffice
-
-odc     !application/vnd.oasis.opendocument.chart
-odf     !application/vnd.oasis.opendocument.formula
-odg     !application/vnd.oasis.opendocument.graphics
-odi     !application/vnd.oasis.opendocument.image
-odp     !application/vnd.oasis.opendocument.presentation
-ods     !application/vnd.oasis.opendocument.spreadsheet
-odt     !application/vnd.oasis.opendocument.text
-
-# You should enable HTML and Text uploads only for restricted Wikis.
-# Spammers are known to upload spam pages through unprotected Wikis.
-# Note: Enabling HTML opens Cross Site Scripting vulnerabilities
-#       through JavaScript. Only enable this with trusted users. You
-#       need to disable the iexssprotect option additionally to
-#       adding the mime type here
-#html    text/html
-#htm     text/html
-#txt     text/plain
-#conf    text/plain
-#xml     text/xml
-#csv     text/csv
-
diff --git a/_test/conf/mysql.conf.php.example b/_test/conf/mysql.conf.php.example
deleted file mode 100644
index 94bc14e1f..000000000
--- a/_test/conf/mysql.conf.php.example
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-/*
- * This is an example configuration for the mysql auth module.
- *
- * This SQL statements are optimized for following table structure.
- * If you use a different one you have to change them accordingly.
- * See comments of every statement for details.
- *
- * TABLE users
- *     uid   login   pass   firstname   lastname   email
- *
- * TABLE groups
- *     gid   name
- *
- * TABLE usergroup
- *     uid   gid
- *
- * To use this configuration you have to copy them to local.protected.php
- * or at least include this file in local.protected.php.
- */
-
-/* Options to configure database access. You need to set up this
- * options carefully, otherwise you won't be able to access you
- * database.
- */
-$conf['auth']['mysql']['server']   = '';
-$conf['auth']['mysql']['user']     = '';
-$conf['auth']['mysql']['password'] = '';
-$conf['auth']['mysql']['database'] = '';
-
-/* This option enables debug messages in the mysql module. It is
- * mostly usefull for system admins.
- */
-$conf['auth']['mysql']['debug'] = 0;
-
-/* Normally password encryption is done by DokuWiki (recommended) but for
- * some reasons it might be usefull to let the database do the encryption.
- * Set 'forwardClearPass' to '1' and the cleartext password is forwarded to
- * the database, otherwise the encrypted one.
- */
-$conf['auth']['mysql']['forwardClearPass'] = 0;
-
-/* Multiple table operations will be protected by locks. This array tolds
- * the module which tables to lock. If you use any aliases for table names
- * these array must also contain these aliases. Any unamed alias will cause
- * a warning during operation. See the example below.
- */
-$conf['auth']['mysql']['TablesToLock']= array("users", "users AS u","groups", "groups AS g", "usergroup", "usergroup AS ug");
-
-/***********************************************************************/
-/*       Basic SQL statements for user authentication (required)       */
-/***********************************************************************/
-
-/* This statement is used to grant or deny access to the wiki. The result
- * should be a table with exact one line containing at least the password
- * of the user. If the result table is empty or contains more than one
- * row, access will be denied.
- *
- * The module access the password as 'pass' so a alias might be necessary.
- *
- * Following patters will be replaced:
- *   %{user}    user name
- *   %{pass}    encrypted or clear text password (depends on 'encryptPass')
- *   %{dgroup}  default group name
- */
-$conf['auth']['mysql']['checkPass']   = "SELECT pass
-                                         FROM usergroup AS ug
-                                         JOIN users AS u ON u.uid=ug.uid
-                                         JOIN groups AS g ON g.gid=ug.gid
-                                         WHERE login='%{user}'
-                                         AND name='%{dgroup}'";
-
-/* This statement should return a table with exact one row containing
- * information about one user. The field needed are:
- * 'pass'  containing the encrypted or clear text password
- * 'name'  the user's full name
- * 'mail'  the user's email address
- *
- * Keep in mind that Dokuwiki will access thise information through the
- * names listed above so aliasses might be neseccary.
- *
- * Following patters will be replaced:
- *   %{user}    user name
- */
-$conf['auth']['mysql']['getUserInfo'] = "SELECT pass, CONCAT(firstname,' ',lastname) AS name, email AS mail
-                                         FROM users
-                                         WHERE login='%{user}'";
-
-/* This statement is used to get all groups a user is member of. The
- * result should be a table containing all groups the given user is
- * member of. The module access the group name as 'group' so a alias
- * might be nessecary.
- *
- * Following patters will be replaced:
- *   %{user}    user name
- */
-$conf['auth']['mysql']['getGroups']   = "SELECT name as `group`
-                                         FROM groups g, users u, usergroup ug
-                                         WHERE u.uid = ug.uid
-                                         AND g.gid = ug.gid
-                                         AND u.login='%{user}'";
-
-/***********************************************************************/
-/*      Additional minimum SQL statements to use the user manager      */
-/***********************************************************************/
-
-/* This statement should return a table containing all user login names
- * that meet certain filter criteria. The filter expressions will be added
- * case dependend by the module. At the end a sort expression will be added.
- * Important is that this list contains no double entries fo a user. Each
- * user name is only allowed once in the table.
- *
- * The login name will be accessed as 'user' to a alias might be neseccary.
- * No patterns will be replaced in this statement but following patters
- * will be replaced in the filter expressions:
- *   %{user}    in FilterLogin  user's login name
- *   %{name}    in FilterName   user's full name
- *   %{email}   in FilterEmail  user's email address
- *   %{group}   in FilterGroup  group name
- */
-$conf['auth']['mysql']['getUsers']    = "SELECT DISTINCT login AS user
-                                         FROM users AS u
-                                         LEFT JOIN usergroup AS ug ON u.uid=ug.uid
-                                         LEFT JOIN groups AS g ON ug.gid=g.gid";
-$conf['auth']['mysql']['FilterLogin'] = "login LIKE '%{user}'";
-$conf['auth']['mysql']['FilterName']  = "CONCAT(firstname,' ',lastname) LIKE '%{name}'";
-$conf['auth']['mysql']['FilterEmail'] = "email LIKE '%{email}'";
-$conf['auth']['mysql']['FilterGroup'] = "name LIKE '%{group}'";
-$conf['auth']['mysql']['SortOrder']   = "ORDER BY login";
-
-/***********************************************************************/
-/*   Additional SQL statements to add new users with the user manager  */
-/***********************************************************************/
-
-/* This statement should add a user to the database. Minimum information
- * to store are: login name, password, email address and full name.
- *
- * Following patterns will be replaced:
- *   %{user}    user's login name
- *   %{pass}    password (encrypted or clear text, depends on 'encryptPass')
- *   %{email}   email address
- *   %{name}    user's full name
- */
-$conf['auth']['mysql']['addUser']     = "INSERT INTO users
-                                         (login, pass, email, firstname, lastname)
-                                         VALUES ('%{user}', '%{pass}', '%{email}',
-                                         SUBSTRING_INDEX('%{name}',' ', 1),
-                                         SUBSTRING_INDEX('%{name}',' ', -1))";
-
-/* This statement should add a group to the database.
- * Following patterns will be replaced:
- *   %{group}   group name
- */
-$conf['auth']['mysql']['addGroup']    = "INSERT INTO groups (name)
-                                         VALUES ('%{group}')";
-
-/* This statement should connect a user to a group (a user become member
- * of that group).
- * Following patterns will be replaced:
- *   %{user}    user's login name
- *   %{uid}     id of a user dataset
- *   %{group}   group name
- *   %{gid}     id of a group dataset
- */
-$conf['auth']['mysql']['addUserGroup']= "INSERT INTO usergroup (uid, gid)
-                                         VALUES ('%{uid}', '%{gid}')";
-
-/* This statement should remove a group fom the database.
- * Following patterns will be replaced:
- *   %{group}   group name
- *   %{gid}     id of a group dataset
- */
-$conf['auth']['mysql']['delGroup']    = "DELETE FROM groups
-                                         WHERE gid='%{gid}'";
-
-/* This statement should return the database index of a given user name.
- * The module will access the index with the name 'id' so a alias might be
- * necessary.
- * following patters will be replaced:
- *   %{user}    user name
- */
-$conf['auth']['mysql']['getUserID']   = "SELECT uid AS id
-                                         FROM users
-                                         WHERE login='%{user}'";
-
-/***********************************************************************/
-/*   Additional SQL statements to delete users with the user manager   */
-/***********************************************************************/
-
-/* This statement should remove a user fom the database.
- * Following patterns will be replaced:
- *   %{user}    user's login name
- *   %{uid}     id of a user dataset
- */
-$conf['auth']['mysql']['delUser']     = "DELETE FROM users
-                                         WHERE uid='%{uid}'";
-
-/* This statement should remove all connections from a user to any group
- * (a user quits membership of all groups).
- * Following patterns will be replaced:
- *   %{uid}     id of a user dataset
- */
-$conf['auth']['mysql']['delUserRefs'] = "DELETE FROM usergroup
-                                         WHERE uid='%{uid}'";
-
-/***********************************************************************/
-/*   Additional SQL statements to modify users with the user manager   */
-/***********************************************************************/
-
-/* This statements should modify a user entry in the database. The
- * statements UpdateLogin, UpdatePass, UpdateEmail and UpdateName will be
- * added to updateUser on demand. Only changed parameters will be used.
- *
- * Following patterns will be replaced:
- *   %{user}    user's login name
- *   %{pass}    password (encrypted or clear text, depends on 'encryptPass')
- *   %{email}   email address
- *   %{name}    user's full name
- *   %{uid}     user id that should be updated
- */
-$conf['auth']['mysql']['updateUser']  = "UPDATE users SET";
-$conf['auth']['mysql']['UpdateLogin'] = "login='%{user}'";
-$conf['auth']['mysql']['UpdatePass']  = "pass='%{pass}'";
-$conf['auth']['mysql']['UpdateEmail'] = "email='%{email}'";
-$conf['auth']['mysql']['UpdateName']  = "firstname=SUBSTRING_INDEX('%{name}',' ', 1),
-                                         lastname=SUBSTRING_INDEX('%{name}',' ', -1)";
-$conf['auth']['mysql']['UpdateTarget']= "WHERE uid=%{uid}";
-
-/* This statement should remove a single connection from a user to a
- * group (a user quits membership of that group).
- *
- * Following patterns will be replaced:
- *   %{user}    user's login name
- *   %{uid}     id of a user dataset
- *   %{group}   group name
- *   %{gid}     id of a group dataset
- */
-$conf['auth']['mysql']['delUserGroup']= "DELETE FROM usergroup
-                                         WHERE uid='%{uid}'
-                                         AND gid='%{gid}'";
-
-/* This statement should return the database index of a given group name.
- * The module will access the index with the name 'id' so a alias might
- * be necessary.
- *
- * Following patters will be replaced:
- *   %{group}   group name
- */
-$conf['auth']['mysql']['getGroupID']  = "SELECT gid AS id
-                                         FROM groups
-                                         WHERE name='%{group}'";
-
-
diff --git a/_test/conf/plugins.php b/_test/conf/plugins.php
deleted file mode 100644
index b2c79970d..000000000
--- a/_test/conf/plugins.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * This file configures the default states of available plugins. All settings in
- * the plugins.*.php files will override those here.
- */
-$plugins['testing'] = 0;
diff --git a/_test/conf/plugins.required.php b/_test/conf/plugins.required.php
deleted file mode 100644
index 26eb8888b..000000000
--- a/_test/conf/plugins.required.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * This file configures the enabled/disabled status of plugins, which are also protected
- * from changes by the extention manager. These settings will override any local settings.
- * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades.
- */
-$plugins['acl']         = 1;
-$plugins['plugin']      = 1;
-$plugins['config']      = 1;
-$plugins['usermanager'] = 1;
-$plugins['revert']      = 1;
diff --git a/_test/conf/scheme.conf b/_test/conf/scheme.conf
deleted file mode 100644
index 88cb3c44d..000000000
--- a/_test/conf/scheme.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-#Add URL schemes you want to be recognized as links here
-
-http
-https
-telnet
-gopher
-wais
-ftp
-ed2k
-irc
-ldap
\ No newline at end of file
diff --git a/_test/conf/smileys.conf b/_test/conf/smileys.conf
deleted file mode 100644
index 80daed57a..000000000
--- a/_test/conf/smileys.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Smileys configured here will be replaced by the
-# configured images in the smiley directory
-
-8-)         icon_cool.gif
-8-O         icon_eek.gif
-8-o         icon_eek.gif
-:-(         icon_sad.gif
-:-)         icon_smile.gif
-=)          icon_smile2.gif
-:-/         icon_doubt.gif
-:-\         icon_doubt2.gif
-:-?         icon_confused.gif
-:-D         icon_biggrin.gif
-:-P         icon_razz.gif
-:-o         icon_surprised.gif
-:-O         icon_surprised.gif
-:-x         icon_silenced.gif
-:-X         icon_silenced.gif
-:-|         icon_neutral.gif
-;-)         icon_wink.gif
-m(          facepalm.gif
-^_^         icon_fun.gif
-:?:         icon_question.gif
-:!:         icon_exclaim.gif
-LOL         icon_lol.gif
-FIXME       fixme.gif
-DELETEME    delete.gif
-
diff --git a/_test/conf/users.auth.php.dist b/_test/conf/users.auth.php
similarity index 60%
rename from _test/conf/users.auth.php.dist
rename to _test/conf/users.auth.php
index 6576eeb5f..4adee0d4b 100644
--- a/_test/conf/users.auth.php.dist
+++ b/_test/conf/users.auth.php
@@ -7,4 +7,6 @@
 # Format:
 #
 # user:MD5password:Real Name:email:groups,comma,seperated
-
+#
+# testuser : testpass
+testuser:179ad45c6ce2cb97cf1029e212046e81:Arthur Dent:arthur@example.com:
diff --git a/_test/conf/wordblock.conf b/_test/conf/wordblock.conf
deleted file mode 100644
index fe451f278..000000000
--- a/_test/conf/wordblock.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# This blacklist is maintained by the DokuWiki community
-# patches welcome
-#
-https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine)
-gay\s*sex
-bi\s*sex
-incest
-zoosex
-gang\s*bang
-facials
-ladyboy
-fetish
-\btits\b
-\brape\b
-bolea\.com
-52crystal
-baida\.org
-web-directory\.awardspace\.us
-korsan-team\.com
-BUDA TAMAMDIR
-wow-powerleveling-wow\.com
-wow gold
-wow-gold\.dinmo\.cn
-downgrade-vista\.com
-downgradetowindowsxp\.com
-elegantugg\.com
-classicedhardy\.com
-research-service\.com
-https?:\/\/(\S*?)(2-pay-secure|911essay|academia-research|anypapers|applicationessay|bestbuyessay|bestdissertation|bestessay|bestresume|besttermpaper|businessessay|college-paper|customessay|custom-made-paper|custom-writing|degree-?result|dissertationblog|dissertation-service|dissertations?expert|essaybank|essay-?blog|essaycapital|essaylogic|essaymill|essayontime|essaypaper|essays?land|essaytownsucks|essay-?writ|fastessays|freelancercareers|genuinecontent|genuineessay|genuinepaper|goessay|grandresume|killer-content|ma-dissertation|managementessay|masterpaper|mightystudent|needessay|researchedge|researchpaper-blog|resumecvservice|resumesexperts|resumesplanet|rushessay|samedayessay|superiorcontent|superiorpaper|superiorthesis|term-paper|termpaper-blog|term-paper-research|thesisblog|universalresearch|valwriting|vdwriters|wisetranslation|writersassembly|writers\.com\.ph|writers\.ph)
-flatsinmumbai\.co\.in
-https?:\/\/(\S*?)penny-?stock
-mattressreview\.biz
diff --git a/_test/core/TestUtils.php b/_test/core/TestUtils.php
index 64de62213..2750a3edf 100644
--- a/_test/core/TestUtils.php
+++ b/_test/core/TestUtils.php
@@ -17,7 +17,9 @@ class TestUtils {
             copy($source, $destdir.'/'.basename($source));
         } else {
             $newdestdir = $destdir.'/'.basename($source);
-            mkdir($newdestdir);
+            if (!is_dir($newdestdir)) {
+                mkdir($newdestdir);
+            }
 
             $dh = dir($source);
             while (false !== ($entry = $dh->read())) {
-- 
GitLab