fix libdir tainting

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a5514da91ce5d820dfe2da2bca148f06..87db648e0accc2c177f2f55e8c6dc712863a0326 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -19,18 +19,33 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
 sub setup_standard {
        my %setup=%{$_[1]};
 

-       if (! $config{refresh}) {
-               debug("generating wrappers..");
+       $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);
                my %startconfig=(%config);

-               foreach my $wrapper (@{$setup{wrappers}}) {
-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+               foreach my $wrapper (@wrappers) {
+                       %config=(%startconfig, rebuild => 0, verbose => 0, %setup, %{$wrapper});

                        checkconfig();
                        checkconfig();

+                       if (! $config{cgi} && ! $config{post_commit}) {
+                               $config{post_commit}=1;
+                       }

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

-               delete $config{wrappers};

        }
        }

+       

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

+               next if $c eq 'syslog';

                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
                                $config{$c}=possibly_foolish_untaint($setup{$c});
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
                                $config{$c}=possibly_foolish_untaint($setup{$c});


@@ -38,26 +53,35 @@ sub setup_standard {
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $config{$c}=[map { 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;
                }
        }
 
                }
                else {
                        $config{$c}=undef;
                }
        }
 

-       if (! $config{refresh}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {

                $config{rebuild}=1;
                $config{rebuild}=1;

-               debug("rebuilding wiki..");
+               debug(gettext("rebuilding wiki.."));

        }
        else {
        }
        else {

-               debug("refreshing wiki..");
+               debug(gettext("refreshing wiki.."));

        }
 
        }
 

+       loadplugins();

        checkconfig();
        lockwiki();
        loadindex();
        refresh();
 
        checkconfig();
        lockwiki();
        loadindex();
        refresh();
 

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

        saveindex();
 }
 
        saveindex();
 }