fix var name

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 44fe5514a7cf0017ce3a3f5c1193ed78c2af1108..3d094c263196a7738295f81c8995ce365c5ce091 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -64,7 +64,7 @@ sub cgi_editpage ($$) {
 
        decode_cgi_utf8($q);
 
 
        decode_cgi_utf8($q);
 

-       my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+       my @fields=qw(do rcsinfo subpage from page type editcontent editmessage);

        my @buttons=("Save Page", "Preview", "Cancel");
        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my @buttons=("Save Page", "Preview", "Cancel");
        eval q{use CGI::FormBuilder};
        error($@) if $@;


@@ -75,10 +75,10 @@ sub cgi_editpage ($$) {
                required => [qw{editcontent}],
                javascript => 0,
                params => $q,
                required => [qw{editcontent}],
                javascript => 0,
                params => $q,

-               action => $config{cgiurl},
+               action => IkiWiki::cgiurl(),

                header => 0,
                table => 0,
                header => 0,
                table => 0,

-               template => scalar template_params("editpage.tmpl"),
+               template => { template("editpage.tmpl") },

        );
        
        decode_form_utf8($form);
        );
        
        decode_form_utf8($form);


@@ -91,14 +91,17 @@ sub cgi_editpage ($$) {
        # This untaint is safe because we check file_pruned and
        # wiki_file_regexp.
        my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
        # This untaint is safe because we check file_pruned and
        # wiki_file_regexp.
        my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;

+       if (! defined $page) {
+               error(gettext("bad page name"));
+       }

        $page=possibly_foolish_untaint($page);
        $page=possibly_foolish_untaint($page);

-       my $absolute=($page =~ s#^/+##);
+       my $absolute=($page =~ s#^/+##); # absolute name used to force location

        if (! defined $page || ! length $page ||
        if (! defined $page || ! length $page ||

-           file_pruned($page, $config{srcdir})) {
+           file_pruned($page)) {

                error(gettext("bad page name"));
        }
 
                error(gettext("bad page name"));
        }
 

-       my $baseurl = urlto($page, undef, 1);
+       my $baseurl = urlto($page);

 
        my $from;
        if (defined $form->field('from')) {
 
        my $from;
        if (defined $form->field('from')) {


@@ -128,7 +131,8 @@ sub cgi_editpage ($$) {
                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }
                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }

-               $type=$config{default_pageext} unless defined $type;
+               $type=$config{default_pageext}
+                       if ! defined $type || $type=~/^_/; # not internal type

                $file=newpagefile($page, $type);
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo", value => "", force => 1);
                $file=newpagefile($page, $type);
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo", value => "", force => 1);


@@ -144,34 +148,34 @@ sub cgi_editpage ($$) {
        $form->field(name => "subpage", type => 'hidden');
        $form->field(name => "page", value => $page, force => 1);
        $form->field(name => "type", value => $type, force => 1);
        $form->field(name => "subpage", type => 'hidden');
        $form->field(name => "page", value => $page, force => 1);
        $form->field(name => "type", value => $type, force => 1);

-       $form->field(name => "comments", type => "text", size => 80);
+       $form->field(name => "editmessage", type => "text", size => 80);

        $form->field(name => "editcontent", type => "textarea", rows => 20,
                cols => 80);
        $form->tmpl_param("can_commit", $config{rcs});
        $form->field(name => "editcontent", type => "textarea", rows => 20,
                cols => 80);
        $form->tmpl_param("can_commit", $config{rcs});

-       $form->tmpl_param("indexlink", indexlink());

        $form->tmpl_param("helponformattinglink",
                htmllink($page, $page, "ikiwiki/formatting",
                        noimageinline => 1,
                        linktext => "FormattingHelp"));
        
        $form->tmpl_param("helponformattinglink",
                htmllink($page, $page, "ikiwiki/formatting",
                        noimageinline => 1,
                        linktext => "FormattingHelp"));
        

+       my $previewing=0;

        if ($form->submitted eq "Cancel") {
                if ($form->field("do") eq "create" && defined $from) {
        if ($form->submitted eq "Cancel") {
                if ($form->field("do") eq "create" && defined $from) {

-                       redirect($q, urlto($from, undef, 1));
+                       redirect($q, urlto($from));

                }
                elsif ($form->field("do") eq "create") {
                }
                elsif ($form->field("do") eq "create") {

-                       redirect($q, $config{url});
+                       redirect($q, baseurl(undef));

                }
                else {
                }
                else {

-                       redirect($q, urlto($page, undef, 1));
+                       redirect($q, $baseurl);

                }
                exit;
        }
        elsif ($form->submitted eq "Preview") {
                }
                exit;
        }
        elsif ($form->submitted eq "Preview") {

+               $previewing=1;
+

                my $new=not exists $pagesources{$page};
                my $new=not exists $pagesources{$page};

-               if ($new) {
-                       # temporarily record its type
-                       $pagesources{$page}=$page.".".$type;
-               }
+               # temporarily record its type
+               $pagesources{$page}=$page.".".$type if $new;

                my %wasrendered=map { $_ => 1 } @{$renderedfiles{$page}};
 
                my $content=$form->field('editcontent');
                my %wasrendered=map { $_ => 1 } @{$renderedfiles{$page}};
 
                my $content=$form->field('editcontent');


@@ -196,18 +200,17 @@ sub cgi_editpage ($$) {
                });
                $form->tmpl_param("page_preview", $preview);
                
                });
                $form->tmpl_param("page_preview", $preview);
                

-               if ($new) {
-                       delete $pagesources{$page};
-               }
-

                # Previewing may have created files on disk.
                # Keep a list of these to be deleted later.
                my %previews = map { $_ => 1 } @{$wikistate{editpage}{previews}};
                foreach my $f (@{$renderedfiles{$page}}) {
                        $previews{$f}=1 unless $wasrendered{$f};
                }
                # Previewing may have created files on disk.
                # Keep a list of these to be deleted later.
                my %previews = map { $_ => 1 } @{$wikistate{editpage}{previews}};
                foreach my $f (@{$renderedfiles{$page}}) {
                        $previews{$f}=1 unless $wasrendered{$f};
                }

+
+               # Throw out any other state changes made during previewing,
+               # and save the previews list.
+               loadindex();

                @{$wikistate{editpage}{previews}} = keys %previews;
                @{$wikistate{editpage}{previews}} = keys %previews;

-               $renderedfiles{$page}=[keys %wasrendered];

                saveindex();
        }
        elsif ($form->submitted eq "Save Page") {
                saveindex();
        }
        elsif ($form->submitted eq "Save Page") {


@@ -220,8 +223,7 @@ sub cgi_editpage ($$) {
                        my $best_loc;
                        if (! defined $from || ! length $from ||
                            $from ne $form->field('from') ||
                        my $best_loc;
                        if (! defined $from || ! length $from ||
                            $from ne $form->field('from') ||

-                           file_pruned($from, $config{srcdir}) ||
-                           $from=~/^\// || 
+                           file_pruned($from) ||

                            $absolute ||
                            $form->submitted) {
                                @page_locs=$best_loc=$page;
                            $absolute ||
                            $form->submitted) {
                                @page_locs=$best_loc=$page;


@@ -257,14 +259,14 @@ sub cgi_editpage ($$) {
                        if (! @page_locs) {
                                # hmm, someone else made the page in the
                                # meantime?
                        if (! @page_locs) {
                                # hmm, someone else made the page in the
                                # meantime?

-                               if ($form->submitted eq "Preview") {
+                               if ($previewing) {

                                        # let them go ahead with the edit
                                        # and resolve the conflict at save
                                        # time
                                        @page_locs=$page;
                                }
                                else {
                                        # let them go ahead with the edit
                                        # and resolve the conflict at save
                                        # time
                                        @page_locs=$page;
                                }
                                else {

-                                       redirect($q, urlto($page, undef, 1));
+                                       redirect($q, $baseurl);

                                        exit;
                                }
                        }
                                        exit;
                                }
                        }


@@ -293,7 +295,7 @@ sub cgi_editpage ($$) {
                                value => $best_loc);
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                                value => $best_loc);
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);

-                       $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
+                       $form->title(sprintf(gettext("creating %s"), pagetitle(basename($page))));

                        
                }
                elsif ($form->field("do") eq "edit") {
                        
                }
                elsif ($form->field("do") eq "edit") {


@@ -311,10 +313,10 @@ sub cgi_editpage ($$) {
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');

-                       $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
+                       $form->title(sprintf(gettext("editing %s"), pagetitle(basename($page))));

                }
                
                }
                

-               showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+               showform($form, \@buttons, $session, $q, page => $page);

        }
        else {
                # save page
        }
        else {
                # save page


@@ -331,7 +333,8 @@ sub cgi_editpage ($$) {
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));

-                       showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+                       showform($form, \@buttons, $session, $q,
+                               page => $page);

                        exit;
                }
                elsif ($form->field("do") eq "create" && $exists) {
                        exit;
                }
                elsif ($form->field("do") eq "create" && $exists) {


@@ -345,14 +348,15 @@ sub cgi_editpage ($$) {
                                value => readfile("$config{srcdir}/$file").
                                         "\n\n\n".$form->field("editcontent"),
                                force => 1);
                                value => readfile("$config{srcdir}/$file").
                                         "\n\n\n".$form->field("editcontent"),
                                force => 1);

-                       showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl);
+                       showform($form, \@buttons, $session, $q,
+                               page => $page);

                        exit;
                }
                        
                my $message="";
                        exit;
                }
                        
                my $message="";

-               if (defined $form->field('comments') &&
-                   length $form->field('comments')) {
-                       $message=$form->field('comments');
+               if (defined $form->field('editmessage') &&
+                   length $form->field('editmessage')) {
+                       $message=$form->field('editmessage');

                }
                
                my $content=$form->field('editcontent');
                }
                
                my $content=$form->field('editcontent');


@@ -386,7 +390,7 @@ sub cgi_editpage ($$) {
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        showform($form, \@buttons, $session, $q,
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        showform($form, \@buttons, $session, $q,

-                               forcebaseurl => $baseurl);
+                               page => $page);

                        exit;
                }
                
                        exit;
                }
                


@@ -400,9 +404,12 @@ sub cgi_editpage ($$) {
                        # signaling to it that it should not try to
                        # do anything.
                        disable_commit_hook();
                        # signaling to it that it should not try to
                        # do anything.
                        disable_commit_hook();

-                       $conflict=rcs_commit($file, $message,
-                               $form->field("rcsinfo"),
-                               $session->param("name"), $ENV{REMOTE_ADDR});
+                       $conflict=rcs_commit(
+                               file => $file,
+                               message => $message,
+                               token => $form->field("rcsinfo"),
+                               session => $session,
+                       );

                        enable_commit_hook();
                        rcs_update();
                }
                        enable_commit_hook();
                        rcs_update();
                }


@@ -425,12 +432,12 @@ sub cgi_editpage ($$) {
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        showform($form, \@buttons, $session, $q,
                        $form->field(name => "type", type => 'hidden');
                        $form->title(sprintf(gettext("editing %s"), $page));
                        showform($form, \@buttons, $session, $q,

-                               forcebaseurl => $baseurl);
+                               page => $page);

                }
                else {
                        # The trailing question mark tries to avoid broken
                        # caches and get the most recent version of the page.
                }
                else {
                        # The trailing question mark tries to avoid broken
                        # caches and get the most recent version of the page.

-                       redirect($q, urlto($page, undef, 1)."?updated");
+                       redirect($q, $baseurl."?updated");

                }
        }
 
                }
        }