openid: Automatically upgrade openid_realm to https when accessed via https.

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 98308de135ba42c6efc5d574b261d51cc5f18e29..c7f1e4fa7f7117660b5d89207a1795caec9fc6af 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -3,11 +3,11 @@ package IkiWiki::Plugin::edittemplate;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use HTML::Template;
 use Encode;
 
 use HTML::Template;
 use Encode;
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "edittemplate",
                call => \&getsetup);
        hook(type => "needsbuild", id => "edittemplate",
        hook(type => "getsetup", id => "edittemplate",
                call => \&getsetup);
        hook(type => "needsbuild", id => "edittemplate",


@@ -16,17 +16,18 @@ sub import { #{{{
                call => \&preprocess);
        hook(type => "formbuilder", id => "edittemplate",
                call => \&formbuilder);
                call => \&preprocess);
        hook(type => "formbuilder", id => "edittemplate",
                call => \&formbuilder);

-} #}}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => undef,
        return
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "web",

                },
                },

-} #}}}
+}

 
 

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

        my $needsbuild=shift;
 
        foreach my $page (keys %pagestate) {
        my $needsbuild=shift;
 
        foreach my $page (keys %pagestate) {


@@ -40,9 +41,11 @@ sub needsbuild (@) { #{{{
                        }
                }
        }
                        }
                }
        }

-} #}}}

 
 

-sub preprocess (@) { #{{{
+       return $needsbuild;
+}
+
+sub preprocess (@) {

         my %params=@_;
 
        return "" if $params{page} ne $params{destpage};
         my %params=@_;
 
        return "" if $params{page} ne $params{destpage};


@@ -54,18 +57,29 @@ sub preprocess (@) { #{{{
                error gettext("match not specified")
        }
 
                error gettext("match not specified")
        }
 

-       $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
+       my $link=linkpage($params{template});
+       add_depends($params{page}, $link, deptype("presence"));
+       my $bestlink=bestlink($params{page}, $link);
+       if (! length $bestlink) {
+               add_depends($params{page}, "templates/$link", deptype("presence"));
+               $link="/templates/".$link;
+               $bestlink=bestlink($params{page}, $link);
+       }
+       $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;

 
 

+       return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
+               length $bestlink;

        return sprintf(gettext("edittemplate %s registered for %s"),
        return sprintf(gettext("edittemplate %s registered for %s"),

-               $params{template}, $params{match});
-} # }}}
+               htmllink($params{page}, $params{destpage}, $link),
+               $params{match});
+}

 
 

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

        my %params=@_;
        my $form=$params{form};
 
        return if $form->field("do") ne "create" ||
        my %params=@_;
        my $form=$params{form};
 
        return if $form->field("do") ne "create" ||

-               length $form->field("editcontent");
+               (defined $form->field("editcontent") && length $form->field("editcontent"));

        
        my $page=$form->field("page");
        
        
        my $page=$form->field("page");
        


@@ -78,56 +92,52 @@ sub formbuilder (@) { #{{{
        foreach my $field ($form->field) {
                if ($field eq 'page') {
                        @page_locs=$field->def_value;
        foreach my $field ($form->field) {
                if ($field eq 'page') {
                        @page_locs=$field->def_value;

-                       push @page_locs, $field->options;
+
+                       # FormBuilder is on the bad crack. See #551499
+                       my @options=map { ref $_ ? @$_ : $_ } $field->options;
+
+                       push @page_locs, @options;

                }
        }
                }
        }

-

        foreach my $p (@page_locs) {
                foreach my $registering_page (keys %pagestate) {
                        if (exists $pagestate{$registering_page}{edittemplate}) {
                                foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
                                        if (pagespec_match($p, $pagespec, location => $registering_page)) {
        foreach my $p (@page_locs) {
                foreach my $registering_page (keys %pagestate) {
                        if (exists $pagestate{$registering_page}{edittemplate}) {
                                foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
                                        if (pagespec_match($p, $pagespec, location => $registering_page)) {

+                                               my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};

                                                $form->field(name => "editcontent",
                                                $form->field(name => "editcontent",

-                                                        value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+                                                        value =>  filltemplate($template, $page));
+                                               my $type=pagetype($pagesources{$template})
+                                                               if $pagesources{$template};
+                                               $form->field(name => "type",
+                                                        value => $type)
+                                                               if defined $type;

                                                return;
                                        }
                                }
                        }
                }
        }
                                                return;
                                        }
                                }
                        }
                }
        }

-} #}}}
+}

 
 

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

        my $template_page=shift;
        my $page=shift;
 
        my $template_page=shift;
        my $page=shift;
 

-       my $template_file=$pagesources{$template_page};
-       if (! defined $template_file) {
-               return;
-       }
-

        my $template;
        eval {
        my $template;
        eval {

-               $template=HTML::Template->new(
-                       filter => sub {
-                               my $text_ref = shift;
-                               $$text_ref=&Encode::decode_utf8($$text_ref);
-                               chomp $$text_ref;
-                       },
-                       filename => srcfile($template_file),
-                       die_on_bad_params => 0,
-                       no_includes => 1,
-               );
+               # force page name absolute so it doesn't look in templates/
+               $template=template("/".$template_page);

        };
        if ($@) {
                # Indicate that the earlier preprocessor directive set 
                # up a template that doesn't work.
        };
        if ($@) {
                # Indicate that the earlier preprocessor directive set 
                # up a template that doesn't work.

-               return "[[!pagetemplate ".gettext("failed to process")." $@]]";
+               return "[[!edittemplate ".gettext("failed to process template:")." $@]]";

        }
 
        $template->param(name => $page);
 
        return $template->output;
        }
 
        $template->param(name => $page);
 
        return $template->output;

-} #}}}
+}

 
 1
 
 1