websetup timeouts

[git.ikiwiki.info.git] / IkiWiki / Plugin / emailauth.pm

diff --git a/IkiWiki/Plugin/emailauth.pm b/IkiWiki/Plugin/emailauth.pm
index 6674fe3d6b07b91ec9daf0d3276fa8936fc66378..becf40ca506a234082eb837f27b892b083639d54 100644 (file)
--- a/IkiWiki/Plugin/emailauth.pm
+++ b/IkiWiki/Plugin/emailauth.pm
@@ -76,7 +76,7 @@ sub email_auth ($$$$) {
        $template->param(
                wikiname => $config{wikiname},
                # Intentionally using short field names to keep link short.
        $template->param(
                wikiname => $config{wikiname},
                # Intentionally using short field names to keep link short.

-               authurl => IkiWiki::cgiurl_abs(
+               authurl => IkiWiki::cgiurl_abs_samescheme(

                        'e' => $email,
                        'v' => $token,
                ),
                        'e' => $email,
                        'v' => $token,
                ),


@@ -95,7 +95,7 @@ sub email_auth ($$$$) {
                        .">",
                Subject => "$config{wikiname} login | $shorturl",
                Message => $template->output,
                        .">",
                Subject => "$config{wikiname} login | $shorturl",
                Message => $template->output,

-       ) or error(gettext("Failed to send mail"));
+       ) or error(sprintf(gettext("Failed to send mail: %s"), $Mail::Sendmail::error));

 
        $infodisplayer->(gettext("You have been sent an email, with a link you can open to complete the login process."));
 }
 
        $infodisplayer->(gettext("You have been sent an email, with a link you can open to complete the login process."));
 }


@@ -148,7 +148,7 @@ sub gentoken ($$) {
        my $session=shift;
        eval q{use CGI::Session};
        error($@) if $@;
        my $session=shift;
        eval q{use CGI::Session};
        error($@) if $@;

-       my $token = CGI::Session->new->id;
+       my $token = CGI::Session->new("driver:DB_File", undef, {FileName => "/dev/null"})->id;

        IkiWiki::userinfo_set($email, "emailauthexpire", time+(60*60*24));
        IkiWiki::userinfo_set($email, "emailauth", $token);
        IkiWiki::userinfo_set($email, "emailauthpostsignin", defined $session->param("postsignin") ? $session->param("postsignin") : "");
        IkiWiki::userinfo_set($email, "emailauthexpire", time+(60*60*24));
        IkiWiki::userinfo_set($email, "emailauth", $token);
        IkiWiki::userinfo_set($email, "emailauthpostsignin", defined $session->param("postsignin") ? $session->param("postsignin") : "");