X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cebbb6f482492ba776a1ca542e81a74fb74fbfce..0b6dd9247bd442560ab740051f0e60b22bf2dccc:/IkiWiki/Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 262d49479..73e32447c 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -9,12 +9,6 @@ use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 
-# There can be multiple modules, with different configuration styles.
-# The setup modules each convert the data into the hashes used by ikiwiki
-# internally (if it's not already in that format), and store it in
-# IkiWiki::Setup::$raw_setup, to pass it back to this module.
-our $raw_setup;
-
 sub load ($) { # {{{
 	my $setup=IkiWiki::possibly_foolish_untaint(shift);
 	delete $config{setup};
@@ -31,11 +25,12 @@ sub load ($) { # {{{
 
 	eval $code;
 	error("$setup: ".$@) if $@;
+} #}}}
 
-	my %setup=%{$raw_setup};
-	$raw_setup=undef;
-
+sub merge ($) {
 	# Merge setup into existing config and untaint.
+	my %setup=%{shift()};
+
 	if (exists $setup{add_plugins}) {
 		push @{$setup{add_plugins}}, @{$config{add_plugins}};
 	}
@@ -48,7 +43,13 @@ sub load ($) { # {{{
 				$config{$c}=IkiWiki::possibly_foolish_untaint($setup{$c});
 			}
 			elsif (ref $setup{$c} eq 'ARRAY') {
-				$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
+				if ($c eq 'wrappers') {
+					# backwards compatability code
+					$config{$c}=$setup{$c};
+				}
+				else {
+					$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
+				}
 			}
 			elsif (ref $setup{$c} eq 'HASH') {
 				foreach my $key (keys %{$setup{$c}}) {
@@ -60,6 +61,43 @@ sub load ($) { # {{{
 			$config{$c}=undef;
 		}
 	}
+	
+	if (length $config{cgi_wrapper}) {
+		push @{$config{wrappers}}, {
+			cgi => 1,
+			wrapper => $config{cgi_wrapper},
+			wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
+		};
+	}
+} #}}}
+
+sub getsetup () { #{{{
+	# Gets all available setup data from all plugins. Returns an ordered list of
+	# [plugin, setup] pairs.
+	my @ret;
+
+	# Load all plugins, so that all setup options are available.
+	# (But skip a few problematic external demo plugins.)
+	my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
+		sort(IkiWiki::listplugins());
+	unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
+	foreach my $plugin (@plugins) {
+		eval { IkiWiki::loadplugin($plugin) };
+		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
+			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
+		}
+	}
+
+	foreach my $plugin (@plugins) {
+		if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) {
+			# use an array rather than a hash, to preserve order
+			my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() };
+			next unless @s;
+			push @ret, [ $plugin, \@s ],
+		}
+	}
+
+	return @ret;
 } #}}}
 
 sub dump ($) { #{{{