X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/041923a89ece8b1ed195cb7b528843c15770ea6f..9e0cbb73fe550d05e668d3584ef6f7981e781c8e:/IkiWiki/Setup.pm diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index c2fd59b21..d2d1e4b8e 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -28,9 +28,9 @@ sub load ($) { # {{{ } #}}} sub merge ($) { + # Merge setup into existing config and untaint. my %setup=%{shift()}; - # Merge setup into existing config and untaint. if (exists $setup{add_plugins}) { push @{$setup{add_plugins}}, @{$config{add_plugins}}; } @@ -71,6 +71,40 @@ sub merge ($) { } } #}}} +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);