X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b7950d8d01875747cfe74328358c3ff0304e4ad4..bac47cdecd9a9f7db3224eaaed43de0984bcf9ea:/IkiWiki/Setup/Standard.pm?ds=inline

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index fb542be20..f67c3829b 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -3,88 +3,13 @@
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 
+package IkiWiki::Setup::Standard;
+
 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]};
-
-	$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, rebuild => 0, verbose => 0, %setup, %{$wrapper});
-			checkconfig();
-			if (! $config{cgi} && ! $config{post_commit}) {
-				$config{post_commit}=1;
-			}
-			gen_wrapper();
-		}
-		%config=(%startconfig);
-	}
-	
-	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});
-			}
-			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;
-		}
-	}
-	
-	loadplugins();
-	checkconfig();
-
-	if ($config{render}) {
-		commandline_render();
-	}
-
-	if (! $config{refresh}) {
-		$config{rebuild}=1;
-		debug(gettext("rebuilding wiki.."));
-	}
-	else {
-		debug(gettext("refreshing wiki.."));
-	}
-
-	lockwiki();
-	loadindex();
-	refresh();
-
-	debug(gettext("done"));
-	saveindex();
+	$IkiWiki::Setup::raw_setup=$_[1];
 }
 
 1