aggregate: If a feed fails to be downloaded, try again immediatly next time aggregati...

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

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 687ebf51e63d4c7daebdcf6bfe172ad90674a8da..9210d6ff8c7a61eeac6e3162e89cc9b92d09847b 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -6,25 +6,55 @@ 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 => "getsetup", id => "editpage", call => \&getsetup);

+       hook(type => "refresh", id => "editpage", call => \&refresh);

         hook(type => "sessioncgi", id => "editpage", call => \&IkiWiki::cgi_editpage);
         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}) {
+               # Expire old preview files after one hour.
+               my $expire=time - (60 * 60);
+
+               my @previews;
+               foreach my $file (@{$wikistate{editpage}{previews}}) {
+                       my $mtime=(stat("$config{destdir}/$file"))[9];
+                       if (defined $mtime && $mtime <= $expire) {
+                               # Avoid deleting a preview that was later saved.
+                               my $delete=1;
+                               foreach my $page (keys %renderedfiles) {
+                                       if (grep { $_ eq $file } @{$renderedfiles{$page}}) {
+                                               $delete=0;
+                                       }
+                               }
+                               if ($delete) {
+                                       debug(sprintf(gettext("removing old preview %s"), $file));
+                                       IkiWiki::prune("$config{destdir}/$file");
+                               }
+                       }
+                       elsif (defined $mtime) {
+                               push @previews, $file;
+                       }
+               }
+               $wikistate{editpage}{previews}=\@previews;
+       }
+}

 
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin,
 # and other plugins use the functions below.
 package IkiWiki;
 
 
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin,
 # 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;


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

-} #}}}
+}

 
 

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

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


@@ -92,7 +122,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);


@@ -126,7 +156,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);
                }


@@ -169,6 +199,7 @@ sub cgi_editpage ($$) { #{{{
                        # temporarily record its type
                        $pagesources{$page}=$page.".".$type;
                }
                        # temporarily record its type
                        $pagesources{$page}=$page.".".$type;
                }

+               my %wasrendered=map { $_ => 1 } @{$renderedfiles{$page}};

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


@@ -191,11 +222,19 @@ sub cgi_editpage ($$) { #{{{
                        );
                });
                $form->tmpl_param("page_preview", $preview);
                        );
                });
                $form->tmpl_param("page_preview", $preview);

-       
+               

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

-               # previewing may have created files on disk
+
+               # 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};
+               }
+               @{$wikistate{editpage}{previews}} = keys %previews;
+               $renderedfiles{$page}=[keys %wasrendered];

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


@@ -211,7 +250,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 {


@@ -301,16 +340,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";
 


@@ -423,6 +453,6 @@ sub cgi_editpage ($$) { #{{{
        }
 
        exit;
        }
 
        exit;

-} #}}}
+}

 
 1
 
 1