diff options
author | Andreas Gohr <andi@splitbrain.org> | 2014-09-26 11:31:13 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2014-09-26 11:31:13 +0200 |
commit | 7b950f2d59050052c1d9251b0bd9bd40c7441040 (patch) | |
tree | 98a14f7a197ed87059aab12b3c2a424000962a43 /inc/auth.php | |
parent | 9d209ab87700c872fa85dcbee8623ad386190847 (diff) | |
parent | 2dc9e90007f12ac996b0e74479137a9dc6243c3c (diff) | |
download | rpg-7b950f2d59050052c1d9251b0bd9bd40c7441040.tar.gz rpg-7b950f2d59050052c1d9251b0bd9bd40c7441040.tar.bz2 |
Merge remote-tracking branch 'origin/auth_getUserData_improvements'
* origin/auth_getUserData_improvements:
KISS - remove class constants for REQUIRE_GROUPS & IGNORE_GROUPS and replace with boolean values
use $requireGroups constants in auth classes; comments; code improvements
fix comment errors, sp. & grammar
code styling - add missing braces
Allow user info to be retrieved without groups
Restore correct public interface of getUserData() for authldap plugin
Conflicts:
inc/common.php
Diffstat (limited to 'inc/auth.php')
-rw-r--r-- | inc/auth.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/auth.php b/inc/auth.php index b12800584..6abaa166f 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -923,7 +923,7 @@ function auth_sendPassword($user, $password) { if(!$auth) return false; $user = $auth->cleanUser($user); - $userinfo = $auth->getUserData($user); + $userinfo = $auth->getUserData($user, $requireGroups = false); if(!$userinfo['mail']) return false; @@ -1185,7 +1185,7 @@ function act_resendpwd() { } $user = io_readfile($tfile); - $userinfo = $auth->getUserData($user); + $userinfo = $auth->getUserData($user, $requireGroups = false); if(!$userinfo['mail']) { msg($lang['resendpwdnouser'], -1); return false; @@ -1237,7 +1237,7 @@ function act_resendpwd() { $user = trim($auth->cleanUser($INPUT->post->str('login'))); } - $userinfo = $auth->getUserData($user); + $userinfo = $auth->getUserData($user, $requireGroups = false); if(!$userinfo['mail']) { msg($lang['resendpwdnouser'], -1); return false; |