po: use discussionpage config setting

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

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 72668d26a9d596c8b340946b2051fa4ad840949e..37b6f2a62667600c0ad181eb448d4629504bdd4c 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -6,21 +6,21 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

-sub getuser () { #{{{
+sub getuser () {

        my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
        if (! defined $user) {
                error("cannot determine username for $<");
        }
        return $user;
        my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
        if (! defined $user) {
                error("cannot determine username for $<");
        }
        return $user;

-} #}}}
+}

 
 

-sub trusted () { #{{{
+sub trusted () {

        my $user=getuser();
        return ! ref $config{untrusted_committers} ||
                ! grep { $_ eq $user } @{$config{untrusted_committers}};
        my $user=getuser();
        return ! ref $config{untrusted_committers} ||
                ! grep { $_ eq $user } @{$config{untrusted_committers}};

-} #}}}
+}

 
 

-sub gen_wrapper () { #{{{
+sub gen_wrapper () {

        # Test for commits from untrusted committers in the wrapper, to
        # avoid loading ikiwiki at all for trusted commits.
 
        # Test for commits from untrusted committers in the wrapper, to
        # avoid loading ikiwiki at all for trusted commits.
 


@@ -43,9 +43,9 @@ EOF
        }
 EOF
        return $ret;
        }
 EOF
        return $ret;

-} #}}}
+}

 
 

-sub test () { #{{{
+sub test () {

        exit 0 if trusted();
        
        IkiWiki::lockwiki();
        exit 0 if trusted();
        
        IkiWiki::lockwiki();


@@ -130,6 +130,6 @@ sub test () { #{{{
        }
 
        exit 0;
        }
 
        exit 0;

-} #}}}
+}

 
 1
 
 1