* Allow /etc/ikiwiki/wikilist to list just the names of users, if so then

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a5514da91ce5d820dfe2da2bca148f06..7512c258758eb7e7a577d73e08b2679dc5a6e6b0 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -19,17 +19,34 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
-       if (! $config{refresh}) {
+       $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}/;
+       }
+
+       if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
                debug("generating wrappers..");
+               my @wrappers=@{$setup{wrappers}};
+               delete $setup{wrappers};
                my %startconfig=(%config);
-               foreach my $wrapper (@{$setup{wrappers}}) {
+               foreach my $wrapper (@wrappers) {
                        %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
                        checkconfig();
                        gen_wrapper();
                }
                %config=(%startconfig);
-               delete $config{wrappers};
        }
+       
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
@@ -38,13 +55,21 @@ sub setup_standard {
                        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}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {
                $config{rebuild}=1;
                debug("rebuilding wiki..");
        }
@@ -52,6 +77,7 @@ sub setup_standard {
                debug("refreshing wiki..");
        }
 
+       loadplugins();
        checkconfig();
        lockwiki();
        loadindex();