From 9c6354e5be3db406fa7f0966d65063e1d3b4d242 Mon Sep 17 00:00:00 2001 From: Tobias Sarnowski Date: Wed, 18 Apr 2012 18:04:25 +0000 Subject: use original conf directory and only shadow special files https://github.com/splitbrain/dokuwiki/pull/96#issuecomment-5195756 --- _test/bootstrap.php | 11 +- _test/conf/acl.auth.php | 21 ++++ _test/conf/acl.auth.php.dist | 21 ---- _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 ----- _test/conf/users.auth.php | 12 ++ _test/conf/users.auth.php.dist | 10 -- _test/conf/wordblock.conf | 32 ----- _test/core/TestUtils.php | 4 +- 21 files changed, 51 insertions(+), 1053 deletions(-) create mode 100644 _test/conf/acl.auth.php delete mode 100644 _test/conf/acl.auth.php.dist 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 create mode 100644 _test/conf/users.auth.php delete mode 100644 _test/conf/users.auth.php.dist 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 b/_test/conf/acl.auth.php new file mode 100644 index 000000000..14344d778 --- /dev/null +++ b/_test/conf/acl.auth.php @@ -0,0 +1,21 @@ +# acl.auth.php +# +# Don't modify the lines above +# +# Access Control Lists +# +# Editing this file by hand shouldn't be necessary. Use the ACL +# Manager interface instead. +# +# If your auth backend allows special char like spaces in groups +# or user names you need to urlencode them (only chars <128, leave +# UTF-8 multibyte chars as is) +# +# none 0 +# read 1 +# edit 2 +# create 4 +# upload 8 +# delete 16 + +* @ALL 8 diff --git a/_test/conf/acl.auth.php.dist b/_test/conf/acl.auth.php.dist deleted file mode 100644 index 14344d778..000000000 --- a/_test/conf/acl.auth.php.dist +++ /dev/null @@ -1,21 +0,0 @@ -# acl.auth.php -# -# Don't modify the lines above -# -# Access Control Lists -# -# Editing this file by hand shouldn't be necessary. Use the ACL -# Manager interface instead. -# -# If your auth backend allows special char like spaces in groups -# or user names you need to urlencode them (only chars <128, leave -# UTF-8 multibyte chars as is) -# -# none 0 -# read 1 -# edit 2 -# create 4 -# upload 8 -# delete 16 - -* @ALL 8 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 @@ - 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&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&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}&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&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&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&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=*&Form=Dict1&Strategy=*&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&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&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&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 @@ - '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 @@ 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 @@ - +# Don't modify the lines above +# +# Userfile +# +# Format: +# +# user:MD5password:Real Name:email:groups,comma,seperated +# +# testuser : testpass +testuser:179ad45c6ce2cb97cf1029e212046e81:Arthur Dent:arthur@example.com: diff --git a/_test/conf/users.auth.php.dist b/_test/conf/users.auth.php.dist deleted file mode 100644 index 6576eeb5f..000000000 --- a/_test/conf/users.auth.php.dist +++ /dev/null @@ -1,10 +0,0 @@ -# users.auth.php -# -# Don't modify the lines above -# -# Userfile -# -# Format: -# -# user:MD5password:Real Name:email:groups,comma,seperated - 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())) { -- cgit v1.2.3