X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e3b9e716d093497c1748f92f333f00a47a4272fa..23ab9057d2999de112880ee82a818149f42d0d7b:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9aa9299ea..25f038a06 100644
--- 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,
-# 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;
@@ -20,22 +19,54 @@ package IkiWiki;
 sub setup_standard {
 	my %setup=%{$_[1]};
 
+	$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};
+	}
+
 	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});
-		checkoptions();
+		checkconfig();
 		gen_wrapper();
 	}
 	%config=(%startconfig);
 	
-	debug("rebuilding wiki..");
 	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}}]
+			}
+		}
+		else {
+			$config{$c}=undef;
+		}
 	}
-	$config{rebuild}=1;
-	checkoptions();
+
+	if (! $config{refresh}) {
+		$config{rebuild}=1;
+		debug("rebuilding wiki..");
+	}
+	else {
+		debug("refreshing wiki..");
+	}
+
+	checkconfig();
+	lockwiki();
+	loadindex();
 	refresh();
 
 	debug("done");