X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e9e75f5f29d78b0631f98d9b0fa93184fcb181fe..f768b6bf16e043b41d4503f3ab0758d975994b12:/IkiWiki/Plugin/link.pm?ds=inline

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 48691d973..f6c3573f7 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -7,12 +7,15 @@ use IkiWiki 3.00;
 
 my $link_regexp;
 
+my $email_regexp = qr/^.+@.+$/;
+my $url_regexp = qr/^(?:[^:]+:\/\/|mailto:).*/i;
+
 sub import {
 	hook(type => "getsetup", id => "link", call => \&getsetup);
 	hook(type => "checkconfig", id => "link", call => \&checkconfig);
 	hook(type => "linkify", id => "link", call => \&linkify);
 	hook(type => "scan", id => "link", call => \&scan);
-	hook(type => "renamelink", id => "link", call => \&renamelink);
+	hook(type => "renamepage", id => "link", call => \&renamepage);
 }
 
 sub getsetup () {
@@ -20,6 +23,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
@@ -56,10 +60,56 @@ sub checkconfig () {
 			)?                      # optional
 
 			\]\]                    # end of link
-		}x,
+		}x;
 	}
 }
 
+sub is_externallink ($$;$$) {
+	my $page = shift;
+	my $url = shift;
+	my $anchor = shift;
+	my $force = shift;
+	
+	if (defined $anchor) {
+		$url.="#".$anchor;
+	}
+
+	if (! $force && $url =~ /$email_regexp/) {
+		# url looks like an email address, so we assume it
+		# is supposed to be an external link if there is no
+		# page with that name.
+		return (! (bestlink($page, linkpage($url))))
+	}
+
+	return ($url =~ /$url_regexp/)
+}
+
+sub externallink ($$;$) {
+	my $url = shift;
+	my $anchor = shift;
+	my $pagetitle = shift;
+
+	if (defined $anchor) {
+		$url.="#".$anchor;
+	}
+
+	# build pagetitle
+	if (! $pagetitle) {
+		$pagetitle = $url;
+		# use only the email address as title for mailto: urls
+		if ($pagetitle =~ /^mailto:.*/) {
+			$pagetitle =~ s/^mailto:([^?]+).*/$1/;
+		}
+	}
+
+	if ($url !~ /$url_regexp/) {
+		# handle email addresses (without mailto:)
+		$url = "mailto:" . $url;
+	}
+
+	return "<a href=\"$url\">$pagetitle</a>";
+}
+
 sub linkify (@) {
 	my %params=@_;
 	my $page=$params{page};
@@ -68,13 +118,17 @@ sub linkify (@) {
 	$params{content} =~ s{(\\?)$link_regexp}{
 		defined $2
 			? ( $1 
-				? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-				: htmllink($page, $destpage, linkpage($3),
-					anchor => $4, linktext => pagetitle($2)))
+				? "[[$2|$3".(defined $4 ? "#$4" : "")."]]" 
+				: is_externallink($page, $3, $4)
+					? externallink($3, $4, $2)
+					: htmllink($page, $destpage, linkpage($3),
+						anchor => $4, linktext => pagetitle($2)))
 			: ( $1 
-				? "[[$3".($4 ? "#$4" : "")."]]"
-				: htmllink($page, $destpage, linkpage($3),
-					anchor => $4))
+				? "[[$3".(defined $4 ? "#$4" : "")."]]"
+				: is_externallink($page, $3, $4)
+					? externallink($3, $4)
+					: htmllink($page, $destpage, linkpage($3),
+						anchor => $4))
 	}eg;
 	
 	return $params{content};
@@ -86,35 +140,39 @@ sub scan (@) {
 	my $content=$params{content};
 
 	while ($content =~ /(?<!\\)$link_regexp/g) {
-		push @{$links{$page}}, linkpage($2);
+		if (! is_externallink($page, $2, $3, 1)) {
+			add_link($page, linkpage($2));
+		}
 	}
 }
 
-sub renamelink (@) {
+sub renamepage (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $old=$params{oldpage};
 	my $new=$params{newpage};
 
 	$params{content} =~ s{(?<!\\)$link_regexp}{
-		my $linktext=$2;
-		my $link=$linktext;
-		if (bestlink($page, linkpage($linktext)) eq $old) {
-			$link=pagetitle($new, 1);
-			$link=~s/ /_/g;
-			if ($linktext =~ m/.*\/*?[A-Z]/) {
-				# preserve leading cap of last component
-				my @bits=split("/", $link);
-				$link=join("/", @bits[0..$#bits-1], ucfirst($bits[$#bits]));
-			}
-			if (index($linktext, "/") == 0) {
-				# absolute link
-				$link="/$link";
+		if (! is_externallink($page, $2, $3)) {
+			my $linktext=$2;
+			my $link=$linktext;
+			if (bestlink($page, linkpage($linktext)) eq $old) {
+				$link=pagetitle($new, 1);
+				$link=~s/ /_/g;
+				if ($linktext =~ m/.*\/*?[A-Z]/) {
+					# preserve leading cap of last component
+					my @bits=split("/", $link);
+					$link=join("/", @bits[0..$#bits-1], ucfirst($bits[$#bits]));
+				}
+				if (index($linktext, "/") == 0) {
+					# absolute link
+					$link="/$link";
+				}
 			}
+			defined $1
+				? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
+				: ( "[[$link".   ($3 ? "#$3" : "")."]]" )
 		}
-		defined $1
-			? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
-			: ( "[[$link".   ($3 ? "#$3" : "")."]]" )
 	}eg;
 
 	return $params{content};