Yoshihisa Fukuhara
higef****@users*****
2006年 4月 6日 (木) 10:36:19 JST
Index: affelio/apps/diary/Diary/WriteComment.pm
diff -u affelio/apps/diary/Diary/WriteComment.pm:1.3 affelio/apps/diary/Diary/WriteComment.pm:1.4
--- affelio/apps/diary/Diary/WriteComment.pm:1.3 Thu Mar 30 16:19:03 2006
+++ affelio/apps/diary/Diary/WriteComment.pm Thu Apr 6 10:36:18 2006
@@ -57,7 +57,7 @@
my $id = $wi->PTN_num($cgi->param("id"));
my $sub_mode = $wi->PTN_mode($cgi->param("action"));
my $comment = $cgi->param("comment");
-
+ my $visitor_name = $wi->PTN_word($cgi->param("visitor_name"));
$diary->errorExit('An article number was not specified') if (!$id);
$diary->errorExit("The specified article does not exist") unless $diary->existsEntry($id);
my $user = $diary->{afap}->get_visitor_info("nickname");
@@ -81,32 +81,29 @@
$output_ref->{"ID"} = $id;
if(!$user){
- $user = escape_comment($diary,$cgi->param('visitor_name'));
+ $user = escape_comment($diary,$visitor_name);
}else{
my $url = $diary->{afap}->get_visitor_info('afid');
- if ($url =~ /<a href="([^"]*)"/) {
+ if ($url =~ /<a href="([^"]*)"/) {
$url = $1;
+ }
+
+ $url = $diary->{afap}->get_site_info('web_root').'/outgoing.cgi?dest_url='.$url;
+ $user = "<a href=\"$url\">".$diary->{afap}->get_visitor_info("nickname")."</a>";
+ $visitor_name = $diary->{afap}->get_visitor_info("nickname");
}
- $url = $diary->{afap}->get_site_info('web_root').'/outgoing.cgi?dest_url='.$url;
- $user = "<a href=\"$url\">".$diary->{afap}->get_visitor_info("nickname")."</a>";
-
- try {
- addComment($diary, $id, $user, $comment);
- }
- catch Error with {
- my $e = shift;
- $output_ref->{err_msg} .= $e->stacktrace . '<BR>';
- }
- }
- debug_print("Diary::WriteComment::show end.");
- }
+ try {
+ addComment($diary, $id, $user, $comment, $visitor_name);
+ }
+ catch Error with {
+ my $e = shift;
+ $output_ref->{err_msg} .= $e->stacktrace . '<BR>';
+ }
+ }
+ debug_print("Diary::WriteComment::show end.");
}
-# print $diary->getRedirection("show_diary.cgi?id=$id");
-# exit;
-# else {
-# $diary->errorExit('Invalid Access');
-# }
+
##############################################
@@ -118,6 +115,7 @@
my $id = $diary->escape(shift, 'int');
my $user = shift;
my $comment = $diary->escape(shift);
+ my $visitor_name = shift;
my $time = time;
my @same = $diary->getall("SELECT id FROM $diary->{comment_table} WHERE user = '$user' AND comment = '$comment'");
@@ -125,7 +123,7 @@
$diary->{dbh}->do("INSERT INTO $diary->{comment_table} VALUES ($id, '$user', '$comment', $time)");
my @ret = $diary->getall("SELECT * FROM $diary->{entry_table} WHERE id = $id");
$comment =~ s/<br[^>]*>/\n/g;
- my $msg = $diary->{afap}->get_visitor_info("nickname")."ã•ã‚“ã‹ã‚‰ã®ã‚³ãƒ¡ãƒ³ãƒˆã§ã™ã€‚\n\n-----\n".$comment."\n\n".$diary->{afap}->get_site_info("web_root")."/apps/".$diary->{afap}->{install_name}."/index.cgi?mode=show_diary&id=".$id;
+ my $msg = $visitor_name."ã•ã‚“ã‹ã‚‰ã®ã‚³ãƒ¡ãƒ³ãƒˆã§ã™ã€‚\n\n-----\n".$comment."\n\n".$diary->{afap}->get_site_info("web_root")."/apps/".$diary->{afap}->{install_name}."/index.cgi?mode=show_diary&id=".$id;
use Affelio::NetLib::Email qw(send_email);
Affelio::NetLib::Email::send_email($diary->{afap}->{af}->{cmd__sendmail}, "$diary->{afap}->{af}->{user__email1}", "$diary->{afap}->{af}->{site__username}", "$diary->{afap}->{af}->{user__email1}", "$diary->{afap}->{af}->{site__username}/$diary->{afap}->{install_title}/$ret[0]->{title}", "$msg");