X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2eb5893ce7095475cadc07f9f3b0c50eb6efc68d..f8995795a99aae80faec706cc76d2cf6622cf8f2:/IkiWiki/Setup/Standard.pm?ds=sidebyside

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 4d1118f30..c279e6451 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,37 +1,88 @@
 #!/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 IkiWiki::Wrapper;
+use IkiWiki::Render;
+
+package IkiWiki::Setup::Standard;
 
 sub import {
+	IkiWiki::setup_standard(@_);
+}
+	
+package IkiWiki;
+
+sub setup_standard {
 	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{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) {
-		$::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();
 	}
-	$::config{rebuild}=1;
-	::checkoptions();
-	::refresh();
+	elsif (! $config{refresh}) {
+		$config{rebuild}=1;
+		debug(gettext("rebuilding wiki.."));
+	}
+	else {
+		debug(gettext("refreshing wiki.."));
+	}
+
+	loadplugins();
+	checkconfig();
+	lockwiki();
+	loadindex();
+	refresh();
 
-	::debug("done");
-	::saveindex();
+	debug(gettext("done"));
+	saveindex();
 }
 
 1