Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 4f07866e443c61ff73e778620e691d85c81f2084..c2a8da29f853ec5f13e8fab959773751cc86ada9 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -107,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;
                                        }
                                }


@@ -128,16 +130,34 @@ sub filltemplate ($$) {
                $template=template("/".$template_page);
        };
        if ($@) {
                $template=template("/".$template_page);
        };
        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 template:")." $@]]";
-       }
-       if (! defined $template) {
-               return;
+               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;
 }