X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/73e32f7fa6851cadae2f2c3f5920cc36c1ad397f..ec371adab1109b338a3de473298b41140ec5017e:/IkiWiki/Plugin/emailauth.pm?ds=inline

diff --git a/IkiWiki/Plugin/emailauth.pm b/IkiWiki/Plugin/emailauth.pm
index 5e74ce8f6..6674fe3d6 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 ($$) {
@@ -78,12 +84,16 @@ 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} ( ".$config{url}." ) login",
+		Subject => "$config{wikiname} login | $shorturl",
 		Message => $template->output,
 	) or error(gettext("Failed to send mail"));