Export add_autofile() for use in Plugins.

[git.ikiwiki.info.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 38b7152029a851d0651943abd6ff772f76e6f364..8a25ecc575da894711d27e4583e6ab491b350a45 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -8,35 +8,33 @@ use warnings;
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};

+use File::Spec;

 
 

-# 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 ($) { # {{{
+sub load ($) {

        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        my $setup=IkiWiki::possibly_foolish_untaint(shift);

-       delete $config{setup};
+       $config{setupfile}=File::Spec->rel2abs($setup);
+

        #translators: The first parameter is a filename, and the second
        #translators: is a (probably not translated) error message.
        open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
        my $code;
        {
                local $/=undef;
        #translators: The first parameter is a filename, and the second
        #translators: is a (probably not translated) error message.
        open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
        my $code;
        {
                local $/=undef;

-               $code=<IN>;
+               $code=<IN> || error("$setup: $!");

        }
        }

+       

        ($code)=$code=~/(.*)/s;
        close IN;
 
        eval $code;
        error("$setup: ".$@) if $@;
        ($code)=$code=~/(.*)/s;
        close IN;
 
        eval $code;
        error("$setup: ".$@) if $@;

+}

 
 

-       my %setup=%{$raw_setup};
-       $raw_setup=undef;
-
+sub merge ($) {

        # Merge setup into existing config and untaint.
        # Merge setup into existing config and untaint.

-       if (exists $setup{add_plugins}) {
+       my %setup=%{shift()};
+
+       if (exists $setup{add_plugins} && exists $config{add_plugins}) {

                push @{$setup{add_plugins}}, @{$config{add_plugins}};
        }
        if (exists $setup{exclude}) {
                push @{$setup{add_plugins}}, @{$config{add_plugins}};
        }
        if (exists $setup{exclude}) {


@@ -74,9 +72,43 @@ sub load ($) { # {{{
                        wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
                };
        }
                        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;
+
+        # disable logging to syslog while dumping, broken plugins may
+       # whine when loaded
+       my $syslog=$config{syslog};
+        $config{syslog}=undef;
+
+       # 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 ($) { #{{{
+sub dump ($) {

        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;