add guard against enabling multiple rcs plugins
[ikiwiki.git] / IkiWiki / Setup.pm
index adb8abb6280199527667d03ad1ede171f74a3824..c2fd59b21479f96bc4d70d68981a36e0edfed593 100644 (file)
@@ -9,12 +9,6 @@ use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 
 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};
 sub load ($) { # {{{
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        delete $config{setup};
@@ -31,9 +25,10 @@ sub load ($) { # {{{
 
        eval $code;
        error("$setup: ".$@) if $@;
 
        eval $code;
        error("$setup: ".$@) if $@;
+} #}}}
 
 
-       my %setup=%{$raw_setup};
-       $raw_setup=undef;
+sub merge ($) {
+       my %setup=%{shift()};
 
        # Merge setup into existing config and untaint.
        if (exists $setup{add_plugins}) {
 
        # Merge setup into existing config and untaint.
        if (exists $setup{add_plugins}) {
@@ -48,7 +43,13 @@ sub load ($) { # {{{
                                $config{$c}=IkiWiki::possibly_foolish_untaint($setup{$c});
                        }
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $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}}) {
                        }
                        elsif (ref $setup{$c} eq 'HASH') {
                                foreach my $key (keys %{$setup{$c}}) {
@@ -60,15 +61,24 @@ sub load ($) { # {{{
                        $config{$c}=undef;
                }
        }
                        $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 dump ($) { #{{{
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;
 } #}}}
 
 sub dump ($) { #{{{
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;
+       my @dump=IkiWiki::Setup::Standard::gendump("Setup file for ikiwiki.");
 
        open (OUT, ">", $file) || die "$file: $!";
 
        open (OUT, ">", $file) || die "$file: $!";
-       print OUT "$_\n" foreach IkiWiki::Setup::Standard::gendump();
+       print OUT "$_\n" foreach @dump;
        close OUT;
 }
 
        close OUT;
 }