checksessionexpiry: rework

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

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 0de7a67436c709cd351536abbd4988e14af994e3..b8748a1d65e188abefee86cde10110356c941b5a 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -112,12 +112,12 @@ sub preprocess { # {{{
        my $page = $params{page};
 
        my $format = $params{format};
        my $page = $params{page};
 
        my $format = $params{format};

-       if (defined $format && !exists $IkiWiki::hooks{htmlize}{$format}) {
+       if (defined $format && ! exists $IkiWiki::hooks{htmlize}{$format}) {

                error(sprintf(gettext("unsupported page format %s"), $format));
        }
 
        my $content = $params{content};
                error(sprintf(gettext("unsupported page format %s"), $format));
        }
 
        my $content = $params{content};

-       if (!defined $content) {
+       if (! defined $content) {

                error(gettext("comment must have content"));
        }
        $content =~ s/\\"/"/g;
                error(gettext("comment must have content"));
        }
        $content =~ s/\\"/"/g;


@@ -165,10 +165,10 @@ sub preprocess { # {{{
        $pagestate{$page}{comments}{commentip} = $commentip;
        $pagestate{$page}{comments}{commentauthor} = $commentauthor;
        $pagestate{$page}{comments}{commentauthorurl} = $commentauthorurl;
        $pagestate{$page}{comments}{commentip} = $commentip;
        $pagestate{$page}{comments}{commentauthor} = $commentauthor;
        $pagestate{$page}{comments}{commentauthorurl} = $commentauthorurl;

-       if (!defined $pagestate{$page}{meta}{author}) {
+       if (! defined $pagestate{$page}{meta}{author}) {

                $pagestate{$page}{meta}{author} = $commentauthor;
        }
                $pagestate{$page}{meta}{author} = $commentauthor;
        }

-       if (!defined $pagestate{$page}{meta}{authorurl}) {
+       if (! defined $pagestate{$page}{meta}{authorurl}) {

                $pagestate{$page}{meta}{authorurl} = $commentauthorurl;
        }
 
                $pagestate{$page}{meta}{authorurl} = $commentauthorurl;
        }
 


@@ -192,8 +192,7 @@ sub preprocess { # {{{
 
        my $baseurl = urlto($params{destpage}, undef, 1);
        my $anchor = "";
 
        my $baseurl = urlto($params{destpage}, undef, 1);
        my $anchor = "";

-       my $comments_pagename = $config{comments_pagename};
-       if ($params{page} =~ m/\/(\Q${comments_pagename}\E\d+)$/) {
+       if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {

                $anchor = $1;
        }
        $pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";
                $anchor = $1;
        }
        $pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";


@@ -221,7 +220,7 @@ sub linkcgi ($) { #{{{
        if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
 
                my $page=decode_utf8($cgi->param("page"));
        if (defined $cgi->param('do') && $cgi->param('do') eq "commenter") {
 
                my $page=decode_utf8($cgi->param("page"));

-               if (!defined $page) {
+               if (! defined $page) {

                        error("missing page parameter");
                }
 
                        error("missing page parameter");
                }
 


@@ -310,11 +309,9 @@ sub sessioncgi ($$) { #{{{
        }
        my @page_types;
        if (exists $IkiWiki::hooks{htmlize}) {
        }
        my @page_types;
        if (exists $IkiWiki::hooks{htmlize}) {

-               @page_types = grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}};
+               @page_types = grep { ! /^_/ } keys %{$IkiWiki::hooks{htmlize}};

        }
 
        }
 

-       my $allow_author = $config{comments_allowauthor};
-

        $form->field(name => 'do', type => 'hidden');
        $form->field(name => 'sid', type => 'hidden', value => $session->id,
                force => 1);
        $form->field(name => 'do', type => 'hidden');
        $form->field(name => 'sid', type => 'hidden', value => $session->id,
                force => 1);


@@ -326,7 +323,8 @@ sub sessioncgi ($$) { #{{{
 
        $form->tmpl_param(username => $session->param('name'));
 
 
        $form->tmpl_param(username => $session->param('name'));
 

-       if ($allow_author and !defined $session->param('name')) {
+       if ($config{comments_allowauthor} and
+           ! defined $session->param('name')) {

                $form->tmpl_param(allowauthor => 1);
                $form->field(name => 'author', type => 'text', size => '40');
                $form->field(name => 'url', type => 'text', size => '40');
                $form->tmpl_param(allowauthor => 1);
                $form->field(name => 'author', type => 'text', size => '40');
                $form->field(name => 'url', type => 'text', size => '40');


@@ -343,15 +341,11 @@ sub sessioncgi ($$) { #{{{
        # it to file_pruned anyway
        my $page = $form->field('page');
        $page = IkiWiki::possibly_foolish_untaint($page);
        # it to file_pruned anyway
        my $page = $form->field('page');
        $page = IkiWiki::possibly_foolish_untaint($page);

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

                IkiWiki::file_pruned($page, $config{srcdir})) {
                error(gettext("bad page name"));
        }
 
                IkiWiki::file_pruned($page, $config{srcdir})) {
                error(gettext("bad page name"));
        }
 

-       my $allow_directives = $config{comments_allowdirectives};
-       my $commit_comments = $config{comments_commit};
-       my $comments_pagename = $config{comments_pagename};
-

        # FIXME: is this right? Or should we be using the candidate subpage
        # (whatever that might mean) as the base URL?
        my $baseurl = urlto($page, undef, 1);
        # FIXME: is this right? Or should we be using the candidate subpage
        # (whatever that might mean) as the base URL?
        my $baseurl = urlto($page, undef, 1);


@@ -363,7 +357,7 @@ sub sessioncgi ($$) { #{{{
                htmllink($page, $page, 'ikiwiki/formatting',
                        noimageinline => 1,
                        linktext => 'FormattingHelp'),
                htmllink($page, $page, 'ikiwiki/formatting',
                        noimageinline => 1,
                        linktext => 'FormattingHelp'),

-                       allowdirectives => $allow_directives);
+                       allowdirectives => $config{allow_directives});

 
        if ($form->submitted eq CANCEL) {
                # bounce back to the page they wanted to comment on, and exit.
 
        if ($form->submitted eq CANCEL) {
                # bounce back to the page they wanted to comment on, and exit.


@@ -391,25 +385,15 @@ sub sessioncgi ($$) { #{{{
        IkiWiki::check_canedit($page, $cgi, $session);
        $postcomment=0;
 
        IkiWiki::check_canedit($page, $cgi, $session);
        $postcomment=0;
 

-       my $editcontent = $form->field('editcontent') || '';
-       $editcontent =~ s/\r\n/\n/g;
-       $editcontent =~ s/\r/\n/g;
-
-       # FIXME: check that the wiki is locked right now, because
-       # if it's not, there are mad race conditions!
-

        # FIXME: rather a simplistic way to make the comments...
        my $i = 0;
        my $file;
        my $location;
        do {
                $i++;
        # FIXME: rather a simplistic way to make the comments...
        my $i = 0;
        my $file;
        my $location;
        do {
                $i++;

-               $location = "$page/${comments_pagename}${i}";
+               $location = "$page/$config{comments_pagename}$i";

        } while (-e "$config{srcdir}/$location._comment");
 
        } while (-e "$config{srcdir}/$location._comment");
 

-       my $anchor = "${comments_pagename}${i}";
-
-       $editcontent =~ s/"/\\"/g;

        my $content = "[[!_comment format=$type\n";
 
        # FIXME: handling of double quotes probably wrong?
        my $content = "[[!_comment format=$type\n";
 
        # FIXME: handling of double quotes probably wrong?


@@ -425,7 +409,7 @@ sub sessioncgi ($$) { #{{{
                }
        }
 
                }
        }
 

-       if ($allow_author) {
+       if ($config{comments_allowauthor}) {

                my $author = $form->field('author');
                if (length $author) {
                        $author =~ s/"/"/g;
                my $author = $form->field('author');
                if (length $author) {
                        $author =~ s/"/"/g;


@@ -446,6 +430,10 @@ sub sessioncgi ($$) { #{{{
 
        $content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 
 
        $content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
 

+       my $editcontent = $form->field('editcontent') || '';
+       $editcontent =~ s/\r\n/\n/g;
+       $editcontent =~ s/\r/\n/g;
+       $editcontent =~ s/"/\\"/g;

        $content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
        # This is essentially a simplified version of editpage:
        $content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n";
 
        # This is essentially a simplified version of editpage:


@@ -480,7 +468,7 @@ sub sessioncgi ($$) { #{{{
        if ($form->submitted eq POST_COMMENT && $form->validate) {
                my $file = "$location._comment";
 
        if ($form->submitted eq POST_COMMENT && $form->validate) {
                my $file = "$location._comment";
 

-               IkiWiki::checksessionexpiry($session, $cgi->param('sid'));
+               IkiWiki::checksessionexpiry($cgi, $session);

 
                # FIXME: could probably do some sort of graceful retry
                # on error? Would require significant unwinding though
 
                # FIXME: could probably do some sort of graceful retry
                # on error? Would require significant unwinding though


@@ -488,7 +476,7 @@ sub sessioncgi ($$) { #{{{
 
                my $conflict;
 
 
                my $conflict;
 

-               if ($config{rcs} and $commit_comments) {
+               if ($config{rcs} and $config{comments_commit}) {

                        my $message = gettext("Added a comment");
                        if (defined $form->field('subject') &&
                                length $form->field('subject')) {
                        my $message = gettext("Added a comment");
                        if (defined $form->field('subject') &&
                                length $form->field('subject')) {


@@ -515,7 +503,7 @@ sub sessioncgi ($$) { #{{{
                error($conflict) if defined $conflict;
 
                # Bounce back to where we were, but defeat broken caches
                error($conflict) if defined $conflict;
 
                # Bounce back to where we were, but defeat broken caches

-               my $anticache = "?updated=$page/${comments_pagename}${i}";
+               my $anticache = "?updated=$page/$config{comments_pagename}$i";

                IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
        }
        else {
                IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
        }
        else {


@@ -535,14 +523,12 @@ sub pagetemplate (@) { #{{{
        if ($template->query(name => 'comments')) {
                my $comments = undef;
 
        if ($template->query(name => 'comments')) {
                my $comments = undef;
 

-               my $comments_pagename = $config{comments_pagename};
-

                my $open = 0;
                my $shown = pagespec_match($page,
                        $config{comments_shown_pagespec},
                        location => $page);
 
                my $open = 0;
                my $shown = pagespec_match($page,
                        $config{comments_shown_pagespec},
                        location => $page);
 

-               if (pagespec_match($page, "*/${comments_pagename}*",
+               if (pagespec_match($page, "*/$config{comments_pagename}*",

                                location => $page)) {
                        $shown = 0;
                        $open = 0;
                                location => $page)) {
                        $shown = 0;
                        $open = 0;


@@ -555,11 +541,8 @@ sub pagetemplate (@) { #{{{
                }
 
                if ($shown) {
                }
 
                if ($shown) {

-                       eval q{use IkiWiki::Plugin::inline};
-                       error($@) if $@;
-
-                       my @args = (
-                               pages => "internal($page/${comments_pagename}*)",
+                       $comments = IkiWiki::preprocess_inline(
+                               pages => "internal($page/$config{comments_pagename}*)",

                                template => 'comments_display',
                                show => 0,
                                reverse => 'yes',
                                template => 'comments_display',
                                show => 0,
                                reverse => 'yes',


@@ -568,7 +551,6 @@ sub pagetemplate (@) { #{{{
                                feedfile => 'comments',
                                emptyfeeds => 'no',
                        );
                                feedfile => 'comments',
                                emptyfeeds => 'no',
                        );

-                       $comments = IkiWiki::preprocess_inline(@args);

                }
 
                if (defined $comments && length $comments) {
                }
 
                if (defined $comments && length $comments) {