forgot to add this

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d5135f3eb8de14acdda1d6ac37aee45d192eb6bb..b1418ae34743272c583e35cdbe915026a236c258 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 # Standard ikiwiki setup module.
 # Parameters to import should be all the standard ikiwiki config stuff,
 #!/usr/bin/perl
 # Standard ikiwiki setup module.
 # Parameters to import should be all the standard ikiwiki config stuff,

-# plus hashes for cgiwrapper and svnwrapper, which specify any differing
-# config stuff for them and cause the wrappers to be made.
+# plus an array of wrappers to set up.

 
 use warnings;
 use strict;
 
 use warnings;
 use strict;


@@ -20,24 +19,58 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
 sub setup_standard {
        my %setup=%{$_[1]};
 

+       $setup{plugin}=$config{plugin};
+       if (exists $setup{add_plugins}) {
+               push @{$setup{plugin}}, @{$setup{add_plugins}};
+               delete $setup{add_plugins};
+       }
+       if (exists $setup{disable_plugins}) {
+               foreach my $plugin (@{$setup{disable_plugins}}) {
+                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
+               }
+               delete $setup{disable_plugins};
+       }
+       if (exists $setup{exclude}) {
+               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+       }
+

        debug("generating wrappers..");
        debug("generating wrappers..");

+       my @wrappers=@{$setup{wrappers}};
+       delete $setup{wrappers};

        my %startconfig=(%config);
        my %startconfig=(%config);

-       foreach my $wrapper (@{$setup{wrappers}}) {
+       foreach my $wrapper (@wrappers) {

                %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
                %config=(%startconfig, verbose => 0, %setup, %{$wrapper});

-               checkoptions();
+               checkconfig();

                gen_wrapper();
        }
        %config=(%startconfig);
        
                gen_wrapper();
        }
        %config=(%startconfig);
        

-       debug("rebuilding wiki..");

        foreach my $c (keys %setup) {
        foreach my $c (keys %setup) {

-               $config{$c}=possibly_foolish_untaint($setup{$c})
-                       if defined $setup{$c} && ! ref $setup{$c};
+               if (defined $setup{$c}) {
+                       if (! ref $setup{$c}) {
+                               $config{$c}=possibly_foolish_untaint($setup{$c});
+                       }
+                       elsif (ref $setup{$c} eq 'ARRAY') {
+                               $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
+                       }
+               }
+               else {
+                       $config{$c}=undef;
+               }
+       }
+
+       if (! $config{refresh}) {
+               $config{rebuild}=1;
+               debug("rebuilding wiki..");
+       }
+       else {
+               debug("refreshing wiki..");

        }
        }

-       $config{rebuild}=1;

 
 

-       checkoptions();
+       loadplugins();
+       checkconfig();

        lockwiki();
        lockwiki();

+       loadindex();

        refresh();
 
        debug("done");
        refresh();
 
        debug("done");