make postal.pm use Convert::YText

diff --git a/Convert/YText.pm b/Convert/YText.pm
index a2b2193f30fd627ca2d90a0f7592adba18b04b75..bdd155bbf2ba808f41228ea518b5f41e08f6723a 100644 (file)
--- a/Convert/YText.pm
+++ b/Convert/YText.pm
@@ -64,7 +64,7 @@ sub encode_num($){
     my $str="";
 
     while ($num>0){
     my $str="";
 
     while ($num>0){

-       $remainder=$num % 64;
+       my $remainder=$num % 64;

        $num=$num >> 6;
        
        $str = $digits[$remainder].$str;
        $num=$num >> 6;
        
        $str = $digits[$remainder].$str;

diff --git a/IkiWiki/Plugin/postal.pm b/IkiWiki/Plugin/postal.pm
index bc34102802499d3d67009410ece04e6cf83730dc..82878692850d1706b887e752fbd4ded17335f3b5 100644 (file)
--- a/IkiWiki/Plugin/postal.pm
+++ b/IkiWiki/Plugin/postal.pm
@@ -1,8 +1,8 @@
 # A plugin for ikiwiki to implement adding a footer with a comment URL
 # based on a template file and a key representing the current page
 
 # A plugin for ikiwiki to implement adding a footer with a comment URL
 # based on a template file and a key representing the current page
 

-# Copyright © 2007 Thomas Schwinge <tschwinge@gnu.org>
-# Copyright © 2008 David Bremner <tschwinge@gnu.org>
+# Copyright © 2007 Thomas Schwinge <tschwinge@gnu.org>
+# Copyright © 2008 David Bremner <tschwinge@gnu.org>

 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the


@@ -31,7 +31,7 @@ package IkiWiki::Plugin::postal;
 use warnings;
 use strict;
 use IkiWiki 2.00;
 use warnings;
 use strict;
 use IkiWiki 2.00;

-
+use Convert::YText 'encode_ytext';

 
 \f
 sub import
 
 \f
 sub import


@@ -51,40 +51,27 @@ sub pagetemplate (@)
        ! defined $template->param ('comments'))
     {
        debug("adding comments to ".$page);
        ! defined $template->param ('comments'))
     {
        debug("adding comments to ".$page);

-       my $key = uri_escape_utf8($page);
+       my $key = encode_ytext($page);

        debug("using key ".$key);
 
 
        my $content;
        my $comment_page = bestlink ($page, "comments") || return;
        my $comment_file = $pagesources{$comment_page} || return;
        debug("using key ".$key);
 
 
        my $content;
        my $comment_page = bestlink ($page, "comments") || return;
        my $comment_file = $pagesources{$comment_page} || return;

-       #my $pagetype = pagetype ($comment_file);
-       # Check if ``$pagetype eq 'html'''?
+

        $content = readfile (srcfile ($comment_file));
        if (defined $content && length $content)
        {
            $content =~ s/%%KEY%%/$key/g;
        $content = readfile (srcfile ($comment_file));
        if (defined $content && length $content)
        {
            $content =~ s/%%KEY%%/$key/g;

+           $content =~ s/%%PAGE%%/$page/g;

 
            debug("comment blurb: ". $content);
 
            $template->param (comments =>
 
            debug("comment blurb: ". $content);
 
            $template->param (comments =>

-             IkiWiki::linkify ($page, $destpage, $content))
+                             IkiWiki::linkify ($page, $destpage, $content)) 

        }
     }
 }
        }
     }
 }

-\f
-sub strict_rfc2822_escape($){
-# according to rfc 2822, the following non-alphanumerics are OK for
-# the local part of an address: "!#$%&'*+-/=?^_`{|}~". On the other
-# hand, a fairly common exim configuration, for example, blocks
-# addresses having "@%!/|`#&?" in the local part.  '+' and '-' are
-# pretty widely used to attach suffixes (although usually only one
-# works on a given mail host).
-    my $str=shift;
-
-    $str=s/[^a-zA-Z0-9+\-~_]/= ord($1)/;
-
-};

 
 
 1;
 
 
 1;

diff --git a/examples/comments.mdwn b/examples/comments.mdwn
index 9098179ade9e3d002d1ab43cdce6b218df6e031a..f73cd1e76e094802304a1104aab0615e36b33c16 100644 (file)
--- a/examples/comments.mdwn
+++ b/examples/comments.mdwn
@@ -1,3 +1,3 @@
 <a href="mailto:user-comment-%%KEY%%@host.some.org">Send Comment</a>
 
 <a href="mailto:user-comment-%%KEY%%@host.some.org">Send Comment</a>
 

-[[Read Comments|comments/%%KEY%%]]
+[[Read Comments|%%PAGE%%/comments]]