X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4b79a43db6bf3027bc3b98d8770f98ce878035b8..73f4a8835876c8cb07808367cd72d9ae972893e8:/IkiWiki/Plugin/websetup.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 8bef44925..9edd22d26 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; @@ -134,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=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion } if ($info{type} eq "string") { @@ -207,9 +207,27 @@ sub showfields ($$$@) { #{{{ } return %enabledfields; -} #}}} +} -sub showform ($$) { #{{{ +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; @@ -218,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 $@; @@ -241,6 +263,7 @@ sub showform ($$) { #{{{ $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", @@ -314,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}; @@ -344,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 { @@ -359,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.")); @@ -370,27 +399,57 @@ 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.")); - + my $oldsetup=readfile($config{setupfile}); + 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."
\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"); + } + + close STDERR; + open(STDERR, ">&STDOUT"); + my $ret=system(@command); + print "\n<\/pre>"; + if ($ret != 0) { + print ''. + sprintf(gettext("Error: %s exited nonzero (%s). Discarding setup changes."), + join(" ", @command), $ret). + '
'; + open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!"); + print OUT $oldsetup; + close OUT; + } + + print $tail; + exit 0; } } IkiWiki::showform($form, $buttons, $session, $cgi); -} #}}} +} -sub sessioncgi ($$) { #{{{ +sub sessioncgi ($$) { my $cgi=shift; my $session=shift; @@ -398,9 +457,9 @@ sub sessioncgi ($$) { #{{{ showform($cgi, $session); exit; } -} #}}} +} -sub formbuilder_setup (@) { #{{{ +sub formbuilder_setup (@) { my %params=@_; my $form=$params{form}; @@ -411,6 +470,6 @@ sub formbuilder_setup (@) { #{{{ exit; } } -} #}}} +} 1