aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/common.pl6
-rwxr-xr-xwww/login.pl2
2 files changed, 2 insertions, 6 deletions
diff --git a/www/common.pl b/www/common.pl
index a094442..63b8d0f 100644
--- a/www/common.pl
+++ b/www/common.pl
@@ -35,11 +35,7 @@ sub email_users($) {
sub reluri($$) {
my ($cgi, $x) = @_;
- my $uri = URI->new($cgi->url(-full=>1));
- my @path = $uri->path_segments;
- pop @path;
- push @path, $x;
- $uri->path_segments(@path);
+ my $uri = "https://" . $::MULKONF->{real_domain} . $::MULKONF->{basepath} . "/$x";
return "$uri";
}
diff --git a/www/login.pl b/www/login.pl
index 2be2b77..363f243 100755
--- a/www/login.pl
+++ b/www/login.pl
@@ -74,7 +74,7 @@ while (my $cgi = new CGI::Fast) {
when ('google') {
my $g = Net::Google::FederatedLogin->new(
cgi => $cgi,
- return_to => $cgi->url()
+ return_to => reluri($cgi, "login.pl")
);
$g->verify_auth or die "Could not verify the OpenID assertion!";
my $ext = $g->get_extension('http://openid.net/srv/ax/1.0');