(no commit message)

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 5f0551d9272972d34d685df5ecc57e3802ca054f..c2a8da29f853ec5f13e8fab959773751cc86ada9 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -41,6 +41,8 @@ sub needsbuild (@) {
                        }
                }
        }
                        }
                }
        }

+
+       return $needsbuild;

 }
 
 sub preprocess (@) {
 }
 
 sub preprocess (@) {


@@ -56,11 +58,17 @@ sub preprocess (@) {
        }
 
        my $link=linkpage($params{template});
        }
 
        my $link=linkpage($params{template});

+       add_depends($params{page}, $link, deptype("presence"));

        my $bestlink=bestlink($params{page}, $link);
        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;
 
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 

-       return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
-       add_depends($params{page}, $link, deptype("presence"));
+       return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
+               length $bestlink;

        return sprintf(gettext("edittemplate %s registered for %s"),
                htmllink($params{page}, $params{destpage}, $link),
                $params{match});
        return sprintf(gettext("edittemplate %s registered for %s"),
                htmllink($params{page}, $params{destpage}, $link),
                $params{match});


@@ -99,9 +107,11 @@ sub formbuilder (@) {
                                                my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
                                                $form->field(name => "editcontent",
                                                         value =>  filltemplate($template, $page));
                                                my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};
                                                $form->field(name => "editcontent",
                                                         value =>  filltemplate($template, $page));

-                                               $form->field(name => "type",
-                                                        value => pagetype($pagesources{$template}))
+                                               my $type=pagetype($pagesources{$template})

                                                                if $pagesources{$template};
                                                                if $pagesources{$template};

+                                               $form->field(name => "type",
+                                                        value => $type)
+                                                               if defined $type;

                                                return;
                                        }
                                }
                                                return;
                                        }
                                }


@@ -114,32 +124,40 @@ 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 ($@) {
        };
        if ($@) {

+               # gettext can clobber $@
+               my $error = $@;

                # Indicate that the earlier preprocessor directive set 
                # up a template that doesn't work.
                # 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:")." $error]]";

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

+       if ($template->query(name => 'uuid')) {
+               my $uuid;
+               if (open(my $fh, "<", "/proc/sys/kernel/random/uuid")) {
+                       $uuid = <$fh>;
+                       chomp $uuid;
+                       close $fh;
+               }
+               else {
+                       eval {
+                               require UUID::Tiny;
+                               $uuid = UUID::Tiny::create_uuid_as_string(UUID::Tiny::UUID_V4());
+                       };
+               }
+               $template->param(uuid => $uuid);
+       }
+
+       my $time = time();
+       $template->param(time => IkiWiki::date_3339($time));
+

        return $template->output;
 }
 
        return $template->output;
 }