X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cddc335b2bd98a302b261200c12d61b05476d727..149a3e65a75d3d6e1b2106be00c7ec675c26406a:/IkiWiki/UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 2ffc51c55..3423dc923 100644
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,23 +1,23 @@
 #!/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, $newfile);
+	my $ret=Storable::lock_nstore($userinfo, $newfile);
 	umask($oldmask);
 	if (defined $ret && $ret) {
 		if (! rename($newfile, "$config{wikistatedir}/userdb")) {
@@ -26,9 +26,9 @@ sub userinfo_store ($) { #{{{
 		}
 	}
 	return $ret;
-} #}}}
+}
 
-sub userinfo_get ($$) { #{{{
+sub userinfo_get ($$) {
 	my $user=shift;
 	my $field=shift;
 
@@ -39,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;
@@ -54,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;
 	
@@ -66,30 +66,32 @@ 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 () { #{{{
+# XXX deprecated, should be removed eventually
+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 (@) { #{{{
+# 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