X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0ae1e4cc0e598eacfeb508d11db81c33169631fd..45fb0371db05027ee0d822264f81a77c02970586:/IkiWiki/Plugin/openid.pm

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 0220a3cf6..bd2cfdc44 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -84,7 +84,7 @@ sub openid_selector {
 	);
 
 	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=IkiWiki::cgiurl() if ! defined $cgiurl;
+	$cgiurl=$q->url if ! defined $cgiurl;
 
 	my $trust_root=$config{openid_realm};
 	$trust_root=$cgiurl if ! defined $trust_root;
@@ -229,6 +229,7 @@ sub getobj ($$) {
 	my $q=shift;
 	my $session=shift;
 
+	eval q{use Net::INET6Glue::INET_is_INET6}; # may not be available
 	eval q{use Net::OpenID::Consumer};
 	error($@) if $@;
 
@@ -249,7 +250,7 @@ sub getobj ($$) {
 	}
 	
 	my $cgiurl=$config{openid_cgiurl};
-	$cgiurl=IkiWiki::cgiurl() if ! defined $cgiurl;
+	$cgiurl=$q->url if ! defined $cgiurl;
 
 	return Net::OpenID::Consumer->new(
 		ua => $ua,