Up to 2020-07-29a

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

diff --git a/dokuwiki-http_auth-option.patch b/dokuwiki-http_auth-option.patch
index c38c600a591c0880b86166eb7d4d450ecd079670..3b8fbbe5e9c7ba9841f907b9acdf8e0c9a6fb9da 100644 (file)
--- a/dokuwiki-http_auth-option.patch
+++ b/dokuwiki-http_auth-option.patch
@@ -1,13 +1,15 @@
---- dokuwiki-2018-04-22c.org/conf/dokuwiki.php 2020-05-01 12:38:20.000000000 +0200
-+++ dokuwiki-2018-04-22c/conf/dokuwiki.php     2022-09-27 22:46:31.557879706 +0200
-@@ -63,6 +63,7 @@ $conf['profileconfirm'] = 1;
+- https://github.com/dokuwiki/dokuwiki/pull/15
+
+--- dokuwiki-2020-07-29a/conf/dokuwiki.php~    2022-09-03 19:58:24.000000000 +0300
++++ dokuwiki-2020-07-29a/conf/dokuwiki.php     2023-03-27 11:25:04.212540600 +0300
+@@ -63,6 +63,7 @@
  $conf['rememberme'] = 1;                 //Enable/disable remember me on login
  $conf['disableactions'] = '';            //comma separated list of actions to disable
  $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
  $conf['remote']      = 0;                //Enable/disable remote interfaces
- $conf['remoteuser']  = '!!not set!!';    //user/groups that have access to remote interface (comma separated)
+ $conf['remoteuser']  = '!!not set!!';    //user/groups that have access to remote interface (comma separated). leave empty to allow all users
 --- dokuwiki-2018-04-22c.org/inc/auth.php      2020-05-01 12:38:20.000000000 +0200
 +++ dokuwiki-2018-04-22c/inc/auth.php  2022-09-27 22:46:31.557879706 +0200
 @@ -84,7 +84,7 @@ function auth_setup() {