From 94c59d3254dd97be541cd8ff03ccf3c29b5a55b8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 2 Aug 2008 23:06:25 -0400
Subject: [PATCH] collect a hash of shown fields

Need to do this to know what fields to take from CGI.
(Can't trust that only safe ones are sent..)
---
 .IkiWiki.pm.swp            | Bin 16384 -> 0 bytes
 IkiWiki/Plugin/websetup.pm |  39 +++++++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)
 delete mode 100644 .IkiWiki.pm.swp

diff --git a/.IkiWiki.pm.swp b/.IkiWiki.pm.swp
deleted file mode 100644
index adf830d94a5f4ed131610662776020c1c906d086..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
IxG-q_7i_y9oB#j-

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 150c792a5..64c4d0991 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -78,15 +78,19 @@ sub showfields ($$$@) { #{{{
 		push @show, $key, \%info;
 	}
 
-	return 0 unless @show;
+	return unless @show;
 
 	my $section=defined $plugin ? $plugin." ".gettext("plugin") : gettext("main");
 
+	my %shownfields;
 	if (defined $plugin) {
-		if (! showplugintoggle($form, $plugin, $enabled, $section) && ! $enabled) {
+		if (showplugintoggle($form, $plugin, $enabled, $section)) {
+			$shownfields{"enable.$plugin"}=$plugin;
+		}
+		elsif (! $enabled) {
 		    # plugin not enabled and cannot be, so skip showing
 		    # its configuration
-		    return 0;
+		    return;
 		}
 	}
 
@@ -149,9 +153,12 @@ sub showfields ($$$@) { #{{{
 			$form->field(name => $name, disabled => 1);
 			$form->text(gettext("Note: Disabled options cannot be configured here, but only by editing the setup file."));
 		}
+		else {
+			$shownfields{$name}=$key;
+		}
 	}
 
-	return 1;
+	return %shownfields;
 } #}}}
 
 sub showplugintoggle ($$$$) { #{{{
@@ -170,7 +177,7 @@ sub showplugintoggle ($$$$) { #{{{
 	}
 
 	$form->field(
-		name => "enable.$plugin",
+		ame => "enable.$plugin",
 		label => "",
 		type => "checkbox",
 		options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
@@ -217,7 +224,7 @@ sub showform ($$) { #{{{
 
 	$form->field(name => "do", type => "hidden", value => "setup",
 		force => 1);
-	showfields($form, undef, undef, IkiWiki::getsetup());
+	my %fields=showfields($form, undef, undef, IkiWiki::getsetup());
 	
 	# record all currently enabled plugins before all are loaded
 	my %enabled_plugins=%IkiWiki::loaded_plugins;
@@ -232,19 +239,31 @@ sub showform ($$) { #{{{
 		# skip all rcs plugins except for the one in use
 		next if $plugin ne $config{rcs} && grep { $_ eq $plugin } @rcs_plugins;
 
-		delete $plugins{$plugin} if showfields($form, $plugin, $enabled_plugins{$plugin}, @{$setup});
+		my %shown=showfields($form, $plugin, $enabled_plugins{$plugin}, @{$setup});
+		if (%shown) {
+			delete $plugins{$plugin};
+			$fields{$_}=$shown{$_} foreach keys %shown;
+		}
 	}
 
 	# list all remaining plugins (with no setup options) at the end
-	showplugintoggle($form, $_, $enabled_plugins{$_}, gettext("other plugins"))
-		foreach sort keys %plugins;
+	foreach (sort keys %plugins) {
+		if (showplugintoggle($form, $_, $enabled_plugins{$_}, gettext("other plugins"))) {
+			$fields{"enable.$_"}=$_;
+		}
+	}
 	
 	if ($form->submitted eq "Cancel") {
 		IkiWiki::redirect($cgi, $config{url});
 		return;
 	}
 	elsif ($form->submitted eq 'Save Setup' && $form->validate) {
-		# TODO
+		foreach my $field (keys %fields) {
+			# TODO plugin enable/disable
+			next if $field=~/^enable\./; # plugin
+			$config{$fields{$field}}=$form->field($field);
+		}
+		# TODO save to real path
 		IkiWiki::Setup::dump("/tmp/s");
 		$form->text(gettext("Setup saved."));
 	}
-- 
2.44.0