X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FText%2FTradition%2FDirectory.pm;h=e07350350e34a696538fe265f8744db9f8e4fec7;hb=a528f0f656c88f72ce332949963b0648193b3b84;hp=ed5f9b21e22142e4aa6267f995be8d8d61d98e60;hpb=8591038d46bc45c2664c0f8f05ed7076ea9ae9f8;p=scpubgit%2Fstemmatology.git diff --git a/lib/Text/Tradition/Directory.pm b/lib/Text/Tradition/Directory.pm index ed5f9b2..e073503 100644 --- a/lib/Text/Tradition/Directory.pm +++ b/lib/Text/Tradition/Directory.pm @@ -378,7 +378,7 @@ sub add_user { my $user = Text::Tradition::User->new( id => $username, password => ($password ? crypt_password($password) : ''), - display => ($userinfo->{display} ? $userinfo->{display} : $username), + email => ($userinfo->{email} ? $userinfo->{email} : $username), role => $role, ); @@ -413,7 +413,7 @@ sub extract_openid_data { ## Somewhat ugly attribute extension reponse, contains ## google-email string which we can use as the id - $userinfo->{display} = $userinfo->{extensions}{'http://openid.net/srv/ax/1.0'}{'value.email'}; + $userinfo->{email} = $userinfo->{extensions}{'http://openid.net/srv/ax/1.0'}{'value.email'}; } return; @@ -442,7 +442,7 @@ sub find_user { my $user = $self->lookup(Text::Tradition::User->id_for_user($username)); return if(!$user || !$user->active); - print STDERR "Found user, $username, display is :", $user->display, ":\n"; + print STDERR "Found user, $username, email is :", $user->email, ":\n"; return $user; }