Skip to content

Commit

Permalink
fixed configuration loading and datadir misdirection
Browse files Browse the repository at this point in the history
  • Loading branch information
@sarnowski
sarnowski committed Apr 16, 2012
1 parent 561684d commit 9a5e1c6
Show file tree
Hide file tree
Showing 38 changed files with 1,928 additions and 26 deletions.
6 changes: 5 additions & 1 deletion _testing/README
View file
Expand Up @@ -28,5 +28,9 @@ Bad tests are tests that do not run out of the box.
* inc/parser/xhtml_links


==== Integration Tests ====
> phpunit -c inttests.xml

==== TODO ====
* integration tests (+plugins)
* integration tests (+plugins)

20 changes: 0 additions & 20 deletions _testing/integrationtests/basic/hooks.test.php
View file

This file was deleted.

21 changes: 21 additions & 0 deletions _testing/inttests.conf/acl.auth.php.dist
View file
@@ -0,0 +1,21 @@
# acl.auth.php
# <?php exit()?>
# 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
145 changes: 145 additions & 0 deletions _testing/inttests.conf/acronyms.conf
View file
@@ -0,0 +1,145 @@
# 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
171 changes: 171 additions & 0 deletions _testing/inttests.conf/dokuwiki.php
View file
@@ -0,0 +1,171 @@
<?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.
22 changes: 22 additions & 0 deletions _testing/inttests.conf/entities.conf
View file
@@ -0,0 +1,22 @@
# 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) ®
... …

0 comments on commit 9a5e1c6

Please sign in to comment.