X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b6509c74a96ee5b16c774c5365f5ab6e542d180b..c16a80651401e4f020d79fd16cb41b0151f51d97:/IkiWiki/UserInfo.pm?ds=inline

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index ae63d8023..cfc27609d 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -11,16 +11,23 @@ sub userinfo_retrieve () { #{{{
 	my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
 	return $userinfo;
 } #}}}
-	
+
 sub userinfo_store ($) { #{{{
 	my $userinfo=shift;
 	
+	my $newfile="$config{wikistatedir}/userdb.new";
 	my $oldmask=umask(077);
-	my $ret=Storable::lock_store($userinfo, "$config{wikistatedir}/userdb");
+	my $ret=Storable::lock_store($userinfo, $newfile);
 	umask($oldmask);
+	if (defined $ret && $ret) {
+		if (! rename($newfile, "$config{wikistatedir}/userdb")) {
+			unlink($newfile);
+			$ret=undef;
+		}
+	}
 	return $ret;
 } #}}}
-	
+
 sub userinfo_get ($$) { #{{{
 	my $user=shift;
 	my $field=shift;
@@ -87,12 +94,8 @@ sub set_banned_users (@) { #{{{
 
 sub commit_notify_list ($@) { #{{{
 	my $committer=shift;
-	
-	my @pages;
-	foreach my $file (@_) {
-		push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-	}
-	
+	my @pages = map pagename($_), @_;
+
 	my @ret;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
@@ -101,11 +104,79 @@ sub commit_notify_list ($@) { #{{{
 		    length $userinfo->{$user}->{subscriptions} &&
 		    exists $userinfo->{$user}->{email} &&
 		    length $userinfo->{$user}->{email} &&
-		    grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
+		    grep { pagespec_match($_,
+				    $userinfo->{$user}->{subscriptions}, 
+				    user => $committer) }
+	    	    	map pagename($_), @_) {
 			push @ret, $userinfo->{$user}->{email};
 		}
 	}
 	return @ret;
 } #}}}
 
+sub send_commit_mails ($$$@) { #{{{
+	my $messagesub=shift;
+	my $diffsub=shift;
+	my $user=shift;
+	my @changed_pages=@_;
+
+	return unless @changed_pages;
+
+	my @email_recipients=commit_notify_list($user, @changed_pages);
+	if (@email_recipients) {
+		# TODO: if a commit spans multiple pages, this will send
+		# subscribers a diff that might contain pages they did not
+		# sign up for. Should separate the diff per page and
+		# reassemble into one mail with just the pages subscribed to.
+		my $diff=$diffsub->();
+		my $message=$messagesub->();
+
+		my $pagelist;
+		if (@changed_pages > 2) {
+			$pagelist="$changed_pages[0] $changed_pages[1] ...";
+		}
+		else {
+			$pagelist.=join(" ", @changed_pages);
+		}
+		#translators: The three variables are the name of the wiki,
+		#translators: A list of one or more pages that were changed,
+		#translators: And the name of the user making the change.
+		#translators: This is used as the subject of a commit email.
+		my $subject=sprintf(gettext("update of %s's %s by %s"), 
+			$config{wikiname}, $pagelist, $user);
+
+		my $template=template("notifymail.tmpl");
+		$template->param(
+			wikiname => $config{wikiname},
+			diff => $diff,
+			user => $user,
+			message => $message,
+		);
+
+		# Daemonize, in case the mail sending takes a while.
+		defined(my $pid = fork) or error("Can't fork: $!");
+		return if $pid;
+		setsid() or error("Can't start a new session: $!");
+		chdir '/';
+		open STDIN, '/dev/null';
+		open STDOUT, '>/dev/null';
+		open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");
+
+		unlockwiki(); # don't need to keep a lock on the wiki
+
+		eval q{use Mail::Sendmail};
+		error($@) if $@;
+		foreach my $email (@email_recipients) {
+			sendmail(
+				To => $email,
+				From => "$config{wikiname} <$config{adminemail}>",
+				Subject => $subject,
+				Message => $template->output,
+			);
+		}
+
+		exit 0; # daemon process done
+	}
+} #}}}
+
 1