po(cansave): use po_to_markup to check PO validity

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 8ab02cabc364f7f99b8cf1b963c3d9f1b36af562..91d125a5ca1ca30e836706a6e5e2aa43df6eced2 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -6,19 +6,19 @@ use strict;
 use IkiWiki;
 use open qw{:utf8 :std};
 
 use IkiWiki;
 use open qw{:utf8 :std};
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "editpage", call => \&getsetup);
        hook(type => "refresh", id => "editpage", call => \&refresh);
         hook(type => "sessioncgi", id => "editpage", call => \&IkiWiki::cgi_editpage);
        hook(type => "getsetup", id => "editpage", call => \&getsetup);
        hook(type => "refresh", id => "editpage", call => \&refresh);
         hook(type => "sessioncgi", id => "editpage", call => \&IkiWiki::cgi_editpage);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => 1,
                },
        return
                plugin => {
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+}

 
 sub refresh () {
        if (exists $wikistate{editpage} && exists $wikistate{editpage}{previews}) {
 
 sub refresh () {
        if (exists $wikistate{editpage} && exists $wikistate{editpage}{previews}) {


@@ -54,7 +54,7 @@ sub refresh () {
 # and other plugins use the functions below.
 package IkiWiki;
 
 # and other plugins use the functions below.
 package IkiWiki;
 

-sub check_canedit ($$$;$) { #{{{
+sub check_canedit ($$$;$) {

        my $page=shift;
        my $q=shift;
        my $session=shift;
        my $page=shift;
        my $q=shift;
        my $session=shift;


@@ -79,9 +79,36 @@ sub check_canedit ($$$;$) { #{{{
                }
        });
        return $canedit;
                }
        });
        return $canedit;

-} #}}}
+}
+
+sub check_cansave ($$$$) {
+       my $page=shift;
+       my $content=shift;
+       my $q=shift;
+       my $session=shift;
+
+       my $cansave;
+       run_hooks(cansave => sub {
+               return if defined $cansave;
+               my $ret=shift->($page, $content, $q, $session);
+               if (defined $ret) {
+                       if ($ret eq "") {
+                               $cansave=1;
+                       }
+                       elsif (ref $ret eq 'CODE') {
+                               $ret->();
+                               $cansave=0;
+                       }
+                       else {
+                               error($ret);
+                               $cansave=0;
+                       }
+               }
+       });
+       return $cansave;
+}

 
 

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

        my $q=shift;
        my $session=shift;
        
        my $q=shift;
        my $session=shift;
        


@@ -105,7 +132,6 @@ sub cgi_editpage ($$) { #{{{
                header => 0,
                table => 0,
                template => scalar template_params("editpage.tmpl"),
                header => 0,
                table => 0,
                template => scalar template_params("editpage.tmpl"),

-               wikiname => $config{wikiname},

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


@@ -122,7 +148,7 @@ sub cgi_editpage ($$) { #{{{
        my $absolute=($page =~ s#^/+##);
        if (! defined $page || ! length $page ||
            file_pruned($page, $config{srcdir})) {
        my $absolute=($page =~ s#^/+##);
        if (! defined $page || ! length $page ||
            file_pruned($page, $config{srcdir})) {

-               error("bad page name");
+               error(gettext("bad page name"));

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


@@ -156,7 +182,7 @@ sub cgi_editpage ($$) { #{{{
                        $type=pagetype($pagesources{$from});
                }
                $type=$config{default_pageext} unless defined $type;
                        $type=pagetype($pagesources{$from});
                }
                $type=$config{default_pageext} unless defined $type;

-               $file=$page.".".$type;
+               $file=newpagefile($page, $type);

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


@@ -230,8 +256,8 @@ sub cgi_editpage ($$) { #{{{
                # Previewing may have created files on disk.
                # Keep a list of these to be deleted later.
                my %previews = map { $_ => 1 } @{$wikistate{editpage}{previews}};
                # 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 $file (@{$renderedfiles{$page}}) {
-                       $previews{$file}=1 unless $wasrendered{$file};
+               foreach my $f (@{$renderedfiles{$page}}) {
+                       $previews{$f}=1 unless $wasrendered{$f};

                }
                @{$wikistate{editpage}{previews}} = keys %previews;
                $renderedfiles{$page}=[keys %wasrendered];
                }
                @{$wikistate{editpage}{previews}} = keys %previews;
                $renderedfiles{$page}=[keys %wasrendered];


@@ -250,7 +276,7 @@ sub cgi_editpage ($$) { #{{{
                            file_pruned($from, $config{srcdir}) ||
                            $from=~/^\// || 
                            $absolute ||
                            file_pruned($from, $config{srcdir}) ||
                            $from=~/^\// || 
                            $absolute ||

-                           $form->submitted eq "Preview") {
+                           $form->submitted) {

                                @page_locs=$best_loc=$page;
                        }
                        else {
                                @page_locs=$best_loc=$page;
                        }
                        else {


@@ -340,16 +366,7 @@ sub cgi_editpage ($$) { #{{{
        else {
                # save page
                check_canedit($page, $q, $session);
        else {
                # save page
                check_canedit($page, $q, $session);

-       
-               # The session id is stored on the form and checked to
-               # guard against CSRF. But only if the user is logged in,
-               # as anonok can allow anonymous edits.
-               if (defined $session->param("name")) {
-                       my $sid=$q->param('sid');
-                       if (! defined $sid || $sid ne $session->id) {
-                               error(gettext("Your login session has expired."));
-                       }
-               }
+               checksessionexpiry($q, $session, $q->param('sid'));

 
                my $exists=-e "$config{srcdir}/$file";
 
 
                my $exists=-e "$config{srcdir}/$file";
 


@@ -380,6 +397,7 @@ sub cgi_editpage ($$) { #{{{
                }
                
                my $content=$form->field('editcontent');
                }
                
                my $content=$form->field('editcontent');

+               check_cansave($page, $content, $q, $session);

                run_hooks(editcontent => sub {
                        $content=shift->(
                                content => $content,
                run_hooks(editcontent => sub {
                        $content=shift->(
                                content => $content,


@@ -462,6 +480,6 @@ sub cgi_editpage ($$) { #{{{
        }
 
        exit;
        }
 
        exit;

-} #}}}
+}

 
 1
 
 1