summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-08-03 16:23:41 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-08-03 16:23:41 -0400
commit9e0cbb73fe550d05e668d3584ef6f7981e781c8e (patch)
treef468eb3956ca64b8c90f9fba13a538c853894e80 /IkiWiki
parent43307fb21556098024331ee26563e5be19ccea3e (diff)
plugin safe/rebuild controls
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/websetup.pm95
-rw-r--r--IkiWiki/Setup.pm7
-rw-r--r--IkiWiki/Setup/Standard.pm2
3 files changed, 43 insertions, 61 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 061ce0873..aed2ddf64 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -5,12 +5,6 @@ use warnings;
use strict;
use IkiWiki 2.00;
-my @rcs_plugins=(qw{git svn bzr mercurial monotone tla norcs});
-
-# amazon_s3 is not something that should be enabled via the web.
-# external is not a standalone plugin.
-my @force_plugins=(qw{amazon_s3 external});
-
sub import { #{{{
hook(type => "getsetup", id => "websetup", call => \&getsetup);
hook(type => "checkconfig", id => "websetup", call => \&checkconfig);
@@ -64,12 +58,13 @@ sub showfields ($$$@) { #{{{
my $enabled=shift;
my @show;
+ my %plugininfo;
while (@_) {
my $key=shift;
my %info=%{shift()};
# skip internal settings
- next if $info{type} eq "internal";
+ next if defined $info{type} && $info{type} eq "internal";
# XXX hashes not handled yet
next if ref $config{$key} && ref $config{$key} eq 'HASH' || ref $info{example} eq 'HASH';
# maybe skip unsafe settings
@@ -78,26 +73,26 @@ sub showfields ($$$@) { #{{{
next if $info{advanced} && ! $config{websetup_advanced};
# these are handled specially, so don't show
next if $key eq 'add_plugins' || $key eq 'disable_plugins';
+
+ if ($key eq 'plugin') {
+ %plugininfo=%info;
+ next;
+ }
push @show, $key, \%info;
}
- return unless @show;
-
- my $section=defined $plugin ? $plugin." ".gettext("plugin") : gettext("main");
-
- my %shownfields;
- if (defined $plugin) {
- if (showplugintoggle($form, $plugin, $enabled, $section)) {
- $shownfields{"enable.$plugin"}=[$plugin];
- }
- elsif (! $enabled) {
- # plugin not enabled and cannot be, so skip showing
- # its configuration
- return;
- }
+ my $plugin_forced=defined $plugin && (! $plugininfo{safe} ||
+ (exists $config{websetup_force_plugins} && grep { $_ eq $plugin } @{$config{websetup_force_plugins}}));
+ if ($plugin_forced && ! $enabled) {
+ # plugin is disabled and cannot be turned on,
+ # so skip its configuration
+ return;
}
+ my %shownfields;
+ my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
+
while (@show) {
my $key=shift @show;
my %info=%{shift @show};
@@ -169,40 +164,32 @@ sub showfields ($$$@) { #{{{
if (! $info{safe}) {
$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, \%info];
}
}
- return %shownfields;
-} #}}}
-
-sub showplugintoggle ($$$$) { #{{{
- my $form=shift;
- my $plugin=shift;
- my $enabled=shift;
- my $section=shift;
-
- if (exists $config{websetup_force_plugins} &&
- grep { $_ eq $plugin } @{$config{websetup_force_plugins}}) {
- return 0;
- }
- if (grep { $_ eq $plugin } @force_plugins, @rcs_plugins) {
- return 0;
+ if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
+ my $name="enable.$plugin";
+ $section="plugins" unless %shownfields;
+ $form->field(
+ name => $name,
+ label => "",
+ type => "checkbox",
+ options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
+ value => $enabled,
+ fieldset => $section,
+ );
+ if ($plugin_forced) {
+ $form->field(name => $name, disabled => 1);
+ }
+ else {
+ $shownfields{$name}=[$name, \%plugininfo];
+ }
}
- $form->field(
- name => "enable.$plugin",
- label => "",
- type => "checkbox",
- options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
- value => $enabled,
- fieldset => $section,
- );
-
- return 1;
+ return %shownfields;
} #}}}
sub showform ($$) { #{{{
@@ -226,6 +213,10 @@ sub showform ($$) { #{{{
javascript => 0,
reset => 1,
params => $cgi,
+ fieldsets => [
+ [main => gettext("main")],
+ [plugins => gettext("plugins")]
+ ],
action => $config{cgiurl},
template => {type => 'div'},
stylesheet => IkiWiki::baseurl()."style.css",
@@ -271,9 +262,6 @@ sub showform ($$) { #{{{
foreach my $pair (IkiWiki::Setup::getsetup()) {
my $plugin=$pair->[0];
my $setup=$pair->[1];
-
- # skip all rcs plugins except for the one in use
- next if $plugin ne $config{rcs} && grep { $_ eq $plugin } @rcs_plugins;
my %shown=showfields($form, $plugin, $enabled_plugins{$plugin}, @{$setup});
if (%shown) {
@@ -281,13 +269,6 @@ sub showform ($$) { #{{{
$fields{$_}=$shown{$_} foreach keys %shown;
}
}
-
- # list all remaining plugins (with no setup options) at the end
- foreach (sort keys %plugins) {
- if (showplugintoggle($form, $_, $enabled_plugins{$_}, gettext("other plugins"))) {
- $fields{"enable.$_"}=[$_];
- }
- }
if ($form->submitted eq "Cancel") {
IkiWiki::redirect($cgi, $config{url});
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 02a462082..d2d1e4b8e 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -72,11 +72,12 @@ sub merge ($) {
} #}}}
sub getsetup () { #{{{
- # Gets all available setup data from all plugins. Returns an ordered list of
- # [plugin, setup] pairs.
+ # Gets all available setup data from all plugins. Returns an
+ # ordered list of [plugin, setup] pairs.
my @ret;
- # disable logging to syslog while dumping, broken plugins may whine when loaded
+ # disable logging to syslog while dumping, broken plugins may
+ # whine when loaded
my $syslog=$config{syslog};
$config{syslog}=0;
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index dd613fd03..c87fb80f5 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -62,7 +62,7 @@ sub dumpvalues ($@) { #{{{
my $key=shift;
my %info=%{shift()};
- next if $info{type} eq "internal";
+ next if $info{type} eq "internal" || $key eq "plugin";
push @ret, "\t# ".$info{description} if exists $info{description};