X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/c83fd4a32868d46765a88f6903dd807f18c9ae84..9e0cbb73fe550d05e668d3584ef6f7981e781c8e:/IkiWiki/Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 92f1eadb5..d2d1e4b8e 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}};
 	}
@@ -67,7 +62,7 @@ sub load ($) { # {{{
 		}
 	}
 	
-	if (exists $config{cgi_wrapper}) {
+	if (length $config{cgi_wrapper}) {
 		push @{$config{wrappers}}, {
 			cgi => 1,
 			wrapper => $config{cgi_wrapper},
@@ -76,6 +71,40 @@ sub load ($) { # {{{
 	}
 } #}}}
 
+sub getsetup () { #{{{
+	# Gets all available setup data from all plugins. Returns an
+	# ordered list of [plugin, setup] pairs.
+	my @ret;
+
+        # disable logging to syslog while dumping, broken plugins may
+	# whine when loaded
+	my $syslog=$config{syslog};
+        $config{syslog}=0;
+
+	# Load all plugins, so that all setup options are available.
+	my @plugins=grep { $_ ne $config{rcs} } 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 ],
+		}
+	}
+	
+        $config{syslog}=$syslog;
+
+	return @ret;
+} #}}}
+
 sub dump ($) { #{{{
 	my $file=IkiWiki::possibly_foolish_untaint(shift);