editpage, comments: Fix broken links in sidebar (due to forcebaseurl). (Thanks, privat)

[ikiwiki.git] / IkiWiki / UserInfo.pm

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index f4e261563d3ef625be6e776014a93eaf7fd691f5..0bf100a959c934d23c8f73ac1f0962f856732a35 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,26 +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;
 
@@ -31,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;
@@ -46,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;
        
@@ -58,27 +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 page_subscribers (@) { #{{{
-       my @ret;
-       my $userinfo=userinfo_retrieve();
-       foreach my $user (keys %{$userinfo}) {
-               if (exists $user->{subscriptions} &&
-                   length $user->{subscriptions} &&
-                   exists $user->{email} &&
-                   length $user->{email} &&
-                   grep { globmatch($_, $user->{subscriptions}) } @_) {
-                       push @ret, $user->{email};
-               }
-       }
-       return @ret;
-} #}}}
+}
 
 1