X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c207086282b2f058f647b7fa810f3da54fe5fe4b..e767f18867bbddb252bd53589676f29dfc75837e:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8f7cd826e..9a63ea1c9 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -11,6 +11,7 @@ use URI;
 my %knownfeeds;
 my %page_numfeeds;
 my @inline;
+my $nested=0;
 
 sub import { #{{{
 	hook(type => "getopt", id => "inline", call => \&getopt);
@@ -69,12 +70,12 @@ sub sessioncgi () { #{{{
 	my $session=shift;
 
 	if ($q->param('do') eq 'blog') {
-		my $page=decode_utf8($q->param('title'));
-		$page=~s/\///g; # no slashes in blog posts
+		my $page=IkiWiki::titlepage(decode_utf8($q->param('title')));
+		$page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs
 		# 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)}) {
+		while (exists $IkiWiki::pagecase{lc($from."/".$page.$add)}) {
 			$add=1 unless length $add;
 			$add++;
 		}
@@ -102,7 +103,7 @@ sub preprocess_inline (@) { #{{{
 	my %params=@_;
 	
 	if (! exists $params{pages}) {
-		return "";
+		return "[[inline ".gettext("missing pages parameter")."]]";
 	}
 	my $raw=yesno($params{raw});
 	my $archive=yesno($params{archive});
@@ -277,7 +278,7 @@ sub preprocess_inline (@) { #{{{
 					}
 					if (length $config{cgiurl} && defined $type) {
 						$template->param(have_actions => 1);
-						$template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
+						$template->param(editurl => cgiurl(do => "edit", page => $page));
 					}
 				}
 	
@@ -329,7 +330,7 @@ sub preprocess_inline (@) { #{{{
 		}
 	}
 	
-	return $ret if $raw;
+	return $ret if $raw || $nested;
 	push @inline, $ret;
 	return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
 } #}}}
@@ -350,11 +351,14 @@ sub get_inline_content ($$) { #{{{
 	my $file=$pagesources{$page};
 	my $type=pagetype($file);
 	if (defined $type) {
-		return htmlize($page, $type,
+		$nested++;
+		my $ret=htmlize($page, $destpage, $type,
 		       linkify($page, $destpage,
 		       preprocess($page, $destpage,
 		       filter($page, $destpage,
 		       readfile(srcfile($file))))));
+		$nested--;
+		return $ret;
 	}
 	else {
 		return "";
@@ -389,18 +393,18 @@ sub absolute_urls ($$) { #{{{
 	my $url=$baseurl;
 	$url=~s/[^\/]+$//;
 
-        # what is the non path part of the url? (need it for relative url's starting with /
+        # what is the non path part of the url?
         my $top_uri = URI->new($url);
-        $top_uri->path_query("/"); # reset the path
+        $top_uri->path_query(""); # reset the path
         my $urltop = $top_uri->as_string;
-        $urltop=~s/\/*$//;
 
 	$content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(#[^"]+)"/$1 href="$baseurl$2"/mig;
-        # Relative URL
+        # relative to another wiki page
 	$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;
         # relative to the top of the site
 	$content=~s/(<a(?:\s+(?:class|id)\s*="?\w+"?)?)\s+href=\s*"(?!\w+:)(\/[^"]*)"/$1 href="$urltop$2"/mig;
-	$content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)([^"]+)"/$1 src="$url$2"/mig;
+	$content=~s/(<img(?:\s+(?:class|id|width|height)\s*="?\w+"?)*)\s+src=\s*"(?!\w+:)(\/[^"]*)"/$1 src="$urltop$2"/mig;
 	return $content;
 } #}}}
 
@@ -438,6 +442,13 @@ sub genfeed ($$$$@) { #{{{
 			mdate_3339 => date_3339($pagemtime{$p}),
 		);
 
+		if (exists $pagestate{$p} &&
+		    exists $pagestate{$p}{meta}{uuid}) {
+			my $atom_id = $pagestate{$p}{meta}{uuid};
+
+			$itemtemplate->param(uuid => $atom_id);
+		}
+
 		if ($itemtemplate->query(name => "enclosure")) {
 			my $file=$pagesources{$p};
 			my $type=pagetype($file);
@@ -445,7 +456,7 @@ sub genfeed ($$$$@) { #{{{
 				$itemtemplate->param(content => $pcontent);
 			}
 			else {
-				my ($a, $b, $c, $d, $e, $f, $g, $size) = stat(srcfile($file));
+				my $size=(srcfile_stat($file))[8];
 				my $mime="unknown";
 				eval q{use File::MimeInfo};
 				if (! $@) {
@@ -505,7 +516,7 @@ sub pingurl (@) { #{{{
 	defined(my $pid = fork) or error("Can't fork: $!");
 	return if $pid;
 	chdir '/';
-	setsid() or error("Can't start a new session: $!");
+	POSIX::setsid() or error("Can't start a new session: $!");
 	open STDIN, '/dev/null';
 	open STDOUT, '>/dev/null';
 	open STDERR, '>&STDOUT' or error("Can't dup stdout: $!");