Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index da2551489c2dd9dce0f4901865db94f56715fe18..827ee3099f31f0f091b6d76326842e0bfea1fd8e 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -104,10 +104,12 @@ sub showfields ($$$@) { #{{{
                        name => $name,
                        label => "",
                        type => "checkbox",
                        name => $name,
                        label => "",
                        type => "checkbox",

-                       options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
-                       value => $enabled,

                        fieldset => $section,
                        fieldset => $section,

+                       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);
                }
                if ($plugin_forced) {
                        $form->field(name => $name, disabled => 1);
                }


@@ -132,12 +134,12 @@ sub showfields ($$$@) { #{{{
                }
 
                # multiple plugins can have the same field
                }
 
                # 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};
 
 
                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") {
                }
 
                if ($info{type} eq "string") {


@@ -180,10 +182,12 @@ sub showfields ($$$@) { #{{{
                                name => $name,
                                label => "",
                                type => "checkbox",
                                name => $name,
                                label => "",
                                type => "checkbox",

-                               value => $value,

                                options => [ [ 1 => $description ] ],
                                fieldset => $section,
                        );
                                options => [ [ 1 => $description ] ],
                                fieldset => $section,
                        );

+                       if (! $form->submitted) {
+                               $form->field(name => $name, value => $value);
+                       }

                }
                
                if (! $info{safe}) {
                }
                
                if (! $info{safe}) {


@@ -205,6 +209,24 @@ sub showfields ($$$@) { #{{{
        return %enabledfields;
 } #}}}
 
        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;
 sub showform ($$) { #{{{
        my $cgi=shift;
        my $session=shift;


@@ -214,6 +236,10 @@ sub showform ($$) { #{{{
                error(gettext("you are not logged in as an admin"));
        }
 
                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 $@;
 
        eval q{use CGI::FormBuilder};
        error($@) if $@;
 


@@ -237,6 +263,7 @@ sub showform ($$) { #{{{
        
        $form->field(name => "do", type => "hidden", value => "setup",
                force => 1);
        
        $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", 
 
        if ($form->submitted eq 'Basic Mode') {
                $form->field(name => "showadvanced", type => "hidden", 


@@ -310,8 +337,15 @@ sub showform ($$) { #{{{
                                        
                        if ($field=~/^enable\.(.*)/) {
                                my $plugin=$1;
                                        
                        if ($field=~/^enable\.(.*)/) {
                                my $plugin=$1;

+                               $value[0]=0 if ! length $value[0];

                                if ($value[0] != exists $enabled_plugins{$plugin}) {
                                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};
                                }
                                else {
                                        delete $rebuild{$field};


@@ -340,25 +374,22 @@ sub showform ($$) { #{{{
                                elsif (! defined $config{$key} && ! length $value[0]) {
                                        delete $rebuild{$field};
                                }
                                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 {
                                        delete $rebuild{$field};
                                }
                                else {

-                                       print STDERR ">>$key (@value) ($config{$key})\n";

                                        $config{$key}=$value[0];
                                }
                        }
                }
                
                if (%rebuild && ! $form->field("rebuild_asked")) {
                                        $config{$key}=$value[0];
                                }
                        }
                }
                
                if (%rebuild && ! $form->field("rebuild_asked")) {

-                       print STDERR ">>".(join "," , keys %rebuild)."\n";

                        my $required=0;
                        foreach my $field ($form->field) {
                                $required=1 if $rebuild{$field};
                                next if exists $rebuild{$field};
                        my $required=0;
                        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."));
                        }
                        if ($required) {
                                $form->text(gettext("The configuration changes shown below require a wiki rebuild to take effect."));


@@ -368,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->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->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') {
                        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;

                }
        }
 
                }
        }