Added a comment: Solution

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

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index 2ffc51c55feb6978e47c6e2147eaf45c414ef8f5..0bf100a959c934d23c8f73ac1f0962f856732a35 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,23 +1,23 @@
 #!/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 () { #{{{
+sub userinfo_retrieve () {

        my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
        return $userinfo;
        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 $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")) {
        umask($oldmask);
        if (defined $ret && $ret) {
                if (! rename($newfile, "$config{wikistatedir}/userdb")) {


@@ -26,9 +26,9 @@ sub userinfo_store ($) { #{{{
                }
        }
        return $ret;
                }
        }
        return $ret;

-} #}}}
+}

 
 

-sub userinfo_get ($$) { #{{{
+sub userinfo_get ($$) {

        my $user=shift;
        my $field=shift;
 
        my $user=shift;
        my $field=shift;
 


@@ -39,9 +39,9 @@ sub userinfo_get ($$) { #{{{
                return "";
        }
        return $userinfo->{$user}->{$field};
                return "";
        }
        return $userinfo->{$user}->{$field};

-} #}}}
+}

 
 

-sub userinfo_set ($$$) { #{{{
+sub userinfo_set ($$$) {

        my $user=shift;
        my $field=shift;
        my $value=shift;
        my $user=shift;
        my $field=shift;
        my $value=shift;


@@ -54,9 +54,9 @@ sub userinfo_set ($$$) { #{{{
        
        $userinfo->{$user}->{$field}=$value;
        return userinfo_store($userinfo);
        
        $userinfo->{$user}->{$field}=$value;
        return userinfo_store($userinfo);

-} #}}}
+}

 
 

-sub userinfo_setall ($$) { #{{{
+sub userinfo_setall ($$) {

        my $user=shift;
        my $info=shift;
        
        my $user=shift;
        my $info=shift;
        


@@ -66,30 +66,12 @@ sub userinfo_setall ($$) { #{{{
        }
        $userinfo->{$user}=$info;
        return userinfo_store($userinfo);
        }
        $userinfo->{$user}=$info;
        return userinfo_store($userinfo);

-} #}}}
+}

 
 

-sub is_admin ($) { #{{{
+sub is_admin ($) {

        my $user_name=shift;
 
        return grep { $_ eq $user_name } @{$config{adminuser}};
        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);
-} #}}}
+}

 
 1
 
 1