X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5cd32c2eeeafc5e9f3feae7983fc48a9711462a3..a8c5c8c0ba4deba4f396f6d491970256907569b3:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index bbcddb616..ae63d8023 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -3,6 +3,7 @@
 use warnings;
 use strict;
 use Storable;
+use IkiWiki;
 
 package IkiWiki;
 
@@ -66,9 +67,31 @@ sub is_admin ($) { #{{{
 	return grep { $_ eq $user_name } @{$config{adminuser}};
 } #}}}
 
+sub get_banned_users () { #{{{
+	my @ret;
+	my $userinfo=userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		push @ret, $user if $userinfo->{$user}->{banned};
+	}
+	return @ret;
+} #}}}
+
+sub set_banned_users (@) { #{{{
+	my %banned=map { $_ => 1 } @_;
+	my $userinfo=userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		$userinfo->{$user}->{banned} = $banned{$user};
+	}
+	return userinfo_store($userinfo);
+} #}}}
+
 sub commit_notify_list ($@) { #{{{
 	my $committer=shift;
-	my @pages=@_;
+	
+	my @pages;
+	foreach my $file (@_) {
+		push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
+	}
 	
 	my @ret;
 	my $userinfo=userinfo_retrieve();
@@ -78,7 +101,7 @@ sub commit_notify_list ($@) { #{{{
 		    length $userinfo->{$user}->{subscriptions} &&
 		    exists $userinfo->{$user}->{email} &&
 		    length $userinfo->{$user}->{email} &&
-		    grep { globlist_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
+		    grep { pagespec_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
 			push @ret, $userinfo->{$user}->{email};
 		}
 	}