X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d9a3c2bed29f7ff6f7a12d1d421e4c88fa97b264..14609ab92d01133c6b13fac5c5ae5336d512e8dd:/IkiWiki/Plugin/inline.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 67aaa817e..0b3d5e406 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -4,12 +4,14 @@ package IkiWiki::Plugin::inline;
 
 use warnings;
 use strict;
+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",
@@ -19,6 +21,7 @@ sub import { #{{{
 	# pings interrupting page builds.
 	hook(type => "change", id => "inline", 
 		call => \&IkiWiki::pingurl);
+
 } # }}}
 
 sub getopt () { #{{{
@@ -43,6 +46,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;
@@ -68,6 +93,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 $feedonly=yesno($params{feedonly});
 	if (! exists $params{show} && ! $archive) {
 		$params{show}=10;
 	}
@@ -155,65 +181,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);
-			}
-			$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}));
+	
+				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{page},
+									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 => pagetitle($page, 1)));
-				}
+	
+				run_hooks(pagetemplate => sub {
+					shift->(page => $page, destpage => $params{page},
+						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{page},
+					      preprocess($page, $params{page},
+					      filter($page, $params{page},
+					      readfile(srcfile($file)))));
+				}
 			}
 		}
 	}
@@ -289,7 +318,7 @@ sub date_3339 ($) { #{{{
 
 	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;
 } #}}}
@@ -336,8 +365,10 @@ sub genfeed ($$$$@) { #{{{
 			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")) {
@@ -372,7 +403,7 @@ 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);