Merge branch 'master' into next

[git.ikiwiki.info.git] / doc / todo / blogpost_plugin.mdwn

diff --git a/doc/todo/blogpost_plugin.mdwn b/doc/todo/blogpost_plugin.mdwn
index ecb5f94544f84504550feff6e298a7ebc7b8d133..bb91ffd02a299f6cb6e44e2ab241854338237515 100644 (file)
--- a/doc/todo/blogpost_plugin.mdwn
+++ b/doc/todo/blogpost_plugin.mdwn
@@ -51,13 +51,13 @@ Index: IkiWiki/Plugin/blogpost.pm
 +use POSIX;
 +use IkiWiki 2.00;
 +
 +use POSIX;
 +use IkiWiki 2.00;
 +

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

 +      hook(type => "checkconfig", id => "blogpost", call => \&checkconfig);
 +      hook(type => "authcgi", id => "blogpost", call => \&authcgi);
 +      hook(type => "canedit", id => "blogpost", call => \&canedit);
 +      hook(type => "checkconfig", id => "blogpost", call => \&checkconfig);
 +      hook(type => "authcgi", id => "blogpost", call => \&authcgi);
 +      hook(type => "canedit", id => "blogpost", call => \&canedit);

-+} # }}}
++}

 +
 +

-+sub checkconfig () { #{{{
++sub checkconfig () {

 +      if (! defined $config{blogformat}){
 +              $config{blogformat} = 'posts/%Y/%m/%d/$title';
 +      }
 +      if (! defined $config{blogformat}){
 +              $config{blogformat} = 'posts/%Y/%m/%d/$title';
 +      }


@@ -72,9 +72,9 @@ Index: IkiWiki/Plugin/blogpost.pm
 +      if (! defined $config{blogusers}) {
 +              $config{blogusers} = (); # disallow all posting by default
 +      }
 +      if (! defined $config{blogusers}) {
 +              $config{blogusers} = (); # disallow all posting by default
 +      }

-+} #}}}
++}

 +
 +

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

 +      my $cgi=shift;
 +      my $session=shift;
 +
 +      my $cgi=shift;
 +      my $session=shift;
 +


@@ -115,16 +115,16 @@ Index: IkiWiki/Plugin/blogpost.pm
 +              $cgi->param("page", $page);
 +      }
 +
 +              $cgi->param("page", $page);
 +      }
 +

-+} #}}}
++}

 +
 +

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

 +      my $title=shift;
 +      my $page=POSIX::strftime $config{blogformat}, localtime;
 +      $page =~ s/\$title/$title/;
 +      return $page;
 +      my $title=shift;
 +      my $page=POSIX::strftime $config{blogformat}, localtime;
 +      $page =~ s/\$title/$title/;
 +      return $page;

-+} #}}}
++}

 +
 +

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

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


@@ -136,7 +136,7 @@ Index: IkiWiki/Plugin/blogpost.pm
 +      return "" if ($config{blogusers} eq "*" ||
 +                    grep {$_ eq $user} $config{blogusers});
 +      return ("not allowed to blog, $user");
 +      return "" if ($config{blogusers} eq "*" ||
 +                    grep {$_ eq $user} $config{blogusers});
 +      return ("not allowed to blog, $user");

-+} #}}}
++}

 +
 +1
 Index: IkiWiki.pm
 +
 +1
 Index: IkiWiki.pm


@@ -151,4 +151,6 @@ Index: IkiWiki.pm
                   %config %links %renderedfiles %pagesources %destsources);
  our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
  our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
                   %config %links %renderedfiles %pagesources %destsources);
  our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
  our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE

-</pre>
\ No newline at end of file
+</pre>
+
+[[!tag patch]]