- allow disabling http auth param

[packages/dokuwiki.git] / dokuwiki-http_auth-option.patch

diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
new file mode 100644 (file)
index 0000000..1da5b94
--- /dev/null
+++ b/dokuwiki-http_auth-option.patch
@@ -0,0 +1,21 @@
+--- dokuwiki-2007-06-26b/conf/dokuwiki.php~    2007-12-19 00:27:28.671399503 +0200
++++ dokuwiki-2007-06-26b/conf/dokuwiki.php     2007-12-19 00:39:47.679195099 +0200
+@@ -69,6 +69,7 @@
+ $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['http_auth'] = 1;                  //allows HTTP auhtorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables
+ 
+ /* Advanced Options */
+ 
+--- dokuwiki-2007-06-26b/inc/auth.php~ 2007-06-26 21:27:15.000000000 +0300
++++ dokuwiki-2007-06-26b/inc/auth.php  2007-12-19 00:40:14.598022033 +0200
+@@ -60,7 +60,7 @@
+       if (!isset($_REQUEST['r'])) $_REQUEST['r'] = '';
+ 
+       // if no credentials were given try to use HTTP auth (for SSO)
+-      if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
++      if($conf['http_auth'] && empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
+         $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
+         $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
+       }