| Commit message (Collapse) | Author | Age |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This merge fixes all conflicts but is otherwise untested and might break
funktionality in the auth system somewhere. It NEEDS MAJOR TESTING!
Some refactoring of the auth plugins is still needed:
* move to PHP5 style
* fix comments
* add plugin.info.txt
* janschumann/master:
Refactored auth system: All auth methods are now introduced as plugins.
Bugfix: auth types are now correcty added
Setup auth system from plugins
Added Auth-Plugin-Prototype to autoload
Load auth types from plugins in settings_authtype class
Added prototype for Auth-Plugins
added plugin type 'auth'
Conflicts:
inc/auth.php
inc/auth/pgsql.class.php
inc/init.php
inc/load.php
lib/plugins/auth.php
lib/plugins/authad/auth.php
lib/plugins/authldap/auth.php
lib/plugins/authmysql/auth.php
lib/plugins/authplain/auth.php
|
| | |
|
| |
| |
| |
| | |
this function was removed in PHP 5.4.0
|
| |
| |
| |
| |
| | |
The class loader isn't available at that place in inc/init.php so the
check if the sitemap is compressed didn't work.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Compressing a gzip file again for transport is standards compliant, but
some clients assume that the file is only compressed once then and don't
remove the outer compression layer. This could disable compression in
too many cases theses cases should be rare and shouldn't cause any
problems.
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This new wrapper ensures types are correct and accessed parameters are
actually set (with custom default fallbacks).
The wrapper is available in the global $INPUT variable. It accesses
$_REQUEST by default. If POST or GET is required, the post and get
members can be used:
$INPUT->int('foo',false); // access $_REQUEST['foo'], default false
$INPUT->post->int('foo'); // access $_POST['foo'], default 0
$INPUT->get->int('foo'); // access $_GET['foo'], default 0
The codebase still needs to be updated to make use of this.
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
lib/exe/xmlrpc.php
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* jscachekey:
trigger JS_CACHE_USE in lib/exe/js.php
added INIT_LANG_LOAD event
let js.php use multiple caches
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Some plugins want to dynamically switch the template based on users,
namspaces or the phase of the moon. Having fixed paths in a unchangable
constant prevents this.
This changes deprecates the DOKU_TPL* constants in favor of two new
tpl_* functions that return the correct paths based on the $conf
variables which can be changed from the DOKUWIKI_STARTED event.
|
| |/
| |
| |
| |
| |
| |
| |
| | |
This change disables the reporting of strict standard errors in PHP 5.4,
in PHP versions prior to 5.4 E_STRICT wasn't part of E_ALL so for
these versions this doesn't cause any change (however E_STRICT is
available in all versions of PHP 5 so this doesn't cause any problems).
See also FS#2427.
|
|/ |
|
|\ |
|
| |\
| | |
| | | |
Make cookie path configurable
|
| | |
| | |
| | |
| | | |
If $conf['cookiedir'] is set, use this setting instead of DOKU_REL.
|
|/ / |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
|
| | | |
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
|
| | | |
|
| |/
| |
| |
| |
| | |
as discussed in
http://www.freelists.org/post/dokuwiki/git-changes-20101209,7
|
|/ |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
The title.idx file needs to have exactly the same length as the
page.idx. This patch creates the file with the correct length if it
doesn't exist yet.
If you upgrade in between you need to delete your data/index/title.idx
file
|
| |
|
| |
|
| |
|
|
|
|
|
| |
This patch moved the place where DOKU_PLUGIN is defined. It no longer
can be set from a normal config (only via preload)
|
|
|
|
|
|
|
|
| |
Classes are loaded throug PHP5's class autoloader, all other
includes are just loaded by default. This skips a lot of
require_once calls.
Parser and Plugin stuff isn't handled by the class loader yet.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Changes of behaviour are:
* Allow the user name, title & description \e2\80\9c0\e2\80\9d
* Default to Port 443 if using HTTPS
* Set $INFO['isadmin'] and $INFO['ismanager'] to \e2\80\9cfalse\e2\80\9d even if no user is
logged in
* Do not pass empty fragment field in the event data for event
ACTION_SHOW_REDIRECT
* Handle chunked encoding in HTTPClient
darcs-hash:20091104100115-e4919-5cf6397d4a457e3f98a8ca49fbdab03f2147721d.gz
|
|
|
|
|
|
| |
Ignore-this: 3686859078d4a5e4af166eaec089268b
darcs-hash:20091103180625-7ad00-36d8e781f9a25095cf5efaad5efb16a6b8f95b1e.gz
|
|
|
|
|
|
| |
Ignore-this: 259cb5773c3144c6c706d87298dcf674
darcs-hash:20091020212338-7ad00-6bf1c5c403491f136a1c02af5ecd9f84d7227107.gz
|
|
|
|
|
|
| |
Ignore-this: 27ea52110bce929b2c61ed8faba67cfc
darcs-hash:20091016205526-c0bf4-35eba4e65d37980a667ba982f7f1ea5b7b07f01c.gz
|
|
|
|
|
|
|
|
|
| |
Ignore-this: de9ef30fc53fbfc1caa74b55f97290a5
This should avoid problems on portbased virtual hosts.
This patch might log you out ;-)
darcs-hash:20090801222159-7ad00-808a91dd29af758ef10d7942888c2c22d8b8b888.gz
|
|
|
|
|
|
|
|
|
| |
Ignore-this: ce01faedc6c3d9370362b0e1e39ded36
This fixes a security hole when register_globals is enabled. An exploit is
in the wild: http://www.milw0rm.com/exploits/8781
darcs-hash:20090526145030-7ad00-c0483e021f47898c8597f3bfbdd26c637f891d86.gz
|
|
|
|
|
|
| |
Ignore-this: 7059284786889a3ead12f5a4b3873bdf
darcs-hash:20090205170449-7ad00-63f9459819a355abc7a154e07b487d8431097614.gz
|
|
|
|
|
|
|
|
|
|
| |
- Avoid double compression when gzip_output is enabled
- Only compress when gzip_output is enabled
- Do not use x-sendfile for compressed content (content-encoding is not supported)
- Make sure the script terminates after using x-sendfile
- Moved gzip browser support check to init.php
darcs-hash:20090122215010-7ad00-765765d353ff78df5b8704086328c5c699bbe7e0.gz
|
|
|
|
|
|
|
|
|
|
| |
- add mediameta and license config files into the cascade
- update the cache validity code in cache.php, css.php & js.php to use config_cascade
- redo inclusion of main config files to avoid suppression of errors in config files
- add getConfigFiles($type) function
- minor updates elsewhere to use config_cascade rather than hardcoded config file names
darcs-hash:20090122114457-f07c6-98ad5627fd5df93edf8dd03289b9cf6d81962afe.gz
|
|
|
|
|
|
| |
DOKU_UNITTEST_ASSUME_WINDOWS isn't set
darcs-hash:20090122081649-f07c6-e7744b1496e1a05ab089812fd7ca3716ecec2290.gz
|
|
|
|
| |
darcs-hash:20090122080426-f07c6-c2e4cb107f9d07f333a9fe295f5df5bd9d3fb15f.gz
|
|
|
|
| |
darcs-hash:20090119050218-f07c6-8cb3615ee51fe81ef90b1e54675c359d84a2e57c.gz
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change add the global $config_cascade which holds the list of files to be
read for each configuration setting group. Dokuwiki adds in its configuration
file values after preload.php, giving preload.php to set its own configuration
cascade.
One side effect of the change is "local.protected.php" is part of the default
cascade, removing the need for it to be included at the bottom of local.php.
darcs-hash:20090118181204-f07c6-fea1c406da1bbdb0a52ab40914f11b835e797728.gz
|