X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3676ab329d40de55fa11b4862cc3fb5350ceedb3..30b101e6e8ffa5d02af9b44bfb9abdc2f2a84547:/IkiWiki/Plugin/emailauth.pm

diff --git a/IkiWiki/Plugin/emailauth.pm b/IkiWiki/Plugin/emailauth.pm
index a589199d3..9c595dc86 100644
--- 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 ($$) {
@@ -80,10 +86,12 @@ sub email_auth ($$$$) {
 	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 | $shorturl",
 		Message => $template->output,
@@ -140,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") : "");