X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c8d3626c51bdc53781d9431b1da88ae1e92dc2d5..35460e3153286381a6019e5afd46b2880a95cb88:/IkiWiki/Plugin/websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index b110939e4..95d044c08 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -3,17 +3,17 @@ package IkiWiki::Plugin::websetup;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "websetup", call => \&getsetup);
 	hook(type => "checkconfig", id => "websetup", call => \&checkconfig);
 	hook(type => "sessioncgi", id => "websetup", call => \&sessioncgi);
 	hook(type => "formbuilder_setup", id => "websetup", 
 	     call => \&formbuilder_setup);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -33,15 +33,15 @@ sub getsetup () { #{{{
 			safe => 0,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	if (! exists $config{websetup_show_unsafe}) {
 		$config{websetup_show_unsafe}=1;
 	}
-} #}}}
+}
 
-sub formatexample ($$) { #{{{
+sub formatexample ($$) {
 	my $example=shift;
 	my $value=shift;
 
@@ -54,9 +54,9 @@ sub formatexample ($$) { #{{{
 	else {
 		return "";
 	}
-} #}}}
+}
 
-sub showfields ($$$@) { #{{{
+sub showfields ($$$@) {
 	my $form=shift;
 	my $plugin=shift;
 	my $enabled=shift;
@@ -139,7 +139,7 @@ sub showfields ($$$@) { #{{{
 		my $value=$config{$key};
 
 		if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-			$value=[@{$value}, "", ""]; # blank items for expansion
+			$value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion
 		}
 
 		if ($info{type} eq "string") {
@@ -207,16 +207,16 @@ sub showfields ($$$@) { #{{{
 	}
 
 	return %enabledfields;
-} #}}}
+}
 
-sub enable_plugin ($) { #{{{
+sub enable_plugin ($) {
 	my $plugin=shift;
 
 	$config{disable_plugins}=[grep { $_ ne $plugin } @{$config{disable_plugins}}];
 	push @{$config{add_plugins}}, $plugin;
 }
 
-sub disable_plugin ($) { #{{{
+sub disable_plugin ($) {
 	my $plugin=shift;
 
 	if (grep { $_ eq $plugin } @{$config{add_plugins}}) {
@@ -227,7 +227,7 @@ sub disable_plugin ($) { #{{{
 	}
 }
 
-sub showform ($$) { #{{{
+sub showform ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
@@ -236,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 $@;
 
@@ -349,10 +353,7 @@ sub showform ($$) { #{{{
 				next;
 			}
 
-			print STDERR "on $key\n";
-
 			if (ref $config{$key} eq "ARRAY" || ref $info{example} eq "ARRAY") {
-				print STDERR "$key is array\n";
 				@value=sort grep { length $_ } @value;
 				my @oldvalue=sort grep { length $_ }
 					(defined $config{$key} ? @{$config{$key}} : ());
@@ -368,20 +369,16 @@ sub showform ($$) { #{{{
 			}
 			else {
 				if (defined $config{$key} && $config{$key} eq $value[0]) {
-					print STDERR "$key SET SAME ($config{$key})\n";
 					delete $rebuild{$field};
 				}
 				elsif (! defined $config{$key} && ! length $value[0]) {
-					print STDERR "$key UNDEF and unset\n";
 					delete $rebuild{$field};
 				}
 				elsif ((! defined $config{$key} || ! $config{$key}) &&
 				       ! $value[0] && $info{type} eq "boolean") {
-				        print STDERR "omitting false $key\n";
 					delete $rebuild{$field};
 				}
 				else {
-					print STDERR "for $key : $value[0] vs $config{$key}; type: $info{type}\n";
 					$config{$key}=$value[0];
 				}
 			}
@@ -406,26 +403,47 @@ sub showform ($$) { #{{{
 			$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 {
-				# TODO refresh wiki and wrappers
+				@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;
 		}
 	}
 
 	IkiWiki::showform($form, $buttons, $session, $cgi);
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
@@ -433,9 +451,9 @@ sub sessioncgi ($$) { #{{{
 		showform($cgi, $session);
 		exit;
 	}
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -446,6 +464,6 @@ sub formbuilder_setup (@) { #{{{
 			exit;
 		}
 	}
-} #}}}
+}
 
 1