summaryrefslogtreecommitdiff
path: root/conf/dokuwiki.php
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2012-03-23 10:02:01 +0100
committerAndreas Gohr <andi@splitbrain.org>2012-03-23 10:02:01 +0100
commita2b7fdb8e14f02aff9ab4b1b5646f640123ec0c7 (patch)
tree676ba2c0959bb1d99c34074a9ac4043862d91871 /conf/dokuwiki.php
parent7518cd81d69733d64ee5c80a8e5df4fcaa33246d (diff)
parentb967e5fc8fd93226eba7926c13b73b93878f182b (diff)
downloadrpg-a2b7fdb8e14f02aff9ab4b1b5646f640123ec0c7.tar.gz
rpg-a2b7fdb8e14f02aff9ab4b1b5646f640123ec0c7.tar.bz2
Merge branch 'master' of https://github.com/dom-mel/dokuwiki into pull-request-87
* 'master' of https://github.com/dom-mel/dokuwiki: (38 commits) removed requires, changed conf check in xmlrpc.php removed require_once for autoloaded fulltext.php updated comment added dokuwiki.getXMLRPCAPIVersion and wiki.getRPCVersionSupported added RPC_CALL_ADD event. replaced $HTTP_RAW_POST_DATA with http_get_raw_post_data function changed error code for unauthorized method calls. typo fixes moved plugin and core method calls to seperate function corrected comment added getapi methods to remote plugin removed unused class fixed testcase refactored RemoteAccessDenied to RemoteAccessDeniedException adjusted test cases delegate file and date transformation to remote library treat null as empty array added missing getTime added missing getVersion set login as public method ...
Diffstat (limited to 'conf/dokuwiki.php')
-rw-r--r--conf/dokuwiki.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 8da818638..fd89a90ed 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -81,8 +81,8 @@ $conf['sneaky_index'] = 0; //check for namespace read permission i
$conf['auth_security_timeout'] = 900; //time (seconds) auth data is considered valid, set to 0 to recheck on every page view
$conf['securecookie'] = 1; //never send HTTPS cookies via HTTP
-$conf['xmlrpc'] = 0; //Enable/disable XML-RPC interface
-$conf['xmlrpcuser'] = '!!not set!!'; //Restrict XML-RPC access to this groups/users
+$conf['remote'] = 0; //Enable/disable remote interfaces
+$conf['remoteuser'] = '!!not set !!'; //user/groups that have access to remote interface (comma separated)
/* Advanced Options */