diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2006-09-06 20:48:14 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2006-09-06 20:48:14 +0200 |
| commit | ebf97c8f2d2dc79586ed3910a7085626e61d6607 (patch) | |
| tree | add283a06bf4687ba442257fab34e34f45fb7a1c | |
| parent | 12cd3c98bde23843947f6991037009ab9ef49b05 (diff) | |
| download | rpg-ebf97c8f2d2dc79586ed3910a7085626e61d6607.tar.gz rpg-ebf97c8f2d2dc79586ed3910a7085626e61d6607.tar.bz2 | |
move AUTH defines higher up
This moves the defines for the different AUTH levels higher up in inc/auth.php
to set them before including any auth modules. This fixes a problem with the
phpBB auth module posted at
http://wiki.splitbrain.org/wiki:tips:integrate_with_phpbb#another_phpbb.class.php
darcs-hash:20060906184814-7ad00-679bd636730e21dca45b9baaf721fb3b34a8695a.gz
| -rw-r--r-- | inc/auth.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/inc/auth.php b/inc/auth.php index 40145ee78..db53a4c19 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -13,7 +13,16 @@ require_once(DOKU_INC.'inc/common.php'); require_once(DOKU_INC.'inc/io.php'); - global $conf; + // some ACL level defines + define('AUTH_NONE',0); + define('AUTH_READ',1); + define('AUTH_EDIT',2); + define('AUTH_CREATE',4); + define('AUTH_UPLOAD',8); + define('AUTH_DELETE',16); + define('AUTH_ADMIN',255); + + global $conf; if($conf['useacl']){ require_once(DOKU_INC.'inc/blowfish.php'); @@ -46,15 +55,6 @@ if (!defined('DOKU_COOKIE')) define('DOKU_COOKIE', 'DW'.md5($conf['title'])); - // some ACL level defines - define('AUTH_NONE',0); - define('AUTH_READ',1); - define('AUTH_EDIT',2); - define('AUTH_CREATE',4); - define('AUTH_UPLOAD',8); - define('AUTH_DELETE',16); - define('AUTH_ADMIN',255); - // do the login either by cookie or provided credentials if($conf['useacl']){ if (!isset($_REQUEST['u'])) $_REQUEST['u'] = ''; |