GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use common_nicknamize() in better places.

This commit is contained in:
Craig Andrews 2010-03-01 11:48:46 -05:00
parent 7410571bda
commit 3bfe3345df
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/authenticationplugin.php
View File

@ -79,7 +79,7 @@ abstract class AuthenticationPlugin extends Plugin
$nickname = $username;
}
$registration_data = array();
$registration_data['nickname'] = common_nicknamize($nickname);
$registration_data['nickname'] = $nickname;
return User::register($registration_data);
}
@ -101,12 +101,14 @@ abstract class AuthenticationPlugin extends Plugin
* Used during autoregistration
* Useful if your usernames are ugly, and you want to suggest
* nice looking nicknames when users initially sign on
* All nicknames returned by this function should be valid
* implementations may want to use common_nicknamize() to ensure validity
* @param username
* @return string nickname
*/
function suggestNicknameForUsername($username)
{
return $username;
return common_nicknamize($username);
}
//------------Below are the methods that connect StatusNet to the implementing Auth plugin------------\\
@ -129,7 +131,7 @@ abstract class AuthenticationPlugin extends Plugin
$test_user = User::staticGet('nickname', $suggested_nickname);
if($test_user) {
//someone already exists with the suggested nickname, so used the passed nickname
$suggested_nickname = $nickname;
$suggested_nickname = common_nicknamize($nickname);
}
$test_user = User::staticGet('nickname', $suggested_nickname);
if($test_user) {

9
plugins/LdapAuthentication/LdapAuthenticationPlugin.php
View File

@ -189,15 +189,14 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
$entry = $this->ldap_get_user($username, $this->attributes);
if(!$entry){
//this really shouldn't happen
return $username;
$nickname = $username;
}else{
$nickname = $entry->getValue($this->attributes['nickname'],'single');
if($nickname){
return $nickname;
}else{
return $username;
if(!$nickname){
$nickname = $username;
}
}
return common_nicknamize($nickname);
}
//---utility functions---//