X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b7f64d884cd8bd8e1d9e8fb75735530d4c8a135d..f621761b0cf761904e875bc0d2f84a9d38e47ddc:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 8c27714b8..dcf99da09 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,25 +1,33 @@
 #!/usr/bin/perl
 
+package IkiWiki;
+
 use warnings;
 use strict;
 use Storable;
-
-package IkiWiki;
+use IkiWiki;
 
 sub userinfo_retrieve () { #{{{
 	my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
 	return $userinfo;
 } #}}}
-	
+
 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_nstore($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;
@@ -66,19 +74,24 @@ sub is_admin ($) { #{{{
 	return grep { $_ eq $user_name } @{$config{adminuser}};
 } #}}}
 
-sub page_subscribers (@) { #{{{
+# XXX deprecated, should be removed eventually
+sub get_banned_users () { #{{{
 	my @ret;
 	my $userinfo=userinfo_retrieve();
 	foreach my $user (keys %{$userinfo}) {
-		if (exists $userinfo->{$user}->{subscriptions} &&
-		    length $userinfo->{$user}->{subscriptions} &&
-		    exists $userinfo->{$user}->{email} &&
-		    length $userinfo->{$user}->{email} &&
-		    grep { glob_match($_, $userinfo->{$user}->{subscriptions}) } @_) {
-			push @ret, $userinfo->{$user}->{email};
-		}
+		push @ret, $user if $userinfo->{$user}->{banned};
 	}
 	return @ret;
 } #}}}
 
+# XXX deprecated, should be removed eventually
+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