revert spam

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

diff --git a/IkiWiki/Plugin/emailauth.pm b/IkiWiki/Plugin/emailauth.pm
index aa067238fb77e81cbcf3ab1f7eab5b39fc9de7c6..becf40ca506a234082eb837f27b892b083639d54 100644 (file)
--- a/IkiWiki/Plugin/emailauth.pm
+++ b/IkiWiki/Plugin/emailauth.pm
@@ -26,6 +26,12 @@ sub getsetup () {
                        rebuild => 0,
                        section => "auth",
                },
+               emailauth_sender => {
+                       type => "string",
+                       description => "email address to send emailauth mails as (default: adminemail)",
+                       safe => 1,
+                       rebuild => 0,
+               },
 }
 
 sub email_setup ($$) {
@@ -70,7 +76,7 @@ sub email_auth ($$$$) {
        $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,
                ),
@@ -78,14 +84,18 @@ sub email_auth ($$$$) {
        
        eval q{use Mail::Sendmail};
        error($@) if $@;
+       my $shorturl=$config{url};
+       $shorturl=~s/^https?:\/\///i;
+       my $emailauth_sender=$config{emailauth_sender};
+       $emailauth_sender=$config{adminemail} unless defined $emailauth_sender;
        sendmail(
                To => $email,
                From => "$config{wikiname} admin <".
-                       (defined $config{adminemail} ? $config{adminemail} : "")
+                       (defined $emailauth_sender ? $emailauth_sender : "")
                        .">",
-               Subject => "$config{wikiname} login",
+               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."));
 }
@@ -138,7 +148,7 @@ sub gentoken ($$) {
        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") : "");