X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b38b9327a8f11b642e5f51f7ee537043e25ccff9..83056abb8788e55041f2ea535236afd20736a659:/IkiWiki/Plugin/openid.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index f19a559a9..bd67384f2 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -77,14 +77,14 @@ sub openid_selector {
 
 	my $template=IkiWiki::template("openid-selector.tmpl");
 	$template->param(
-		cgiurl => $config{cgiurl},
+		cgiurl => IkiWiki::cgiurl(),
 		(defined $openid_error ? (openid_error => $openid_error) : ()),
 		(defined $openid_url ? (openid_url => $openid_url) : ()),
 		($real_cgi_signin ? (nonopenidform => $real_cgi_signin->($q, $session, 1)) : ()),
 	);
 
 	IkiWiki::printheader($session);
-	print IkiWiki::misctemplate("signin", $template->output);
+	print IkiWiki::cgitemplate($q, "signin", $template->output);
 	exit;
 }
 
@@ -148,7 +148,7 @@ sub validate ($$$;$) {
 	}
 
 	my $cgiurl=$config{openid_cgiurl};
-	$cgiurl=$config{cgiurl} if ! defined $cgiurl;
+	$cgiurl=$q->url if ! defined $cgiurl;
 
 	my $trust_root=$config{openid_realm};
 	$trust_root=$cgiurl if ! defined $trust_root;
@@ -175,7 +175,7 @@ sub auth ($$) {
 			IkiWiki::redirect($q, $setup_url);
 		}
 		elsif ($csr->user_cancel) {
-			IkiWiki::redirect($q, $config{url});
+			IkiWiki::redirect($q, IkiWiki::baseurl(undef));
 		}
 		elsif (my $vident = $csr->verified_identity) {
 			$session->param(name => $vident->url);
@@ -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) {
+				$session->param(nickname =>
+					Encode::decode_utf8($nickname));
 			}
 		}
 		else {
@@ -249,7 +249,7 @@ sub getobj ($$) {
 	}
 	
 	my $cgiurl=$config{openid_cgiurl};
-	$cgiurl=$config{cgiurl} if ! defined $cgiurl;
+	$cgiurl=$q->url if ! defined $cgiurl;
 
 	return Net::OpenID::Consumer->new(
 		ua => $ua,