diff options
author | Joey Hess <joey@kitenet.net> | 2010-06-23 20:12:26 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-06-23 20:16:01 -0400 |
commit | 9a32451986c710d1f1ce71217c1f7ab3b84f72bf (patch) | |
tree | c3bf789d7d0e247327d94e5ff696ba50aba81526 /IkiWiki/Plugin/openid.pm | |
parent | a4f381ace837a032bc202cc6b2a98e922d4b7cfc (diff) | |
download | ikiwiki-9a32451986c710d1f1ce71217c1f7ab3b84f72bf.tar ikiwiki-9a32451986c710d1f1ce71217c1f7ab3b84f72bf.tar.gz |
finializing openid nickname support
Renamed usershort => nickname.
Note that this means existing user login sessions will not have the nickname
recorded, and so it won't be used for those.
Diffstat (limited to 'IkiWiki/Plugin/openid.pm')
-rw-r--r-- | IkiWiki/Plugin/openid.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index f19a559a9..d393afd23 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -187,16 +187,16 @@ sub auth ($$) { $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'), ); } - my $username; + my $nickname; foreach my $ext (@extensions) { foreach my $field (qw{value.email email}) { if (exists $ext->{$field} && defined $ext->{$field} && length $ext->{$field}) { $session->param(email => $ext->{$field}); - if (! defined $username && + if (! defined $nickname && $ext->{$field}=~/(.+)@.+/) { - $username = $1; + $nickname = $1; } last; } @@ -205,14 +205,14 @@ sub auth ($$) { if (exists $ext->{$field} && defined $ext->{$field} && length $ext->{$field}) { - $username=$ext->{$field}; + $nickname=$ext->{$field}; last; } } } - if (defined $username) { - $username=~s/\s+/_/g; - $session->param(username => $username); + if (defined $nickname) { + $nickname=~s/\s+/_/g; + $session->param(nickname => $nickname); } } else { |