Merge branch 'master' into aggregateinternal

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

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index fabe495bbe532821f507d6bdaf9342c70fb9ed3c..109a6cb5f24eff1c54e3e9ac722babb12a3753cb 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,26 +1,33 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use Storable;
 use IkiWiki;
 
 use warnings;
 use strict;
 use Storable;
 use IkiWiki;
 

-package IkiWiki;
-

 sub userinfo_retrieve () { #{{{
        my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
        return $userinfo;
 } #}}}
 sub userinfo_retrieve () { #{{{
        my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
        return $userinfo;
 } #}}}

-       
+

 sub userinfo_store ($) { #{{{
        my $userinfo=shift;
        
 sub userinfo_store ($) { #{{{
        my $userinfo=shift;
        

+       my $newfile="$config{wikistatedir}/userdb.new";

        my $oldmask=umask(077);
        my $oldmask=umask(077);

-       my $ret=Storable::lock_store($userinfo, "$config{wikistatedir}/userdb");
+       my $ret=Storable::lock_nstore($userinfo, $newfile);

        umask($oldmask);
        umask($oldmask);

+       if (defined $ret && $ret) {
+               if (! rename($newfile, "$config{wikistatedir}/userdb")) {
+                       unlink($newfile);
+                       $ret=undef;
+               }
+       }

        return $ret;
 } #}}}
        return $ret;
 } #}}}

-       
+

 sub userinfo_get ($$) { #{{{
        my $user=shift;
        my $field=shift;
 sub userinfo_get ($$) { #{{{
        my $user=shift;
        my $field=shift;


@@ -67,27 +74,22 @@ sub is_admin ($) { #{{{
        return grep { $_ eq $user_name } @{$config{adminuser}};
 } #}}}
 
        return grep { $_ eq $user_name } @{$config{adminuser}};
 } #}}}
 

-sub commit_notify_list ($@) { #{{{
-       my $committer=shift;
-       
-       my @pages;
-       foreach my $file (@_) {
-               push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-       }
-       
+sub get_banned_users () { #{{{

        my @ret;
        my $userinfo=userinfo_retrieve();
        foreach my $user (keys %{$userinfo}) {
        my @ret;
        my $userinfo=userinfo_retrieve();
        foreach my $user (keys %{$userinfo}) {

-               next if $user eq $committer;
-               if (exists $userinfo->{$user}->{subscriptions} &&
-                   length $userinfo->{$user}->{subscriptions} &&
-                   exists $userinfo->{$user}->{email} &&
-                   length $userinfo->{$user}->{email} &&
-                   grep { globlist_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
-                       push @ret, $userinfo->{$user}->{email};
-               }
+               push @ret, $user if $userinfo->{$user}->{banned};

        }
        return @ret;
 } #}}}
 
        }
        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);
+} #}}}
+

 1
 1