X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..dd0e043fd8bf69edaeec469e6560944cacdc984f:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 03d63cc23..8bd056248 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -15,12 +15,19 @@ sub userinfo_retrieve () { #{{{
 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;
@@ -85,14 +92,13 @@ sub set_banned_users (@) { #{{{
 	return userinfo_store($userinfo);
 } #}}}
 
+# Global used to pass information into the PageSpec function.
+our $committer;
+
 sub commit_notify_list ($@) { #{{{
-	my $committer=shift;
-	
-	my @pages;
-	foreach my $file (@_) {
-		push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-	}
-	
+	$committer=shift;
+	my @pages = map pagename($_), @_;
+
 	my @ret;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
@@ -101,7 +107,8 @@ 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}, "") }
+	    	    	map pagename($_), @_) {
 			push @ret, $userinfo->{$user}->{email};
 		}
 	}
@@ -132,6 +139,10 @@ sub send_commit_mails ($$$@) { #{{{
 		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);
 
@@ -147,7 +158,6 @@ sub send_commit_mails ($$$@) { #{{{
 		defined(my $pid = fork) or error("Can't fork: $!");
 		return if $pid;
 		setsid() or error("Can't start a new session: $!");
-		eval q{use POSIX 'setsid'};
 		chdir '/';
 		open STDIN, '/dev/null';
 		open STDOUT, '>/dev/null';
@@ -170,4 +180,13 @@ sub send_commit_mails ($$$@) { #{{{
 	}
 } #}}}
 
+package IkiWiki::PageSpec;
+
+sub match_user ($$$) { #{{{
+	shift;
+	my $user=shift;
+
+	return $user eq $committer;
+} #}}}
+
 1