Merge branch 'master' into po

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

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 2a5e27bf921ee98edc0ee7f12f1ca15497595368..9edd22d2625ddf474fc419d84b6bc544ba6c3270 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -3,17 +3,17 @@ package IkiWiki::Plugin::websetup;
 
 use warnings;
 use strict;
 
 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);
        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,
        return
                plugin => {
                        safe => 1,


@@ -33,15 +33,15 @@ sub getsetup () { #{{{
                        safe => 0,
                        rebuild => 0,
                },
                        safe => 0,
                        rebuild => 0,
                },

-} #}}}
+}

 
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        if (! exists $config{websetup_show_unsafe}) {
                $config{websetup_show_unsafe}=1;
        }
        if (! exists $config{websetup_show_unsafe}) {
                $config{websetup_show_unsafe}=1;
        }

-} #}}}
+}

 
 

-sub formatexample ($$) { #{{{
+sub formatexample ($$) {

        my $example=shift;
        my $value=shift;
 
        my $example=shift;
        my $value=shift;
 


@@ -54,9 +54,9 @@ sub formatexample ($$) { #{{{
        else {
                return "";
        }
        else {
                return "";
        }

-} #}}}
+}

 
 

-sub showfields ($$$@) { #{{{
+sub showfields ($$$@) {

        my $form=shift;
        my $plugin=shift;
        my $enabled=shift;
        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')) {
                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") {
                }
 
                if ($info{type} eq "string") {


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


@@ -236,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 $@;
 


@@ -399,26 +403,53 @@ sub showform ($$) { #{{{
                        $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."));
+                       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."<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 {
                        }
                        else {

-                               # TODO refresh wiki and wrappers
+                               @command=("ikiwiki", "-setup", $config{setupfile},
+                                       "-refresh", "-wrappers", "-v");

                        }
                        }

-       
+
+                       close STDERR;
+                       open(STDERR, ">&STDOUT");
+                       my $ret=system(@command);
+                       print "\n<\/pre>";
+                       if ($ret != 0) {
+                               print '<p class="error">'.
+                                       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;
+                       exit 0;

                }
        }
 
        IkiWiki::showform($form, $buttons, $session, $cgi);
                }
        }
 
        IkiWiki::showform($form, $buttons, $session, $cgi);

-} #}}}
+}

 
 

-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {

        my $cgi=shift;
        my $session=shift;
 
        my $cgi=shift;
        my $session=shift;
 


@@ -426,9 +457,9 @@ sub sessioncgi ($$) { #{{{
                showform($cgi, $session);
                exit;
        }
                showform($cgi, $session);
                exit;
        }

-} #}}}
+}

 
 

-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {

        my %params=@_;
 
        my $form=$params{form};
        my %params=@_;
 
        my $form=$params{form};


@@ -439,6 +470,6 @@ sub formbuilder_setup (@) { #{{{
                        exit;
                }
        }
                        exit;
                }
        }

-} #}}}
+}

 
 1
 
 1