X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b2bd444f31fd9f294ee0dbc4b9a61b1e8c04055c..8966b8504c3cedb11ca961c7722af23f0044a89c:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index df38efb7d..a2af406a9 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -36,13 +36,14 @@ sub defaultconfig () { #{{{
 	svnpath => "trunk",
 	srcdir => undef,
 	destdir => undef,
+	pingurl => [],
 	templatedir => "/usr/share/ikiwiki/templates",
 	underlaydir => "/usr/share/ikiwiki/basewiki",
 	setup => undef,
 	adminuser => undef,
 	adminemail => undef,
 	plugin => [qw{inline htmlscrubber}],
-	headercontent => '',
+	timeformat => '%c',
 } #}}}
 	    
 sub checkconfig () { #{{{
@@ -163,7 +164,12 @@ sub readfile ($;$) { #{{{
 	
 	local $/=undef;
 	open (IN, $file) || error("failed to read $file: $!");
-	binmode(IN) if $binary;
+	if (! $binary) {
+		binmode(IN, ":utf8");
+	}
+	else {
+		binmode(IN);
+	}
 	my $ret=<IN>;
 	close IN;
 	return $ret;
@@ -195,7 +201,12 @@ sub writefile ($$$;$) { #{{{
 	}
 	
 	open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
-	binmode(OUT) if $binary;
+	if (! $binary) {
+		binmode(OUT, ":utf8");
+	}
+	else {
+		binmode(OUT);
+	}
 	print OUT $content;
 	close OUT;
 } #}}}
@@ -261,8 +272,9 @@ sub styleurl (;$) { #{{{
 	return $page."style.css";
 } #}}}
 
-sub htmllink ($$;$$$) { #{{{
-	my $page=shift;
+sub htmllink ($$$;$$$) { #{{{
+	my $lpage=shift; # the page doing the linking
+	my $page=shift; # the page that will contain the link (different for inline)
 	my $link=shift;
 	my $noimageinline=shift; # don't turn links into inline html images
 	my $forcesubpage=shift; # force a link to a subpage
@@ -270,10 +282,10 @@ sub htmllink ($$;$$$) { #{{{
 
 	my $bestlink;
 	if (! $forcesubpage) {
-		$bestlink=bestlink($page, $link);
+		$bestlink=bestlink($lpage, $link);
 	}
 	else {
-		$bestlink="$page/".lc($link);
+		$bestlink="$lpage/".lc($link);
 	}
 
 	$linktext=pagetitle(basename($link)) unless defined $linktext;
@@ -282,14 +294,13 @@ sub htmllink ($$;$$$) { #{{{
 	
 	# TODO BUG: %renderedfiles may not have it, if the linked to page
 	# was also added and isn't yet rendered! Note that this bug is
-	# masked by the bug mentioned below that makes all new files
-	# be rendered twice.
+	# masked by the bug that makes all new files be rendered twice.
 	if (! grep { $_ eq $bestlink } values %renderedfiles) {
 		$bestlink=htmlpage($bestlink);
 	}
 	if (! grep { $_ eq $bestlink } values %renderedfiles) {
 		return "<span><a href=\"".
-			cgiurl(do => "create", page => $link, from =>$page).
+			cgiurl(do => "create", page => $link, from => $page).
 			"\">?</a>$linktext</span>"
 	}
 	
@@ -401,13 +412,27 @@ sub glob_match ($$) { #{{{
 	my $page=shift;
 	my $glob=shift;
 
-	# turn glob into safe regexp
-	$glob=quotemeta($glob);
-	$glob=~s/\\\*/.*/g;
-	$glob=~s/\\\?/./g;
-	$glob=~s!\\/!/!g;
-	
-	$page=~/^$glob$/i;
+	if ($glob =~ /^link\((.+)\)$/) {
+		my $rev = $links{$page} or return undef;
+		foreach my $p (@$rev) {
+			return 1 if lc $p eq $1;
+		}
+		return 0;
+	} elsif ($glob =~ /^backlink\((.+)\)$/) {
+		my $rev = $links{$1} or return undef;
+		foreach my $p (@$rev) {
+			return 1 if lc $p eq $page;
+		}
+		return 0;
+	} else {
+		# turn glob into safe regexp
+		$glob=quotemeta($glob);
+		$glob=~s/\\\*/.*/g;
+		$glob=~s/\\\?/./g;
+		$glob=~s!\\/!/!g;
+		
+		return $page=~/^$glob$/i;
+	}
 } #}}}
 
 sub globlist_match ($$) { #{{{