web commit by http://ccshan.myopenid.com/

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 56ed5ab3b553e7f17b3b257cc82ee94049821770..c279e6451e738505e0ceb5b3e47e96087312c5b9 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,27 +19,69 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
 sub setup_standard {
        my %setup=%{$_[1]};
 

-       debug("generating wrappers..");
-       my %startconfig=(%config);
-       foreach my $wrapper (@{$setup{wrappers}}) {
-               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               checkconfig();
-               gen_wrapper();
+       $setup{plugin}=$config{plugin};
+       if (exists $setup{add_plugins}) {
+               push @{$setup{plugin}}, @{$setup{add_plugins}};
+               delete $setup{add_plugins};
+       }
+       if (exists $setup{exclude}) {
+               push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
+       }
+
+       if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
+               debug(gettext("generating wrappers.."));
+               my @wrappers=@{$setup{wrappers}};
+               delete $setup{wrappers};
+               my %startconfig=(%config);
+               foreach my $wrapper (@wrappers) {
+                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       checkconfig();
+                       if (! $config{cgi} && ! $config{post_commit}) {
+                               $config{post_commit}=1;
+                       }
+                       gen_wrapper();
+               }
+               %config=(%startconfig);

        }
        }

-       %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};
+               next if $c eq 'syslog';
+               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{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {
+               $config{rebuild}=1;
+               debug(gettext("rebuilding wiki.."));
+       }
+       else {
+               debug(gettext("refreshing wiki.."));

        }
        }

-       $config{rebuild}=1;

 
 

+       loadplugins();

        checkconfig();
        lockwiki();
        checkconfig();
        lockwiki();

+       loadindex();

        refresh();
 
        refresh();
 

-       debug("done");
+       debug(gettext("done"));

        saveindex();
 }
 
        saveindex();
 }