Yoshihisa Fukuhara
higef****@users*****
2006年 3月 30日 (木) 16:19:03 JST
Index: affelio/apps/diary/Diary/UploadImage.pm
diff -u affelio/apps/diary/Diary/UploadImage.pm:1.3 affelio/apps/diary/Diary/UploadImage.pm:1.4
--- affelio/apps/diary/Diary/UploadImage.pm:1.3 Wed Mar 8 02:15:20 2006
+++ affelio/apps/diary/Diary/UploadImage.pm Thu Mar 30 16:19:03 2006
@@ -96,7 +96,7 @@
mkdir $tmp_imgdir;
}
- my $thumbdir = $tmp_imgdir."thumb/";
+ my $thumbdir = "$self->{datadir}tmp/thumb/";
unless (-d $thumbdir) {
mkdir $thumbdir;
}
Index: affelio/apps/diary/Diary/WriteComment.pm
diff -u affelio/apps/diary/Diary/WriteComment.pm:1.2 affelio/apps/diary/Diary/WriteComment.pm:1.3
--- affelio/apps/diary/Diary/WriteComment.pm:1.2 Wed Mar 8 00:14:41 2006
+++ affelio/apps/diary/Diary/WriteComment.pm Thu Mar 30 16:19:03 2006
@@ -119,11 +119,16 @@
my $user = shift;
my $comment = $diary->escape(shift);
my $time = time;
-
+
my @same = $diary->getall("SELECT id FROM $diary->{comment_table} WHERE user = '$user' AND comment = '$comment'");
if($#same >= 0) { return; }
-
$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;
+
+ 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");
}
sub escape_comment {
Index: affelio/apps/diary/Diary/WriteDiary.pm
diff -u affelio/apps/diary/Diary/WriteDiary.pm:1.10 affelio/apps/diary/Diary/WriteDiary.pm:1.11
--- affelio/apps/diary/Diary/WriteDiary.pm:1.10 Wed Mar 8 02:15:21 2006
+++ affelio/apps/diary/Diary/WriteDiary.pm Thu Mar 30 16:19:03 2006
@@ -145,7 +145,7 @@
"",
$diary->{afap}->get_visitor_info("nickname"),
$diary->{afap}->get_site_info("web_root") . "/apps/".
- $diary->{afap}->{install_name} . "/list_diary.cgi");
+ $diary->{afap}->{install_name} . "/index.cgi?mode=show_diary&id=".$new_id);
debug_print("Diary::Write::show: ping");
# send trackback ping
@@ -365,6 +365,7 @@
if (-d $imgdir) {
opendir(DIR, $imgdir);
while ($file = readdir(DIR)) {
+ if ($file eq "thumb") { next; }
copy ($imgdir.$file, $tmp_imgdir.$file);
}
closedir(DIR);