PyukiWiki CVS Commit
pyuki****@lists*****
2012年 4月 8日 (日) 04:18:05 JST
Index: PyukiWiki-Devel/plugin/article.inc.pl diff -u PyukiWiki-Devel/plugin/article.inc.pl:1.525 PyukiWiki-Devel/plugin/article.inc.pl:1.526 --- PyukiWiki-Devel/plugin/article.inc.pl:1.525 Sun Apr 8 03:47:06 2012 +++ PyukiWiki-Devel/plugin/article.inc.pl Sun Apr 8 04:18:05 2012 @@ -1,6 +1,6 @@ ###################################################################### # article.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: article.inc.pl,v 1.525 2012/04/07 18:47:06 papu Exp $ +# $Id: article.inc.pl,v 1.526 2012/04/07 19:18:05 papu Exp $ # # "PyukiWiki" ver 0.2.0-p3-dev3 $$ # Author: Nekyo http://nekyo.qp.land.to/ @@ -131,6 +131,12 @@ $article::no++; my $conflictchecker = &get_info($::form{mypage}, $::info_ConflictChecker); + + my $captcha_form; + eval { + $captcha_form=&plugin_captcha_form; + }; + return <<"EOD"; <form action="$::script" method="post"> <div> @@ -142,6 +148,7 @@ $::resource{article_plugin_name} <input type="text" name="myname" size="$article::name_cols" value="$::name_cookie{myname}" /><br /> $::resource{article_plugin_subject} <input type="text" name="subject" size="$article::subject_cols" value=""/><br /> <textarea name="msg" rows="$article::rows" cols="$article::cols"></textarea><br /> + $captcha_form <input type="submit" value="$::resource{article_plugin_btn}" /> </div> </form> Index: PyukiWiki-Devel/plugin/comment.inc.pl diff -u PyukiWiki-Devel/plugin/comment.inc.pl:1.520 PyukiWiki-Devel/plugin/comment.inc.pl:1.521 --- PyukiWiki-Devel/plugin/comment.inc.pl:1.520 Sun Apr 8 03:47:06 2012 +++ PyukiWiki-Devel/plugin/comment.inc.pl Sun Apr 8 04:18:05 2012 @@ -1,6 +1,6 @@ ###################################################################### # comment.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: comment.inc.pl,v 1.520 2012/04/07 18:47:06 papu Exp $ +# $Id: comment.inc.pl,v 1.521 2012/04/07 19:18:05 papu Exp $ # # "PyukiWiki" ver 0.2.0-p3-dev3 $$ # Author: Nekyo http://nekyo.qp.land.to/ @@ -136,6 +136,11 @@ $comment_no = ++$comment_numbers{$::form{mypage}}; my $escapedmypage = &escape($::form{mypage}); my $conflictchecker = &get_info($::form{mypage}, $::info_ConflictChecker); + my $captcha_form; + eval { + $captcha_form=&plugin_captcha_form; + }; + return <<"EOD"; <form action="$::script" method="post"> <div> @@ -149,6 +154,7 @@ @{[$noname eq 1 ? qq(<input type="hidden" name="noname" value="1" />) : ""]} $nametags <input type="text" name="mymsg" value="" size="$comment::size_msg" /> + @{[$captcha_form ne "" ? qq(<br />$captcha_form) : '']} <input type="submit" value="$::resource{comment_plugin_commentbutton}" /> </div> </form> Index: PyukiWiki-Devel/plugin/pcomment.inc.pl diff -u PyukiWiki-Devel/plugin/pcomment.inc.pl:1.471 PyukiWiki-Devel/plugin/pcomment.inc.pl:1.472 --- PyukiWiki-Devel/plugin/pcomment.inc.pl:1.471 Sun Apr 8 03:47:07 2012 +++ PyukiWiki-Devel/plugin/pcomment.inc.pl Sun Apr 8 04:18:05 2012 @@ -1,6 +1,6 @@ ###################################################################### # pcomment.inc.pl - This is PyukiWiki, yet another Wiki clone. -# $Id: pcomment.inc.pl,v 1.471 2012/04/07 18:47:07 papu Exp $ +# $Id: pcomment.inc.pl,v 1.472 2012/04/07 19:18:05 papu Exp $ # # "PyukiWiki" ver 0.2.0-p3-dev3 $$ # Author: Nanami http://nanakochi.daiba.cx/ @@ -242,6 +242,11 @@ . "[[$::resource{pcomment_plugin_msg_all}>$pcomment_page]]\n"); } my $conflictchecker = &get_info($pcomment_page, $::info_ConflictChecker); + my $captcha_form; + eval { + $captcha_form=&plugin_captcha_form; + }; + my $body=<<EOD; <div> <input type="hidden" name="cmd" value="pcomment" /> @@ -255,6 +260,7 @@ @{[$reply eq 1 ? qq( <input class="pcmt" type="radio" name="reply" value="" checked />) : ""]} $nametags <input type="text" name="mymsg" value="" size="$pcomment::size_msg" /> + @{[$captcha_form ne "" ? qq(<br />$captcha_form) : '']} <input type="submit" value="$::resource{pcomment_plugin_pcommentbutton}" /> </div> EOD
