typo

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index da712e94aa784ea482f622e35fd4632ec0223635..b7583097daf84851b0ebc43900ae941e79677695 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,36 +1,87 @@
 #!/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.
-
-package IkiWiki::Setup::Standard;
+# plus an array of wrappers to set up.

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

+use IkiWiki::Wrapper;
+use IkiWiki::Render;
+
+package IkiWiki::Setup::Standard;

 
 sub import {
 
 sub import {

+       IkiWiki::setup_standard(@_);
+}
+       
+package IkiWiki;
+
+sub setup_standard {

        my %setup=%{$_[1]};
 
        my %setup=%{$_[1]};
 

-       ::debug("generating wrappers..");
-       my %startconfig=(%::config);
-       foreach my $wrapper (@{$setup{wrappers}}) {
-               %::config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               ::checkoptions();
-               ::gen_wrapper();
+       $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("rebuilding wiki..");
+       if (! $config{refresh} || $config{wrappers}) {
+               debug("generating wrappers..");
+               my @wrappers=@{$setup{wrappers}};
+               delete $setup{wrappers};
+               my %startconfig=(%config);
+               foreach my $wrapper (@wrappers) {
+                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       checkconfig();
+                       gen_wrapper();
+               }
+               %config=(%startconfig);
+       }
+       

        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}}]
+                       }
+                       elsif (ref $setup{$c} eq 'HASH') {
+                               foreach my $key (keys %{$setup{$c}}) {
+                                       $config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+                               }
+                       }
+               }
+               else {
+                       $config{$c}=undef;
+               }
+       }
+
+       if (! $config{refresh}) {
+               $config{rebuild}=1;
+               debug("rebuilding wiki..");
+       }
+       else {
+               debug("refreshing wiki..");

        }
        }

-       $::config{rebuild}=1;
-       ::checkoptions();
-       ::refresh();

 
 

-       ::debug("done");
-       ::saveindex();
+       loadplugins();
+       checkconfig();
+       lockwiki();
+       loadindex();
+       refresh();
+
+       debug("done");
+       saveindex();

 }
 
 1
 }
 
 1