X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/65ddd9ee21d0faa8e02b3c32dc396210d97275de..f850acc6ad8a780a6b913df1099b8563647de03d:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index d48b8071c..02c27991c 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;
@@ -101,7 +108,7 @@ 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}, "") } @pages) {
 			push @ret, $userinfo->{$user}->{email};
 		}
 	}
@@ -125,14 +132,19 @@ sub send_commit_mails ($$$@) { #{{{
 		my $diff=$diffsub->();
 		my $message=$messagesub->();
 
-		my $subject="update of $config{wikiname}'s ";
+		my $pagelist;
 		if (@changed_pages > 2) {
-			$subject.="$changed_pages[0] $changed_pages[1] etc";
+			$pagelist="$changed_pages[0] $changed_pages[1] ...";
 		}
 		else {
-			$subject.=join(" ", @changed_pages);
+			$pagelist.=join(" ", @changed_pages);
 		}
-		$subject.=" by $user";
+		#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(
@@ -146,11 +158,11 @@ 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’};
+		eval q{use POSIX 'setsid'};
 		chdir '/';
 		open STDIN, '/dev/null';
 		open STDOUT, '>/dev/null';
-		open STDERR, '>&STDOUT' or error("Can’t dup stdout: $!");
+		open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");
 
 		unlockwiki(); # don't need to keep a lock on the wiki
 
@@ -162,7 +174,7 @@ sub send_commit_mails ($$$@) { #{{{
 				From => "$config{wikiname} <$config{adminemail}>",
 				Subject => $subject,
 				Message => $template->output,
-			) or error("Failed to send update notification mail");
+			);
 		}
 
 		exit 0; # daemon process done