* Only try postsignin if no other action matched. Fixes a bug where the

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 063673730ca88e9f30fe6762863e75ee2ae47a71..53b051816740db8a2448ac76c04192e887843eb1 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,12 +4,17 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use Encode;

 use IkiWiki 2.00;
 use URI;
 
 use IkiWiki 2.00;
 use URI;
 

+my %knownfeeds;
+my %page_numfeeds;
+

 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
        hook(type => "checkconfig", id => "inline", call => \&checkconfig);

+       hook(type => "sessioncgi", id => "inline", call => \&sessioncgi);

        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
        hook(type => "preprocess", id => "inline", 
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",


@@ -19,6 +24,7 @@ sub import { #{{{
        # pings interrupting page builds.
        hook(type => "change", id => "inline", 
                call => \&IkiWiki::pingurl);
        # pings interrupting page builds.
        hook(type => "change", id => "inline", 
                call => \&IkiWiki::pingurl);

+

 } # }}}
 
 sub getopt () { #{{{
 } # }}}
 
 sub getopt () { #{{{


@@ -43,6 +49,28 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub sessioncgi () { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       if ($q->param('do') eq 'blog') {
+               my $page=decode_utf8($q->param('title'));
+               $page=~s/\///g; # no slashes in blog posts
+               # if the page already exists, munge it to be unique
+               my $from=$q->param('from');
+               my $add="";
+               while (exists $IkiWiki::pagecase{lc($from."/".IkiWiki::titlepage($page).$add)}) {
+                       $add=1 unless length $add;
+                       $add++;
+               }
+               $q->param('page', $page.$add);
+               # now go create the page
+               $q->param('do', 'create');
+               IkiWiki::cgi_editpage($q, $session);
+               exit;
+       }
+}
+

 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin.
 package IkiWiki;
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin.
 package IkiWiki;


@@ -68,6 +96,7 @@ sub preprocess_inline (@) { #{{{
        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
        $feeds=0 if $params{preview};
        my $quick=exists $params{quick} ? yesno($params{quick}) : 0;
        my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick;
        $feeds=0 if $params{preview};

+       my $feedonly=yesno($params{feedonly});

        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }
        if (! exists $params{show} && ! $archive) {
                $params{show}=10;
        }


@@ -123,9 +152,29 @@ sub preprocess_inline (@) { #{{{
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        add_depends($params{page}, join(" or ", @list));
        # that if they are removed or otherwise changed, the inline will be
        # sure to be updated.
        add_depends($params{page}, join(" or ", @list));

+       
+       my $feednum="";
+
+       my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params);
+       if (exists $knownfeeds{$feedid}) {
+               $feednum=$knownfeeds{$feedid};
+       }
+       else {
+               if (exists $page_numfeeds{$params{destpage}}) {
+                       if ($feeds) {
+                               $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}};
+                       }
+               }
+               else {
+                       $feednum=$knownfeeds{$feedid}="";
+                       if ($feeds) {
+                               $page_numfeeds{$params{destpage}}=1;
+                       }
+               }
+       }

 
 

-       my $rssurl=basename(rsspage($params{page}));
-       my $atomurl=basename(atompage($params{page}));
+       my $rssurl=basename(rsspage($params{destpage}).$feednum) if $feeds && $rss;
+       my $atomurl=basename(atompage($params{destpage}).$feednum) if $feeds && $atom;

        my $ret="";
 
        if ($config{cgiurl} && (exists $params{rootpage} ||
        my $ret="";
 
        if ($config{cgiurl} && (exists $params{rootpage} ||


@@ -155,65 +204,68 @@ sub preprocess_inline (@) { #{{{
                $ret.=$linktemplate->output;
        }
        
                $ret.=$linktemplate->output;
        }
        

-       my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
-       if (! @params) {
-               return sprintf(gettext("nonexistant template %s"), $params{template});
-       }
-       my $template=HTML::Template->new(@params) unless $raw;
+       if (! $feedonly) {
+               require HTML::Template;
+               my @params=IkiWiki::template_params($params{template}.".tmpl", blind_cache => 1);
+               if (! @params) {
+                       return sprintf(gettext("nonexistant template %s"), $params{template});
+               }
+               my $template=HTML::Template->new(@params) unless $raw;

        
        

-       foreach my $page (@list) {
-               my $file = $pagesources{$page};
-               my $type = pagetype($file);
-               if (! $raw || ($raw && ! defined $type)) {
-                       unless ($archive && $quick) {
-                               # Get the content before populating the
-                               # template, since getting the content uses
-                               # the same template if inlines are nested.
-                               my $content=get_inline_content($page, $params{destpage});
-                               $template->param(content => $content);
-                       }
-                       $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
-                       $template->param(title => pagetitle(basename($page)));
-                       $template->param(ctime => displaytime($pagectime{$page}));
-
-                       if ($actions) {
-                               my $file = $pagesources{$page};
-                               my $type = pagetype($file);
-                               if ($config{discussion}) {
-                                       my $discussionlink=gettext("discussion");
-                                       if ($page !~ /.*\/\Q$discussionlink\E$/ &&
-                                           (length $config{cgiurl} ||
-                                            exists $links{$page."/".$discussionlink})) {
+               foreach my $page (@list) {
+                       my $file = $pagesources{$page};
+                       my $type = pagetype($file);
+                       if (! $raw || ($raw && ! defined $type)) {
+                               unless ($archive && $quick) {
+                                       # Get the content before populating the
+                                       # template, since getting the content uses
+                                       # the same template if inlines are nested.
+                                       my $content=get_inline_content($page, $params{destpage});
+                                       $template->param(content => $content);
+                               }
+                               $template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+                               $template->param(title => pagetitle(basename($page)));
+                               $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+       
+                               if ($actions) {
+                                       my $file = $pagesources{$page};
+                                       my $type = pagetype($file);
+                                       if ($config{discussion}) {
+                                               my $discussionlink=gettext("discussion");
+                                               if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+                                                   (length $config{cgiurl} ||
+                                                    exists $links{$page."/".$discussionlink})) {
+                                                       $template->param(have_actions => 1);
+                                                       $template->param(discussionlink =>
+                                                               htmllink($page,
+                                                                       $params{destpage},
+                                                                       gettext("Discussion"),
+                                                                       noimageinline => 1,
+                                                                       forcesubpage => 1));
+                                               }
+                                       }
+                                       if (length $config{cgiurl} && defined $type) {

                                                $template->param(have_actions => 1);
                                                $template->param(have_actions => 1);

-                                               $template->param(discussionlink =>
-                                                       htmllink($page,
-                                                               $params{page},
-                                                               gettext("Discussion"),
-                                                               noimageinline => 1,
-                                                               forcesubpage => 1));
+                                               $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));

                                        }
                                }
                                        }
                                }

-                               if (length $config{cgiurl} && defined $type) {
-                                       $template->param(have_actions => 1);
-                                       $template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
-                               }
+       
+                               run_hooks(pagetemplate => sub {
+                                       shift->(page => $page, destpage => $params{destpage},
+                                               template => $template,);
+                               });
+       
+                               $ret.=$template->output;
+                               $template->clear_params;

                        }
                        }

-
-                       run_hooks(pagetemplate => sub {
-                               shift->(page => $page, destpage => $params{page},
-                                       template => $template,);
-                       });
-
-                       $ret.=$template->output;
-                       $template->clear_params;
-               }
-               else {
-                       if (defined $type) {
-                               $ret.="\n".
-                                     linkify($page, $params{page},
-                                     preprocess($page, $params{page},
-                                     filter($page, $params{page},
-                                     readfile(srcfile($file)))));
+                       else {
+                               if (defined $type) {
+                                       $ret.="\n".
+                                             linkify($page, $params{destpage},
+                                             preprocess($page, $params{destpage},
+                                             filter($page, $params{destpage},
+                                             readfile(srcfile($file)))));
+                               }

                        }
                }
        }
                        }
                }
        }


@@ -227,19 +279,19 @@ sub preprocess_inline (@) { #{{{
                }
        
                if ($rss) {
                }
        
                if ($rss) {

-                       my $rssp=rsspage($params{page});
-                       will_render($params{page}, $rssp);
+                       my $rssp=rsspage($params{destpage}).$feednum;
+                       will_render($params{destpage}, $rssp);

                        writefile($rssp, $config{destdir},
                        writefile($rssp, $config{destdir},

-                               genfeed("rss", $rssurl, $desc, $params{page}, @list));
-                       $toping{$params{page}}=1 unless $config{rebuild};
+                               genfeed("rss", $rssurl, $desc, $params{destpage}, @list));
+                       $toping{$params{destpage}}=1 unless $config{rebuild};

                        $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
                }
                if ($atom) {
                        $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
                }
                if ($atom) {

-                       my $atomp=atompage($params{page});
-                       will_render($params{page}, $atomp);
+                       my $atomp=atompage($params{destpage}).$feednum;
+                       will_render($params{destpage}, $atomp);

                        writefile($atomp, $config{destdir},
                        writefile($atomp, $config{destdir},

-                               genfeed("atom", $atomurl, $desc, $params{page}, @list));
-                       $toping{$params{page}}=1 unless $config{rebuild};
+                               genfeed("atom", $atomurl, $desc, $params{destpage}, @list));
+                       $toping{$params{destpage}}=1 unless $config{rebuild};

                        $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
                }
        }
                        $feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
                }
        }


@@ -289,7 +341,7 @@ sub date_3339 ($) { #{{{
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");
 
        my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");

-       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", localtime($time));
+       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));

        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
 } #}}}
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
        return $ret;
 } #}}}


@@ -302,9 +354,9 @@ sub absolute_urls ($$) { #{{{
        my $url=$baseurl;
        $url=~s/[^\/]+$//;
        
        my $url=$baseurl;
        $url=~s/[^\/]+$//;
        

-       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(#[^"]+)"/$1 href="$baseurl$2"/ig;
-       $content=~s/(<a(?:\s+(?:class|id)="?\w+"?)?)\s+href="(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/ig;
-       $content=~s/(<img(?:\s+(?:class|id)="?\w+"?)?)\s+src="(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/ig;
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
+       $content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:\/\/)([^"]+)"/$1 href="$url$2"/mig;
+       $content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:\/\/)([^"]+)"/$1 src="$url$2"/mig;

        return $content;
 } #}}}
 
        return $content;
 } #}}}
 


@@ -333,11 +385,13 @@ sub genfeed ($$$$@) { #{{{
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(
                my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
 
                $itemtemplate->param(

-                       title => pagetitle(basename($p), 1),
+                       title => pagetitle(basename($p)),

                        url => $u,
                        permalink => $u,
                        url => $u,
                        permalink => $u,

-                       date_822 => date_822($pagectime{$p}),
-                       date_3339 => date_3339($pagectime{$p}),
+                       cdate_822 => date_822($pagectime{$p}),
+                       mdate_822 => date_822($pagemtime{$p}),
+                       cdate_3339 => date_3339($pagectime{$p}),
+                       mdate_3339 => date_3339($pagemtime{$p}),

                );
 
                if ($itemtemplate->query(name => "enclosure")) {
                );
 
                if ($itemtemplate->query(name => "enclosure")) {


@@ -372,12 +426,12 @@ sub genfeed ($$$$@) { #{{{
                $content.=$itemtemplate->output;
                $itemtemplate->clear_params;
 
                $content.=$itemtemplate->output;
                $itemtemplate->clear_params;
 

-               $lasttime = $pagectime{$p} if $pagectime{$p} > $lasttime;
+               $lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;

        }
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        $template->param(
        }
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);
        $template->param(

-               title => $page ne "index" ? pagetitle($page, 1) : $config{wikiname},
+               title => $page ne "index" ? pagetitle($page) : $config{wikiname},

                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,
                wikiname => $config{wikiname},
                pageurl => $url,
                content => $content,