X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/182edf291bec90e77a59824e95ded696213b7edb..93ebd04e2942d531b6c7c129ed23212e81ac5588:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e1c4b6e2f..4e4da11c5 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -121,7 +121,7 @@ sub getsetup () { #{{{
 		type => "internal",
 		default => [qw{mdwn link inline htmlscrubber passwordauth
 				openid signinedit lockedit conditional
-				recentchanges parentlinks}],
+				recentchanges parentlinks editpage}],
 		description => "plugins to enable by default",
 		safe => 0,
 		rebuild => 1,
@@ -312,9 +312,15 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 1,
 	},
+	wiki_file_chars => {
+		type => "string",
+		description => "specifies the characters that are allowed in source filenames",
+		default => "-[:alnum:]+/.:_",
+		safe => 0,
+		rebuild => 1,
+	},
 	wiki_file_regexp => {
 		type => "internal",
-		default => qr/(^[-[:alnum:]_.:\/+]+$)/,
 		description => "regexp of legal source files",
 		safe => 0,
 		rebuild => 1,
@@ -354,6 +360,13 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
+	setup => {
+		type => "internal",
+		default => undef,
+		description => "running in setup mode",
+		safe => 0,
+		rebuild => 0,
+	},
 	refresh => {
 		type => "internal",
 		default => 0,
@@ -375,10 +388,17 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
-	setup => {
+	setupfile => {
 		type => "internal",
 		default => undef,
-		description => "setup file to read",
+		description => "path to setup file",
+		safe => 0,
+		rebuild => 0,
+	},
+	allow_symlinks_before_srcdir => {
+		type => "string",
+		default => 0,
+		description => "allow symlinks in the path leading to the srcdir (potentially insecure)",
 		safe => 0,
 		rebuild => 0,
 	},
@@ -406,6 +426,10 @@ sub checkconfig () { #{{{
 			$gettext_obj=undef;
 		}
 	}
+		
+	if (! defined $config{wiki_file_regexp}) {
+		$config{wiki_file_regexp}=qr/(^[$config{wiki_file_chars}]+$)/;
+	}
 
 	if (ref $config{ENV} eq 'HASH') {
 		foreach my $val (keys %{$config{ENV}}) {
@@ -464,7 +488,9 @@ sub loadplugins () { #{{{
 		unshift @INC, possibly_foolish_untaint($config{libdir});
 	}
 
-	loadplugin($_) foreach @{$config{default_plugins}}, @{$config{add_plugins}};
+	foreach my $plugin (@{$config{default_plugins}}, @{$config{add_plugins}}) {
+		loadplugin($plugin);
+	}
 	
 	if ($config{rcs}) {
 		if (exists $IkiWiki::hooks{rcs}) {
@@ -494,7 +520,11 @@ sub loadplugin ($) { #{{{
 	foreach my $dir (defined $config{libdir} ? possibly_foolish_untaint($config{libdir}) : undef,
 	                 "$installdir/lib/ikiwiki") {
 		if (defined $dir && -x "$dir/plugins/$plugin") {
-			require IkiWiki::Plugin::external;
+			eval { require IkiWiki::Plugin::external };
+			if ($@) {
+				my $reason=$@;
+				error(sprintf(gettext("failed to load external plugin needed for %s plugin: %s"), $plugin, $reason));
+			}
 			import IkiWiki::Plugin::external "$dir/plugins/$plugin";
 			$loaded_plugins{$plugin}=1;
 			return 1;
@@ -761,7 +791,7 @@ sub bestlink ($$) { #{{{
 		elsif (exists $pagecase{lc $l}) {
 			return $pagecase{lc $l};
 		}
-	} while $cwd=~s!/?[^/]+$!!;
+	} while $cwd=~s{/?[^/]+$}{};
 
 	if (length $config{userdir}) {
 		my $l = "$config{userdir}/".lc($link);
@@ -799,13 +829,16 @@ sub pagetitle ($;$) { #{{{
 
 sub titlepage ($) { #{{{
 	my $title=shift;
-	$title=~s/([^-[:alnum:]:+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
+	# support use w/o %config set
+	my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
+	$title=~s/([^$chars]|_)/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
 	return $title;
 } #}}}
 
 sub linkpage ($) { #{{{
 	my $link=shift;
-	$link=~s/([^-[:alnum:]:+\/._])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
+	my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
+	$link=~s/([^$chars])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
 	return $link;
 } #}}}