X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dokuwiki-http_auth-option.patch;h=5240da7d4d4f47f4c7fc38edce4862c1d0a6d76c;hb=b196ede3ef3f90c787928dc2ae85fe7963134196;hp=d3b0a17a08beaeca5a5bd2661cf763b28f42a1e9;hpb=c9dcec0a273693207d2984a2244d9bce3d11a278;p=packages%2Fdokuwiki.git

diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
index d3b0a17..5240da7 100644
--- a/dokuwiki-http_auth-option.patch
+++ b/dokuwiki-http_auth-option.patch
@@ -1,21 +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 @@
+--- dokuwiki-rc2009-01-26/conf/dokuwiki.php~	2009-01-27 12:56:43.000000000 +0200
++++ dokuwiki-rc2009-01-26/conf/dokuwiki.php	2009-01-27 12:57:04.936215007 +0200
+@@ -75,6 +75,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 authorization (SSO) from PHP_AUTH_USER/PHP_AUTH_PW variables
+ $conf['securecookie'] = 1;               //never send HTTPS cookies via HTTP
  
  /* Advanced Options */
+--- dokuwiki-2012-07-08/inc/auth.php~	2012-07-07 13:06:48.000000000 +0300
++++ dokuwiki-2012-07-08/inc/auth.php	2012-07-08 11:21:54.220213692 +0300
+@@ -84,7 +84,7 @@
+     }
  
---- 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'];
-       }
+     // if no credentials were given try to use HTTP auth (for SSO)
+-    if(!$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])) {
++    if($conf['http_auth'] && !$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])) {
+         $INPUT->set('u', $_SERVER['PHP_AUTH_USER']);
+         $INPUT->set('p', $_SERVER['PHP_AUTH_PW']);
+         $INPUT->set('http_credentials', true);