smcvpostcomment: import other plugins lazily and remove unnecessary use of CGI

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

diff --git a/IkiWiki/Plugin/smcvpostcomment.pm b/IkiWiki/Plugin/smcvpostcomment.pm
index 562dc9ed5e462848e4354b986c5211e50f836517..40ffe816425722d89852bf37ee59479dbfe398f5 100644 (file)
--- a/IkiWiki/Plugin/smcvpostcomment.pm
+++ b/IkiWiki/Plugin/smcvpostcomment.pm
@@ -8,9 +8,6 @@ package IkiWiki::Plugin::smcvpostcomment;
 use warnings;
 use strict;
 use IkiWiki 2.00;
 use warnings;
 use strict;
 use IkiWiki 2.00;

-use IkiWiki::Plugin::inline;
-use IkiWiki::Plugin::mdwn;
-use CGI 'escapeHTML';

 
 use constant PLUGIN => "smcvpostcomment";
 use constant PREVIEW => "Preview";
 
 use constant PLUGIN => "smcvpostcomment";
 use constant PREVIEW => "Preview";


@@ -24,6 +21,13 @@ sub import { #{{{
        hook(type => "htmlize", id => "_".PLUGIN,
                call => \&IkiWiki::Plugin::mdwn::htmlize);
        IkiWiki::loadplugin("inline");
        hook(type => "htmlize", id => "_".PLUGIN,
                call => \&IkiWiki::Plugin::mdwn::htmlize);
        IkiWiki::loadplugin("inline");

+       IkiWiki::loadplugin("mdwn");
+} # }}}
+
+sub htmlize { # {{{
+       eval { use IkiWiki::Plugin::mdwn; };
+       error($@) if ($@);
+       return IkiWiki::Plugin::mdwn::htmlize(@_)

 } # }}}
 
 sub getsetup () { #{{{
 } # }}}
 
 sub getsetup () { #{{{


@@ -63,16 +67,30 @@ sub preprocess (@) { #{{{
 
        debug("page $params{page} => destpage $params{destpage}");
 
 
        debug("page $params{page} => destpage $params{destpage}");
 

-       # I'm reasonably sure that this counts as abuse of [[!inline]]
-       return $formtemplate->output . "\n" .
-               IkiWiki::preprocess_inline(
+       my $posts = '';
+       unless (defined $params{inline} && !IkiWiki::yesno($params{inline})) {
+               eval { use IkiWiki::Plugin::inline; };
+               error($@) if ($@);
+               my @args = (

                        pages => "internal($params{page}/_comment_*)",
                        template => PLUGIN . "_display",
                        show => 0,
                        reverse => "yes",
                        pages => "internal($params{page}/_comment_*)",
                        template => PLUGIN . "_display",
                        show => 0,
                        reverse => "yes",

+                       # special stuff passed through

                        page => $params{page},
                        destpage => $params{destpage},
                        page => $params{page},
                        destpage => $params{destpage},

-                       preview => $params{preview});
+                       preview => $params{preview},
+               );
+               push @args, atom => $params{atom} if defined $params{atom};
+               push @args, rss => $params{rss} if defined $params{rss};
+               push @args, feeds => $params{feeds} if defined $params{feeds};
+               push @args, feedshow => $params{feedshow} if defined $params{feedshow};
+               push @args, timeformat => $params{timeformat} if defined $params{timeformat};
+               push @args, feedonly => $params{feedonly} if defined $params{feedonly};
+               $posts = "\n" . IkiWiki::preprocess_inline(@args);
+       }
+
+       return $formtemplate->output . $posts;

 } # }}}
 
 # FIXME: logic taken from editpage, should be common code?
 } # }}}
 
 # FIXME: logic taken from editpage, should be common code?