add

[git.ikiwiki.info.git] / IkiWiki / UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 02c27991c585a7d31053c030f19ebae54fa4840b..8bd056248ff1ee02884fc7f6847b9e9dc83ad8f1 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -92,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}) {
@@ -108,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};
                }
        }
@@ -158,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';
@@ -181,4 +180,13 @@ sub send_commit_mails ($$$@) { #{{{
        }
 } #}}}
 
+package IkiWiki::PageSpec;
+
+sub match_user ($$$) { #{{{
+       shift;
+       my $user=shift;
+
+       return $user eq $committer;
+} #}}}
+
 1