X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d157a97452ae0641f87996b6d0f21c9d222cef3d..684f7d7616fed71e757a9e044f9cc9ee5216d110:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 1db96f9f2..2c5b4a84d 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -91,7 +91,7 @@ sub redirect ($$) {
 	my $q=shift;
 	eval q{use URI};
 
-	my $topurl;
+	my $topurl = $config{cgiurl};
 	if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) {
 		$topurl = $q->url;
 	}
@@ -146,7 +146,7 @@ sub needsignin ($$) {
 	my $q=shift;
 	my $session=shift;
 
-	if (! defined $session->param("name") ||
+	if (! length $session->param("name") ||
 	    ! userinfo_get($session->param("name"), "regdate")) {
 		$session->param(postsignin => $q->query_string);
 		cgi_signin($q, $session);
@@ -217,7 +217,7 @@ sub cgi_postsignin ($$) {
 			error(gettext("probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https"));
 		}
 		else {
-			error(gettext("login failed, perhaps you need to turn on cookies?"));
+			error(gettext("Login succeeded, but I don't remember why you were logging in, so you'll have to navigate back to whatever you were doing. (This should not normally happen. Perhaps you need to enable cookies?)"));
 		}
 	}
 }
@@ -391,7 +391,7 @@ sub checksessionexpiry ($$) {
 
 	if (defined $session->param("name")) {
 		my $sid=$q->param('sid');
-		if (! defined $sid || $sid ne $session->id) {
+		if (! defined $sid || $sid ne $session->id || ! length $session->param("name")) {
 			error(gettext("Your login session has expired."));
 		}
 	}
@@ -444,11 +444,11 @@ sub cgi (;$$) {
 	}
 	
 	# Auth hooks can sign a user in.
-	if ($do ne 'signin' && ! defined $session->param("name")) {
+	if ($do ne 'signin' && ! length $session->param("name")) {
 		run_hooks(auth => sub {
 			shift->($q, $session)
 		});
-		if (defined $session->param("name")) {
+		if (length $session->param("name")) {
 			# Make sure whatever user was authed is in the
 			# userinfo db.
 			if (! userinfo_get($session->param("name"), "regdate")) {
@@ -490,7 +490,8 @@ sub cgierror ($) {
 	print "Content-type: text/html\n\n";
 	print cgitemplate(undef, gettext("Error"),
 		"<p class=\"error\">".gettext("Error").": $message</p>");
-	die $@;
+
+	die $message;
 }
 
 1