X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2a712c8817417842ed06a7f2920c406d6ac94679..779c5214f330269fa95a5fed5b16fe8d65730102:/IkiWiki/Plugin/websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 7f4bce5e5..827ee3099 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -102,15 +102,14 @@ sub showfields ($$$@) { #{{{
 		my $name="enable.$plugin";
 		$form->field(
 			name => $name,
-			label => sprintf(gettext("enable %s?"), $plugin),
-			type => "radio",
-			value => $enabled,
+			label => "",
+			type => "checkbox",
 			fieldset => $section,
-			options => [
-				[ 1 => gettext("Yes") ],
-				[ 0 => gettext("No") ]
-			],
+			options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ]]
 		);
+		if (! $form->submitted) {
+			$form->field(name => $name, value => $enabled);
+		}
 		if ($plugin_forced) {
 			$form->field(name => $name, disabled => 1);
 		}
@@ -135,12 +134,12 @@ sub showfields ($$$@) { #{{{
 		}
 
 		# multiple plugins can have the same field
-		my $name=defined $plugin ? $plugin.".".$key : $key;
+		my $name=defined $plugin ? $plugin.".".$key : $section.".".$key;
 
 		my $value=$config{$key};
 
-		if ($info{safe} && (ref $config{$key} eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-			push @{$value}, "", ""; # blank items for expansion
+		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
+			$value=[@{$value}, "", ""]; # blank items for expansion
 		}
 
 		if ($info{type} eq "string") {
@@ -181,15 +180,14 @@ sub showfields ($$$@) { #{{{
 		elsif ($info{type} eq "boolean") {
 			$form->field(
 				name => $name,
-				label => $description,
-				type => "radio",
-				value => $value,
-				options => [
-					[ 1 => gettext("Yes") ],
-					[ 0 => gettext("No") ]
-				],
+				label => "",
+				type => "checkbox",
+				options => [ [ 1 => $description ] ],
 				fieldset => $section,
 			);
+			if (! $form->submitted) {
+				$form->field(name => $name, value => $value);
+			}
 		}
 		
 		if (! $info{safe}) {
@@ -211,6 +209,24 @@ sub showfields ($$$@) { #{{{
 	return %enabledfields;
 } #}}}
 
+sub enable_plugin ($) { #{{{
+	my $plugin=shift;
+
+	$config{disable_plugins}=[grep { $_ ne $plugin } @{$config{disable_plugins}}];
+	push @{$config{add_plugins}}, $plugin;
+}
+
+sub disable_plugin ($) { #{{{
+	my $plugin=shift;
+
+	if (grep { $_ eq $plugin } @{$config{add_plugins}}) {
+		$config{add_plugins}=[grep { $_ ne $plugin } @{$config{add_plugins}}];
+	}
+	else {
+		push @{$config{disable_plugins}}, $plugin;
+	}
+}
+
 sub showform ($$) { #{{{
 	my $cgi=shift;
 	my $session=shift;
@@ -220,6 +236,10 @@ sub showform ($$) { #{{{
 		error(gettext("you are not logged in as an admin"));
 	}
 
+	if (! exists $config{setupfile}) {
+		error(gettext("setup file for this wiki is not known"));
+	}
+
 	eval q{use CGI::FormBuilder};
 	error($@) if $@;
 
@@ -237,13 +257,13 @@ sub showform ($$) { #{{{
 			[plugins => gettext("plugins")]
 		],
 		action => $config{cgiurl},
-		table => 0,
 		template => {type => 'div'},
 		stylesheet => IkiWiki::baseurl()."style.css",
 	);
 	
 	$form->field(name => "do", type => "hidden", value => "setup",
 		force => 1);
+	$form->field(name => "rebuild_asked", type => "hidden");
 
 	if ($form->submitted eq 'Basic Mode') {
 		$form->field(name => "showadvanced", type => "hidden", 
@@ -317,8 +337,15 @@ sub showform ($$) { #{{{
 					
 			if ($field=~/^enable\.(.*)/) {
 				my $plugin=$1;
+				$value[0]=0 if ! length $value[0];
 				if ($value[0] != exists $enabled_plugins{$plugin}) {
-					# TODO plugin enable/disable
+					if ($value[0]) {
+						enable_plugin($plugin);
+					}
+					else {
+						disable_plugin($plugin);
+
+					}
 				}
 				else {
 					delete $rebuild{$field};
@@ -347,8 +374,8 @@ sub showform ($$) { #{{{
 				elsif (! defined $config{$key} && ! length $value[0]) {
 					delete $rebuild{$field};
 				}
-				elsif (! defined $config{$key} && ! $value[0] &&
-				       $info{type} eq "boolean") {
+				elsif ((! defined $config{$key} || ! $config{$key}) &&
+				       ! $value[0] && $info{type} eq "boolean") {
 					delete $rebuild{$field};
 				}
 				else {
@@ -362,8 +389,7 @@ sub showform ($$) { #{{{
 			foreach my $field ($form->field) {
 				$required=1 if $rebuild{$field};
 				next if exists $rebuild{$field};
-				$form->field(name => $field, type => "hidden",
-					force => 1);
+				$form->field(name => $field, type => "hidden");
 			}
 			if ($required) {
 				$form->text(gettext("The configuration changes shown below require a wiki rebuild to take effect."));
@@ -373,20 +399,44 @@ sub showform ($$) { #{{{
 				$form->text(gettext("For the configuration changes shown below to fully take effect, you may need to rebuild the wiki."));
 				$buttons=["Rebuild Wiki", "Save Setup", "Cancel"];
 			}
-			$form->field(name => "rebuild_asked", type => "hidden",
-				value => 1, force => 1);
+			$form->field(name => "rebuild_asked", value => 1, force => 1);
 			$form->reset(0); # doesn't really make sense here
 		}
 		else {
-			$form->field(name => "rebuild_asked", type => "hidden",
-				value => 0, force => 1);
-			# TODO save to real path
-			IkiWiki::Setup::dump("/tmp/s");
-			$form->text(gettext("Setup saved."));
-	
+			IkiWiki::Setup::dump($config{setupfile});
+
+			IkiWiki::saveindex();
+			IkiWiki::unlockwiki();
+
+			# Print the top part of a standard misctemplate,
+			# then show the rebuild or refresh.
+			my $divider="xxx";
+			my $html=IkiWiki::misctemplate("setup", $divider);
+			IkiWiki::printheader($session);
+			my ($head, $tail)=split($divider, $html, 2);
+			print $head."<pre>\n";
+
+			my @command;
 			if ($form->submitted eq 'Rebuild Wiki') {
-				# TODO rebuild
+				@command=("ikiwiki", "-setup", $config{setupfile},
+                                        "-rebuild", "-v");
+			}
+			else {
+				@command=("ikiwiki", "-setup", $config{setupfile},
+					"-refresh", "-wrappers", "-v");
 			}
+
+			my $ret=system(@command);
+			print "\n<pre>";
+			if ($ret != 0) {
+				print '<p class="error">'.
+					sprintf(gettext("<p class=\"error\">Error: %s exited nonzero (%s)"),
+						join(" ", @command), $ret).
+					'</p>';
+			}
+
+			print $tail;			
+			exit 0;
 		}
 	}