diff options
author | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 15:25:18 +0000 |
---|---|---|
committer | Christopher Smith <chris@jalakai.co.uk> | 2014-03-12 15:25:18 +0000 |
commit | d397e6da631cb6d262ad14ec7b46b75d1b60fbcf (patch) | |
tree | 2fec04a1f9259ea496fec5d0e23242229fe0af71 /lib/plugins | |
parent | 069942acdaa5ba825bc3f92c7093b5071789f1ca (diff) | |
download | rpg-d397e6da631cb6d262ad14ec7b46b75d1b60fbcf.tar.gz rpg-d397e6da631cb6d262ad14ec7b46b75d1b60fbcf.tar.bz2 |
Restore correct public interface of getUserData() for authldap
plugin
The outer/public getUserData() implemented as a wrapper for the
previous fn which is now protected.
Diffstat (limited to 'lib/plugins')
-rw-r--r-- | lib/plugins/authldap/auth.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php index 6c3637e15..9d03afd7f 100644 --- a/lib/plugins/authldap/auth.php +++ b/lib/plugins/authldap/auth.php @@ -103,7 +103,7 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { return true; } else { // See if we can find the user - $info = $this->getUserData($user, true); + $info = $this->_getUserData($user, true); if(empty($info['dn'])) { return false; } else { @@ -146,10 +146,18 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { * @author Steffen Schoch <schoch@dsb.net> * * @param string $user + * @return array containing user data or false + */ + public function getUserData($user) { + return $this->_getUserData($user); + } + + /** + * @param string $user * @param bool $inbind authldap specific, true if in bind phase * @return array containing user data or false */ - public function getUserData($user, $inbind = false) { + protected function _getUserData($user, $inbind = false) { global $conf; if(!$this->_openLDAP()) return false; |