po: initial infrastructure to deal with renamed master page

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

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index c2fd59b21479f96bc4d70d68981a36e0edfed593..77afdd6084e94084ba8e6a09b8bba632f3adcbfc 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -8,10 +8,12 @@ use warnings;
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 use strict;
 use IkiWiki;
 use open qw{:utf8 :std};

+use File::Spec;

 
 sub load ($) { # {{{
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
 
 sub load ($) { # {{{
        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, $!));
        #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, $!));


@@ -28,10 +30,10 @@ sub load ($) { # {{{
 } #}}}
 
 sub merge ($) {
 } #}}}
 
 sub merge ($) {

+       # Merge setup into existing config and untaint.

        my %setup=%{shift()};
 
        my %setup=%{shift()};
 

-       # Merge setup into existing config and untaint.
-       if (exists $setup{add_plugins}) {
+       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}) {


@@ -71,6 +73,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}=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 ($) { #{{{
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
 sub dump ($) { #{{{
        my $file=IkiWiki::possibly_foolish_untaint(shift);