X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/af029154d6b145302f8ece0286711f61ea606877..6a9e16374f1549c7e63c7cd1c0e6989b2fb32191:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index c2c3aac83..085953a17 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -6,6 +6,10 @@ use strict;
 use Encode;
 use open qw{:utf8 :std};
 
+# Optimisation.
+use Memoize;
+memoize("abs2rel");
+
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
 
@@ -16,7 +20,7 @@ sub defaultconfig () { #{{{
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 	verbose => 0,
 	wikiname => "wiki",
-	default_pageext => ".mdwn",
+	default_pageext => "mdwn",
 	cgi => 0,
 	rcs => 'svn',
 	notify => 0,
@@ -30,6 +34,7 @@ sub defaultconfig () { #{{{
 	rebuild => 0,
 	refresh => 0,
 	getctime => 0,
+	w3mmode => 0,
 	wrapper => undef,
 	wrappermode => undef,
 	svnrepo => undef,
@@ -44,9 +49,30 @@ sub defaultconfig () { #{{{
 	adminemail => undef,
 	plugin => [qw{mdwn inline htmlscrubber}],
 	timeformat => '%c',
+	locale => undef,
 } #}}}
-	    
+   
 sub checkconfig () { #{{{
+	# locale stuff; avoid LC_ALL since it overrides everything
+	if (defined $ENV{LC_ALL}) {
+		$ENV{LANG} = $ENV{LC_ALL};
+		delete $ENV{LC_ALL};
+	}
+	if (defined $config{locale}) {
+		eval q{use POSIX};
+		$ENV{LANG} = $config{locale}
+			if POSIX::setlocale(&POSIX::LANG, $config{locale});
+	}
+
+	if ($config{w3mmode}) {
+		eval q{use Cwd q{abs_path}};
+		$config{srcdir}=possibly_foolish_untaint(abs_path($config{srcdir}));
+		$config{destdir}=possibly_foolish_untaint(abs_path($config{destdir}));
+		$config{cgiurl}="file:///\$LIB/ikiwiki-w3m.cgi/".$config{cgiurl}
+			unless $config{cgiurl} =~ m!file:///!;
+		$config{url}="file://".$config{destdir};
+	}
+
 	if ($config{cgi} && ! length $config{url}) {
 		error("Must specify url to wiki with --url when using --cgi\n");
 	}
@@ -67,6 +93,14 @@ sub checkconfig () { #{{{
 		require IkiWiki::Rcs::Stub;
 	}
 
+	if (exists $hooks{checkconfig}) {
+                foreach my $id (keys %{$hooks{checkconfig}}) {
+                        $hooks{checkconfig}{$id}{call}->();
+                }
+        }
+} #}}}
+
+sub loadplugins () { #{{{
 	foreach my $plugin (@{$config{plugin}}) {
 		my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
 		eval qq{use $mod};
@@ -74,12 +108,6 @@ sub checkconfig () { #{{{
 			error("Failed to load plugin $mod: $@");
 		}
 	}
-
-	if (exists $hooks{checkconfig}) {
-                foreach my $id (keys %{$hooks{checkconfig}}) {
-                        $hooks{checkconfig}{$id}{call}->();
-                }
-        }
 } #}}}
 
 sub error ($) { #{{{
@@ -123,7 +151,7 @@ sub dirname ($) { #{{{
 sub pagetype ($) { #{{{
 	my $page=shift;
 	
-	if ($page =~ /\.(.*)$/) {
+	if ($page =~ /\.([^.]+)$/) {
 		return $1 if exists $hooks{htmlize}{$1};
 	}
 	return undef;
@@ -260,6 +288,19 @@ sub styleurl (;$) { #{{{
 	return $page."style.css";
 } #}}}
 
+sub abs2rel ($$) {
+	# Work around very innefficient behavior in File::Spec if abs2rel
+	# is passed two relative paths. It's much faster if paths are
+	# absolute!
+	my $path="/".shift;
+	my $base="/".shift;
+
+	require File::Spec;
+	my $ret=File::Spec->abs2rel($path, $base);
+	$ret=~s/^// if defined $ret;
+	return $ret;
+}
+
 sub htmllink ($$$;$$$) { #{{{
 	my $lpage=shift; # the page doing the linking
 	my $page=shift; # the page that will contain the link (different for inline)
@@ -292,8 +333,7 @@ sub htmllink ($$$;$$$) { #{{{
 			"\">?</a>$linktext</span>"
 	}
 	
-	require File::Spec;
-	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
+	$bestlink=abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";