bugfixes

[git.ikiwiki.info.git] / IkiWiki / Plugin / websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 95d044c08a5d46ada18308d6448efebede1732af..d444c0a3d2b67e228737d592d66a04b082876960 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -18,6 +18,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
+                       section => "web",
                },
                websetup_force_plugins => {
                        type => "string",
@@ -26,6 +27,13 @@ sub getsetup () {
                        safe => 0,
                        rebuild => 0,
                },
+               websetup_unsafe => {
+                       type => "string",
+                       example => [],
+                       description => "list of additional setup field keys to treat as unsafe",
+                       safe => 0,
+                       rebuild => 0,
+               },
                websetup_show_unsafe => {
                        type => "boolean",
                        example => 1,
@@ -56,6 +64,12 @@ sub formatexample ($$) {
        }
 }
 
+sub issafe ($) {
+       my $key=shift;
+
+       return ! grep { $_ eq $key } @{$config{websetup_unsafe}};
+}
+
 sub showfields ($$$@) {
        my $form=shift;
        my $plugin=shift;
@@ -66,27 +80,30 @@ sub showfields ($$$@) {
        while (@_) {
                my $key=shift;
                my %info=%{shift()};
+               
+               if ($key eq 'plugin') {
+                       %plugininfo=%info;
+                       next;
+               }
 
                # skip internal settings
                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
-               next if ! $info{safe} && ! ($config{websetup_show_unsafe} && $config{websetup_advanced});
+               next if ! ($config{websetup_show_unsafe} && $config{websetup_advanced}) &&
+                       (! $info{safe} || ! issafe($key));
                # maybe skip advanced settings
                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;
        }
 
-       my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
+       my $section=defined $plugin
+               ? sprintf(gettext("%s plugin:"), $plugininfo{section}).$plugin
+               : "main";
        my %enabledfields;
        my $shownfields=0;
        
@@ -97,6 +114,16 @@ sub showfields ($$$@) {
                @show=();
        }
 
+       my $section_fieldset;
+       if (defined $plugin) {
+               # Define the combined fieldset for the plugin's section.
+               # This ensures that this fieldset comes first.
+               $section_fieldset=sprintf(gettext("%s plugins"), $plugininfo{section});
+               $form->field(name => "placeholder.$plugininfo{section}",
+                       type => "hidden",
+                       fieldset => $section_fieldset);
+       }
+
        # show plugin toggle
        if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
                my $name="enable.$plugin";
@@ -137,9 +164,16 @@ sub showfields ($$$@) {
                my $name=defined $plugin ? $plugin.".".$key : $section.".".$key;
 
                my $value=$config{$key};
+               if (! defined $value) {
+                       $value="";
+               }
 
-               if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) {
-                       $value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion
+               if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') {
+                       $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) }  @{$value} : "")];
+                       push @$value, "", "" if $info{safe} && issafe($key); # blank items for expansion
+               }
+               else {
+                       $value=Encode::encode_utf8($value);
                }
 
                if ($info{type} eq "string") {
@@ -190,7 +224,7 @@ sub showfields ($$$@) {
                        }
                }
                
-               if (! $info{safe}) {
+               if (! $info{safe} || ! issafe($key)) {
                        $form->field(name => $name, disabled => 1);
                }
                else {
@@ -199,11 +233,11 @@ sub showfields ($$$@) {
                $shownfields++;
        }
        
-       # if no fields were shown for the plugin, drop it into the
-       # plugins fieldset
+       # if no fields were shown for the plugin, drop it into a combined
+       # fieldset for its section
        if (defined $plugin && (! $plugin_forced || $config{websetup_advanced}) &&
            ! $shownfields) {
-               $form->field(name => "enable.$plugin", fieldset => "plugins");
+               $form->field(name => "enable.$plugin", fieldset => $section_fieldset);
        }
 
        return %enabledfields;
@@ -254,7 +288,6 @@ sub showform ($$) {
                params => $cgi,
                fieldsets => [
                        [main => gettext("main")], 
-                       [plugins => gettext("plugins")]
                ],
                action => $config{cgiurl},
                template => {type => 'div'},
@@ -290,7 +323,6 @@ sub showform ($$) {
                shift->(form => $form, cgi => $cgi, session => $session,
                        buttons => $buttons);
        });
-       IkiWiki::decode_form_utf8($form);
 
        my %fields=showfields($form, undef, undef, IkiWiki::getsetup());
        
@@ -308,6 +340,8 @@ sub showform ($$) {
                        $fields{$_}=$shown{$_} foreach keys %shown;
                }
        }
+
+       IkiWiki::decode_form_utf8($form);
        
        if ($form->submitted eq "Cancel") {
                IkiWiki::redirect($cgi, $config{url});
@@ -326,7 +360,7 @@ sub showform ($$) {
                                @value=0;
                        }
                
-                       if (! $info{safe}) {
+                       if (! $info{safe} || ! issafe($key)) {
                                error("unsafe field $key"); # should never happen
                        }
                
@@ -357,7 +391,11 @@ sub showform ($$) {
                                @value=sort grep { length $_ } @value;
                                my @oldvalue=sort grep { length $_ }
                                        (defined $config{$key} ? @{$config{$key}} : ());
-                               if ((@oldvalue) == (@value)) {
+                               my $same=(@oldvalue) == (@value);
+                               for (my $x=0; $same && $x < @value; $x++) {
+                                       $same=0 if $value[$x] ne $oldvalue[$x];
+                               }
+                               if ($same) {
                                        delete $rebuild{$field};
                                }
                                else {
@@ -403,6 +441,7 @@ sub showform ($$) {
                        $form->reset(0); # doesn't really make sense here
                }
                else {
+                       my $oldsetup=readfile($config{setupfile});
                        IkiWiki::Setup::dump($config{setupfile});
 
                        IkiWiki::saveindex();
@@ -426,16 +465,21 @@ sub showform ($$) {
                                        "-refresh", "-wrappers", "-v");
                        }
 
+                       close STDERR;
+                       open(STDERR, ">&STDOUT");
                        my $ret=system(@command);
-                       print "\n<pre>";
+                       print "\n<\/pre>";
                        if ($ret != 0) {
                                print '<p class="error">'.
-                                       sprintf(gettext("<p class=\"error\">Error: %s exited nonzero (%s)"),
+                                       sprintf(gettext("Error: %s exited nonzero (%s). Discarding setup changes."),
                                                join(" ", @command), $ret).
                                        '</p>';
+                               open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
+                               print OUT $oldsetup;
+                               close OUT;
                        }
 
-                       print $tail;                    
+                       print $tail;
                        exit 0;
                }
        }