po(nicepagetitle): forgot to display %

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

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index a0b1327b44fdeac0b3b37e46e863de95a0ad360e..3423dc92335c9a0139e02d0562ee1ac9c01121c4 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,18 +1,18 @@
 #!/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 $userinfo=shift;
        
        my $newfile="$config{wikistatedir}/userdb.new";


@@ -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,32 @@ 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 () { #{{{
+# 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;
        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);
        my %banned=map { $_ => 1 } @_;
        my $userinfo=userinfo_retrieve();
        foreach my $user (keys %{$userinfo}) {
                $userinfo->{$user}->{banned} = $banned{$user};
        }
        return userinfo_store($userinfo);

-} #}}}
+}

 
 1
 
 1