explanation

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

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index bbcddb6162cfde668a8665ad498a78fcc4f9e5c7..ae63d80235af328a8197775fdde3f75ec8ba31e2 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -3,6 +3,7 @@
 use warnings;
 use strict;
 use Storable;
 use warnings;
 use strict;
 use Storable;

+use IkiWiki;

 
 package IkiWiki;
 
 
 package IkiWiki;
 


@@ -66,9 +67,31 @@ sub is_admin ($) { #{{{
        return grep { $_ eq $user_name } @{$config{adminuser}};
 } #}}}
 
        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;
 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();
        
        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} &&
                    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};
                }
        }
                        push @ret, $userinfo->{$user}->{email};
                }
        }