X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/16ab4ba2df8f2badcdc6e4725475345681194670..127945aad38c45874c7b95f042f040c34151780e:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0ed52aeae..37ff792d1 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,16 +5,17 @@ use warnings;
 use strict;
 use Encode;
 use HTML::Entities;
+use URI::Escape q{uri_escape_utf8};
 use open qw{:utf8 :std};
 
-use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
+use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
             %renderedfiles %oldrenderedfiles %pagesources %depends %hooks
 	    %forcerebuild $gettext_obj};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
-                 displaytime will_render gettext
+                 displaytime will_render gettext urlto targetpage
                  %config %links %renderedfiles %pagesources);
 our $VERSION = 1.02; # plugin interface version, next is ikiwiki version
 our $version="1.45";my $installdir="/usr";
@@ -71,6 +72,8 @@ sub defaultconfig () { #{{{
 	sslcookie => 0,
 	httpauth => 0,
 	userdir => "",
+	usedirs => 0,
+	numbacklinks => 10,
 } #}}}
    
 sub checkconfig () { #{{{
@@ -222,10 +225,21 @@ sub pagename ($) { #{{{
 	return $page;
 } #}}}
 
-sub htmlpage ($) { #{{{
+sub targetpage ($$) { #{{{
 	my $page=shift;
+	my $ext=shift;
+	
+	if (! $config{usedirs} || $page =~ /^index$/ ) {
+		return $page.".".$ext;
+	} else {
+		return $page."/index.".$ext;
+	}
+} #}}}
 
-	return $page.".html";
+sub htmlpage ($) { #{{{
+	my $page=shift;
+	
+	return targetpage($page, "html");
 } #}}}
 
 sub srcfile ($) { #{{{
@@ -385,7 +399,8 @@ sub linkpage ($) { #{{{
 sub cgiurl (@) { #{{{
 	my %params=@_;
 
-	return $config{cgiurl}."?".join("&", map "$_=$params{$_}", keys %params);
+	return $config{cgiurl}."?".
+		join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 } #}}}
 
 sub baseurl (;$) { #{{{
@@ -393,6 +408,7 @@ sub baseurl (;$) { #{{{
 
 	return "$config{url}/" if ! defined $page;
 	
+	$page=htmlpage($page);
 	$page=~s/[^\/]+$//;
 	$page=~s/[^\/]+\//..\//g;
 	return $page;
@@ -422,6 +438,32 @@ sub displaytime ($) { #{{{
 			$config{timeformat}, localtime($time)));
 } #}}}
 
+sub beautify_url ($) { #{{{
+	my $url=shift;
+
+	$url =~ s!/index.html$!/!;
+	$url =~ s!^$!./!; # Browsers don't like empty links...
+
+	return $url;
+} #}}}
+
+sub urlto ($$) { #{{{
+	my $to=shift;
+	my $from=shift;
+
+	if (! length $to) {
+		return beautify_url(baseurl($from));
+	}
+
+	if (! grep { $_ eq $to } map { @{$_} } values %renderedfiles) {
+		$to=htmlpage($to);
+	}
+
+	my $link = abs2rel($to, dirname(htmlpage($from)));
+
+	return beautify_url($link);
+} #}}}
+
 sub htmllink ($$$;@) { #{{{
 	my $lpage=shift; # the page doing the linking
 	my $page=shift; # the page that will contain the link (different for inline)
@@ -453,11 +495,16 @@ sub htmllink ($$$;@) { #{{{
 	if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) {
 		return $linktext unless length $config{cgiurl};
 		return "<span><a href=\"".
-			cgiurl(do => "create", page => lc($link), from => $page).
+			cgiurl(
+				do => "create",
+				page => pagetitle(lc($link), 1),
+				from => $lpage
+			).
 			"\">?</a>$linktext</span>"
 	}
 	
-	$bestlink=abs2rel($bestlink, dirname($page));
+	$bestlink=abs2rel($bestlink, dirname(htmlpage($page)));
+	$bestlink=beautify_url($bestlink);
 	
 	if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
@@ -502,8 +549,14 @@ sub linkify ($$$) { #{{{
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
 		defined $2
-			? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, linkpage($3), anchor => $4, linktext => pagetitle($2)))
-			: ( $1 ? "[[$3]]"    : htmllink($lpage, $page, linkpage($3), anchor => $4))
+			? ( $1 
+				? "[[$2|$3".(length $4 ? "#$4" : "")."]]" 
+				: htmllink($lpage, $page, linkpage($3),
+					anchor => $4, linktext => pagetitle($2)))
+			: ( $1 
+				? "[[$3".(length $4 ? "#$4" : "")."]]"
+				: htmllink($lpage, $page, linkpage($3),
+					anchor => $4))
 	}eg;
 	
 	return $content;
@@ -666,7 +719,7 @@ sub loadindex () { #{{{
 		my $page=pagename($items{src}[0]);
 		if (! $config{rebuild}) {
 			$pagesources{$page}=$items{src}[0];
-			$oldpagemtime{$page}=$items{mtime}[0];
+			$pagemtime{$page}=$items{mtime}[0];
 			$oldlinks{$page}=[@{$items{link}}];
 			$links{$page}=[@{$items{link}}];
 			$depends{$page}=$items{depends}[0] if exists $items{depends};
@@ -688,9 +741,9 @@ sub saveindex () { #{{{
 	my $newfile="$config{wikistatedir}/index.new";
 	my $cleanup = sub { unlink($newfile) };
 	open (OUT, ">$newfile") || error("cannot write to $newfile: $!", $cleanup);
-	foreach my $page (keys %oldpagemtime) {
-		next unless $oldpagemtime{$page};
-		my $line="mtime=$oldpagemtime{$page} ".
+	foreach my $page (keys %pagemtime) {
+		next unless $pagemtime{$page};
+		my $line="mtime=$pagemtime{$page} ".
 			"ctime=$pagectime{$page} ".
 			"src=$pagesources{$page}";
 		$line.=" dest=$_" foreach @{$renderedfiles{$page}};
@@ -915,7 +968,7 @@ sub pagespec_translate ($) { #{{{
 		}
 		elsif ($word =~ /^(\w+)\((.*)\)$/) {
 			if (exists $IkiWiki::PageSpec::{"match_$1"}) {
-				$code.=" IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).")";
+				$code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \$from)";
 			}
 			else {
 				$code.=" 0";
@@ -962,22 +1015,36 @@ sub match_glob ($$$) { #{{{
 	return $page=~/^$glob$/i;
 } #}}}
 
-sub match_link ($$) { #{{{
+sub match_link ($$$) { #{{{
 	my $page=shift;
 	my $link=lc(shift);
+	my $from=shift;
+	if (! defined $from){
+		$from = "";
+	}
+
+	# relative matching
+	if ($link =~ m!^\.! && defined $from) {
+		$from=~s!/?[^/]+$!!;
+		$link=~s!^\./!!;
+		$link="$from/$link" if length $from;
+	}
 
 	my $links = $IkiWiki::links{$page} or return undef;
+	return 0 unless @$links;
+	my $bestlink = IkiWiki::bestlink($from, $link);
+	return 0 unless length $bestlink;
 	foreach my $p (@$links) {
-		return 1 if lc $p eq $link;
+		return 1 if $bestlink eq IkiWiki::bestlink($page, $p);
 	}
 	return 0;
 } #}}}
 
-sub match_backlink ($$) { #{{{
-	match_link(pop, pop);
+sub match_backlink ($$$) { #{{{
+	match_link($_[1], $_[0], $_[3]);
 } #}}}
 
-sub match_created_before ($$) { #{{{
+sub match_created_before ($$$) { #{{{
 	my $page=shift;
 	my $testpage=shift;
 
@@ -989,7 +1056,7 @@ sub match_created_before ($$) { #{{{
 	}
 } #}}}
 
-sub match_created_after ($$) { #{{{
+sub match_created_after ($$$) { #{{{
 	my $page=shift;
 	my $testpage=shift;
 
@@ -1001,15 +1068,15 @@ sub match_created_after ($$) { #{{{
 	}
 } #}}}
 
-sub match_creation_day ($$) { #{{{
+sub match_creation_day ($$$) { #{{{
 	return ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift);
 } #}}}
 
-sub match_creation_month ($$) { #{{{
+sub match_creation_month ($$$) { #{{{
 	return ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift);
 } #}}}
 
-sub match_creation_year ($$) { #{{{
+sub match_creation_year ($$$) { #{{{
 	return ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift);
 } #}}}