X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2e11f8a81f254d3ef971a8b8ae8007d3518b1383..4745391360cf0843e376676479fee306d0a8312d:/IkiWiki/Plugin/inline.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index d49993e5f..ebeb23178 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -4,12 +4,17 @@ package IkiWiki::Plugin::inline; use warnings; use strict; -use IkiWiki 1.00; +use Encode; +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); + hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi); 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); + } # }}} 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; @@ -67,6 +95,8 @@ sub preprocess_inline (@) { #{{{ my $atom=($config{atom} && exists $params{atom}) ? yesno($params{atom}) : $config{atom}; 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; } @@ -87,7 +117,7 @@ sub preprocess_inline (@) { #{{{ my @list; foreach my $page (keys %pagesources) { next if $page eq $params{page}; - if (pagespec_match($page, $params{pages}, $params{page})) { + if (pagespec_match($page, $params{pages}, location => $params{page})) { push @list, $page; } } @@ -95,6 +125,9 @@ sub preprocess_inline (@) { #{{{ if (exists $params{sort} && $params{sort} eq 'title') { @list=sort @list; } + elsif (exists $params{sort} && $params{sort} eq 'mtime') { + @list=sort { $pagemtime{$b} <=> $pagemtime{$a} } @list; + } elsif (! exists $params{sort} || $params{sort} eq 'age') { @list=sort { $pagectime{$b} <=> $pagectime{$a} } @list; } @@ -115,18 +148,48 @@ sub preprocess_inline (@) { #{{{ } add_depends($params{page}, $params{pages}); + # Explicitly add all currently displayed pages as dependencies, so + # 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 $rssurl=rsspage(basename($params{page})); - my $atomurl=atompage(basename($params{page})); + my $feedid=join("\0", map { $_."\0".$params{$_} } sort keys %params); + if (exists $knownfeeds{$feedid}) { + $feednum=$knownfeeds{$feedid}; + } + else { + if (exists $page_numfeeds{$params{destpage}}) { + $feednum=$knownfeeds{$feedid}=++$page_numfeeds{$params{destpage}}; + } + else { + $feednum=$knownfeeds{$feedid}=""; + $page_numfeeds{$params{destpage}}=1; + } + } + + my $rssurl=basename(rsspage($params{destpage}).$feednum); + my $atomurl=basename(atompage($params{destpage}).$feednum); my $ret=""; - if (exists $params{rootpage} && $config{cgiurl}) { + if ($config{cgiurl} && (exists $params{rootpage} || + (exists $params{postform} && yesno($params{postform})))) { # Add a blog post form, with feed buttons. my $formtemplate=template("blogpost.tmpl", blind_cache => 1); $formtemplate->param(cgiurl => $config{cgiurl}); - $formtemplate->param(rootpage => $params{rootpage}); + $formtemplate->param(rootpage => + exists $params{rootpage} ? $params{rootpage} : $params{page}); $formtemplate->param(rssurl => $rssurl) if $feeds && $rss; $formtemplate->param(atomurl => $atomurl) if $feeds && $atom; + if (exists $params{postformtext}) { + $formtemplate->param(postformtext => + $params{postformtext}); + } + else { + $formtemplate->param(postformtext => + gettext("Add a new post titled:")); + } $ret.=$formtemplate->output; } elsif ($feeds) { @@ -137,71 +200,68 @@ sub preprocess_inline (@) { #{{{ $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); - } - # Don't use htmllink because this way the - # title is separate and can be overridden by - # other plugins. - my $link=bestlink($params{page}, $page); - $link=htmlpage($link) if defined $type; - $link=abs2rel($link, dirname($params{destpage})); - $template->param(pageurl => $link); - $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(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 => $page)); - } + + 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, - readfile(srcfile($file))))); + else { + if (defined $type) { + $ret.="\n". + linkify($page, $params{destpage}, + preprocess($page, $params{destpage}, + filter($page, $params{destpage}, + readfile(srcfile($file))))); + } } } } @@ -210,19 +270,24 @@ sub preprocess_inline (@) { #{{{ if (exists $params{feedshow} && @list > $params{feedshow}) { @list=@list[0..$params{feedshow} - 1]; } + if (exists $params{feedpages}) { + @list=grep { pagespec_match($_, $params{feedpages}, location => $params{page}) } @list; + } if ($rss) { - will_render($params{page}, rsspage($params{page})); - writefile(rsspage($params{page}), $config{destdir}, - genfeed("rss", $rssurl, $desc, $params{page}, @list)); - $toping{$params{page}}=1 unless $config{rebuild}; + my $rssp=rsspage($params{destpage}).$feednum; + will_render($params{destpage}, $rssp); + writefile($rssp, $config{destdir}, + genfeed("rss", $rssurl, $desc, $params{destpage}, @list)); + $toping{$params{destpage}}=1 unless $config{rebuild}; $feedlinks{$params{destpage}}=qq{}; } if ($atom) { - will_render($params{page}, atompage($params{page})); - writefile(atompage($params{page}), $config{destdir}, - genfeed("atom", $atomurl, $desc, $params{page}, @list)); - $toping{$params{page}}=1 unless $config{rebuild}; + my $atomp=atompage($params{destpage}).$feednum; + will_render($params{destpage}, $atomp); + writefile($atomp, $config{destdir}, + genfeed("atom", $atomurl, $desc, $params{destpage}, @list)); + $toping{$params{destpage}}=1 unless $config{rebuild}; $feedlinks{$params{destpage}}=qq{}; } } @@ -249,7 +314,7 @@ sub get_inline_content ($$) { #{{{ return htmlize($page, $type, linkify($page, $destpage, preprocess($page, $destpage, - filter($page, + filter($page, $destpage, readfile(srcfile($file)))))); } else { @@ -260,8 +325,6 @@ sub get_inline_content ($$) { #{{{ sub date_822 ($) { #{{{ my $time=shift; - eval q{use POSIX}; - error($@) if $@; my $lc_time=POSIX::setlocale(&POSIX::LC_TIME); POSIX::setlocale(&POSIX::LC_TIME, "C"); my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time)); @@ -272,11 +335,9 @@ sub date_822 ($) { #{{{ sub date_3339 ($) { #{{{ my $time=shift; - eval q{use POSIX}; - error($@) if $@; 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; } #}}} @@ -289,22 +350,18 @@ sub absolute_urls ($$) { #{{{ my $url=$baseurl; $url=~s/[^\/]+$//; - $content=~s/(new(encode_utf8($config{url}."/".htmlpage($page))); + my $url=URI->new(encode_utf8($config{url}."/".urlto($page,""))); my $itemtemplate=template($feedtype."item.tmpl", blind_cache => 1); my $content=""; my $lasttime = 0; foreach my $p (@pages) { - my $u=URI->new(encode_utf8($config{url}."/".htmlpage($p))); - + my $u=URI->new(encode_utf8($config{url}."/".urlto($p, ""))); 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, - 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")) { @@ -364,12 +422,12 @@ sub genfeed ($$$$@) { #{{{ $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( - title => $page ne "index" ? pagetitle($page, 1) : $config{wikiname}, + title => $page ne "index" ? pagetitle($page) : $config{wikiname}, wikiname => $config{wikiname}, pageurl => $url, content => $content, @@ -399,7 +457,6 @@ sub pingurl (@) { #{{{ defined(my $pid = fork) or error("Can't fork: $!"); return if $pid; chdir '/'; - eval q{use POSIX 'setsid'}; setsid() or error("Can't start a new session: $!"); open STDIN, '/dev/null'; open STDOUT, '>/dev/null'; @@ -410,7 +467,7 @@ sub pingurl (@) { #{{{ foreach my $page (keys %toping) { my $title=pagetitle(basename($page), 0); - my $url="$config{url}/".htmlpage($page); + my $url="$config{url}/".urlto($page, ""); foreach my $pingurl (@{$config{pingurl}}) { debug("Pinging $pingurl for $page"); eval {