X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..160326b46936d94bd60727112ad31e45360c9ee0:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index eb21959f9..fee3e06b7 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,13 +4,14 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
-use IkiWiki 1.00;
-use IkiWiki::Render; # for displaytime
+use Encode;
+use IkiWiki 2.00;
 use URI;
 
 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",
@@ -20,6 +21,7 @@ sub import { #{{{
 	# pings interrupting page builds.
 	hook(type => "change", id => "inline", 
 		call => \&IkiWiki::pingurl);
+
 } # }}}
 
 sub getopt () { #{{{
@@ -44,6 +46,27 @@ 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);
+	}
+}
+
 # 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 +91,7 @@ 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};
 	if (! exists $params{show} && ! $archive) {
 		$params{show}=10;
 	}
@@ -78,11 +102,17 @@ sub preprocess_inline (@) { #{{{
 		$desc = $config{wikiname};
 	}
 	my $actions=yesno($params{actions});
+	if (exists $params{template}) {
+		$params{template}=~s/[^-_a-zA-Z0-9]+//g;
+	}
+	else {
+		$params{template} = $archive ? "archivepage" : "inlinepage";
+	}
 
 	my @list;
 	foreach my $page (keys %pagesources) {
 		next if $page eq $params{page};
-		if (pagespec_match($page, $params{pages})) {
+		if (pagespec_match($page, $params{pages}, location => $params{page})) {
 			push @list, $page;
 		}
 	}
@@ -90,6 +120,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;
 	}
@@ -97,6 +130,10 @@ sub preprocess_inline (@) { #{{{
 		return sprintf(gettext("unknown sort type %s"), $params{sort});
 	}
 
+	if (yesno($params{reverse})) {
+		@list=reverse(@list);
+	}
+
 	if (exists $params{skip}) {
 		@list=@list[$params{skip} .. scalar @list - 1];
 	}
@@ -106,18 +143,32 @@ 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 $rssurl=rsspage(basename($params{page}));
-	my $atomurl=atompage(basename($params{page}));
+	my $rssurl=basename(rsspage($params{page}));
+	my $atomurl=basename(atompage($params{page}));
 	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) {
@@ -128,10 +179,12 @@ sub preprocess_inline (@) { #{{{
 		$ret.=$linktemplate->output;
 	}
 	
-	my $template=template(
-		($archive ? "inlinepagetitle.tmpl" : "inlinepage.tmpl"),
-		blind_cache => 1,
-	) unless $raw;
+	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};
@@ -144,13 +197,7 @@ sub preprocess_inline (@) { #{{{
 				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(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 			$template->param(title => pagetitle(basename($page)));
 			$template->param(ctime => displaytime($pagectime{$page}));
 
@@ -158,12 +205,22 @@ sub preprocess_inline (@) { #{{{
 				my $file = $pagesources{$page};
 				my $type = pagetype($file);
 				if ($config{discussion}) {
-					$template->param(have_actions => 1);
-					$template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
+					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{page},
+								gettext("Discussion"),
+								noimageinline => 1,
+								forcesubpage => 1));
+					}
 				}
 				if (length $config{cgiurl} && defined $type) {
 					$template->param(have_actions => 1);
-					$template->param(editurl => cgiurl(do => "edit", page => $page));
+					$template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
 				}
 			}
 
@@ -180,25 +237,36 @@ sub preprocess_inline (@) { #{{{
 				$ret.="\n".
 				      linkify($page, $params{page},
 				      preprocess($page, $params{page},
-				      filter($page,
+				      filter($page, $params{page},
 				      readfile(srcfile($file)))));
 			}
 		}
 	}
 	
-	if ($feeds && $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};
-		$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/rss+xml" title="RSS" href="$rssurl" />};
-	}
-	if ($feeds && $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};
-		$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+	if ($feeds) {
+		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) {
+			my $rssp=rsspage($params{page});
+			will_render($params{page}, $rssp);
+			writefile($rssp, $config{destdir},
+				genfeed("rss", $rssurl, $desc, $params{page}, @list));
+			$toping{$params{page}}=1 unless $config{rebuild};
+			$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);
+			writefile($atomp, $config{destdir},
+				genfeed("atom", $atomurl, $desc, $params{page}, @list));
+			$toping{$params{page}}=1 unless $config{rebuild};
+			$feedlinks{$params{destpage}}=qq{<link rel="alternate" type="application/atom+xml" title="Atom" href="$atomurl" />};
+		}
 	}
 	
 	return $ret;
@@ -223,7 +291,7 @@ sub get_inline_content ($$) { #{{{
 		return htmlize($page, $type,
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
-		       filter($page,
+		       filter($page, $destpage,
 		       readfile(srcfile($file))))));
 	}
 	else {
@@ -234,9 +302,7 @@ sub get_inline_content ($$) { #{{{
 sub date_822 ($) { #{{{
 	my $time=shift;
 
-	eval q{use POSIX};
-	error($@) if $@;
-	my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+	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));
 	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
@@ -246,9 +312,7 @@ sub date_822 ($) { #{{{
 sub date_3339 ($) { #{{{
 	my $time=shift;
 
-	eval q{use POSIX};
-	error($@) if $@;
-	my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+	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));
 	POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
@@ -263,22 +327,18 @@ sub absolute_urls ($$) { #{{{
 	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;
 } #}}}
 
 sub rsspage ($) { #{{{
-	my $page=shift;
-
-	return $page.".rss";
+	return targetpage(shift, "rss");
 } #}}}
 
 sub atompage ($) { #{{{
-	my $page=shift;
-
-	return $page.".atom";
+	return targetpage(shift, "atom");
 } #}}}
 
 sub genfeed ($$$$@) { #{{{
@@ -288,22 +348,23 @@ sub genfeed ($$$$@) { #{{{
 	my $page=shift;
 	my @pages=@_;
 	
-	my $url=URI->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")) {
@@ -338,12 +399,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,
@@ -373,7 +434,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';
@@ -384,7 +444,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 {