Yoshihisa Fukuhara
higef****@users*****
2006年 1月 12日 (木) 14:33:50 JST
Index: affelio/apps/bb/bb.pm
diff -u affelio/apps/bb/bb.pm:1.2 affelio/apps/bb/bb.pm:1.3
--- affelio/apps/bb/bb.pm:1.2 Mon Dec 19 21:11:55 2005
+++ affelio/apps/bb/bb.pm Thu Jan 12 14:33:50 2006
@@ -215,7 +215,8 @@
$self->{afap}->get_site_info("web_root") . "/apps/".
$self->{afap}->{install_name} . "/view_forum.cgi?f_id=".$forum_id);
- $self->sendBbMail("New Forum $title was created by $user.\n");
+ $description =~ s/<br[^>]*>/\n/g;
+ $self->sendBbMail("New Forum $title was created by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_forum.cgi?f_id=$forum_id");
return $forum_id;
}
@@ -256,8 +257,8 @@
$self->{afap}->post_news($title, "", $user,
$self->{afap}->get_site_info("web_root") . "/apps/".
$self->{afap}->{install_name} . "/view_topic.cgi?t_id=".$topic_id);
-
- $self->sendBbMail("New Topic $title was created by $user.\n\n-----\n$description\n");
+ $description =~ s/<br[^>]*>/\n/g;
+ $self->sendBbMail("New Topic $title was created by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_topic.cgi?t_id=$topic_id");
return $topic_id;
}
@@ -284,8 +285,8 @@
$self->errorExit('<AF_M text="A topic of the proposed name already exists.">') if($#same >= 1);
$self->{dbh}->do("UPDATE $self->{topic_tb} SET title='$title', description='$description', icon='$icon', status=$status, lock=$lock, user = '$user', afid = '$afid', timestamp = $time WHERE topic_id = $topic_id");
-
- $self->sendBbMail("Topic $title was updated by $user.\n\n-----\n$description\n");
+ $description =~ s/<br[^>]*>/\n/g;
+ $self->sendBbMail("Topic $title was updated by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_topic.cgi?t_id=$topic_id");
return $topic_id;
}
@@ -309,8 +310,8 @@
$self->errorExit('<AF_M text="A forum of the proposed name already exists.">') if($#same >= 1);
$self->{dbh}->do("UPDATE $self->{forum_tb} SET title='$title', description='$description', user = '$user', afid = '$afid', timestamp = $time WHERE forum_id = $forum_id");
-
- $self->sendBbMail("Forum $title was updated by $user.\n\n-----\n$description\n");
+ $description =~ s/<br[^>]*>/\n/g;
+ $self->sendBbMail("Forum $title was updated by $user.\n\n-----\n$description\n\n$self->{afap}->{app__web_root}/view_forum.cgi?f_id=$forum_id");
return $forum_id;
}
@@ -641,8 +642,8 @@
$self->{afap}->post_news($title, "", $user,
$self->{afap}->get_site_info("web_root") . "/apps/".
$self->{afap}->{install_name} . "/view_topic.cgi?t_id=".$topic_id);
-
- $self->sendBbMail("New Comment $title was written by $user.\n\n-----\n$comment\n");
+ $comment =~ s/<br[^>]*>/\n/g;
+ $self->sendBbMail("New Comment $title was written by $user.\n\n-----\n$comment\n\n$self->{afap}->{app__web_root}/view_topic.cgi?t_id=$topic_id");
}
##############################################