]>
Commit | Line | Data |
---|---|---|
7df7f76f ER |
1 | --- dokuwiki-rc2009-01-26/conf/dokuwiki.php~ 2009-01-27 12:56:43.000000000 +0200 |
2 | +++ dokuwiki-rc2009-01-26/conf/dokuwiki.php 2009-01-27 12:57:04.936215007 +0200 | |
3 | @@ -75,6 +75,7 @@ | |
110e8aa6 ER |
4 | $conf['disableactions'] = ''; //comma separated list of actions to disable |
5 | $conf['sneaky_index'] = 0; //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior) | |
6 | $conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view | |
c9dcec0a | 7 | +$conf['http_auth'] = 1; //allows HTTP authorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables |
7df7f76f | 8 | $conf['securecookie'] = 1; //never send HTTPS cookies via HTTP |
110e8aa6 ER |
9 | |
10 | /* Advanced Options */ | |
82008d57 ER |
11 | --- dokuwiki-2012-07-08/inc/auth.php~ 2012-07-07 13:06:48.000000000 +0300 |
12 | +++ dokuwiki-2012-07-08/inc/auth.php 2012-07-08 11:21:54.220213692 +0300 | |
13 | @@ -84,7 +84,7 @@ | |
c4df8b0c | 14 | } |
110e8aa6 | 15 | |
c4df8b0c | 16 | // if no credentials were given try to use HTTP auth (for SSO) |
82008d57 ER |
17 | - if(!$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])) { |
18 | + if($conf['http_auth'] && !$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])) { | |
19 | $INPUT->set('u', $_SERVER['PHP_AUTH_USER']); | |
20 | $INPUT->set('p', $_SERVER['PHP_AUTH_PW']); | |
21 | $INPUT->set('http_credentials', true); |