X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b6509c74a96ee5b16c774c5365f5ab6e542d180b..c849a9f409e8b3cd5091dd8b674670850d7bd3b9:/IkiWiki/UserInfo.pm?ds=sidebyside

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index ae63d8023..0bf100a95 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,27 +1,34 @@
 #!/usr/bin/perl
 
+package IkiWiki;
+
 use warnings;
 use strict;
 use Storable;
 use IkiWiki;
 
-package IkiWiki;
-
-sub userinfo_retrieve () { #{{{
+sub userinfo_retrieve () {
 	my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
 	return $userinfo;
-} #}}}
-	
-sub userinfo_store ($) { #{{{
+}
+
+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 ($$) { #{{{
+}
+
+sub userinfo_get ($$) {
 	my $user=shift;
 	my $field=shift;
 
@@ -32,9 +39,9 @@ sub userinfo_get ($$) { #{{{
 		return "";
 	}
 	return $userinfo->{$user}->{$field};
-} #}}}
+}
 
-sub userinfo_set ($$$) { #{{{
+sub userinfo_set ($$$) {
 	my $user=shift;
 	my $field=shift;
 	my $value=shift;
@@ -47,9 +54,9 @@ sub userinfo_set ($$$) { #{{{
 	
 	$userinfo->{$user}->{$field}=$value;
 	return userinfo_store($userinfo);
-} #}}}
+}
 
-sub userinfo_setall ($$) { #{{{
+sub userinfo_setall ($$) {
 	my $user=shift;
 	my $info=shift;
 	
@@ -59,53 +66,12 @@ sub userinfo_setall ($$) { #{{{
 	}
 	$userinfo->{$user}=$info;
 	return userinfo_store($userinfo);
-} #}}}
+}
 
-sub is_admin ($) { #{{{
+sub is_admin ($) {
 	my $user_name=shift;
 
 	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;
-	foreach my $file (@_) {
-		push @pages, grep { $pagesources{$_} eq $file } keys %pagesources;
-	}
-	
-	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 { pagespec_match($_, $userinfo->{$user}->{subscriptions}) } @pages) {
-			push @ret, $userinfo->{$user}->{email};
-		}
-	}
-	return @ret;
-} #}}}
+}
 
 1