po: new po_translation_status_in_links option

[git.ikiwiki.info.git] / IkiWiki / Plugin / lockedit.pm

diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 010705c49a4fc460976b3239227c972d05d6df76..31a9e70cd919124beb1b01b944b000b682e210be 100644 (file)
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -5,13 +5,30 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
 use strict;
 use IkiWiki 2.00;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "lockedit", call => \&getsetup);

        hook(type => "canedit", id => "lockedit", call => \&canedit);
        hook(type => "formbuilder_setup", id => "lockedit",
             call => \&formbuilder_setup);
        hook(type => "canedit", id => "lockedit", call => \&canedit);
        hook(type => "formbuilder_setup", id => "lockedit",
             call => \&formbuilder_setup);

-} # }}}
+}

 
 

-sub canedit ($$) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+               locked_pages => {
+                       type => "pagespec",
+                       example => "!*/Discussion",
+                       description => "PageSpec controlling which pages are locked",
+                       link => "ikiwiki/PageSpec",
+                       safe => 1,
+                       rebuild => 0,
+               },
+}
+
+sub canedit ($$) {

        my $page=shift;
        my $cgi=shift;
        my $session=shift;
        my $page=shift;
        my $cgi=shift;
        my $session=shift;


@@ -19,50 +36,79 @@ sub canedit ($$) { #{{{
        my $user=$session->param("name");
        return undef if defined $user && IkiWiki::is_admin($user);
 
        my $user=$session->param("name");
        return undef if defined $user && IkiWiki::is_admin($user);
 

+       if (defined $config{locked_pages} && length $config{locked_pages} &&
+           pagespec_match($page, $config{locked_pages},
+                   user => $session->param("name"),
+                   ip => $ENV{REMOTE_ADDR},
+           )) {
+               if (! defined $user ||
+                   ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
+                       return sub { IkiWiki::needsignin($cgi, $session) };
+               }
+               else {
+                       return sprintf(gettext("%s is locked and cannot be edited"),
+                               htmllink("", "", $page, noimageinline => 1));
+                       
+               }
+       }
+
+       # XXX deprecated, should be removed eventually

        foreach my $admin (@{$config{adminuser}}) {
        foreach my $admin (@{$config{adminuser}}) {

-               if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) {
+               if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"),
+                   user => $session->param("name"),
+                   ip => $ENV{REMOTE_ADDR},
+               )) {

                        if (! defined $user ||
                            ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
                                return sub { IkiWiki::needsignin($cgi, $session) };
                        }
                        else {
                        if (! defined $user ||
                            ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
                                return sub { IkiWiki::needsignin($cgi, $session) };
                        }
                        else {

-                               return sprintf(gettext("%s is locked by %s and cannot be edited"),
-                                       htmllink("", "", $page, noimageinline => 1),
-                                       IkiWiki::userlink($admin));
+                               return sprintf(gettext("%s is locked and cannot be edited"),
+                                       htmllink("", "", $page, noimageinline => 1));

                        }
                }
        }
 
        return undef;
                        }
                }
        }
 
        return undef;

-} #}}}
+}

 
 

-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {

        my %params=@_;
        my %params=@_;

-       
-       my $form=$params{form};
-       my $session=$params{session};
-       my $cgi=$params{cgi};
-       my $user_name=$session->param("name");

 
 

+       # XXX deprecated, should be removed eventually  
+       my $form=$params{form};

        if ($form->title eq "preferences") {
        if ($form->title eq "preferences") {

+               my $session=$params{session};
+               my $cgi=$params{cgi};
+               my $user_name=$session->param("name");
+

                $form->field(name => "locked_pages", size => 50,
                        fieldset => "admin",
                $form->field(name => "locked_pages", size => 50,
                        fieldset => "admin",

-                       comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");
+                       comment => "deprecated; please move to locked_pages in setup file"
+               );

                if (! IkiWiki::is_admin($user_name)) {
                        $form->field(name => "locked_pages", type => "hidden");
                }
                if (! $form->submitted) {
                if (! IkiWiki::is_admin($user_name)) {
                        $form->field(name => "locked_pages", type => "hidden");
                }
                if (! $form->submitted) {

-                       $form->field(name => "locked_pages", force => 1,
-                               value => IkiWiki::userinfo_get($user_name, "locked_pages"));
+                       my $value=IkiWiki::userinfo_get($user_name, "locked_pages");
+                       if (length $value) {
+                               $form->field(name => "locked_pages", force => 1, value => $value);
+                       }
+                       else {
+                               $form->field(name => "locked_pages", type => "hidden");
+                       }

                }
                if ($form->submitted && $form->submitted eq 'Save Preferences') {
                        if (defined $form->field("locked_pages")) {
                                IkiWiki::userinfo_set($user_name, "locked_pages",
                                        $form->field("locked_pages")) ||
                                                error("failed to set locked_pages");
                }
                if ($form->submitted && $form->submitted eq 'Save Preferences') {
                        if (defined $form->field("locked_pages")) {
                                IkiWiki::userinfo_set($user_name, "locked_pages",
                                        $form->field("locked_pages")) ||
                                                error("failed to set locked_pages");

+                               if (! length $form->field("locked_pages")) {
+                                       $form->field(name => "locked_pages", type => "hidden");
+                               }

                        }
                }
        }
                        }
                }
        }

-} #}}}
+}

 
 1
 
 1